Added new account nav item

changelog.md

@@ -8,6 +8,8 @@
 - Can now search for brews by a specific author
 - Editing a brew in anyway while logged in will now add you to the list of authors
 - Added a new user page to see others published brews, as well as all of your own brews.
+- Added a new nav item for accessing your profile and logging in
+
 
 ### Monday, 14/11/2016
 - Updated snippet bar style

client/homebrew/homebrew.jsx

@@ -31,6 +31,9 @@ const Homebrew = React.createClass({
 		};
 	},
 	componentWillMount: function() {
+		global.account = this.props.account;
+
+
 		Router = CreateRouter({
 			'/edit/:id' : (args) => {
 				if(!this.props.brew.editId){

client/homebrew/navbar/account.navitem.jsx

@@ -0,0 +1,17 @@
+const React = require('react');
+const Nav = require('naturalcrit/nav/nav.jsx');
+
+module.exports = function(props){
+	if(global.account){
+		return <Nav.item href={`/user/${global.account.username}`} color='yellow' icon='fa-user'>
+			profile
+		</Nav.item>
+	}
+	let url = '';
+	if(typeof window !== 'undefined'){
+		url = window.location.href
+	}
+	return <Nav.item href={`http://naturalcrit.com/login?redirect=${url}`} color='teal' icon='fa-sign-in'>
+		login
+	</Nav.item>
+};

client/homebrew/pages/editPage/editPage.jsx

@@ -8,7 +8,8 @@ const Navbar = require('../../navbar/navbar.jsx');
 
 const ReportIssue = require('../../navbar/issue.navitem.jsx');
 const PrintLink = require('../../navbar/print.navitem.jsx');
-const RecentlyEdited = require('../../navbar/recent.navitem.jsx').edited;
+const Account = require('../../navbar/account.navitem.jsx');
+//const RecentlyEdited = require('../../navbar/recent.navitem.jsx').edited;
 
 
 const SplitPane = require('naturalcrit/splitPane/splitPane.jsx');
@@ -191,11 +192,12 @@ const EditPage = React.createClass({
 			</Nav.section>
 			<Nav.section>
 				{this.renderSaveButton()}
-				<RecentlyEdited brew={this.props.brew} />
+				{/*<RecentlyEdited brew={this.props.brew} />*/}
 				<Nav.item newTab={true} href={'/share/' + this.props.brew.shareId} color='teal' icon='fa-share-alt'>
 					Share
 				</Nav.item>
 				<PrintLink shareId={this.props.brew.shareId} />
+				<Account />
 			</Nav.section>
 		</Navbar>
 	},

client/homebrew/pages/homePage/homePage.jsx

@@ -1,22 +1,23 @@
-var React = require('react');
+const React = require('react');
-var _ = require('lodash');
+const _ = require('lodash');
-var cx = require('classnames');
+const cx = require('classnames');
-var request = require("superagent");
+const request = require("superagent");
 
-var Nav = require('naturalcrit/nav/nav.jsx');
+const Nav = require('naturalcrit/nav/nav.jsx');
-var Navbar = require('../../navbar/navbar.jsx');
+const Navbar = require('../../navbar/navbar.jsx');
-var PatreonNavItem = require('../../navbar/patreon.navitem.jsx');
+const PatreonNavItem = require('../../navbar/patreon.navitem.jsx');
-var IssueNavItem = require('../../navbar/issue.navitem.jsx');
+const IssueNavItem = require('../../navbar/issue.navitem.jsx');
-var RecentNavItem = require('../../navbar/recent.navitem.jsx');
+const RecentNavItem = require('../../navbar/recent.navitem.jsx');
+const AccountNavItem = require('../../navbar/account.navitem.jsx');
 
 
-var SplitPane = require('naturalcrit/splitPane/splitPane.jsx');
+const SplitPane = require('naturalcrit/splitPane/splitPane.jsx');
-var Editor = require('../../editor/editor.jsx');
+const Editor = require('../../editor/editor.jsx');
-var BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
+const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
 
 
 
-var HomePage = React.createClass({
+const HomePage = React.createClass({
 	getDefaultProps: function() {
 		return {
 			welcomeText : '',
@@ -56,9 +57,12 @@ var HomePage = React.createClass({
 					Changelog
 				</Nav.item>
 				<RecentNavItem.both />
+				<AccountNavItem />
+				{/*}
 				<Nav.item href='/new' color='green' icon='fa-external-link'>
 					New Brew
 				</Nav.item>
+				*/}
 			</Nav.section>
 		</Navbar>
 	},

client/homebrew/pages/sharePage/sharePage.jsx

@@ -5,7 +5,9 @@ const cx = require('classnames');
 const Nav = require('naturalcrit/nav/nav.jsx');
 const Navbar = require('../../navbar/navbar.jsx');
 const PrintLink = require('../../navbar/print.navitem.jsx');
-const RecentlyViewed = require('../../navbar/recent.navitem.jsx').viewed;
+//const RecentlyViewed = require('../../navbar/recent.navitem.jsx').viewed;
+const Account = require('../../navbar/account.navitem.jsx');
+
 
 const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
 
@@ -46,11 +48,12 @@ const SharePage = React.createClass({
 				</Nav.section>
 
 				<Nav.section>
-					<RecentlyViewed brew={this.props.brew} />
+					{/*<RecentlyViewed brew={this.props.brew} />*/}
 					<PrintLink shareId={this.props.brew.shareId} />
 					<Nav.item href={'/source/' + this.props.brew.shareId} color='teal' icon='fa-code'>
 						source
 					</Nav.item>
+					<Account />
 				</Nav.section>
 			</Navbar>
 

client/homebrew/pages/userPage/userPage.jsx

@@ -5,6 +5,8 @@ const cx    = require('classnames');
 const Nav = require('naturalcrit/nav/nav.jsx');
 const Navbar = require('../../navbar/navbar.jsx');
 
+const RecentNavItem = require('../../navbar/recent.navitem.jsx');
+const Account = require('../../navbar/account.navitem.jsx');
 const BrewItem = require('./brewItem/brewItem.jsx');
 
 const UserPage = React.createClass({
@@ -29,10 +31,13 @@ const UserPage = React.createClass({
 
 	render : function(){
 		const brews = this.getSortedBrews();
+
+
 		return <div className='userPage page'>
 			<Navbar>
 				<Nav.section>
-					holla
+					<RecentNavItem.both />
+					<Account />
 				</Nav.section>
 			</Navbar>
 

client/homebrew/pages/userPage/userPage.less

@@ -1,8 +1,9 @@
+
 .userPage{
 	.content .phb{
-		margin: 20px auto;
+		height       : 80%;
-		min-height : 350px;
+		min-height   : 350px;
-		height : 80%;
+		margin       : 20px auto;
 		column-count : 1;
 		&::after{
 			display : none;

server.js

@@ -126,7 +126,8 @@ app.use((req, res) => {
 			welcomeText : welcomeText,
 			changelog : changelogText,
 			brew : req.brew,
-			brews : req.brews
+			brews : req.brews,
+			account : req.account
 		},
 		clearRequireCache : !process.env.PRODUCTION,
 	}, (err, page) => {