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

Shawn Carpenter and Anthea Yur #98

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

Shawn Carpenter and Anthea Yur #98

wants to merge 194 commits into from

Conversation

shawndcarpenter
Copy link

Resubmitting this PR as it includes a bugfix. We got through all the user stories, plus the sessions/caching/password encryption extension.

chisPmama and others added 30 commits November 27, 2023 16:50
@chisPmama
Create pull_request_template.md for PR requests
e589b2c
@chisPmama
Create folders for general organization to avoid overlap
0ae4bcc
@chisPmama
Edit the pull request template in docs directory
ebf0628
@shawndcarpenter
Merge pull request #3 from shawndcarpenter/2-user-registration-page
3b57a8d 
Worked on together on call
@shawndcarpenter
Write tests for landing page user story
325c79b
@shawndcarpenter
Add users index and root routes
c4a7a4c
@shawndcarpenter
Set up controllers and model for root and users index
cf29f59
@shawndcarpenter
Set up views for root and users index
1071356
@shawndcarpenter
Create title and links on all pages using partial
b316683
@chisPmama
Merge pull request #4 from shawndcarpenter/1-landing-page
cbee8a1 
1 landing page
@chisPmama
Test written for Register Page
6f7fd3b
@shawndcarpenter
Write tests for user dashboard
16c4164
@chisPmama
Create controller for create and include form
3a3bed7
@chisPmama
Complete Registration
aef7ab9
@chisPmama
Create test_data method for instantiating test data and complete Regi…
0f6df3c 
…ster Page requirements
@shawndcarpenter
Merge pull request #6 from shawndcarpenter/2-user-registration-page
425d9a2 
discussed on call
@shawndcarpenter
Add controller and view for user show page
fa33c3d
@shawndcarpenter
Add user show to routes
4c17400
@shawndcarpenter
Merge branch 'main' of github.com:shawndcarpenter/viewing_party_lite_…
6e162e6 
…7 into feat/user-dashboard-page
@shawndcarpenter
Complete merge from main
baffbc7
@shawndcarpenter
Write tests for party user relationships
3b044d7
@shawndcarpenter
Create parties and user parties tables
d3121cf
@shawndcarpenter
Set up relationships and testing gems
a20ab15
@shawndcarpenter
Add test coverage for iterating through viewing parties
a82c022
@shawndcarpenter
Add code to iterate through viewing parties in user show page
f772c7d
@chisPmama
Merge pull request #8 from shawndcarpenter/feat/user-dashboard-page
fdf1d75 
Feat/user dashboard page
@chisPmama
Create test and adding route for users/parties to be dicover
c892a9c
@chisPmama
Add paht to Discover Movies button
35720bd
@chisPmama
Complete User Story by directing user to the discover page that would…
bd9f40a 
… be the user_parties index
@shawndcarpenter
Merge pull request #9 from shawndcarpenter/7-dashboard-discover-movies
aa89433 
7 Dashboard: Discover Movies
shawndcarpenter and others added 30 commits December 1, 2023 22:47
@shawndcarpenter
Add edge case protection for missing poster
f1a41e7
@shawndcarpenter
Create preliminary login options
b533e56
@shawndcarpenter
Move movie poster logic out of views
f408510
@shawndcarpenter
Add sad path cases to tests and functionality for movie poster missing
20e195f
@shawndcarpenter
Merge branch 'feat/dashboard-viewing-parties' of github.com:shawndcar…
5a02e4b 
…penter/viewing_party_lite_7 into feat/passwords
@chisPmama
Merge pull request #36 from shawndcarpenter/feat/dashboard-viewing-pa…
b88e283 
…rties

Feat/dashboard viewing parties
@chisPmama
Light formatting for landing page
88fb2ba
@chisPmama
Render index and new user page
b1dbfb2
@shawndcarpenter
Write testing for user login and logout
10900f9
@shawndcarpenter
enable encryption gem
b65f10a
@shawndcarpenter
Add session functionality in controllers
16c9838
@shawndcarpenter
Create user params in user controller
94657fc
@shawndcarpenter
Add password secure validation in model
d6a18a6
@shawndcarpenter
Add sessions functionality and caching to views
16908d5
@shawndcarpenter
Add caching functionality to environments, change password column, ad…
ff16063 
…d sessions routes
@shawndcarpenter
Change password column for users to work with encryption
a7e8166
@chisPmama
Logic added to separate invited list and host to remove repetition
ce6af38
@shawndcarpenter
Change name to email in sessions creation
f2bb6a1
@chisPmama
Finish reformatting of top rated movies
71ca8e5
@shawndcarpenter
Add validation testing for users
980a60f
@chisPmama
Reformat the movie results for search
fff011d
@chisPmama
Soft formatting for other paes
5ea7bdc
@chisPmama
Merge pull request #37 from shawndcarpenter/format/css
c699af7 
Format/css
@shawndcarpenter
Merge branch 'main' of github.com:shawndcarpenter/viewing_party_lite_…
3bac9eb 
…7 into feat/passwords
@shawndcarpenter
Fix some broken code from main merge
b95d8ef
@chisPmama
Merge pull request #38 from shawndcarpenter/feat/passwords
9fa5e3a 
Feat/passwords
@shawndcarpenter
Fix loading landing error when no users created
9c286dd
@shawndcarpenter
Add testing for no users created
77aed38
@shawndcarpenter
Reverts some code that resulted in names no longer being rendered on …
8696276 
…page
@shawndcarpenter
Merge pull request #39 from shawndcarpenter/bugfix/no-invitees-listed
87374d3 
Reverts some code that resulted in names no longer being rendered on …
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
@shawndcarpenter @chisPmama