Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
98a2015
added react router to app.js
faezeh-ashtiani Jun 22, 2020
29e5f76
Initial setup
olgapatrakova Jun 22, 2020
33cf2c6
Merged conflict in package-lock.json
olgapatrakova Jun 22, 2020
30f1552
added a comment on how to connect the front end and back end
faezeh-ashtiani Jun 23, 2020
73e6171
package-lock.json came in differently and I have to commit it
faezeh-ashtiani Jun 23, 2020
25ed594
Getting customers from api call
olgapatrakova Jun 23, 2020
dd6e000
Added movie search
olgapatrakova Jun 23, 2020
0c5c0e8
Fixed movie search
olgapatrakova Jun 23, 2020
fbe0398
Added pictures to search movies display
olgapatrakova Jun 23, 2020
72102fe
Add to a rental library button
olgapatrakova Jun 24, 2020
49b9485
added select movie and select customer button and function, added ren…
faezeh-ashtiani Jun 24, 2020
7252a83
cleaned up the components
faezeh-ashtiani Jun 24, 2020
f2315a2
did some beginning styling
faezeh-ashtiani Jun 24, 2020
2b2f853
Button Add movie to rental library appears when there are several out…
olgapatrakova Jun 24, 2020
77ed574
Merged conflict
olgapatrakova Jun 24, 2020
6e72589
Fixed bug with propTypes
olgapatrakova Jun 24, 2020
4b23b4a
Add movie functionality moved to App js
olgapatrakova Jun 24, 2020
da50e62
Fixed a bug in add to rental library functionality
olgapatrakova Jun 24, 2020
067e5f4
Fixed search movie functionality
olgapatrakova Jun 24, 2020
39b6caa
Button bug fixed
olgapatrakova Jun 24, 2020
55fd00f
was able to show the selected movie with available inventory
faezeh-ashtiani Jun 24, 2020
0be10e4
solved merge conflict
faezeh-ashtiani Jun 24, 2020
ab7662d
added more details to movie list and styling
faezeh-ashtiani Jun 24, 2020
5857225
Made messages disappear functionality
olgapatrakova Jun 24, 2020
bb7348f
Merge branch 'master' of https://github.com/faezeh-ashtiani/video-sto…
olgapatrakova Jun 24, 2020
d79d27b
added styling for customer list
faezeh-ashtiani Jun 24, 2020
667b9f8
Rental info disappear as soon as we click Rent
olgapatrakova Jun 24, 2020
a6722ad
Fixed a bug in a new set of chosen movie and customer
olgapatrakova Jun 24, 2020
1a63a1f
Merge branch 'master' of https://github.com/faezeh-ashtiani/video-sto…
olgapatrakova Jun 24, 2020
92460a9
Added style to movie search
olgapatrakova Jun 24, 2020
46d5c73
added styling for search area and button
faezeh-ashtiani Jun 25, 2020
db69552
Added more style to search bar and flash messages
olgapatrakova Jun 25, 2020
4fed735
Merged conflicts in movie search and form
olgapatrakova Jun 25, 2020
1c6f5ca
changed release date to year, and modified a bit of styling
faezeh-ashtiani Jun 25, 2020
449d4d4
changes search bar color to teal
faezeh-ashtiani Jun 25, 2020
6e487a5
changed the welcome text color to teal
faezeh-ashtiani Jun 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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*

.env
2 changes: 2 additions & 0 deletions .idea/.gitignore

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

6 changes: 6 additions & 0 deletions .idea/misc.xml

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

8 changes: 8 additions & 0 deletions .idea/modules.xml

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

6 changes: 6 additions & 0 deletions .idea/vcs.xml

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

8 changes: 8 additions & 0 deletions .idea/video-store-consumer.iml

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

10,242 changes: 5,742 additions & 4,500 deletions package-lock.json

Large diffs are not rendered by default.

19 changes: 19 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,33 @@
"version": "0.1.1",
"private": true,
"dependencies": {
"axios": "^0.19.2",
"react": "^16.13.1",
"react-dom": "^16.13.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"
]
},
"devDependencies": {
"@babel/core": "^7.10.3",
"@babel/preset-env": "^7.10.3",
"babel-loader": "^8.1.0"
}
}
161 changes: 145 additions & 16 deletions src/App.css
Original file line number Diff line number Diff line change
@@ -1,28 +1,157 @@
.App {
@import url('https://fonts.googleapis.com/css2?family=Notable&display=swap');
@import url('https://fonts.googleapis.com/css2?family=Poppins:wght@200&display=swap');
@import url(http://netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css);

* {
padding: 0;
}

body {
background-color: #f7efee;
margin: 10px;
}

.body {
font-family: 'Poppins', sans-serif;
}

.navigation-bar {
margin: 10px 5px;
border-bottom: gray solid 0.5px;
}

.navigation-bar a {
color: tomato;
font-family: 'Notable', sans-serif;
}

.navigation-elements {
display: flex;
flex-wrap: wrap;
justify-content: space-evenly;
list-style: none;
}

a {
color: black;
}
a:link {
text-decoration: none;
}

a:hover {
cursor: -moz-grab;
}

a:active {
text-decoration: underline;
}

.home-message {
text-align: center;
font-family: 'Notable', sans-serif;
margin-top: 50px;
color: teal;
}

.movie-list {
display: flex;
flex-wrap: wrap;
justify-content: space-evenly;
list-style: none;
}
.movie-square {
display: grid;
grid-template: 1fr / 1fr 2fr ;
width: 420px;
border-radius: 25px;
padding: 15px;
border: solid tomato 1px;
margin: 10px;
}

.movie-image {
padding-right: 10px;
width: 140px;
height: auto;
}

.movie-title {
margin-top: 3px;
}

.movie-date {
margin-bottom: 3px;
}

.App-logo {
animation: App-logo-spin infinite 20s linear;
height: 80px;
.select-button {
background-color: tomato;
width: 80px;
height: 30px;
}

.App-header {
background-color: #222;
height: 150px;
padding: 20px;
color: white;
.add-button {
background-color: tomato;
width: 160px;
height: 30px;
}

.App-title {
font-size: 1.5em;
.body{

}

.App-intro {
font-size: large;
.search {
width: 400px;
position: relative;
}

.searchTerm {
float: left;
width: 100%;
border: 3px solid teal;
padding: 5px;
height: 20px;
border-radius: 5px;
outline: none;
color: #9DBFAF;
}

.searchTerm:focus{
color: black;
}

.searchButton {
position: absolute;
right: -50px;
width: 40px;
height: 36px;
opacity: 0;
cursor: pointer;
}

.search:before {
position: absolute;
right: -50px;
width: 40px;
height: 36px;
line-height: 36px;
background: teal;
text-align: center;
color: #fff;
border-radius: 3px;
font-family: 'FontAwesome';
content: '\f002';
}

@keyframes App-logo-spin {
from { transform: rotate(0deg); }
to { transform: rotate(360deg); }
/*Resize the wrap to see the search bar change!*/
.wrap{
position: relative;
margin-left: 108px;
padding: 10px;
overflow: auto;
}
.messageWrap{
position: relative;
margin-left: 150px;
overflow: auto;
}
Loading