diff --git a/.env.giift b/.env.giift new file mode 100644 index 0000000..f7e394f --- /dev/null +++ b/.env.giift @@ -0,0 +1 @@ +TEST=322 diff --git a/.gitignore b/.gitignore index 8172e9c..01d335e 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,5 @@ settings.json .cache/ dist/ + +public/assets diff --git a/assets/images/giift.png b/assets/images/giift.png new file mode 100644 index 0000000..1ac3fff Binary files /dev/null and b/assets/images/giift.png differ diff --git a/assets/images/logo-bankbtn.png b/assets/images/logo-bankbtn.png index 46c44a2..1ac3fff 100644 Binary files a/assets/images/logo-bankbtn.png and b/assets/images/logo-bankbtn.png differ diff --git a/package-lock.json b/package-lock.json index 338ebef..67fd6a3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6433,13 +6433,11 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true, - "optional": true + "bundled": 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, - "optional": true + "bundled": 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, - "optional": true + "bundled": 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", - "iconv-lite": "0.4.21", - "sax": "1.2.4" + "debug": "^2.1.2", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" } }, "node-pre-gyp": { diff --git a/package.json b/package.json index fc8aff6..8582e7c 100644 --- a/package.json +++ b/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", diff --git a/src/common/config/app.js b/src/common/config/app.js index 35d4072..586ba81 100644 --- a/src/common/config/app.js +++ b/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, diff --git a/src/common/pages/AcceptInvite/index.js b/src/common/pages/AcceptInvite/index.js index 111b883..a4dbd82 100644 --- a/src/common/pages/AcceptInvite/index.js +++ b/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 (
- BTN + {applicationName} @@ -211,7 +220,7 @@ export default class AcceptInvite extends React.Component { marginRight: "auto", marginLeft: "auto" }} zDepth={1} circle={true}> - +

BTN

+ }}>{applicationName}
} diff --git a/src/common/pages/App/index.js b/src/common/pages/App/index.js index b15a956..31fedb0 100644 --- a/src/common/pages/App/index.js +++ b/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 {
- BTN + {applicationName} @@ -366,8 +372,16 @@ export default class App extends React.Component { {/* */} - + + + {/*} className={(this.state.selectedMenu === '/app/dashboard') ? "menuAkunItem active" : 'menuAkunItem'}>Dashboard + className="menuAkun">Home { 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 (
- +

5 Roti dan 2 Ikan

-

BTN

+

Giift

Confirm Password

}> @@ -206,8 +206,8 @@ export default class ChangePassword extends React.Component { > {this.state.dialogMessage} - diff --git a/src/common/pages/ForgotPassword/index.js b/src/common/pages/ForgotPassword/index.js index c16de43..ebbb18e 100644 --- a/src/common/pages/ForgotPassword/index.js +++ b/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 (
@@ -160,7 +160,7 @@ export default class ForgotPasswordComponent extends React.Component { maxWidth: 500, marginTop: 15, marginBottom: 0 - }}>BTN + }}>Giift
diff --git a/src/common/pages/Login/index.js b/src/common/pages/Login/index.js index 00391d0..3448ed1 100644 --- a/src/common/pages/Login/index.js +++ b/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 (
- +

Login into our System

diff --git a/src/common/pages/Vouchers/Payment/index.js b/src/common/pages/Vouchers/Payment/index.js index bb07b40..2280590 100644 --- a/src/common/pages/Vouchers/Payment/index.js +++ b/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 (
@@ -105,11 +113,11 @@ export default class PaymentVouchers extends React.Component {

- Points BTN + Points {applicationName}

- +
}>
diff --git a/src/common/pages/Wallet/Modal/index.js b/src/common/pages/Wallet/Modal/index.js index acae053..82f7315 100644 --- a/src/common/pages/Wallet/Modal/index.js +++ b/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 }); }