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

Aruna & Jackie - Ampers #12

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

Aruna & Jackie - Ampers #12

wants to merge 39 commits into from

Commits on Jun 18, 2018

  1. initial commit

    @aruna79
    aruna79 committed Jun 18, 2018
    Configuration menu
    Copy the full SHA
    14317f0 View commit details
    Browse the repository at this point in the history

  2. Revert "initial commit" 

    This reverts commit 14317f0.
    @aruna79
    aruna79 committed Jun 18, 2018
    Configuration menu
    Copy the full SHA
    d5ce05e View commit details
    Browse the repository at this point in the history

  3. Added npm install

    @Jackiesan
    Jackiesan committed Jun 18, 2018
    Configuration menu
    Copy the full SHA
    b884407 View commit details
    Browse the repository at this point in the history

  4. Added api tokens

    @Jackiesan
    Jackiesan committed Jun 18, 2018
    Configuration menu
    Copy the full SHA
    202c31c View commit details
    Browse the repository at this point in the history

  5. created components

    @aruna79
    aruna79 committed Jun 18, 2018
    Configuration menu
    Copy the full SHA
    ff230d8 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2018

  1. Updated url for search collection get request

    @Jackiesan
    Jackiesan committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    2cc8f36 View commit details
    Browse the repository at this point in the history

  2. Added render method for Movie component

    @Jackiesan
    Jackiesan committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    39f1f4c View commit details
    Browse the repository at this point in the history

  3. installed react router dom

    @Jackiesan
    Jackiesan committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    ed24235 View commit details
    Browse the repository at this point in the history

  4. some changes to components

    @aruna79
    aruna79 committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    91d28e5 View commit details
    Browse the repository at this point in the history

  5. resolve merge conflict

    @aruna79
    aruna79 committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    12e858f View commit details
    Browse the repository at this point in the history

  6. Added header to app component

    @Jackiesan
    Jackiesan committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    afc1944 View commit details
    Browse the repository at this point in the history

  7. implemented customer component

    @aruna79
    aruna79 committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    a55b423 View commit details
    Browse the repository at this point in the history

  8. implemented customercollection component

    @aruna79
    aruna79 committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    e5c23aa View commit details
    Browse the repository at this point in the history

  9. added react routes

    @aruna79
    aruna79 committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    99a3161 View commit details
    Browse the repository at this point in the history

  10. resolved merge conflict

    @aruna79
    aruna79 committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    62eefbe View commit details
    Browse the repository at this point in the history

  11. Created Library component

    @Jackiesan
    Jackiesan committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    1a60107 View commit details
    Browse the repository at this point in the history

  12. resolved merge conflict in app

    @Jackiesan
    Jackiesan committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    de7da88 View commit details
    Browse the repository at this point in the history

  13. Updated Movie component to have submit button

    @Jackiesan
    Jackiesan committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    5b85fda View commit details
    Browse the repository at this point in the history

  14. added seletedmovie

    @aruna79
    aruna79 committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    a688a34 View commit details
    Browse the repository at this point in the history

  15. merge conflict

    @aruna79
    aruna79 committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    12d90f4 View commit details
    Browse the repository at this point in the history

  16. Updated Search Collection component to render submit form

    @Jackiesan
    Jackiesan committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    a4003b6 View commit details
    Browse the repository at this point in the history

  17. selects movie and customer

    @aruna79
    aruna79 committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    86a784f View commit details
    Browse the repository at this point in the history

  18. merge conflict

    @aruna79
    aruna79 committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    38185f4 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2018

  1. Added more props to movie component

    @Jackiesan
    Jackiesan committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    0804d04 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/aruna79/video-store-consumer

    @Jackiesan
    Jackiesan committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    80b8589 View commit details
    Browse the repository at this point in the history

  3. fixed bug in app

    @aruna79
    aruna79 committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    df5b082 View commit details
    Browse the repository at this point in the history

  4. working on rental

    @aruna79
    aruna79 committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    44b9786 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/aruna79/video-store-consumer

    @aruna79
    aruna79 committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    b346b86 View commit details
    Browse the repository at this point in the history

  6. Changed rendering in Movie component to render image rather than url

    @Jackiesan
    Jackiesan committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    57568d0 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of https://github.com/aruna79/video-store-consumer

    @aruna79
    aruna79 committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    99242e1 View commit details
    Browse the repository at this point in the history

  8. merger conflict

    @aruna79
    aruna79 committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    dffe479 View commit details
    Browse the repository at this point in the history

  9. Updated Axios post request in App component

    @Jackiesan
    Jackiesan committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    a8a95fe View commit details
    Browse the repository at this point in the history

  10. removed console logs in movie and customer component

    @Jackiesan
    Jackiesan committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    863b08d View commit details
    Browse the repository at this point in the history

  11. added messages

    @aruna79
    aruna79 committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    45c0ea3 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2018

  1. added fonts, icons, logo, and stylized main nav bar

    @Jackiesan
    Jackiesan committed Jun 21, 2018
    Configuration menu
    Copy the full SHA
    5259954 View commit details
    Browse the repository at this point in the history

  2. Resolved merge conflict in nav bar section of app

    @Jackiesan
    Jackiesan committed Jun 21, 2018
    Configuration menu
    Copy the full SHA
    7da9265 View commit details
    Browse the repository at this point in the history

  3. Added styling to collection components

    @Jackiesan
    Jackiesan committed Jun 21, 2018
    Configuration menu
    Copy the full SHA
    071f52c View commit details
    Browse the repository at this point in the history

  4. Added flex to movie search collection

    @Jackiesan
    Jackiesan committed Jun 21, 2018
    Configuration menu
    Copy the full SHA
    eb08e2c View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2018

  1. Added gif to home page and updated styling in customer and library co… 

    …llection
    @Jackiesan
    Jackiesan committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    27010a0 View commit details
    Browse the repository at this point in the history