Code

Sockets Tatiana and Grace (Gratiana)#16

Code

Open

tatsqui wants to merge 51 commits intoAda-C11:masterAda-C11/video-store-consumer:masterfrom tatsqui:mastertatsqui/video-store-consumer:masterCopy head branch name to clipboard

+1,197-13

Commits

Commits on Jun 24, 2019

• adding initial structure for VideoStore component

  tatsqui

  committed
  89f25d6

Commits on Jun 25, 2019

• setup of components folder and created of library files

  gracemshea

  committed
  bfee07e

• Library.js with imports, class, render and return. Comments added for next steps

  gracemshea

  committed
  0671e12

• Movie.js with imports, const, onMovieClick, movie card, and propTypes

  gracemshea

  committed
  8861030

• componentDidMount and get axios code added to Library.js

  gracemshea

  committed
  558abfc

• findMovieforRental drafted, no sure it works yet

  gracemshea

  committed
  879c403

• git commit, got axios get request to talk to rails api

  tatsqui

  committed
  9a2cd4a

• merging new files frompr into master

  tatsqui

  committed
  5984624

• moved files into src/components

  tatsqui

  committed
  6bcd750

• added customer list and customer cards

  tatsqui

  committed
  a82c1c4

• commented out callback function in Movie

  tatsqui

  committed
  5f527ac

• added key to map function in CustomerList

  tatsqui

  committed
  ab54165

• navmenu js and css created

  gracemshea

  committed
  a4906bf

• movie search js and css created. js file is bare bones currently

  gracemshea

  committed
  c3e6cfa

• working out state in MovieSearch.js

  gracemshea

  committed
  b022d28

• addMovietoLibrary code added to MovieSearch.js

  gracemshea

  committed
  21e7c4e

• Selection.js and Selection.css created

  gracemshea

  committed
  8dc9d46

• added routing to index and created route component

  tatsqui

  committed
  0420e26

• merged grace's inputs

  tatsqui

  committed
  b5635cc

• very very very basic css

  gracemshea

  committed
  8c9a358

• beginning of more substantial styling

  gracemshea

  committed
  b38be27

Commits on Jun 26, 2019

• removed bug with having router in index.js and App

  tatsqui

  committed
  cd5ffba

• merged

  tatsqui

  committed
  12f53b2

• creating smaller functional component for movieRental

  tatsqui

  committed
  d8034bd

• customer list styling

  gracemshea

  committed
  f2f17a9

• search link included, not yet functional. debugging

  gracemshea

  committed
  a40e4c0

• overviews included in the movie cards

  gracemshea

  committed
  9744a19

• writing Rental class to handle rental reservations

  tatsqui

  committed
  909dc06

• added callback function for rental selection, better name home

  tatsqui

  committed
  735724a

• making sure it's all good with the merges

  gracemshea

  committed
  1516996

• navbar styling fixed

  gracemshea

  committed
  efffd0a

• adding form to search or customer

  tatsqui

  committed
  a43fa27

• working on rental reservation func

  tatsqui

  committed
  6153a97

• rental post request works!

  tatsqui

  committed
  a22700c

• merge

  tatsqui

  committed
  4de828b

• renamed selectedCustomer to rentalCustomerID for clarity

  tatsqui

  committed
  e2028df

• working on adding movie to library

  gracemshea

  committed
  f178b76

• clearing out rental info after reservation

  tatsqui

  committed
  249a96b

• merged grace's changes

  tatsqui

  committed
  c61326c

Commits on Jun 27, 2019

• removed inventory (for now) from table

  tatsqui

  committed
  3b918a6

• made rental info (customer and movie) visible everywhere

  tatsqui

  committed
  b6ed11b

• styling of table in rentals and of current selected block

  gracemshea

  committed
  d0d8a06

• quick fix to library header

  gracemshea

  committed
  c83236e

• header added to search page

  gracemshea

  committed
  421c647

• styling of current rental box

  gracemshea

  committed
  3583ee8

Commits on Jun 28, 2019

• styling to search bar

  gracemshea

  committed
  2d10ebf

• adding error display for views

  tatsqui

  committed
  c5e1810

• merge

  tatsqui

  committed
  70b552f

• table styling

  gracemshea

  committed
  a509cef

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

  tatsqui

  committed
  0b00ff5

• merged and tidy up

  tatsqui

  committed
  067f6c1