Skip to content

russ.savage.atx.advanced.1 #9

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

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

russ.savage.atx.advanced.1 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e00d537
Simple Change
RX7RUSS May 6, 2017
8201014
Reviews Added to State Practice
RX7RUSS May 10, 2017
38f9896
Reviews and App Change
RX7RUSS May 16, 2017
d6e2260
Problems Fixed
RX7RUSS May 29, 2017
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
73 changes: 41 additions & 32 deletions src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,48 @@
import React, { Component } from 'react';
import logo from './logo.svg';
import './App.css';
import NavBar from './components/NavBar';
import Footer from './components/Footer';
import ProductDetail from './components/ProductDetail';
import Carousel from './components/Carousel';
function App (props) {
import React from "react";
import "./App.css";
import NavBar from "./components/NavBar";
import Footer from "./components/Footer";
import ProductDetail from "./components/ProductDetail";
import Carousel from "./components/Carousel";
import PropTypes from "prop-types";

var products = props.state.products.map(function(prod){
return <ProductDetail product={prod} />;
});
function App(props) {

const products = props.state.products.map(function (prod) {
return (
<div className="App">
<NavBar />
<div className="container">
<div className="row">
<div className="col-md-3">
<p className="lead">Shop Name</p>
<div className="list-group">
<a href="#" className="list-group-item">Category 1</a>
<a href="#" className="list-group-item">Category 2</a>
<a href="#" className="list-group-item">Category 3</a>
</div>
</div>
<div className="col-md-9">
<Carousel />
<div className="row">
{products}
</div>
</div>
</div>
<ProductDetail
key={prod.id}
product={prod} />
);
});
return (
<div className="App">
<NavBar />
<div className="container">
<div className="row">
<div className="col-md-3">
<p className="lead">Shop Name</p>
<div className="list-group">
<a href="#" className="list-group-item">Category 1</a>
<a href="#" className="list-group-item">Category 2</a>
<a href="#" className="list-group-item">Category 3</a>
</div>
<Footer />
</div>
);
<div className="col-md-9">
<Carousel />
<div className="row">
{products}
</div>
</div>
</div>
</div>
<Footer />
</div>
);
}

App.propTypes = {
state: PropTypes.object.isRequired
};

export default App;
75 changes: 52 additions & 23 deletions src/components/ProductDetail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,59 @@
import React from "react";
import React, {Component} from "react";
import Reviews from "./Reviews";
import PropTypes from "prop-types";

function ProductDetail(props) {
const {name,description,rating,imgUrl} = props.product;
const stars = [];
for (let i = 0; i < rating; i++) {
stars.push(<span className="glyphicon glyphicon-star" />);
class ProductDetail extends Component {
constructor(props) {
super(props);
this.state = {
showReviews: false
};
}

return (
<div className="col-sm-4 col-lg-4 col-md-4">
<div className="thumbnail">
<img style={{width: "320px",height: "150px"}} src={imgUrl} alt="" />
<div className="caption">
<h4><a href="#">{name}</a>
</h4>
<p>{description}
</p>
</div>
<div className="ratings">
<p className="pull-right">15 reviews</p>
<p>
{stars}
</p>
displayStars() {
const stars = [];
for (let i = 0; i < this.props.product.rating; i++) {
stars.push(<span className="glyphicon glyphicon-star" />);
}
return stars;
}

toggleReviews() {
this.setState({
showReviews: !this.state.showReviews
});
}

render() {
return (
<div className="col-sm-4 col-lg-4 col-md-4">
<div className="thumbnail">
<img style={{width: "320px",height: "150px"}} src={this.props.product.imgUrl} alt="" />
<div className="caption">
<h4><a href="#">{this.props.product.name}</a>
</h4>
<p>{this.props.product.description}
</p>
</div>
<div className="ratings">
<Reviews
showReviews={this.state.showReviews}
toggleReviews={() => {
this.toggleReviews();
}}
product={this.props.product} />
<p>
{this.displayStars()}
</p>
</div>
</div>
</div>
</div>
);
);
}
}

ProductDetail.propTypes = {
product: PropTypes.object.isRequired,
};

export default ProductDetail;
45 changes: 45 additions & 0 deletions src/components/Reviews.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
import React, {Component} from "react";
import PropTypes from "prop-types";

class Reviews extends Component {
constructor(props) {
super(props);
this.state = {
reviews: this.props.product.reviews,
reviewText: "Reviews",
reviewDetails: this.props.product.reviewDetails
};
}

showReviewDetails() {
return this.state.reviewDetails.map((each, index) => {
return (
<p key={index}>
{each.description}
</p>
);
});
}

render() {
if (this.state.reviews <= 1) {
this.setState({
reviewText: "Review"
});
}
return (
<div onClick={this.props.toggleReviews}>
{this.state.reviews} {this.state.reviewText}
{this.props.showReviews && this.showReviewDetails()}
</div>
);
}
}

Reviews.propTypes = {
showReviews: PropTypes.bool.isRequired,
toggleReviews: PropTypes.func.isRequired,
product: PropTypes.object.isRequired
};

export default Reviews;
22 changes: 11 additions & 11 deletions src/state.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export default {
"imgUrl": "http://dummyimage.com/136x167.bmp/cc0000/ffffff",
"price": "$95.11",
"category": "food",
"reviews": [{
"reviewDetails": [{
"description": "architect revolutionary deliverables",
"rating": 2
}, {
Expand Down Expand Up @@ -49,7 +49,7 @@ export default {
"imgUrl": "http://dummyimage.com/125x134.jpg/cc0000/ffffff",
"price": "$37.09",
"category": "food",
"reviews": [{
"reviewDetails": [{
"description": "architect revolutionary deliverables",
"rating": 2
}, {
Expand All @@ -75,7 +75,7 @@ export default {
"imgUrl": "http://dummyimage.com/149x190.jpg/dddddd/000000",
"price": "$51.83",
"category": "food",
"reviews": [{
"reviewDetails": [{
"description": "architect revolutionary deliverables",
"rating": 2
}, {
Expand All @@ -95,7 +95,7 @@ export default {
"imgUrl": "http://dummyimage.com/162x153.jpg/cc0000/ffffff",
"price": "$86.93",
"category": "electronics",
"reviews": [{
"reviewDetails": [{
"description": "architect revolutionary deliverables",
"rating": 2
}, {
Expand All @@ -115,7 +115,7 @@ export default {
"imgUrl": "http://dummyimage.com/120x245.jpg/cc0000/ffffff",
"price": "$70.10",
"category": "electronics",
"reviews": [{
"reviewDetails": [{
"description": "architect revolutionary deliverables",
"rating": 2
}, {
Expand All @@ -135,7 +135,7 @@ export default {
"imgUrl": "http://dummyimage.com/211x227.bmp/5fa2dd/ffffff",
"price": "$39.25",
"category": "electronics",
"reviews": [{
"reviewDetails": [{
"description": "architect revolutionary deliverables",
"rating": 2
}, {
Expand All @@ -155,7 +155,7 @@ export default {
"imgUrl": "http://dummyimage.com/212x144.jpg/ff4444/ffffff",
"price": "$99.91",
"category": "sporting",
"reviews": [{
"reviewDetails": [{
"description": "architect revolutionary deliverables",
"rating": 2
}, {
Expand All @@ -175,7 +175,7 @@ export default {
"imgUrl": "http://dummyimage.com/204x175.jpg/5fa2dd/ffffff",
"price": "$67.17",
"category": "sporting",
"reviews": [{
"reviewDetails": [{
"description": "architect revolutionary deliverables",
"rating": 2
}, {
Expand All @@ -195,7 +195,7 @@ export default {
"imgUrl": "http://dummyimage.com/212x108.bmp/cc0000/ffffff",
"price": "$96.84",
"category": "sporting",
"reviews": [{
"reviewDetails": [{
"description": "architect revolutionary deliverables",
"rating": 2
}, {
Expand All @@ -215,10 +215,10 @@ export default {
"imgUrl": "http://dummyimage.com/189x109.png/cc0000/ffffff",
"price": "$74.37",
"category": "sporting",
"reviews": [{
"reviewDetails": [{
"description": "architect revolutionary deliverables",
"rating": 2
}
]
}]
}
};
10 changes: 3 additions & 7 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2570,11 +2570,11 @@ got@^5.0.0:
unzip-response "^1.0.2"
url-parse-lax "^1.0.0"

graceful-fs@4.1.10:
graceful-fs@4.1.10, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
version "4.1.10"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.10.tgz#f2d720c22092f743228775c75e3612632501f131"

graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
graceful-fs@^4.1.11:
version "4.1.11"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"

Expand Down Expand Up @@ -4557,14 +4557,10 @@ q-io@1.13.2:
qs "^1.2.1"
url2 "^0.0.0"

q@1.4.1:
q@1.4.1, q@^1.0.1, q@^1.1.2:
version "1.4.1"
resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"

q@^1.0.1, q@^1.1.2:
version "1.5.0"
resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"

qs@6.4.0, qs@~6.4.0:
version "6.4.0"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
Expand Down