diff --git a/packages/components-faraday/src/components/AppBar/AppBar.js b/packages/components-faraday/src/components/AppBar/AppBar.js index 585a9c1179292476496e988cdebd487cd8266313..ae81cda79dab1a163f07ffa77629ec0a90ca030c 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 dcab7794e79dc3521cc7e72e98109bed99dcdb1f..b5acdae84239af709cacddfc81852a9fb7d37b62 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': {