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

Aruna & Jackie - Ampers #12

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

Aruna & Jackie - Ampers #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
14317f0
initial commit
aruna79 Jun 18, 2018
d5ce05e
Revert "initial commit"
aruna79 Jun 18, 2018
b884407
Added npm install
Jackiesan Jun 18, 2018
202c31c
Added api tokens
Jackiesan Jun 18, 2018
ff230d8
created components
aruna79 Jun 18, 2018
2cc8f36
Updated url for search collection get request
Jackiesan Jun 19, 2018
39f1f4c
Added render method for Movie component
Jackiesan Jun 19, 2018
ed24235
installed react router dom
Jackiesan Jun 19, 2018
91d28e5
some changes to components
aruna79 Jun 19, 2018
12e858f
resolve merge conflict
aruna79 Jun 19, 2018
afc1944
Added header to app component
Jackiesan Jun 19, 2018
a55b423
implemented customer component
aruna79 Jun 19, 2018
e5c23aa
implemented customercollection component
aruna79 Jun 19, 2018
99a3161
added react routes
aruna79 Jun 19, 2018
62eefbe
resolved merge conflict
aruna79 Jun 19, 2018
1a60107
Created Library component
Jackiesan Jun 19, 2018
de7da88
resolved merge conflict in app
Jackiesan Jun 19, 2018
5b85fda
Updated Movie component to have submit button
Jackiesan Jun 19, 2018
a688a34
added seletedmovie
aruna79 Jun 19, 2018
12d90f4
merge conflict
aruna79 Jun 19, 2018
a4003b6
Updated Search Collection component to render submit form
Jackiesan Jun 19, 2018
86a784f
selects movie and customer
aruna79 Jun 19, 2018
38185f4
merge conflict
aruna79 Jun 19, 2018
0804d04
Added more props to movie component
Jackiesan Jun 20, 2018
80b8589
Merge branch 'master' of https://github.com/aruna79/video-store-consumer
Jackiesan Jun 20, 2018
df5b082
fixed bug in app
aruna79 Jun 20, 2018
44b9786
working on rental
aruna79 Jun 20, 2018
b346b86
Merge branch 'master' of https://github.com/aruna79/video-store-consumer
aruna79 Jun 20, 2018
57568d0
Changed rendering in Movie component to render image rather than url
Jackiesan Jun 20, 2018
99242e1
Merge branch 'master' of https://github.com/aruna79/video-store-consumer
aruna79 Jun 20, 2018
dffe479
merger conflict
aruna79 Jun 20, 2018
a8a95fe
Updated Axios post request in App component
Jackiesan Jun 20, 2018
863b08d
removed console logs in movie and customer component
Jackiesan Jun 20, 2018
45c0ea3
added messages
aruna79 Jun 20, 2018
5259954
added fonts, icons, logo, and stylized main nav bar
Jackiesan Jun 21, 2018
7da9265
Resolved merge conflict in nav bar section of app
Jackiesan Jun 21, 2018
071f52c
Added styling to collection components
Jackiesan Jun 21, 2018
eb08e2c
Added flex to movie search collection
Jackiesan Jun 21, 2018
27010a0
Added gif to home page and updated styling in customer and library co…
Jackiesan 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 .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*
.env
Loading