Added in a logout to the user page

client/homebrew/homebrew.jsx

@@ -3,11 +3,12 @@ const _ = require('lodash');
 const cx = require('classnames');
 
 const CreateRouter = require('pico-router').createRouter;
-const Actions = require('homebrewery/brew.actions.js');
+const BrewActions = require('homebrewery/brew.actions.js');
+const AccountActions = require('homebrewery/account.actions.js');
 
 const HomePage = require('./pages/homePage/homePage.jsx');
 const EditPage = require('./pages/editPage/editPage.jsx');
-//const UserPage = require('./pages/userPage/userPage.jsx');
+const UserPage = require('./pages/userPage/userPage.jsx');
 const SharePage = require('./pages/sharePage/sharePage.jsx');
 const NewPage   = require('./pages/newPage/newPage.jsx');
 //const ErrorPage = require('./pages/errorPage/errorPage.jsx');
@@ -39,19 +40,25 @@ const Homebrew = React.createClass({
 
 		//console.log(mapObject(['version', 'brew', 'account'], this.props));
 
-		Actions.init(mapObject(['version', 'brew', 'account'], this.props));
+		BrewActions.init({
+			version : this.props.version,
+			brew    : this.props.brew
+		});
+		AccountActions.init({
+			user      : this.props.user,
+			loginPath : this.props.loginPath
+		});
 
 
 		Router = CreateRouter({
 			'/edit/:id' : <EditPage />,
 			'/share/:id' : <SharePage />,
-			/*
 			'/user/:username' : (args) => {
 				return <UserPage
 					username={args.username}
 					brews={this.props.brews}
 				/>
-			},*/
+			},
 			'/print/:id' : (args, query) => {
 				return <PrintPage brew={this.props.brew} query={query}/>;
 			},

client/homebrew/navbar/account.navitem.jsx

@@ -1,19 +1,23 @@
 const React = require('react');
 const Nav = require('naturalcrit/nav/nav.jsx');
 
+const Store = require('homebrewery/account.store.js');
+const Actions = require('homebrewery/account.actions.js');
+
+
 module.exports = function(props){
-	if(global.account){
-		return <Nav.item href={`/user/${global.account.username}`} color='yellow' icon='fa-user'>
-			{global.account.username}
+	const user = Store.getUser();
+	if(user && user == props.userPage){
+		return <Nav.item onClick={Actions.logout} color='yellow' icon='fa-user-times'>
+			logout
 		</Nav.item>
 	}
-	let url = '';
-	/*
-	if(typeof window !== 'undefined'){
-		url = window.location.href
+	if(user){
+		return <Nav.item href={`/user/${user}`} color='yellow' icon='fa-user'>
+			{user}
+		</Nav.item>
 	}
-	*/
-	return <Nav.item href={`http://naturalcrit.com/login?redirect=${url}`} color='teal' icon='fa-sign-in'>
+	return <Nav.item onClick={Actions.login} color='teal' icon='fa-sign-in'>
 		login
 	</Nav.item>
 };

client/homebrew/pages/userPage/userPage.jsx

@@ -57,7 +57,7 @@ const UserPage = React.createClass({
 			<Navbar>
 				<Nav.section>
 					<RecentNavItem.both />
-					<Account />
+					<Account userPage={this.props.username} />
 				</Nav.section>
 			</Navbar>