general fixups

scripts/start-server.js

@@ -84,7 +84,7 @@ const run = async () => {
       secret: creds.secret,
     })
   })
-  
+
   app.post('/api-key', async (req, res) => {
     const { key, secret } = req.body
 
@@ -103,7 +103,7 @@ const run = async () => {
         secret,
       })
     } catch (error) {
-      console.log(error)
+      console.error(error)
       return res.status(500).json({ error: error.message })
     }
     startHFServer()

src/components/AlgoOrderDefenitionsTable/AlgoOrderDefinitionsTable.container.js

@@ -1,13 +1,12 @@
 import { connect } from 'react-redux'
 
-import TableActions from '../../redux/actions/table'
+import AlgoOrderActions from '../../redux/actions/algo-orders'
 import EditorActions from '../../redux/actions/editor'
-import RestHfActions from '../../redux/actions/rest-hf-server'
 
 import AlgoOrderDefinitionsTableView from './AlgoOrderDefinitionsTable'
 
 const mapStateToProps = (state = {}) => {
-  const { algoOrders = [], orders = [] } = state.table
+  const { algoOrders = [], orders = [] } = state.algoOrders
   const { editorOpened = false } = state.editor
   return {
     algoOrders,
@@ -18,13 +17,13 @@ const mapStateToProps = (state = {}) => {
 
 const mapDispatchToProps = dispatch => ({
   changeStatus: (index) => {
-    dispatch(TableActions.changeStatus(index))
+    dispatch(AlgoOrderActions.changeStatus(index))
   },
   toggleEditor: (flag) => {
     dispatch(EditorActions.toggleEditor(flag))
   },
   stopOrder: (gId) => {
-    dispatch(RestHfActions.stopAlgoOrder(gId))
+    dispatch(AlgoOrderActions.stopOrder(gId))
   },
 })
 

src/components/AlgoOrderDefenitionsTable/AlgoOrderDefinitionsTable.js

@@ -21,7 +21,7 @@ export default class AlgoOrderTable extends React.Component {
     const newAlgoOrders = nextProps.algoOrders
     const newOrders = nextProps.orders
     const { algoOrders, orders } = this.props
-    if (orders.length !== newOrders.length) {
+    if (orders !== newOrders) {
       return true
     }
     if (newAlgoOrders.length !== algoOrders.length) {
@@ -35,7 +35,7 @@ export default class AlgoOrderTable extends React.Component {
 
   render() {
     const { orders, stopOrder } = this.props
-    const orderObjects = orders.map((ao) => {
+    const orderObjects = orders.reverse().map((ao) => {
       const isActive = !!ao[2]
       let status = <p>Inactive</p>
       if (isActive) {

src/components/AlgoOrderTable/AlgoOrderTable.container.js

@@ -1,14 +1,14 @@
 import { connect } from 'react-redux'
 import { withRouter } from 'react-router-dom'
 
-import TableActions from '../../redux/actions/table'
+import AlgoOrderActions from '../../redux/actions/algo-orders'
 import EditorActions from '../../redux/actions/editor'
 
 import AlgoOrderTableView from './AlgoOrderTable'
 
 const mapStateToProps = (state = {}, ownProps = {}) => {
   const { orders = [] } = ownProps
-  const { algoOrders = [] } = state.table
+  const { algoOrders = [] } = state.algoOrders
   const { editorOpened = false } = state.editor
   return {
     algoOrders,
@@ -19,7 +19,7 @@ const mapStateToProps = (state = {}, ownProps = {}) => {
 
 const mapDispatchToProps = dispatch => ({
   changeStatus: (index) => {
-    dispatch(TableActions.changeStatus(index))
+    dispatch(AlgoOrderActions.changeStatus(index))
   },
   toggleEditor: (flag) => {
     dispatch(EditorActions.toggleEditor(flag))

src/components/HFUI/HFUI.container.js

@@ -1,6 +1,6 @@
 import { connect } from 'react-redux'
 import { withRouter } from 'react-router-dom'
-import APIKeyActions from '../../redux/actions/apiKey'
+import APIKeyActions from '../../redux/actions/api-key'
 import WSHFActions from '../../redux/actions/ws-hf-server'
 import HFUI from './HFUI'
 

src/components/HFUI/_HFUI.scss

@@ -19,6 +19,7 @@
   flex-direction: row;
 }
 
+
 .hfui_view__wrapper {
   padding: 0 32px;
   display: flex;

src/components/PLChart/index.js

@@ -62,7 +62,6 @@ class PLChart extends React.PureComponent {
     if (_isEmpty(data)) {
       return null
     }
-    console.log('%c ChartData: ', 'color:white;background:blue;', data)
 
     const start = xAccessor(data[Math.max(0, data.length - 1000)])
     const end = xAccessor(_last(data))

src/pages/AlgoOrders/AlgoOrders.js

@@ -16,13 +16,14 @@ export default class AlgoOrdersView extends React.Component {
     return (
       <div className='hfui_view__wrapper'>
         <h1>Algo Orders</h1>
-        <AlgoOrderTable
-          algoOrders={algoOrders}
-        />
-         {/* <AlgoOrderForm /> */}
-        <AlgoOrderDefinitions 
-          algoOrders={algoOrders}
-        />
+        <div className='hfui_content__wrapper'>
+          <AlgoOrderTable
+            algoOrders={algoOrders}
+          />
+          <AlgoOrderDefinitions
+            algoOrders={algoOrders}
+          />
+        </div>
       </div>
     )
   }

src/pages/Settings/Settings.container.js

@@ -1,13 +1,12 @@
 import { connect } from 'react-redux'
 import SettingsView from './SettingsView'
-import APIKeyActions from '../../redux/actions/apiKey'
+import APIKeyActions from '../../redux/actions/api-key'
 import WSHFActions from '../../redux/actions/ws-hf-server'
 
 const mapStateToProps = (state = {}, ownProps = {}) => {
   const { dataHF = {} } = state
   const { apiKey = {} } = dataHF
   const { key, secret } = apiKey
-  console.log(apiKey)
 
 
   return {

src/pages/Settings/SettingsView.js

@@ -8,24 +8,28 @@ import APIComboDialog from '../../components/APIComboDialogMenu'
 
 export default class SettingsView extends React.Component {
 
-    constructor(props) {
-        super(props)
-        this.onSubmitKeys = this.onSubmitKeys.bind(this)
-    }
-    onSubmitKeys({ key, secret } = {}) {
-        const { updateAPIKey, cycleBFXConnection } = this.props
-        updateAPIKey({ key, secret })
-    }
+  constructor(props) {
+    super(props)
+    this.onSubmitKeys = this.onSubmitKeys.bind(this)
+  }
+
+  onSubmitKeys({ key, secret } = {}) {
+    const { updateAPIKey, cycleBFXConnection } = this.props
+    updateAPIKey({ key, secret })
+  }
 
   render() {
     const { apiKey } = this.props
     const { key, secret } = apiKey
-    console.log(this.props)
     return (
-      <div className='hfui_view__wrapper'>
-        <h1>Settings</h1>
-        <Settings />
-        <APIComboDialog onSubmit={this.onSubmitKeys} />
+      <div style={{ flex: 1, display: 'flex', flexDirection: 'row' }}>
+        <div className='hfui_sidenavbar' style={{ backgroundColor: 'rgba(27,38,45,0.95)' }}>
+          <div style={{ marginTop: '90px' }} />
+          <Settings />
+        </div>
+        <div style={{ flex: 1, marginTop: '90px'}}>
+          <APIComboDialog onSubmit={this.onSubmitKeys} />
+        </div>
       </div>
     )
   }

src/redux/actions/algo-orders.js

@@ -0,0 +1,58 @@
+import axios from 'axios'
+import HfServerConsts from '../constants/rest-hf-server'
+
+const stopOrder = (gId) => {
+  return (dispatch) => {
+    return axios.get(`${HfServerConsts.HOST}/v1/orders/${gId}/stop`)
+      .then((response) => {
+        // success
+        dispatch({
+          type: 'RECEIVE_ORDERS',
+          payload: Object.values(response.data).map((v) => {
+            return [
+              v.gid,
+              v.algoID,
+              v.active,
+              v.state,
+            ]
+          }),
+        })
+      })
+      .catch((error) => {
+        // failed
+        console.error(error)
+      })
+      .finally(() => {
+        dispatch({ type: 'RECEIVE_ORDERS_DONE' })
+      })
+  }
+}
+
+function changeStatus(index) {
+  return {
+    type: 'CHANGE_STATUS',
+    index,
+  }
+}
+
+function getAlgoData() {
+  return {
+    type: 'GET_ALGO_DATA',
+  }
+}
+
+function receiveAlgoData() {
+  return {
+    type: 'RECEIVE_ALGO_DATA',
+    payload: {
+      data: [],
+    },
+  }
+}
+
+export default {
+  stopOrder,
+  changeStatus,
+  getAlgoData,
+  receiveAlgoData,
+}

src/redux/actions/ws-hf-server.js

@@ -54,7 +54,6 @@ export default {
    */
   recvBitfinex: (msg = []) => {
     const payload = msg[1]
-    console.log(msg)
     if (_isObject(payload) && payload.event) {
       switch (payload.event) {
         /*

src/redux/constants/rest-hf-server.js

@@ -0,0 +1,3 @@
+export default {
+  HOST: 'http://localhost:7799',
+}

src/redux/index.js

@@ -1,5 +1,6 @@
 import { createStore, applyMiddleware, compose } from 'redux'
 import createSagaMiddleware from 'redux-saga'
+import thunk from 'redux-thunk';
 
 import reducer from './reducers'
 import constants from './constants'
@@ -20,6 +21,7 @@ export function configureStore(
 
   let middleware = [
     hfSocketMiddleware(),
+    thunk,
     sagaMiddleware,
   ]
 
@@ -49,7 +51,7 @@ export function configureStore(
 }
 
 export function runSaga() {
-  console.log('%c runSaga is deprecated: it is already run in configureStore', 'color:white;background:orange;')
+  console.error('%c runSaga is deprecated: it is already run in configureStore', 'color:white;background:orange;')
 }
 
 export default {

src/redux/middleware/ws-data-server.js

@@ -33,7 +33,6 @@ const socketMiddleware = () => {
     }
 
     const [msg] = payload
-    console.log(JSON.stringify(action))
     switch (msg) {
       case 'error': {
         console.error('[wss] error ', payload)

src/redux/middleware/ws-hf-server.js

@@ -16,7 +16,6 @@ export default () => {
     }
 
     const { type, payload = {} } = action
-    console.log(JSON.stringify(action))
     switch (type) {
       case WSHFTypes.CONNECT: {
         if (socket !== null) {

src/redux/middleware/ws-hf/on_message.js

@@ -19,7 +19,6 @@ export default (ws, store) => (e = {}) => {
   }
 
   const [scope, msg] = payload
-  console.log(JSON.stringify(e))
   switch (scope) {
     case 'error': {
       console.error('[wss] error ', payload)