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

Sockets-Bita-Rosalyn #17

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

Sockets-Bita-Rosalyn #17

wants to merge 61 commits into from

Commits on Jun 24, 2019

  1. Added components for Movies search library and customer list

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

  2. set up done

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

  3. Merge branch 'master' of https://github.com/ranuseh/video-store-consumer

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

  4. made the Movie search component with a search form inside

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

  5. Added movies selection feature

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

  6. merged app conflicts

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

Commits on Jun 25, 2019

  1. Conditional component display feature working

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

  2. added ability to select movie and display in rental cart

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

  3. added customer list component and conditional display on main page

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

  4. Small formatting changes

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

  5. Addec customer component and ability to select customer and movie and… 

    … send to rental
    @ranuseh
    ranuseh committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    9af4565 View commit details
    Browse the repository at this point in the history

  6. Rental can now be checked out

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

  7. Small changes to formatting

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

  8. small changes

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

  9. made the axios call inside the form

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

  10. fixed merge

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

  11. search results rendering

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

Commits on Jun 26, 2019

  1. the search result is now renders in the MovieSearch

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

  2. Small changes

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

  3. Merge fixed

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

  4. Search results rendering effectively

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

  5. Search results cleared after each search

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

  6. Added ability to add movies to library

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

  7. added add to library confirmation

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

  8. Made some small formatting changes

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

  9. Created a seperate card component

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

  10. Added visual display of movies

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

  11. Added details for movie library page

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

  12. axios call to get the customers

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

  13. Added more details to customer list

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

  14. Added some formatting and styles to the main page

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

  15. Small changes

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

  16. axios call to display the library

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

  17. Merge branch 'master' of https://github.com/ranuseh/video-store-consumer

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

  18. Styling of header

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

  19. Changes to movies component to reuse it across the app

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

  20. Starting to add routes

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

Commits on Jun 27, 2019

  1. Routing implemented

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

  2. Routing fixed. Now working

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

  3. Styling and formatting changes

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

  4. Added formatting to customers

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

  5. check out movie is adding to movies checked out to the customer

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

  6. Merged checkout changes and fixed message upon checkout

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

  7. small changes in rental

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

  8. merge conflict resolved

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

  9. added axios call to add a movie to the library

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

  10. made some changes to addmovie to the library callback function

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

  11. Styling changes to customer

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

  12. Merges fixed

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

  13. Formatted customers

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

  14. an existing movie can't get added to the library again

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

Commits on Jun 28, 2019

  1. added the ability to rerender customers after checkout to show new re… 

    …ntal numbers
    @ranuseh
    ranuseh committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    d2b6e69 View commit details
    Browse the repository at this point in the history

  2. Fixed issue of images not rendering when added from search to library

    @ranuseh
    ranuseh committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    02960c4 View commit details
    Browse the repository at this point in the history

  3. Added message when checked out.

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

  4. resolved merge conflicts

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

  5. merge conflict resolved

    @Bitaman
    Bitaman committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    2bda26d View commit details
    Browse the repository at this point in the history

  6. fixed another conflict

    @Bitaman
    Bitaman committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    4064c4c View commit details
    Browse the repository at this point in the history

  7. Small changes to formatting

    @ranuseh
    ranuseh committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    73603d4 View commit details
    Browse the repository at this point in the history

  8. minor changes

    @Bitaman
    Bitaman committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    4d895e4 View commit details
    Browse the repository at this point in the history

  9. merge conflict

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

  10. Small fixes

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