Code

Katie and Alice Video Store#12

Code

Closed

katietj wants to merge 44 commits intoAda-C10:masterAda-C10/video-store-consumer:masterfrom katietj:masterkatietj/video-store-consumer:masterCopy head branch name to clipboard

+3,379-2,315

Commits

Commits on Dec 17, 2018

• Created React Router and stock components to make sure it works

  alicehsiao

  committed
  ef551c3

  Copy full SHA for ef551c3

Commits on Dec 18, 2018

• Built basic components to search external API and add movie to our database

  alicehsiao

  committed
  3f8c849

  Copy full SHA for 3f8c849

• Changed error message

  alicehsiao

  committed
  97a21e4

  Copy full SHA for 97a21e4

• Added navigation via React Router

  alicehsiao

  committed
  90854b8

  Copy full SHA for 90854b8

• Installed prop types

  alicehsiao

  committed
  eb8f00f

  Copy full SHA for eb8f00f

• added prop types to movie

  katietj

  committed
  2c51f3b

  Copy full SHA for 2c51f3b

• Worked on Logo for front page

  alicehsiao

  committed
  d6487a2

  Copy full SHA for d6487a2

• resolved merge conflict

  alicehsiao

  committed
  389d78e

  Copy full SHA for 389d78e

• Worked on App

  alicehsiao

  committed
  448f24b

  Copy full SHA for 448f24b

• Sent in path to library component

  alicehsiao

  committed
  ec1aa80

  Copy full SHA for ec1aa80

• adjusted library

  katietj

  committed
  d76426b

  Copy full SHA for d76426b

• fixed merge issue

  katietj

  committed
  30efa66

  Copy full SHA for 30efa66

• library component shows movie components

  katietj

  committed
  6589212

  Copy full SHA for 6589212

• fixed error handling

  katietj

  committed
  1289354

  Copy full SHA for 1289354

• Selected Movie Shows up

  alicehsiao

  committed
  9aba434

  Copy full SHA for 9aba434

• Updated to live search

  alicehsiao

  committed
  9a69e57

  Copy full SHA for 9a69e57

• added customer components

  katietj

  committed
  84a44a9

  Copy full SHA for 84a44a9

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

  Show description for 6e9d78b
  katietj

  committed
  6e9d78b

  Copy full SHA for 6e9d78b

• rentals added

  katietj

  committed
  f22bacf

  Copy full SHA for f22bacf

Commits on Dec 19, 2018

• Movies Checked Out count changes upon rental

  alicehsiao

  committed
  e825a6f

  Copy full SHA for e825a6f

• Cleaned up the search functionality

  alicehsiao

  committed
  7c2ee44

  Copy full SHA for 7c2ee44

• Styled Navbar

  alicehsiao

  committed
  bf08164

  Copy full SHA for bf08164

• Styled home page

  alicehsiao

  committed
  f1cee3a

  Copy full SHA for f1cee3a

• Styled library, search, and movie components

  alicehsiao

  committed
  fce121b

  Copy full SHA for fce121b

• Adjusted spacing in movie layout

  alicehsiao

  committed
  228c74e

  Copy full SHA for 228c74e

• Styled customer cards

  alicehsiao

  committed
  fdb0834

  Copy full SHA for fdb0834

• Styled customer cards

  alicehsiao

  committed
  8db4ac3

  Copy full SHA for 8db4ac3

• Selected movie is clickable in library

  alicehsiao

  committed
  70158c3

  Copy full SHA for 70158c3

• Removed overlay from search results

  alicehsiao

  committed
  2469579

  Copy full SHA for 2469579

• styled button

  katietj

  committed
  db93729

  Copy full SHA for db93729

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

  Show description for adaad92
  katietj

  committed
  adaad92

  Copy full SHA for adaad92

• Fixed customers list state

  alicehsiao

  committed
  9d19b75

  Copy full SHA for 9d19b75

• styling of buttons

  katietj

  committed
  bc3d911

  Copy full SHA for bc3d911

• fixed merge conflict

  katietj

  committed
  6220e66

  Copy full SHA for 6220e66

• Updated error message display

  alicehsiao

  committed
  0d7ed0c

  Copy full SHA for 0d7ed0c

• styling button

  katietj

  committed
  07477bc

  Copy full SHA for 07477bc

• added styling

  katietj

  committed
  1b123c1

  Copy full SHA for 1b123c1

• Chose colors and styles for video

  alicehsiao

  committed
  6cdcf23

  Copy full SHA for 6cdcf23

• deploy to gh pages setup

  alicehsiao

  committed
  1ce4fc1

  Copy full SHA for 1ce4fc1

• Changed website location

  alicehsiao

  committed
  b0bd360

  Copy full SHA for b0bd360

• updated website name

  alicehsiao

  committed
  ee4b03d

  Copy full SHA for ee4b03d

Commits on Dec 20, 2018

• Substituted Local Host 3000

  alicehsiao

  committed
  762089d

  Copy full SHA for 762089d

• Changed flex

  alicehsiao

  committed
  30ea589

  Copy full SHA for 30ea589

Commits on Dec 21, 2018

• Updated error messages in router

  alicehsiao

  committed
  6f90dd5

  Copy full SHA for 6f90dd5