Code

addy & lindsay - edges - video store#20

Code

Open

elle-terch wants to merge 75 commits intoAda-C10:masterAda-C10/video-store-consumer:masterfrom addisoncole:masteraddisoncole/video-store-consumer:masterCopy head branch name to clipboard

+13,039-8,225

Commits

Commits on Dec 18, 2018

• add react router

  addisoncole

  committed
  8f6503b

• add react router to index.js, add header placeholder for nav bar contents to app.js.

  addisoncole

  committed
  67aa3d0

• add component folder. npm install axios. create NewRental component, and a ComponentTemplate for building.

  addisoncole

  committed
  9d1e17b

• add Functional Component Template for development. Add Selector component. App.js now passes dprops to New Rental component, which is made up on selectors which take in props of the type of selecto…

  Show description for c24fe15
  addisoncole

  committed
  c24fe15

• created basic framework for 3 nav buttons

  elle-terch

  committed
  154d0c6

• added placeholder buttons for nav components

  elle-terch

  committed
  600dfb7

• renamed nav components

  elle-terch

  committed
  1276c0d

• added components

  elle-terch

  committed
  4196586

• renamed components

  elle-terch

  committed
  29bb439

• merge

  addisoncole

  committed
  99d9945

• added client side Links for Search Customers and Library. Cleaned up html tags in App and Nav.

  addisoncole

  committed
  228a123

• created pieces for movie component

  elle-terch

  committed
  f43447a

• connected link in nav component to routes which render library, customer and search section components.

  addisoncole

  committed
  4d3db6b

• fixed merge conflicts.

  addisoncole

  committed
  dda8809

• removed Library component, and connected library section component to hardcoded data.

  addisoncole

  committed
  d6d0642

• added pieces for customer component

  elle-terch

  committed
  c8b5923

• rendered customer component in customer section

  elle-terch

  committed
  387b194

• merge with master

  elle-terch

  committed
  4cd85ab

• hooked customersection component up to API

  elle-terch

  committed
  108b72b

• connect library component to rails api with axios call during mount.

  addisoncole

  committed
  e28a074

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

  addisoncole

  committed
  53e003a

• Merge branch 'customers_api'

  elle-terch

  committed
  1e702dd

• added missing .css files for corresponding components. Create search bar component that is ffunctional, insofar as it returns its form input to the console.

  addisoncole

  committed
  2872d0e

• created callback functions to send info for a specific movie

  elle-terch

  committed
  ae78c05

• merge with master

  elle-terch

  committed
  7085dc9

• created ability to select a video from library

  elle-terch

  committed
  235fbf3

• searchBar component passes form state to search section and onsubmit it queries rails api for search term and populates the search section with movies in the component's state array.

  addisoncole

  committed
  2f00b6f

• add missing component css files.

  addisoncole

  committed
  fe0a61f

• Merge branch 'search'

  addisoncole

  committed
  dfd98ca

Commits on Dec 19, 2018

• created callback functions to select a customer for rental

  elle-terch

  committed
  d4c15c8

• add onCall function to NewRental button, which calls callback function, rentMvie from App.

  Show description for 1343aa8
  addisoncole

  committed
  1343aa8

• basic structure for axios post call for checking out a movie. works with preset date, will add function to get today's date and set a return date 3 days later.

  addisoncole

  committed
  f6a736d

• add axios, create initial state for app.js to maintain state of return date, which is 5 days from today's date.

  addisoncole

  committed
  7561c5a

• spacing

  addisoncole

  committed
  260554d

• title change

  addisoncole

  committed
  e8a361a

• created function to add move from API to local library

  elle-terch

  committed
  d6b0b2e

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

  elle-terch

  committed
  fce289f

• css for app and nav

  addisoncole

  committed
  68a6d4e

• created status message for checking out a movie

  elle-terch

  committed
  a9be211

Commits on Dec 20, 2018

• add className to movie component. add missing proptypes.

  addisoncole

  committed
  b1e395d

• add missing propType to LibrarySection component. Add css flex box to same component.

  addisoncole

  committed
  489833d

• add styling to movie to create card elements. Added fonts.

  addisoncole

  committed
  82d4b9c

• fixed status message for checking out a movie

  elle-terch

  committed
  fef69b4

• added status messages for loading the movie library

  elle-terch

  committed
  e1872b4

• added status messages for loading customers & errors

  elle-terch

  committed
  8e86753

• added proptypes

  elle-terch

  committed
  e18d071

• added status for adding movie to library

  elle-terch

  committed
  3191c5b

• add css styling to search component, nav bar and customer components.

  addisoncole

  committed
  26d6c3f

• fixed merge conflicts

  addisoncole

  committed
  14d3cee

• cleaned up some spacing and added missing PropTypes

  addisoncole

  committed
  e815a00

• added proptypes to status bar

  elle-terch

  committed
  3dc2539

• added proptypes to new rental

  elle-terch

  committed
  bcad085

• fixed status messages

  elle-terch

  committed
  b3af609

• merging with master

  elle-terch

  committed
  ec96cca

• added number of checked out movies to customers

  elle-terch

  committed
  0b172c1

• fixed movies per customer

  elle-terch

  committed
  027fc39

• updated conditional for nonexistent release date

  elle-terch

  committed
  e51fc1b

• added ternary to create date to fix bug.

  addisoncole

  committed
  5385399

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

  addisoncole

  committed
  11e4b8b

• add styling touches to movie component and header.

  addisoncole

  committed
  6ed6447

• add transition styling

  addisoncole

  committed
  84f894d

Commits on Dec 21, 2018

• add styling to status bar

  addisoncole

  committed
  9e5426a

• add styling to status bar and customers. corrected search seaction to return movie components. button for movie component is now modular, and will take a proptype to name it.

  addisoncole

  committed
  a41cd90

• change header text color, add some styling to selector. ad dmissing proptype to newRental.

  addisoncole

  committed
  99d5390

• added sorting methods to library and customer sections. added styling to status bar.

  addisoncole

  committed
  b8b6abb

• styling on selector and spacing.

  addisoncole

  committed
  673b2b0

• removed extraneous console.logs and fixed spacing and added missing semicolons.

  addisoncole

  committed
  c63aa08

• added null option for title

  elle-terch

  committed
  ed25bee

• styling on status bar, text color to fix scheme.

  addisoncole

  committed
  e0d2e29

• add button and callback method to check in a movie for a customer. changed styling for New rental component to take this into account. styling on selectors changed font weight. add transition anima…

  Show description for 63dabcf
  addisoncole

  committed
  63dabcf

• add spacing to header in customer component.

  addisoncole

  committed
  af618dd

• add styling to movie and customer so that it is highlighted red if it currently selected and will stay red if navigated away from or back to.

  addisoncole

  committed
  7a599ff

• refactor error messages.

  addisoncole

  committed
  a964bb1

• dry up css

  addisoncole

  committed
  df88a73

• small style change to status bar gradient. animation package loaded, may need to npm install.

  addisoncole

  committed
  2698104