Code

Lily & Phoebe - Ampers#6

Code

Open

pmanni02 wants to merge 74 commits intoAda-C9:masterAda-C9/video-store-consumer:masterfrom pmanni02:masterpmanni02/video-store-consumer:masterCopy head branch name to clipboard

+2,887-337

Commits

Commits on Jun 18, 2018

• package.json

  lillers1122

  committed
  97b880d

  Copy full SHA for 97b880d

• package.json updated

  pmanni02

  committed
  277f9aa

  Copy full SHA for 277f9aa

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

  pmanni02

  committed
  6b2474c

  Copy full SHA for 6b2474c

• local api request works; cannot render yet

  lillers1122

  committed
  f50636b

  Copy full SHA for f50636b

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

  lillers1122

  committed
  894e764

  Copy full SHA for 894e764

• components folder made; generic App.js

  lillers1122

  committed
  004c287

  Copy full SHA for 004c287

• test commit

  lillers1122

  committed
  109781a

  Copy full SHA for 109781a

• creates Tmbd component

  pmanni02

  committed
  9df24a7

  Copy full SHA for 9df24a7

• creates SearchTmbdForm component

  pmanni02

  committed
  e9d973f

  Copy full SHA for e9d973f

• basic movie information shows for all movies

  lillers1122

  committed
  162855a

  Copy full SHA for 162855a

• adds additional logic to search form and passes back term to Tmbd component

  pmanni02

  committed
  60abbcd

  Copy full SHA for 60abbcd

Commits on Jun 19, 2018

• adds axios get request to Tmbd

  pmanni02

  committed
  71cd79e

  Copy full SHA for 71cd79e

• adds logic for hidding/showing components within Tmbd Component

  pmanni02

  committed
  6ace143

  Copy full SHA for 6ace143

• adds TmbdMovie component and renders within Tmbd

  pmanni02

  committed
  38d38ef

  Copy full SHA for 38d38ef

• customer list renders

  lillers1122

  committed
  c8a2a97

  Copy full SHA for c8a2a97

• adds Add Movie button to all movies from search results

  pmanni02

  committed
  fa2f8b1

  Copy full SHA for fa2f8b1

• prepped for merge

  lillers1122

  committed
  302247e

  Copy full SHA for 302247e

• merge resolution

  lillers1122

  committed
  0071f7e

  Copy full SHA for 0071f7e

• post rental works with writing in data

  lillers1122

  committed
  51ae8f6

  Copy full SHA for 51ae8f6

• refactors so that front end is not calling tmbd directly

  pmanni02

  committed
  76915d3

  Copy full SHA for 76915d3

• gets rid of existing code with old api code to tmbd

  pmanni02

  committed
  5d11c65

  Copy full SHA for 5d11c65

• updated App and components to not need form; can return title and c_id on image click

  lillers1122

  committed
  e99add3

  Copy full SHA for e99add3

• can update state on App.js for customer name+id and movie title

  lillers1122

  committed
  c4f5a49

  Copy full SHA for c4f5a49

• merge conflict

  pmanni02

  committed
  cfe4ff5

  Copy full SHA for cfe4ff5

• merge resolution

  lillers1122

  committed
  bdf6e02

  Copy full SHA for bdf6e02

• gets rid of npm cors install

  pmanni02

  committed
  33f106a

  Copy full SHA for 33f106a

• merge conflict fixed

  pmanni02

  committed
  4b9b503

  Copy full SHA for 4b9b503

• rental works; hide and how movies and customers works

  lillers1122

  committed
  ffb208b

  Copy full SHA for ffb208b

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

  lillers1122

  committed
  2c9a9da

  Copy full SHA for 2c9a9da

• adds button for search form

  pmanni02

  committed
  729907e

  Copy full SHA for 729907e

• gets rid of comments

  pmanni02

  committed
  c83dc8f

  Copy full SHA for c83dc8f

• adds function to display status message based on state variable

  pmanni02

  committed
  c68edf1

  Copy full SHA for c68edf1

• adds callbacks from tmbdMovie component to AppJs for posting to backend

  pmanni02

  committed
  12b1a6f

  Copy full SHA for 12b1a6f

• adds timeout for status messages

  pmanni02

  committed
  b6266f0

  Copy full SHA for b6266f0

• basic page header styling

  lillers1122

  committed
  562d51c

  Copy full SHA for 562d51c

• adds function for default image

  pmanni02

  committed
  2803466

  Copy full SHA for 2803466

• merge conflix fixed

  pmanni02

  committed
  f4cf588

  Copy full SHA for f4cf588

• addtional merge conflict fixed

  pmanni02

  committed
  965b2bf

  Copy full SHA for 965b2bf

• refactor app.js layout / search form

  pmanni02

  committed
  12891be

  Copy full SHA for 12891be

• format tweak

  lillers1122

  committed
  6330bf9

  Copy full SHA for 6330bf9

• merge resolution

  lillers1122

  committed
  e5b271d

  Copy full SHA for e5b271d

• base css styling

  lillers1122

  committed
  b48102a

  Copy full SHA for b48102a

• adds initial setup for react-router

  pmanni02

  committed
  1bb74de

  Copy full SHA for 1bb74de

Commits on Jun 20, 2018

• merge conflict resolved

  pmanni02

  committed
  dcbdc39

  Copy full SHA for dcbdc39

• fixes popup messages timeout

  pmanni02

  committed
  b61db85

  Copy full SHA for b61db85

• css styling for most pages

  lillers1122

  committed
  39ceda8

  Copy full SHA for 39ceda8

• fixes status updates

  pmanni02

  committed
  86bc3d7

  Copy full SHA for 86bc3d7

• merge resolution

  lillers1122

  committed
  68295b9

  Copy full SHA for 68295b9

• another merge resolution

  lillers1122

  committed
  70d6747

  Copy full SHA for 70d6747

• code cleanup

  pmanni02

  committed
  21e5719

  Copy full SHA for 21e5719

• merge conflix resolved

  pmanni02

  committed
  b839ea9

  Copy full SHA for b839ea9

• router works

  lillers1122

  committed
  d00212a

  Copy full SHA for d00212a

• adds parameter for inventory

  pmanni02

  committed
  09c964e

  Copy full SHA for 09c964e

• cleaned up files; buttons nested in link tos; cursors back

  lillers1122

  committed
  8edaf69

  Copy full SHA for 8edaf69

• adds logic to prevent duplicates from being added to the library

  pmanni02

  committed
  b356117

  Copy full SHA for b356117

• Merge branch 'duplicate-movies'

  pmanni02

  committed
  b55cf81

  Copy full SHA for b55cf81

• setup for testing

  pmanni02

  committed
  ed388f5

  Copy full SHA for ed388f5

• adds snapshot tests for Customerlist

  pmanni02

  committed
  a13ae6a

  Copy full SHA for a13ae6a

• footer; code clean up

  lillers1122

  committed
  e278a37

  Copy full SHA for e278a37

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

  lillers1122

  committed
  a1a9522

  Copy full SHA for a1a9522

• snapshot test for movie comp.

  pmanni02

  committed
  682db64

  Copy full SHA for 682db64

• snapshot test for rentalList comp.

  pmanni02

  committed
  63def76

  Copy full SHA for 63def76

• snapshot test for searchtmbdform comp.

  pmanni02

  committed
  f686309

  Copy full SHA for f686309

• snapshot test for showmovieresults comp.

  pmanni02

  committed
  7fb3dfc

  Copy full SHA for 7fb3dfc

• snapshot test for tmbd comp.

  pmanni02

  committed
  431a5e7

  Copy full SHA for 431a5e7

• snapshot test for tmbdmovie

  pmanni02

  committed
  b9ed87f

  Copy full SHA for b9ed87f

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

  lillers1122

  committed
  7416aaf

  Copy full SHA for 7416aaf

Commits on Jun 21, 2018

• alt txt added to logo; alerts for adding movie to library

  lillers1122

  committed
  b1b5765

  Copy full SHA for b1b5765

• changes back to localhost from aws instance

  pmanni02

  committed
  5220592

  Copy full SHA for 5220592

Commits on Jun 22, 2018

• refactored/cleaned up tmbd component

  pmanni02

  committed
  8a2d34a

  Copy full SHA for 8a2d34a

• cleaned up tmbdmovie component

  pmanni02

  committed
  72dca37

  Copy full SHA for 72dca37

• cleaned up app component

  pmanni02

  committed
  f8adf6e

  Copy full SHA for f8adf6e

• less space below nav buttons

  lillers1122

  committed
  37af922

  Copy full SHA for 37af922

• code cleanup

  pmanni02

  committed
  734a5c0

  Copy full SHA for 734a5c0