From 5fbddd4e22037c395c27521c394d09fac19f588a Mon Sep 17 00:00:00 2001
From: john <johnbarlas39@gmail.com>
Date: Wed, 30 Nov 2016 19:02:43 +0200
Subject: [PATCH] logout redirects you to /
---
app/components/Navigation/Navigation.jsx | 33 ++++++++++++++++++++----
1 file changed, 28 insertions(+), 5 deletions(-)
diff --git a/app/components/Navigation/Navigation.jsx b/app/components/Navigation/Navigation.jsx
index a444956..3286d6c 100644
--- a/app/components/Navigation/Navigation.jsx
+++ b/app/components/Navigation/Navigation.jsx
@@ -1,4 +1,5 @@
import React from 'react'
+import { browserHistory } from 'react-router'
import { LinkContainer } from 'react-router-bootstrap'
import { Navbar, Nav, NavItem, NavbarBrand } from 'react-bootstrap'
@@ -6,39 +7,61 @@ import Authorize from 'pubsweet-frontend/src/helpers/Authorize'
import NavbarUser from 'pubsweet-component-navigation/NavbarUser'
export default class Navigation extends React.Component {
+ constructor (props) {
+ super(props)
+ this.logout = this.logout.bind(this)
+ }
+
+ logout () {
+ const { logoutUser } = this.props.actions
+ logoutUser()
+ browserHistory.push('/')
+ }
render () {
- const { actions, currentUser } = this.props
+ const { currentUser } = this.props
let logoutButtonIfAuthenticated
+
if (currentUser.isAuthenticated) {
- logoutButtonIfAuthenticated = <NavbarUser
- user={currentUser.user}
- onLogoutClick={actions.logoutUser}
- />
+ logoutButtonIfAuthenticated = (
+ <NavbarUser
+ user={currentUser.user}
+ onLogoutClick={this.logout}
+ />
+ )
}
+
+ // TODO -- fix object properties underneath
return (
<Navbar fluid>
+
<Navbar.Header>
<NavbarBrand>
<a href='#'><img src='/pubsweet.jpg' alt='pubsweet' /></a>
</NavbarBrand>
</Navbar.Header>
+
<Nav>
<LinkContainer to='/books'>
<NavItem>Books</NavItem>
</LinkContainer>
+
<Authorize operation='read' object={currentUser.user}>
<LinkContainer to='/users'>
<NavItem>Users</NavItem>
</LinkContainer>
</Authorize>
+
<Authorize operation='read'>
<LinkContainer to='/teams'>
<NavItem>Teams</NavItem>
</LinkContainer>
</Authorize>
+
</Nav>
+
{ logoutButtonIfAuthenticated }
+
</Navbar>
)
}
--
GitLab