From 69b54932845f8634377bc99f57d10a3f5de3a897 Mon Sep 17 00:00:00 2001 From: Tony Date: Tue, 25 Apr 2017 20:46:55 -0500 Subject: [PATCH 1/2] Initial commit --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 258a878..e4c5852 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,6 @@ +#### Name +Tony Rinaldi + #### Setup Fork, clone, run yarn install, yarn start, pull request From 274c9477ca3d827c01d7e884f304c4d762ba1942 Mon Sep 17 00:00:00 2001 From: Tony Date: Thu, 27 Apr 2017 12:35:41 -0500 Subject: [PATCH 2/2] Met requirements of assignment --- public/css/shop-homepage.css | 5 ++ src/App.js | 53 ++++++++------- src/components/Carousel.js | 2 +- src/components/Footer.js | 2 +- src/components/NavBar.js | 2 +- src/components/ProductDetail.js | 115 +++++++++++++++++++++++++------- src/components/Reviews.js | 31 +++++++++ src/state.js | 20 +++--- 8 files changed, 166 insertions(+), 64 deletions(-) create mode 100644 src/components/Reviews.js diff --git a/public/css/shop-homepage.css b/public/css/shop-homepage.css index b498194..3647b7f 100755 --- a/public/css/shop-homepage.css +++ b/public/css/shop-homepage.css @@ -40,6 +40,11 @@ body { color: #d17581; } +.reviews { + clear: both; + text-align: left; +} + .thumbnail { padding: 0; } diff --git a/src/App.js b/src/App.js index 8dfa97f..55b50ee 100644 --- a/src/App.js +++ b/src/App.js @@ -1,5 +1,4 @@ -import React, { Component } from 'react'; -import logo from './logo.svg'; +import React from 'react'; import './App.css'; import NavBar from './components/NavBar'; import Footer from './components/Footer'; @@ -7,33 +6,33 @@ import ProductDetail from './components/ProductDetail'; import Carousel from './components/Carousel'; function App (props) { - var products = props.state.products.map(function(prod){ - return ; - }); - return ( -
- -
-
-
-

Shop Name

- -
-
- -
- {products} -
-
-
+ const products = props.state.products.map(function(prod){ + return ; + }); + return ( +
+ +
+
+
+

Shop Name

+ -
- ); +
+ +
+ {products} +
+
+
+
+
+
+ ); } export default App; diff --git a/src/components/Carousel.js b/src/components/Carousel.js index a10b02b..a9e441e 100644 --- a/src/components/Carousel.js +++ b/src/components/Carousel.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import React from 'react'; function Carousel(){ return ( diff --git a/src/components/Footer.js b/src/components/Footer.js index b1cffbd..c24bb65 100644 --- a/src/components/Footer.js +++ b/src/components/Footer.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import React from 'react'; function Footer(){ return ( diff --git a/src/components/NavBar.js b/src/components/NavBar.js index 0fc4200..f44a1d1 100644 --- a/src/components/NavBar.js +++ b/src/components/NavBar.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import React from 'react'; function NavBar(){ return (