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

Joe King / Bryan Flanagan Pair Project PR #204

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

Joe King / Bryan Flanagan Pair Project PR #204

wants to merge 90 commits into from

Commits on Jan 30, 2023

  1. Create pull_request_template.md 

    Created PR template - Created via zoom with both JK & BF
    @bflanagan138
    bflanagan138 authored Jan 30, 2023
    Configuration menu
    Copy the full SHA
    1f5d653 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from bflanagan138/bflanagan138-patch-1 

    Create pull_request_template.md
    @this-is-joeking
    this-is-joeking authored Jan 30, 2023
    Configuration menu
    Copy the full SHA
    33894fd View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2023

  1. feat: Create migrations:

    @bflanagan138
    bflanagan138 committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    bb7aca1 View commit details
    Browse the repository at this point in the history

  2. refactor: Try to change name for genres_movies, didn't work

    @bflanagan138
    bflanagan138 committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    23dc481 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #14 from bflanagan138/bf_migrations 

    Bf migrations
    @this-is-joeking
    this-is-joeking authored Jan 31, 2023
    Configuration menu
    Copy the full SHA
    7ad0fd7 View commit details
    Browse the repository at this point in the history

  4. Refactor: Remove tables from db that will come from TMDB API

    @this-is-joeking
    this-is-joeking committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    a6ee4cb View commit details
    Browse the repository at this point in the history

  5. Merge pull request #16 from bflanagan138/jk_migrations 

    Refactor: Remove tables from db that will come from TMDB API
    @bflanagan138
    bflanagan138 authored Jan 31, 2023
    Configuration menu
    Copy the full SHA
    75b74c1 View commit details
    Browse the repository at this point in the history

  6. feat: Add landing page with button to create a new user

    @this-is-joeking
    this-is-joeking committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    7afe57c View commit details
    Browse the repository at this point in the history

  7. Add coverage directory to .gitignore

    @this-is-joeking
    this-is-joeking committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    400d1d0 View commit details
    Browse the repository at this point in the history

  8. feat: Add model associations/validations and associated tests

    @this-is-joeking
    this-is-joeking committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    1cf688d View commit details
    Browse the repository at this point in the history

  9. refactor: Adjusted column names for database to align with best pract… 

    …ices
    @this-is-joeking
    this-is-joeking committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    3e212db View commit details
    Browse the repository at this point in the history

  10. feat: Complete landing page

    @this-is-joeking
    this-is-joeking committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    3eb2c0f View commit details
    Browse the repository at this point in the history

  11. refactor: Add styling to center content and add heading to all pages

    @this-is-joeking
    this-is-joeking committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    6d0229e View commit details
    Browse the repository at this point in the history

  12. Merge pull request #17 from bflanagan138/jk_landing_page 

    Jk landing page
    @bflanagan138
    bflanagan138 authored Jan 31, 2023
    Configuration menu
    Copy the full SHA
    3563fa4 View commit details
    Browse the repository at this point in the history

  13. feat: Create user registration page with tests

    @bflanagan138
    bflanagan138 committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    9d92045 View commit details
    Browse the repository at this point in the history

  14. refactor: Add format cues to users new view

    @bflanagan138
    bflanagan138 committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    135fb95 View commit details
    Browse the repository at this point in the history

  15. feat: Create user show page

    @bflanagan138
    bflanagan138 committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    6c118b2 View commit details
    Browse the repository at this point in the history

  16. refactor: Update test to check sad path

    @bflanagan138
    bflanagan138 committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    84e61e2 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2023

  1. refactor: update welcome index view page with correct path

    @bflanagan138
    bflanagan138 committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    9f7f47a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #18 from bflanagan138/bf_user_registration_page 

    Bf user registration page
    @this-is-joeking
    this-is-joeking authored Feb 1, 2023
    Configuration menu
    Copy the full SHA
    5402906 View commit details
    Browse the repository at this point in the history

  3. feat: Add content to user dashboard and routes for discover

    @this-is-joeking
    this-is-joeking committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    d70cc35 View commit details
    Browse the repository at this point in the history

  4. feat: Add user model method to find viewing party user given the view… 

    …ing party
    @this-is-joeking
    this-is-joeking committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    3762c80 View commit details
    Browse the repository at this point in the history

  5. feat: Add button to discover movies and basic list of viewing parties

    @this-is-joeking
    this-is-joeking committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    2caec86 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #21 from bflanagan138/jk_user_dashboard 

    Jk user dashboard
    @bflanagan138
    bflanagan138 authored Feb 1, 2023
    Configuration menu
    Copy the full SHA
    49aca98 View commit details
    Browse the repository at this point in the history

  7. refactor: Format user show page to add border around viewing parties … 

    …to match wireframe example
    @bflanagan138
    bflanagan138 committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    d402c95 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #22 from bflanagan138/bf_format_user_show 

    refactor: Format user show page to add border around viewing parties …
    @this-is-joeking
    this-is-joeking authored Feb 1, 2023
    Configuration menu
    Copy the full SHA
    33fa054 View commit details
    Browse the repository at this point in the history

  9. feat: create user discover movies page with tests

    @bflanagan138
    bflanagan138 committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    3a51b65 View commit details
    Browse the repository at this point in the history

  10. feat: add Find Top Rated Movies button to discover index page, incorr… 

    …ect path
    @bflanagan138
    bflanagan138 committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    5b5903f View commit details
    Browse the repository at this point in the history

  11. Merge pull request #23 from bflanagan138/bf_dashboard_discover_movies 

    Bf dashboard discover movies
    @this-is-joeking
    this-is-joeking authored Feb 1, 2023
    Configuration menu
    Copy the full SHA
    a053ff2 View commit details
    Browse the repository at this point in the history

  12. refactor: Discover Movies page to include button to find top rated mo… 

    …vies with working path and search field for finding movies by keyword
    @this-is-joeking
    this-is-joeking committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    1d17b32 View commit details
    Browse the repository at this point in the history

  13. Add gems faraday and figarao

    @this-is-joeking
    this-is-joeking committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    25b2c58 View commit details
    Browse the repository at this point in the history

  14. feat: Add movies controller with call to TMDB API so the movie result… 

    …s page will populate
    @this-is-joeking
    this-is-joeking committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    b08ae71 View commit details
    Browse the repository at this point in the history

  15. refactor: Remove save and open page and extra blank lines

    @this-is-joeking
    this-is-joeking committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    496c328 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #24 from bflanagan138/jk_discover_movies_page 

    Jk discover movies page
    @bflanagan138
    bflanagan138 authored Feb 1, 2023
    Configuration menu
    Copy the full SHA
    0cc0dca View commit details
    Browse the repository at this point in the history

  17. test: Add webmock gem and adjust tests to use webmock instead of call… 

    …ing API, created json fixture files
    @this-is-joeking
    this-is-joeking committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    9ce020b View commit details
    Browse the repository at this point in the history

  18. feat: Add link back to discover page on movie results page

    @this-is-joeking
    this-is-joeking committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    8bb7265 View commit details
    Browse the repository at this point in the history

  19. refactor: Simplify the movie controller #index

    @this-is-joeking
    this-is-joeking committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    3d766fb View commit details
    Browse the repository at this point in the history

  20. feat: Add links to each movies details page on the movie results page

    @this-is-joeking
    this-is-joeking committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    10da32d View commit details
    Browse the repository at this point in the history

  21. Merge pull request #25 from bflanagan138/jk_add_webmock 

    Jk add webmock
    @bflanagan138
    bflanagan138 authored Feb 1, 2023
    Configuration menu
    Copy the full SHA
    3c7fc37 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2023

  1. test: Add fixture files for testing with webmock

    @this-is-joeking
    this-is-joeking committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    c4ee387 View commit details
    Browse the repository at this point in the history

  2. feat: Add movie details page and associated tests

    @this-is-joeking
    this-is-joeking committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    f3f92e0 View commit details
    Browse the repository at this point in the history

  3. refactor: Controller and view to make the data from API call POROS

    @this-is-joeking
    this-is-joeking committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    ce069d6 View commit details
    Browse the repository at this point in the history

  4. test: Add tests for movie class

    @this-is-joeking
    this-is-joeking committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    185c61c View commit details
    Browse the repository at this point in the history

  5. test: the poros actor class

    @this-is-joeking
    this-is-joeking committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    14d3b14 View commit details
    Browse the repository at this point in the history

  6. test: the review poros class

    @this-is-joeking
    this-is-joeking committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    b5fb59e View commit details
    Browse the repository at this point in the history

  7. refactor: Remove all mentions of API key

    @this-is-joeking
    this-is-joeking committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    55b0107 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #27 from bflanagan138/jk_movie_details 

    Jk movie details
    @bflanagan138
    bflanagan138 authored Feb 2, 2023
    Configuration menu
    Copy the full SHA
    8020324 View commit details
    Browse the repository at this point in the history

  9. refactor: move API call from movies controller to movie service

    @bflanagan138
    bflanagan138 committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    c47619e View commit details
    Browse the repository at this point in the history

  10. refactor: sort movie api inside movie_service

    @bflanagan138
    bflanagan138 committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    89ff9f2 View commit details
    Browse the repository at this point in the history

  11. refactor: create movie facade, move actor instantiation from movie se… 

    …rvice to movie facade:
    @bflanagan138
    bflanagan138 committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    1317b61 View commit details
    Browse the repository at this point in the history

  12. refactor: move movie instantiation from movie service to movie facade

    @bflanagan138
    bflanagan138 committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    40eecdd View commit details
    Browse the repository at this point in the history

  13. refactor: move reviews instantiation from movie service to movie facade

    @bflanagan138
    bflanagan138 committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    718d2bd View commit details
    Browse the repository at this point in the history

  14. refactor: move index movies instantiation from movie service to movie… 

    … facade
    @bflanagan138
    bflanagan138 committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    d7a6fd5 View commit details
    Browse the repository at this point in the history

  15. refactor: remove old comment from movies controller

    @bflanagan138
    bflanagan138 committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    90ea53d View commit details
    Browse the repository at this point in the history

  16. test: create tests for movie service

    @bflanagan138
    bflanagan138 committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    cfcaa59 View commit details
    Browse the repository at this point in the history

  17. test: create actor tests for movie service

    @bflanagan138
    bflanagan138 committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    751a682 View commit details
    Browse the repository at this point in the history

  18. test: add top rated movies tests for movie service

    @bflanagan138
    bflanagan138 committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    10e7b51 View commit details
    Browse the repository at this point in the history

  19. test: create test for search movies in movie service

    @bflanagan138
    bflanagan138 committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    7a12cde View commit details
    Browse the repository at this point in the history

  20. Merge pull request #28 from bflanagan138/bf_create_services 

    Bf create services
    @this-is-joeking
    this-is-joeking authored Feb 2, 2023
    Configuration menu
    Copy the full SHA
    beb1d02 View commit details
    Browse the repository at this point in the history

  21. test: Add test for movie facade #movie_details

    @this-is-joeking
    this-is-joeking committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    7c4c1c7 View commit details
    Browse the repository at this point in the history

  22. test: Add tests for all MovieFacade methods

    @this-is-joeking
    this-is-joeking committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    7665a52 View commit details
    Browse the repository at this point in the history

  23. linting: ran rubocops linters

    @this-is-joeking
    this-is-joeking committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    4aceb14 View commit details
    Browse the repository at this point in the history

  24. feat: Add initial form for creating viewing_party

    @this-is-joeking
    this-is-joeking committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    3bad24c View commit details
    Browse the repository at this point in the history

  25. feat: Add option to invite users to new viewing party form

    @this-is-joeking
    this-is-joeking committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    cbc7aae View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2023

  1. feat: Create #name_and_email for users for proper display in view

    @this-is-joeking
    this-is-joeking committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    22b5208 View commit details
    Browse the repository at this point in the history

  2. feat: Complete the new viewing party form

    @this-is-joeking
    this-is-joeking committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    174947c View commit details
    Browse the repository at this point in the history

  3. Merge pull request #29 from bflanagan138/jk_facade_tests 

    Jk facade tests
    @bflanagan138
    bflanagan138 authored Feb 3, 2023
    Configuration menu
    Copy the full SHA
    fcdfc1f View commit details
    Browse the repository at this point in the history

  4. feat: Add movie poster and link to movie page to viewing parties

    @bflanagan138
    bflanagan138 committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    52196b8 View commit details
    Browse the repository at this point in the history

  5. feat: Add user guests to dashboard viewing party tiles

    @bflanagan138
    bflanagan138 committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    4e63045 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #30 from bflanagan138/bf_dashboard_viewing_parties 

    Bf dashboard viewing parties
    @this-is-joeking
    this-is-joeking authored Feb 3, 2023
    Configuration menu
    Copy the full SHA
    5e7d0ed View commit details
    Browse the repository at this point in the history

  7. feat: Created #all_other_users in user class to move this data logic … 

    …out of vp controller
    @this-is-joeking
    this-is-joeking committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    49e9d1c View commit details
    Browse the repository at this point in the history

  8. refactor: Added additional tests and moved creation of vp-users to ha… 

    …ppen alongside creation of viewing party
    @this-is-joeking
    this-is-joeking committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    7a41ad3 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #31 from bflanagan138/jk_refactory 

    Jk refactory
    @bflanagan138
    bflanagan138 authored Feb 3, 2023
    Configuration menu
    Copy the full SHA
    12b670c View commit details
    Browse the repository at this point in the history

  10. test: Add sad path test for new viewing party page

    @this-is-joeking
    this-is-joeking committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    b58aaa2 View commit details
    Browse the repository at this point in the history

  11. refactor/test: create poros test for runtime_calc

    @bflanagan138
    bflanagan138 committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    eb91d7c View commit details
    Browse the repository at this point in the history

  12. refactor/feat: Add runtime_calc movie method

    @bflanagan138
    bflanagan138 committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    cb83c00 View commit details
    Browse the repository at this point in the history

  13. refactor: Make movie_runtime variable in runtime_calc method

    @bflanagan138
    bflanagan138 committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    0726f00 View commit details
    Browse the repository at this point in the history

  14. refactor: Refactor runtime_calc method

    @bflanagan138
    bflanagan138 committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    3cc6235 View commit details
    Browse the repository at this point in the history

  15. style: Add home icon next to link, and change banner font to helvetica

    @this-is-joeking
    this-is-joeking committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    eec7802 View commit details
    Browse the repository at this point in the history

  16. refactor: Remove save and open page

    @bflanagan138
    bflanagan138 committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    701ff4b View commit details
    Browse the repository at this point in the history

  17. Merge pull request #33 from bflanagan138/bf_runtime_refactor 

    Bf runtime refactor
    @this-is-joeking
    this-is-joeking authored Feb 3, 2023
    Configuration menu
    Copy the full SHA
    4af3467 View commit details
    Browse the repository at this point in the history

  18. Merge pull request #34 from bflanagan138/jk_final_touches 

    Jk final touches
    @bflanagan138
    bflanagan138 authored Feb 3, 2023
    Configuration menu
    Copy the full SHA
    83efee0 View commit details
    Browse the repository at this point in the history

  19. feat: Add bootstrap gem

    @this-is-joeking
    this-is-joeking committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    1f3330d View commit details
    Browse the repository at this point in the history

  20. Merge pull request #35 from bflanagan138/jk_add_bootstrap 

    feat: Add bootstrap gem
    @bflanagan138
    bflanagan138 authored Feb 3, 2023
    Configuration menu
    Copy the full SHA
    b0ae698 View commit details
    Browse the repository at this point in the history

  21. feat: Populate seed file

    @bflanagan138
    bflanagan138 committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    4760f33 View commit details
    Browse the repository at this point in the history

  22. Merge pull request #36 from bflanagan138/bf_create_seeds 

    feat: Populate seed file
    @this-is-joeking
    this-is-joeking authored Feb 3, 2023
    Configuration menu
    Copy the full SHA
    27b1972 View commit details
    Browse the repository at this point in the history

  23. refactor: Format viewing party page to list invitees on separate lines

    @bflanagan138
    bflanagan138 committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    fa9d1a2 View commit details
    Browse the repository at this point in the history

  24. Merge pull request #37 from bflanagan138/bf_vp_checkbox 

    refactor: Format viewing party page to list invitees on separate lines
    @this-is-joeking
    this-is-joeking authored Feb 3, 2023
    Configuration menu
    Copy the full SHA
    779c65a View commit details
    Browse the repository at this point in the history

  25. refactor: Rubocop linting and style corrections

    @this-is-joeking
    this-is-joeking committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    7f9ef64 View commit details
    Browse the repository at this point in the history

  26. Merge pull request #38 from bflanagan138/jk_rubocop_linting 

    refactor: Rubocop linting and style corrections
    @bflanagan138
    bflanagan138 authored Feb 3, 2023
    Configuration menu
    Copy the full SHA
    ea1dc8e View commit details
    Browse the repository at this point in the history