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

Gessica and Stacy --Fire #22

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

Gessica and Stacy --Fire #22

wants to merge 37 commits into from

Commits on Jan 19, 2021

  1. API setup

    @StacyLundquist
    StacyLundquist committed Jan 19, 2021
    Configuration menu
    Copy the full SHA
    5c480d3 View commit details
    Browse the repository at this point in the history

  2. set up react router

    @GeMath18
    GeMath18 committed Jan 19, 2021
    Configuration menu
    Copy the full SHA
    c155952 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/StacyLundquist/video-stor… 

    …e-consumer into master
    @StacyLundquist
    StacyLundquist committed Jan 19, 2021
    Configuration menu
    Copy the full SHA
    d67d742 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2021

  1. Merge branch 'master' of https://github.com/StacyLundquist/video-stor… 

    …e-consumer into master
    @StacyLundquist
    StacyLundquist committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    e561534 View commit details
    Browse the repository at this point in the history

  2. include App links, added CustomerList component

    @StacyLundquist
    StacyLundquist committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    ee53339 View commit details
    Browse the repository at this point in the history

  3. added state on library and created video, still working on search

    @GeMath18
    GeMath18 committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    3ea69b8 View commit details
    Browse the repository at this point in the history

  4. library page shows the list of videos

    @GeMath18
    GeMath18 committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    e05f0a2 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2021

  1. added customer.js and customer css w/bootstrap

    @StacyLundquist
    StacyLundquist committed Jan 21, 2021
    Configuration menu
    Copy the full SHA
    75f7518 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'customer_list-SL' of https://github.com/StacyLundquist/… 

    …video-store-consumer into customer_list-SL
    @StacyLundquist
    StacyLundquist committed Jan 21, 2021
    Configuration menu
    Copy the full SHA
    12b542a View commit details
    Browse the repository at this point in the history

  3. customer list update/cleanup extra lines

    @StacyLundquist
    StacyLundquist committed Jan 21, 2021
    Configuration menu
    Copy the full SHA
    7b1bbc1 View commit details
    Browse the repository at this point in the history

  4. corrected the video component to select video, still working on searc… 

    …h, deleted some files
    @GeMath18
    GeMath18 committed Jan 21, 2021
    Configuration menu
    Copy the full SHA
    6db5b4a View commit details
    Browse the repository at this point in the history

  5. updates before merge

    @StacyLundquist
    StacyLundquist committed Jan 21, 2021
    Configuration menu
    Copy the full SHA
    7393db0 View commit details
    Browse the repository at this point in the history

  6. move a line to the right

    @GeMath18
    GeMath18 committed Jan 21, 2021
    Configuration menu
    Copy the full SHA
    ca38cc0 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into customer_list-SL

    @StacyLundquist
    StacyLundquist authored Jan 21, 2021
    Configuration menu
    Copy the full SHA
    c81c9b6 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #1 from StacyLundquist/customer_list-SL 

    Customer list sl
    @StacyLundquist
    StacyLundquist authored Jan 21, 2021
    Configuration menu
    Copy the full SHA
    3cc5936 View commit details
    Browse the repository at this point in the history

  9. changed Libraryto VideoLibrary on App

    @GeMath18
    GeMath18 committed Jan 21, 2021
    Configuration menu
    Copy the full SHA
    e03db12 View commit details
    Browse the repository at this point in the history

  10. selection of customer is working

    @GeMath18
    GeMath18 committed Jan 21, 2021
    Configuration menu
    Copy the full SHA
    3c2cf71 View commit details
    Browse the repository at this point in the history

  11. small changes to video search

    @GeMath18
    GeMath18 committed Jan 21, 2021
    Configuration menu
    Copy the full SHA
    70b2e2e View commit details
    Browse the repository at this point in the history

  12. searching works locally

    @GeMath18
    GeMath18 committed Jan 21, 2021
    Configuration menu
    Copy the full SHA
    72d3e89 View commit details
    Browse the repository at this point in the history

  13. selectVideo functioning, added proptypes(customerList)

    @StacyLundquist
    StacyLundquist committed Jan 21, 2021
    Configuration menu
    Copy the full SHA
    c7fd05d View commit details
    Browse the repository at this point in the history

  14. Merge pull request #2 from StacyLundquist/SL-selectCustomer 

    selectVideo functioning, added proptypes(customerList)
    @StacyLundquist
    StacyLundquist authored Jan 21, 2021
    Configuration menu
    Copy the full SHA
    eeca51d View commit details
    Browse the repository at this point in the history

  15. changed the button on Search to Add to Library

    @GeMath18
    GeMath18 committed Jan 21, 2021
    Configuration menu
    Copy the full SHA
    1b7ef20 View commit details
    Browse the repository at this point in the history

  16. Sending video as an object, setting state

    @StacyLundquist
    StacyLundquist committed Jan 21, 2021
    Configuration menu
    Copy the full SHA
    55fbf68 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2021

  1. we can add video to library

    @GeMath18
    GeMath18 committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    be0a883 View commit details
    Browse the repository at this point in the history

  2. almost functioning checkout

    @StacyLundquist
    StacyLundquist committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    ddb12dc View commit details
    Browse the repository at this point in the history

  3. code cleanup

    @StacyLundquist
    StacyLundquist committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    f8866cb View commit details
    Browse the repository at this point in the history

  4. code cleanup

    @StacyLundquist
    StacyLundquist committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    42f2889 View commit details
    Browse the repository at this point in the history

  5. trying to get these date params to work

    @StacyLundquist
    StacyLundquist committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    cbf21ab View commit details
    Browse the repository at this point in the history

  6. Merge pull request #3 from StacyLundquist/rental-SL 

    some rental code - non functioning checkout
    @StacyLundquist
    StacyLundquist authored Jan 22, 2021
    Configuration menu
    Copy the full SHA
    23b1dfc View commit details
    Browse the repository at this point in the history

  7. trying Kareha's idea

    @StacyLundquist
    StacyLundquist committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    53f35aa View commit details
    Browse the repository at this point in the history

  8. checkout functionality works

    @GeMath18
    GeMath18 committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    44f5734 View commit details
    Browse the repository at this point in the history

  9. quotes to make the dates work

    @StacyLundquist
    StacyLundquist committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    edba983 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' of https://github.com/StacyLundquist/video-stor… 

    …e-consumer into master
    @StacyLundquist
    StacyLundquist committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    4e3eea9 View commit details
    Browse the repository at this point in the history

  11. some styling

    @StacyLundquist
    StacyLundquist committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    a64d901 View commit details
    Browse the repository at this point in the history

  12. organizing library, not there yet

    @GeMath18
    GeMath18 committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    b196fc9 View commit details
    Browse the repository at this point in the history

  13. merge conflict

    @GeMath18
    GeMath18 committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    4cb7c26 View commit details
    Browse the repository at this point in the history

  14. arranged videos on library

    @GeMath18
    GeMath18 committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    689cab8 View commit details
    Browse the repository at this point in the history