Merge branch 'master' of https://github.com/AdvancedAlgos/MasterApp into develop
This commit is contained in:
commit
72e047dfbc
4 files changed
+8798
-7234
No files matched your search
Generated
+8788
-7234
File diff suppressed because it is too large.
Load diff
@@ -24,6 +24,7 @@
|
||||
"@advancedalgos/key-vault-client": "^0.0.14",
|
||||
"@advancedalgos/teams-client": "0.0.22",
|
||||
"@advancedalgos/users-client": "^0.0.14",
|
||||
"@advancedalgos/hosts-client": "^0.0.1",
|
||||
"@advancedalgos/web-components": "0.0.13",
|
||||
"@babel/core": "^7.1.2",
|
||||
"autoprefixer": "^9.2.0",
|
||||
|
||||
@@ -15,6 +15,7 @@ import { Header, Footer, Home, Charts, Callback } from './views'
|
||||
|
||||
import Users from '@advancedalgos/users-client'
|
||||
import Teams from '@advancedalgos/teams-client'
|
||||
import Hosts from '@advancedalgos/hosts-client'
|
||||
import KeyVault from '@advancedalgos/key-vault-client'
|
||||
|
||||
export const auth = new Auth(
|
||||
@@ -49,6 +50,10 @@ export const MasterApp = () => (
|
||||
path='/teams'
|
||||
render={props => <Teams {...props} auth={auth} />}
|
||||
/>
|
||||
<Route
|
||||
path='/hosts'
|
||||
render={props => <Hosts {...props} auth={auth} />}
|
||||
/>
|
||||
<Route
|
||||
path='/key-vault'
|
||||
render={props => <KeyVault {...props} auth={auth} />}
|
||||
|
||||
@@ -26,6 +26,7 @@ import AALogo from '../../assets/advanced-algos/aa-logo-dark.svg'
|
||||
const ChartsLink = props => <Link to='/charts' {...props} />
|
||||
const UsersLink = props => <Link to='/users' {...props} />
|
||||
const TeamsLink = props => <Link to='/teams' {...props} />
|
||||
const HostsLink = props => <Link to='/hosts' {...props} />
|
||||
const KeyVaultLink = props => <Link to='/key-vault' {...props} />
|
||||
const HomeLink = props => <Link to='/' {...props} />
|
||||
|
||||
@@ -116,6 +117,9 @@ class Header extends Component {
|
||||
<Button component={TeamsLink} color='inherit'>
|
||||
Teams
|
||||
</Button>
|
||||
<Button component={HostsLink} color='inherit'>
|
||||
Hosts
|
||||
</Button>
|
||||
<Button component={KeyVaultLink} color='inherit'>
|
||||
Key Vault
|
||||
</Button>
|
||||
|
||||
Reference in new issue
Block a user