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

Branches - Emily and Mira #18

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

Branches - Emily and Mira #18

wants to merge 41 commits into from

Commits on Dec 16, 2019

  1. files for components + listing customers

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

  2. moved api calls to app.js and added movieslist component

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

Commits on Dec 17, 2019

  1. nav, home, and proptypes

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

  2. added styling to tables, added additional customer/movie props

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

  3. nav bar styling

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

  4. minor update - forgot to delete css file we don't need

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

  5. last removal from uneccesary nav css

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

  6. Merge pull request #1 from eaball35/emily-consumer-branch 

    Day 1
    @calopter
    calopter committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    a320502 View commit details
    Browse the repository at this point in the history

  7. changed movies to cards, cleaned up props

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

  8. refactor customer to cards

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

  9. Merge pull request #2 from eaball35/emily-consumer-branch 

    refactor to cards
    @calopter
    calopter committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    ad68ea3 View commit details
    Browse the repository at this point in the history

  10. select customer and movie, display in checkout

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

  11. conditionally render movie and customer cards in checkout

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

  12. layout css

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

  13. conditional rendering for checkout

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

  14. sticky

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

  15. refactor to functional

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

  16. formatting and props fixes

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

Commits on Dec 18, 2019

  1. added checkout button

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

  2. checkout styling

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

  3. checkout styling

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

  4. error/success message alert

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

  5. fixed warnings, imports, prop types

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

  6. Merge pull request #3 from eaball35/checkout 

    Checkout
    @calopter
    calopter committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    63a2b0e View commit details
    Browse the repository at this point in the history

  7. create search component and route

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

  8. basic search functionality

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

  9. Merge branch 'master' into search

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

  10. add movie to library

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

  11. messages on adding to lib

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

  12. reset messages on timer

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

  13. remove selected from checkout

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

  14. check for duplicates in lib when adding

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

  15. fix button text for search

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

  16. Merge pull request #4 from eaball35/search 

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

Commits on Dec 19, 2019

  1. css styling

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

  2. updated home

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

  3. styling:

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

Commits on Dec 20, 2019

  1. Merge pull request #5 from eaball35/wed-styling 

    Wed styling
    @calopter
    calopter committed Dec 20, 2019
    Configuration menu
    Copy the full SHA
    a20ef58 View commit details
    Browse the repository at this point in the history

  2. remove extra click listener

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

  3. added links and moved router around app

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

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

    …umer
    @eaball35
    eaball35 committed Dec 20, 2019
    Configuration menu
    Copy the full SHA
    3b1aa58 View commit details
    Browse the repository at this point in the history