Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
1921f06
npm install
syrosalynyu Jun 23, 2020
cf40150
added React Router
syrosalynyu Jun 23, 2020
811b952
created 4 new components
syrosalynyu Jun 23, 2020
7e85ccb
Merge pull request #1 from syrosalynyu/react-router
syrosalynyu Jun 23, 2020
469c3bc
created a seach container component
yieknee Jun 24, 2020
4fe1d8b
create a movie component and fill out a rough outline
yieknee Jun 24, 2020
fe2da26
make image show on movie component when rendered
yieknee Jun 24, 2020
e02baca
linked searchComponent
yieknee Jun 24, 2020
5208966
change image_url to imageUrl and render movie component
yieknee Jun 24, 2020
4757e5d
refactor to accomodate changes made to other controllers
yieknee Jun 24, 2020
1707447
created library
yieknee Jun 24, 2020
82d15d2
wrote code to show or not show buttom
yieknee Jun 24, 2020
20cc5ff
created search container
yieknee Jun 24, 2020
ceaf0e4
need to fix customer page and api call. deleted rentals
yieknee Jun 24, 2020
4b41cbe
moved the customers API call back to Customers
syrosalynyu Jun 24, 2020
304196f
fixed indentation
syrosalynyu Jun 24, 2020
cb5b145
added Route to the movie detail page
syrosalynyu Jun 24, 2020
88c3ab5
created Details function
syrosalynyu Jun 24, 2020
64e35a4
Add the showDetailButton props to Movie
syrosalynyu Jun 24, 2020
3980cc7
Merge pull request #2 from syrosalynyu/select-customer-and-movie
syrosalynyu Jun 24, 2020
e303478
Created selected component an added rough outline of how it will look…
yieknee Jun 25, 2020
de20045
import selected to app and created class names
yieknee Jun 25, 2020
e150a04
not sure where these extra files came from
yieknee Jun 25, 2020
33d6425
imported react bootstrap
yieknee Jun 25, 2020
75ab72a
imported selected, added a select customer event handler and a button
yieknee Jun 25, 2020
428881c
add prop for showing not showing selctmovie button
yieknee Jun 25, 2020
3742e69
changed message for successful api post. create select movie ecent ha…
yieknee Jun 25, 2020
3c14481
add select movie button false
yieknee Jun 25, 2020
0f1fd46
reorganized the navbar in App.js
syrosalynyu Jun 25, 2020
1b3660b
added styling to Customers/Home/Seleted
syrosalynyu Jun 25, 2020
c4b84b8
Merge pull request #3 from syrosalynyu/styling-home-customer
syrosalynyu Jun 25, 2020
ecc71db
creade css for library and movie. sorted libray
yieknee Jun 25, 2020
f4cc0cc
Merge branch 'master' of https://github.com/syrosalynyu/video-store-c…
yieknee Jun 25, 2020
0319a85
changed movie sorting algo
yieknee Jun 25, 2020
1e20c75
added css to mage button bigger
yieknee Jun 25, 2020
e2832e6
imported react bootstrap
yieknee Jun 25, 2020
03f499b
import react bootstrap
yieknee Jun 25, 2020
b49562c
removed a empty line
syrosalynyu Jun 25, 2020
1cc4263
removed unneeded buttons from Movie.js
syrosalynyu Jun 25, 2020
176d3f5
no longer rendering Movie functions in Library
syrosalynyu Jun 25, 2020
da6d136
add checkout and return button in App.js
syrosalynyu Jun 25, 2020
343baf3
Merge pull request #4 from syrosalynyu/callback
syrosalynyu Jun 25, 2020
8fd6800
added api calls in App.js PLUS callbacks
syrosalynyu Jun 25, 2020
4cd27bb
added event handler for selected customer
syrosalynyu Jun 25, 2020
429acb8
added event handler for selected movie
syrosalynyu Jun 25, 2020
5944e1d
imported bootstrap
syrosalynyu Jun 26, 2020
10fac66
consolidated css to App.css
syrosalynyu Jun 26, 2020
f02622e
cleared out Library.css
syrosalynyu Jun 26, 2020
ea5db0c
deleted Selected.js
syrosalynyu Jun 26, 2020
1fc79ff
cleaned up unneeded codes
syrosalynyu Jun 26, 2020
a42d984
took care of the Warning messages.
syrosalynyu Jun 26, 2020
7928924
styling
yieknee Jun 26, 2020
cffd93f
fixed styling on details page, libray, and movie
yieknee Jun 26, 2020
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
10,212 changes: 5,713 additions & 4,499 deletions package-lock.json

Large diffs are not rendered by default.

20 changes: 20 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,34 @@
"version": "0.1.1",
"private": true,
"dependencies": {
"3": "^2.1.0",
"-": "0.0.1",
"axios": "^0.19.2",
"bootstrap": "^4.5.0",
"jquery": "^1.9.1",
"react": "^16.13.1",
"react-bootstrap": "^1.0.1",
"react-dom": "^16.13.1",
"react-router": "^5.2.0",
"react-router-dom": "^5.2.0",
"react-scripts": "3.4.1"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test --env=jsdom",
"eject": "react-scripts eject"
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
}
}
246 changes: 230 additions & 16 deletions src/App.css
Original file line number Diff line number Diff line change
@@ -1,28 +1,242 @@
.App {

body {
margin-bottom: 0;
}
.input-group-append .btn {
background-color: #159585;
color: whitesmoke;
}
.camera img{
height: 65vh;
width: 100%;
}
.form-group{
margin: 10px;
}
.form-group button{
background-color: black;
}
.header {
padding-top: 2vh;
text-align: center;
background: #159585;
color: whitesmoke;
height: 80px;
}

.App-logo {
animation: App-logo-spin infinite 20s linear;
height: 80px;
.header a{
color: whitesmoke;
}

.header a:hover{
color: #F5D5C9;
text-decoration: none;
}

.header h2{
font-family: 'MuseoModerno', cursive;
font-weight: 900;
}

.details{
text-align: center;
}
.note {
font-family: 'Open Sans', sans-serif;
background:#F5D5C9;
height: 100%;
text-align: center;
font-size: 25px;
color: rgb(99, 103, 104);
font-weight: 400;
margin-bottom: 0;
}
.note h6{
margin-bottom: 2px;
}
.note p {
margin:2px;
}
.note button{
font-family: 'Open Sans', sans-serif;
margin: 2px;
background-color:whitesmoke;
color: rgb(99, 103, 104);
border-color:rgb(99, 103, 104);
border: solid 2px;
}
.navbar {
display: flex;
list-style: none;
background-color: rgb(99, 103, 104);
justify-content: center;
margin: 0;
}

.navbar a {
font-family: 'MuseoModerno', cursive;
color: whitesmoke;
padding: 14px 20px;
text-decoration: none;
text-align: center;
font-size: 20px;
font-weight: 300px;
}

.navbar a:hover {
text-decoration: none;
color: #F5D5C9;
}
/* Style the navigation bar links */
.navbar ul {
list-style: none;
}

.row {
display: flex;
flex-wrap: wrap;
}

@media screen and (max-width: 700px) {
.row, .navbar {
flex-direction: column;
}
}
.table{
text-align: center;
}

.table th{
font-family: 'MuseoModerno', cursive;
}
table .btn{
margin-top: 6px;
background-color: #159585;
color: whitesmoke;
border-color: whitesmoke;
}
table .hover-row{
height: 20px;
font-family: 'Open Sans', sans-serif;
}

.movie-list {
display: flex;
flex-wrap: wrap;
}
.detail-outer-card{
background-color: whitesmoke;
box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2);
transition: 0.3s;
border-radius: 5px;
padding: 10px;
width: 40vw;
margin-right: auto;
margin-left: auto;
margin-top: 5%;
text-align: center;
}
.detail-card-info-text{
padding-top: 55%
}
.detail-card-info-text p{
font-weight: 500;
font-style: oblique;
}

.detail-card-container {
box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2);
transition: 0.3s;
height: 40vh;
border-radius: 10px;
background-color: #159585;
margin: 15px;
display: flex;
object-fit: cover;
}

.detail-card-container img {
width: 60%;
border-top-left-radius: 10px;
border-bottom-left-radius: 10px;
}

.detail-card-info {
width: 400px;
color: whitesmoke;
font-size: 15px;
text-align: center;
padding: 2px 16px;
font-family: 'MuseoModerno', cursive;
overflow-y: scroll;
}

.detail-card-info p {
font-family: 'Open Sans', sans-serif;
}

.detail-outer-card button{
margin: 3px;
}

******
.card-info-text p{
font-weight: 500;
font-style: oblique;
}

.App-header {
background-color: #222;
height: 150px;
padding: 20px;
color: white;
.outer-card{
background-color: whitesmoke;
box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2);
transition: 0.3s;
border-radius: 5px;
padding: 10px;
width: 30%;
margin: 20px;
text-align: center;
}
.card-info-text{
padding-top: 55%
}
.outer-card button{
font-family: 'Open Sans', sans-serif;
background-color:white;
color: rgb(99, 103, 104);
border-color:rgb(99, 103, 104);
border: solid 2px;
}
.card-container {
box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2);
transition: 0.3s;
height: 40vh;
border-radius: 10px;
background-color: #159585;
margin: 15px;
display: flex;
object-fit: cover;
}

.App-title {
font-size: 1.5em;
.card:hover {
box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2);
}

.App-intro {
font-size: large;
.card-container img {
width: 100%;
border-top-left-radius: 10px;
border-bottom-left-radius: 10px;
}

@keyframes App-logo-spin {
from { transform: rotate(0deg); }
to { transform: rotate(360deg); }
.card-info {
width: 400px;
color: whitesmoke;
font-size: 15px;
text-align: center;
padding: 2px 16px;
font-family: 'MuseoModerno', cursive;
overflow-y: scroll;
}

.card-info p {
font-family: 'Open Sans', sans-serif;
}

Loading