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

Ampers: Katie and Sara #8

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

Ampers: Katie and Sara #8

wants to merge 62 commits into from

Commits on Jun 18, 2018

  1. files updated by the initial setup

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

  2. bundle install changes to package json

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

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

    …sumer
    @CheerOnMars
    CheerOnMars committed Jun 18, 2018
    Configuration menu
    Copy the full SHA
    480d5db View commit details
    Browse the repository at this point in the history

  4. created a components folder and created customer component js and css… 

    … files
    @kcforsman
    kcforsman committed Jun 18, 2018
    Configuration menu
    Copy the full SHA
    4a58ee7 View commit details
    Browse the repository at this point in the history

  5. created files for the CustomerDetails and CustomerList components, bo… 

    …th css and js
    @kcforsman
    kcforsman committed Jun 18, 2018
    Configuration menu
    Copy the full SHA
    8e7982b View commit details
    Browse the repository at this point in the history

  6. added logic to CustomerList to make api call to retrieve list of cust… 

    …omers from our Rails api, and installed axios to package.json
    @kcforsman
    kcforsman committed Jun 18, 2018
    Configuration menu
    Copy the full SHA
    6e9e61c View commit details
    Browse the repository at this point in the history

  7. added props validation and render content to the Customer Component

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

  8. finished implementing logic for displaying basic customer details to … 

    …the CustomerList
    @kcforsman
    kcforsman committed Jun 18, 2018
    Configuration menu
    Copy the full SHA
    65a2d2d View commit details
    Browse the repository at this point in the history

  9. add movie and rental library component files

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

  10. small changes

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

Commits on Jun 19, 2018

  1. added Katies customers files

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

  2. added navigation functionality to a Navigation component by allowing … 

    …a click event to determine which component is displayed from CustomerList, RentalLibrary, and SearchBar, and began filling in the App component
    @kcforsman
    kcforsman committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    49c611f View commit details
    Browse the repository at this point in the history

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

    …sumer
    @kcforsman
    kcforsman committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    6307660 View commit details
    Browse the repository at this point in the history

  4. removed unused axios and PropTypes from the beginning of the differen… 

    …t componenet files
    @kcforsman
    kcforsman committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    a2a1f9b View commit details
    Browse the repository at this point in the history

  5. created needed components to finish rendering navigation. those compo… 

    …nents include MovieSearch and SearchBar with content but no functionality
    @kcforsman
    kcforsman committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    3565f84 View commit details
    Browse the repository at this point in the history

  6. revise movie components to render on app

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

  7. minor spacing change

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

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

    …sumer
    @CheerOnMars
    CheerOnMars committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    86d5041 View commit details
    Browse the repository at this point in the history

  9. added release date fields and image to movie components

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

  10. changed the initial state of the App so that the search element rende… 

    …rs when you open the app
    @kcforsman
    kcforsman committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    c50c44d View commit details
    Browse the repository at this point in the history

  11. added the Checkout component to render customer and movie selection f… 

    …or implementing selecting a movie or customer from app lists
    @kcforsman
    kcforsman committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    918ae39 View commit details
    Browse the repository at this point in the history

  12. added selection button component to project then implemented a series… 

    … on nested callback function to update the apps state for a selected customer from the onClick of the SelectionButton to the Customer to the Customer list to the App. the change in the App's state then updates the props that are sent to the Checkout component
    @kcforsman
    kcforsman committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    c648403 View commit details
    Browse the repository at this point in the history

  13. translated all logic used for costumer components to select a custome… 

    …r to the rentalLibrary to select a movie. We now save both a movie and a customer to the App state which populates the Checkout Component with a name and a title
    @kcforsman
    kcforsman committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    f302d63 View commit details
    Browse the repository at this point in the history

  14. add search functionality

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

  15. implemented basic logic to handle checking out a rental, still need t… 

    …o implement error handling
    @kcforsman
    kcforsman committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    670dec9 View commit details
    Browse the repository at this point in the history

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

    …sumer
    @kcforsman
    kcforsman committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    d7ae8da View commit details
    Browse the repository at this point in the history

  17. changed index.html title

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

  18. removed all unused imports from the beginning of files, deleted unuse… 

    …d code, and fixed CustomerDetail Component from merge so that credit is an optional prop
    @kcforsman
    kcforsman committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    d1d677f View commit details
    Browse the repository at this point in the history

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

    …sumer
    @kcforsman
    kcforsman committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    ff0d5ff View commit details
    Browse the repository at this point in the history

  20. removed unused imports from Movie Results component

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

Commits on Jun 20, 2018

  1. finished initial styling of the header of the app wich includes styli… 

    …ng the navigation component and the checkout component
    @kcforsman
    kcforsman committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    2145283 View commit details
    Browse the repository at this point in the history

  2. adjusted header margins once more

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

  3. added styling to the main content and list containers

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

  4. implemented alignment for the list item arrangement of result details… 

    … and the selectionbutton
    @kcforsman
    kcforsman committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    cfa5f56 View commit details
    Browse the repository at this point in the history

  5. added styling to movie component to align and arrange presentation of… 

    … api results and added render function to MovieSearch to render results components only after a search has been made
    @kcforsman
    kcforsman committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    a7f105f View commit details
    Browse the repository at this point in the history

  6. added styling to the customer details component

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

  7. finished styling search bar component and that finishes styling for t… 

    …he website for now
    @kcforsman
    kcforsman committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    63c0e77 View commit details
    Browse the repository at this point in the history

  8. deleted all unused css files and removed the import from the correspo… 

    …nding js files
    @kcforsman
    kcforsman committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    950bc3f View commit details
    Browse the repository at this point in the history

  9. utilized React Router to create dynamic url paths while navigating th… 

    …e one-page app
    @kcforsman
    kcforsman committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    46c59be View commit details
    Browse the repository at this point in the history

  10. changed a placeholder in the SearchBar from Enter Search Terms to Ent… 

    …er Title
    @kcforsman
    kcforsman committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    2da637b View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' into ReactRouter

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

  12. added logic to display error from requdsts to the API and an invalid … 

    …checkout
    @kcforsman
    kcforsman committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    d7ea9bc View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2018

  1. added logic to display messages from api calls and user interaction o… 

    …nly temporarily
    @kcforsman
    kcforsman committed Jun 21, 2018
    Configuration menu
    Copy the full SHA
    4f5c605 View commit details
    Browse the repository at this point in the history

  2. resolved merge conflict between the ReactRouter app.js and original

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

  3. altered MovieSearch to clear previous search results when a new searc… 

    …h is done
    @kcforsman
    kcforsman committed Jun 21, 2018
    Configuration menu
    Copy the full SHA
    65c99c9 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into ReactRouter

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

  5. altered styling for a slightly bigger screen

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

  6. figured out how to pass props to a component rendered by a route with… 

    … ReactRouter and fixed issue for the RentalLibrary and CustomerList Components
    @kcforsman
    kcforsman committed Jun 21, 2018
    Configuration menu
    Copy the full SHA
    48ad589 View commit details
    Browse the repository at this point in the history

  7. add fuctionality to add movie to library

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

  8. removed unused method

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

Commits on Jun 22, 2018

  1. code alignment shift, no funcationality

    @kcforsman
    kcforsman committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    97b269b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into ReactRouter

    @kcforsman
    kcforsman committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    615f97c View commit details
    Browse the repository at this point in the history

  3. prevent movies with duplicate names from being added to the library

    @CheerOnMars
    CheerOnMars committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    3a1a48f View commit details
    Browse the repository at this point in the history

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

    …sumer
    @CheerOnMars
    CheerOnMars committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    0e94e53 View commit details
    Browse the repository at this point in the history

  5. added logic to the Movie component and RentalLibrary to display a mov… 

    …ie as unavailable if there is 0 inventory
    @kcforsman
    kcforsman committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    4fe1e15 View commit details
    Browse the repository at this point in the history

  6. dealt with merge in Movie Component to handle the display for availib… 

    …ility of a Movie for rent
    @kcforsman
    kcforsman committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    28b37e5 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'ReactRouter'

    @kcforsman
    kcforsman committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    eed08ab View commit details
    Browse the repository at this point in the history

  8. removed logic to prevent duplicates from the front end

    @CheerOnMars
    CheerOnMars committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    98eee81 View commit details
    Browse the repository at this point in the history

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

    …sumer
    @CheerOnMars
    CheerOnMars committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    251c855 View commit details
    Browse the repository at this point in the history

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

    …sumer
    @kcforsman
    kcforsman committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    00dcfd5 View commit details
    Browse the repository at this point in the history

  11. removed unused props and added required props as needed to correct fo… 

    …r the warnings from the browser console
    @kcforsman
    kcforsman committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    b9e9376 View commit details
    Browse the repository at this point in the history

  12. fix typo

    @CheerOnMars
    CheerOnMars committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    51b1586 View commit details
    Browse the repository at this point in the history