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

Mod 3 BE Wk 1 Project Sage Skaff and Annie Pulzone #189

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

Mod 3 BE Wk 1 Project Sage Skaff and Annie Pulzone #189

wants to merge 76 commits into from

Conversation

ajpulzone
Copy link

Pull request for project submission. AJP

ajpulzone and others added 30 commits November 28, 2022 18:00
@ajpulzone
Added orderly gem
ce6ca59
@ajpulzone
Added coverage to gitignore file
70caa31
@ajpulzone
Created databases and schema
ce6a81d
@ajpulzone
Add shoulda-matchers gem
90fe33d
@ajpulzone
Add tests and relationships for users, viewing parties and user viewi…
6c74fc7 
…ng parties
@ajpulzone
Added user, viewing party and user party classes with validations
0618810
@ajpulzone
Resolved rubocop offenses
d8157ab
@ajpulzone
Create pull_request_template.md
83be31c
@ajpulzone
Create pull request document
ac7cfd3 
Accidentally committed directly to main with pull request template . Would like to review with Sage/make changes prior to making this our default pull request template. AJP
@ajpulzone
Add additional validations to users and viewing parties
3edbba3
@samiraskaff
Merge pull request #1 from ajpulzone/ajpulzone_pull_request_template
8d4bfff 
Create pull request document
@samiraskaff
Merge pull request #2 from ajpulzone/validations
c296904 
Initial Set Up/Validations/Gems Pull Request
@samiraskaff
Add landing page
eecaaa4 
Co-authored-by: Annie Pulzone ajpulzone@gmail.com
@ajpulzone
Added partial for Home link and Viewing Party Title
7e2c1da
@ajpulzone
Refactored testing/routes and updated view text for landing page
0aef1ea
@samiraskaff
Adds tests for users dashboard page
8077b1d
@samiraskaff
Add users dashboard page
c22e260
@ajpulzone
Add flash message authorization
a1beec2
@ajpulzone
Add flash message code body
daf19e8
@ajpulzone
Add functionality to add new user and associated testing/views
e772502
@ajpulzone
Added flash message errors for sad path testing for creating a new us…
bae3ee1 
…er, that are applicable to the specific reason the user could not be created
@ajpulzone
Added testing for dashboard that should be on new users page
b43339b
@ajpulzone
Added the Home button and Viewing Party as a global view rendering so…
3376e1c 
… they will show up on any new page created
@samiraskaff
Update user name display test; Add test for global rendering
747cdc5
@ajpulzone
Merge pull request #4 from ajpulzone/feature_dashboard_page
94986ef 
Feature dashboard page

Changes made, will merge with main. AJP
@ajpulzone
Resolve merge conflicts
0ba0c2c
@ajpulzone
Updated test to say home link instead of home button
254babc
@samiraskaff
Merge pull request #5 from ajpulzone/user_registration
16b5c6e 
User registration
@samiraskaff
Update landing page controller, routes, and test for discover movies …
e6accfe 
…button
@samiraskaff
Add movies controller, discover view; Update dashboard dicover movies…
beb5d8c 
… button
samiraskaff and others added 30 commits December 2, 2022 07:55
@samiraskaff
Add test for cast members on movie details page
fc55113
@samiraskaff
Add cast members to movie details page
9c38276
@ajpulzone
Added API service/facade for obtaining a movie reviews, wrote tests a…
fd33a29 
…nd created partial form for movie show page
@ajpulzone
Resolve merge conflicts
9463b33
@ajpulzone
Resolve merge conflicts
5469933
@ajpulzone
Merge pull request #9 from ajpulzone/cast_members
102aef6 
Cast members & Reviews
Resolved merge conflicts locally, discussed code in real time.

Will approve merge request. AJP
@samiraskaff
Add runtime to movie attributes test
65e8dc9
@samiraskaff
Add runtime to movie details page
906653b
@samiraskaff
Add title, description, vote average, and total review count to movie…
e42cdb0 
… details attributes test
@samiraskaff
Add movie attributes to movie show page
1b10a86
@samiraskaff
Add genres to movie attributes test
4f4c51a
@samiraskaff
Add genres to movie details page
89bcd2f
@ajpulzone
Merge pull request #10 from ajpulzone/movie_details
47a746b 
Movie details

Reviewed code, no changes needed. Will merge request. AJP
@ajpulzone
WIP: Viewing Party New Page
6327b45
@ajpulzone
WIP: new viewing party page
d30d857
@samiraskaff
Add test for new viewing party button
19d13f3
@samiraskaff
Add button to create new user viewing party
f7dd108
@samiraskaff
Add test for button to return to the discover page
827312d
@samiraskaff
Add button to return to the discover page
309db53
@ajpulzone
Removed status from viewing parties and added it to userviewingparties
8759b30
@samiraskaff
Update formatting
3e1b3d8
@samiraskaff
Resolve merge conflicts
76fe7e1
@ajpulzone
Minor changes/refactoring
4d2bd22
@samiraskaff
Merge branch 'main' into new_viewing_party
9ad53b1
@samiraskaff
Merge pull request #11 from ajpulzone/new_viewing_party
1be4bb2 
New viewing party
@ajpulzone
WIP viewing party instantiation
d6f9384
@samiraskaff
Merge pull request #12 from ajpulzone/new_viewing_party2
ff33873 
WIP viewing party instantiation
@samiraskaff
Resolve merge conflicts
9c06941
@ajpulzone
Initial commit, completed US 3
d79cb53
@ajpulzone
Merge pull request #13 from ajpulzone/adding_authentication
02b5128 
Initial commit, completed US 3
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
@ajpulzone @samiraskaff