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

Gessica and Stacy --Fire #22

Open
wants to merge 37 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
5c480d3
API setup
StacyLundquist Jan 19, 2021
c155952
set up react router
GeMath18 Jan 19, 2021
d67d742
Merge branch 'master' of https://github.com/StacyLundquist/video-stor…
StacyLundquist Jan 19, 2021
e561534
Merge branch 'master' of https://github.com/StacyLundquist/video-stor…
StacyLundquist Jan 20, 2021
ee53339
include App links, added CustomerList component
StacyLundquist Jan 20, 2021
3ea69b8
added state on library and created video, still working on search
GeMath18 Jan 20, 2021
e05f0a2
library page shows the list of videos
GeMath18 Jan 20, 2021
75f7518
added customer.js and customer css w/bootstrap
StacyLundquist Jan 21, 2021
12b542a
Merge branch 'customer_list-SL' of https://github.com/StacyLundquist/…
StacyLundquist Jan 21, 2021
7b1bbc1
customer list update/cleanup extra lines
StacyLundquist Jan 21, 2021
6db5b4a
corrected the video component to select video, still working on searc…
GeMath18 Jan 21, 2021
7393db0
updates before merge
StacyLundquist Jan 21, 2021
ca38cc0
move a line to the right
GeMath18 Jan 21, 2021
c81c9b6
Merge branch 'master' into customer_list-SL
StacyLundquist Jan 21, 2021
3cc5936
Merge pull request #1 from StacyLundquist/customer_list-SL
StacyLundquist Jan 21, 2021
e03db12
changed Libraryto VideoLibrary on App
GeMath18 Jan 21, 2021
3c2cf71
selection of customer is working
GeMath18 Jan 21, 2021
70b2e2e
small changes to video search
GeMath18 Jan 21, 2021
72d3e89
searching works locally
GeMath18 Jan 21, 2021
c7fd05d
selectVideo functioning, added proptypes(customerList)
StacyLundquist Jan 21, 2021
eeca51d
Merge pull request #2 from StacyLundquist/SL-selectCustomer
StacyLundquist Jan 21, 2021
1b7ef20
changed the button on Search to Add to Library
GeMath18 Jan 21, 2021
55fbf68
Sending video as an object, setting state
StacyLundquist Jan 21, 2021
be0a883
we can add video to library
GeMath18 Jan 22, 2021
ddb12dc
almost functioning checkout
StacyLundquist Jan 22, 2021
f8866cb
code cleanup
StacyLundquist Jan 22, 2021
42f2889
code cleanup
StacyLundquist Jan 22, 2021
cbf21ab
trying to get these date params to work
StacyLundquist Jan 22, 2021
23b1dfc
Merge pull request #3 from StacyLundquist/rental-SL
StacyLundquist Jan 22, 2021
53f35aa
trying Kareha's idea
StacyLundquist Jan 22, 2021
44f5734
checkout functionality works
GeMath18 Jan 22, 2021
edba983
quotes to make the dates work
StacyLundquist Jan 22, 2021
4e3eea9
Merge branch 'master' of https://github.com/StacyLundquist/video-stor…
StacyLundquist Jan 22, 2021
a64d901
some styling
StacyLundquist Jan 22, 2021
b196fc9
organizing library, not there yet
GeMath18 Jan 22, 2021
4cb7c26
merge conflict
GeMath18 Jan 22, 2021
689cab8
arranged videos on library
GeMath18 Jan 22, 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
Prev Previous commit
Next Next commit
some styling
StacyLundquist committed Jan 22, 2021

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit a64d901a2a89cc93461225eef6f61256c9619e3a
6 changes: 6 additions & 0 deletions src/App.css
Original file line number Diff line number Diff line change
@@ -33,4 +33,10 @@

.disabled:hover {
background-color: #F41861;
}

.navigation {
background-color: rgb(0, 195, 255);
padding: 5%;
width: 100%;
}
52 changes: 29 additions & 23 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -3,6 +3,9 @@ import VideoLibrary from './components/VideoLibrary';
import CustomerList from './components/CustomerList';
import axios from 'axios';
import moment from 'moment';
import './components/CustomerList.css'
import {Table} from 'react-bootstrap';


import React, { Component } from 'react';
import './App.css';
@@ -85,31 +88,34 @@ class App extends Component {

return (
<Router>

<div>
<nav>
<p> {this.state.message} </p>
<ul>
<li>
<Link to='/'>Home</Link>
</li>
<li>
<Link to='/search'>Video Search</Link>
</li>
<li>
<Link to='/library'>Video Library</Link>
</li>
<li>

<Link to='/customers'>Customers</Link>
</li>
</ul>
<ol>
<li>Selected Customer: {this.state.chosenCustomer.name}</li>
<li>Selected Video:{this.state.chosenVideo.title}</li>
<button onClick={this.checkoutVideo} className= { `button button-large ${ this.visibility() }` }>
<nav className='navigation'>
<Table className="table-sm customer-table__table">
<thead>
<tr className="customer-table__header-row">
<th scope="col">Selected Customer</th>
<th scope="col">Selected Video</th>
<th scope="col">CHECKOUT</th>
<th scope="col">Video</th>
<th scope="col">Video</th>
<th scope="col">Customer</th>
</tr>
</thead>
<tbody>
<tr className="customer-table__table-row">
<td>{this.state.chosenCustomer.name}</td>
<td>{this.state.chosenVideo.title}</td>
<td><button onClick={this.checkoutVideo} className= { `button button-large ${ this.visibility() }` }>
Check out {this.state.chosenVideo.title} to {this.state.chosenCustomer.name}
</button>
</ol>
</button></td>
<td><Link to='/search'>SEARCH</Link></td>
<td><Link to='/library'>LIBRARY</Link></td>
<td><Link to='/customers'>LIST</Link></td>
</tr>
</tbody>
</Table>
<p> {this.state.message} </p>
</nav>

<Switch>
4 changes: 2 additions & 2 deletions src/components/CustomerList.css
Original file line number Diff line number Diff line change
@@ -19,11 +19,11 @@
.customer-table__table {
font-family: 'Gothic A1', sans-serif;
font-weight: lighter;
background-color: #9fb2c2;
background-color: #f6fbff;
width: 100%;
text-align: center;
}

.customer-table__table-row:hover {
background-color: #a8ec0a;
background-color:rgb(0, 195, 255);
}