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

Daniela and Xtina's Bonkers Video Store #17

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

Daniela and Xtina's Bonkers Video Store #17

wants to merge 80 commits into from

Commits on Dec 17, 2018

  1. basic router setup

    @mystioreo
    mystioreo committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    100a706 View commit details
    Browse the repository at this point in the history

  2. inital setup

    Xtina committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    26466e2 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/mystioreo/video-store-con… 

    …sumer
    Xtina committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    40f6394 View commit details
    Browse the repository at this point in the history

  4. added customers and index class components for use inside router

    @mystioreo
    mystioreo committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    0759328 View commit details
    Browse the repository at this point in the history

  5. updating

    Xtina committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    6f456f8 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of https://github.com/mystioreo/video-store-con… 

    …sumer

updating
    Xtina committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    d7887a8 View commit details
    Browse the repository at this point in the history

  7. adding customer map

    @mystioreo
    mystioreo committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    94676d9 View commit details
    Browse the repository at this point in the history

  8. dka

    Xtina committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    128cfdc View commit details
    Browse the repository at this point in the history

  9. basic class setup for each route component, api call retrieves custom… 

    …er list
    @mystioreo
    mystioreo committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    83eae0e View commit details
    Browse the repository at this point in the history

  10. Merge branch 'router'

    @mystioreo
    mystioreo committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    e82ec56 View commit details
    Browse the repository at this point in the history

  11. merge conflict

    @mystioreo
    mystioreo committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    d0d3591 View commit details
    Browse the repository at this point in the history

  12. passing all customer details in as props to customer component

    @mystioreo
    mystioreo committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    a753c85 View commit details
    Browse the repository at this point in the history

  13. api call retrieves a list of movies. movie cards are displayed as com… 

    …ponents
    @mystioreo
    mystioreo committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    c104966 View commit details
    Browse the repository at this point in the history

  14. wrote html for movie component

    @mystioreo
    mystioreo committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    41785af View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2018

  1. matched styling of sample app for movie components

    @mystioreo
    mystioreo committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    b72bf6a View commit details
    Browse the repository at this point in the history

  2. displaying customers

    Xtina committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    6abf7cd View commit details
    Browse the repository at this point in the history

  3. updated customer display

    Xtina committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    173def7 View commit details
    Browse the repository at this point in the history

  4. updated css for customer

    Xtina committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    f4d47c9 View commit details
    Browse the repository at this point in the history

  5. search bar updates search term and submits query to API upon hitting … 

    …enter
    @mystioreo
    mystioreo committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    ccf2ded View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into search

    @mystioreo
    mystioreo committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    c1c3e06 View commit details
    Browse the repository at this point in the history

  7. customers now matches the example

    Xtina committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    f25bd7c View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' of https://github.com/mystioreo/video-store-con… 

    …sumer
    @mystioreo
    mystioreo committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    9431d58 View commit details
    Browse the repository at this point in the history

  9. refactored to use rentalmanager component as a child of app

    @mystioreo
    mystioreo committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    d84bcd9 View commit details
    Browse the repository at this point in the history

  10. set up rental selection component with callback function to check out

    @mystioreo
    mystioreo committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    69caf3f View commit details
    Browse the repository at this point in the history

  11. set up post request for checkout, need to pull in customer and movie … 

    …info
    @mystioreo
    mystioreo committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    a65f5bb View commit details
    Browse the repository at this point in the history

  12. added set customer callback

    Xtina committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    eb0347c View commit details
    Browse the repository at this point in the history

  13. set movie callback and checkout function works

    Xtina committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    8606008 View commit details
    Browse the repository at this point in the history

  14. refactored searchto use external tmdb api

    @mystioreo
    mystioreo committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    75620d6 View commit details
    Browse the repository at this point in the history

  15. Merge branch 'master' of https://github.com/mystioreo/video-store-con… 

    …sumer
    @mystioreo
    mystioreo committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    9ac996a View commit details
    Browse the repository at this point in the history

  16. took out hard-coded checkout url and replaced with correct info

    @mystioreo
    mystioreo committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    5a0a081 View commit details
    Browse the repository at this point in the history

  17. search function updated

    Xtina committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    0400a6b View commit details
    Browse the repository at this point in the history

  18. Merge branch 'master' of https://github.com/mystioreo/video-store-con… 

    …sumer

git merge
    Xtina committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    fad2de9 View commit details
    Browse the repository at this point in the history

  19. refactored search to go through Rails API instead of TMDB

    @mystioreo
    mystioreo committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    0fedb03 View commit details
    Browse the repository at this point in the history

  20. add to library sends post request with movie params to rails api

    @mystioreo
    mystioreo committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    af3b31b View commit details
    Browse the repository at this point in the history

  21. add to library accurately passes movie data to rails api and movie sh… 

    …ows up on library list
    @mystioreo
    mystioreo committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    cf8dc72 View commit details
    Browse the repository at this point in the history

  22. added messagebar component and callback function to change message

    @mystioreo
    mystioreo committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    7f10dd0 View commit details
    Browse the repository at this point in the history

  23. set up message bar with callback function to change message

    @mystioreo
    mystioreo committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    90ba06a View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2018

  1. success message shows up after checking out a movie

    @mystioreo
    mystioreo committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    c321dfb View commit details
    Browse the repository at this point in the history

  2. message bar works for checking out a rental but does not work for oth… 

    …er components, revisit
    @mystioreo
    mystioreo committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    10b7f6e View commit details
    Browse the repository at this point in the history

  3. putting customer css back

    Xtina committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    b385111 View commit details
    Browse the repository at this point in the history

  4. merging

    Xtina committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    57bb560 View commit details
    Browse the repository at this point in the history

  5. fixed the mess after a wonky merge

    Xtina committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    68d2b85 View commit details
    Browse the repository at this point in the history

  6. playing with css

    Xtina committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    4be1697 View commit details
    Browse the repository at this point in the history

  7. rearranging components to consolidate code

    @mystioreo
    mystioreo committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    8a1919c View commit details
    Browse the repository at this point in the history

  8. rename css files

    @mystioreo
    mystioreo committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    a1d3b88 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' into messages

    @mystioreo
    mystioreo committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    c14a4ed View commit details
    Browse the repository at this point in the history

  10. moved rental message into rental manager. moved router into rental ma… 

    …nager.
    @mystioreo
    mystioreo committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    b2ccd07 View commit details
    Browse the repository at this point in the history

  11. set 2.5sec timeout for rental message

    @mystioreo
    mystioreo committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    a23b6e3 View commit details
    Browse the repository at this point in the history

  12. shows messages for loading customers

    @mystioreo
    mystioreo committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    7acafb5 View commit details
    Browse the repository at this point in the history

  13. shows messages for loading search results

    @mystioreo
    mystioreo committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    bc80f31 View commit details
    Browse the repository at this point in the history

  14. shows messages for loading library

    @mystioreo
    mystioreo committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    c56b18b View commit details
    Browse the repository at this point in the history

  15. merging

    Xtina committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    887152a View commit details
    Browse the repository at this point in the history

  16. Merge branch 'master' of https://github.com/mystioreo/video-store-con… 

    …sumer

merging
    Xtina committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    4036b2d View commit details
    Browse the repository at this point in the history

  17. shows messages when adding a movie to library

    @mystioreo
    mystioreo committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    d18ce99 View commit details
    Browse the repository at this point in the history

  18. tweak

    Xtina committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    06e597e View commit details
    Browse the repository at this point in the history

  19. css fun

    Xtina committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    a5955b8 View commit details
    Browse the repository at this point in the history

  20. styled rental bar

    @mystioreo
    mystioreo committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    5f3982b View commit details
    Browse the repository at this point in the history

  21. removed extraneous status messages because the screen was flashing to… 

    …o much
    @mystioreo
    mystioreo committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    9935537 View commit details
    Browse the repository at this point in the history

  22. removed extra div

    @mystioreo
    mystioreo committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    4d01964 View commit details
    Browse the repository at this point in the history

  23. added Christmasy theme

    Xtina committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    10bf9f9 View commit details
    Browse the repository at this point in the history

  24. Merge branch 'master' of https://github.com/mystioreo/video-store-con… 

    …sumer

merge
    Xtina committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    5ef53e0 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2018

  1. nav links are in a row instead of column

    @mystioreo
    mystioreo committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    1d33301 View commit details
    Browse the repository at this point in the history

  2. added padding to rental selection

    @mystioreo
    mystioreo committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    0cdeb68 View commit details
    Browse the repository at this point in the history

  3. padding around search bar

    @mystioreo
    mystioreo committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    ad39f2d View commit details
    Browse the repository at this point in the history

  4. fixed background css

    Xtina committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    981150c View commit details
    Browse the repository at this point in the history

  5. accurately adds movie to library with success message

    @mystioreo
    mystioreo committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    3adf610 View commit details
    Browse the repository at this point in the history

  6. merging

    Xtina committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    13112cd View commit details
    Browse the repository at this point in the history

  7. merging again

    Xtina committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    97b62f1 View commit details
    Browse the repository at this point in the history

  8. styled main page and customers needs more tacky

    Xtina committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    e15839c View commit details
    Browse the repository at this point in the history

  9. more christmas hahahaha

    Xtina committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    be4e838 View commit details
    Browse the repository at this point in the history

  10. added google fonts

    Xtina committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    127f625 View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2018

  1. added white backgrounds for status messages

    @mystioreo
    mystioreo committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    9783bc0 View commit details
    Browse the repository at this point in the history

  2. flashing border

    @mystioreo
    mystioreo committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    7ec9875 View commit details
    Browse the repository at this point in the history

  3. tweaked border

    Xtina committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    ea19853 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/mystioreo/video-store-con… 

    …sumer

merge
    Xtina committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    6e37c54 View commit details
    Browse the repository at this point in the history

  5. more christmas

    Xtina committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    d05d785 View commit details
    Browse the repository at this point in the history

  6. allll the christmas

    Xtina committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    e698602 View commit details
    Browse the repository at this point in the history

  7. file name correction

    @mystioreo
    mystioreo committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    42797e6 View commit details
    Browse the repository at this point in the history

  8. Rename customer.css to Customer.css

    @mystioreo
    mystioreo authored Dec 21, 2018
    Configuration menu
    Copy the full SHA
    55bfc72 View commit details
    Browse the repository at this point in the history

  9. Rename customers.css to Customers.css

    @mystioreo
    mystioreo authored Dec 21, 2018
    Configuration menu
    Copy the full SHA
    0426384 View commit details
    Browse the repository at this point in the history