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

Div & Liz #19

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

Div & Liz #19

wants to merge 59 commits into from

Commits on Dec 17, 2018

  1. added CustomerList and Customer components

    @elle-johnnie
    elle-johnnie committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    7305ad5 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2018

  1. browser router

    @elle-johnnie
    elle-johnnie committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    cfb7f2f View commit details
    Browse the repository at this point in the history

  2. merge conflicts resolved

    @elle-johnnie
    elle-johnnie committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    6f265ad View commit details
    Browse the repository at this point in the history

  3. customers rendering

    @elle-johnnie
    elle-johnnie committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    5ccd3b4 View commit details
    Browse the repository at this point in the history

  4. customer selection

    @elle-johnnie
    elle-johnnie committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    56264b5 View commit details
    Browse the repository at this point in the history

  5. populate customer selection

    @elle-johnnie
    elle-johnnie committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    87f625d View commit details
    Browse the repository at this point in the history

  6. customer selection passed back to parent app

    @elle-johnnie
    elle-johnnie committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    c1e3b9a View commit details
    Browse the repository at this point in the history

  7. customer component fixes

    @elle-johnnie
    elle-johnnie committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    539afae View commit details
    Browse the repository at this point in the history

  8. created structur for cofirm rental event

    @elle-johnnie
    elle-johnnie committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    8768d23 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2018

  1. navbar css

    @elle-johnnie
    elle-johnnie committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    98c7ffc View commit details
    Browse the repository at this point in the history

  2. gitignore

    @elle-johnnie
    elle-johnnie committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    745f71b View commit details
    Browse the repository at this point in the history

  3. fixed merge conflict

    @elle-johnnie
    elle-johnnie committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    2cbb05e View commit details
    Browse the repository at this point in the history

  4. fixed .idea settings

    @elle-johnnie
    elle-johnnie committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    7e5297b View commit details
    Browse the repository at this point in the history

  5. ignore this commit

    @elle-johnnie
    elle-johnnie committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    1cf2a87 View commit details
    Browse the repository at this point in the history

  6. ignore this commit2

    @elle-johnnie
    elle-johnnie committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    bbd4fd3 View commit details
    Browse the repository at this point in the history

  7. Working copy for Movies

    @Naltrexone
    Naltrexone committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    f7358db View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' of https://github.com/elle-johnnie/video-store-… 

    …consumer
    @Naltrexone
    Naltrexone committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    dac6e8e View commit details
    Browse the repository at this point in the history

  9. Search.js - transition stage

    @Naltrexone
    Naltrexone committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    322c9ef View commit details
    Browse the repository at this point in the history

  10. Revert "ignore this commit2" 

    This reverts commit bbd4fd3.
    @Naltrexone
    Naltrexone committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    0c92b9e View commit details
    Browse the repository at this point in the history

  11. Revert "Revert "ignore this commit2"" 

    This reverts commit 0c92b9e.
    @Naltrexone
    Naltrexone committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    dff3842 View commit details
    Browse the repository at this point in the history

  12. Revert "Search.js - transition stage" 

    This reverts commit 322c9ef.
    @Naltrexone
    Naltrexone committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    ecbc081 View commit details
    Browse the repository at this point in the history

  13. Merge completed except App.js

    @Naltrexone
    Naltrexone committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    76eafe8 View commit details
    Browse the repository at this point in the history

  14. Basic page setup.. Movies not showing up

    @Naltrexone
    Naltrexone committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    f3b1ecc View commit details
    Browse the repository at this point in the history

  15. fixed library render

    @elle-johnnie
    elle-johnnie committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    41595c5 View commit details
    Browse the repository at this point in the history

  16. rental created with updated movies out count

    @elle-johnnie
    elle-johnnie committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    6a50973 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2018

  1. checked out rentals component added

    @elle-johnnie
    elle-johnnie committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    7eb9795 View commit details
    Browse the repository at this point in the history

  2. Add a movie function works

    @Naltrexone
    Naltrexone committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    b8c70a5 View commit details
    Browse the repository at this point in the history

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

    …consumer

# Conflicts:
#	src/components/MovieResult.js
    @Naltrexone
    Naltrexone committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    568ccb7 View commit details
    Browse the repository at this point in the history

  4. parsed out componentdidmount data retrievals to fetch data functions

    @elle-johnnie
    elle-johnnie committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    1c54dd3 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/elle-johnnie/video-store-… 

    …consumer
    @elle-johnnie
    elle-johnnie committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    7032a64 View commit details
    Browse the repository at this point in the history

  6. functionality to show overdue rentals and return rentals

    @elle-johnnie
    elle-johnnie committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    077a94b View commit details
    Browse the repository at this point in the history

  7. overdue render function

    @elle-johnnie
    elle-johnnie committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    6d4a23c View commit details
    Browse the repository at this point in the history

  8. fixes to navbar and styling

    @elle-johnnie
    elle-johnnie committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    79105ce View commit details
    Browse the repository at this point in the history

  9. movie info on hover popover

    @elle-johnnie
    elle-johnnie committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    d311b1d View commit details
    Browse the repository at this point in the history

  10. settings file

    @elle-johnnie
    elle-johnnie committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    5bd650d View commit details
    Browse the repository at this point in the history

  11. start with react app on heroku

    @elle-johnnie
    elle-johnnie committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    b6df489 View commit details
    Browse the repository at this point in the history

  12. removed yarn lock to deploy conflicted with npm package json file

    @elle-johnnie
    elle-johnnie committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    ca25e85 View commit details
    Browse the repository at this point in the history

  13. added semicolons to import lines in app.js

    @elle-johnnie
    elle-johnnie committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    51ad7c6 View commit details
    Browse the repository at this point in the history

  14. dealing with Can't resolve './Components/SearchCollection' changed Co… 

    …mponents folder to components
    @elle-johnnie
    elle-johnnie committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    c1ee6be View commit details
    Browse the repository at this point in the history

  15. fixed typo in URL

    @elle-johnnie
    elle-johnnie committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    6e44bd7 View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2018

  1. working on bug in search feature

    @elle-johnnie
    elle-johnnie committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    9eea361 View commit details
    Browse the repository at this point in the history

  2. working on json status error when duplicated movies are added to library

    @elle-johnnie
    elle-johnnie committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    4ec5a99 View commit details
    Browse the repository at this point in the history

  3. favicon added

    @elle-johnnie
    elle-johnnie committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    90d9f04 View commit details
    Browse the repository at this point in the history

  4. search alert message

    @elle-johnnie
    elle-johnnie committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    7b8f8bf View commit details
    Browse the repository at this point in the history

  5. search alert message showing but still not showing detailed error mes… 

    …sage for duplicate movie
    @elle-johnnie
    elle-johnnie committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    35a4b7c View commit details
    Browse the repository at this point in the history

  6. changed styling of alert box

    @elle-johnnie
    elle-johnnie committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    69208e1 View commit details
    Browse the repository at this point in the history

  7. alert box css

    @elle-johnnie
    elle-johnnie committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    7325891 View commit details
    Browse the repository at this point in the history

  8. header bottom padding

    @elle-johnnie
    elle-johnnie committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    720aed2 View commit details
    Browse the repository at this point in the history

  9. catch errors on movie add

    @elle-johnnie
    elle-johnnie committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    c5788d8 View commit details
    Browse the repository at this point in the history

  10. catch errors on movie add

    @elle-johnnie
    elle-johnnie committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    676364d View commit details
    Browse the repository at this point in the history

  11. trying error.errors

    @elle-johnnie
    elle-johnnie committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    f08fb40 View commit details
    Browse the repository at this point in the history

  12. nested errors.message works used for setState in add to library

    @elle-johnnie
    elle-johnnie committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    1a68bef View commit details
    Browse the repository at this point in the history

  13. nevermind nested error message does not work outside of console log

    @elle-johnnie
    elle-johnnie committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    3ca4900 View commit details
    Browse the repository at this point in the history

  14. bugs in status for adding to library

    @elle-johnnie
    elle-johnnie committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    aed20c8 View commit details
    Browse the repository at this point in the history

  15. spinner logo

    @elle-johnnie
    elle-johnnie committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    4374bc1 View commit details
    Browse the repository at this point in the history

  16. spinner logo bug

    @elle-johnnie
    elle-johnnie committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    dbb07e6 View commit details
    Browse the repository at this point in the history

  17. remove spinner

    @elle-johnnie
    elle-johnnie committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    fdf94f9 View commit details
    Browse the repository at this point in the history

  18. info panels css

    @elle-johnnie
    elle-johnnie committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    d983060 View commit details
    Browse the repository at this point in the history

  19. cleaned up messages

    @elle-johnnie
    elle-johnnie committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    c71111a View commit details
    Browse the repository at this point in the history