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

Layla & Hayden - Edges - Video Store Consumer #11

Open
wants to merge 27 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
ee9fed3
adding component folder with search files
lbristol88 Dec 18, 2018
19918b2
implement librarycontainer component
haydenwalls Dec 18, 2018
7d57e24
implement movie and customer components
haydenwalls Dec 18, 2018
86fa263
remove unnecessary escape character
haydenwalls Dec 18, 2018
a86b72e
search components
lbristol88 Dec 18, 2018
f55d003
Merge pull request #1 from haydenwalls/layla-branch
haydenwalls Dec 18, 2018
0c1ab08
Merge branch 'master' of https://github.com/haydenwalls/video-store-c…
haydenwalls Dec 18, 2018
5ff2b01
can now add searched movie to library
lbristol88 Dec 18, 2018
840c6e4
Merge pull request #2 from haydenwalls/layla-branch
haydenwalls Dec 18, 2018
01c2097
Merge branch 'master' of https://github.com/haydenwalls/video-store-c…
haydenwalls Dec 18, 2018
4f235b7
added some component styles
haydenwalls Dec 18, 2018
e9dccb2
fix git weirdness
haydenwalls Dec 18, 2018
85cf964
Merge branch 'library'
haydenwalls Dec 19, 2018
76156df
implement newrental component
haydenwalls Dec 19, 2018
1d8d525
get newrental customer and movie selection displayed
haydenwalls Dec 19, 2018
61086fc
implement newrental submission
haydenwalls Dec 19, 2018
9e81ef4
added router functions to app
lbristol88 Dec 19, 2018
4c7ff7b
Merge pull request #3 from haydenwalls/layla-branch
haydenwalls Dec 19, 2018
53e3e7f
add some silly styles, add StatusBar comp to App
haydenwalls Dec 19, 2018
b32fc66
fix navbar <link>s
haydenwalls Dec 19, 2018
e9be72f
implement StatusBar component
haydenwalls Dec 19, 2018
f8f38c3
implement statusbar component and pass its callback as prop to necess…
haydenwalls Dec 20, 2018
9060c5c
update routes to show library as root and clear status when alink is …
haydenwalls Dec 20, 2018
6de04b7
extensive styling of all components
haydenwalls Dec 20, 2018
aa1572d
fixed button bug in container components; update status mesg in NewRe…
haydenwalls Dec 21, 2018
49895e8
oops forgot to track stylesheet for SearchContainer
haydenwalls Dec 21, 2018
c459f8c
font troubleshooting
haydenwalls Dec 21, 2018
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
4,675 changes: 2,378 additions & 2,297 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"axios": "^0.18.0",
"react": "^16.4.1",
"react-dom": "^16.4.1",
"react-router-dom": "^4.3.1",
"react-scripts": "1.1.4"
},
"scripts": {
Expand All @@ -13,4 +15,4 @@
"test": "react-scripts test --env=jsdom",
"eject": "react-scripts eject"
}
}
}
37 changes: 32 additions & 5 deletions src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,53 @@
}

.App-logo {
animation: App-logo-spin infinite 20s linear;
height: 80px;
animation: App-logo-spin infinite 3s linear;
height: 120px;
margin-top: 14px;
}

.App-header {
background-color: #222;
height: 150px;
padding: 20px;
height: 148px;
padding: 35px;
color: white;
display: flex;

}

.App-titles {
text-align: left;
margin-left: 1.5vw;
text-shadow: 0px 0px 20px black;
width: 100%;
}

.App-title {
font-size: 1.5em;
font-size: 4em;
font-family: BOMBFONT;
margin: 0;
}

.App-title2 {
margin-top: -.15em;
}

.App-intro {
font-size: large;
text-align: right;
}

.uppercontainer {
display: flex;
justify-content: space-around;
}

@keyframes App-logo-spin {
from { transform: rotate(0deg); }
to { transform: rotate(360deg); }
}

@font-face {
font-family: 'BOMBFONT';
src: url(./assets/fonts/BOMBFONT.ttf) format('ttf');
}
80 changes: 75 additions & 5 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,88 @@
import React, { Component } from 'react';
import logo from './logo.svg';
import logo from './logo.png';
import './App.css';

import LibraryContainer from './components/LibraryContainer';
import SearchContainer from './components/SearchContainer';
import NewRental from './components/NewRental';
import NavBar from './components/NavBar';
import StatusBar from './components/StatusBar';
import { Route } from 'react-router-dom';


class App extends Component {
constructor() {
super();

this.state = {
movie: '',
customer: '',
cust_id: '',
status: '',
}
}

clearSelections = () => {
this.setState({
movie: '',
customer: '',
cust_id: '',
});
}

select = (obj, type) => {
let newState = this.state;
newState[type.toLowerCase()] = obj.title ? obj.title : obj.name;
if (obj.name) {
newState.cust_id = obj.id;
}

this.setState(newState);
}

status = (txt) => {
let newState = this.state;
newState.status = txt;

this.setState(newState);
}

clearStatus = () => {
let newState = this.state;
newState.status = '';

this.setState(newState);
}

render() {
return (
<div className="App">
<header className="App-header">
<img src={logo} className="App-logo" alt="logo" />
<h1 className="App-title">Welcome to React</h1>
<div className="App-titles">
<h1 className="App-title">Welcome to</h1>
<h1 className="App-title App-title2">React Video Store</h1>
<p className="App-intro">
"To get started, edit <code>kawaii/Anime.mkv</code> and save to reload..."
</p>
</div>
</header>
<p className="App-intro">
To get started, edit <code>src/App.js</code> and save to reload.
</p>
<div className="uppercontainer">
<NavBar clearCB={ this.clearStatus } />
<NewRental
movie={ this.state.movie }
customer={ this.state.customer }
cust_id={ this.state.cust_id }
clearCB={ this.clearSelections }
statusCB={ this.status } />
</div>

<StatusBar status={ this.state.status } />

<Route path="/" exact="true" render={() => <LibraryContainer type="Movie" selectCB={this.select} statusCB={ this.status } />} />
<Route path="/library" render={() => <LibraryContainer type="Movie" selectCB={this.select} statusCB={ this.status } />} />
<Route path="/customers" render={() => <LibraryContainer type="Customer" selectCB={this.select} statusCB={ this.status } />} />
<Route path="/search" render={() => <SearchContainer statusCB={ this.status } />} />
</div>
);
}
Expand Down
126 changes: 126 additions & 0 deletions src/assets/film-reel.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/fonts/BOMBFONT.ttf
Binary file not shown.
44 changes: 44 additions & 0 deletions src/assets/magnifying-glass-search.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
51 changes: 51 additions & 0 deletions src/assets/people.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/profpic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading