|
@@ -32,6 +32,7 @@ const LoginForm = ({onLogin}) => {
|
|
|
const CLoginForm = connect(null, {onLogin: actionLogin})(LoginForm)
|
|
|
|
|
|
|
|
|
+
|
|
|
store.dispatch(actionCategories())
|
|
|
store.dispatch(actionOrders())
|
|
|
|
|
@@ -40,23 +41,19 @@ const CategoryMenuItem = ({category:{_id, name}={_id: 'NOID', name: "NO CATEGORY
|
|
|
<Link to={`/category/${_id}`}>{name}</Link>
|
|
|
</li>
|
|
|
|
|
|
-const CategoryMenu = ({categories=
|
|
|
-[
|
|
|
- { "_id": "5dc45acf5df9d670df48cc48", "name": "TV's" },
|
|
|
- { "_id": "5dc49f4d5df9d670df48cc64", "name": "Airconditions" },
|
|
|
- { "_id": "5dc458985df9d670df48cc47", "name": "Smartphones" },
|
|
|
- ]
|
|
|
-}) =>
|
|
|
+const CategoryMenu = ({categories}) =>
|
|
|
<aside style={{float: 'left'}}>
|
|
|
<ul>
|
|
|
- {categories &&
|
|
|
- categories.map(category => <CategoryMenuItem category={category}/>)}
|
|
|
+ {categories ?
|
|
|
+ categories.map(category => <CategoryMenuItem category={category}/>)
|
|
|
+ : <img src='https://i.gifer.com/origin/ec/ecf46fc2a40f43ad0ef438b04b0d2e8e_w200.gif'/>}
|
|
|
</ul>
|
|
|
</aside>
|
|
|
|
|
|
const CCategoryMenu = connect(state => ({categories: state.promise.categories &&
|
|
|
state.promise.categories.payload}))(CategoryMenu)
|
|
|
|
|
|
+
|
|
|
const defaultGoods = [
|
|
|
{
|
|
|
"_id": "5dcaac1fe87d153c543bcef4",
|
|
@@ -71,8 +68,9 @@ const defaultGoods = [
|
|
|
"name": "Пшеничная лапша с овощами и свининой"
|
|
|
}]
|
|
|
|
|
|
-const GoodCard = ({_id, name}) =>
|
|
|
+const GoodCard = ({_id, name, images}) =>
|
|
|
<li>
|
|
|
+ <img src={"http://shop-roles.asmer.fs.a-level.com.ua/" + ((images && images[0]) ? images[0].url : '' )} />
|
|
|
<h2>{name}</h2>
|
|
|
</li>
|
|
|
|
|
@@ -84,8 +82,7 @@ const GoodList = ({goods=defaultGoods}) =>
|
|
|
const CGoodList = connect(
|
|
|
state => ({goods: state.promise.category &&
|
|
|
state.promise.category.payload &&
|
|
|
- state.promise.category.payload.CategoryFindOne &&
|
|
|
- state.promise.category.payload.CategoryFindOne.goods})
|
|
|
+ state.promise.category.payload.goods})
|
|
|
)(GoodList)
|
|
|
|
|
|
|