Code

video-store-katherine-kay#13

Code

Open

kayxn23 wants to merge 45 commits intoAda-C10:masterAda-C10/video-store-consumer:masterfrom kayxn23:masterkayxn23/video-store-consumer:masterCopy head branch name to clipboard

+4,079-2,397

Commits

Commits on Dec 18, 2018

• created customers component draft

  kayxn23

  committed
  2889572

• connected customers to app

  kayxn23

  committed
  1deed10

• CustomerCollection and Axios get

  KatherineJF

  committed
  f0f7741

• Merge pull request #1 from kayxn23/Katherine

  Show description for b9f19ab
  kayxn23

  authored
  b9f19ab

• set up axios request successful in customerscollection and displayCustomers method

  kayxn23

  committed
  bb538c1

• added rentalLibrary and movie components

  KatherineJF

  committed
  cd0f29b

• saved PropTypes add

  KatherineJF

  committed
  d5bee2e

• added SearchBar.js to App for search bar funcationality still with bug

  kayxn23

  committed
  8057712

• add search query

  KatherineJF

  committed
  eaefebc

• slightly edited app

  kayxn23

  committed
  fc4f9b8

• Merge branch 'Katherine'

  KatherineJF

  committed
  196f01d

• search query added

  KatherineJF

  committed
  98145c8

• search query return from api

  KatherineJF

  committed
  0c7f696

• added displayMovies callback in searchbar component

  kayxn23

  committed
  bd4f4e9

• fixed bug in url

  kayxn23

  committed
  4f20755

• added unique key for Movie compoenents when theyre created in display Movies

  kayxn23

  committed
  54da151

Commits on Dec 19, 2018

• updated movie props

  kayxn23

  committed
  0d9a3d9

• exited keys for Movie components and display imgs

  kayxn23

  committed
  105ef4f

• selected movie persisted in app

  KatherineJF

  committed
  5369014

• app fixes

  KatherineJF

  committed
  7843444

• updated click handler for select movie

  KatherineJF

  committed
  a1b92b5

• adding movies to library works

  KatherineJF

  committed
  6d52f03

• added callbackfuncationality in Customer to select a customer in app

  kayxn23

  committed
  7fa6805

• added h1 tag to display selected customer

  kayxn23

  committed
  47ceb34

Commits on Dec 20, 2018

• made small changes to edit styling and html organization

  kayxn23

  committed
  4193f80

• added react-boostrap and styled buttons and imge

  kayxn23

  committed
  c3a1f99

• changed display from media to col row in rental library

  kayxn23

  committed
  d65b200

• added regular bootstrap and aligned text buttons center

  kayxn23

  committed
  521d448

• added padding to movies

  kayxn23

  committed
  3dbea6b

• display movie img and customer in card when selected

  kayxn23

  committed
  e20f386

• updated bkground color in selected mv customer

  kayxn23

  committed
  45e6d04

• card background image added

  kayxn23

  committed
  3f2fee3

• slight change to background

  kayxn23

  committed
  74fe9bb

• work on app.js checkout method

  KatherineJF

  committed
  d13802e

• merge conflict button accept in app.js

  KatherineJF

  committed
  a1c68ef

• added app title

  kayxn23

  committed
  508f09a

• fixed mrg conflict

  kayxn23

  committed
  388f3ec

• addex axios to app.js

  kayxn23

  committed
  7dd47a9

• checkout method error reversal

  KatherineJF

  committed
  4f4cb50

• new function in app for checkout

  KatherineJF

  committed
  f3b6323

• added button for checkout + function

  kayxn23

  committed
  a135348

Commits on Dec 21, 2018

• checkout function working

  kayxn23

  committed
  9ae200e

• added AlertMessage component to display checkout alert messages

  kayxn23

  committed
  471b23e

• added alertmessage.js again

  kayxn23

  committed
  ffb5cb6

• font color

  KatherineJF

  committed
  a5a9ff8