|
@@ -5,7 +5,7 @@ import {Provider, connect} from 'react-redux';
|
|
import {createStore, combineReducers, applyMiddleware} from 'redux';
|
|
import {createStore, combineReducers, applyMiddleware} from 'redux';
|
|
import thunk from 'redux-thunk';
|
|
import thunk from 'redux-thunk';
|
|
import store from "../reducers";
|
|
import store from "../reducers";
|
|
-import Catalog from "./catalog";
|
|
|
|
|
|
+import Catalog from "./goods/catalog";
|
|
import {actionCatalogCard, CBasketPage, searchInput, CGoodsCategory,
|
|
import {actionCatalogCard, CBasketPage, searchInput, CGoodsCategory,
|
|
SearchInput, CGoodsSearch, LoginForm, CGoodCard, CYourProfile,
|
|
SearchInput, CGoodsSearch, LoginForm, CGoodCard, CYourProfile,
|
|
COrderPage, CUsersList, COrdersList, COrderUpdate, CWishesPage, CGoodsList} from "./index";
|
|
COrderPage, CUsersList, COrdersList, COrderUpdate, CWishesPage, CGoodsList} from "./index";
|
|
@@ -31,11 +31,12 @@ const Main = ({className = "MainImg" }) => {
|
|
<Route path = "/search/"component={Catalog} />
|
|
<Route path = "/search/"component={Catalog} />
|
|
<Route path = "/good/:id" component={(window.innerWidth > 900) && Catalog} />
|
|
<Route path = "/good/:id" component={(window.innerWidth > 900) && Catalog} />
|
|
<Route path = "/orderPage/" component = {Catalog}/>
|
|
<Route path = "/orderPage/" component = {Catalog}/>
|
|
|
|
+ <Route component = { Empty } exact/>
|
|
</Switch>
|
|
</Switch>
|
|
</aside>
|
|
</aside>
|
|
|
|
|
|
|
|
|
|
- <content>
|
|
|
|
|
|
+ <div className = "content">
|
|
<Switch>
|
|
<Switch>
|
|
<Route path = "/" component = {About} exact/>
|
|
<Route path = "/" component = {About} exact/>
|
|
<Route path = "/catalog/" component={MainCatalog} exact/>
|
|
<Route path = "/catalog/" component={MainCatalog} exact/>
|
|
@@ -56,7 +57,7 @@ const Main = ({className = "MainImg" }) => {
|
|
<Route path = "/loginError" component={LoginError} />
|
|
<Route path = "/loginError" component={LoginError} />
|
|
<Route component = { NotFound } exact/>
|
|
<Route component = { NotFound } exact/>
|
|
</Switch>
|
|
</Switch>
|
|
- </content>
|
|
|
|
|
|
+ </div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div className = "bottom">
|
|
<div className = "bottom">
|
|
@@ -82,7 +83,7 @@ const LoginError = () => {
|
|
</div>
|
|
</div>
|
|
</>
|
|
</>
|
|
)}
|
|
)}
|
|
-const MainMag = () => <div>Я тут кароче самый главный страниц</div>
|
|
|
|
|
|
+
|
|
const About = () =>
|
|
const About = () =>
|
|
<div className = "basketNoGoods">
|
|
<div className = "basketNoGoods">
|
|
|
|
|
|
@@ -109,7 +110,7 @@ const NotFound = () => {
|
|
}
|
|
}
|
|
{/* <div> <h5 className = "profilePage">Ой, щось пішло не так. Мабудь цієї сторінки немає, або сталася помилка. Спробуйте ще.</h5></div> */}
|
|
{/* <div> <h5 className = "profilePage">Ой, щось пішло не так. Мабудь цієї сторінки немає, або сталася помилка. Спробуйте ще.</h5></div> */}
|
|
const MainCatalog = () => <div></div>
|
|
const MainCatalog = () => <div></div>
|
|
-const Post = () => <div className = "post">Точно не знаю зачем это, возможно потом уберу. Но в некоторых магазинах есть такое</div>
|
|
|
|
|
|
+const Empty = () => <div className = "empty"></div>
|
|
const Contacts = () =>
|
|
const Contacts = () =>
|
|
<div className = "order">
|
|
<div className = "order">
|
|
<h4>Як ви нас зможете знайти:</h4>
|
|
<h4>Як ви нас зможете знайти:</h4>
|