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

addy & lindsay - edges - video store #20

Open
wants to merge 75 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
8f6503b
add react router
addisoncole Dec 18, 2018
67aa3d0
add react router to index.js, add header placeholder for nav bar cont…
addisoncole Dec 18, 2018
9d1e17b
add component folder. npm install axios. create NewRental component, …
addisoncole Dec 18, 2018
c24fe15
add Functional Component Template for development. Add Selector compo…
addisoncole Dec 18, 2018
154d0c6
created basic framework for 3 nav buttons
elle-terch Dec 18, 2018
600dfb7
added placeholder buttons for nav components
elle-terch Dec 18, 2018
1276c0d
renamed nav components
elle-terch Dec 18, 2018
4196586
added components
elle-terch Dec 18, 2018
29bb439
renamed components
elle-terch Dec 18, 2018
99d9945
merge
addisoncole Dec 18, 2018
228a123
added client side Links for Search Customers and Library. Cleaned up …
addisoncole Dec 18, 2018
f43447a
created pieces for movie component
elle-terch Dec 18, 2018
4d3db6b
connected link in nav component to routes which render library, custo…
addisoncole Dec 18, 2018
dda8809
fixed merge conflicts.
addisoncole Dec 18, 2018
d6d0642
removed Library component, and connected library section component to…
addisoncole Dec 18, 2018
c8b5923
added pieces for customer component
elle-terch Dec 18, 2018
387b194
rendered customer component in customer section
elle-terch Dec 18, 2018
4cd85ab
merge with master
elle-terch Dec 18, 2018
108b72b
hooked customersection component up to API
elle-terch Dec 18, 2018
e28a074
connect library component to rails api with axios call during mount.
addisoncole Dec 18, 2018
53e003a
Merge branch 'master' of https://github.com/addisoncole/video-store-c…
addisoncole Dec 18, 2018
1e702dd
Merge branch 'customers_api'
elle-terch Dec 18, 2018
2872d0e
added missing .css files for corresponding components. Create search …
addisoncole Dec 18, 2018
ae78c05
created callback functions to send info for a specific movie
elle-terch Dec 18, 2018
7085dc9
merge with master
elle-terch Dec 18, 2018
235fbf3
created ability to select a video from library
elle-terch Dec 18, 2018
2f00b6f
searchBar component passes form state to search section and onsubmit …
addisoncole Dec 18, 2018
fe0a61f
add missing component css files.
addisoncole Dec 18, 2018
dfd98ca
Merge branch 'search'
addisoncole Dec 18, 2018
d4c15c8
created callback functions to select a customer for rental
elle-terch Dec 19, 2018
1343aa8
add onCall function to NewRental button, which calls callback functio…
addisoncole Dec 19, 2018
f6a736d
basic structure for axios post call for checking out a movie. works w…
addisoncole Dec 19, 2018
7561c5a
add axios, create initial state for app.js to maintain state of retur…
addisoncole Dec 19, 2018
260554d
spacing
addisoncole Dec 19, 2018
e8a361a
title change
addisoncole Dec 19, 2018
d6b0b2e
created function to add move from API to local library
elle-terch Dec 19, 2018
fce289f
Merge branch 'master' of https://github.com/addisoncole/video-store-c…
elle-terch Dec 19, 2018
68a6d4e
css for app and nav
addisoncole Dec 19, 2018
a9be211
created status message for checking out a movie
elle-terch Dec 19, 2018
b1e395d
add className to movie component. add missing proptypes.
addisoncole Dec 20, 2018
489833d
add missing propType to LibrarySection component. Add css flex box to…
addisoncole Dec 20, 2018
82d4b9c
add styling to movie to create card elements. Added fonts.
addisoncole Dec 20, 2018
fef69b4
fixed status message for checking out a movie
elle-terch Dec 20, 2018
e1872b4
added status messages for loading the movie library
elle-terch Dec 20, 2018
8e86753
added status messages for loading customers & errors
elle-terch Dec 20, 2018
e18d071
added proptypes
elle-terch Dec 20, 2018
3191c5b
added status for adding movie to library
elle-terch Dec 20, 2018
26d6c3f
add css styling to search component, nav bar and customer components.
addisoncole Dec 20, 2018
14d3cee
fixed merge conflicts
addisoncole Dec 20, 2018
e815a00
cleaned up some spacing and added missing PropTypes
addisoncole Dec 20, 2018
3dc2539
added proptypes to status bar
elle-terch Dec 20, 2018
bcad085
added proptypes to new rental
elle-terch Dec 20, 2018
b3af609
fixed status messages
elle-terch Dec 20, 2018
ec96cca
merging with master
elle-terch Dec 20, 2018
0b172c1
added number of checked out movies to customers
elle-terch Dec 20, 2018
027fc39
fixed movies per customer
elle-terch Dec 20, 2018
e51fc1b
updated conditional for nonexistent release date
elle-terch Dec 20, 2018
5385399
added ternary to create date to fix bug.
addisoncole Dec 20, 2018
11e4b8b
Merge branch 'master' of https://github.com/addisoncole/video-store-c…
addisoncole Dec 20, 2018
6ed6447
add styling touches to movie component and header.
addisoncole Dec 20, 2018
84f894d
add transition styling
addisoncole Dec 20, 2018
9e5426a
add styling to status bar
addisoncole Dec 21, 2018
a41cd90
add styling to status bar and customers. corrected search seaction to…
addisoncole Dec 21, 2018
99d5390
change header text color, add some styling to selector. ad dmissing p…
addisoncole Dec 21, 2018
b8b6abb
added sorting methods to library and customer sections. added styling…
addisoncole Dec 21, 2018
673b2b0
styling on selector and spacing.
addisoncole Dec 21, 2018
c63aa08
removed extraneous console.logs and fixed spacing and added missing s…
addisoncole Dec 21, 2018
ed25bee
added null option for title
elle-terch Dec 21, 2018
e0d2e29
styling on status bar, text color to fix scheme.
addisoncole Dec 21, 2018
63dabcf
add button and callback method to check in a movie for a customer. ch…
addisoncole Dec 21, 2018
af618dd
add spacing to header in customer component.
addisoncole Dec 21, 2018
7a599ff
add styling to movie and customer so that it is highlighted red if it…
addisoncole Dec 21, 2018
a964bb1
refactor error messages.
addisoncole Dec 21, 2018
df88a73
dry up css
addisoncole Dec 21, 2018
2698104
small style change to status bar gradient. animation package loaded, …
addisoncole 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
Prev Previous commit
Next Next commit
add missing propType to LibrarySection component. Add css flex box to…
… same component.
addisoncole committed Dec 20, 2018
commit 489833db2cee40013b2116d75182378a67cceeef
5 changes: 4 additions & 1 deletion src/components/LibrarySection.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
.library-section {
margin-top: 10vh;
margin-top: 8vh;
display: flex;
flex-wrap: wrap;
justify-content: space-evenly;
}
5 changes: 2 additions & 3 deletions src/components/LibrarySection.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React, { Component } from 'react';
// import { BrowserRouter as Router, Link } from 'react-router-dom';
import PropTypes from 'prop-types';
import axios from 'axios';
import Movie from './Movie';
@@ -33,7 +32,7 @@ class LibrarySection extends Component {

render() {

const { movies } = this.state
const { movies } = this.state;

const allMovies = movies.map((movie, i) => {

@@ -55,7 +54,7 @@ class LibrarySection extends Component {
}

LibrarySection.propTypes = {

selectMovieCallback: PropTypes.func,
};

export default LibrarySection;
3 changes: 3 additions & 0 deletions src/components/Movie.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.movie-card {
background-color: rgba(14, 16, 17, 1);
}
2 changes: 1 addition & 1 deletion src/components/Movie.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
// import './Movie.css';
import './Movie.css';


const Movie = (props) => {