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.

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

Brenda, Wini, Hannah - VSC - Octos #9

Open
wants to merge 50 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
4b1b251
Added axios to project.
brendarios Jun 18, 2018
394e6b6
Added movie, customer and container components files.
brendarios Jun 18, 2018
5bca802
added functions to get movies and get customers from the api.
brendarios Jun 18, 2018
5ad6ddd
working on passing library data to customer and movie collection to e…
brendarios Jun 18, 2018
cbde526
changes
winirarrazaval Jun 18, 2018
595d536
Merge branch 'master' of https://github.com/hannahlcameron/video-stor…
winirarrazaval Jun 18, 2018
c9ae170
we are getting every title
winirarrazaval Jun 18, 2018
25a130f
we can reach all the info
winirarrazaval Jun 18, 2018
0b905ac
ve have our data working in the react part
winirarrazaval Jun 19, 2018
d0ae03f
added the browser router to have the links to library and customers.
brendarios Jun 19, 2018
d57a664
Added a search form component and added links to home and search.
brendarios Jun 19, 2018
0a7b1f5
added form to search form component.
brendarios Jun 19, 2018
5a66892
added onclick event to select a movie.
brendarios Jun 19, 2018
048b550
added state for the selected movie.
brendarios Jun 19, 2018
72caf22
added state to customers to select a customer.
brendarios Jun 19, 2018
cf921a4
now container component have the state of the customer.
brendarios Jun 19, 2018
905c980
now container component sets the state of the movie.
brendarios Jun 19, 2018
19bff8d
added a callback to be able to set state in container for customer an…
winirarrazaval Jun 19, 2018
0edbda4
added the correct button movie. Either add to library and selecting a…
winirarrazaval Jun 19, 2018
889d4f2
working on adding a movie to the library.
brendarios Jun 19, 2018
41f29d6
Added addmovietolibrary function to be able to add a movie to the lib…
brendarios Jun 19, 2018
04f4321
got the customer Id to be sent in the axios post to create a new rental
winirarrazaval Jun 19, 2018
f61a56e
we are able to make rentals
winirarrazaval Jun 19, 2018
78cc955
changes
hannahlcameron Jun 20, 2018
92dea5a
Merge branch 'master' of https://github.com/hannahlcameron/video-stor…
hannahlcameron Jun 20, 2018
92862e6
Added Status component and added status and error messages to all whe…
brendarios Jun 20, 2018
c3783f9
added new props to movie
winirarrazaval Jun 20, 2018
6882569
added css to movie component
winirarrazaval Jun 20, 2018
cd090cc
added some css
winirarrazaval Jun 20, 2018
508ed51
adding some css
winirarrazaval Jun 20, 2018
a6b43c4
did some css
winirarrazaval Jun 20, 2018
ee0a29e
Merge branch 'master' of https://github.com/hannahlcameron/video-stor…
hannahlcameron Jun 20, 2018
a2a8987
Cleaning and indentation.
brendarios Jun 20, 2018
84e48a6
Added styling to the nav bar.
brendarios Jun 21, 2018
de67cb1
Added styling for search, customers.
brendarios Jun 21, 2018
9831d10
Merge branch 'master' of https://github.com/hannahlcameron/video-stor…
hannahlcameron Jun 21, 2018
ce389cb
Added a footer.
brendarios Jun 21, 2018
fa6a211
Added styling to the customers list
brendarios Jun 21, 2018
06b8b23
attempted changed to page layout
hannahlcameron Jun 21, 2018
fec6c9c
Merge branch 'master' of https://github.com/hannahlcameron/video-stor…
hannahlcameron Jun 21, 2018
7f38733
movie container redesigned
hannahlcameron Jun 22, 2018
8e58202
refigured title and release date to next to image
hannahlcameron Jun 22, 2018
05ea819
Styling search button.
brendarios Jun 22, 2018
c36ce82
added some changes making many grid objects
winirarrazaval Jun 22, 2018
6fe0d58
added some css to general layoutç
winirarrazaval Jun 22, 2018
94e2052
added more css for the page layout
winirarrazaval Jun 22, 2018
58e2a49
Styling search button and fixing conflicts.
brendarios Jun 22, 2018
427ade8
Merge branch 'master' of https://github.com/hannahlcameron/video-stor…
winirarrazaval Jun 22, 2018
20cca84
added some more css for display
winirarrazaval Jun 22, 2018
f66e383
added some more css for page display
winirarrazaval Jun 22, 2018
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 VideoStoreConsumer-API
Submodule VideoStoreConsumer-API added at d2a343
Loading