From: Daniel Kos <daniel.kos@contractors.roche.com>
Date: Wed, 6 Jun 2018 14:38:18 +0000 (+0200)
Subject: Add better layout for user name on the appbar
X-Git-Tag: 1.0.0~1^2~4
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/8a514334ae2a6e02cc1e254d29b229b2750eec7d?hp=e5ff916017b1f215dc1d0ae5b82cd3d7e669a5fc

Add better layout for user name on the appbar

Feature #13563

Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos@contractors.roche.com>:
---

diff --git a/src/services/auth-service/auth-service.ts b/src/services/auth-service/auth-service.ts
index 5a08d3b5..12c5b680 100644
--- a/src/services/auth-service/auth-service.ts
+++ b/src/services/auth-service/auth-service.ts
@@ -2,7 +2,6 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import Axios from "axios";
 import { API_HOST } from "../../common/server-api";
 import { User } from "../../models/user";
 
diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx
index 38c3f042..b5babde1 100644
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@ -23,6 +23,7 @@ import Menu from "@material-ui/core/Menu/Menu";
 import MenuItem from "@material-ui/core/MenuItem/MenuItem";
 import { AccountCircle } from "@material-ui/icons";
 import { User } from "../../models/user";
+import Grid from "@material-ui/core/Grid/Grid";
 
 const drawerWidth = 240;
 
@@ -109,17 +110,21 @@ class Workbench extends React.Component<WorkbenchProps, WorkbenchState> {
                             <span>Arvados</span><br/><span style={{fontSize: 12}}>Workbench 2</span>
                         </Typography>
                         {user ?
-                            <div>
-                                <Typography variant="title" color="inherit" noWrap>
-                                    {user.firstName} {user.lastName}
-                                </Typography>
-                                <IconButton
-                                      aria-owns={this.state.anchorEl ? 'menu-appbar' : undefined}
-                                      aria-haspopup="true"
-                                      onClick={this.handleOpenMenu}
-                                      color="inherit">
-                                  <AccountCircle/>
-                                </IconButton>
+                            <Grid container style={{width: 'auto'}}>
+                                <Grid container style={{width: 'auto'}} alignItems='center'>
+                                    <Typography variant="title" color="inherit" noWrap>
+                                        {user.firstName} {user.lastName}
+                                    </Typography>
+                                </Grid>
+                                <Grid item>
+                                    <IconButton
+                                          aria-owns={this.state.anchorEl ? 'menu-appbar' : undefined}
+                                          aria-haspopup="true"
+                                          onClick={this.handleOpenMenu}
+                                          color="inherit">
+                                      <AccountCircle/>
+                                    </IconButton>
+                                </Grid>
                                 <Menu
                                   id="menu-appbar"
                                   anchorEl={this.state.anchorEl}
@@ -136,7 +141,7 @@ class Workbench extends React.Component<WorkbenchProps, WorkbenchState> {
                                   <MenuItem onClick={this.logout}>Logout</MenuItem>
                                   <MenuItem onClick={this.handleClose}>My account</MenuItem>
                                 </Menu>
-                            </div>
+                            </Grid>
                             :
                             <Button color="inherit" onClick={this.login}>Login</Button>
                         }