Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
1367a3c
installs dependencies, including react-router-dom
theomoondev Jun 23, 2020
926436b
adds routing for home, search, library, and customer list
theomoondev Jun 23, 2020
a1630b2
revises placeholder text and comments
theomoondev Jun 23, 2020
28d5aac
Merge pull request #1 from peachmakkoli/01-lee-navigation
theomoondev Jun 23, 2020
79a762a
installs axios, begins work on movie search feature
theomoondev Jun 23, 2020
f1e087f
removes redundant components
theomoondev Jun 23, 2020
a62aa80
moves components into separate files
theomoondev Jun 24, 2020
158f5d7
renders results array into search result components
theomoondev Jun 24, 2020
a41d869
creates a search result component that inherits from search
theomoondev Jun 24, 2020
8df6b92
adds get request for list of all customers
theomoondev Jun 24, 2020
25b1c0d
renders list of customers and data, dependent on which customer is cl…
theomoondev Jun 24, 2020
56c434f
refactors return block using && operator
theomoondev Jun 24, 2020
72bffa5
changes to ordered list, changes text
theomoondev Jun 24, 2020
ee30bb9
adds state for selectedCustomer and a button for setting state, displ…
theomoondev Jun 24, 2020
256c090
adds reactjs-popup module
theomoondev Jun 24, 2020
29383c8
restructures customer list based on wireframe
theomoondev Jun 24, 2020
45e1165
adds id to each customer box
theomoondev Jun 24, 2020
461943b
updates nav and current selection based on wireframe
theomoondev Jun 24, 2020
1259744
adds basic styling
theomoondev Jun 24, 2020
2a2e6c0
adds padding to customer profile box
theomoondev Jun 24, 2020
d08f233
changes app title to home link
theomoondev Jun 24, 2020
18e28ca
adjusts header to better match wireframe
theomoondev Jun 24, 2020
738e4fd
added architecture for selected movie, filled out route for movie lib…
saintmedusa Jun 24, 2020
3f3cc99
displays error messages, persists across pages
theomoondev Jun 24, 2020
690ebb6
fixed endpoint for getting movie list
saintmedusa Jun 24, 2020
09b4f3a
set up mapping for formating raw movie list into each movie component…
saintmedusa Jun 24, 2020
bd39858
cleaned up left over code from nested routes, passed in onSelectedCal…
saintmedusa Jun 24, 2020
715b00e
creates Checkout component, adds basic styling
theomoondev Jun 24, 2020
42a6239
adds createRental callback, route for checkout, renders Checkout comp…
theomoondev Jun 24, 2020
bf8ad79
renders movie on Checkout page
theomoondev Jun 24, 2020
5265700
adds due_date to createRental params
theomoondev Jun 24, 2020
b49b417
adds conditional rendering when there is no customer or movie selected
theomoondev Jun 24, 2020
671470e
cleaned up some import statements, made changes to how key is being s…
saintmedusa Jun 24, 2020
a416721
added context for movie selection
saintmedusa Jun 24, 2020
62c296e
added class component, Movie.js
saintmedusa Jun 24, 2020
ed12e7d
Merge pull request #3 from peachmakkoli/03-yaz-rental-library
saintmedusa Jun 24, 2020
1842352
adds variables to pass into onSubmitCallback handler, adds functions …
theomoondev Jun 25, 2020
28e5de2
Merge branch 'master' into 03-lee-checkout
theomoondev Jun 25, 2020
68426e6
add movie image_url to Movie component
theomoondev Jun 25, 2020
bbd4aec
adjusts styling based on wireframe
theomoondev Jun 25, 2020
203048b
adjusts current selection styling in header
theomoondev Jun 25, 2020
07715ae
fixes link, adds comment
theomoondev Jun 25, 2020
10a3f7b
adds react-day-picker module
theomoondev Jun 25, 2020
18d72cd
adds create rental form, cleans up variables, reconfigures params for…
theomoondev Jun 25, 2020
90df385
adds basic styling for checkout form
theomoondev Jun 25, 2020
42961af
Merge pull request #4 from peachmakkoli/03-lee-checkout
saintmedusa Jun 25, 2020
3e60ad5
Merge branch 'master' into 04-lee-error-messages
theomoondev Jun 25, 2020
97cdfdd
adds react-notifications-component module, displays error messages in…
theomoondev Jun 26, 2020
6d2eb71
adds success messages, fixes error messages to work with validation e…
theomoondev Jun 26, 2020
3cc7fcb
creates selectMovie and selectCustomer callback functions for setting…
theomoondev Jun 26, 2020
9dac5dc
adds customer name to success message for movie checkouts
theomoondev Jun 26, 2020
1ba7459
adds error messages for no customer or movie on checkout, opens up ac…
theomoondev Jun 26, 2020
ca966d2
Merge pull request #5 from peachmakkoli/04-lee-error-messages
theomoondev Jun 26, 2020
f723a68
adds basic styling to movie search form
theomoondev Jun 26, 2020
f113a97
adds basic styling for search and searchresult
theomoondev Jun 26, 2020
95abe33
adjusts alignment of movies and movie boxes, adds basic styling to bu…
theomoondev Jun 26, 2020
d2f6519
adds color to search movies button
theomoondev Jun 26, 2020
388836a
adjusts alignment of customer boxes, changes button stylings
theomoondev Jun 26, 2020
0632da5
adjusts button and form styling for checkout
theomoondev Jun 26, 2020
79eef75
adds header background image
theomoondev Jun 26, 2020
94e5480
adds logo text and simple welcome message
theomoondev Jun 26, 2020
8d0d240
adjusts logo size
theomoondev Jun 26, 2020
bb1b998
Merge pull request #6 from peachmakkoli/04-lee-styling
theomoondev Jun 26, 2020
6eade1a
adds proptypes to checkout
theomoondev Jun 26, 2020
1f0747e
adds proptypes for customer
theomoondev Jun 26, 2020
0a3e83d
adds a couple missing proptypes for movie
theomoondev Jun 26, 2020
e28338f
adds proptypes for customers
theomoondev Jun 26, 2020
5588747
adds more detail to movies and movie proptypes
theomoondev Jun 26, 2020
0c2e149
adds proptypes for search
theomoondev Jun 26, 2020
85f7b98
adds proptypes for searchresult
theomoondev Jun 26, 2020
ecac258
Merge pull request #7 from peachmakkoli/05-lee-proptypes
theomoondev Jun 26, 2020
9b60f20
started axios post for add movie, with callback function passed into …
saintmedusa Jun 26, 2020
59ad6a7
clean up for addMovieCallback in app
saintmedusa Jun 26, 2020
ac2d51b
removes setSearchResults and adds getMovies function to addMovie then…
theomoondev Jun 26, 2020
b55840c
adds getMovies function to addMovie then statement
theomoondev Jun 26, 2020
927af68
got home component working, axios calls for specfic movie lists, App …
saintmedusa Jun 26, 2020
7c1b87b
some box formatting
saintmedusa 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,054 changes: 5,556 additions & 4,498 deletions package-lock.json

Large diffs are not rendered by default.

19 changes: 18 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,31 @@
"version": "0.1.1",
"private": true,
"dependencies": {
"axios": "^0.19.2",
"react": "^16.13.1",
"react-day-picker": "^7.4.8",
"react-dom": "^16.13.1",
"react-scripts": "3.4.1"
"react-notifications-component": "^2.4.0",
"react-router-dom": "^5.2.0",
"react-scripts": "3.4.1",
"reactjs-popup": "^1.5.0"
},
"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"
]
}
}
Binary file added src/90s_bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
108 changes: 104 additions & 4 deletions src/App.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
@import url('https://fonts.googleapis.com/css2?family=Fredoka+One&display=swap');

.App {
text-align: center;
/* text-align: center; */
}

.App-logo {
Expand All @@ -8,14 +10,28 @@
}

.App-header {
display: flex;
justify-content: space-between;
background-color: #222;
height: 150px;
padding: 20px;
padding: 0 3.75em;
color: white;
background: url('./90s_bg.png') no-repeat center center fixed;
background-size: cover;
}

.App-title {
font-size: 1.5em;
font-size: 68px;
font-family: 'Fredoka One', cursive;
}

.App-title a {
text-decoration: none;
color: #fff;
text-shadow:
-3px -3px 0 #45c,
3px -3px 0 #45c,
-3px 3px 0 #45c,
3px 3px 0 #45c;
}

.App-intro {
Expand All @@ -26,3 +42,87 @@
from { transform: rotate(0deg); }
to { transform: rotate(360deg); }
}

/* NAV LINKS */

.App-nav {
display: flex;
flex-direction: column;
}

.App-nav-links {
display: flex;
text-align: center;
}

.App-nav-links__item {
width: 100px;
text-decoration: none;
color: #222;
background-color: #fff;
padding: 1em;
margin-right: 1em;
border: 1px solid #222;
}

.App-nav-links__item:hover {
background-color: #222;
color: #fff;
border: 1px solid #fff;
}

/* CURRENT SELECTION */

.App-selected {
display: flex;
align-items: center;
flex-direction: column;
padding: 1em 2em;
margin: 2em 0;
background-color: #45c;
}

.App-selected h3 {
margin-top: 0;
}

.App-selected__customer,
.App-selected__movie,
.App-selected__checkout {
width: 100%;
text-align: center;
text-decoration: none;
color: #fff;
padding: 1em;
margin-top: .5em;
border: 1px solid #fff;
}

.App-selected__checkout {
border: none;
}

.App-selected__customer-name,
.App-selected__movie {
margin: .5em 0;
}

.App-selected__checkout-button {
text-align: center;
text-decoration: none;
color: #222;
background-color: #03CEA4;
padding: 1em;
margin-top: .5em;
border: 1px solid #222;
}

.App-selected__checkout-button:hover {
background-color: #222;
color: #fff;
border: 1px solid #fff;
}

.App-content {
padding: 4rem;
}
Loading