Water - Christabel & Kayla - #25

Open

Kaylaj89 wants to merge 65 commits into

Ada-C14:masterfrom

cescarez:master

Commits on Jan 20, 2021

create Home.js, add React Router import to App.js
cescarez
committed
b9dd478
Added template files for Display components
cescarez
committed
551f59a
Added routes to React components
Kaylaj89
committed
4ba4f8b
Added Base_URL to App.js
Kaylaj89
committed
080ddd9
Video list printing to VideoLibrary component
Kaylaj89
committed
1bcfdcb
checking i saved it all!
cescarez
committed
f8b3d0f
Merge branch 'cbel'
cescarez
committed
83c1859
troubleshooting accessing props in components (baseUrl)
cescarez
committed
0e44d2d
accessing database endopints via a passed in base url
cescarez
committed
ebad72a
Added baseURL via props to VideoLibrary
Kaylaj89
committed
4e3e6df
Added base URL to customer list
Kaylaj89
committed
17f6be4
Added a route for Video.js to App.js
Kaylaj89
committed
081042b
added an s to the video show route
cescarez
committed
dc7b100
changed match function in Video.js
Kaylaj89
committed
02d1e0e
Video printing to console.log in Video.js
Kaylaj89
committed
417f009
Video info displays on screen
cescarez
committed
40f4115
partial implementation of Search functionality/external API request
cescarez
committed
e051d29

Commits on Jan 21, 2021

changed httparty request format in search.js
Kaylaj89
committed
b5fcdce
search will display results
cescarez
committed
d573296
button to add title to library displays conditionally (if title is not already in library)
cescarez
committed
dc4157a
Small change to customerlist and post request language for search.js (not yet working)
Kaylaj89
committed
3ac082d
added boiler plate to display individual customer information
cescarez
committed
aab796e
Merge branch 'master' of https://github.com/cescarez/video-store-consumer
cescarez
committed
245aea9
fixed account credit accessing of response.data
cescarez
committed
a5992cf
Add movie to library implemented (adds all search results)
cescarez
committed
8a7f8bb
select video and session storage implemented
cescarez
committed
257c785
Add video to collection WORKING.
Kaylaj89
committed
19b0458
rental button appears and customer selection/sessionStorage implemented
cescarez
committed
ae96ab3
Added some CSS
Kaylaj89
committed
60bbfa7
moved buttons from nav to app.js
cescarez
committed
05f6961
Added a rental route to App.js via axios
Kaylaj89
committed
04bd2bc
moved Rental buttons/banner from App.js into its own component
cescarez
committed
6a38b00
App.js now managing state for customer list and video list
cescarez
committed
98b0459
fixed ternary for add title to library button
cescarez
committed
6f0738c
callback function implemented for adding title to library
cescarez
committed
bec501b
search results now managed by App
cescarez
committed
9cb280c
added table to customer table
cescarez
committed
db3bc83
baseURL now being passed as prop to Video and CUstomer
cescarez
committed
83fa06f

Commits on Jan 22, 2021

customer show page shows list of current and past rentals
cescarez
committed
0e6f760
current and past rental history displaying on video and customer show pages
cescarez
committed
6ec03b9
CSS for Search mostly done, working on VideoLibrary CSS
Kaylaj89
committed
209939a
Remerging CSS Files
Kaylaj89
committed
3ee70d7
can return videos from customer and video show pages (page needs manual refresh)
cescarez
committed
97e6981
Merge branch 'checkin'
cescarez
committed
b4466b6
moved customer current rental table headers to outside of map function
cescarez
committed
f6b6bee
Added CSS to Video Library
Kaylaj89
committed
7626c51
Merge branch 'CSS_VL' into master
Kaylaj89
committed
89958ae
implemented Rental history state reset (uses returned values of checkin/checkout)
cescarez
committed
d6e8a53
Added Hollywood Video Logo to homepage
Kaylaj89
committed
ba78628
removed all lock files, reran yarn install
cescarez
committed
be134dc
removed all lock files, reran npm install
cescarez
committed
a48a1a9
Finishing up last touches for VideoLibrary
Kaylaj89
committed
d5c6473
Small change to App.css
Kaylaj89
committed
a9043ec
Added some css configuration back into search.css
Kaylaj89
committed
92780c3
Got rid of bullets on video library 'overview' feature
Kaylaj89
committed
f781c5e
Merge branch 'master' into cbel_going_nuts
cescarez
committed
0048468
rental rendering correctly after video selected for rental
cescarez
committed
b362b44
rental renders correctly after customer selection for rental and after checkout
cescarez
committed
2812b68
keys added to listed customers and listed videos
cescarez
committed
72fb661
current rentals/rental history appropriately rendering/state appropriately updating
cescarez
committed
eb867d5
Last changes
Kaylaj89
committed
734590c
Merge pull request #1 from cescarez/FINAL
Kaylaj89
authored
552b38c
Merge branch 'master' of https://github.com/cescarez/video-store-consumer
cescarez
committed
2a47d10
video info and customer info reload after video is returned (and thus currently checked out and available inventory are correct
cescarez
committed
211f51a
implemented overdue red highlighting in customer and video pages
cescarez
committed
22a2a62