dev to beta

src/botPage/bot/TradeEngine/index.js

@@ -16,6 +16,7 @@ import Ticks from './Ticks';
 import rootReducer from './state/reducers';
 import * as constants from './state/constants';
 import { start } from './state/actions';
+import { observer as globalObserver } from '../../../common/utils/observer';
 
 const watchBefore = store =>
     watchScope({
@@ -34,7 +35,7 @@ const watchDuring = store =>
     });
 
 /* The watchScope function is called randomly and resets the prevTick
- * which leads to the same problem we try to solve. So prevTick is isolated 
+ * which leads to the same problem we try to solve. So prevTick is isolated
  */
 let prevTick;
 const watchScope = ({ store, stopScope, passScope, passFlag }) => {
@@ -90,6 +91,8 @@ export default class TradeEngine extends Balance(Purchase(Sell(OpenContract(Prop
             throw createError('NotInitialized', translate('Bot.init is not called'));
         }
 
+        globalObserver.emit('bot.running');
+
         this.tradeOptions = expectTradeOptions(tradeOptions);
 
         this.store.dispatch(start());

src/botPage/common/const.js

@@ -229,6 +229,11 @@ const config = {
     },
     bbResult  : [[translate('upper'), '1'], [translate('middle'), '0'], [translate('lower'), '2']],
     macdFields: [[translate('Histogram'), '0'], [translate('MACD'), '1'], [translate('Signal'), '2']],
+    gd        : {
+        cid: '646610722767-7ivdbunktgtnumj23en9gkecbgtf2ur7.apps.googleusercontent.com',
+        aid: 'binarybot-237009',
+        api: 'AIzaSyBieTeLip_lVQZUimIuJypU1kJyqOvQRgc',
+    },
 };
 
 export async function updateConfigCurrencies() {

src/botPage/view/Dialogs/Dialog.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import DialogComponent from './DialogComponent';
+import { observer as globalObserver } from '../../../common/utils/observer';
 
 export default class Dialog {
     constructor(id, title, content, options = {}) {
@@ -13,8 +14,16 @@ export default class Dialog {
     }
     open() {
         $(`#${this.componentId}`).dialog('open');
+        globalObserver.emit('dialog.opened', this.componentId);
     }
     close() {
         $(`#${this.componentId}`).dialog('close');
     }
+    registerCloseOnOtherDialog() {
+        globalObserver.register('dialog.opened', dialogId => {
+            if (dialogId !== this.componentId) {
+                this.close();
+            }
+        });
+    }
 }

src/botPage/view/Dialogs/IntegrationsDialog.js

@@ -0,0 +1,29 @@
+import React from 'react';
+import Dialog from './Dialog';
+import GoogleDriveIntegration from '../react-components/Integrations/GoogleDriveIntegration';
+import * as style from '../style';
+import { translate } from '../../../common/i18n';
+
+const IntegrationsContent = () => (
+    <div id="integrations-dialog" className="dialog-content" style={style.content}>
+        <GoogleDriveIntegration />
+    </div>
+);
+
+export default class IntegrationsDialog extends Dialog {
+    constructor() {
+        const closeDialog = () => {
+            this.close();
+        };
+        super(
+            'integrations-dialog',
+            translate('Google Drive Integration'),
+            <IntegrationsContent closeDialog={closeDialog} />,
+            {
+                width : 500,
+                height: 'auto',
+            }
+        );
+        this.registerCloseOnOtherDialog();
+    }
+}

src/botPage/view/Dialogs/LoadDialog.js

@@ -0,0 +1,95 @@
+import PropTypes from 'prop-types';
+import React, { PureComponent } from 'react';
+import Dialog from './Dialog';
+import * as style from '../style';
+import { translate } from '../../../common/i18n';
+import googleDrive from '../../../common/integrations/GoogleDrive';
+import { showSpinnerInButton, removeSpinnerInButton } from '../../../common/utils/tools';
+
+class LoadContent extends PureComponent {
+    constructor() {
+        super();
+        this.state = { loadType: 'local' };
+    }
+
+    onChange(event) {
+        this.setState({ loadType: event.target.value });
+    }
+
+    submit() {
+        if (this.state.loadType === 'google-drive') {
+            const initialButtonText = $(this.submitButton).text();
+            showSpinnerInButton($(this.submitButton));
+            googleDrive
+                .createFilePicker()
+                .then(() => {
+                    this.props.closeDialog();
+                    removeSpinnerInButton($(this.submitButton), initialButtonText);
+                })
+                .catch(() => {
+                    removeSpinnerInButton($(this.submitButton), initialButtonText);
+                });
+        } else {
+            $('#files').click();
+            this.props.closeDialog();
+        }
+    }
+
+    render() {
+        return (
+            <form
+                id="load-dialog"
+                action="javascript:;" // eslint-disable-line no-script-url
+                className="dialog-content"
+                style={style.content}
+                onSubmit={() => this.submit()}
+            >
+                <div className="center-text input-row">
+                    <span className="integration-option">
+                        <input
+                            type="radio"
+                            id="load-local"
+                            name="load-option"
+                            value="local"
+                            defaultChecked={true}
+                            onChange={e => this.onChange(e)}
+                        />
+                        <label htmlFor="load-local">{translate('My computer')}</label>
+                    </span>
+                    <span className="integration-option invisible">
+                        <input
+                            type="radio"
+                            id="load-google-drive"
+                            name="load-option"
+                            value="google-drive"
+                            onChange={e => this.onChange(e)}
+                        />
+                        <label htmlFor="load-google-drive">Google Drive</label>
+                    </span>
+                </div>
+                <div className="center-text input-row last">
+                    <button
+                        id="load-strategy"
+                        type="submit"
+                        ref={el => {
+                            this.submitButton = el;
+                        }}
+                    >
+                        {translate('Load')}
+                    </button>
+                </div>
+            </form>
+        );
+    }
+    static props: { closeDialog: PropTypes.func };
+}
+
+export default class LoadDialog extends Dialog {
+    constructor() {
+        const closeDialog = () => {
+            this.close();
+        };
+        super('load-dialog', translate('Load blocks'), <LoadContent closeDialog={closeDialog} />, style.dialogLayout);
+        this.registerCloseOnOtherDialog();
+    }
+}