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

Leaves - Ga-Young, Bri #26

Open
wants to merge 42 commits into
base: master
Choose a base branch
from
Open

Leaves - Ga-Young, Bri #26

wants to merge 42 commits into from

Commits on Dec 16, 2019

  1. added react router

    @gyjin
    gyjin committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    f13ec94 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2019

  1. api call to external api hardcoded

    @brilatimer
    brilatimer committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    da917ad View commit details
    Browse the repository at this point in the history

  2. movieform created

    @brilatimer
    brilatimer committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    2d2d907 View commit details
    Browse the repository at this point in the history

  3. movies component created

    @brilatimer
    brilatimer committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    fde3ac6 View commit details
    Browse the repository at this point in the history

  4. added customercollection and customer components

    @gyjin
    gyjin committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    e668cba View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2019

  1. search bar created, has state

    @brilatimer
    brilatimer committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    9fe4501 View commit details
    Browse the repository at this point in the history

  2. added ability to select a customer and save it in a state in customer… 

    …collection
    @gyjin
    gyjin committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    c006099 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1 from gyjin/customer-page 

    Customer page
    @gyjin
    gyjin authored Dec 18, 2019
    Configuration menu
    Copy the full SHA
    4a20d5a View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into movie_library

    @gyjin
    gyjin authored Dec 18, 2019
    Configuration menu
    Copy the full SHA
    59f2305 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #2 from gyjin/movie_library 

    Movie library
    @gyjin
    gyjin authored Dec 18, 2019
    Configuration menu
    Copy the full SHA
    cb3c5cc View commit details
    Browse the repository at this point in the history

  6. search for movies button on search page

    @brilatimer
    brilatimer committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    21cf96f View commit details
    Browse the repository at this point in the history

  7. able to pass selected customer back to app component

    @gyjin
    gyjin committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    ebdcb19 View commit details
    Browse the repository at this point in the history

  8. able to select customer and show it persistently on app

    @gyjin
    gyjin committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    7095902 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #3 from gyjin/customer-page 

    Customer page #2
    @gyjin
    gyjin authored Dec 18, 2019
    Configuration menu
    Copy the full SHA
    7af0594 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' into search

    @brilatimer
    brilatimer committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    15bce43 View commit details
    Browse the repository at this point in the history

  11. search calls api, produces text results

    @brilatimer
    brilatimer committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    686aa3a View commit details
    Browse the repository at this point in the history

  12. search results have id, overview, release date, title

    @brilatimer
    brilatimer committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    111aad8 View commit details
    Browse the repository at this point in the history

  13. added ability to see all movies and select one

    @gyjin
    gyjin committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    a474d16 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #4 from gyjin/movie-page 

    added ability to see all movies and select one
    @gyjin
    gyjin authored Dec 18, 2019
    Configuration menu
    Copy the full SHA
    742e888 View commit details
    Browse the repository at this point in the history

  15. Merge branch 'master' into search

    @gyjin
    gyjin authored Dec 18, 2019
    Configuration menu
    Copy the full SHA
    654d584 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #5 from gyjin/search 

    Search
    @gyjin
    gyjin authored Dec 18, 2019
    Configuration menu
    Copy the full SHA
    4d9c66d View commit details
    Browse the repository at this point in the history

  17. added feature to see overdue rentals

    @gyjin
    gyjin committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    216817d View commit details
    Browse the repository at this point in the history

  18. added function to see overdue rentals

    @gyjin
    gyjin committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    a1317ef View commit details
    Browse the repository at this point in the history

  19. Merge pull request #6 from gyjin/rental 

    can see overdue rentals
    @gyjin
    gyjin authored Dec 18, 2019
    Configuration menu
    Copy the full SHA
    9c0e4ca View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2019

  1. selected movie from Search will appear in library

    @brilatimer
    brilatimer committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    90735e8 View commit details
    Browse the repository at this point in the history

  2. added error messages for making a new rental

    @gyjin
    gyjin committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    5d09f96 View commit details
    Browse the repository at this point in the history

  3. added error message for making a new rental

    @gyjin
    gyjin committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    0928e98 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #7 from gyjin/selectmovie 

    selected movie from Search will appear in library
    @gyjin
    gyjin authored Dec 19, 2019
    Configuration menu
    Copy the full SHA
    19ef75f View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into rental

    @gyjin
    gyjin authored Dec 19, 2019
    Configuration menu
    Copy the full SHA
    91be9b1 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #8 from gyjin/rental 

    error messages for making a new rental
    @gyjin
    gyjin authored Dec 19, 2019
    Configuration menu
    Copy the full SHA
    f467387 View commit details
    Browse the repository at this point in the history

  7. nav bar is in place, it is purple?

    @brilatimer
    brilatimer committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    e19dce7 View commit details
    Browse the repository at this point in the history

  8. fixed curly brace

    @gyjin
    gyjin committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    e024625 View commit details
    Browse the repository at this point in the history

  9. added ability to see overdue rentals and make a new rental

    @gyjin
    gyjin committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    219c48b View commit details
    Browse the repository at this point in the history

  10. Merge pull request #9 from gyjin/rental 

    added ability to see overdue rentals and make a new rental
    @gyjin
    gyjin authored Dec 19, 2019
    Configuration menu
    Copy the full SHA
    24b155c View commit details
    Browse the repository at this point in the history

  11. Merge pull request #10 from gyjin/navstyle 

    nav bar is in place, it is purple?
    @gyjin
    gyjin authored Dec 19, 2019
    Configuration menu
    Copy the full SHA
    f1d130b View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2019

  1. styling for search and home page done

    @brilatimer
    brilatimer committed Dec 20, 2019
    Configuration menu
    Copy the full SHA
    a4c2d6e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #11 from gyjin/style 

    styling for search and home page done
    @gyjin
    gyjin authored Dec 20, 2019
    Configuration menu
    Copy the full SHA
    8504186 View commit details
    Browse the repository at this point in the history

  3. added styles to selected customer and movie, rentals, and moved custo… 

    …mer state to app
    @gyjin
    gyjin committed Dec 20, 2019
    Configuration menu
    Copy the full SHA
    97b0b35 View commit details
    Browse the repository at this point in the history

  4. added table to customers

    @gyjin
    gyjin committed Dec 20, 2019
    Configuration menu
    Copy the full SHA
    1059978 View commit details
    Browse the repository at this point in the history

  5. addd table to movies

    @gyjin
    gyjin committed Dec 20, 2019
    Configuration menu
    Copy the full SHA
    4f85700 View commit details
    Browse the repository at this point in the history

  6. added table to rentals, cleaned up code, added proptypes

    @gyjin
    gyjin committed Dec 20, 2019
    Configuration menu
    Copy the full SHA
    9fbfcd3 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #12 from gyjin/styling-lists 

    Styling lists
    @gyjin
    gyjin authored Dec 20, 2019
    Configuration menu
    Copy the full SHA
    0c7a075 View commit details
    Browse the repository at this point in the history