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.

Sign up for GitHub

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 - Kasey + Mina #20

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open

Ports - Kasey + Mina #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
31a2286
uhhh
kaseea Jun 25, 2019
fd0ceaf
some templetey stuff
kaseea Jun 25, 2019
0f4b6b8
hopefully points the right direction
kaseea Jun 25, 2019
32ae56f
restructure axios get higher up to access state, and brings selected …
kaseea Jun 26, 2019
282fe1a
displays (poorly) the selected customer and movie, although, no way t…
kaseea Jun 26, 2019
5290524
testing search component
minams Jun 26, 2019
2d559c2
added query
minams Jun 26, 2019
542c53d
added search functionality
minams Jun 26, 2019
b6e1c42
Merge pull request #1 from kaseea/search
minams Jun 26, 2019
9ea7977
renders movies
minams Jun 26, 2019
41d0dd2
Merge pull request #2 from kaseea/search
minams Jun 26, 2019
30651df
changed url to reflect internal db
minams Jun 26, 2019
d4bc6fa
Merge pull request #3 from kaseea/search
minams Jun 26, 2019
57f47ab
fixing post
minams Jun 26, 2019
f463de6
adds all required funcionality minus search
kaseea Jun 26, 2019
931c306
able to post to database
minams Jun 27, 2019
695824c
some stuff
kaseea Jun 27, 2019
5184dc1
Merge branch 'master' of https://github.com/kaseea/video-store-consumer
kaseea Jun 27, 2019
4c11769
added custom message for posting duplicate movies
minams Jun 27, 2019
e052cc0
some stuff
kaseea Jun 28, 2019
12b2fe5
we merged stuff
kaseea Jun 28, 2019
9f5703e
library component renders when movie is added
minams Jun 28, 2019
d5654e5
add logic to not display anything after 2000
kaseea Jun 28, 2019
9a8ae19
some flexing
kaseea Jun 28, 2019
184e799
more css
kaseea 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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

# misc
.DS_Store
.env
.env.local
.env.development.local
.env.test.local
Expand Down
148 changes: 145 additions & 3 deletions package-lock.json
View file
Open in desktop

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

17 changes: 17 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,31 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"axios": "^0.19.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"
]
},
"devDependencies": {
"dotenv": "^8.0.0"
}
}
65 changes: 52 additions & 13 deletions src/App.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,67 @@
.App {


/* body {
text-align: center;
background-image: url("./images/background.jpg");
background-repeat: repeat;
height: 100%;
color: yellow;

} */

body {
display: grid;
grid-template-columns: 1fr;
grid-template-rows: auto auto auto auto;
margin: 0 auto;
text-align: center;
background-image: url("./images/background.jpg");
background-repeat: repeat;
height: 100%;
color: yellow;
}

nav {
width: 100%;
font-family: "Merriweather", serif;
}

.App-logo {
nav ul {
position: relative;
z-index: 100;
margin: 0;
padding: 0;
}

a {
color:yellow;
}

/* .App-logo {
animation: App-logo-spin infinite 20s linear;
height: 80px;
} */
.Nav-header {
list-style: none;
}

.App-header h1 {
color: black;
float: left;
margin-left: 300px;
font-size: 2em;
}
.App-header {
background-color: #222;
height: 150px;
padding: 20px;
color: white;
/* padding: 20px; */
list-style: none;
background-color: grey;
}

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

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

@keyframes App-logo-spin {
from { transform: rotate(0deg); }
to { transform: rotate(360deg); }
}
.big-words {
font-size: 2em;
}
Loading