Code

Leaves - Dominique & Yasmin#13

Code

Open

dtaylor73 wants to merge 42 commits intoAda-C12:masterAda-C12/video-store-consumer:masterfrom dtaylor73:masterdtaylor73/video-store-consumer:masterCopy head branch name to clipboard

+807-29

Commits

Commits on Dec 17, 2019

• Added customer components

  YasminM11

  committed
  5c00718

• Minor spacing cleanup

  YasminM11

  committed
  c7d7253

• added button

  YasminM11

  committed
  9e8cffc

• Created new MovieLibrary_Movie_FeatureBranch

  dtaylor73

  committed
  d1ffe73

• add react router to app

  dtaylor73

  committed
  d2d7e15

• refined react routes

  dtaylor73

  committed
  504e9e9

• added on click button to select the customer

  YasminM11

  committed
  591f665

• change App state - current customer

  YasminM11

  committed
  357601c

• finished rental select button in rentallibrary

  dtaylor73

  committed
  8c17a4d

• added home comp

  YasminM11

  committed
  7aa8f31

• Merge pull request #1 from dtaylor73/MovieLibrary_Movie_FeatureBranch

  Show description for 527c9f3
  YasminM11

  authored
  527c9f3

Commits on Dec 18, 2019

• Resolved merge conflict - customer/movie

  YasminM11

  committed
  e90f8e2

• merged branches - clean version

  YasminM11

  committed
  26b7bef

• Merge pull request #4 from dtaylor73/CustomerBranch

  Show description for dabbd68
  YasminM11

  authored
  dabbd68

• merged branches - clean

  dtaylor73

  committed
  f6e97c8

• made moviesearch form

  dtaylor73

  committed
  e38b911

• updated search feature

  dtaylor73

  committed
  2e743af

• added photos to movie search

  dtaylor73

  committed
  b32b457

• finished search results

  dtaylor73

  committed
  a2261ce

• Merge pull request #6 from dtaylor73/MovieLibrary_Movie_FeatureBranch

  Show description for 0d72888
  dtaylor73

  authored
  0d72888

• take out Customer in JSX in App

  YasminM11

  committed
  ff4b894

• sample change

  YasminM11

  committed
  8a72b38

• sample change

  YasminM11

  committed
  4e6a3cb

• made checkout component

  YasminM11

  committed
  1b4428e

• added movie to rental library feature complete

  dtaylor73

  committed
  7039481

• Merge pull request #7 from dtaylor73/MovieLibrary_Movie_FeatureBranch

  Show description for 73a82d6
  dtaylor73

  authored
  73a82d6

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

  YasminM11

  committed
  43a7687

• latest commit

  YasminM11

  committed
  8312440

• Merge branch 'master' into CustomerBranch

  YasminM11

  committed
  1942f5b

• Merge pull request #8 from dtaylor73/CustomerBranch

  Show description for 66e7ed8
  dtaylor73

  authored
  66e7ed8

Commits on Dec 19, 2019

• added checkout functionality to checkout comp

  YasminM11

  committed
  9ab86d6

• added style to customerList and RentalLibrary

  YasminM11

  committed
  21f1010

Commits on Dec 20, 2019

• added style to Movie Search

  YasminM11

  committed
  4932298

• finished presentation version

  dtaylor73

  committed
  88ea83b

• pushed changs

  YasminM11

  committed
  49ecbf6

• finished presentation version 2.0

  dtaylor73

  committed
  5ae5779

• Merge pull request #9 from dtaylor73/MovieLibrary_Movie_FeatureBranch

  Show description for 3742faf
  dtaylor73

  authored
  3742faf

• clean the code

  YasminM11

  committed
  7bf92a8

• Merge branch 'master' into CustomerBranch

  YasminM11

  committed
  e50fcd0

• Merge pull request #10 from dtaylor73/CustomerBranch

  Show description for a1e8d2e
  dtaylor73

  authored
  a1e8d2e

• finished adding colors to finalized version

  dtaylor73

  committed
  03485f7

• Merge pull request #11 from dtaylor73/MovieLibrary_Movie_FeatureBranch

  Show description for f647711
  dtaylor73

  authored
  f647711