From cae1bc9f0a17a8867eb477ab77b11a2313dbe195 Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Mon, 5 Sep 2022 23:31:23 -0400
Subject: [PATCH 1/4] Put tags in individual spans

---
 .../pages/basePages/listPage/brewItem/brewItem.jsx        | 3 ++-
 .../pages/basePages/listPage/brewItem/brewItem.less       | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx
index fc69466f1..923ebef45 100644
--- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx
+++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx
@@ -106,7 +106,8 @@ const BrewItem = createClass({
 			<div className='info'>
 				{brew.tags ? <>
 					<span className='brewTags' title={`Tags:\n${brew.tags.join('\n')}`}>
-						<i className='fas fa-tags'/> {brew.tags.join(', ')}
+						<i className='fas fa-tags'/>
+						{brew.tags.map((tag, idx)=>{return <><span>{tag}</span>{'\n'}</>;})}
 					</span>
 					<br />
 				</> : <></>
diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less
index 762a0b8d5..d81ec3852 100644
--- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less
+++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less
@@ -36,6 +36,14 @@
 			line-height  : 1.5em;
 		}
 	}
+	.brewTags span {
+		background-color: #c8ac6e3b;
+		margin-left: 2px;
+		border-radius: 0.5em;
+		padding: 1px 4px;
+		border: 1px solid #c8ac6e;
+		white-space: nowrap;
+	}
 	&:hover{
 		.links{
 			opacity : 1;

From e0d8846c442e8255fea08a12be53b0a912828439 Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Tue, 6 Sep 2022 01:00:38 -0400
Subject: [PATCH 2/4] tweaks

---
 .../pages/basePages/listPage/brewItem/brewItem.jsx     |  7 +++----
 .../pages/basePages/listPage/brewItem/brewItem.less    | 10 ++++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx
index 923ebef45..ce12a420a 100644
--- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx
+++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx
@@ -105,11 +105,10 @@ const BrewItem = createClass({
 			<hr />
 			<div className='info'>
 				{brew.tags ? <>
-					<span className='brewTags' title={`Tags:\n${brew.tags.join('\n')}`}>
+					<div className='brewTags' title={`Tags:\n${brew.tags.join('\n')}`}>
 						<i className='fas fa-tags'/>
-						{brew.tags.map((tag, idx)=>{return <><span>{tag}</span>{'\n'}</>;})}
-					</span>
-					<br />
+						{brew.tags.map((tag, idx)=>{return <span>{tag}</span>;})}
+					</div>
 				</> : <></>
 				}
 				<span title={`Authors:\n${brew.authors?.join('\n')}`}>
diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less
index d81ec3852..5ee7758b5 100644
--- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less
+++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less
@@ -29,7 +29,7 @@
 	.info{
 		position: initial;
 		bottom: 2px;
-		font-family : ScalySans;
+		font-family : ScalySansRemake;
 		font-size   : 1.2em;
 		&>span{
 			margin-right : 12px;
@@ -38,11 +38,13 @@
 	}
 	.brewTags span {
 		background-color: #c8ac6e3b;
-		margin-left: 2px;
-		border-radius: 0.5em;
-		padding: 1px 4px;
+		margin: 2px;
+		padding: 2px;
 		border: 1px solid #c8ac6e;
+		border-radius: 4px;
 		white-space: nowrap;
+		display: inline-block;
+		font-weight: bold;
 	}
 	&:hover{
 		.links{

From 8709545f1498941d1f7cd09dadea44db28b99e25 Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Tue, 6 Sep 2022 22:41:10 -0400
Subject: [PATCH 3/4] Don't display tags that are empty strings.

---
 .../pages/basePages/listPage/brewItem/brewItem.jsx   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx
index ce12a420a..472ca5724 100644
--- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx
+++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx
@@ -95,6 +95,10 @@ const BrewItem = createClass({
 
 	render : function(){
 		const brew = this.props.brew;
+		if(Array.isArray(brew.tags)) {               // temporary fix until dud tags are cleaned
+			brew.tags = brew.tags?.filter(tag => tag); //remove tags that are empty strings
+			console.log(brew.tags);
+		}
 		const dateFormatString = 'YYYY-MM-DD HH:mm:ss';
 
 		return <div className='brewItem'>
@@ -104,10 +108,14 @@ const BrewItem = createClass({
 			</div>
 			<hr />
 			<div className='info'>
-				{brew.tags ? <>
+
+				{brew.tags?.length ? <>
 					<div className='brewTags' title={`Tags:\n${brew.tags.join('\n')}`}>
 						<i className='fas fa-tags'/>
-						{brew.tags.map((tag, idx)=>{return <span>{tag}</span>;})}
+						{brew.tags.map((tag, idx)=>{
+							let matches = tag.match(/^(?:([^:]+):)?([^:]+)$/);
+							return <span className={matches[1]}>{matches[2]}</span>;
+						})}
 					</div>
 				</> : <></>
 				}

From c0a14a56187402ad87f0cf26852cb745db8f3a22 Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Tue, 6 Sep 2022 22:57:00 -0400
Subject: [PATCH 4/4] remove console.log

---
 client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx
index 472ca5724..79a4f7d0f 100644
--- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx
+++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx
@@ -97,7 +97,6 @@ const BrewItem = createClass({
 		const brew = this.props.brew;
 		if(Array.isArray(brew.tags)) {               // temporary fix until dud tags are cleaned
 			brew.tags = brew.tags?.filter(tag => tag); //remove tags that are empty strings
-			console.log(brew.tags);
 		}
 		const dateFormatString = 'YYYY-MM-DD HH:mm:ss';