Code

Earth/Taylor& Beauttie#26

Code

Open

TaylorMililani wants to merge 38 commits intoAda-C14:masterAda-C14/video-store-consumer:masterfrom beauttie:masterbeauttie/video-store-consumer:masterCopy head branch name to clipboard

Commits

Commits on Jan 20, 2021

• Create JS components for video store

  beauttie

  committed
  9781cad

  Copy full SHA for 9781cad

Commits on Jan 21, 2021

• Skeleton of Customers component

  beauttie

  committed
  2fee8d8

  Copy full SHA for 2fee8d8

• created video component

  TaylorMililani

  committed
  25ec8c2

  Copy full SHA for 25ec8c2

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

  Show description for 3c94d34
  TaylorMililani

  committed
  3c94d34

  Copy full SHA for 3c94d34

• created customer component and trying to get async select to work

  TaylorMililani

  committed
  f18f63f

  Copy full SHA for f18f63f

• Use React Router to render components

  beauttie

  committed
  6efb61b

  Copy full SHA for 6efb61b

• uncommented video stuff

  TaylorMililani

  committed
  ececafe

  Copy full SHA for ececafe

• fixed merge conflicts

  TaylorMililani

  committed
  a9e6672

  Copy full SHA for a9e6672

• imported react to customer, server finally starting

  TaylorMililani

  committed
  aac2a85

  Copy full SHA for aac2a85

• Render VideoSearch component

  beauttie

  committed
  39e19a5

  Copy full SHA for 39e19a5

• Remove Async and DRY up component map function

  beauttie

  committed
  696b5b3

  Copy full SHA for 696b5b3

• Resolve merge conflict

  beauttie

  committed
  a2e0d34

  Copy full SHA for a2e0d34

• moved select cust and video functions to app

  TaylorMililani

  committed
  bf47926

  Copy full SHA for bf47926

• added select button to vids

  TaylorMililani

  committed
  9d73ad0

  Copy full SHA for 9d73ad0

• made some changes to app

  TaylorMililani

  committed
  9810113

  Copy full SHA for 9810113

• added cool font

  TaylorMililani

  committed
  1cadaa0

  Copy full SHA for 1cadaa0

• created rental form

  TaylorMililani

  committed
  3dcb5ba

  Copy full SHA for 3dcb5ba

Commits on Jan 22, 2021

• Moved state of video library to App and created addVideo function to pass down as props

  beauttie

  committed
  8226351

  Copy full SHA for 8226351

• Resolve merge conflict

  beauttie

  committed
  205fd0c

  Copy full SHA for 205fd0c

• finally figured out how to format a date after what felt like 7 years

  TaylorMililani

  committed
  075c0a0

  Copy full SHA for 075c0a0

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

  Show description for 7dc5457
  TaylorMililani

  committed
  7dc5457

  Copy full SHA for 7dc5457

• Incorporate CSS into Video components

  beauttie

  committed
  e68a727

  Copy full SHA for e68a727

• selected video not passing correctly to rentalform

  TaylorMililani

  committed
  5b94e74

  Copy full SHA for 5b94e74

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

  Show description for f4e3962
  TaylorMililani

  committed
  f4e3962

  Copy full SHA for f4e3962

• Add CSS to Customer components

  beauttie

  committed
  3f0d222

  Copy full SHA for 3f0d222

• made pic a header

  TaylorMililani

  committed
  2ebcd4b

  Copy full SHA for 2ebcd4b

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

  Show description for 1a9c78c
  TaylorMililani

  committed
  1a9c78c

  Copy full SHA for 1a9c78c

• did a lot of css

  TaylorMililani

  committed
  dda5155

  Copy full SHA for dda5155

• rental is DONE

  TaylorMililani

  committed
  d2e7f46

  Copy full SHA for d2e7f46

• Fix error message pop up

  beauttie

  committed
  ef23852

  Copy full SHA for ef23852

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

  beauttie

  committed
  d627a06

  Copy full SHA for d627a06

• Use CSS Grid for Video Library layout

  beauttie

  committed
  128a8f4

  Copy full SHA for 128a8f4

• Create table for Customer components

  beauttie

  committed
  a0f7d70

  Copy full SHA for a0f7d70

• Put selected customer and video in div container

  beauttie

  committed
  3eac555

  Copy full SHA for 3eac555

• Modify CSS for rental form to use flexbox

  beauttie

  committed
  ca588ed

  Copy full SHA for ca588ed

• Change font of body

  beauttie

  committed
  c29c752

  Copy full SHA for c29c752

• Remove comments from CSS file

  beauttie

  committed
  4b9fdea

  Copy full SHA for 4b9fdea

• Add text and CSS to homepage

  beauttie

  committed
  393ebd0

  Copy full SHA for 393ebd0