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

Angela and Maja Octos #11

Open
wants to merge 58 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
ba7391b
one route working
mgraonic Jun 18, 2018
4df3761
customer list and customer components created; can send get request a…
mgraonic Jun 18, 2018
1f62594
Created MovieLibrary and Movie component, wrote get call to rails API…
knockknockhusthere Jun 18, 2018
855afb6
created a search bar form - not yet rendering
knockknockhusthere Jun 18, 2018
20b1dd6
added search bar, changes state on input
knockknockhusthere Jun 19, 2018
0598818
added search bar functionality, movies load after query submitted
knockknockhusthere Jun 19, 2018
9671f74
built out movie component, with button
knockknockhusthere Jun 19, 2018
396592b
can add movie from search to api local db
mgraonic Jun 19, 2018
8d843e8
started rental info component
mgraonic Jun 19, 2018
f8214cc
html for rentalinfo component
knockknockhusthere Jun 19, 2018
93f4487
testing if changes go up
mgraonic Jun 19, 2018
89ca35d
merge conflict rez
mgraonic Jun 19, 2018
bb28350
recovering form a change
mgraonic Jun 19, 2018
a5a2a98
moved rentalinfo into app.js render components differently
knockknockhusthere Jun 19, 2018
4bd8707
function skeleton in app component
mgraonic Jun 20, 2018
c240128
can update app state with movie name
mgraonic Jun 20, 2018
c911e18
moved selected customer and movie into app.js
knockknockhusthere Jun 20, 2018
b0581c6
resolved merge conflicts
knockknockhusthere Jun 20, 2018
88b4090
can check out a rental
mgraonic Jun 20, 2018
61dfdaa
rental clean up
mgraonic Jun 20, 2018
c799c2d
Merge branch 'master' of https://github.com/mgraonic/video-store-cons…
knockknockhusthere Jun 20, 2018
6c67c67
added background image
knockknockhusthere Jun 20, 2018
c7ed4ba
playing around with the ui
knockknockhusthere Jun 20, 2018
c872534
fixed css scroll
knockknockhusthere Jun 20, 2018
4bd9d96
moved html elements around for styling
knockknockhusthere Jun 20, 2018
784a367
merging
mgraonic Jun 20, 2018
c4104fb
resized for more flexibility
knockknockhusthere Jun 20, 2018
a81808c
merging
mgraonic Jun 20, 2018
e1d14b3
Merge branch 'master' of https://github.com/mgraonic/video-store-cons…
mgraonic Jun 20, 2018
7a2e8ee
fixed buttons or something
knockknockhusthere Jun 20, 2018
94eff42
Merge branch 'master' of https://github.com/mgraonic/video-store-cons…
mgraonic Jun 20, 2018
a1e98f7
button styling
knockknockhusthere Jun 20, 2018
1656a76
nav bar styling
knockknockhusthere Jun 20, 2018
15772cc
aligned movie library
mgraonic Jun 20, 2018
2f7e587
Merge branch 'master' of https://github.com/mgraonic/video-store-cons…
mgraonic Jun 20, 2018
6d281d9
adding css files
mgraonic Jun 20, 2018
1b901a9
formatted nav bar and added scroll bar fix
knockknockhusthere Jun 20, 2018
fee38fc
styling search page
mgraonic Jun 20, 2018
5d35596
merging
mgraonic Jun 20, 2018
fa37ae4
styling header
mgraonic Jun 20, 2018
b0e66ea
added footer
knockknockhusthere Jun 20, 2018
78b2470
Merge branch 'master' of https://github.com/mgraonic/video-store-cons…
knockknockhusthere Jun 20, 2018
4cfb74a
added nav bar line styling
knockknockhusthere Jun 20, 2018
e92d1fa
merging base component styling with app styling
mgraonic Jun 20, 2018
9b708b9
linting
mgraonic Jun 21, 2018
7d25ae3
added propTypes to customer and customerList
knockknockhusthere Jun 21, 2018
90ea2fa
merging files
knockknockhusthere Jun 21, 2018
bf87518
moved lines around
knockknockhusthere Jun 21, 2018
d881ccf
cannot add same movie to movie library; ruby validation done
mgraonic Jun 21, 2018
ed1e018
Merge branch 'master' of https://github.com/mgraonic/video-store-cons…
mgraonic Jun 21, 2018
95dcc8b
fixed alignment on movies
knockknockhusthere Jun 21, 2018
45a0b2f
fixed image reconstruction issue
mgraonic Jun 21, 2018
76f6463
changed logo color
mgraonic Jun 22, 2018
01d83e3
added status messages
knockknockhusthere Jun 22, 2018
7f90373
updated status message text
knockknockhusthere Jun 22, 2018
69d37a2
status messages clear
mgraonic Jun 22, 2018
36502ed
cleaned up props
mgraonic Jun 22, 2018
9c45b2b
added console log styling
mgraonic 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
94 changes: 91 additions & 3 deletions package-lock.json

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

5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"axios": "^0.18.0",
"colors": "^1.3.0",
"react": "^16.4.1",
"react-dom": "^16.4.1",
"react-router-dom": "^4.3.1",
"react-scripts": "1.1.4"
},
"scripts": {
Expand All @@ -13,4 +16,4 @@
"test": "react-scripts test --env=jsdom",
"eject": "react-scripts eject"
}
}
}
Binary file modified public/favicon.ico
Binary file not shown.
87 changes: 76 additions & 11 deletions src/App.css
Original file line number Diff line number Diff line change
@@ -1,28 +1,93 @@
.App {
text-align: center;
}

.App-logo {
animation: App-logo-spin infinite 20s linear;
height: 80px;
position: absolute;
background-image: url(https://images.unsplash.com/photo-1505775561242-727b7fba20f0?ixlib=rb-0.3.5&ixid=eyJhcHBfaWQiOjEyMDd9&s=c246da92e7f2654da6c3326e1b35b287&auto=format&fit=crop&w=2850&q=80);
height: 100%;
width: 100%;
color: white;
background-position: fixed;
background-repeat: no-repeat;
background-size: cover;
background-attachment: fixed;
background-size: cover;
}

.App-header {
background-color: #222;
height: 150px;
height: 20%;
padding: 20px;
color: white;
display: grid;
grid-template-columns: 1fr 2.7fr 3fr 1fr;
align-items: center;
}

.App-title {
font-size: 1.5em;
font-size: 2em;
display: inline;
border-right: white 2px solid;
padding-right: 20px;
text-decoration: none;
font-weight: bold;
color: #e31222;
}

.App-intro {
font-size: large;
}

@keyframes App-logo-spin {
from { transform: rotate(0deg); }
to { transform: rotate(360deg); }
.links {
display: grid;
grid-template-columns: 1fr 1fr 1fr;
align-items: center;
}

.selected-items {
display: grid;
grid-template-columns: 1fr 1fr;
align-items: center;
border-left: white 2px solid;
padding: 12px 0;
}

main {
height: 67vh;
background-color: transparent;
overflow: scroll;
}

button {
width: 120px;
height: 50px;
background-color: transparent;
/* border: solid transparent 2px; */
padding: 5px;
margin: 10px;
color: white;
border: solid 2px;
border-radius: 3px;
}

button:hover {
background-color: grey;
}

.page-link {
text-decoration: none;
color: white;
padding: 0px 30px 0px 30px;
}

.page-link:hover {
color: grey;
}

::-webkit-scrollbar {
-webkit-appearance: none;
width: 7px;
}

::-webkit-scrollbar-thumb {
border-radius: 4px;
background-color: rgba(0, 0, 0, .5);
-webkit-box-shadow: 0 0 1px rgba(255, 255, 255, .5);
}
Loading