Richelle and Rachael - Water - #23

Open

r-spiel wants to merge 35 commits into

Ada-C14:masterfrom

RachaelGomez:master

Commits on Jan 19, 2021

add react router
r-spiel
committed
d369372

Commits on Jan 20, 2021

added routes to library and customers
r-spiel
committed
3485cd7
showing video list
RachaelGomez
committed
b663ffc
render list of customers from local api
r-spiel
committed
1576ed1
Merge branch 'master' into rms/customers
r-spiel
authored
8d4452d
Merge pull request #1 from RachaelGomez/rms/customers
r-spiel
authored
e222cd1
Everything showing for video and library, the beginning of the search component is in there as well
RachaelGomez
committed
1664b38
Merge pull request #2 from RachaelGomez/Video-Branch
RachaelGomez
authored
8ad040c
adding state for selected customer to App
r-spiel
committed
d8d10c4
Merge pull request #3 from RachaelGomez/rms/selectedstate
r-spiel
authored
f062432
added some more bits to the search component
RachaelGomez
committed
5e74b66
Merge branch 'master' of https://github.com/RachaelGomez/video-store-consumer into Video-Branch
RachaelGomez
committed
37552d2

Commits on Jan 21, 2021

Nothing is actually showing up on the search page no matter what I put
RachaelGomez
committed
4c4753b
add state for Library conditionally show checkout button
r-spiel
committed
5e9a079
clean up comments
r-spiel
committed
f73592e
clean up
r-spiel
committed
dcf2fe8
Connecting all of the pieces
RachaelGomez
committed
7df8c94
add dueDate state and function
r-spiel
committed
59a1ee0
Search is working
RachaelGomez
committed
c742c92
date not saving to state
r-spiel
committed
1600642
Merge pull request #4 from RachaelGomez/Video-Branch
RachaelGomez
authored
78565ed
Merge branch 'master' into rms/librarystate
r-spiel
authored
3943541
Merge pull request #5 from RachaelGomez/rms/librarystate
r-spiel
authored
f11ae89

Commits on Jan 22, 2021

Fixing what renders and messing with css
RachaelGomez
committed
92d5840
added proptypes
RachaelGomez
committed
6537422
add movie to api
r-spiel
committed
8a99c97
Merge pull request #6 from RachaelGomez/rms/addnewvideo
r-spiel
authored
11eaffa
Trying to make bootstrap work
RachaelGomez
committed
ca21150
Merge branch 'master' into Add-Vid-Branch
RachaelGomez
authored
9fff07d
Merge pull request #7 from RachaelGomez/Add-Vid-Branch
RachaelGomez
authored
9477bd3
adding package
RachaelGomez
committed
dd38c09
card fix
RachaelGomez
committed
0418e4f
styled the header
RachaelGomez
committed
effc387
styling draft
r-spiel
committed
6c3e4bc
Merge pull request #8 from RachaelGomez/rms/styling
r-spiel
authored
d29cc95