Merge pull request #131 from algorithms-anonymous/master

Integrate Financial Beings
This commit is contained in:
Barry Low authored and GitHub committed 2018-12-18 18:34:32 -08:00
commit 9796a4f5f3
5 files changed
+6082 -6145

No files matched your search

+6074 -6137
View File
File diff suppressed because it is too large. Load diff
+1
View File
@@ -26,6 +26,7 @@
"homepage": "https://github.com/Algoteers/MasterApp#readme",
"devDependencies": {
"@advancedalgos/events-client": "0.0.4",
"@advancedalgos/financial-beings-client": "0.0.5",
"@advancedalgos/key-vault-client": "0.0.25",
"@advancedalgos/teams-client": "0.0.32",
"@advancedalgos/users-client": "0.0.24",
+5 -3
View File
@@ -18,9 +18,7 @@ import Users from '@advancedalgos/users-client'
import Teams from '@advancedalgos/teams-client'
import Events from '@advancedalgos/events-client'
import KeyVault from '@advancedalgos/key-vault-client'
// import FinancialBeings from '@advancedalgos/financial-beings-client'
import { FINANCIAL_BEINGS } from './constants/routes'
import FinancialBeings from '@advancedalgos/financial-beings-client'
export const auth = new Auth(
result => console.log('Authentication successful.'),
@@ -70,6 +68,10 @@ export const MasterApp = props => (
path='/events'
render={props => <Events {...props} auth={auth} />}
/>
<Route
path='/financial-beings'
render={props => <FinancialBeings {...props} auth={auth}/>}
/>
<Route
path='/key-vault'
render={props => <KeyVault {...props} auth={auth} />}
-1
View File
@@ -1 +0,0 @@
export const FINANCIAL_BEINGS = '/financial-beings'
+2 -4
View File
@@ -13,8 +13,6 @@ import {
AddCircleOutline
} from '@material-ui/icons'
import { FINANCIAL_BEINGS } from '../../../constants/routes'
const usersMenus = {
title: 'Users',
to: '/users',
@@ -66,7 +64,7 @@ const keyvaultMenus = {
const financialBeingsMenus = {
title: 'Financial beings',
to: FINANCIAL_BEINGS,
to: '/financial-beings',
authenticated: false,
submenus: []
}
@@ -75,7 +73,7 @@ const allMenus = [
usersMenus,
teamsMenus,
eventsMenus,
// financialBeingsMenus,
financialBeingsMenus,
keyvaultMenus
]