From 468ccd748d33d0d0ceb6dfd615f31b76ca3a4dc0 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sat, 2 Apr 2022 10:10:40 +1300 Subject: [PATCH 1/8] 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({ }/> }/> }/> + }/> }/> }/> }/> 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" Date: Sat, 2 Apr 2022 10:11:59 +1300 Subject: [PATCH 2/8] 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({ }/> }/> }/> - }/> }/> }/> }/> 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" Date: Wed, 13 Apr 2022 17:19:45 +1200 Subject: [PATCH 3/8] 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 = {})=>{ - - + + - + ${title.length ? `${title} - The Homebrewery`: 'The Homebrewery - NaturalCrit'} From 0e25793f0ae0536440de00f0dcb87a0b8b68160c Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Wed, 13 Apr 2022 19:35:51 +1200 Subject: [PATCH 4/8] Add publicUrl to global.config & update template --- client/template.js | 2 +- server/app.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/template.js b/client/template.js index fd8bc22b6..b9f76fdde 100644 --- a/client/template.js +++ b/client/template.js @@ -1,5 +1,5 @@ module.exports = async(name, title = '', props = {})=>{ - const HOMEBREWERY_PUBLIC_URL=props.publicUrl; + const HOMEBREWERY_PUBLIC_URL=props.config.publicUrl; return ` diff --git a/server/app.js b/server/app.js index 381113a4a..adb741b32 100644 --- a/server/app.js +++ b/server/app.js @@ -281,11 +281,11 @@ app.use((req, res)=>{ // Create configuration object const configuration = { local : isLocalEnvironment, + publicUrl : config.get('publicUrl') ?? '', environment : nodeEnv }; const props = { version : require('./../package.json').version, - publicUrl : config.get('publicUrl') ?? '', url : req.originalUrl, brew : req.brew, brews : req.brews, From a73b3648ae665cf75d4e8bc9ea5790dfb0c9bf69 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Wed, 13 Apr 2022 19:40:33 +1200 Subject: [PATCH 5/8] Update editPage links to use publicUrl --- client/homebrew/pages/editPage/editPage.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx index a77321e6f..a0a262038 100644 --- a/client/homebrew/pages/editPage/editPage.jsx +++ b/client/homebrew/pages/editPage/editPage.jsx @@ -352,7 +352,7 @@ const EditPage = createClass({ const title = `${this.props.brew.title} ${systems}`; const text = `Hey guys! I've been working on this homebrew. I'd love your feedback. Check it out. -**[Homebrewery Link](https://homebrewery.naturalcrit.com/share/${shareLink})**`; +**[Homebrewery Link](${global.config.publicUrl}/share/${shareLink})**`; return `https://www.reddit.com/r/UnearthedArcana/submit?title=${encodeURIComponent(title)}&text=${encodeURIComponent(text)}`; }, @@ -387,7 +387,7 @@ const EditPage = createClass({ view - {navigator.clipboard.writeText(`https://homebrewery.naturalcrit.com/share/${shareLink}`);}}> + {navigator.clipboard.writeText(`${global.config.publicUrl}/share/${shareLink}`);}}> copy url From 0fb0f4b6b0e7389af0909dcc5ceb91ece810b095 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Thu, 14 Apr 2022 13:58:51 +1200 Subject: [PATCH 6/8] 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 = {})=>{ - + - - + + From b2bcc9ef95352a121aa2111afaa533e3f89f5098 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Thu, 14 Apr 2022 13:58:51 +1200 Subject: [PATCH 7/8] Shift to logical OR operator (cherry picked from commit 0fb0f4b6b0e7389af0909dcc5ceb91ece810b095) --- client/template.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/template.js b/client/template.js index b9f76fdde..482e49c25 100644 --- a/client/template.js +++ b/client/template.js @@ -9,10 +9,10 @@ module.exports = async(name, title = '', props = {})=>{ - + - - + + From 56d3d38cada912df4266b394ae5de8baed6b2adc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Apr 2022 03:01:21 +0000 Subject: [PATCH 8/8] Bump mongoose from 6.2.10 to 6.2.11 Bumps [mongoose](https://github.com/Automattic/mongoose) from 6.2.10 to 6.2.11. - [Release notes](https://github.com/Automattic/mongoose/releases) - [Changelog](https://github.com/Automattic/mongoose/blob/master/CHANGELOG.md) - [Commits](https://github.com/Automattic/mongoose/compare/6.2.10...6.2.11) --- updated-dependencies: - dependency-name: mongoose dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 802ac42c1..8b28635ed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,7 +32,7 @@ "marked-extended-tables": "^1.0.3", "markedLegacy": "npm:marked@^0.3.19", "moment": "^2.29.2", - "mongoose": "^6.2.10", + "mongoose": "^6.2.11", "nanoid": "3.3.2", "nconf": "^0.11.4", "query-string": "7.1.1", @@ -9404,9 +9404,9 @@ } }, "node_modules/mongoose": { - "version": "6.2.10", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.2.10.tgz", - "integrity": "sha512-Yp+6UH5M0AlxAVGdC2/Deq0St+2qW73oKCnhJDr83bOZ12eflTLTT5uQF0p6KzvtFj86XWbq/7ApvO4yW6h1sA==", + "version": "6.2.11", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.2.11.tgz", + "integrity": "sha512-YqYAFTOqKthsFduM1IZCArIAwScFJKWoE3pEwmnR7UMw9mynEnOc6c4gBvAon+NtPdB0RAP6ppd3aOvLrVth2g==", "dependencies": { "bson": "^4.2.2", "kareem": "2.3.5", @@ -20354,9 +20354,9 @@ } }, "mongoose": { - "version": "6.2.10", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.2.10.tgz", - "integrity": "sha512-Yp+6UH5M0AlxAVGdC2/Deq0St+2qW73oKCnhJDr83bOZ12eflTLTT5uQF0p6KzvtFj86XWbq/7ApvO4yW6h1sA==", + "version": "6.2.11", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.2.11.tgz", + "integrity": "sha512-YqYAFTOqKthsFduM1IZCArIAwScFJKWoE3pEwmnR7UMw9mynEnOc6c4gBvAon+NtPdB0RAP6ppd3aOvLrVth2g==", "requires": { "bson": "^4.2.2", "kareem": "2.3.5", diff --git a/package.json b/package.json index 504ef46b4..f50e4541a 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "marked-extended-tables": "^1.0.3", "markedLegacy": "npm:marked@^0.3.19", "moment": "^2.29.2", - "mongoose": "^6.2.10", + "mongoose": "^6.2.11", "nanoid": "3.3.2", "nconf": "^0.11.4", "query-string": "7.1.1",