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

Ports - Elise & Myriam #24

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

Ports - Elise & Myriam #24

wants to merge 83 commits into from

Commits on Jun 24, 2019

  1. set up

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

  2. clear up the default view

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

  3. routes

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

  4. added components

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

  5. typo

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

  6. added axios

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

  7. Search Button and configuration of ports' 

    '
    @MyriamWD
    MyriamWD committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    71329d0 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2019

  1. Search button working

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

  2. successfully called the API to display all customers

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

  3. added bootstrap dependency

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

  4. added props passing to the Customer List link

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

  5. in progress of making radio button

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

  6. added checked boxes and get the events bubbled up to parent and down … 

    …to checkout
    @ChubbyCub
    ChubbyCub committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    900afe2 View commit details
    Browse the repository at this point in the history

  7. display search results

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

  8. Merge pull request #1 from MyriamWD/elise-customers 

    Elise customers
    @ChubbyCub
    ChubbyCub authored Jun 25, 2019
    Configuration menu
    Copy the full SHA
    44e5fa0 View commit details
    Browse the repository at this point in the history

  9. solve merge conflicts

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

  10. Merge pull request #2 from MyriamWD/mwd-search 

    Mwd search
    @MyriamWD
    MyriamWD authored Jun 25, 2019
    Configuration menu
    Copy the full SHA
    699f563 View commit details
    Browse the repository at this point in the history

  11. added the movie library feature

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

  12. try to merge

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

  13. cleaned up some details

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

  14. add movie from search to library

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

  15. solved merge conflicts

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

  16. Merge pull request #3 from MyriamWD/mwd-search 

    Mwd Add movie to library
    @MyriamWD
    MyriamWD authored Jun 25, 2019
    Configuration menu
    Copy the full SHA
    ee7bed5 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2019

  1. added callback to clear search results

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

  2. added callback to lift the state to App and clear search results

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

  3. create conditional statement to add new movie when not repeated

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

  4. set state to clear input

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

  5. got the table format completed

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

  6. cleaned up the customer list and the customer component

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

  7. added customer id prop

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

  8. successfully posted a rental checkout

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

  9. try to push some changes

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

  10. Merge pull request #4 from MyriamWD/rework-customers-page 

    Rework customers page
    @ChubbyCub
    ChubbyCub authored Jun 26, 2019
    Configuration menu
    Copy the full SHA
    edd844b View commit details
    Browse the repository at this point in the history

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

    …umer into mwd-search
    @MyriamWD
    MyriamWD committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    157c449 View commit details
    Browse the repository at this point in the history

  12. able to clear the checkout section after checkout button is clicked

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

  13. solved merge conflicts

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

  14. Merge pull request #5 from MyriamWD/mwd-search 

    Mwd search
    @MyriamWD
    MyriamWD authored Jun 26, 2019
    Configuration menu
    Copy the full SHA
    c62758f View commit details
    Browse the repository at this point in the history

  15. added success and error message placeholder

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

  16. resolved merged conflicts

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

  17. added success message and made it disappear after 3 seconds

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

  18. deleleted console.log

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

  19. extracted componentDidMount to App - Goal: Load the movie library as … 

    …soon as the webapp is open
    @MyriamWD
    MyriamWD committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    c2404ae View commit details
    Browse the repository at this point in the history

  20. added componentDidMount to load the movie library state - added onCli… 

    …ck handlers to links to clear up search results
    @MyriamWD
    MyriamWD committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    9c3c484 View commit details
    Browse the repository at this point in the history

  21. added atl to images

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

  22. deleted callback function to clear results - using onClick handler in… 

    … app instead
    @MyriamWD
    MyriamWD committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    f7353b4 View commit details
    Browse the repository at this point in the history

  23. Merge pull request #6 from MyriamWD/mwd-search 

    Modified MovieLibrary component to load the movies when the web-app opens 
Clear search results using onClick handlers
    @MyriamWD
    MyriamWD authored Jun 26, 2019
    Configuration menu
    Copy the full SHA
    11b8ab4 View commit details
    Browse the repository at this point in the history

  24. added error messages and make them disappear after 3 seconds

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

  25. resolved merge conflicts

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

  26. deleted extra checkout tag

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

  27. styles for search result display

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

  28. solved merge conflicts

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

  29. Merge pull request #7 from MyriamWD/mwd-search 

    Mwd search
    @MyriamWD
    MyriamWD authored Jun 26, 2019
    Configuration menu
    Copy the full SHA
    53ea716 View commit details
    Browse the repository at this point in the history

  30. updated customer list when checkedout button is clicked

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

  31. created section to display messages

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

  32. use DisplayMessages funtion from App component to display messages

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

  33. use DisplayMessages function from App component to display messages

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

  34. organize a few things for styling

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

  35. redering customers list after post request

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

  36. solved merge conflicts

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

  37. Merge pull request #8 from MyriamWD/mwd-search 

    Mwd re rendering customer after checkout
    @MyriamWD
    MyriamWD authored Jun 26, 2019
    Configuration menu
    Copy the full SHA
    0746254 View commit details
    Browse the repository at this point in the history

  38. restructure code

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

  39. Merge pull request #9 from MyriamWD/mwd-search 

    restructure code
    @MyriamWD
    MyriamWD authored Jun 26, 2019
    Configuration menu
    Copy the full SHA
    4978945 View commit details
    Browse the repository at this point in the history

  40. added grid layout to page

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

  41. added styling to the side bar

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

  42. styling

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

Commits on Jun 27, 2019

  1. web-app style

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

  2. Merge pull request #10 from MyriamWD/mwd-search 

    website styling
    @MyriamWD
    MyriamWD authored Jun 27, 2019
    Configuration menu
    Copy the full SHA
    fd75854 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2019

  1. fixed minor detail on the search box

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

  2. changed CustomerList to functional component

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

  3. remove a few this in CustomerList

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

  4. changed Movie Library to functional component

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

  5. changed checkout component to functional component

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

  6. cleaned up all the console.log

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

  7. styling of the web app

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

  8. solved merge conflicts

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

  9. Merge pull request #11 from MyriamWD/mwd-search 

    styling of the web app
    @MyriamWD
    MyriamWD authored Jun 28, 2019
    Configuration menu
    Copy the full SHA
    67379d8 View commit details
    Browse the repository at this point in the history

  10. displaying movie details

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

  11. Merge pull request #12 from MyriamWD/mwd-search 

    displaying movie details
    @MyriamWD
    MyriamWD authored Jun 28, 2019
    Configuration menu
    Copy the full SHA
    bbb2d6b View commit details
    Browse the repository at this point in the history

  12. syting for movie details

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

  13. added more style to the site

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

  14. Merge pull request #13 from MyriamWD/mwd-search 

    site style
    @MyriamWD
    MyriamWD authored Jun 28, 2019
    Configuration menu
    Copy the full SHA
    ee1447c View commit details
    Browse the repository at this point in the history

  15. styled the movie details

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

  16. Merge pull request #14 from MyriamWD/mwd-search 

    styled the movie details
    @MyriamWD
    MyriamWD authored Jun 28, 2019
    Configuration menu
    Copy the full SHA
    86d0ef6 View commit details
    Browse the repository at this point in the history