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

Anna & Mona - Fire #7

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

Anna & Mona - Fire #7

wants to merge 75 commits into from

Commits on Jan 19, 2021

  1. initial setup

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

  2. created component folderinitial setup for components

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

  3. added react Router

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

Commits on Jan 20, 2021

  1. fixed the switch error and added routes in App

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

  2. listed all videos in the video library

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

  3. Merge pull request #1 from MonaRahmani/MovieLibrary 

    listed all videos in the video library
    @MonaRahmani
    MonaRahmani authored Jan 20, 2021
    Configuration menu
    Copy the full SHA
    f1fe466 View commit details
    Browse the repository at this point in the history

  4. basic setup for MovieSearch component

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

  5. moviesearch comp: add state - searchQuery and searchResults

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

  6. moviesearch comp: add onInputChange handler

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

  7. add base api url localhost3000 as constant in app comp

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

  8. moviesearch comp: submit event handler; set state for alerts to pass … 

    …to search results page
    @annakim93
    annakim93 committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    2514fef View commit details
    Browse the repository at this point in the history

  9. rename components

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

  10. rename components

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

  11. moviesearchbar comp: set up return and redirect on submit

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

  12. set up route to take in props for moviesearchresults in app comp

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

  13. moviesearchresults: update proptypes to check for nested props

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

  14. add movie component

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

  15. complete return for movie comp and proptypes

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

  16. moviesearchresults comp: generateMovieComponents fn

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

  17. update moviesearchresults comp to return movie components

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

  18. worked on CustomerLis- we can see a list of all customers

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

  19. styling for movie component

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

  20. Merge pull request #2 from MonaRahmani/ML 

    worked on CustomerLis- we can see a list of all customers
    @MonaRahmani
    MonaRahmani authored Jan 20, 2021
    Configuration menu
    Copy the full SHA
    35ba338 View commit details
    Browse the repository at this point in the history

  21. add styling to movie search results

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

  22. add similar styling to movie library list

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

  23. Merge branch 'master' into video-search

    @annakim93
    annakim93 authored Jan 20, 2021
    Configuration menu
    Copy the full SHA
    f7aef20 View commit details
    Browse the repository at this point in the history

  24. Merge pull request #3 from MonaRahmani/video-search 

    Video search
    @annakim93
    annakim93 authored Jan 20, 2021
    Configuration menu
    Copy the full SHA
    b09ff54 View commit details
    Browse the repository at this point in the history

  25. set up alert messages for num search results found in moviesearchresu… 

    …lts comp and moviesearchbar
    @annakim93
    annakim93 committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    93db068 View commit details
    Browse the repository at this point in the history

  26. add props to movie library component

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

  27. adjust movie to allow for info on click

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

  28. add popup component to show more info on movies on click

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

  29. add popup component to show more info on movies on click

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

  30. working on customer selection - created selectCustomerCallback

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

  31. started working on rental

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

  32. Merge pull request #4 from MonaRahmani/customer 

    Customer
    @MonaRahmani
    MonaRahmani authored Jan 20, 2021
    Configuration menu
    Copy the full SHA
    8adf93b View commit details
    Browse the repository at this point in the history

  33. added click popup to movie library component

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

  34. changes to movie component hover styling

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

  35. add 'location' to props passed to movie component

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

  36. addToLibrary callback fn for movie search results

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

  37. Merge pull request #5 from MonaRahmani/add-video-to-library 

    Add video to library
    @annakim93
    annakim93 authored Jan 20, 2021
    Configuration menu
    Copy the full SHA
    abcaf29 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2021

  1. styling

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

  2. worked on rental- not done

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

  3. homepage styling

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

  4. Merge pull request #6 from MonaRahmani/select-customer 

    Select customer
    @annakim93
    annakim93 authored Jan 21, 2021
    Configuration menu
    Copy the full SHA
    050ed76 View commit details
    Browse the repository at this point in the history

  5. added selectMovie func

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

  6. Merge branch 'master' into stillcustomer

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

  7. Merge pull request #7 from MonaRahmani/stillcustomer 

    added selectMovie func
    @MonaRahmani
    MonaRahmani authored Jan 21, 2021
    Configuration menu
    Copy the full SHA
    1a017b1 View commit details
    Browse the repository at this point in the history

  8. added dueDate func

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

  9. adjust to select customer

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

  10. Merge branch 'rental-setup'

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

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

    …onsumer
    @annakim93
    annakim93 committed Jan 21, 2021
    Configuration menu
    Copy the full SHA
    2b637f5 View commit details
    Browse the repository at this point in the history

  12. add rentMovie func-POST to checkout

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

  13. add select movie for rental functionality to movie library and movie … 

    …comps
    @annakim93
    annakim93 committed Jan 21, 2021
    Configuration menu
    Copy the full SHA
    69124fc View commit details
    Browse the repository at this point in the history

  14. adjust rentmovie fn in app comp

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

  15. add view to homepage to show if rental in progress

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

  16. complete conditional rendering on homepage for rental in-progress

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

  17. fix some styling and add alert messages for picking rental parties

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

  18. add homepage component

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

  19. added rental section

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

  20. added rental section

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

  21. add buttons to popups to select movies that way too

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

  22. fix issue with popup positioning off-screen; add scroll to top functi… 

    …onality
    @annakim93
    annakim93 committed Jan 21, 2021
    Configuration menu
    Copy the full SHA
    e8e1ce6 View commit details
    Browse the repository at this point in the history

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

    …onsumer
    @annakim93
    annakim93 committed Jan 21, 2021
    Configuration menu
    Copy the full SHA
    bf72bf5 View commit details
    Browse the repository at this point in the history

  24. add undo buttons to video and customer selections

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

  25. conditional checkout button dependent on rental materials present

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

  26. add navbar component and add logic to show rental status on all pages

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

  27. post request for movie rental

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

  28. we added alert message for successful rental

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

  29. added same alert for error message with post request

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

  30. remove not used fns

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

  31. removed some comments

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

Commits on Jan 22, 2021

  1. clean up some unused imports

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

  2. make popup exit button less funky looking

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

  3. adjust homepage to get image on full rhs

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

  4. homepage movie transitions

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