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

Ports - Kim and Alex #19

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

Ports - Kim and Alex #19

wants to merge 60 commits into from

Commits on Jun 24, 2019

  1. npm install and set-up

    @Kimberly-Fasbender
    Kimberly-Fasbender committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    87431cf View commit details
    Browse the repository at this point in the history

  2. initial setup

    @alexandria7
    alexandria7 committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    afe154a View commit details
    Browse the repository at this point in the history

  3. added Home route and API call

    @Kimberly-Fasbender
    Kimberly-Fasbender committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    e38a29c View commit details
    Browse the repository at this point in the history

  4. added .env file to store API path

    @Kimberly-Fasbender
    Kimberly-Fasbender committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    5887344 View commit details
    Browse the repository at this point in the history

  5. fixed merge conflicts

    @alexandria7
    alexandria7 committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    c22b00c View commit details
    Browse the repository at this point in the history

  6. added customers component and route to it

    @alexandria7
    alexandria7 committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    cb93ee3 View commit details
    Browse the repository at this point in the history

  7. able to push customers as props to Customers component

    @alexandria7
    alexandria7 committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    b8e1056 View commit details
    Browse the repository at this point in the history

  8. Updating componentDidMount to handle multiple get requests and setStates

    @Kimberly-Fasbender
    Kimberly-Fasbender committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    439d957 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2019

  1. added Movies component and Route

    @Kimberly-Fasbender
    Kimberly-Fasbender committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    612c8a3 View commit details
    Browse the repository at this point in the history

  2. updated state for customers using the rails api

    @Kimberly-Fasbender
    Kimberly-Fasbender committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    195ab99 View commit details
    Browse the repository at this point in the history

  3. rendered moviesList props in movies component

    @alexandria7
    alexandria7 committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    571c63b View commit details
    Browse the repository at this point in the history

  4. added Movie component and moved rendering of individual movie there f… 

    …rom Movies
    @alexandria7
    alexandria7 committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    5041f36 View commit details
    Browse the repository at this point in the history

  5. passed callback function down to Movie component to get movie informa… 

    …tion once clicked
    @alexandria7
    alexandria7 committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    9705fb5 View commit details
    Browse the repository at this point in the history

  6. added section to display selected movie

    @alexandria7
    alexandria7 committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    5e159d2 View commit details
    Browse the repository at this point in the history

  7. Added table to customers to CustomerList Component, adding Customer C… 

    …omponent
    @Kimberly-Fasbender
    Kimberly-Fasbender committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    8506e60 View commit details
    Browse the repository at this point in the history

  8. added some styling to the homepage

    @alexandria7
    alexandria7 committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    b08e8ab View commit details
    Browse the repository at this point in the history

  9. added ability to deselect movie once selected for rental

    @alexandria7
    alexandria7 committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    c3da009 View commit details
    Browse the repository at this point in the history

  10. added select and unselect customer functionality

    @Kimberly-Fasbender
    Kimberly-Fasbender committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    b192bf6 View commit details
    Browse the repository at this point in the history

  11. merge conflict resolution

    @Kimberly-Fasbender
    Kimberly-Fasbender committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    e0ef1b7 View commit details
    Browse the repository at this point in the history

  12. updating buttons to have consistent names

    @Kimberly-Fasbender
    Kimberly-Fasbender committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    d0ab1ff View commit details
    Browse the repository at this point in the history

  13. added basic searchMovie component and page

    @alexandria7
    alexandria7 committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    d932197 View commit details
    Browse the repository at this point in the history

  14. added onChangeHandler to set state when search term is entered

    @alexandria7
    alexandria7 committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    fa4b767 View commit details
    Browse the repository at this point in the history

  15. passed search term back up to app in callback function

    @alexandria7
    alexandria7 committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    4f9f204 View commit details
    Browse the repository at this point in the history

  16. updated searchMovie component to print external api GET request results

    @alexandria7
    alexandria7 committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    fe00dbd View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2019

  1. changed searchTerm from null to an empty string

    @alexandria7
    alexandria7 committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    d6f6724 View commit details
    Browse the repository at this point in the history

  2. movied logic of listing movie information down to Movie

    @alexandria7
    alexandria7 committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    46ef8a3 View commit details
    Browse the repository at this point in the history

  3. updating rental functionality to include user messages and clear afte… 

    …r check-out
    @Kimberly-Fasbender
    Kimberly-Fasbender committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    2551410 View commit details
    Browse the repository at this point in the history

  4. merge conflict resolution

    @Kimberly-Fasbender
    Kimberly-Fasbender committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    0f24002 View commit details
    Browse the repository at this point in the history

  5. experimenting with react flash messages

    @Kimberly-Fasbender
    Kimberly-Fasbender committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    79f4e15 View commit details
    Browse the repository at this point in the history

  6. added logic to add searched movie to the library

    @alexandria7
    alexandria7 committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    667742d View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of https://github.com/alexandria7/video-store-c… 

    …onsumer
    @alexandria7
    alexandria7 committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    34094c4 View commit details
    Browse the repository at this point in the history

  8. added functionality for not being able to add the same movie to the l… 

    …ibrary twice.
    @Kimberly-Fasbender
    Kimberly-Fasbender committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    02516d8 View commit details
    Browse the repository at this point in the history

  9. installed bootstrap

    @Kimberly-Fasbender
    Kimberly-Fasbender committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    c509076 View commit details
    Browse the repository at this point in the history

  10. removed comments and unecessary white space

    @alexandria7
    alexandria7 committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    98657c4 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' of https://github.com/alexandria7/video-store-c… 

    …onsumer
    @alexandria7
    alexandria7 committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    addea4d View commit details
    Browse the repository at this point in the history

  12. cleaning up console.logs and basic styling additions

    @Kimberly-Fasbender
    Kimberly-Fasbender committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    ed8e365 View commit details
    Browse the repository at this point in the history

  13. resolved merge conflict

    @Kimberly-Fasbender
    Kimberly-Fasbender committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    6885020 View commit details
    Browse the repository at this point in the history

  14. added proptypes

    @alexandria7
    alexandria7 committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    4ada167 View commit details
    Browse the repository at this point in the history

  15. fixed merge conflict

    @alexandria7
    alexandria7 committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    c68c811 View commit details
    Browse the repository at this point in the history

  16. fixed weird html error

    @alexandria7
    alexandria7 committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    5ea13cb View commit details
    Browse the repository at this point in the history

  17. styled movieList page

    @alexandria7
    alexandria7 committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    b42eca9 View commit details
    Browse the repository at this point in the history

  18. styling for customer table

    @Kimberly-Fasbender
    Kimberly-Fasbender committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    6d43936 View commit details
    Browse the repository at this point in the history

  19. merge conflict resolution

    @Kimberly-Fasbender
    Kimberly-Fasbender committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    acfbca3 View commit details
    Browse the repository at this point in the history

  20. added basic buttons

    @alexandria7
    alexandria7 committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    75ad5b6 View commit details
    Browse the repository at this point in the history

  21. Merge branch 'master' of https://github.com/alexandria7/video-store-c… 

    …onsumer
    @alexandria7
    alexandria7 committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    2584029 View commit details
    Browse the repository at this point in the history

  22. added styling for movie search

    @Kimberly-Fasbender
    Kimberly-Fasbender committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    707f73a View commit details
    Browse the repository at this point in the history

  23. Merge branch 'master' of https://github.com/alexandria7/video-store-c… 

    …onsumer
    @Kimberly-Fasbender
    Kimberly-Fasbender committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    1ec86bf View commit details
    Browse the repository at this point in the history

  24. added styling for nav bar

    @alexandria7
    alexandria7 committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    8fe973b View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2019

  1. added styling to movie displays

    @alexandria7
    alexandria7 committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    9e1da56 View commit details
    Browse the repository at this point in the history

  2. changed styling for already-in-library notif

    @alexandria7
    alexandria7 committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    cee1158 View commit details
    Browse the repository at this point in the history

  3. styled welcome page with vhs page image

    @Kimberly-Fasbender
    Kimberly-Fasbender committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    430c1bc View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/alexandria7/video-store-c… 

    …onsumer
    @Kimberly-Fasbender
    Kimberly-Fasbender committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    dadc6f9 View commit details
    Browse the repository at this point in the history

  5. styling and updating prop types

    @Kimberly-Fasbender
    Kimberly-Fasbender committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    11d3bce View commit details
    Browse the repository at this point in the history

  6. refactored customer table to make it more dry

    @Kimberly-Fasbender
    Kimberly-Fasbender committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    a88f448 View commit details
    Browse the repository at this point in the history

  7. refactored and cleaned up Customer and CustomerList components

    @Kimberly-Fasbender
    Kimberly-Fasbender committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    3079015 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2019

  1. added styling to display of selected movie and customer section

    @alexandria7
    alexandria7 committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    7120c8b View commit details
    Browse the repository at this point in the history

  2. added functionality for alert message timeouts and sending user to th… 

    …e top of the page after click events
    @Kimberly-Fasbender
    Kimberly-Fasbender committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    b05291c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/alexandria7/video-store-c… 

    …onsumer
    @Kimberly-Fasbender
    Kimberly-Fasbender committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    be10697 View commit details
    Browse the repository at this point in the history

  4. added alert message display to view for SearchMovie component

    @Kimberly-Fasbender
    Kimberly-Fasbender committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    1651898 View commit details
    Browse the repository at this point in the history

  5. updated message forwhen loading a movie and refactored state variables

    @Kimberly-Fasbender
    Kimberly-Fasbender committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    8078f47 View commit details
    Browse the repository at this point in the history