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

Leaves - Dominique & Yasmin #13

Open
wants to merge 42 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
5c00718
Added customer components
YasminM11 Dec 17, 2019
c7d7253
Minor spacing cleanup
YasminM11 Dec 17, 2019
9e8cffc
added button
YasminM11 Dec 17, 2019
d1ffe73
Created new MovieLibrary_Movie_FeatureBranch
dtaylor73 Dec 17, 2019
d2d7e15
add react router to app
dtaylor73 Dec 17, 2019
504e9e9
refined react routes
dtaylor73 Dec 17, 2019
591f665
added on click button to select the customer
YasminM11 Dec 17, 2019
357601c
change App state - current customer
YasminM11 Dec 17, 2019
8c17a4d
finished rental select button in rentallibrary
dtaylor73 Dec 17, 2019
7aa8f31
added home comp
YasminM11 Dec 17, 2019
527c9f3
Merge pull request #1 from dtaylor73/MovieLibrary_Movie_FeatureBranch
YasminM11 Dec 17, 2019
e90f8e2
Resolved merge conflict - customer/movie
YasminM11 Dec 18, 2019
26b7bef
merged branches - clean version
YasminM11 Dec 18, 2019
dabbd68
Merge pull request #4 from dtaylor73/CustomerBranch
YasminM11 Dec 18, 2019
f6e97c8
merged branches - clean
dtaylor73 Dec 18, 2019
e38b911
made moviesearch form
dtaylor73 Dec 18, 2019
2e743af
updated search feature
dtaylor73 Dec 18, 2019
b32b457
added photos to movie search
dtaylor73 Dec 18, 2019
a2261ce
finished search results
dtaylor73 Dec 18, 2019
0d72888
Merge pull request #6 from dtaylor73/MovieLibrary_Movie_FeatureBranch
dtaylor73 Dec 18, 2019
ff4b894
take out Customer in JSX in App
YasminM11 Dec 18, 2019
8a72b38
sample change
YasminM11 Dec 18, 2019
4e6a3cb
sample change
YasminM11 Dec 18, 2019
1b4428e
made checkout component
YasminM11 Dec 18, 2019
7039481
added movie to rental library feature complete
dtaylor73 Dec 18, 2019
73a82d6
Merge pull request #7 from dtaylor73/MovieLibrary_Movie_FeatureBranch
dtaylor73 Dec 18, 2019
43a7687
Merge branch 'master' of https://github.com/dtaylor73/video-store-con…
YasminM11 Dec 18, 2019
8312440
latest commit
YasminM11 Dec 18, 2019
1942f5b
Merge branch 'master' into CustomerBranch
YasminM11 Dec 18, 2019
66e7ed8
Merge pull request #8 from dtaylor73/CustomerBranch
dtaylor73 Dec 18, 2019
9ab86d6
added checkout functionality to checkout comp
YasminM11 Dec 19, 2019
21f1010
added style to customerList and RentalLibrary
YasminM11 Dec 19, 2019
4932298
added style to Movie Search
YasminM11 Dec 20, 2019
88ea83b
finished presentation version
dtaylor73 Dec 20, 2019
49ecbf6
pushed changs
YasminM11 Dec 20, 2019
5ae5779
finished presentation version 2.0
dtaylor73 Dec 20, 2019
3742faf
Merge pull request #9 from dtaylor73/MovieLibrary_Movie_FeatureBranch
dtaylor73 Dec 20, 2019
7bf92a8
clean the code
YasminM11 Dec 20, 2019
e50fcd0
Merge branch 'master' into CustomerBranch
YasminM11 Dec 20, 2019
a1e8d2e
Merge pull request #10 from dtaylor73/CustomerBranch
dtaylor73 Dec 20, 2019
03485f7
finished adding colors to finalized version
dtaylor73 Dec 20, 2019
f647711
Merge pull request #11 from dtaylor73/MovieLibrary_Movie_FeatureBranch
dtaylor73 Dec 20, 2019
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
125 changes: 125 additions & 0 deletions package-lock.json

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

15 changes: 15 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,29 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"axios": "^0.19.0",
"bootstrap": "^4.4.1",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-router-dom": "^4.3.1",
"react-scripts": "3.0.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"
]
}
}
89 changes: 72 additions & 17 deletions src/App.css
Original file line number Diff line number Diff line change
@@ -1,28 +1,83 @@
.App {
text-align: center;


.nav-item {
border-style: dashed;
background-color: white;
padding-right: 5px;
padding-left: 5px;
}

.App-logo {
animation: App-logo-spin infinite 20s linear;
height: 80px;
.navigation-bar {
list-style-type: none;
display: flex;
flex-direction: row;
justify-content: space-evenly;
align-items: center;
background-color: #A4C3B2;
height: 5rem;
}

.App-header {
background-color: #222;
height: 150px;
padding: 20px;
color: white;
.rentals {
display: flex;
flex-wrap: wrap;
}

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


.card {
width: 30%;
display: inline-block;
/* flex-wrap: wrap; */
}

img.card-img-top {
width: 80%;
height: auto;
}

card-img-top {
width: 25%;
height: 25%;
}

.App-title {
font-size: 1.5em;
.alert {
color: green;
}

.App-intro {
font-size: large;
.movie-logo {
width: 500px;
padding-top: 125px;
text-align: center;
}

.blue-text {
color: #141B5B;
}

@keyframes App-logo-spin {
from { transform: rotate(0deg); }
to { transform: rotate(360deg); }
.white-text {
color: white;
}

.Checkout-button {
border-radius: 10px;
}

.message {
color: #FF928B;
}












Loading