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

Ampers: Zheng, Alex #4

Open
wants to merge 35 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
ee83a03
movie collection and movie components created
brownav Jun 18, 2018
d0d113e
Show Movie List when button clicked
2020dream Jun 19, 2018
e09f53b
Run npm install --save react-router
2020dream Jun 19, 2018
c50930c
Use route to show MovieCollection
2020dream Jun 19, 2018
fc22f66
customer and search movies components added
brownav Jun 19, 2018
40d1c39
fixed url for customers
brownav Jun 19, 2018
52bad55
Show selectedMovie on Header
2020dream Jun 19, 2018
6e7bb74
Merge branch 'master' of https://github.com/brownav/video-store-consumer
2020dream Jun 19, 2018
b6bb6e7
Show selectedCustomer and SearchMovie component
2020dream Jun 19, 2018
6226f2c
searchMovie component renders movies based on query
brownav Jun 19, 2018
4c4d6c5
Add movie to library
2020dream Jun 19, 2018
ebec424
Fix spaceing bug
2020dream Jun 19, 2018
2a9e8c8
creates new rental
brownav Jun 19, 2018
ca9be32
Style App, MovieCollection, CustomerCollection
2020dream Jun 19, 2018
45a59a1
movie styling
brownav Jun 19, 2018
3de8425
customer styling
brownav Jun 19, 2018
fed7d06
Adjust style for Movie
2020dream Jun 19, 2018
84314d3
Resolve merge conflict
2020dream Jun 19, 2018
d5bab9e
moved styling for card from cardcollection to card
brownav Jun 19, 2018
38debcf
More styling
2020dream Jun 20, 2018
b08ae18
removed unnecessary logging
brownav Jun 20, 2018
b665b77
Merge branch 'master' of https://github.com/brownav/video-store-consumer
brownav Jun 20, 2018
f437598
static header when page is scrolled and flash message when user makes…
brownav Jun 20, 2018
58d19a5
Show message and clear movie title and customer name after making a r…
2020dream Jun 20, 2018
c4653cd
Merge branch 'master' of https://github.com/brownav/video-store-consumer
2020dream Jun 20, 2018
9376d58
rental notification and static header
brownav Jun 20, 2018
62c1cd5
Clear selectedMovie and selectedCustomer after making a rental
2020dream Jun 20, 2018
f280d02
minor styling
brownav Jun 20, 2018
a5466e1
Merge branch 'master' of https://github.com/brownav/video-store-consumer
brownav Jun 20, 2018
381a17a
Refactor codes
2020dream Jun 20, 2018
9a1ede3
Update URL with AWS backend link
2020dream Jun 20, 2018
afd9e11
Set up repo
2020dream Jun 20, 2018
a41bd96
Use heroku backend deployment
2020dream Jun 20, 2018
8dd2225
Show message after adding a new movie
brownav Jun 21, 2018
2eec7d5
Fix route bug
brownav Jun 21, 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
181 changes: 181 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,22 @@
"name": "video-store-consumer",
"version": "0.1.0",
"private": true,
"homepage": "http://brownav.github.io/video-store-consumer",
"dependencies": {
"axios": "^0.18.0",
"gh-pages": "^1.2.0",
"react": "^16.4.1",
"react-dom": "^16.4.1",
"react-router": "^4.3.1",
"react-router-dom": "^4.3.1",
"react-scripts": "1.1.4"
},
"scripts": {
"predeploy": "npm run build",
"deploy": "gh-pages -d build",
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test --env=jsdom",
"eject": "react-scripts eject"
}
}
}
54 changes: 39 additions & 15 deletions src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,51 @@
text-align: center;
}

.App-logo {
animation: App-logo-spin infinite 20s linear;
height: 80px;
header {
display: grid;
grid-template-columns: 1fr 1fr 1fr 2.5fr 2.5fr 150px;
grid-gap: 15px;
align-items: center;
padding: 10px;
background: #7d9174;
}

.App-header {
background-color: #222;
height: 150px;
padding: 20px;
color: white;
.fixed-header {
position: fixed;
top: 0;
left: 0;
width: 100%;
z-index: 99;
}

.movie-selection {
margin-left: 50px;
}

header p {
text-align: center;
font-size: 20px;
margin: 5px 10px;
}

.App-title {
font-size: 1.5em;
.button, button {
text-align: center;
text-decoration: none;
font-size: 20px;
color: white;
background: #97c689;
border: none;
padding: 8px;
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
}

.App-intro {
font-size: large;
.button:hover, button:hover {
color: #24700d;
}

@keyframes App-logo-spin {
from { transform: rotate(0deg); }
to { transform: rotate(360deg); }
.notification {
display: flex;
justify-content: center;
margin: 0px;
background: #ffcc5e;
}
Loading