From d43cc88c94c31d32c969909f2765bab1cde6d874 Mon Sep 17 00:00:00 2001 From: enggar_ganteng Date: Sat, 5 Jan 2019 22:08:12 +0700 Subject: [PATCH] empty state dan navbar --- assets/images/emptyState/coupon.png | Bin 0 -> 3742 bytes src/common/pages/App/index.js | 10 ++++----- src/common/pages/App/style.scss | 8 ++++--- src/common/pages/EmptyComponent/index.js | 20 ++++++++++++++++- src/common/pages/Vouchers/index.js | 27 +++++++++++------------ src/common/pages/Vouchers/style.scss | 12 ---------- src/common/routes.js | 7 ++++-- 7 files changed, 47 insertions(+), 37 deletions(-) create mode 100644 assets/images/emptyState/coupon.png diff --git a/assets/images/emptyState/coupon.png b/assets/images/emptyState/coupon.png new file mode 100644 index 0000000000000000000000000000000000000000..fa5cb6ec3852251d953ae323d1cb6f3ea704a469 GIT binary patch literal 3742 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 NAYjcfr3Mbs{{j0Bj2i#| literal 0 HcmV?d00001 diff --git a/src/common/pages/App/index.js b/src/common/pages/App/index.js index 24f3729..ad96827 100644 --- a/src/common/pages/App/index.js +++ b/src/common/pages/App/index.js @@ -466,7 +466,7 @@ export default class App extends React.Component { {userData.role === 'admin' ? (
{this.notificationStore.unread_notif === 0 ? - : @@ -475,7 +475,7 @@ export default class App extends React.Component { primary={true} badgeStyle={{top: 15, right: 12}} > - @@ -485,7 +485,7 @@ export default class App extends React.Component { ) : (
{this.notificationStore.unread_notif === 0 ? - : @@ -494,7 +494,7 @@ export default class App extends React.Component { primary={true} badgeStyle={{top: 15, right: 12}} > - @@ -615,7 +615,7 @@ export default class App extends React.Component { ); }) : + content="No item yet! "/> }
); - } + } + else if(type == "default4"){ + return( +
+ +
+
+ +
+
+

{this.props.header}

+

{this.props.content}

+
+
+
+ ); + } else if(type == "404"){ return(
diff --git a/src/common/pages/Vouchers/index.js b/src/common/pages/Vouchers/index.js index 277da90..5626d8d 100644 --- a/src/common/pages/Vouchers/index.js +++ b/src/common/pages/Vouchers/index.js @@ -1,11 +1,12 @@ import React from 'react'; import {inject, observer} from 'mobx-react'; import {Link} from 'react-router'; -import {Affix, Card, Slider, Select, Col, Row, Carousel } from 'antd'; +import {Affix, Card, Slider, Select, Col, Row } from 'antd'; import {Tab, Tabs} from 'material-ui'; import './style.scss'; import {ItemCard} from "./ItemCard"; import ModalVouchersComponent from "./Modal"; +import EmptyComponent from '../EmptyComponent'; const Option = Select.Option; @inject('appstate') @@ -186,14 +187,6 @@ export default class VouchersComponent extends React.Component { return (
- {/*
*/} - {/**/} - {/*
Banner 1
*/} - {/*
Banner 2
*/} - {/*
Banner 3
*/} - {/*
Banner 4
*/} - {/**/} - {/*
*/}

@@ -201,11 +194,17 @@ export default class VouchersComponent extends React.Component {

- {data.map((item, index) => { - return ( this.setState({isOpened: true, data: item})} key={index} span={6}> - - ) - })} + { + (data.length > 0) ? + data.map((item, index) => { + return ( this.setState({isOpened: true, data: item})} key={index} span={6}> + + ) + }) + : ( + + ) + } ( this.authStore.isLoggedIn === true + render={ + (props) => true === true ? () : ( - )}/> + ) + } + /> ) return (