Code

Branches - Angele and Erika#30

Code

Open

geli-gel wants to merge 40 commits intoAda-C12:masterAda-C12/video-store-consumer:masterfrom emaust:masteremaust/video-store-consumer:masterCopy head branch name to clipboard

+896-13

Commits

Commits on Dec 17, 2019

• React routes for library, search, and customer created

  emaust

  committed
  09d3170

• ignore .env for my skip preflight check problem

  geli-gel

  committed
  dc1f159

• Created home, search, library, and customers components

  emaust

  committed
  e535ebe

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

  emaust

  committed
  e019712

• Created home, library, search, and customer components

  emaust

  committed
  7244ede

Commits on Dec 18, 2019

• Added form for search component. All routes and components created but do not have render or returns in them. Need to comment out routes and imports to work on each without erroring

  emaust

  committed
  3c6d9dd

• noted in gitignore that we set port to 3001

  geli-gel

  committed
  d95f133

• set up basic state of app

  geli-gel

  committed
  053a4a3

• made library and movie functional components - library shows movies from rails db

  geli-gel

  committed
  f130b59

• removed inventory from movie component since it doesn't come from rails response

  geli-gel

  committed
  5edf630

• Search bar external API call successful and appropriately setting searchResults state

  emaust

  committed
  7cbbb19

• added some comments and temporary className to Movie

  geli-gel

  committed
  5bcb09f

• Merge pull request #1 from emaust/ViewAllMoviesInRentalLibrary

  Show description for 26fe8e0
  geli-gel

  authored
  26fe8e0

• Merge branch 'master' into search-external-api

  emaust

  authored
  e172b2f

• Merge pull request #2 from emaust/search-external-api

  Show description for c86fe5d
  emaust

  authored
  c86fe5d

• Movie search results display - no selection button available

  emaust

  committed
  8bc320d

Commits on Dec 19, 2019

• Added bootstrap

  emaust

  committed
  0b6d852

• Able to add movies with button and they show up in Library

  geli-gel

  committed
  72a6357

• Created customer component and attempted to iterate through customer list. Does not work yet.

  emaust

  committed
  b10b402

• Customer list renders on on customer page. Select customer feature not yet implemented.

  emaust

  committed
  5bb7021

• Merge pull request #3 from emaust/select-search-results

  Show description for 82d9205
  geli-gel

  authored
  82d9205

• Merge branch 'master' into customers

  emaust

  committed
  d64976e

• Merge pull request #4 from emaust/customers

  Show description for d64db04
  emaust

  authored
  d64db04

• fixed typos from merge (erika)

  geli-gel

  committed
  c6a711f

• can select movie - stores in state

  geli-gel

  committed
  2653be6

Commits on Dec 20, 2019

• Created movie select and customer select button. Both persist on page re-render

  geli-gel

  committed
  827de54

• Merge pull request #5 from emaust/select-movies-from-library

  Show description for d6703d5
  emaust

  authored
  d6703d5

• check out a movie

  geli-gel

  committed
  23f8b17

• Merge pull request #6 from emaust/check-out

  Show description for fd3e340
  geli-gel

  authored
  fd3e340

• Customer cards styled and complete

  emaust

  committed
  76d77c6

• Merge pull request #7 from emaust/styling

  Show description for 71b94cb
  geli-gel

  authored
  71b94cb

• Movie cards created and bare minimum beauty

  emaust

  committed
  64f3327

• added some style to home page and header

  geli-gel

  committed
  8028fd8

• Merge branch 'master' into styling

  emaust

  authored
  db1561e

• Merge pull request #8 from emaust/styling

  Show description for 6625673
  emaust

  authored
  6625673

• Popcorn search page

  emaust

  committed
  edeba78

• trying to fix something wrong with button

  geli-gel

  committed
  6a1ee40

• fixed the library component to work for both search and select for checkout

  geli-gel

  committed
  5475ea7

• Cleaned up leftover comments

  emaust

  committed
  d7707d9

• Changed home page image

  emaust

  committed
  91ccd50