Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Joseph Lee and Kam Kennedy #100

Open
wants to merge 80 commits into
base: main
Choose a base branch
from
Open

Joseph Lee and Kam Kennedy #100

wants to merge 80 commits into from

Conversation

josephlee702
Copy link

Our submission :)

kameronk92 and others added 30 commits November 27, 2023 16:42
@kameronk92
Create pull_request_template.md
9c76522
@josephlee702
Set up and run Rubocop
c92963e
@kameronk92
Merge pull request #14 from josephlee702/setup/rubocop
8c9bbd5 
Set up and run Rubocop
@josephlee702
set up tables and relationships
d49cff1
@kameronk92
Merge pull request #15 from josephlee702/setup/database
526c4aa 
set up tables and relationships
@kameronk92
progress on model specs
e3c1f6a
@kameronk92
set up models and testing
55b7524
@josephlee702
Merge pull request #16 from josephlee702/setup/database
4447f3d 
Setup/database
@kameronk92
rework schema
6ac0dc0
@kameronk92
all tests passing
a9b55ba
@kameronk92
complete user dashboard story
0bbcf73
@josephlee702
Merge pull request #17 from josephlee702/setup/database
f48c5cf 
Setup/database
@josephlee702
Merge pull request #18 from josephlee702/user/dashboard
2818830 
User/dashboard
@kameronk92
add discovers index page
fe633f2
@kameronk92
refactor with advanced routing
3816e88
@josephlee702
Merge pull request #19 from josephlee702/user/discover
662adb2 
add discovers index page
@josephlee702
add seed data
4639e8a
@kameronk92
progress on landing page
bd311df
@kameronk92
all tests passing
07a0f42
@josephlee702
write tests and finish user reg page
cc75ba2
@kameronk92
add partial for link to root
f55ddb6
@kameronk92
resolve merge conflicts
dcf56f7
@kameronk92
Merge pull request #20 from josephlee702/feat/user-registration
a2eb342 
Feat/user registration
@josephlee702
Merge branch 'main' into user/landing
cfe27d5
@josephlee702
Merge pull request #22 from josephlee702/user/landing
513d9c1 
User/landing
@josephlee702
make sure all tests pass after the merge conflict
f519c37
@kameronk92
Merge pull request #23 from josephlee702/feat/cleanupstuff
e334e87 
make sure all tests pass after the merge conflict
@josephlee702
preliminary stuff
18e0e13
@josephlee702
everything until api consumption
8355374
@josephlee702
figure out the api consumption
2cef804
kameronk92 and others added 30 commits December 1, 2023 20:18
@kameronk92
add header to all views, with test
63fb689
@josephlee702
implement facade for movies_show
9aed43a
@josephlee702
Merge pull request #29 from josephlee702/user/landing
a5738db 
all tests passing
@josephlee702
fix merge conflict
3c5f889
@josephlee702
Merge pull request #30 from josephlee702/spec_improvements
091ae5d 
Spec improvements
@josephlee702
Merge branch 'main' of github.com:josephlee702/viewing_party_lite_7 i…
101dc75 
…nto feat/implement-facades
@kameronk92
add flash alerts for sad path
dc438f8
@josephlee702
small adjustments
7bce31f
@josephlee702
Merge pull request #31 from josephlee702/spec_improvements
255d1a4 
add flash alerts for sad path
@josephlee702
Merge branch 'main' of github.com:josephlee702/viewing_party_lite_7 i…
c31072e 
…nto feat/implement-facades
@josephlee702
test moviefacade
ffd7c44
@josephlee702
refactor facades
3902e96
@kameronk92
Merge pull request #32 from josephlee702/feat/implement-facades
9b285a1 
Feat/implement facades
@josephlee702
Add reviews title before reviews start
cdab967
@josephlee702
add more seeds
305f8bb
@josephlee702
Merge branch 'main' of github.com:josephlee702/viewing_party_lite_7 i…
914c7db 
…nto feat/dashboard-viewing-parties-real
@kameronk92
add factory bot, faker and pull out add attendees method
52cd627
@josephlee702
Merge pull request #33 from josephlee702/feat/viewing_parties_helpers
17f72f1 
add factory bot, faker and pull out add attendees method
@josephlee702
start work on VP dashboard story
19d4ba7
@josephlee702
Merge branch 'main' of github.com:josephlee702/viewing_party_lite_7 i…
119f4e3 
…nto feat/dashboard-viewing-parties-real
@kameronk92
add spec for movie service
5a9ca14
@josephlee702
Merge pull request #34 from josephlee702/spec/movie_service_spec
7f835a2 
add spec for movie service
@josephlee702
pull kam's branch
dbcfbd7
@josephlee702
Merge branch 'main' of github.com:josephlee702/viewing_party_lite_7 i…
856961a 
…nto feat/dashboard-viewing-parties-real
@josephlee702
idk
5f9fdb4
@josephlee702
finish up the user's dashboard for vps hosting and invited to
1402c6b
@kameronk92
Merge pull request #35 from josephlee702/feat/dashboard-viewing-parti…
e879f07 
…es-real

Feat/dashboard viewing parties real
@josephlee702
finish login work from class
35a5533
@josephlee702
complete rerouting of everything and authorization challenge
4ac1b8c
@josephlee702
Merge pull request #36 from josephlee702/feat/login_work
6255687 
finish login work from class
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@josephlee702 @kameronk92