Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sockets Tatiana and Grace (Gratiana) #16

Open
wants to merge 51 commits into
base: master
Choose a base branch
from
Open

Sockets Tatiana and Grace (Gratiana) #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
89f25d6
adding initial structure for VideoStore component
tatsqui Jun 24, 2019
bfee07e
setup of components folder and created of library files
gracemshea Jun 25, 2019
0671e12
Library.js with imports, class, render and return. Comments added for…
gracemshea Jun 25, 2019
8861030
Movie.js with imports, const, onMovieClick, movie card, and propTypes
gracemshea Jun 25, 2019
558abfc
componentDidMount and get axios code added to Library.js
gracemshea Jun 25, 2019
879c403
findMovieforRental drafted, no sure it works yet
gracemshea Jun 25, 2019
9a2cd4a
git commit, got axios get request to talk to rails api
tatsqui Jun 25, 2019
5984624
merging new files frompr into master
tatsqui Jun 25, 2019
6bcd750
moved files into src/components
tatsqui Jun 25, 2019
a82c1c4
added customer list and customer cards
tatsqui Jun 25, 2019
5f527ac
commented out callback function in Movie
tatsqui Jun 25, 2019
ab54165
added key to map function in CustomerList
tatsqui Jun 25, 2019
a4906bf
navmenu js and css created
gracemshea Jun 25, 2019
c3e6cfa
movie search js and css created. js file is bare bones currently
gracemshea Jun 25, 2019
b022d28
working out state in MovieSearch.js
gracemshea Jun 25, 2019
21e7c4e
addMovietoLibrary code added to MovieSearch.js
gracemshea Jun 25, 2019
8dc9d46
Selection.js and Selection.css created
gracemshea Jun 25, 2019
0420e26
added routing to index and created route component
tatsqui Jun 25, 2019
b5635cc
merged grace's inputs
tatsqui Jun 25, 2019
8c9a358
very very very basic css
gracemshea Jun 25, 2019
b38be27
beginning of more substantial styling
gracemshea Jun 25, 2019
cd5ffba
removed bug with having router in index.js and App
tatsqui Jun 26, 2019
12f53b2
merged
tatsqui Jun 26, 2019
d8034bd
creating smaller functional component for movieRental
tatsqui Jun 26, 2019
f2f17a9
customer list styling
gracemshea Jun 26, 2019
a40e4c0
search link included, not yet functional. debugging
gracemshea Jun 26, 2019
9744a19
overviews included in the movie cards
gracemshea Jun 26, 2019
909dc06
writing Rental class to handle rental reservations
tatsqui Jun 26, 2019
735724a
added callback function for rental selection, better name home
tatsqui Jun 26, 2019
1516996
making sure it's all good with the merges
gracemshea Jun 26, 2019
efffd0a
navbar styling fixed
gracemshea Jun 26, 2019
a43fa27
adding form to search or customer
tatsqui Jun 26, 2019
6153a97
working on rental reservation func
tatsqui Jun 26, 2019
a22700c
rental post request works!
tatsqui Jun 26, 2019
4de828b
merge
tatsqui Jun 26, 2019
e2028df
renamed selectedCustomer to rentalCustomerID for clarity
tatsqui Jun 26, 2019
f178b76
working on adding movie to library
gracemshea Jun 26, 2019
249a96b
clearing out rental info after reservation
tatsqui Jun 26, 2019
c61326c
merged grace's changes
tatsqui Jun 26, 2019
3b918a6
removed inventory (for now) from table
tatsqui Jun 27, 2019
b6ed11b
made rental info (customer and movie) visible everywhere
tatsqui Jun 27, 2019
d0d8a06
styling of table in rentals and of current selected block
gracemshea Jun 27, 2019
c83236e
quick fix to library header
gracemshea Jun 27, 2019
421c647
header added to search page
gracemshea Jun 27, 2019
3583ee8
styling of current rental box
gracemshea Jun 27, 2019
2d10ebf
styling to search bar
gracemshea Jun 28, 2019
c5e1810
adding error display for views
tatsqui Jun 28, 2019
70b552f
merge
tatsqui Jun 28, 2019
a509cef
table styling
gracemshea Jun 28, 2019
0b00ff5
Merge branch 'master' of github.com:tatsqui/video-store-consumer
tatsqui Jun 28, 2019
067f6c1
merged and tidy up
tatsqui Jun 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
MOVIEDB_KEY=92be5c89c62758c5fda36f90ca253798
Loading