Merge branch 'master' into master

client/src/App.js

@@ -27,7 +27,6 @@ export const MasterApp = () => (
     <ApolloProvider client={client}>
       <MuiThemeProvider theme={theme}>
         <CssBaseline />
-        <div className='App'>
           <Header auth={auth} />
           <Switch>
             <Route exact path='/' component={Home} />
@@ -43,7 +42,7 @@ export const MasterApp = () => (
               render={props => <Teams {...props} auth={auth} />}
             />
             <Route
-              path='/keys'
+              path='/key-vault'
               render={props => <KeyVault {...props} />}
             />
             <Route
@@ -52,7 +51,6 @@ export const MasterApp = () => (
             />
           </Switch>
           <Footer />
-        </div>
       </MuiThemeProvider>
     </ApolloProvider>
   </BrowserRouter>

client/src/views/header/LoggedIn.js

@@ -8,7 +8,6 @@ import { isDefined } from '../../utils/js-helpers'
 
 export const LoggedIn = props => {
   let { data, user, auth } = props
-  console.log('LoggedIn :', data, user)
   let displayName = 'No Display Name'
 
   if (isDefined(user.alias)) {

client/src/views/header/index.js

@@ -24,7 +24,7 @@ import AALogo from '../../assets/advanced-algos/aa-logo-dark.svg'
 const AboutLink = props => <Link to='/about' {...props} />
 const UsersLink = props => <Link to='/users' {...props} />
 const TeamsLink = props => <Link to='/teams' {...props} />
-const KeyVaultLink = props => <Link to='/keys' {...props} />
+const KeyVaultLink = props => <Link to='/key-vault' {...props} />
 const DashboardLink = props => <Link to='/dashboard' {...props} />
 const HomeLink = props => <Link to='/' {...props} />
 
@@ -72,7 +72,6 @@ class Header extends Component {
 
   async componentDidMount () {
     const user = await getItem('user')
-    console.log('NavBar CDM: ', user, this.state)
     this.setState({ user })
   }
 
@@ -111,15 +110,16 @@ class Header extends Component {
             <Button component={TeamsLink} color='inherit'>
               Teams
             </Button>
-            <Button component={KeyVaultLink} color='inherit'>
-              API Keys
-            </Button>
             <Button component={AboutLink} color='inherit'>
               About
             </Button>
 
             {this.state.user !== undefined && this.state.user !== null ? (
               <React.Fragment>
+                <Button component={KeyVaultLink} color='inherit'>
+                  Key Vault
+                </Button>
+
                 <IconButton
                   className={classes.menuButton}
                   color='inherit'