From 0611db1bdfc4299c83c38da8076054fe0f56bfa3 Mon Sep 17 00:00:00 2001
From: "G.Ambatte" <sean@robertson-family.nz>
Date: Sat, 5 Feb 2022 17:01:52 +1300
Subject: [PATCH] Move Nav items to UserPage

---
 .../pages/basePages/listPage/listPage.jsx     | 34 ++++++-------------
 client/homebrew/pages/userPage/userPage.jsx   | 21 +++++++++++-
 2 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/client/homebrew/pages/basePages/listPage/listPage.jsx b/client/homebrew/pages/basePages/listPage/listPage.jsx
index e4beb4a94..17a558735 100644
--- a/client/homebrew/pages/basePages/listPage/listPage.jsx
+++ b/client/homebrew/pages/basePages/listPage/listPage.jsx
@@ -4,16 +4,9 @@ const createClass = require('create-react-class');
 const _     = require('lodash');
 const cx    = require('classnames');
 
-const moment = require('moment');
-
-const Nav = require('naturalcrit/nav/nav.jsx');
-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 ReportIssue = require('../../../navbar/issue.navitem.jsx');
+
+const moment = require('moment');
 
 // const brew = {
 // 	title   : 'SUPER Long title woah now',
@@ -32,7 +25,8 @@ const ListPage = createClass({
 					class : '',
 					brews : []
 				}
-			]
+			],
+			navItems : <></>
 		};
 	},
 	getInitialState : function() {
@@ -146,16 +140,17 @@ const ListPage = createClass({
 
 	getSortedBrews : function(brewCollection){
 		const testString = _.deburr(this.state.filterString).toLowerCase();
-		const brews = this.state.filterString ? _.filter(brewCollection.brews, (brew)=>{
+		console.log(testString);
+		const brews = testString ? _.filter(brewCollection.brews, (brew)=>{
 			return (_.deburr(brew.title).toLowerCase().includes(testString)) ||
 			(_.deburr(brew.description).toLowerCase().includes(testString));
-		}) : this.props.brewCollection.brews;
-		return _.groupBy(brews, (brew)=>{
-			return (brew.published ? 'published' : 'private');
-		});
+		}) : brewCollection.brews;
+		console.log(brews);
+		return brews;
 	},
 
 	renderBrewCollection : function(brewCollection){
+		brewCollection.brews = this.getSortedBrews(brewCollection);
 		return _.map(brewCollection, (brewItem, idx)=>{
 			return <div key={idx} className={`brewCollection${brewItem?.class ? ` ${brewItem.class}` : ''}`}>
 				<h1>{brewItem.title || 'No Title'}</h1>
@@ -167,14 +162,7 @@ const ListPage = createClass({
 	render : function(){
 		return <div className='listPage sitePage'>
 			<link href='/themes/5ePhbLegacy.style.css' rel='stylesheet'/>
-			<Navbar>
-				<Nav.section>
-					<NewBrew />
-					<ReportIssue />
-					<RecentNavItem />
-					<Account />
-				</Nav.section>
-			</Navbar>
+			{this.props.navItems}
 
 			<div className='content V3'>
 				<div className='phb'>
diff --git a/client/homebrew/pages/userPage/userPage.jsx b/client/homebrew/pages/userPage/userPage.jsx
index c3ac93e43..8c1c699f6 100644
--- a/client/homebrew/pages/userPage/userPage.jsx
+++ b/client/homebrew/pages/userPage/userPage.jsx
@@ -5,6 +5,14 @@ const cx    = require('classnames');
 
 const ListPage = require('../basePages/listPage/listPage.jsx');
 
+const Nav = require('naturalcrit/nav/nav.jsx');
+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 ReportIssue = require('../../navbar/issue.navitem.jsx');
+
 const UserPage = createClass({
 	displayName     : 'UserPage',
 	getDefaultProps : function() {
@@ -42,8 +50,19 @@ const UserPage = createClass({
 		};
 	},
 
+	navItems : function() {
+		return <Navbar>
+			<Nav.section>
+				<NewBrew />
+				<ReportIssue />
+				<RecentNavItem />
+				<Account />
+			</Nav.section>
+		</Navbar>;
+	},
+
 	render : function(){
-		return <ListPage brewCollection={this.state.brewCollection} ></ListPage>;
+		return <ListPage brewCollection={this.state.brewCollection} navItems={this.navItems()}></ListPage>;
 	}
 });