Merge pull request #90 from RigoBlock/feature/events-prog-loading

Feature/events prog loading

package.json

@@ -6,33 +6,47 @@
   "dependencies": {
     "0x.js": "^0.38.6",
     "@parity/api": "^2.1.20",
+    "@rigoblock/exchange-connector": "^0.0.7",
     "babel-plugin-transform-remove-console": "^6.9.4",
+    "babel-register": "^6.26.0",
     "bignumber.js": "^7.2.1",
     "chart.js": "^2.7.2",
+    "chartist": "^0.11.0",
     "classnames": "^2.2.6",
+    "crc-32": "^1.2.0",
     "css-loader": "^1.0.0",
-    "custom-react-scripts": "^0.2.0",
+    "custom-react-scripts": "^0.2.2",
     "d3-dsv": "^1.0.8",
     "detect-browser": "^3.0.0",
+    "install": "^0.12.2",
+    "is-number": "^7.0.0",
     "js-sha3": "^0.8.0",
     "jss": "^9.0.0",
+    "lodash": "^4.17.11",
     "material-ui": "^0.20.2",
     "material-ui-pagination": "^1.1.6",
+    "moment": "^2.22.2",
     "node-fetch": "^2.2.0",
     "node-noop": "^1.0.0",
     "node-sass": "^4.0.0",
     "node-sass-chokidar": "^1.3.3",
+    "npm": "^6.4.1",
+    "plotly.js-finance-dist": "^1.41.3",
     "prop-types": "^15.6.0",
     "react": "^16.3.2",
+    "react-chartist": "^0.13.1",
     "react-chartjs-2": "^2.7.4",
+    "react-collapsible": "^2.3.1",
     "react-content-loader": "^3.1.2",
     "react-copy-to-clipboard": "^5.0.1",
     "react-dom": "^16",
     "react-event-listener": "^0.6.2",
     "react-flexbox-grid": "^2.0.0",
     "react-ga": "^2.4.1",
     "react-grid-system": "^4.3.0",
+    "react-json-view": "^1.19.1",
     "react-notification-system": "^0.2.16",
+    "react-plotly.js": "^2.2.0",
     "react-redux": "^5.0.6",
     "react-router": "^4.2.0",
     "react-router-dom": "^4.2.2",
@@ -42,13 +56,12 @@
     "react-virtualized": "^9.20.1",
     "reconnecting-websocket": "3.2.2",
     "redux": "^4.0.0",
-    "redux-logger": "^3.0.6",
     "redux-observable": "^1.0.0",
-    "redux-persist": "^5.10.0",
+    "redux-persist": "5.6.12",
     "redux-persist-transform-filter": "^0.0.18",
     "request-promise": "^4.2.2",
-    "rxjs": "6",
-    "rxjs-compat": "6",
+    "rxjs": "^6.3.3",
+    "rxjs-compat": "^6.3.3",
     "scroll-to-element": "^2.0.0",
     "serialize-error": "^2.1.0",
     "style-loader": "^0.23.0",
@@ -64,8 +77,8 @@
     "start": "react-scripts start",
     "build-parity": "PUBLIC_URL=./ react-scripts build",
     "build-parity-win": "react-scripts build",
-    "build-beta": "GENERATE_SOURCEMAP=false PUBLIC_URL=./ react-scripts build",
-    "build": "GENERATE_SOURCEMAP=false react-scripts build",
+    "build-beta": "GENERATE_SOURCEMAP=true react-scripts --max-old-space-size=8192 build",
+    "build": "GENERATE_SOURCEMAP=false react-scripts --max-old-space-size=8192 build",
     "test": "react-scripts test --env=jsdom --setupTestFrameworkScriptFile=raf/polyfill",
     "eject": "react-scripts eject",
     "watch": "node scripts/watch.js",
@@ -98,10 +111,7 @@
     "eslint-plugin-standard": "^3.0.1",
     "eslint-watch": "^4.0.2",
     "jest-extended": "^0.8.1",
-    "prettier": "^1.14.0",
-    "redux-devtools-extension": "^2.13.5",
-    "regenerator-runtime": "^0.12.1",
-    "source-map-explorer": "^1.5.0"
+    "prettier": "^1.14.0"
   },
   "jest": {
     "collectCoverageFrom": [

src/App.js

@@ -1,7 +1,7 @@
 // Copyright 2016-2017 Rigo Investment Sagl.
 import 'babel-polyfill'
 import 'react-virtualized/styles.css'
-import { DEFAULT_NETWORK_NAME, PROD } from './_utils/const'
+import { PROD } from './_utils/const'
 import { Redirect, Route, Router, Switch } from 'react-router-dom'
 import ApplicationConfigPage from './Application/applicationConfig'
 import ApplicationDragoPage from './Application/applicationDrago'
@@ -91,7 +91,6 @@ export class App extends Component {
   }
 
   shouldComponentUpdate(nextProps, nextState) {
-    // console.log(this.props.user.isManager)
     const propsUpdate = !utils.shallowEqual(this.props, nextProps)
     const stateUpdate = !utils.shallowEqual(this.state, nextState)
     // console.log(`${this.constructor.name} -> propsUpdate: %c${propsUpdate}.%c stateUpdate: %c${stateUpdate}`, `color: ${propsUpdate ? 'green' : 'red'}; font-weight: bold;`,'',`color: ${stateUpdate ? 'green' : 'red'}; font-weight: bold;`)
@@ -125,15 +124,6 @@ export class App extends Component {
     }
   }
 
-  UNSAFE_componentWillMount() {
-    // Starting connection checking. this is not necessary runnin inside Parity UI
-    // because the checki is done by Parity and a messagge will be displayed by the client
-  }
-
-  componentWillUnmount() {}
-
-  UNSAFE_componentWillUpdate() {}
-
   render() {
     let notificationStyle = {
       NotificationItem: {

src/Application/ApplicationTopBar/applicationTopBar.js

@@ -45,7 +45,22 @@ class ApplicationTopBar extends Component {
                 </a>
               </li>
               <li>
-                <a href="#">Help</a>
+                <a
+                  href="https://community.rigoblock.com/"
+                  rel="noopener noreferrer"
+                  target="_blank"
+                >
+                  Community
+                </a>
+              </li>
+              <li>
+                <a
+                  href="https://help.rigoblock.com/"
+                  rel="noopener noreferrer"
+                  target="_blank"
+                >
+                  Help
+                </a>
               </li>
             </ul>
           </div>

src/Application/application.module.css

@@ -45,3 +45,11 @@
   flex: 1 0 auto !important;
   height: 100%;
 }
+
+.comingSoonBlur {
+    max-width: 100%;
+    height: auto;
+    width: auto\9; /* ie8 */
+    padding-left: 5px;
+    /* padding-right: 5px; */
+}

src/Application/applicationExchange.js

@@ -1,6 +1,5 @@
 // Copyright 2016-2017 Rigo Investment Sagl.
 
-import * as Colors from 'material-ui/styles/colors'
 import ApplicationExchangeHome from '../ApplicationExchangeHome'
 import ApplicationTopBar from './ApplicationTopBar'
 import PropTypes from 'prop-types'
@@ -10,8 +9,9 @@ import { Col, Grid, Row } from 'react-flexbox-grid'
 import getMuiTheme from 'material-ui/styles/getMuiTheme'
 
 import { connect } from 'react-redux'
-import ElementNotConnected from '../Elements/elementNotConnected'
 import MuiThemeProvider from 'material-ui/styles/MuiThemeProvider'
+// import TestComponent from '../_atomic/atoms/testComponent'
+import WalletSetup from '../_atomic/organisms/walletSetup'
 import classNames from 'classnames'
 import styles from './application.module.css'
 
@@ -64,12 +64,11 @@ class ApplicationExchangePage extends Component {
     api: PropTypes.object.isRequired
   }
 
-  UNSAFE_componentWillMount() {}
-
   componentWillUnmount() {}
 
   static propTypes = {
     location: PropTypes.object.isRequired,
+    endpoint: PropTypes.object.isRequired,
     app: PropTypes.object.isRequired
   }
 
@@ -79,7 +78,35 @@ class ApplicationExchangePage extends Component {
 
   render() {
     const { notificationsOpen } = this.state
-    const { location } = this.props
+    const { location, endpoint } = this.props
+
+    if (endpoint.networkInfo.id === 42) {
+      return (
+        <MuiThemeProvider muiTheme={muiTheme}>
+          <Grid fluid className={styles.maincontainer}>
+            <Row>
+              <Col xs={12}>
+                <ApplicationTopBar
+                  handleTopBarSelectAccountType={
+                    this.handleTopBarSelectAccountType
+                  }
+                  handleToggleNotifications={this.handleToggleNotifications}
+                />
+              </Col>
+            </Row>
+            <MuiThemeProvider muiTheme={muiThemeExchange}>
+              <Row className={classNames(styles.content)}>
+                <Col xs={12}>
+                  <div style={{ textAlign: 'center', marginTop: '25px' }}>
+                    Exchange only available on Ropsten and Mainnet network.
+                  </div>
+                </Col>
+              </Row>
+            </MuiThemeProvider>
+          </Grid>
+        </MuiThemeProvider>
+      )
+    }
     return (
       <MuiThemeProvider muiTheme={muiTheme}>
         <Grid fluid className={styles.maincontainer}>
@@ -94,26 +121,32 @@ class ApplicationExchangePage extends Component {
             </Col>
           </Row>
           <MuiThemeProvider muiTheme={muiThemeExchange}>
-            <Row className={classNames(styles.content)}>
+            {/* <Row className={classNames(styles.content)}>
               <Col xs={12}>
                 <div style={{ textAlign: 'center', marginTop: '25px' }}>
                   Coming soon.
                 </div>
               </Col>
+            </Row> */}
+            <Row>
               <Col xs={12}>
-                {/* {this.props.app.isConnected && !this.props.app.isSyncing ? (
-                  // {false ? (
-                  <ApplicationExchangeHome
-                    location={location}
-                    notificationsOpen={notificationsOpen}
-                    handleToggleNotifications={this.handleToggleNotifications}
-                  />
+                {endpoint.accounts.length === 0 ||
+                !endpoint.isMetaMaskNetworkCorrect ? (
+                  <WalletSetup />
                 ) : (
-                  <ElementNotConnected
-                    isSyncing={this.props.app.isSyncing}
-                    syncStatus={this.props.app.syncStatus}
-                  />
-                )} */}
+                  endpoint.networkInfo.id !== 42 && (
+                    <div>
+                      <ApplicationExchangeHome
+                        key={'Exchange' + endpoint.lastMetaMaskUpdateTime}
+                        location={location}
+                        notificationsOpen={notificationsOpen}
+                        handleToggleNotifications={
+                          this.handleToggleNotifications
+                        }
+                      />
+                    </div>
+                  )
+                )}
               </Col>
             </Row>
           </MuiThemeProvider>

src/Application/applicationVault.js

@@ -108,6 +108,10 @@ class ApplicationDragoPage extends Component {
                     syncStatus={syncStatus}
                   />
                 )}
+                {/* <ElementNotConnected
+                  isSyncing={isSyncing}
+                  syncStatus={syncStatus}
+                /> */}
               </Col>
             </Row>
           </MuiThemeProvider>

src/ApplicationConfig/applicationConfigHome.js

@@ -3,6 +3,7 @@ import { Redirect, Route, Switch, withRouter } from 'react-router-dom'
 import { connect } from 'react-redux'
 import ElementBottomStatusBar from '../Elements/elementBottomStatusBar'
 import LeftSideDrawerConfig from '../Elements/leftSideDrawerConfig'
+import PageAppConfig from './pageAppConfig'
 import PageNetworkConfig from './pageNetworkConfig'
 import PropTypes from 'prop-types'
 import React, { Component } from 'react'
@@ -32,8 +33,14 @@ class ApplicationConfigHome extends Component {
             <Switch>
               <Route
                 path={match.path + '/network'}
+                exact
                 render={props => <PageNetworkConfig {...props} />}
               />
+              <Route
+                path={match.path + '/application'}
+                exact
+                render={props => <PageAppConfig {...props} />}
+              />
               <Redirect from={match.path} to={match.path + '/network'} />
             </Switch>
           </Col>