From 2921c8e7e9009e2e05ff125145a3ca5939cc8e06 Mon Sep 17 00:00:00 2001
From: Alexandru Munteanu <alexandru.munteanu@thinslices.com>
Date: Thu, 15 Feb 2018 11:51:45 +0200
Subject: [PATCH] refactor(AppBar): add toggle overlay and username
---
.../src/components/AppBar/AppBar.js | 19 ++++++++++++++++---
packages/xpub-faraday/config/default.js | 2 +-
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/packages/components-faraday/src/components/AppBar/AppBar.js b/packages/components-faraday/src/components/AppBar/AppBar.js
index 585a9c117..ae81cda79 100644
--- a/packages/components-faraday/src/components/AppBar/AppBar.js
+++ b/packages/components-faraday/src/components/AppBar/AppBar.js
@@ -1,5 +1,6 @@
import React from 'react'
import { Icon } from '@pubsweet/ui'
+import { get } from 'lodash'
import styled from 'styled-components'
import { withRouter } from 'react-router-dom'
import { withState, withHandlers, compose } from 'recompose'
@@ -13,7 +14,9 @@ const AppBar = ({ expanded, toggleMenu, brand, user, goTo }) => (
<User>
<div onClick={toggleMenu}>
<Icon color="#667080">user</Icon>
- <span>{user.username}</span>
+ <span>
+ {get(user, 'firstName') || get(user, 'username') || 'User'}
+ </span>
<Icon color="#667080">chevron-down</Icon>
</div>
{expanded && (
@@ -22,11 +25,12 @@ const AppBar = ({ expanded, toggleMenu, brand, user, goTo }) => (
<DropdownOption onClick={goTo('admin')}>
Admin dashboard
</DropdownOption>
- <DropdownOption>Logout</DropdownOption>
+ <DropdownOption onClick={goTo('/logout')}>Logout</DropdownOption>
</Dropdown>
)}
</User>
)}
+ {expanded && <ToggleOverlay onClick={toggleMenu} />}
</Root>
)
@@ -87,6 +91,15 @@ const DropdownOption = styled.div`
}
`
+const ToggleOverlay = styled.div`
+ position: fixed;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ opacity: 0;
+`
+
export default compose(
withRouter,
withState('expanded', 'setExpanded', false),
@@ -95,8 +108,8 @@ export default compose(
setExpanded(v => !v)
},
goTo: ({ setExpanded, history }) => path => () => {
- history.push(path)
setExpanded(v => false)
+ history.push(path)
},
}),
)(AppBar)
diff --git a/packages/xpub-faraday/config/default.js b/packages/xpub-faraday/config/default.js
index dcab7794e..b5acdae84 100644
--- a/packages/xpub-faraday/config/default.js
+++ b/packages/xpub-faraday/config/default.js
@@ -25,7 +25,7 @@ module.exports = {
'pubsweet-client': {
API_ENDPOINT: '/api',
'login-redirect': '/',
- 'redux-log': false,
+ 'redux-log': true,
theme: process.env.PUBSWEET_THEME,
},
'mail-transport': {
--
GitLab