Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
436b5b5
Add React Router
Hannah0124 Jun 22, 2020
e75365b
Change from class to function
Hannah0124 Jun 22, 2020
cd1ec08
Update navbar
Hannah0124 Jun 23, 2020
dcacdcb
add TODO comments in suspected locations
seaweeddol Jun 23, 2020
744bc76
merge files
seaweeddol Jun 23, 2020
a82e0d4
Modify Home.js
Hannah0124 Jun 23, 2020
becaf30
Merge branch 'react-router'
Hannah0124 Jun 23, 2020
43ee179
install axios package
seaweeddol Jun 23, 2020
01022af
Solve a merge issue
Hannah0124 Jun 23, 2020
d546edf
Merge branch 'master' of https://github.com/seaweeddol/video-store-co…
seaweeddol Jun 23, 2020
a2d6686
Test axios call
Hannah0124 Jun 23, 2020
80891e1
Merge branch 'master' of https://github.com/seaweeddol/video-store-co…
Hannah0124 Jun 23, 2020
7482efc
add form for submitting search and console.log data
seaweeddol Jun 23, 2020
5ce3d0a
Merge pull request #1 from seaweeddol/movies-search
seaweeddol Jun 23, 2020
3df7042
Update '/movies' route in App, Library and Movie.js
Hannah0124 Jun 23, 2020
648bef3
Update '/customers' route in Customers and Customer.js
Hannah0124 Jun 23, 2020
597fcfb
add Movies to page
seaweeddol Jun 23, 2020
1b989e9
Merge pull request #2 from seaweeddol/search-movie-components
seaweeddol Jun 23, 2020
d1a0e1e
set up callback for selecting customer
seaweeddol Jun 23, 2020
25f39c7
move callback and selectedCustomer to app.js
seaweeddol Jun 23, 2020
9505c54
change onClickCallback to selectCustomerCallback and use selectedCust…
seaweeddol Jun 23, 2020
ec5d6e0
update props and customer info
seaweeddol Jun 23, 2020
4b833c9
Add a 'selectMovie' function
Hannah0124 Jun 23, 2020
f0f83d2
start working on random dog images for each customer
seaweeddol Jun 23, 2020
198edd3
Merge branch 'master' into customer-select
seaweeddol Jun 23, 2020
d3682b7
Merge pull request #3 from seaweeddol/customer-select
seaweeddol Jun 23, 2020
778f326
Add ad 'select Movie' section
Hannah0124 Jun 23, 2020
adab2cc
Made "make rental" work! :D
Hannah0124 Jun 23, 2020
4097c40
update Movie to be reusale in Search and Library
seaweeddol Jun 23, 2020
bc92fe3
Add addMovieCallback in Library.js
Hannah0124 Jun 23, 2020
6c5fd63
Merge branch 'add-movie'
Hannah0124 Jun 23, 2020
3ec1fc9
set up api call for adding movie
seaweeddol Jun 23, 2020
d97e51b
Merge pull request #4 from seaweeddol/add-movie-to-db
seaweeddol Jun 23, 2020
c636a55
update movies state when movie is added to db
seaweeddol Jun 23, 2020
d992ef2
add different dog photos for each customer
seaweeddol Jun 24, 2020
4f72246
add bootstrap
seaweeddol Jun 24, 2020
3a9018f
add rounded border to customer photos
seaweeddol Jun 24, 2020
32a3f7e
Merge pull request #5 from seaweeddol/add-dog-photos
seaweeddol Jun 24, 2020
6bc053d
Add bootstrap and button style
Hannah0124 Jun 24, 2020
f6574ef
Merge branch 'css'
Hannah0124 Jun 24, 2020
592a408
Add favicon
Hannah0124 Jun 24, 2020
3523da7
add bootstrap nav bar
seaweeddol Jun 24, 2020
81f9191
Update style in library and movie components
Hannah0124 Jun 24, 2020
5197fde
Update style in search component
Hannah0124 Jun 24, 2020
03f6712
Add google font and margin in index.html
Hannah0124 Jun 24, 2020
1c8d749
Clear searh box after searching
Hannah0124 Jun 24, 2020
9140f84
Add style in customer components and fix style in other components
Hannah0124 Jun 24, 2020
f3f4f4c
Add shiba image in Home component
Hannah0124 Jun 24, 2020
a6c71a9
add nav bar styling
seaweeddol Jun 24, 2020
3beb839
Add removeMovie and removeCustomer functions
Hannah0124 Jun 24, 2020
4fd213f
more navbar styling
seaweeddol Jun 24, 2020
1b44e5e
Merge branch 'master' into navbar-styling
seaweeddol Jun 24, 2020
49fcae8
Merge pull request #6 from seaweeddol/navbar-styling
seaweeddol Jun 24, 2020
5b619ce
add missing curly brace
seaweeddol Jun 24, 2020
37c11b3
Add setFlash in the makeRental function
Hannah0124 Jun 24, 2020
be78a3f
add remove selected onClick and hover styling
seaweeddol Jun 24, 2020
98091b1
Merge branch 'flash'
Hannah0124 Jun 24, 2020
330a581
Update package.json
Hannah0124 Jun 24, 2020
c059e25
Fix a merge issue
Hannah0124 Jun 24, 2020
44d0e08
fix minor styling after adding nav bar
seaweeddol Jun 24, 2020
07c9a69
Fix style
Hannah0124 Jun 24, 2020
3b2c1ab
set movie and customer to N/A after making rental
seaweeddol Jun 24, 2020
9bf4a7b
Merge branch 'master' into add-remove-selected
seaweeddol Jun 24, 2020
c1d0c8b
Merge pull request #7 from seaweeddol/add-remove-selected
seaweeddol Jun 24, 2020
39eb2da
Add a flash message to selectedMovie function
Hannah0124 Jun 24, 2020
0060a4b
fix search box issue
seaweeddol Jun 24, 2020
5e15069
move customer api call to app.js, and add customer and movie updates …
seaweeddol Jun 24, 2020
aa6479f
clean up code
seaweeddol Jun 24, 2020
1e4950e
Merge pull request #8 from seaweeddol/fix-infinite-api-calls
seaweeddol Jun 24, 2020
6324af5
Add CustomersDetail and Rental components
Hannah0124 Jun 24, 2020
981c61b
Merge branch 'customer'
Hannah0124 Jun 24, 2020
15692c3
add movie details toggle
seaweeddol Jun 24, 2020
df883bd
FINALLY made card flip work
seaweeddol Jun 24, 2020
be3c2d8
fix card flip and remove toggle
seaweeddol Jun 24, 2020
fcc493c
add sticky header & remove body padding
seaweeddol Jun 24, 2020
673120f
Merge pull request #9 from seaweeddol/movie-details
seaweeddol Jun 24, 2020
cf9be2f
Update 'returnRental' function
Hannah0124 Jun 25, 2020
d54b9ac
Fix a bug
Hannah0124 Jun 25, 2020
f657d5d
Fix style
Hannah0124 Jun 25, 2020
117738e
Merge branch 'rental'
Hannah0124 Jun 25, 2020
48bf506
Add pointer: cursor
Hannah0124 Jun 25, 2020
223c5c8
fix search page layout & add styling for image crop
seaweeddol Jun 25, 2020
f95d2fd
Merge pull request #10 from seaweeddol/fix-search-styling
seaweeddol Jun 25, 2020
e4587c7
add movie poster to back of card
seaweeddol Jun 25, 2020
2511d05
Merge pull request #11 from seaweeddol/card-styling
seaweeddol Jun 25, 2020
ba438f2
add failed api call error message flash
seaweeddol Jun 25, 2020
68a2706
change error flash timing
seaweeddol Jun 25, 2020
a15dc42
Merge pull request #12 from seaweeddol/duplicate-movie-add
seaweeddol Jun 25, 2020
08925a9
Add prop types
Hannah0124 Jun 25, 2020
d8941ea
fix rent button
seaweeddol Jun 25, 2020
bd71857
Merge branch 'proptypes'
Hannah0124 Jun 25, 2020
5cec8c9
Merge branch 'master' of https://github.com/seaweeddol/video-store-co…
Hannah0124 Jun 25, 2020
53bfd38
Updated button style
Hannah0124 Jun 26, 2020
61c80c8
Minor update
Hannah0124 Jun 26, 2020
5ff7abd
shaking shiba
Hannah0124 Jun 26, 2020
728c463
update url to heroku
seaweeddol Nov 25, 2020
19623d6
remove background color
seaweeddol Nov 25, 2020
8d40703
add white background
seaweeddol Nov 25, 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,191 changes: 5,702 additions & 4,489 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": {
"@fortawesome/fontawesome-svg-core": "^1.2.29",
"@fortawesome/free-regular-svg-icons": "^5.13.1",
"@fortawesome/react-fontawesome": "^0.1.11",
"axios": "^0.19.2",
"bootstrap": "^4.5.0",
"react": "^16.13.1",
"react-bootstrap": "^1.0.1",
"react-dom": "^16.13.1",
"react-fontawesome": "^1.7.1",
"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"
]
}
}
6 changes: 5 additions & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@
homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json">
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
<link rel="shortcut icon" href="https://i.imgur.com/wfbujRm.png">
<link href="https://fonts.googleapis.com/css2?family=Open+Sans&family=Open+Sans+Condensed:wght@300;700&display=swap" rel="stylesheet">

<link href='//fonts.googleapis.com/css?family=Roboto:100,400,300' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Expand Down
139 changes: 139 additions & 0 deletions src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,142 @@
from { transform: rotate(0deg); }
to { transform: rotate(360deg); }
}

.navbar {
font-family: 'Open Sans Condensed', sans-serif;
font-size: 1.2rem;
}

.navbar-brand {
font-size: 1.5rem;
}

.navbar__logo {
width: 50px;
height: 50px;
margin-right: 10px;
}

.selected__container {
color: white;
}

.selected__item {
width: 200px;
}


.selected__text {
display: block;
width: 100%;
background-color: transparent;
border: 2px rgb(165, 165, 165) solid;
opacity: 0.9;
border-radius: 5px;
height: 30px;
}

.selected__text:hover {
background-color: rgb(199, 98, 98);
transition: background-color 1s;
}

.selected__text:hover span {
display: none;
}

.selected__text:hover:before {
content: "Deselect?";
cursor: pointer;
}

.rent-btn {
width: 100%;
border-radius: 5px;
display: inline-block;
text-align: center;
vertical-align: middle;
-webkit-user-select: none;
user-select: none;
background-color: transparent;
border: 1px solid transparent;
font-size: 1rem;
border-radius: .25rem;
transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;
height: 30px;
margin-top: -2px;
color: #fff;
border: #EF6A4E 2px solid;
}

.rent-btn:hover {
background-color: #EF6A4E;


}

/* https://stackoverflow.com/questions/3397113/how-to-remove-focus-border-outline-around-text-input-boxes-chrome */
input:focus, button:focus {
outline: none;
}


.button-bg {
border: #EF6A4E solid 2px;
border-radius: 5px;
padding: 10px 20px;
font-weight: bold;
color: #EF6A4E;
letter-spacing: 2px;
background-color: #fff;
outline: none;
}

.button-bg:hover {
background-color: #EF6A4E;
color: #fff;
outline: none;
}

.flash-success {
padding: 20px;
color: #155724;
background-color: #d4edda;
border-color: #c3e6cb;
margin-top: 20px;
text-align: center;
}

.flash-failure {
padding: 20px;
color: #571515;
background-color: #edd4d4;
border-color: #e6c3c3;
margin-top: 20px;
text-align: center;
}

.alert {
padding: 20px;
color: #856404;
background-color: #fff3cd;
border-color: #ffeeba;
margin-top: 20px;
text-align: center;

}

.body-container {
margin: 20px 50px;
display: flex;
justify-content: center;
align-items: center;
}

.all-movies {
display: flex;
flex-direction: row;
flex-wrap: wrap;
margin-left: auto;
margin-right: auto;
}
Loading