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

Earth - Sophie & Kal #32

Open
wants to merge 34 commits into
base: master
Choose a base branch
from
Open
Changes from 2 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
a925ca1
created routes with React Router, set up basic app
steve-messing Jan 19, 2021
2767c3d
created CustomerList component
steve-messing Jan 19, 2021
29843e2
Started CustomersList component
kashenafi Jan 20, 2021
318b033
fixed dependencies
steve-messing Jan 20, 2021
62375cb
can display list of videos from rails api
steve-messing Jan 20, 2021
ddc82fd
playing with react-select to display video library
steve-messing Jan 20, 2021
79da559
search or select
steve-messing Jan 20, 2021
fe59c0d
Merge pull request #1 from sophieemessing/video-library
steve-messing Jan 20, 2021
122053b
working on customer list display
kashenafi Jan 20, 2021
977d3f2
saving changes
steve-messing Jan 20, 2021
0f79fea
Merge pull request #2 from sophieemessing/CustomerListdisplay
kashenafi Jan 20, 2021
0db5bc1
merging
steve-messing Jan 20, 2021
8f23958
merge to master
steve-messing Jan 20, 2021
a69fd80
renaming folder
steve-messing Jan 20, 2021
808eb8d
renamed back to components
steve-messing Jan 20, 2021
2defe23
selected video states stored in app
steve-messing Jan 20, 2021
2518dea
user can serarch TMDB database for videos
steve-messing Jan 21, 2021
fe8cb30
added axios post for adding API videos to library
steve-messing Jan 21, 2021
69902cb
Customer display working & started checkout
kashenafi Jan 21, 2021
5a83dbf
merging changes
steve-messing Jan 21, 2021
2467c0f
Update App.js
steve-messing Jan 21, 2021
7d97ea8
Update CustomerList.js
steve-messing Jan 21, 2021
bf81c94
Update VideoLibrary.js
steve-messing Jan 21, 2021
d75eec6
Delete src/Components directory
steve-messing Jan 21, 2021
59d20d2
started adding bootstrap
steve-messing Jan 22, 2021
3124a5a
Checkout working, started customer details
kashenafi Jan 22, 2021
16a067e
Merge pull request #4 from sophieemessing/Jan21
kashenafi Jan 22, 2021
168064b
Merge pull request #3 from sophieemessing/bootstrap
kashenafi Jan 22, 2021
22cf53c
added checkout button to navbar
steve-messing Jan 22, 2021
06f1e99
customer shows customer, video shows video
steve-messing Jan 22, 2021
6f61a2b
frontend
steve-messing Jan 22, 2021
75873aa
styling is done
steve-messing Jan 22, 2021
5a194b5
Merged styling work, checkout & add confirmation
kashenafi Jan 22, 2021
acd7e69
Merge pull request #5 from sophieemessing/Jan22
steve-messing Jan 24, 2021
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
21,518 changes: 21,494 additions & 24 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -3,7 +3,9 @@
"version": "0.1.1",
"private": true,
"dependencies": {
"bootstrap": "^4.6.0",
"react": "^17.0.1",
"react-bootstrap": "^1.4.3",
"react-dom": "^17.0.1",
"react-router": "^5.2.0",
"react-router-dom": "^5.2.0",
2 changes: 1 addition & 1 deletion src/App.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.App {
text-align: center;
text-align: left;
}

.App-logo {
58 changes: 29 additions & 29 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import React, { Component, useState } from 'react';
import logo from './logo.svg';
import './App.css';
import axios from 'axios'
import 'bootstrap/dist/css/bootstrap.min.css';
import {Nav, Navbar} from 'react-bootstrap'

import CustomerList from './components/CustomerList';
import VideoLibrary from './components/VideoLibrary';
@@ -13,7 +14,7 @@ import {
BrowserRouter as Router,
Route,
Switch,
Link
Link,
} from 'react-router-dom';
import Detail from './components/Detail';

@@ -57,36 +58,36 @@ const App = () => {

return (

<Router>

<div className="App">
<Router>

<Navbar bg="dark">
<Nav>
<Nav.Link>
<Link to="/" exact={true}>Video Store</Link>
</Nav.Link>
<Nav.Link>
<Link to="/search" exact={true}>Search</Link>
</Nav.Link>
<Nav.Link>
<Link to="/customers" exact={true}>Customers</Link>
</Nav.Link>
<Nav.Link>
<Link to="/library" exact={true}>Video Library</Link>
</Nav.Link>
</Nav>
</Navbar>

<SelectedVideo video={selectedVideo}/>
<SelectedCustomer customer={selectedCustomer}/>

{/* <VideoLibrary/> */}
{/* <SelectedVideo video={selectedVideo}/> */}
<div>
<nav>
<ul>
<li>
<Link to="/" exact={true}>Home</Link>
</li>
<li>
<Link to="/search">Search</Link>
</li>
<li>
<Link to="/customers" exact={'true'}>Customers</Link>
</li>
<li>
<Link to="/library" exact={true}>Video Library</Link>
</li>
</ul>
</nav>

{/* A <Switch> looks through its children <Route>s and
renders the first one that matches the current URL. */}


<Switch>
<Route exact={true} path="/">
{/* <Home /> */}
<p>Homepage!</p>
</Route>
<Route path="/search">
<Search />
@@ -102,11 +103,10 @@ const App = () => {
<Detail />
</Route>
</Switch>
</div>
</Router>
</Router>
</div>
);


}
}

export default App;
2 changes: 1 addition & 1 deletion src/components/CustomerList.js
Original file line number Diff line number Diff line change
@@ -21,8 +21,8 @@ const CustomerList = (props) => {
.catch((error) => {
setErrorMessage(error.message);
console.log(errorMessage);
}, []);
});
}, []);

return (
<div>
Empty file.
23 changes: 14 additions & 9 deletions src/components/SelectedVideo.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import {React, useState, useEffect} from 'react'
import Select from 'react-select'
import PropTypes from 'prop-types'
import axios from 'axios'
import VideoLibrary from './VideoLibrary'
import React from 'react'
import { Container, Row, Col} from 'react-bootstrap'


const SelectedVideo = (props) => {
@@ -12,10 +9,18 @@ const SelectedVideo = (props) => {
return(
video &&(
<div>
<h3>{video.title}</h3>
<p>{video.overview}</p>
<p>Released: {video.release_date}</p>
<img src={video.image_url} />
<Container>
<Row>
<Col md={2}>
<img src={video.image_url} />
</Col>
<Col md={4}>
<h4>{video.title}</h4>
<p>Released: {video.release_date}</p>
<p>{video.overview}</p>
</Col>
</Row>
</Container>
</div>
))
}
2 changes: 2 additions & 0 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -3,6 +3,8 @@ import ReactDOM from 'react-dom';
import './index.css';
import App from './App';
import registerServiceWorker from './registerServiceWorker';
import 'bootstrap/dist/css/bootstrap.min.css';


ReactDOM.render(<App />, document.getElementById('root'));
registerServiceWorker();
267 changes: 212 additions & 55 deletions yarn.lock

Large diffs are not rendered by default.