Code

Angela and Maja Octos#11

Code

Open

mgraonic wants to merge 58 commits intoAda-C9:masterAda-C9/video-store-consumer:masterfrom mgraonic:mastermgraonic/video-store-consumer:masterCopy head branch name to clipboard

Commits

Commits on Jun 18, 2018

• one route working

  mgraonic

  committed
  ba7391b

  Copy full SHA for ba7391b

• customer list and customer components created; can send get request and parse results

  mgraonic

  committed
  4df3761

  Copy full SHA for 4df3761

• Created MovieLibrary and Movie component, wrote get call to rails API for library list

  knockknockhusthere

  committed
  1f62594

  Copy full SHA for 1f62594

• created a search bar form - not yet rendering

  knockknockhusthere

  committed
  855afb6

  Copy full SHA for 855afb6

Commits on Jun 19, 2018

• added search bar, changes state on input

  knockknockhusthere

  committed
  20b1dd6

  Copy full SHA for 20b1dd6

• added search bar functionality, movies load after query submitted

  knockknockhusthere

  committed
  0598818

  Copy full SHA for 0598818

• built out movie component, with button

  knockknockhusthere

  committed
  9671f74

  Copy full SHA for 9671f74

• can add movie from search to api local db

  mgraonic

  committed
  396592b

  Copy full SHA for 396592b

• started rental info component

  mgraonic

  committed
  8d843e8

  Copy full SHA for 8d843e8

• html for rentalinfo component

  knockknockhusthere

  committed
  f8214cc

  Copy full SHA for f8214cc

• testing if changes go up

  mgraonic

  committed
  93f4487

  Copy full SHA for 93f4487

• merge conflict rez

  mgraonic

  committed
  89ca35d

  Copy full SHA for 89ca35d

• recovering form a change

  mgraonic

  committed
  bb28350

  Copy full SHA for bb28350

• moved rentalinfo into app.js render components differently

  knockknockhusthere

  committed
  a5a2a98

  Copy full SHA for a5a2a98

Commits on Jun 20, 2018

• function skeleton in app component

  mgraonic

  committed
  4bd8707

  Copy full SHA for 4bd8707

• can update app state with movie name

  mgraonic

  committed
  c240128

  Copy full SHA for c240128

• moved selected customer and movie into app.js

  knockknockhusthere

  committed
  c911e18

  Copy full SHA for c911e18

• resolved merge conflicts

  knockknockhusthere

  committed
  b0581c6

  Copy full SHA for b0581c6

• can check out a rental

  mgraonic

  committed
  88b4090

  Copy full SHA for 88b4090

• rental clean up

  mgraonic

  committed
  61dfdaa

  Copy full SHA for 61dfdaa

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

  knockknockhusthere

  committed
  c799c2d

  Copy full SHA for c799c2d

• added background image

  knockknockhusthere

  committed
  6c67c67

  Copy full SHA for 6c67c67

• playing around with the ui

  knockknockhusthere

  committed
  c7ed4ba

  Copy full SHA for c7ed4ba

• fixed css scroll

  knockknockhusthere

  committed
  c872534

  Copy full SHA for c872534

• moved html elements around for styling

  knockknockhusthere

  committed
  4bd9d96

  Copy full SHA for 4bd9d96

• merging

  mgraonic

  committed
  784a367

  Copy full SHA for 784a367

• resized for more flexibility

  knockknockhusthere

  committed
  c4104fb

  Copy full SHA for c4104fb

• merging

  mgraonic

  committed
  a81808c

  Copy full SHA for a81808c

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

  mgraonic

  committed
  e1d14b3

  Copy full SHA for e1d14b3

• fixed buttons or something

  knockknockhusthere

  committed
  7a2e8ee

  Copy full SHA for 7a2e8ee

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

  mgraonic

  committed
  94eff42

  Copy full SHA for 94eff42

• button styling

  knockknockhusthere

  committed
  a1e98f7

  Copy full SHA for a1e98f7

• nav bar styling

  knockknockhusthere

  committed
  1656a76

  Copy full SHA for 1656a76

• aligned movie library

  mgraonic

  committed
  15772cc

  Copy full SHA for 15772cc

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

  mgraonic

  committed
  2f7e587

  Copy full SHA for 2f7e587

• adding css files

  mgraonic

  committed
  6d281d9

  Copy full SHA for 6d281d9

• formatted nav bar and added scroll bar fix

  knockknockhusthere

  committed
  1b901a9

  Copy full SHA for 1b901a9

• styling search page

  mgraonic

  committed
  fee38fc

  Copy full SHA for fee38fc

• merging

  mgraonic

  committed
  5d35596

  Copy full SHA for 5d35596

• styling header

  mgraonic

  committed
  fa37ae4

  Copy full SHA for fa37ae4

• added footer

  knockknockhusthere

  committed
  b0e66ea

  Copy full SHA for b0e66ea

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

  knockknockhusthere

  committed
  78b2470

  Copy full SHA for 78b2470

• added nav bar line styling

  knockknockhusthere

  committed
  4cfb74a

  Copy full SHA for 4cfb74a

• merging base component styling with app styling

  mgraonic

  committed
  e92d1fa

  Copy full SHA for e92d1fa

Commits on Jun 21, 2018

• linting

  mgraonic

  committed
  9b708b9

  Copy full SHA for 9b708b9

• added propTypes to customer and customerList

  knockknockhusthere

  committed
  7d25ae3

  Copy full SHA for 7d25ae3

• merging files

  knockknockhusthere

  committed
  90ea2fa

  Copy full SHA for 90ea2fa

• moved lines around

  knockknockhusthere

  committed
  bf87518

  Copy full SHA for bf87518

• cannot add same movie to movie library; ruby validation done

  mgraonic

  committed
  d881ccf

  Copy full SHA for d881ccf

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

  mgraonic

  committed
  ed1e018

  Copy full SHA for ed1e018

• fixed alignment on movies

  knockknockhusthere

  committed
  95dcc8b

  Copy full SHA for 95dcc8b

• fixed image reconstruction issue

  mgraonic

  committed
  45a0b2f

  Copy full SHA for 45a0b2f

Commits on Jun 22, 2018

• changed logo color

  mgraonic

  committed
  76f6463

  Copy full SHA for 76f6463

• added status messages

  knockknockhusthere

  committed
  01d83e3

  Copy full SHA for 01d83e3

• updated status message text

  knockknockhusthere

  committed
  7f90373

  Copy full SHA for 7f90373

• status messages clear

  mgraonic

  committed
  69d37a2

  Copy full SHA for 69d37a2

• cleaned up props

  mgraonic

  committed
  36502ed

  Copy full SHA for 36502ed

• added console log styling

  mgraonic

  committed
  9c45b2b

  Copy full SHA for 9c45b2b