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 - Cyndi & Karla #7

Open
wants to merge 40 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
3f053ad
set up initial front end with react router and added search, library,…
cyndilopez Jun 24, 2019
e1027a0
changed customer from a functional to a classical component. followed…
cyndilopez Jun 24, 2019
5d6e113
added basics of form to search for movie
cyndilopez Jun 24, 2019
66e38b5
onchange and onformsubmit functions added for search form
cyndilopez Jun 25, 2019
a83ba5e
this added to on form submit
cyndilopez Jun 25, 2019
aa1fe3a
Changed App to classical component to add state that keeps track of m…
kguadron Jun 25, 2019
9fa33c6
added event prevent default to form for search
cyndilopez Jun 25, 2019
1ed8b05
merged from master
cyndilopez Jun 25, 2019
8176e26
built callback chain and edited library app component to take callbac…
cyndilopez Jun 25, 2019
c8a73f0
added functionality to click on a customer and it stays on the page, …
cyndilopez Jun 25, 2019
3ec11eb
built out function with axios post to rental checkout
kguadron Jun 25, 2019
3cad74e
comment
cyndilopez Jun 25, 2019
c91dfc9
Merge branch 'master' of https://github.com/kguadron/video-store-cons…
cyndilopez Jun 25, 2019
e454084
Display movie search list function that has a select link
kguadron Jun 26, 2019
c4f09de
button class name made into state variable. it changes whether it dis…
cyndilopez Jun 26, 2019
b053196
Working on showing user errors
kguadron Jun 26, 2019
0362525
Added error display
kguadron Jun 26, 2019
3f83e3a
Merge pull request #1 from kguadron/toggle-checkout-button-hidden
cyndilopez Jun 26, 2019
5dbf6f9
merged branches
kguadron Jun 26, 2019
6b03030
Resolved conflicts
kguadron Jun 26, 2019
fdeebd8
Refactored code to be in different files for each component
kguadron Jun 26, 2019
fb8168e
Styled Customers and Customer components
kguadron Jun 26, 2019
d611920
Added styling to Movie and Library component
kguadron Jun 26, 2019
7c72371
header formatting with bootstrap and css
cyndilopez Jun 26, 2019
58489e8
nav bar changed to grid style
cyndilopez Jun 26, 2019
3651eba
fixed merge conflict in app
cyndilopez Jun 26, 2019
586edf3
Formatted relase date in Movie
kguadron Jun 26, 2019
aaeb4dc
removed code that was commented out and unecessary console.logs
cyndilopez Jun 26, 2019
397b076
Added more styling
kguadron Jun 26, 2019
82c411d
formatting for button
cyndilopez Jun 26, 2019
5f27163
resolved merge conflicts
cyndilopez Jun 26, 2019
7f1a0f9
Added styling to search list
kguadron Jun 27, 2019
9b5abb7
Changes search display styling
kguadron Jun 27, 2019
461bfc7
state for display message that movie added to database
cyndilopez Jun 27, 2019
0dac5c8
Merge branch 'master' of https://github.com/kguadron/video-store-cons…
cyndilopez Jun 27, 2019
7940486
search bar clears after movie selected and message goes away after va…
cyndilopez Jun 27, 2019
d87b9ca
Added top logo
kguadron Jun 28, 2019
c9ba13b
added whitspace
cyndilopez Jun 28, 2019
7c4df9c
Merge branch 'master' of https://github.com/kguadron/video-store-cons…
cyndilopez Jun 28, 2019
1b69b04
Edited image url from post request
kguadron 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
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"
]
}
}
4 changes: 3 additions & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json">
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
<link href="https://fonts.googleapis.com/css?family=Alegreya&display=swap" rel="stylesheet">
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Expand All @@ -25,7 +26,8 @@
<noscript>
You need to enable JavaScript to run this app.
</noscript>
<div id="root"></div>
<div id="root">
</div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.
Expand Down
Empty file added src/.env
Empty file.
33 changes: 26 additions & 7 deletions src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,19 @@
text-align: center;
}

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

button.checkout-button-display {
display: inline;
}

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

.App-title {
Expand All @@ -22,7 +25,23 @@
font-size: large;
}

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

.no-error {
visibility: hidden;
}

body {
font-family: 'Alegreya', serif;
font-weight: bolder;
}

.logo {
display: block;
margin-left: auto;
margin-right: auto;
width: 50%;
}

Loading