Merge remote-tracking branch 'upstream/develop' into feature/strategizer

This commit is contained in:
Barry Low committed 2019-03-19 21:36:16 +01:00
commit 2d87419750
11 files changed
+4567 -745

No files matched your search

+10 -3
View File
@@ -16,11 +16,13 @@ import { Layout, Home, Charts, Callback, EmailSignupConfirm } from './views'
import Users from '@superalgos/users-client'
import Teams from '@superalgos/teams-client'
import Events from '@advancedalgos/events-client'
import Events from '@superalgos/events-client'
import KeyVault from '@superalgos/key-vault-client'
import FinancialBeings from '@advancedalgos/financial-beings-client'
import Operations from '@superalgos/operations-client'
import Strategizer from '@superalgos/strategizer-client'
import Logs from '@superalgos/logs-client'
// import Miners from '@superalgos/miners-client'
export const auth = new Auth(
result => console.log('Authentication successful.'),
@@ -75,17 +77,22 @@ export const MasterApp = props => (
render={props => <FinancialBeings {...props} auth={auth}/>}
/>
<Route
path='/key-vault'
path='/keys'
render={props => <KeyVault {...props} auth={auth} />}
/>
<Route
path='/operations'
path='/clones'
render={props => <Operations {...props} auth={auth} />}
/>
<Route
path='/strategizer'
render={props => <Strategizer {...props} auth={auth} />}
/>
<Route
path='/logs'
render={props => <Logs {...props} auth={auth} />}
/>
</Switch>
</Layout>
</MuiThemeProvider>