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

Goeun + Katricia | Edges | Video Store Consumer #18

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

Goeun + Katricia | Edges | Video Store Consumer #18

wants to merge 101 commits into from

Commits on Dec 17, 2018

  1. react setup on local computer

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

  2. Install React Router and import to App

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

Commits on Dec 18, 2018

  1. Add react router Router and Links to

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

  2. Fix package json conflict for merge

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

  3. spacing and prelim visuals

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

  4. Add component and css files for Customer, Library, Home, and Search

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

  5. Create class Component and import React, PropTypes, css for Customer,… 

    … Home, Library, and Search
    @krsmith7
    krsmith7 committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    cd9f42d View commit details
    Browse the repository at this point in the history

  6. add constructor and render scaffodlding to customer, home, library, a… 

    …nd search components
    @goeunpark
    goeunpark committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    964288a View commit details
    Browse the repository at this point in the history

  7. more components and scaffolding

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

  8. add css files for components

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

  9. Add React Router Routes to App and placeholder returns in components

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

  10. Change nav bar list styling to flex and no bullets

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

  11. Change order of nav bar headings

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

  12. font change

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

  13. Add form to Search component

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

  14. Add onSearch callback function and onChange handler to form

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

  15. Add handlers for input change and input submit to Search

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

  16. Install axios for api requests

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

  17. Add env to gitignore

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

  18. Adds axios get request to Movie API and state for response results

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

  19. download axios

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

  20. list of movies shows up on app via library container

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

  21. Add function to search Movie DB with key

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

  22. Change movie search URL to Rails API instead of Movie DB directly

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

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

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

  24. refactor out the .map in render

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

  25. spacing'

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

Commits on Dec 19, 2018

  1. add css to movies and library

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

  2. Add SearchHit component

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

  3. Add handling of api search results and rendering of SearchHit component

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

  4. Change SearchHit render to mirror Movie render format

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

  5. add bootstrap to movies and library

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

  6. add bootstrap to search function

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

  7. Change searchhit button text

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

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

    …sumer
    @krsmith7
    krsmith7 committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    d3a3e18 View commit details
    Browse the repository at this point in the history

  9. replace SearchHit component with Movie component

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

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

    …sumer
    @krsmith7
    krsmith7 committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    05303b7 View commit details
    Browse the repository at this point in the history

  11. Adds add to library click handler to Movie

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

  12. Changes clickhandler param from id to external_id

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

  13. clean up spacing and add scaffolding for get.post request to add exte… 

    …rnal movie query to library
    @goeunpark
    goeunpark committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    2fcad19 View commit details
    Browse the repository at this point in the history

  14. hard code data to send to database when search query movie is added t… 

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

  15. Change hard coded addMovie data to data from API search

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

  16. Change image_url Search component from poster_path to image_url

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

  17. Delete unneeded comments from search post request and console logs

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

Commits on Dec 20, 2018

  1. Move navbar from app to Navbar component

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

  2. Delete images from public folder

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

  3. Add font styling to nav links in navbar

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

  4. Change customers icon in navbar. Add padding to navbar icons

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

  5. minor space, naming edits

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

Commits on Dec 21, 2018

  1. add alert for results found in query

    @goeunpark
    goeunpark committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    471fa55 View commit details
    Browse the repository at this point in the history

  2. make alert for searches with zero hits into red

    @goeunpark
    goeunpark committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    12cc430 View commit details
    Browse the repository at this point in the history

  3. add a error handling

    @goeunpark
    goeunpark committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    34b1578 View commit details
    Browse the repository at this point in the history

  4. change header name

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

  5. add alert for loading library

    @goeunpark
    goeunpark committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    6c215f3 View commit details
    Browse the repository at this point in the history

  6. add alert for loading list of customers

    @goeunpark
    goeunpark committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    41e4efd View commit details
    Browse the repository at this point in the history

  7. take out header, change css on navbar

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

  8. delete unnecessary css

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

  9. add 'selected movie' ui in navbar and css

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

  10. make margins for sides 15% for all routed components

    @goeunpark
    goeunpark committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    54bb505 View commit details
    Browse the repository at this point in the history

  11. add white space above alert message in library and customer list

    @goeunpark
    goeunpark committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    29ec02f View commit details
    Browse the repository at this point in the history

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

    …sumer
    @krsmith7
    krsmith7 committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    44173bf View commit details
    Browse the repository at this point in the history

  13. Change selectedMovie from functional to classical component

    @krsmith7
    krsmith7 committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    309532b View commit details
    Browse the repository at this point in the history

  14. Add conditional to click handler function re message text

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

  15. add styling to customer and customer list components

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

  16. add reactstrap button

    @goeunpark
    goeunpark committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    350e334 View commit details
    Browse the repository at this point in the history

  17. Move conditional button handling from clickHandler to render. make cl… 

    …ickHandler two separate callback functions
    @krsmith7
    krsmith7 committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    2bc417d View commit details
    Browse the repository at this point in the history

  18. Add selectRental function to Library class

    @krsmith7
    krsmith7 committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    296a6f3 View commit details
    Browse the repository at this point in the history

  19. Add SelectedMovie file and render to Navbar

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

  20. Add selected movie styling to match selected customer styles

    @krsmith7
    krsmith7 committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    310542b View commit details
    Browse the repository at this point in the history

  21. Add callback functions to Movie proptypes

    @krsmith7
    krsmith7 committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    0f778ab View commit details
    Browse the repository at this point in the history

  22. Adds comment re possible refactor of button conditional - make not ba… 

    …sed on text but on movie inclusion in library
    @krsmith7
    krsmith7 committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    aaa93a6 View commit details
    Browse the repository at this point in the history

  23. Add selectedMovie as state in Library

    @krsmith7
    krsmith7 committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    37e9cf2 View commit details
    Browse the repository at this point in the history

  24. add external component ScrollUpButton to make scrollling up more user… 

    … friendly
    @goeunpark
    goeunpark committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    e9e9169 View commit details
    Browse the repository at this point in the history

  25. create onClick callback to select customer for rental

    @goeunpark
    goeunpark committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    9a555a6 View commit details
    Browse the repository at this point in the history

  26. add a props.fullName to render on navbar

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

  27. Add function to pass selectedMovie in Library state up to App

    @krsmith7
    krsmith7 committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    637568c View commit details
    Browse the repository at this point in the history

  28. Add props to library constructor. List displaySelectedMovie function … 

    …as Library propTypes
    @krsmith7
    krsmith7 committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    bcb1e91 View commit details
    Browse the repository at this point in the history

  29. Change App Route for Library from component to render to have props. … 

    …Add state for selections to App
    @krsmith7
    krsmith7 committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    32b6fee View commit details
    Browse the repository at this point in the history

  30. Add function to set app selectedmovie in state. Add Navbar prop with … 

    …the state as its value
    @krsmith7
    krsmith7 committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    a4f9cb9 View commit details
    Browse the repository at this point in the history

  31. move/delete unneeded code

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

  32. Change param passed from Library to App from movie object in state to… 

    … movie id. Remove Library selectedMovie state
    @krsmith7
    krsmith7 committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    9d63c72 View commit details
    Browse the repository at this point in the history

  33. add state to App for selectedCustomers, add scroll-up-react

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

  34. Add scroll button package

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

  35. Npm install package for page scroll button

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

  36. Merge selectedCustomer handling

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

  37. Merge branch 'master' into selectedMovie

    @krsmith7
    krsmith7 committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    0c4d6dd View commit details
    Browse the repository at this point in the history

  38. add missing }

    @goeunpark
    goeunpark committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    38a3e8f View commit details
    Browse the repository at this point in the history

  39. fix bug, refactor in library, adds movie ID to navbar / selectedMovie

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

  40. spacing

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

  41. selected movie shows title not ID

    @goeunpark
    goeunpark committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    9e20e07 View commit details
    Browse the repository at this point in the history

  42. add ScrollUpButton to library

    @goeunpark
    goeunpark committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    36a575a View commit details
    Browse the repository at this point in the history

  43. Edit starting App selectedMovie state to None

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

  44. Add component CheckoutRental with rentalCustomer and rentalMovie as p… 

    …rops to Navbar component render
    @krsmith7
    krsmith7 committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    4b8b2ea View commit details
    Browse the repository at this point in the history

  45. Add Button for Checkout Rental to Navbar

    @krsmith7
    krsmith7 committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    3a893f8 View commit details
    Browse the repository at this point in the history

  46. Add function to post rental checkout to Rails API

    @krsmith7
    krsmith7 committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    7587fce View commit details
    Browse the repository at this point in the history

  47. Merge react elements scroll up in Library

    @krsmith7
    krsmith7 committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    4ccb7d4 View commit details
    Browse the repository at this point in the history

  48. add arrow function in checkout rental

    @goeunpark
    goeunpark committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    5fda746 View commit details
    Browse the repository at this point in the history

  49. add missing })

    @goeunpark
    goeunpark committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    82759f6 View commit details
    Browse the repository at this point in the history

  50. Fix checkout feature

    @krsmith7
    krsmith7 committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    619145c View commit details
    Browse the repository at this point in the history

  51. Delete render message in Home body

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

Commits on Feb 22, 2022

  1. hm

    @goeunpark
    goeunpark committed Feb 22, 2022
    Configuration menu
    Copy the full SHA
    f8ce4d5 View commit details
    Browse the repository at this point in the history