From 4114986e9db4c3776a12b2e2e66553565616d7a0 Mon Sep 17 00:00:00 2001 From: Pavel Puzin Date: Tue, 25 Dec 2018 01:29:16 +0300 Subject: [PATCH 1/2] added router, changed files structure --- index.html | 2 +- index.js | 38 ++++++++- package-lock.json | 83 ++++++++++++++++++- package.json | 2 + src/components/views/Catalog/Header/index.js | 41 --------- .../{ => Catalog}/ProductCard/CardInput.js | 0 .../views/{ => Catalog}/ProductCard/Image.js | 0 .../views/{ => Catalog}/ProductCard/Price.js | 0 .../views/{ => Catalog}/ProductCard/index.js | 0 src/components/views/Catalog/index.js | 29 ++----- src/components/views/shared/Footer/index.js | 14 ++++ .../Header/Cart/CartIcon.js | 0 .../Header/Cart/CartItem.js | 2 +- .../{Catalog => shared}/Header/Cart/index.js | 0 src/components/views/shared/Header/index.js | 53 ++++++++++++ src/containers/CartItemsList.js | 2 +- src/containers/ProductsCatalog.js | 4 +- .../helpers/AddDescription.js | 0 src/helpers/routes.js | 5 ++ src/main.css | 9 +- src/routes/About.js | 7 ++ src/routes/Catalog.js | 7 ++ src/routes/Main.js | 9 ++ src/routes/Product.js | 7 ++ src/routes/index.js | 8 ++ 25 files changed, 244 insertions(+), 78 deletions(-) delete mode 100644 src/components/views/Catalog/Header/index.js rename src/components/views/{ => Catalog}/ProductCard/CardInput.js (100%) rename src/components/views/{ => Catalog}/ProductCard/Image.js (100%) rename src/components/views/{ => Catalog}/ProductCard/Price.js (100%) rename src/components/views/{ => Catalog}/ProductCard/index.js (100%) create mode 100644 src/components/views/shared/Footer/index.js rename src/components/views/{Catalog => shared}/Header/Cart/CartIcon.js (100%) rename src/components/views/{Catalog => shared}/Header/Cart/CartItem.js (90%) rename src/components/views/{Catalog => shared}/Header/Cart/index.js (100%) create mode 100644 src/components/views/shared/Header/index.js rename src/{components => }/helpers/AddDescription.js (100%) create mode 100644 src/helpers/routes.js create mode 100644 src/routes/About.js create mode 100644 src/routes/Catalog.js create mode 100644 src/routes/Main.js create mode 100644 src/routes/Product.js create mode 100644 src/routes/index.js diff --git a/index.html b/index.html index b99d7be..ca35f29 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,7 @@ - First App + Brew shop
diff --git a/index.js b/index.js index eda7a8b..dab6b0c 100644 --- a/index.js +++ b/index.js @@ -1,9 +1,41 @@ +import './src/main.css'; +import 'bootstrap/dist/css/bootstrap.css'; + import React, { Fragment } from 'react'; import ReactDOM from 'react-dom'; -import Catalog from './src/components/views/Catalog'; -import 'bootstrap/dist/css/bootstrap.css'; + +import routes from './src/routes'; +import { + BrowserRouter as Router, Route, Switch, NavLink +} from 'react-router-dom'; + +import Header from './src/components/views/shared/Header'; +import Footer from './src/components/views/shared/Footer'; + +import CartContainer from '~/src/containers/CartContainer'; +import { Container } from 'reactstrap'; + +const RoutesWithSubroutes = (route) => ( + +); + +const App = () => ( + + + + +
+ + + { routes.map((route) => RoutesWithSubroutes(route)) } + + +