From e367cb2152ec2c74eebd85ab7ec52f1df51458d9 Mon Sep 17 00:00:00 2001
From: "G.Ambatte" <sean@robertson-family.nz>
Date: Sat, 23 Jan 2021 00:36:10 +1300
Subject: [PATCH 1/2] Initial commit - adds a `New` button to the Nav bar on
 the Home, User, and Edit pages.

---
 client/homebrew/navbar/newbrew.navitem.jsx  | 32 +++++++++++++++++++++
 client/homebrew/pages/editPage/editPage.jsx |  2 ++
 client/homebrew/pages/homePage/homePage.jsx |  2 ++
 client/homebrew/pages/userPage/userPage.jsx |  2 ++
 4 files changed, 38 insertions(+)
 create mode 100644 client/homebrew/navbar/newbrew.navitem.jsx

diff --git a/client/homebrew/navbar/newbrew.navitem.jsx b/client/homebrew/navbar/newbrew.navitem.jsx
new file mode 100644
index 000000000..404b5c063
--- /dev/null
+++ b/client/homebrew/navbar/newbrew.navitem.jsx
@@ -0,0 +1,32 @@
+const React = require('react');
+const createClass = require('create-react-class');
+const Nav = require('naturalcrit/nav/nav.jsx');
+
+const NewBrew = createClass({
+
+	getInitialState : function() {
+		return {
+			url : ''
+		};
+	},
+
+	componentDidMount : function(){
+		if(typeof window !== 'undefined'){
+			this.setState({
+				url : window.location.href
+			});
+		}
+	},
+
+	render : function(){
+		if(global.account){
+			return <Nav.item href='/new' color='purple' icon='fa-plus-square'>
+				new
+			</Nav.item>;
+		}
+
+		return;
+	}
+});
+
+module.exports = NewBrew;
diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx
index d75b647e6..1988f9434 100644
--- a/client/homebrew/pages/editPage/editPage.jsx
+++ b/client/homebrew/pages/editPage/editPage.jsx
@@ -9,6 +9,7 @@ const { Meta } = require('vitreum/headtags');
 const Nav = require('naturalcrit/nav/nav.jsx');
 const Navbar = require('../../navbar/navbar.jsx');
 
+const NewBrew = require('../../navbar/newbrew.navitem.jsx');
 const ReportIssue = require('../../navbar/issue.navitem.jsx');
 const PrintLink = require('../../navbar/print.navitem.jsx');
 const Account = require('../../navbar/account.navitem.jsx');
@@ -348,6 +349,7 @@ const EditPage = createClass({
 			</Nav.section>
 
 			<Nav.section>
+				<NewBrew />
 				{this.renderGoogleDriveIcon()}
 				{this.renderSaveButton()}
 				<ReportIssue />
diff --git a/client/homebrew/pages/homePage/homePage.jsx b/client/homebrew/pages/homePage/homePage.jsx
index e245b990b..1172c3131 100644
--- a/client/homebrew/pages/homePage/homePage.jsx
+++ b/client/homebrew/pages/homePage/homePage.jsx
@@ -7,6 +7,7 @@ const { Meta } = require('vitreum/headtags');
 
 const Nav = require('naturalcrit/nav/nav.jsx');
 const Navbar = require('../../navbar/navbar.jsx');
+const NewBrewItem = require('../../navbar/newbrew.navitem.jsx');
 const IssueNavItem = require('../../navbar/issue.navitem.jsx');
 const RecentNavItem = require('../../navbar/recent.navitem.jsx').both;
 const AccountNavItem = require('../../navbar/account.navitem.jsx');
@@ -54,6 +55,7 @@ const HomePage = createClass({
 	renderNavbar : function(){
 		return <Navbar ver={this.props.ver}>
 			<Nav.section>
+				<NewBrewItem />
 				<IssueNavItem />
 				<Nav.item newTab={true} href='/changelog' color='purple' icon='fa-file-text-o'>
 					Changelog
diff --git a/client/homebrew/pages/userPage/userPage.jsx b/client/homebrew/pages/userPage/userPage.jsx
index 5081a4942..a48e86ae4 100644
--- a/client/homebrew/pages/userPage/userPage.jsx
+++ b/client/homebrew/pages/userPage/userPage.jsx
@@ -9,6 +9,7 @@ const Navbar = require('../../navbar/navbar.jsx');
 
 const RecentNavItem = require('../../navbar/recent.navitem.jsx').both;
 const Account = require('../../navbar/account.navitem.jsx');
+const NewBrew = require('../../navbar/newbrew.navitem.jsx');
 const BrewItem = require('./brewItem/brewItem.jsx');
 
 // const brew = {
@@ -54,6 +55,7 @@ const UserPage = createClass({
 		return <div className='userPage page'>
 			<Navbar>
 				<Nav.section>
+					<NewBrew />
 					<RecentNavItem />
 					<Account />
 				</Nav.section>

From f5d5f8cf67ff2d872a014e2185ae6fda02827f9b Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Fri, 5 Mar 2021 22:31:59 -0500
Subject: [PATCH 2/2] Simplify Nav Item

---
 client/homebrew/navbar/newbrew.navitem.jsx  | 37 +++++----------------
 client/homebrew/navbar/patreon.navitem.jsx  |  1 -
 client/homebrew/pages/editPage/editPage.jsx |  2 +-
 3 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/client/homebrew/navbar/newbrew.navitem.jsx b/client/homebrew/navbar/newbrew.navitem.jsx
index 404b5c063..005b05f92 100644
--- a/client/homebrew/navbar/newbrew.navitem.jsx
+++ b/client/homebrew/navbar/newbrew.navitem.jsx
@@ -1,32 +1,11 @@
 const React = require('react');
-const createClass = require('create-react-class');
 const Nav = require('naturalcrit/nav/nav.jsx');
 
-const NewBrew = createClass({
-
-	getInitialState : function() {
-		return {
-			url : ''
-		};
-	},
-
-	componentDidMount : function(){
-		if(typeof window !== 'undefined'){
-			this.setState({
-				url : window.location.href
-			});
-		}
-	},
-
-	render : function(){
-		if(global.account){
-			return <Nav.item href='/new' color='purple' icon='fa-plus-square'>
-				new
-			</Nav.item>;
-		}
-
-		return;
-	}
-});
-
-module.exports = NewBrew;
+module.exports = function(props){
+	return <Nav.item
+		href='/new'
+		color='purple'
+		icon='fa-plus-square'>
+		new
+	</Nav.item>;
+};
diff --git a/client/homebrew/navbar/patreon.navitem.jsx b/client/homebrew/navbar/patreon.navitem.jsx
index 03fb69af4..976f9d127 100644
--- a/client/homebrew/navbar/patreon.navitem.jsx
+++ b/client/homebrew/navbar/patreon.navitem.jsx
@@ -1,5 +1,4 @@
 const React = require('react');
-const createClass = require('create-react-class');
 const Nav = require('naturalcrit/nav/nav.jsx');
 
 module.exports = function(props){
diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx
index 1988f9434..0ab3cd6f3 100644
--- a/client/homebrew/pages/editPage/editPage.jsx
+++ b/client/homebrew/pages/editPage/editPage.jsx
@@ -349,9 +349,9 @@ const EditPage = createClass({
 			</Nav.section>
 
 			<Nav.section>
-				<NewBrew />
 				{this.renderGoogleDriveIcon()}
 				{this.renderSaveButton()}
+				<NewBrew />
 				<ReportIssue />
 				<Nav.item newTab={true} href={`/share/${this.processShareId()}`} color='teal' icon='fa-share-alt'>
 					Share