From 468ccd748d33d0d0ceb6dfd615f31b76ca3a4dc0 Mon Sep 17 00:00:00 2001
From: "G.Ambatte" <sean@robertson-family.nz>
Date: Sat, 2 Apr 2022 10:10:40 +1300
Subject: [PATCH 1/4] Initial pass at redirecting / to a landing page

---
 client/homebrew/homebrew.jsx |  1 +
 server/app.js                | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/client/homebrew/homebrew.jsx b/client/homebrew/homebrew.jsx
index 732c06486..66dfd4d19 100644
--- a/client/homebrew/homebrew.jsx
+++ b/client/homebrew/homebrew.jsx
@@ -52,6 +52,7 @@ const Homebrew = createClass({
 						<Route path='/user/:username' component={(routeProps)=><UserPage username={routeProps.match.params.username} brews={this.props.brews} query={queryString.parse(routeProps.location.search)}/>}/>
 						<Route path='/print/:id' component={(routeProps)=><PrintPage brew={this.props.brew} query={queryString.parse(routeProps.location.search)} />}/>
 						<Route path='/print' exact component={(routeProps)=><PrintPage query={queryString.parse(routeProps.location.search)} />}/>
+						<Route path='/home' component={()=><SharePage brew={this.props.brew} />}/>
 						<Route path='/changelog' exact component={()=><SharePage brew={this.props.brew} />}/>
 						<Route path='/faq' exact component={()=><SharePage brew={this.props.brew} />}/>
 						<Route path='/v3_preview' exact component={()=><HomePage brew={this.props.brew} />}/>
diff --git a/server/app.js b/server/app.js
index de51c8882..56b63235a 100644
--- a/server/app.js
+++ b/server/app.js
@@ -109,9 +109,28 @@ app.get('/robots.txt', (req, res)=>{
 
 //Home page
 app.get('/', async (req, res, next)=>{
+	const homePageId = config.get('homePage');
+	if(homePageId){
+		return res.redirect('/home');
+	}
+	// const brew = homePageId ? await getBrewFromId(homePageId, 'share') : { text: welcomeText } ;
+
 	const brew = {
 		text : welcomeText
 	};
+
+	req.brew = brew;
+	return next();
+});
+
+app.get('/home', async (req, res, next)=>{
+	const homePageId = config.get('homePage');
+
+	const brew = homePageId ? await getBrewFromId(homePageId, 'share') : { text: welcomeText } ;
+	// const brew = {
+	// 	text : welcomeText
+	// };
+
 	req.brew = brew;
 	return next();
 });

From 6c7eb339f448ffaafbf5e9286438c30d39c90a46 Mon Sep 17 00:00:00 2001
From: "G.Ambatte" <sean@robertson-family.nz>
Date: Sat, 2 Apr 2022 10:11:59 +1300
Subject: [PATCH 2/4] Revert "Initial pass at redirecting / to a landing page"

This reverts commit 468ccd748d33d0d0ceb6dfd615f31b76ca3a4dc0.
---
 client/homebrew/homebrew.jsx |  1 -
 server/app.js                | 19 -------------------
 2 files changed, 20 deletions(-)

diff --git a/client/homebrew/homebrew.jsx b/client/homebrew/homebrew.jsx
index 66dfd4d19..732c06486 100644
--- a/client/homebrew/homebrew.jsx
+++ b/client/homebrew/homebrew.jsx
@@ -52,7 +52,6 @@ const Homebrew = createClass({
 						<Route path='/user/:username' component={(routeProps)=><UserPage username={routeProps.match.params.username} brews={this.props.brews} query={queryString.parse(routeProps.location.search)}/>}/>
 						<Route path='/print/:id' component={(routeProps)=><PrintPage brew={this.props.brew} query={queryString.parse(routeProps.location.search)} />}/>
 						<Route path='/print' exact component={(routeProps)=><PrintPage query={queryString.parse(routeProps.location.search)} />}/>
-						<Route path='/home' component={()=><SharePage brew={this.props.brew} />}/>
 						<Route path='/changelog' exact component={()=><SharePage brew={this.props.brew} />}/>
 						<Route path='/faq' exact component={()=><SharePage brew={this.props.brew} />}/>
 						<Route path='/v3_preview' exact component={()=><HomePage brew={this.props.brew} />}/>
diff --git a/server/app.js b/server/app.js
index 56b63235a..de51c8882 100644
--- a/server/app.js
+++ b/server/app.js
@@ -109,28 +109,9 @@ app.get('/robots.txt', (req, res)=>{
 
 //Home page
 app.get('/', async (req, res, next)=>{
-	const homePageId = config.get('homePage');
-	if(homePageId){
-		return res.redirect('/home');
-	}
-	// const brew = homePageId ? await getBrewFromId(homePageId, 'share') : { text: welcomeText } ;
-
 	const brew = {
 		text : welcomeText
 	};
-
-	req.brew = brew;
-	return next();
-});
-
-app.get('/home', async (req, res, next)=>{
-	const homePageId = config.get('homePage');
-
-	const brew = homePageId ? await getBrewFromId(homePageId, 'share') : { text: welcomeText } ;
-	// const brew = {
-	// 	text : welcomeText
-	// };
-
 	req.brew = brew;
 	return next();
 });

From 3ad6f1d79428122a0e0f8c1c4691e090498fbc93 Mon Sep 17 00:00:00 2001
From: "G.Ambatte" <sean@robertson-family.nz>
Date: Wed, 13 Apr 2022 17:19:45 +1200
Subject: [PATCH 3/4] Switch from nullish coalescing operator to ternary
 operator to correct unexpected behaviour Change meta type from website to
 article based on feedback

---
 client/template.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/template.js b/client/template.js
index d7ef107fa..fd8bc22b6 100644
--- a/client/template.js
+++ b/client/template.js
@@ -11,10 +11,10 @@ module.exports = async(name, title = '', props = {})=>{
 		<link rel="icon" href="/assets/homebrew/favicon.ico" type="image/x-icon" />
 		<meta property="og:title" content="${props.brew?.title ?? 'Homebrewery - Untitled Brew'}">
 		<meta property="og:url" content="${HOMEBREWERY_PUBLIC_URL}/${props.brew?.shareId ? `share/${props.brew.shareId}` : ''}">
-		<meta property="og:image" content="${props.brew?.thumbnail ?? `${HOMEBREWERY_PUBLIC_URL}/thumbnail.png`}">
-		<meta property="og:description" content="${props.brew?.description ?? 'No description.'}">
+		<meta property="og:image" content="${props.brew?.thumbnail ? props.brew?.thumbnail : `${HOMEBREWERY_PUBLIC_URL}/thumbnail.png`}">
+		<meta property="og:description" content="${props.brew?.description ? props.brew?.description : 'No description.'}">
 		<meta property="og:site_name" content="The Homebrewery - Make your Homebrew content look legit!">
-		<meta property="og:type" content="website">
+		<meta property="og:type" content="article">
 		<meta name="twitter:card" content="summary_large_image">
 		<title>${title.length ? `${title} - The Homebrewery`: 'The Homebrewery - NaturalCrit'}</title>
 	</head>

From 0fb0f4b6b0e7389af0909dcc5ceb91ece810b095 Mon Sep 17 00:00:00 2001
From: "G.Ambatte" <sean@robertson-family.nz>
Date: Thu, 14 Apr 2022 13:58:51 +1200
Subject: [PATCH 4/4] Shift to logical OR operator

---
 client/template.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/template.js b/client/template.js
index fd8bc22b6..e3b144ae4 100644
--- a/client/template.js
+++ b/client/template.js
@@ -9,10 +9,10 @@ module.exports = async(name, title = '', props = {})=>{
 		<link href="//fonts.googleapis.com/css?family=Open+Sans:400,300,600,700" rel="stylesheet" type="text/css" />
 		<link href=${`/${name}/bundle.css`} rel='stylesheet' />
 		<link rel="icon" href="/assets/homebrew/favicon.ico" type="image/x-icon" />
-		<meta property="og:title" content="${props.brew?.title ?? 'Homebrewery - Untitled Brew'}">
+		<meta property="og:title" content="${props.brew?.title || 'Homebrewery - Untitled Brew'}">
 		<meta property="og:url" content="${HOMEBREWERY_PUBLIC_URL}/${props.brew?.shareId ? `share/${props.brew.shareId}` : ''}">
-		<meta property="og:image" content="${props.brew?.thumbnail ? props.brew?.thumbnail : `${HOMEBREWERY_PUBLIC_URL}/thumbnail.png`}">
-		<meta property="og:description" content="${props.brew?.description ? props.brew?.description : 'No description.'}">
+		<meta property="og:image" content="${props.brew?.thumbnail || `${HOMEBREWERY_PUBLIC_URL}/thumbnail.png`}">
+		<meta property="og:description" content="${props.brew?.description || 'No description.'}">
 		<meta property="og:site_name" content="The Homebrewery - Make your Homebrew content look legit!">
 		<meta property="og:type" content="article">
 		<meta name="twitter:card" content="summary_large_image">