updates

2019-01-28 19:27:24 +07:00
parent dab57e2c88
commit 3c5c37aac3
7 changed files with 1531 additions and 1055 deletions
--- a/src/common/pages/App/index.js
+++ b/src/common/pages/App/index.js
@@ -322,7 +322,8 @@ export default class App extends React.Component {

    const {userData} = this.appstate;
    // const applicationIcon = (this.settingStore.isIconEmpty) ? "/assets/images/bankbtn.png" : this.http.appendImagePath(this.settingStore.setting.icon);
-    let applicationIcon =  "http://giift.asacreative.com/giift_logo_wide.4d15de72.png";
+    // let applicationIcon =  "http://giift.asacreative.com/giift_logo_wide.4d15de72.png";
+    const applicationIcon = require('../../../../assets/images/logo_new.png');
    let applicationName = 'Giift';
    if(APP_TYPE === 'btn') {
      applicationIcon = "http://btn-redemption-2.bangun-kreatif.com/dr6u0fppdi4xy.cloudfront.net/FilesDirectory/Albilad/ImgIconImage/logo-btn.png";
@@ -379,8 +380,8 @@ export default class App extends React.Component {
                  .bind(this, '/app/dashboard')} to={LINKS.DASHBOARD}>
                  <img
                    style={{
-                      width: 150,
-                      height: 50
+                      width: 100,
+                      height: 30
                    }}
                       src={applicationIcon}/>
                </Link>
--- a/src/common/pages/App/style.scss
+++ b/src/common/pages/App/style.scss
@@ -135,7 +135,7 @@
    width: 100%;
    top: 0;
    z-index: 1000;
-    background-color: #f1f5f9 !important;
+    background-color: #ffeb3b !important;
    height: 70px !important;
    padding: 8px 24px;
    border-bottom: 1px solid rgb(223, 223, 223);
--- a/src/common/pages/Dashboard/index.js
+++ b/src/common/pages/Dashboard/index.js
@@ -1,14 +1,14 @@
 import React from "react";
-import { inject, observer } from "mobx-react";
+import {inject, observer} from "mobx-react";
 import QueueAnim from 'rc-queue-anim';
 import "./style.scss";
 import NumberFormat from 'react-number-format';
-import { LINKS } from './../../routes'
-import { Link } from 'react-router-dom';
+import {LINKS} from './../../routes'
+import {Link} from 'react-router-dom';
 import CardAdmin from './CardAdmin';
 import CardAgent from './CardAgent';
 import moment from 'moment';
-import { Icon, Button, notification, Table, Tooltip as TooltipAntd, Col, Row, } from 'antd';
+import {Icon, Button, notification, Table, Tooltip as TooltipAntd, Col, Row,} from 'antd';
 import DC from 'decimal.js-light';
 import {
  Paper,
@@ -26,11 +26,11 @@ import {
 import Grid from '@material-ui/core/Grid';
 import EmptyComponent from '../EmptyComponent';
 import * as _ from 'lodash';
-import { grey400, darkBlack, lightBlack, black } from 'material-ui/styles/colors';
+import {grey400, darkBlack, lightBlack, black} from 'material-ui/styles/colors';
 import './style.scss';
-import { Carousel } from 'react-responsive-carousel'
-import { ActionGrade, ContentDrafts, ContentInbox, ContentSend } from "material-ui/svg-icons/index";
-import { constant } from "../../config/const";
+import {Carousel} from 'react-responsive-carousel'
+import {ActionGrade, ContentDrafts, ContentInbox, ContentSend} from "material-ui/svg-icons/index";
+import {constant} from "../../config/const";
 import Slider from "react-slick";
 import 'slick-carousel/slick/slick.css';
 import 'slick-carousel/slick/slick-theme.css';
@@ -40,7 +40,7 @@ import slider2 from '../../../../assets/images/slider/2.jpg';
 import slider3 from '../../../../assets/images/slider/3.jpg';
 import slider4 from '../../../../assets/images/slider/4.jpg';
 import slider5 from '../../../../assets/images/slider/5.jpg';
-import { ItemCard } from "../Vouchers/ItemCard";
+import {ItemCard} from "../Vouchers/ItemCard";
 import ModalVouchersComponent from "../Vouchers/Modal";
 import PopularItemCardComponent from "./PopularItemCard";
 import NewItemCardComponent from "./NewItemCard";
@@ -74,18 +74,18 @@ export default class DashboardComponent extends React.Component {
      modalTopup: false,
      data: {
        name: '',
-        background_color_1:'',
-        background_color_2:'',
+        background_color_1: '',
+        background_color_2: '',
        images: {
-          logo:''
+          logo: ''
        },
        description: '',
        additional_data: {
-          information:''
+          information: ''
        },
        sku: [
          {
-            id:'',
+            id: '',
            name: '',
            price: ''
          },
@@ -115,78 +115,81 @@ export default class DashboardComponent extends React.Component {

    return (
      <div>
-        <div className="dashboard animated fadeIn" style={{marginLeft: '8%',marginRight:'7%'}}>
+        <div className="dashboard animated fadeIn" style={{
+          marginLeft: '8%',
+          marginRight: '7%'
+        }}>
          <div className="row ">
-            <div className="col s12 m12 l12 col-leftDashboard" style={{ marginBottom: 0 }}>
+            <div className="col s12 m12 l12 col-leftDashboard" style={{marginBottom: 0}}>
              <div className="row no-margin">
-              {this.props.appstate.wallet.data.wallet ? (
-                <div className="col s12 m4 l4" style={{ marginBottom: 0 }}>
-                <Card className="cardLite cardDashboard">
-                  <h3 style={{
-                    display: 'block',
-                    fontSize: '1rem',
-                    textTransform: 'uppercase',
-                    color: '#0006',
-                    letterSpacing: 1
-                  }}>Voucher</h3>
-                  <div className="value">
-                  {/* <NumberFormat value={(this.props.appstate.wallet.data.wallet).toFixed(2)} displayType={'text'} thousandSeparator={true} prefix={'Rp '}/> */}
-                  <NumberFormat value={(0).toFixed(2)} displayType={'text'} thousandSeparator={true} prefix={'Rp '}/>
-                  </div>
-                  <div style={{marginTop:10}}>
-                    <Button type="primary" icon="plus" onClick={() => this.setModalTopup(true)}>Add Voucher</Button>
-                    {/* <a className="btnFlatUnderline" onClick={() => this.setModalTopup(true)}>
+                {this.props.appstate.wallet.data.wallet ? (
+                  <div className="col s12 m4 l4" style={{marginBottom: 0}}>
+                    <Card className="cardLite cardDashboard">
+                      <h3 style={{
+                        display: 'block',
+                        fontSize: '1rem',
+                        textTransform: 'uppercase',
+                        color: '#0006',
+                        letterSpacing: 1
+                      }}>Voucher</h3>
+                      <div className="value">
+                        {/* <NumberFormat value={(this.props.appstate.wallet.data.wallet).toFixed(2)} displayType={'text'} thousandSeparator={true} prefix={'Rp '}/> */}
+                        <NumberFormat value={(0).toFixed(2)} displayType={'text'} thousandSeparator={true} prefix={'Rp '}/>
+                      </div>
+                      <div style={{marginTop: 10}}>
+                        <Button type="primary" icon="plus" onClick={() => this.setModalTopup(true)}>Add Voucher</Button>
+                        {/* <a className="btnFlatUnderline" onClick={() => this.setModalTopup(true)}>
                      <span>Add Voucher</span>
                      <Icon className="ml-8" type="right" />
                    </a> */}
+                      </div>
+                    </Card>
                  </div>
-                </Card>
-              </div>
-              ) : ''}
-                
+                ) : ''}
+
                {this.props.appstate.wallet.data.wallet ? (
-                <div className="col s12 m4 l4" style={{ marginBottom: 0 }}>
-                  <Card className="cardLite cardDashboard">
-                    <h3 style={{
-                      display: 'block',
-                      fontSize: '1rem',
-                      textTransform: 'uppercase',
-                      color: '#0006',
-                      letterSpacing: 1
-                    }}> Profile</h3>
-                    <div className="value">Please complete your profile</div>
-                    <div style={{marginTop:10}}>
-                    <Button type="primary" icon="edit">Edit Profile</Button>
-                      {/* <a className="btnFlatUnderline" onClick={() => this.setModalTopup(true)}>
+                  <div className="col s12 m4 l4" style={{marginBottom: 0}}>
+                    <Card className="cardLite cardDashboard">
+                      <h3 style={{
+                        display: 'block',
+                        fontSize: '1rem',
+                        textTransform: 'uppercase',
+                        color: '#0006',
+                        letterSpacing: 1
+                      }}> Profile</h3>
+                      <div className="value">Please complete your profile</div>
+                      <div style={{marginTop: 10}}>
+                        <Button type="primary" icon="edit">Edit Profile</Button>
+                        {/* <a className="btnFlatUnderline" onClick={() => this.setModalTopup(true)}>
                        <span>Edit Profile</span>
                        <Icon className="ml-8" type="right" />
                      </a> */}
-                    </div>
-                  </Card>
-                </div>
+                      </div>
+                    </Card>
+                  </div>
                ) : ''}


                {this.props.appstate.wallet.data.wallet ? (
-                <div className="col s12 m4 l4" style={{ marginBottom: 0 }}>
-                  <Card className="cardLite cardDashboard">
-                    <h3 style={{
-                      display: 'block',
-                      fontSize: '1rem',
-                      textTransform: 'uppercase',
-                      color: '#0006',
-                      letterSpacing: 1
-                    }}>Credit Card</h3>
-                    <div className="value ">Please add your credit card</div>
-                    <div style={{marginTop:10}}>
-                    <Button type="primary" icon="plus">Add Credit Card</Button>
+                  <div className="col s12 m4 l4" style={{marginBottom: 0}}>
+                    <Card className="cardLite cardDashboard">
+                      <h3 style={{
+                        display: 'block',
+                        fontSize: '1rem',
+                        textTransform: 'uppercase',
+                        color: '#0006',
+                        letterSpacing: 1
+                      }}>Credit Card</h3>
+                      <div className="value ">Please add your credit card</div>
+                      <div style={{marginTop: 10}}>
+                        <Button type="primary" icon="plus">Add Credit Card</Button>
                        {/* <a className="btnFlatUnderline" onClick={() => this.setModalTopup(true)}>
                        <span>Add Credit Car</span>
                        <Icon className="ml-8" type="right" />
                      </a> */}
-                    </div>
-                  </Card>
-                </div>
+                      </div>
+                    </Card>
+                  </div>
                ) : ''}
              </div>
            </div>
@@ -194,25 +197,23 @@ export default class DashboardComponent extends React.Component {
        </div>


-
-
-        <div style={{ marginLeft: '10%', marginRight: '10%', marginTop: 20, flexGrow: 1, minHeight: window.innerHeight - 70, backgroundColor: '#fff' }}>
+        <div style={{marginLeft: '10%', marginRight: '10%', marginTop: 20, flexGrow: 1, minHeight: window.innerHeight - 70, backgroundColor: '#fff'}}>
          <div>
            <Slider {...settings}>
              <div>
-                <img src={slider1} width={'100%'} />
+                <img src={slider1} width={'100%'}/>
              </div>
              <div>
-                <img src={slider2} width={'100%'} />
+                <img src={slider2} width={'100%'}/>
              </div>
              <div>
-                <img src={slider3} width={'100%'} />
+                <img src={slider3} width={'100%'}/>
              </div>
              <div>
-                <img src={slider4} width={'100%'} />
+                <img src={slider4} width={'100%'}/>
              </div>
              <div>
-                <img src={slider5} width={'100%'} />
+                <img src={slider5} width={'100%'}/>
              </div>
            </Slider>
          </div>
@@ -225,9 +226,9 @@ export default class DashboardComponent extends React.Component {
                    <div className="col l12 m12 s12 padding">
                      <h3>
                        Popular Items
-                    </h3>
+                      </h3>
                      <Row gutter={10}>
-                        <PopularItemCardComponent />
+                        <PopularItemCardComponent/>
                      </Row>
                    </div>
                  </div>
@@ -239,38 +240,38 @@ export default class DashboardComponent extends React.Component {
                    <div className="col l12 m12 s12 padding">
                      <h3>
                        New Products
-                    </h3>
+                      </h3>
                      <Row gutter={10}>
-                        <NewItemCardComponent />
+                        <NewItemCardComponent/>
                      </Row>
                    </div>
                  </div>
                </div>
              </Grid> */}
              <Grid item xs={12}>
-                <div className={"voucher"} style={{ marginTop: 0 }}>
+                <div className={"voucher"} style={{marginTop: 0}}>
                  <div className="row">
                    <div className="col l12 m12 s12 padding">
                      <h3>
                        Voucher & Gift Card
-                    </h3>
+                      </h3>

                      <Row gutter={10}>
-                      {
-                        ( this.vouchersStore.list.length > 0) ?
-                        this.vouchersStore.list.map((item, index) => {
-                          return (<Col onClick={() => this.setState({isOpened: true, data: item})} key={index} span={6}>
-                            <ItemCard data={item}/>
-                          </Col>)
-                        })
-                        : (
-                          <EmptyComponent type="default4" header="" content="There is no voucher in sight"/>
-                        )
-                      }
+                        {
+                          (this.vouchersStore.list.length > 0) ?
+                            this.vouchersStore.list.map((item, index) => {
+                              return (<Col onClick={() => this.setState({isOpened: true, data: item})} key={index} span={6}>
+                                <ItemCard data={item}/>
+                              </Col>)
+                            })
+                            : (
+                              <EmptyComponent type="default4" header="" content="There is no voucher in sight"/>
+                            )
+                        }
                      </Row>

                      <ModalVouchersComponent
-                        title={this.state.data.name+' Vouchers'}
+                        title={this.state.data.name + ' Vouchers'}
                        data={this.state.data}
                        isVisible={this.state.isOpened}
                        onOk={() => this.setState({isOpened: false})}
@@ -283,7 +284,7 @@ export default class DashboardComponent extends React.Component {
            </Grid>
          </div>
        </div>
-        <ModalTopupComponent onOk={() => this.setModalTopup(false)} onCancel={() => this.setModalTopup(false)} isVisible={this.state.modalTopup} />
+        <ModalTopupComponent onOk={() => this.setModalTopup(false)} onCancel={() => this.setModalTopup(false)} isVisible={this.state.modalTopup}/>
      </div>
    );
  }