Code

Ampers: Katie and Sara#8

Code

Open

kcforsman wants to merge 62 commits intoAda-C9:masterAda-C9/video-store-consumer:masterfrom kcforsman:masterkcforsman/video-store-consumer:masterCopy head branch name to clipboard

+1,032-27

Commits

Commits on Jun 18, 2018

• files updated by the initial setup

  kcforsman

  committed
  7f2507c

  Copy full SHA for 7f2507c

• bundle install changes to package json

  CheerOnMars

  committed
  db24a52

  Copy full SHA for db24a52

• Merge branch 'master' of https://github.com/kcforsman/video-store-consumer

  CheerOnMars

  committed
  480d5db

  Copy full SHA for 480d5db

• created a components folder and created customer component js and css files

  kcforsman

  committed
  4a58ee7

  Copy full SHA for 4a58ee7

• created files for the CustomerDetails and CustomerList components, both css and js

  kcforsman

  committed
  8e7982b

  Copy full SHA for 8e7982b

• added logic to CustomerList to make api call to retrieve list of customers from our Rails api, and installed axios to package.json

  kcforsman

  committed
  6e9e61c

  Copy full SHA for 6e9e61c

• added props validation and render content to the Customer Component

  kcforsman

  committed
  c2823ed

  Copy full SHA for c2823ed

• finished implementing logic for displaying basic customer details to the CustomerList

  kcforsman

  committed
  65a2d2d

  Copy full SHA for 65a2d2d

• add movie and rental library component files

  CheerOnMars

  committed
  f7f72dc

  Copy full SHA for f7f72dc

• small changes

  CheerOnMars

  committed
  6f5d9c3

  Copy full SHA for 6f5d9c3

Commits on Jun 19, 2018

• added Katies customers files

  CheerOnMars

  committed
  784fca9

  Copy full SHA for 784fca9

• 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 th…

  Show description for 49c611f
  kcforsman

  committed
  49c611f

  Copy full SHA for 49c611f

• Merge branch 'master' of https://github.com/kcforsman/video-store-consumer

  kcforsman

  committed
  6307660

  Copy full SHA for 6307660

• removed unused axios and PropTypes from the beginning of the different componenet files

  kcforsman

  committed
  a2a1f9b

  Copy full SHA for a2a1f9b

• created needed components to finish rendering navigation. those components include MovieSearch and SearchBar with content but no functionality

  kcforsman

  committed
  3565f84

  Copy full SHA for 3565f84

• revise movie components to render on app

  CheerOnMars

  committed
  cd9968d

  Copy full SHA for cd9968d

• minor spacing change

  CheerOnMars

  committed
  9793000

  Copy full SHA for 9793000

• Merge branch 'master' of https://github.com/kcforsman/video-store-consumer

  CheerOnMars

  committed
  86d5041

  Copy full SHA for 86d5041

• added release date fields and image to movie components

  CheerOnMars

  committed
  0c8d80a

  Copy full SHA for 0c8d80a

• changed the initial state of the App so that the search element renders when you open the app

  kcforsman

  committed
  c50c44d

  Copy full SHA for c50c44d

• added the Checkout component to render customer and movie selection for implementing selecting a movie or customer from app lists

  kcforsman

  committed
  918ae39

  Copy full SHA for 918ae39

• 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 Cus…

  Show description for c648403
  kcforsman

  committed
  c648403

  Copy full SHA for c648403

• translated all logic used for costumer components to select a customer to the rentalLibrary to select a movie. We now save both a movie and a customer to the App state which populates the Checkout …

  Show description for f302d63
  kcforsman

  committed
  f302d63

  Copy full SHA for f302d63

• add search functionality

  CheerOnMars

  committed
  ef621fd

  Copy full SHA for ef621fd

• implemented basic logic to handle checking out a rental, still need to implement error handling

  kcforsman

  committed
  670dec9

  Copy full SHA for 670dec9

• Merge branch 'master' of https://github.com/kcforsman/video-store-consumer

  kcforsman

  committed
  d7ae8da

  Copy full SHA for d7ae8da

• changed index.html title

  CheerOnMars

  committed
  bf66f29

  Copy full SHA for bf66f29

• removed all unused imports from the beginning of files, deleted unused code, and fixed CustomerDetail Component from merge so that credit is an optional prop

  kcforsman

  committed
  d1d677f

  Copy full SHA for d1d677f

• Merge branch 'master' of https://github.com/kcforsman/video-store-consumer

  kcforsman

  committed
  ff0d5ff

  Copy full SHA for ff0d5ff

• removed unused imports from Movie Results component

  kcforsman

  committed
  ad29335

  Copy full SHA for ad29335

Commits on Jun 20, 2018

• finished initial styling of the header of the app wich includes styling the navigation component and the checkout component

  kcforsman

  committed
  2145283

  Copy full SHA for 2145283

• adjusted header margins once more

  kcforsman

  committed
  016dd81

  Copy full SHA for 016dd81

• added styling to the main content and list containers

  kcforsman

  committed
  1668ee0

  Copy full SHA for 1668ee0

• implemented alignment for the list item arrangement of result details and the selectionbutton

  kcforsman

  committed
  cfa5f56

  Copy full SHA for cfa5f56

• 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

  committed
  a7f105f

  Copy full SHA for a7f105f

• added styling to the customer details component

  kcforsman

  committed
  c1f6c0e

  Copy full SHA for c1f6c0e

• finished styling search bar component and that finishes styling for the website for now

  kcforsman

  committed
  63c0e77

  Copy full SHA for 63c0e77

• deleted all unused css files and removed the import from the corresponding js files

  kcforsman

  committed
  950bc3f

  Copy full SHA for 950bc3f

• utilized React Router to create dynamic url paths while navigating the one-page app

  kcforsman

  committed
  46c59be

  Copy full SHA for 46c59be

• changed a placeholder in the SearchBar from Enter Search Terms to Enter Title

  kcforsman

  committed
  2da637b

  Copy full SHA for 2da637b

• Merge branch 'master' into ReactRouter

  kcforsman

  committed
  984b705

  Copy full SHA for 984b705

• added logic to display error from requdsts to the API and an invalid checkout

  kcforsman

  committed
  d7ea9bc

  Copy full SHA for d7ea9bc

Commits on Jun 21, 2018

• added logic to display messages from api calls and user interaction only temporarily

  kcforsman

  committed
  4f5c605

  Copy full SHA for 4f5c605

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

  kcforsman

  committed
  94588d7

  Copy full SHA for 94588d7

• altered MovieSearch to clear previous search results when a new search is done

  kcforsman

  committed
  65c99c9

  Copy full SHA for 65c99c9

• Merge branch 'master' into ReactRouter

  kcforsman

  committed
  1db9d91

  Copy full SHA for 1db9d91

• altered styling for a slightly bigger screen

  kcforsman

  committed
  324539b

  Copy full SHA for 324539b

• 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

  committed
  48ad589

  Copy full SHA for 48ad589

• add fuctionality to add movie to library

  CheerOnMars

  committed
  c3e8323

  Copy full SHA for c3e8323

• removed unused method

  CheerOnMars

  committed
  3804f01

  Copy full SHA for 3804f01

Commits on Jun 22, 2018

• code alignment shift, no funcationality

  kcforsman

  committed
  97b269b

  Copy full SHA for 97b269b

• Merge branch 'master' into ReactRouter

  kcforsman

  committed
  615f97c

  Copy full SHA for 615f97c

• prevent movies with duplicate names from being added to the library

  CheerOnMars

  committed
  3a1a48f

  Copy full SHA for 3a1a48f

• Merge branch 'master' of https://github.com/kcforsman/video-store-consumer

  CheerOnMars

  committed
  0e94e53

  Copy full SHA for 0e94e53

• added logic to the Movie component and RentalLibrary to display a movie as unavailable if there is 0 inventory

  kcforsman

  committed
  4fe1e15

  Copy full SHA for 4fe1e15

• dealt with merge in Movie Component to handle the display for availibility of a Movie for rent

  kcforsman

  committed
  28b37e5

  Copy full SHA for 28b37e5

• Merge branch 'ReactRouter'

  kcforsman

  committed
  eed08ab

  Copy full SHA for eed08ab

• removed logic to prevent duplicates from the front end

  CheerOnMars

  committed
  98eee81

  Copy full SHA for 98eee81

• Merge branch 'master' of https://github.com/kcforsman/video-store-consumer

  CheerOnMars

  committed
  251c855

  Copy full SHA for 251c855

• Merge branch 'master' of https://github.com/kcforsman/video-store-consumer

  kcforsman

  committed
  00dcfd5

  Copy full SHA for 00dcfd5

• removed unused props and added required props as needed to correct for the warnings from the browser console

  kcforsman

  committed
  b9e9376

  Copy full SHA for b9e9376

• fix typo

  CheerOnMars

  committed
  51b1586

  Copy full SHA for 51b1586