diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx
index 1863333b3..7de448315 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
diff --git a/client/template.js b/client/template.js
index d7ef107fa..482e49c25 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 `
@@ -9,12 +9,12 @@ module.exports = async(name, title = '', props = {})=>{
-
+
-
-
+
+
-
+
${title.length ? `${title} - The Homebrewery`: 'The Homebrewery - NaturalCrit'}
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",
diff --git a/server/app.js b/server/app.js
index 385068561..eb264bcc9 100644
--- a/server/app.js
+++ b/server/app.js
@@ -265,11 +265,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,