From 30b2c728a8bdd4c5570dfa61f97a2cb71c4517e7 Mon Sep 17 00:00:00 2001
From: Jure Triglav <juretriglav@gmail.com>
Date: Fri, 28 Aug 2020 15:39:53 +0200
Subject: [PATCH] feat: improve ux to access the user's profile
---
app/components/AdminPage.js | 5 +++++
app/components/Menu.js | 10 +++++++---
app/components/component-avatar/src/index.js | 2 --
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/app/components/AdminPage.js b/app/components/AdminPage.js
index b0f1f8e3bc..8a73fa9cc4 100644
--- a/app/components/AdminPage.js
+++ b/app/components/AdminPage.js
@@ -110,6 +110,7 @@ const AdminPage = ({ children, history, match }) => {
let links = []
const formBuilderLink = `/journal/admin/form-builder`
const homeLink = '/journal/dashboard'
+ const profileLink = '/journal/profile'
if (showLinks) {
const params = getParams(pathname)
@@ -140,6 +141,10 @@ const AdminPage = ({ children, history, match }) => {
})
}
+ if (currentUser) {
+ links.push({ link: profileLink, name: 'My profile', icon: 'user' })
+ }
+
return (
<Root converting={conversion.converting}>
<Menu
diff --git a/app/components/Menu.js b/app/components/Menu.js
index f995464a9b..45963e4444 100644
--- a/app/components/Menu.js
+++ b/app/components/Menu.js
@@ -105,6 +105,9 @@ const UserItem = styled(Link)`
const UserInfo = styled.div`
margin-left: ${grid(1)};
+ display: flex;
+ justify-content: center;
+ flex-direction: column;
`
const Menu = ({
@@ -134,10 +137,11 @@ const Menu = ({
const UserComponent = ({ user, loginLink }) => (
<Section>
{user && (
- <UserItem to="/journal/profile">
- <UserAvatar size={64} user={user} />
+ <UserItem title="Go to your profile" to="/journal/profile">
+ <UserAvatar isClickable={false} size={48} user={user} />
<UserInfo>
- {user.defaultIdentity.name || user.username}
+ <p>{user.defaultIdentity.name || user.username}</p>
+ <p>{user.online ? '' : 'Offline'}</p>
{/* ({user.username}) */}
{user.admin ? ' (admin)' : ''}
</UserInfo>
diff --git a/app/components/component-avatar/src/index.js b/app/components/component-avatar/src/index.js
index 959dab1279..f7f49c4044 100644
--- a/app/components/component-avatar/src/index.js
+++ b/app/components/component-avatar/src/index.js
@@ -1,5 +1,3 @@
-// import CommunityAvatar from './communityAvatar';
import UserAvatar from './UserAvatar'
-// export { CommunityAvatar, UserAvatar };
export { UserAvatar }
--
GitLab