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

Branches - Steph and Monick #19

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

Branches - Steph and Monick #19

wants to merge 46 commits into from

Commits on Dec 17, 2019

  1. added component files and import lines in app.js

    @mfunkemomo
    mfunkemomo committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    345be41 View commit details
    Browse the repository at this point in the history

  2. added nav bar component and is displaying

    @mfunkemomo
    mfunkemomo committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    1fbf122 View commit details
    Browse the repository at this point in the history

  3. added routing for components

    @mfunkemomo
    mfunkemomo committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    87edc44 View commit details
    Browse the repository at this point in the history

  4. added Link to navbar

    @mfunkemomo
    mfunkemomo committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    296f32c View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1 from mfunkemomo/mk-addComponents 

    Mk add components
    @mfunkemomo
    mfunkemomo authored Dec 17, 2019
    Configuration menu
    Copy the full SHA
    84c1136 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #2 from mfunkemomo/mk-addingComponentPageSwitchFun… 

    …ctionality

Mk adding component page switch functionality
    @mfunkemomo
    mfunkemomo authored Dec 17, 2019
    Configuration menu
    Copy the full SHA
    6c0250a View commit details
    Browse the repository at this point in the history

  7. added home to nav

    @mfunkemomo
    mfunkemomo committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    069c1fe View commit details
    Browse the repository at this point in the history

  8. added search box

    @mfunkemomo
    mfunkemomo committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    a4138b1 View commit details
    Browse the repository at this point in the history

  9. added api from react to rails db and trying to get it to display

    @mfunkemomo
    mfunkemomo committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    6ce4710 View commit details
    Browse the repository at this point in the history

  10. able to console.log movie titles but unable to display

    @mfunkemomo
    mfunkemomo committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    8840181 View commit details
    Browse the repository at this point in the history

  11. got movie titles to display by fixing a bug

    @mfunkemomo
    mfunkemomo committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    1df1361 View commit details
    Browse the repository at this point in the history

  12. removed console.log line

    @mfunkemomo
    mfunkemomo committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    c77def6 View commit details
    Browse the repository at this point in the history

  13. trying to make get request to rail

    @mfunkemomo
    mfunkemomo committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    debf253 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2019

  1. was able to add function for get request to rails but not yet complete

    @mfunkemomo
    mfunkemomo committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    a5da049 View commit details
    Browse the repository at this point in the history

  2. played around with submissing to rails api

    @mfunkemomo
    mfunkemomo committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    c5ff070 View commit details
    Browse the repository at this point in the history

  3. Got rails api to work

    @mfunkemomo
    mfunkemomo committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    99179bf View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3 from mfunkemomo/mk-searchMovie 

    Mk search movie
    @mfunkemomo
    mfunkemomo authored Dec 18, 2019
    Configuration menu
    Copy the full SHA
    a8ffe72 View commit details
    Browse the repository at this point in the history

  5. added customer lists

    @Steph0088
    Steph0088 committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    1df4783 View commit details
    Browse the repository at this point in the history

  6. able to get function for displaying searched movie but not complete

    @mfunkemomo
    mfunkemomo committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    e1d3596 View commit details
    Browse the repository at this point in the history

  7. was able to display searched movies

    @mfunkemomo
    mfunkemomo committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    07f6e14 View commit details
    Browse the repository at this point in the history

  8. fixed merge conflicts

    @mfunkemomo
    mfunkemomo committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    90aba72 View commit details
    Browse the repository at this point in the history

  9. removed console.logs from movie search

    @mfunkemomo
    mfunkemomo committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    946cc83 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #4 from mfunkemomo/mk-searchBar2 

    Mk search bar2
    @mfunkemomo
    mfunkemomo authored Dec 18, 2019
    Configuration menu
    Copy the full SHA
    115407d View commit details
    Browse the repository at this point in the history

  11. added table for displaying search results

    @mfunkemomo
    mfunkemomo committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    c4ea8b2 View commit details
    Browse the repository at this point in the history

  12. fixing table

    @mfunkemomo
    mfunkemomo committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    67a236d View commit details
    Browse the repository at this point in the history

  13. screw table, wrapped movie and button in a div to display

    @mfunkemomo
    mfunkemomo committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    e2fc3a2 View commit details
    Browse the repository at this point in the history

  14. fixed bug in passing movie to post request

    @mfunkemomo
    mfunkemomo committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    60b9578 View commit details
    Browse the repository at this point in the history

  15. changed post link to movies/ and takes in movie object

    @mfunkemomo
    mfunkemomo committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    d72aba5 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #5 from mfunkemomo/mk-addMovie 

    Mk add movie
    @mfunkemomo
    mfunkemomo authored Dec 18, 2019
    Configuration menu
    Copy the full SHA
    0c6d336 View commit details
    Browse the repository at this point in the history

  17. added callback functions and handler for selecting movie

    @mfunkemomo
    mfunkemomo committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    df6a7ce View commit details
    Browse the repository at this point in the history

  18. adjusted movie library route into functional component to change stat… 

    …e for selectedMovie
    @mfunkemomo
    mfunkemomo committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    a87faa1 View commit details
    Browse the repository at this point in the history

  19. added console.log to confirm if selectedMovie was saved in state

    @mfunkemomo
    mfunkemomo committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    7fb5df8 View commit details
    Browse the repository at this point in the history

  20. Merge pull request #6 from mfunkemomo/mk-selectMovies 

    Mk select movies
    @mfunkemomo
    mfunkemomo authored Dec 18, 2019
    Configuration menu
    Copy the full SHA
    1d0a752 View commit details
    Browse the repository at this point in the history

  21. added selected customer to app state

    @mfunkemomo
    mfunkemomo committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    af3325b View commit details
    Browse the repository at this point in the history

  22. Merge pull request #7 from mfunkemomo/mk-selectCustomer 

    added selected customer to app state
    @mfunkemomo
    mfunkemomo authored Dec 18, 2019
    Configuration menu
    Copy the full SHA
    d21fd97 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2019

  1. added display customer function

    @mfunkemomo
    mfunkemomo committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    bc6764a View commit details
    Browse the repository at this point in the history

  2. got display to appear when movie and customer has been selected

    @mfunkemomo
    mfunkemomo committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    b8088a0 View commit details
    Browse the repository at this point in the history

  3. added checkout function that takes in params of customer id and duedate

    @mfunkemomo
    mfunkemomo committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    99dfb4a View commit details
    Browse the repository at this point in the history

  4. able to get post request for checkout to return 200 status but can't … 

    …confirm if it manually worked
    @mfunkemomo
    mfunkemomo committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    e3ddabd View commit details
    Browse the repository at this point in the history

  5. Merge pull request #8 from mfunkemomo/mk-checkout 

    Mk checkout
    @mfunkemomo
    mfunkemomo authored Dec 19, 2019
    Configuration menu
    Copy the full SHA
    5fb56e2 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2019

  1. added menu and display listing styles

    @mfunkemomo
    mfunkemomo committed Dec 20, 2019
    Configuration menu
    Copy the full SHA
    f5788f5 View commit details
    Browse the repository at this point in the history

  2. added css to customerlist and movielist

    @mfunkemomo
    mfunkemomo committed Dec 20, 2019
    Configuration menu
    Copy the full SHA
    6874039 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #9 from mfunkemomo/mk-cssStuff 

    Mk css stuff
    @mfunkemomo
    mfunkemomo authored Dec 20, 2019
    Configuration menu
    Copy the full SHA
    078f6d3 View commit details
    Browse the repository at this point in the history

  4. display customer list and movie photos

    @mfunkemomo
    mfunkemomo committed Dec 20, 2019
    Configuration menu
    Copy the full SHA
    112000a View commit details
    Browse the repository at this point in the history

  5. added style to movie search

    @mfunkemomo
    mfunkemomo committed Dec 20, 2019
    Configuration menu
    Copy the full SHA
    550fa5c View commit details
    Browse the repository at this point in the history

  6. Merge pull request #10 from mfunkemomo/mk-cssPart2 

    Mk css part2
    @mfunkemomo
    mfunkemomo authored Dec 20, 2019
    Configuration menu
    Copy the full SHA
    77079c2 View commit details
    Browse the repository at this point in the history