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

Sockets - Evelynn & Nara #5

Open
wants to merge 50 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
0b94b5a
Initial react router setup
bonara Jun 24, 2019
a2d7511
stashing
evelynnkaplan Jun 24, 2019
1bfd43e
Merge branch 'master' of https://github.com/bonara/video-store-consumer
evelynnkaplan Jun 24, 2019
74a2298
Adds Movies and Customers Components
bonara Jun 24, 2019
f8b97c5
Merge branch 'master' of https://github.com/bonara/video-store-consumer
evelynnkaplan Jun 24, 2019
b5b6a99
made /movies an exact path and added Route for /movies/search
evelynnkaplan Jun 24, 2019
4715d56
added Link to movies/search
evelynnkaplan Jun 24, 2019
270a6a2
created MoviesSearchPage component and MoviesSearchBar components as …
evelynnkaplan Jun 24, 2019
092511f
added constructor and searchResults into state, begins as empty array
evelynnkaplan Jun 24, 2019
b909e8e
renamed files and components
evelynnkaplan Jun 24, 2019
57a9974
CustomerListPage component that lists Customer component
bonara Jun 25, 2019
9857cd5
added onChange event handling for text input field
evelynnkaplan Jun 25, 2019
5067272
created movie component
evelynnkaplan Jun 25, 2019
f7e96c4
Displays Rental library movies
bonara Jun 25, 2019
d4a78dd
added buttonName prop to Movie component
evelynnkaplan Jun 25, 2019
55f67c7
capitalized Select for buttonName prop for Movie components
evelynnkaplan Jun 25, 2019
c36ea7f
add buttonName as a prop so that this can be dynamic
evelynnkaplan Jun 25, 2019
47fabba
Adds onSelectCustomer Callback Function
bonara Jun 25, 2019
efa5f37
Merge branch 'master' of github.com:bonara/video-store-consumer
bonara Jun 25, 2019
0cfebbc
re-organized callbacks and changed input from a form to just a plain …
evelynnkaplan Jun 25, 2019
ddfd0fb
Merge branch 'master' of https://github.com/bonara/video-store-consumer
evelynnkaplan Jun 25, 2019
2322c6d
callback functions for searching
evelynnkaplan Jun 25, 2019
b7ac6e8
onCustomerClick function that passes up the customer ID
bonara Jun 25, 2019
8ac9646
Merge branch 'master' of github.com:bonara/video-store-consumer
bonara Jun 25, 2019
09b4f16
Adds links to all pages, and onMovieSelect callback function
bonara Jun 25, 2019
eed35d1
Updates Movie component to pass up the movie title
bonara Jun 25, 2019
bcc8aa7
Removes buttonName from Movie component
bonara Jun 25, 2019
dd2233d
wrote addRental
evelynnkaplan Jun 25, 2019
b55769f
created SearchResult component
evelynnkaplan Jun 25, 2019
e779c16
changed component rendering to searchresult components and wrote func…
evelynnkaplan Jun 25, 2019
0d42504
flushed out component
evelynnkaplan Jun 25, 2019
41d2da3
Adds onCheckOutClick function
bonara Jun 25, 2019
af3b260
Merge branch 'master' of github.com:bonara/video-store-consumer
bonara Jun 25, 2019
d2398ac
Refactored nav links and added bootstrap style
bonara Jun 26, 2019
a144aa5
search bar styling
bonara Jun 26, 2019
967467c
Error styling with bootstrap
bonara Jun 26, 2019
bb0bbf5
added success messages after successful search requests and posts req…
evelynnkaplan Jun 26, 2019
9521875
toggling the 'Go to rental library' on/off
evelynnkaplan Jun 26, 2019
1535791
display movie images in rental library
evelynnkaplan Jun 26, 2019
f7c7520
fixed bug where adding movie to rental library broke image url
evelynnkaplan Jun 26, 2019
6093fd4
adding padding
evelynnkaplan Jun 26, 2019
8f637e2
Adds remove button to the error and success messages
bonara Jun 26, 2019
6865686
Merge branch 'master' of github.com:bonara/video-store-consumer
bonara Jun 26, 2019
75d048f
removed binding.pry
evelynnkaplan Jun 26, 2019
9ca9b1c
Homepage CSS to add padding
bonara Jun 26, 2019
0bb45c0
added table row to fix display
evelynnkaplan Jun 26, 2019
0c8dffe
Merge branch 'master' of github.com:bonara/video-store-consumer
bonara Jun 26, 2019
18baf68
Checkout section styling
bonara Jun 26, 2019
c8c379a
Typo fix
bonara Jun 26, 2019
76442b2
added PropTypes to everything
evelynnkaplan Jun 26, 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
139 changes: 139 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.3.1",
"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"
]
}
}
31 changes: 5 additions & 26 deletions src/App.css
Original file line number Diff line number Diff line change
@@ -1,28 +1,7 @@
.App {
text-align: center;
.table-container {
padding: 25px;
}

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

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

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

.App-intro {
font-size: large;
}

@keyframes App-logo-spin {
from { transform: rotate(0deg); }
to { transform: rotate(360deg); }
}
.checkoutSection {
margin: 20px;
}
Loading