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

Ports - Ari and Amy W #25

Open
wants to merge 59 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
db92ce8
imported react-router-dom into App.js
aribray Jun 24, 2019
4cef164
skeleton of app layout created
amythetester Jun 25, 2019
f0b6507
added customer and customerlist components
aribray Jun 25, 2019
af089fe
added showrentals functionality, added rentalLibrary and Movie compon…
aribray Jun 26, 2019
ea1c7e0
added show customer functionality (mostly just fixed the customer com…
aribray Jun 26, 2019
26beca0
formatting changes
aribray Jun 26, 2019
0b90ff5
Merge branch 'customerlibrary' into rentallibrary
aribray Jun 26, 2019
ff5ff00
merged customerlibrary branch into this branch, cleaned up formatting
aribray Jun 26, 2019
3191328
refactored app to use react-router
aribray Jun 26, 2019
0e7b852
Merge pull request #1 from aribray/rentallibrary
amythetester Jun 26, 2019
7b242f4
Merge pull request #3 from aribray/app_refactor
amythetester Jun 26, 2019
120c3fe
added search functionality/component
aribray Jun 26, 2019
7d71cc5
added rendering of search results with photo within search component
aribray Jun 26, 2019
752fd6b
select customer in state
amythetester Jun 26, 2019
d4ea684
Merge pull request #4 from aribray/search
amythetester Jun 26, 2019
9c35743
merged
amythetester Jun 26, 2019
57fed6d
fixed search link
amythetester Jun 26, 2019
3840545
Merge pull request #5 from aribray/customer-movie-react
aribray Jun 26, 2019
d31ee08
select movie in state
amythetester Jun 26, 2019
c56e142
Merge remote-tracking branch 'origin' into customer-movie-react
amythetester Jun 26, 2019
f6faab9
Merge pull request #6 from aribray/customer-movie-react
aribray Jun 26, 2019
7a31648
working on addMovie functionality
aribray Jun 26, 2019
91dc2e0
using internal api to query external api
aribray Jun 26, 2019
73d043f
working on creating post endpoint in rails API. pushing react portion…
aribray Jun 26, 2019
b677c5f
changed addMovieCallback function back to what it was before
aribray Jun 26, 2019
06de04a
Merge pull request #7 from aribray/addMovie
amythetester Jun 26, 2019
550937d
addMovie Post request
amythetester Jun 26, 2019
cf73354
fixed addmovie function. successfully adding movies
aribray Jun 26, 2019
e219073
added ability to see currently selected movie and customer
aribray Jun 26, 2019
335dfa3
movie rental
amythetester Jun 26, 2019
b81946d
homepage rendering
amythetester Jun 27, 2019
3204236
organize nav, checkout, and added search image
amythetester Jun 27, 2019
1be56db
added styling for CustomerList and Customer components
aribray Jun 27, 2019
2a85d7d
added styling to RentalLibrary and Movie components
aribray Jun 27, 2019
cf3c689
style fixed nav
amythetester Jun 27, 2019
0995bd5
Merge pull request #8 from aribray/customer_styling
amythetester Jun 27, 2019
45f7593
Merge remote-tracking branch 'origin' into nav-styling
amythetester Jun 27, 2019
38d3fc4
selected box
amythetester Jun 27, 2019
42ee552
Merge pull request #9 from aribray/nav-styling
aribray Jun 27, 2019
562d9b8
checkout section styled
amythetester Jun 27, 2019
1bfc828
fixed movie image problem
aribray Jun 27, 2019
ceef89a
Merge branch 'master' into style-checkout
amythetester Jun 27, 2019
9639be7
Merge pull request #10 from aribray/style-checkout
amythetester Jun 27, 2019
b74a984
added image to homepage and centered
amythetester Jun 28, 2019
044ee1b
Merge pull request #11 from aribray/homepage-style
aribray Jun 28, 2019
3a4b9ea
search form centered
amythetester Jun 28, 2019
d92b6c7
Merge branch 'master' into search-style
amythetester Jun 28, 2019
c771235
fixed Search header style
amythetester Jun 28, 2019
8f4f4aa
fixed font
amythetester Jun 28, 2019
970433a
styling results
amythetester Jun 28, 2019
8a477f3
Merge pull request #13 from aribray/result-style
aribray Jun 28, 2019
3b4623d
Added flexbox to movies
amythetester Jun 28, 2019
c24ba57
fixed bold on homepage
amythetester Jun 28, 2019
b03d717
bolding
amythetester Jun 28, 2019
b0fbd40
Merge remote-tracking branch 'origin' into list-style
amythetester Jun 28, 2019
5edb3fa
fixed new movie link color
amythetester Jun 28, 2019
7f581a6
Merge pull request #14 from aribray/list-style
aribray Jun 28, 2019
4cbbcb9
added some front end success
amythetester Jun 28, 2019
7fbc77f
Merge remote-tracking branch 'origin' into list-style
amythetester Jun 28, 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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
.env.development.local
.env.test.local
.env.production.local
.env

npm-debug.log*
yarn-debug.log*
Expand Down
152 changes: 149 additions & 3 deletions package-lock.json

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

16 changes: 16 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,30 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"axios": "^0.19.0",
"bootstrap": "^4.3.1",
"dotenv": "^8.0.0",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-router-dom": "^5.0.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"
]
}
}
73 changes: 57 additions & 16 deletions src/App.css
Original file line number Diff line number Diff line change
@@ -1,28 +1,69 @@
.App {
text-align: center;
.nav {
font-family: 'Nunito', sans-serif;
margin-block-end: 1em;
justify-content: flex-start;
}

.nav-item {
padding: 10px;
font-size: 1.25em;
}

.App-logo {
animation: App-logo-spin infinite 20s linear;
height: 80px;


#search-button {
border: 1px solid white;
}

.App-header {
background-color: #222;
height: 150px;
padding: 20px;
.nav-link {
color: white;
}

.App-title {
font-size: 1.5em;
.nav-link:hover {
background-color: white;
color: #007bff;
border-radius: 0.25rem;
}

section {
margin-top: 1rem;
font-family: 'Nunito', sans-serif;
}

.checkout {
margin-top: 1rem;
margin-left: 2rem;
list-style-type: none;
width: 400px;
border: 1px solid lightgrey;
padding-top: 2rem;
padding-bottom: 2rem;
border-radius: 0.25em;
font-family: 'Nunito', sans-serif;
font-size: 1.25em;
}

li {
margin-bottom: 1.5rem;
}

.homepage {
text-align: center;
font-family: 'Nunito', sans-serif;
}

.homepage__title {
font-weight: bolder;
}

.homepage-p {
font-size: 1.5rem;
}

.App-intro {
font-size: large;
img {
border-radius: 0.25rem;
}

@keyframes App-logo-spin {
from { transform: rotate(0deg); }
to { transform: rotate(360deg); }
.error {
margin-top: 5rem;
}
Loading