fix: add giift version

.env.giift

@@ -0,0 +1 @@
+TEST=322

.gitignore

@@ -47,3 +47,5 @@ settings.json
 
 .cache/
 dist/
+
+public/assets

package-lock.json

@@ -6433,13 +6433,11 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true,
+          "bundled": true
-          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -6456,8 +6454,7 @@
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true,
+          "bundled": true
-          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
@@ -6542,7 +6539,7 @@
           "bundled": true,
           "optional": true,
           "requires": {
-            "safer-buffer": "2.1.2"
+            "safer-buffer": "^2.1.0"
           }
         },
         "ignore-walk": {
@@ -6564,8 +6561,7 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "bundled": true,
+          "bundled": true
-          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -6587,7 +6583,6 @@
         "minimatch": {
           "version": "3.0.4",
           "bundled": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -6629,9 +6624,9 @@
           "bundled": true,
           "optional": true,
           "requires": {
-            "debug": "2.6.9",
+            "debug": "^2.1.2",
-            "iconv-lite": "0.4.21",
+            "iconv-lite": "^0.4.4",
-            "sax": "1.2.4"
+            "sax": "^1.2.4"
           }
         },
         "node-pre-gyp": {

package.json

@@ -14,7 +14,9 @@
     "build:production": "webpack --config webpack.config.prod.js",
     "build:nw": "nwbuild --platforms win32,win64,osx64,linux32,linux64 --buildDir dist/ src/",
     "build:parcel:prod": "node scripts/build-parcel.js",
-    "dev:parcel": "node scripts/dev-parcel.js"
+    "dev:parcel": "node scripts/dev-parcel.js",
+    "deploy": "rsync -chavzP -e \"ssh -p 2222\" --stats dist/ root@209.58.165.19:/home/apps/giift/giift-customer-btn",
+    "deploy:giift": "rsync -chavzP -e \"ssh -p 2222\" --stats dist/ root@209.58.165.19:/home/apps/giift/giift-customer"
   },
   "author": "Asacreative",
   "repository": {
@@ -62,6 +64,7 @@
     "ignore-styles": "^5.0.1",
     "imports-loader": "^0.8.0",
     "isomorphic-fetch": "^2.2.1",
+    "jquery": "^3.3.1",
     "json-loader": "^0.5.7",
     "less": "^3.8.1",
     "load-google-maps-api": "^1.0.0",
@@ -86,12 +89,13 @@
     "rc-queue-anim": "^1.4.0",
     "rc-table": "^6.1.0",
     "rc-util": "^4.3.0",
+    "react": "^16.7.0",
     "react-addons-shallow-compare": "^15.6.2",
     "react-collapse": "^4.0.3",
     "react-color": "^2.13.8",
     "react-compound-timer": "^1.0.7",
     "react-confirm": "^0.1.16",
-    "react-dom": "^16.5.2",
+    "react-dom": "^16.7.0",
     "react-drag-sortable": "^1.0.5",
     "react-easy-print": "^0.6.0-beta.3",
     "react-flexible-carousel": "^1.2.6",

src/common/config/app.js

@@ -34,6 +34,8 @@ if(window.location.href.includes("localhost") || window.location.href.includes("
   appUrl = 'https://sillyfish.asacreative.com';
 }
 
+export const APP_TYPE = 'giift';
+
 export const appConfig = {
   apiUrl: apiUrl,
   imageUrl: imageUrl,

src/common/pages/AcceptInvite/index.js

@@ -21,6 +21,7 @@ import {observer, inject} from 'mobx-react';
 import './style.scss'
 import {LINKS} from "../../routes";
 import {Helmet} from "react-helmet";
+import {APP_TYPE} from "../../config/app";
 
 
 @inject('appstate')
@@ -145,13 +146,21 @@ export default class AcceptInvite extends React.Component {
         style={{marginRight: 10}}
       />
     ];
+
     // const applicationIcon = (this.settingStore.isIconEmpty) ? "/assets/images/bankbtn.png" : this.http.appendImagePath(this.settingStore.setting.icon);
-    const applicationIcon =  "/assets/images/bankbtn.png";
+    let applicationIcon =  "http://giift.asacreative.com/giift_logo_wide.4d15de72.png";
+    let applicationName = 'Giift';
+    if(APP_TYPE === 'btn') {
+      applicationIcon = "/assets/images/bankbtn.png";
+      applicationName = "BTN";
+    }
+
+
     return (
       <div className="AcceptInvite">
         <Helmet>
           <meta charSet="utf-8"/>
-          <title>BTN</title>
+          <title>{applicationName}</title>
           <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
           <link rel="icon" type="image/png" href={applicationIcon} sizes="96x96"/>
         </Helmet>
@@ -211,7 +220,7 @@ export default class AcceptInvite extends React.Component {
                   marginRight: "auto",
                   marginLeft: "auto"
                 }} zDepth={1} circle={true}>
-                  <img className="logo" src={'/assets/images/bankbtn.png'}/>
+                  <img className="logo" src={applicationIcon}/>
                 </Paper>
                 <h2 style={{
                   color: '#275164',
@@ -220,7 +229,7 @@ export default class AcceptInvite extends React.Component {
                   maxWidth: 500,
                   marginTop: 15,
                   marginBottom: 0
-                }}>BTN</h2>
+                }}>{applicationName}</h2>
               </div>
           }
         </div>

src/common/pages/App/index.js

@@ -45,6 +45,7 @@ import NumberFormat from 'react-number-format';
 import faker from 'faker';
 import { Route as RouteDOM } from 'react-router-dom'
 import WalletComponent from "./WalletComponent";
+import {APP_TYPE} from "../../config/app";
 
 faker.locale = 'id_ID';
 @inject("appstate")
@@ -320,7 +321,12 @@ 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);
-    const applicationIcon = "/assets/images/bankbtn.png";
+    let applicationIcon =  "http://giift.asacreative.com/giift_logo_wide.4d15de72.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";
+      applicationName = "BTN";
+    }
 
     let onNotifRowClick = (record) => {
       // if(record.notification.type == 'order_seller' && _.get(record,'notification.additional_data.user_order_store_id',false) != false){
@@ -337,7 +343,7 @@ export default class App extends React.Component {
           <div className="app-container">
             <Helmet>
               <meta charSet="utf-8"/>
-              <title>BTN</title>
+              <title>{applicationName}</title>
               <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
               <link rel="icon" type="image/png" href={applicationIcon} sizes="96x96"/>
             </Helmet>
@@ -366,8 +372,16 @@ export default class App extends React.Component {
                 {/* <ToolbarTitle className="show-on-small marketplace-toolbarTitle" style={{color: '#424770'}}
                           text={"Store Admin"}/> */}
 
-                <img style={{width: 150, height: 50}}
+                <Link onClick={this
-                     src={'http://btn-redemption-2.bangun-kreatif.com/dr6u0fppdi4xy.cloudfront.net/FilesDirectory/Albilad/ImgIconImage/logo-btn.png'}/>
+                  .changeRoute
+                  .bind(this, '/app/dashboard')} to={LINKS.DASHBOARD}>
+                  <img
+                    style={{
+                      width: 150,
+                      height: 50
+                    }}
+                       src={applicationIcon}/>
+                </Link>
 
                 <ToolbarSeparator className="hide-on-small-only" style={{marginLeft: 30, marginRight: 30}}/>
                 {/*<IconButton className="hide-on-small-only" style={{marginRight: 10}}*/}
@@ -391,7 +405,7 @@ export default class App extends React.Component {
                   .bind(this, '/app/dashboard')} to={LINKS.DASHBOARD}><MenuItem
                   // leftIcon={<img src="/assets/images/icon/chart.png"/>}
                   className={(this.state.selectedMenu === '/app/dashboard') ? "menuAkunItem active" : 'menuAkunItem'}><span
-                  className="menuAkun">Dashboard</span></MenuItem></Link>
+                  className="menuAkun">Home</span></MenuItem></Link>
 
                 <Link onClick={this
                   .changeRoute

src/common/pages/ChangePassword/index.js

@@ -82,7 +82,7 @@ export default class ChangePassword extends React.Component {
     }
   }
 
-  
+
 
   componentDidMount() {
     this.query = this
@@ -115,17 +115,17 @@ export default class ChangePassword extends React.Component {
     else{
       this.setState({
         error_retype : 'Password and retype password is not same'
-      }) 
+      })
     }
 
     this.setState({
-      retype : event.target.value    
+      retype : event.target.value
     })
   };
 
   closeDialog = ()=>{
     if(this.state.status){
-      this.props.history.push(LINKS.LOGIN); 
+      this.props.history.push(LINKS.LOGIN);
     }
     else{
       this.setState({
@@ -147,9 +147,9 @@ export default class ChangePassword extends React.Component {
 
     return (
       <div className="AcceptInvite">
-        <img className="logo" src="/assets/images/bankbtn.png" style={{maxWidth : '200px'}}/>
+        <img className="logo" src="http://giift.asacreative.com/giift_logo_wide.4d15de72.png" style={{maxWidth : '200px'}}/>
         <h1 style={{color:'#275164'}}>5 Roti dan 2 Ikan</h1>
-        <h4 style={{color:'#55dab6'}}>BTN</h4>
+        <h4 style={{color:'#55dab6'}}>Giift</h4>
         <Card style={{width:450, marginTop:'18px'}} className="cardLite">
           <CardTitle className="align-center" title={<p style={{fontSize:14}}>Confirm Password</p>}>
             <Divider style={{backgroundColor:'#48d8b2', width:'150px'}} className="margin-auto"/>
@@ -206,8 +206,8 @@ export default class ChangePassword extends React.Component {
         >
           {this.state.dialogMessage}
         </Dialog>
-        <Dialog 
+        <Dialog
-          open={this.state.loading} 
+          open={this.state.loading}
           contentStyle={{maxWidth: 350}}
           modal={true}
         >

src/common/pages/ForgotPassword/index.js

@@ -84,7 +84,7 @@ export default class ForgotPasswordComponent extends React.Component {
     ];
 
     // const applicationIcon = (this.settingStore.isIconEmpty) ? "/assets/images/bankbtn.png" : this.http.appendImagePath(this.settingStore.setting.icon);
-    const applicationIcon = "/assets/images/bankbtn.png";
+    const applicationIcon = "http://giift.asacreative.com/giift_logo_wide.4d15de72.png";
     return (
       <div className="login">
         <Helmet>
@@ -160,7 +160,7 @@ export default class ForgotPasswordComponent extends React.Component {
               maxWidth: 500,
               marginTop: 15,
               marginBottom: 0
-            }}>BTN</h2>
+            }}>Giift</h2>
           </div>
         </div>
         <Card style={{width: 350, marginTop: '18px'}} className="cardLite align-center">

src/common/pages/Login/index.js

@@ -3,6 +3,7 @@ import {TextField, RaisedButton} from 'material-ui';
 import {inject, observer} from 'mobx-react';
 import './style.scss'
 import {LINKS} from "../../routes";
+import {APP_TYPE} from "../../config/app";
 
 
 @inject('appstate')
@@ -39,10 +40,14 @@ export default class LoginComponent extends React.Component {
 
   render() {
 
+    let loginImage = 'http://giift.asacreative.com/giift_logo_wide.4d15de72.png';
+    if(APP_TYPE === 'btn') {
+      loginImage = 'http://btn-redemption-2.bangun-kreatif.com/dr6u0fppdi4xy.cloudfront.net/FilesDirectory/Albilad/ImgIconImage/logo-btn.png'
+    }
     return (
       <div className="loginWrapper">
         <div className={'formContainer'}>
-          <img className={'logoLogin'} src={'http://btn-redemption-2.bangun-kreatif.com/dr6u0fppdi4xy.cloudfront.net/FilesDirectory/Albilad/ImgIconImage/logo-btn.png'} />
+          <img className={'logoLogin'} src={loginImage} />
           <p className={'textLogin'}>Login into our System</p>
 
           <div className={'formParent'}>

src/common/pages/Vouchers/Payment/index.js

@@ -13,6 +13,7 @@ import {DIALOG} from "../../../stores/global_ui";
 import EmptyComponent from '../../EmptyComponent';
 import NavigationArrowBack from 'material-ui/svg-icons/navigation/arrow-back';
 import {LINKS} from "../../../routes";
+import {APP_TYPE} from "../../../config/app";
 
 const Panel = Collapse.Panel;
 
@@ -50,6 +51,13 @@ export default class PaymentVouchers extends React.Component {
       const qty = 1;
       const total = price * qty;
 
+    let applicationName = 'Giift';
+    let applicationLogo = 'http://giift.asacreative.com/giift_logo_wide.4d15de72.png';
+    if(APP_TYPE === 'btn') {
+      applicationName = 'BTN';
+      applicationLogo = 'http://btn-redemption-2.bangun-kreatif.com/dr6u0fppdi4xy.cloudfront.net/FilesDirectory/Albilad/ImgIconImage/logo-btn.png';
+    }
+
     return (
     <div className="wallet containerMiddle">
         <div className="row">
@@ -105,11 +113,11 @@ export default class PaymentVouchers extends React.Component {
                     <Card  title={<div style={{display:'flex',justifyContent:'space-between'}}>
                                 <div>
                                 <h3 style={{fontSize:20}}>
-                                    Points BTN
+                                    Points {applicationName}
                                 </h3>
                                 </div>
                                 <div>
-                                    <img  style={{width:120, height:40}} src="http://btn-redemption-2.bangun-kreatif.com/dr6u0fppdi4xy.cloudfront.net/FilesDirectory/Albilad/ImgIconImage/logo-btn.png" />
+                                    <img  style={{width:120, height:40}} src={applicationLogo} />
                                 </div>
                             </div>}>
                             <div className="row">

src/common/pages/Wallet/Modal/index.js

@@ -47,6 +47,10 @@ export default class ModalTopupComponent extends React.Component {
             message.error(e.message);
           } finally {
             this.setState({
+              inputCode1: '',
+              inputCode2: '',
+              inputCode3: '',
+              inputCode4: '',
               confirmLoading: false
             });
           }