Skip to content

Commit

Permalink
feat: Display avatar next to user name in top bar
Browse files Browse the repository at this point in the history
  • Loading branch information
meltyshev committed Apr 22, 2024
1 parent eb56b21 commit 7ee2d76
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
2 changes: 2 additions & 0 deletions client/src/components/BoardActions/BoardActions.module.scss
@@ -1,5 +1,7 @@
:global(#app) {
.action {
align-items: center;
display: flex;
flex: 0 0 auto;
margin-right: 20px;
}
Expand Down
4 changes: 3 additions & 1 deletion client/src/components/Header/Header.jsx
Expand Up @@ -7,6 +7,7 @@ import { usePopup } from '../../lib/popup';

import Paths from '../../constants/Paths';
import NotificationsStep from './NotificationsStep';
import User from '../User';
import UserStep from '../UserStep';

import styles from './Header.module.scss';
Expand Down Expand Up @@ -91,7 +92,8 @@ const Header = React.memo(
onLogout={onLogout}
>
<Menu.Item className={classNames(styles.item, styles.itemHoverable)}>
{user.name}
<span className={styles.userName}>{user.name}</span>
<User name={user.name} avatarUrl={user.avatarUrl} size="small" />
</Menu.Item>
</UserPopup>
</Menu.Menu>
Expand Down
4 changes: 4 additions & 0 deletions client/src/components/Header/Header.module.scss
Expand Up @@ -86,6 +86,10 @@
font-weight: bold;
}

.userName {
margin-right: 10px;
}

.wrapper {
background: rgba(0, 0, 0, 0.24);
display: flex;
Expand Down

0 comments on commit 7ee2d76

Please sign in to comment.