From ba693365ec85f74f018454954d51e8f948fc6319 Mon Sep 17 00:00:00 2001
From: "G.Ambatte" <sean@robertson-family.nz>
Date: Sat, 3 Sep 2022 20:53:28 +1200
Subject: [PATCH 1/2] Lint fixes

---
 client/homebrew/pages/basePages/listPage/listPage.jsx | 8 ++++----
 client/homebrew/pages/newPage/newPage.jsx             | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/homebrew/pages/basePages/listPage/listPage.jsx b/client/homebrew/pages/basePages/listPage/listPage.jsx
index 0fcef8d9c..808cf369b 100644
--- a/client/homebrew/pages/basePages/listPage/listPage.jsx
+++ b/client/homebrew/pages/basePages/listPage/listPage.jsx
@@ -30,10 +30,10 @@ const ListPage = createClass({
 		});
 
 		return {
-			filterString : this.props.query?.filter || '',
-			sortType     : this.props.query?.sort || 'alpha',
-			sortDir      : this.props.query?.dir || 'asc',
-			query        : this.props.query,
+			filterString   : this.props.query?.filter || '',
+			sortType       : this.props.query?.sort || 'alpha',
+			sortDir        : this.props.query?.dir || 'asc',
+			query          : this.props.query,
 			brewCollection : brewCollection
 		};
 	},
diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx
index 895438997..18b28ed2f 100644
--- a/client/homebrew/pages/newPage/newPage.jsx
+++ b/client/homebrew/pages/newPage/newPage.jsx
@@ -94,7 +94,7 @@ const NewPage = createClass({
 
 		localStorage.setItem(BREWKEY, brew.text);
 		localStorage.setItem(STYLEKEY, brew.style);
-		localStorage.setItem(METAKEY, JSON.stringify({'renderer' : brew.renderer}));
+		localStorage.setItem(METAKEY, JSON.stringify({ 'renderer': brew.renderer }));
 	},
 	componentWillUnmount : function() {
 		document.removeEventListener('keydown', this.handleControlKeys);

From cfbc089207f4a1c355c560e47ea667f0ef748c55 Mon Sep 17 00:00:00 2001
From: "G.Ambatte" <sean@robertson-family.nz>
Date: Sat, 3 Sep 2022 21:15:32 +1200
Subject: [PATCH 2/2] Add sort type & dir to local storage

---
 .../pages/basePages/listPage/listPage.jsx     | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/client/homebrew/pages/basePages/listPage/listPage.jsx b/client/homebrew/pages/basePages/listPage/listPage.jsx
index 808cf369b..fa6965f79 100644
--- a/client/homebrew/pages/basePages/listPage/listPage.jsx
+++ b/client/homebrew/pages/basePages/listPage/listPage.jsx
@@ -1,3 +1,4 @@
+/*eslint max-lines: ["warn", {"max": 300, "skipBlankLines": true, "skipComments": true}]*/
 require('./listPage.less');
 const React       = require('react');
 const createClass = require('create-react-class');
@@ -6,7 +7,10 @@ const moment      = require('moment');
 
 const BrewItem    = require('./brewItem/brewItem.jsx');
 
-const USERPAGE_KEY_PREFIX = 'HOMEBREWERY-LISTPAGE-VISIBILITY';
+const USERPAGE_KEY_PREFIX = 'HOMEBREWERY-LISTPAGE';
+
+const DEFAULT_SORT_TYPE = 'alpha';
+const DEFAULT_SORT_DIR = 'asc';
 
 const ListPage = createClass({
 	displayName     : 'ListPage',
@@ -31,8 +35,8 @@ const ListPage = createClass({
 
 		return {
 			filterString   : this.props.query?.filter || '',
-			sortType       : this.props.query?.sort || 'alpha',
-			sortDir        : this.props.query?.dir || 'asc',
+			sortType       : this.props.query?.sort || null,
+			sortDir        : this.props.query?.dir || null,
 			query          : this.props.query,
 			brewCollection : brewCollection
 		};
@@ -44,12 +48,19 @@ const ListPage = createClass({
 
 		// LOAD FROM LOCAL STORAGE
 		if(typeof window !== 'undefined') {
+			const newSortType = (this.state.sortType ?? (localStorage.getItem(`${USERPAGE_KEY_PREFIX}-SORTTYPE`) || DEFAULT_SORT_TYPE));
+			const newSortDir = (this.state.sortDir ?? (localStorage.getItem(`${USERPAGE_KEY_PREFIX}-SORTDIR`) || DEFAULT_SORT_DIR));
+			this.updateUrl(this.state.filterString, newSortType, newSortDir);
+
 			const brewCollection = this.props.brewCollection.map((brewGroup)=>{
-				brewGroup.visible = (localStorage.getItem(`${USERPAGE_KEY_PREFIX}-${brewGroup.class}`) ?? 'true')=='true';
+				brewGroup.visible = (localStorage.getItem(`${USERPAGE_KEY_PREFIX}-VISIBILITY-${brewGroup.class}`) ?? 'true')=='true';
 				return brewGroup;
 			});
+
 			this.setState({
-				brewCollection : brewCollection
+				brewCollection : brewCollection,
+				sortType       : newSortType,
+				sortDir        : newSortDir
 			});
 		};
 	},
@@ -60,8 +71,10 @@ const ListPage = createClass({
 
 	saveToLocalStorage : function() {
 		this.state.brewCollection.map((brewGroup)=>{
-			localStorage.setItem(`${USERPAGE_KEY_PREFIX}-${brewGroup.class}`, `${brewGroup.visible}`);
+			localStorage.setItem(`${USERPAGE_KEY_PREFIX}-VISIBILITY-${brewGroup.class}`, `${brewGroup.visible}`);
 		});
+		localStorage.setItem(`${USERPAGE_KEY_PREFIX}-SORTTYPE`, this.state.sortType);
+		localStorage.setItem(`${USERPAGE_KEY_PREFIX}-SORTDIR`, this.state.sortDir);
 	},
 
 	renderBrews : function(brews){