Code

FIRE - Pauline and Tram #9

Code

Open

trambui09 wants to merge 57 commits intoAda-C14:masterAda-C14/video-store-consumer:masterfrom ghostfruitleaf:masterghostfruitleaf/video-store-consumer:masterCopy head branch name to clipboard

Commits

Commits on Jan 20, 2021

• added the react router

  trambui09

  committed
  917a0ff

  Copy full SHA for 917a0ff

• fixed double quote imports to single

  ghostfruitleaf

  committed
  004f1ff

  Copy full SHA for 004f1ff

• put yarn.lock into gitignore

  trambui09

  committed
  ef11fda

  Copy full SHA for ef11fda

• added empty component files

  ghostfruitleaf

  committed
  6953029

  Copy full SHA for 6953029

• changed the single quote

  trambui09

  committed
  06d0406

  Copy full SHA for 06d0406

• pauline added the routes as components

  trambui09

  committed
  d522b2b

  Copy full SHA for d522b2b

• laid on the groundworks with react router:

  trambui09

  committed
  4d305a3

  Copy full SHA for 4d305a3

• added useEffect

  trambui09

  committed
  7d9ea48

  Copy full SHA for 7d9ea48

• started on skeleton to video all videos on /videos

  ghostfruitleaf

  committed
  4913930

  Copy full SHA for 4913930

• no axios in project??? hopefully doesn't cause merge conflict

  ghostfruitleaf

  committed
  530c3d7

  Copy full SHA for 530c3d7

• can list all videos in /library

  ghostfruitleaf

  committed
  be615ba

  Copy full SHA for be615ba

• styling added

  ghostfruitleaf

  committed
  2cca655

  Copy full SHA for 2cca655

• can select video, needs styling

  ghostfruitleaf

  committed
  0500551

  Copy full SHA for 0500551

• some formatting for selected video

  ghostfruitleaf

  committed
  4caf56d

  Copy full SHA for 4caf56d

• something changed but idk what?:

  ghostfruitleaf

  committed
  cf21901

  Copy full SHA for cf21901

• added package-lock.json into gitignore and rendered customer list in customer component

  trambui09

  committed
  09003a6

  Copy full SHA for 09003a6

• add the css files and button to customer comp

  trambui09

  committed
  dbb7a50

  Copy full SHA for dbb7a50

• added button to choose selected customer and persist it

  trambui09

  committed
  8d83352

  Copy full SHA for 8d83352

• styling on the customer and customers comps

  trambui09

  committed
  cbec8ec

  Copy full SHA for cbec8ec

• updated css for customer comp

  trambui09

  committed
  3d3a748

  Copy full SHA for 3d3a748

• added .env to gitignore

  trambui09

  committed
  2289bbf

  Copy full SHA for 2289bbf

• search bar functionality

  trambui09

  committed
  d794170

  Copy full SHA for d794170

Commits on Jan 21, 2021

• debugged previous edits, results are pulling but not rendering

  ghostfruitleaf

  committed
  1daa0ef

  Copy full SHA for 1daa0ef

• results need to render upon submit

  ghostfruitleaf

  committed
  714c173

  Copy full SHA for 714c173

• updated, but still fixing

  ghostfruitleaf

  committed
  0d69531

  Copy full SHA for 0d69531

• search now working, need add to video functionality

  ghostfruitleaf

  committed
  5356d91

  Copy full SHA for 5356d91

• videoList moved up to App.js

  ghostfruitleaf

  committed
  458fb8a

  Copy full SHA for 458fb8a

• checkout functionality

  trambui09

  committed
  322d594

  Copy full SHA for 322d594

• seach funtionality and css

  trambui09

  committed
  49a2146

  Copy full SHA for 49a2146

• videoList moved up to App.js

  ghostfruitleaf

  committed
  57c69fc

  Copy full SHA for 57c69fc

• resolved merge conflicts

  trambui09

  committed
  f294810

  Copy full SHA for f294810

• getting ready to put in add functionality

  ghostfruitleaf

  committed
  584682d

  Copy full SHA for 584682d

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

  ghostfruitleaf

  committed
  d0f3eb6

  Copy full SHA for d0f3eb6

• conditional buttons on search result videos working

  ghostfruitleaf

  committed
  f6dacff

  Copy full SHA for f6dacff

• alert to pop up

  trambui09

  committed
  665d3d9

  Copy full SHA for 665d3d9

• paulines edits

  trambui09

  committed
  32f5236

  Copy full SHA for 32f5236

• saving work

  ghostfruitleaf

  committed
  384dce7

  Copy full SHA for 384dce7

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

  ghostfruitleaf

  committed
  6ff1af0

  Copy full SHA for 6ff1af0

• new package added

  ghostfruitleaf

  committed
  d98d16a

  Copy full SHA for d98d16a

• useState for inventory drop down

  ghostfruitleaf

  committed
  466135f

  Copy full SHA for 466135f

• added option to select inventory

  ghostfruitleaf

  committed
  9fee2fc

  Copy full SHA for 9fee2fc

• still need to style buttons

  ghostfruitleaf

  committed
  4884ace

  Copy full SHA for 4884ace

• successfully can add videos, but getting a strange warning in rails api

  ghostfruitleaf

  committed
  7609eac

  Copy full SHA for 7609eac

• now updates library when new video successfully added

  ghostfruitleaf

  committed
  46e1d95

  Copy full SHA for 46e1d95

• retains flash messages while updating videos

  ghostfruitleaf

  committed
  95dfbeb

  Copy full SHA for 95dfbeb

• finally fixed video update without a million re renderings

  ghostfruitleaf

  committed
  7caf485

  Copy full SHA for 7caf485

• still cannot identify extra parameter created

  ghostfruitleaf

  committed
  c179944

  Copy full SHA for c179944

• disregarding phantom videos param, seems to work overall

  ghostfruitleaf

  committed
  8c04121

  Copy full SHA for 8c04121

• added error message for rental of movie with no available inventory

  ghostfruitleaf

  committed
  f584a90

  Copy full SHA for f584a90

• needed to fix test to account for react-alert

  ghostfruitleaf

  committed
  383f057

  Copy full SHA for 383f057

• added note on test to print to console regarding react-alert

  ghostfruitleaf

  committed
  5af850b

  Copy full SHA for 5af850b

• navbar styling css

  trambui09

  committed
  d482f64

  Copy full SHA for d482f64

• search page form to be in the center

  trambui09

  committed
  5e201b9

  Copy full SHA for 5e201b9

• fixed the persisting problem of router

  trambui09

  committed
  1ae8b80

  Copy full SHA for 1ae8b80

• nav_bar completed

  trambui09

  committed
  22bb7c7

  Copy full SHA for 22bb7c7

• rental section css

  trambui09

  committed
  9cba029

  Copy full SHA for 9cba029

• homepage banner and footer

  trambui09

  committed
  71cdea4

  Copy full SHA for 71cdea4