f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-01 23:52:40 +00:00
Code Wiki Activity

Merge branch 'master' into google-document-stubs

Browse Source
This commit is contained in:
Charlie Humphreys
2022-04-15 00:23:51 -05:00
parent 8a5e9aa1f6 784c0ec8f8
commit 2e145e7ff1
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/homebrew/pages/editPage/editPage.jsx
View File

@@ -352,7 +352,7 @@ const EditPage = createClass({
const title = `${this.props.brew.title} ${systems}`; 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. 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)}`; return `https://www.reddit.com/r/UnearthedArcana/submit?title=${encodeURIComponent(title)}&text=${encodeURIComponent(text)}`;
}, },
@@ -387,7 +387,7 @@ const EditPage = createClass({
<Nav.item color='blue' href={`/share/${shareLink}`}> <Nav.item color='blue' href={`/share/${shareLink}`}>
view view
</Nav.item> </Nav.item>
<Nav.item color='blue' onClick={()=>{navigator.clipboard.writeText(`https://homebrewery.naturalcrit.com/share/${shareLink}`);}}> <Nav.item color='blue' onClick={()=>{navigator.clipboard.writeText(`${global.config.publicUrl}/share/${shareLink}`);}}>
copy url copy url
</Nav.item> </Nav.item>
<Nav.item color='blue' href={this.getRedditLink()} newTab={true} rel='noopener noreferrer'> <Nav.item color='blue' href={this.getRedditLink()} newTab={true} rel='noopener noreferrer'>

10
client/template.js
View File

@@ -1,5 +1,5 @@
module.exports = async(name, title = '', props = {})=>{ module.exports = async(name, title = '', props = {})=>{
const HOMEBREWERY_PUBLIC_URL=props.publicUrl; const HOMEBREWERY_PUBLIC_URL=props.config.publicUrl;
return ` return `
<!DOCTYPE html> <!DOCTYPE html>
@@ -9,12 +9,12 @@ 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="//fonts.googleapis.com/css?family=Open+Sans:400,300,600,700" rel="stylesheet" type="text/css" />
<link href=${`/${name}/bundle.css`} rel='stylesheet' /> <link href=${`/${name}/bundle.css`} rel='stylesheet' />
<link rel="icon" href="/assets/homebrew/favicon.ico" type="image/x-icon" /> <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: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:image" content="${props.brew?.thumbnail || `${HOMEBREWERY_PUBLIC_URL}/thumbnail.png`}">
<meta property="og:description" content="${props.brew?.description ?? 'No description.'}"> <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: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"> <meta name="twitter:card" content="summary_large_image">
<title>${title.length ? `${title} - The Homebrewery`: 'The Homebrewery - NaturalCrit'}</title> <title>${title.length ? `${title} - The Homebrewery`: 'The Homebrewery - NaturalCrit'}</title>
</head> </head>

14
package-lock.json generated
View File

@@ -32,7 +32,7 @@
"marked-extended-tables": "^1.0.3", "marked-extended-tables": "^1.0.3",
"markedLegacy": "npm:marked@^0.3.19", "markedLegacy": "npm:marked@^0.3.19",
"moment": "^2.29.2", "moment": "^2.29.2",
"mongoose": "^6.2.10", "mongoose": "^6.2.11",
"nanoid": "3.3.2", "nanoid": "3.3.2",
"nconf": "^0.11.4", "nconf": "^0.11.4",
"query-string": "7.1.1", "query-string": "7.1.1",
@@ -9404,9 +9404,9 @@
} }
}, },
"node_modules/mongoose": { "node_modules/mongoose": {
"version": "6.2.10", "version": "6.2.11",
"resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.2.10.tgz", "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.2.11.tgz",
"integrity": "sha512-Yp+6UH5M0AlxAVGdC2/Deq0St+2qW73oKCnhJDr83bOZ12eflTLTT5uQF0p6KzvtFj86XWbq/7ApvO4yW6h1sA==", "integrity": "sha512-YqYAFTOqKthsFduM1IZCArIAwScFJKWoE3pEwmnR7UMw9mynEnOc6c4gBvAon+NtPdB0RAP6ppd3aOvLrVth2g==",
"dependencies": { "dependencies": {
"bson": "^4.2.2", "bson": "^4.2.2",
"kareem": "2.3.5", "kareem": "2.3.5",
@@ -20354,9 +20354,9 @@
} }
}, },
"mongoose": { "mongoose": {
"version": "6.2.10", "version": "6.2.11",
"resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.2.10.tgz", "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.2.11.tgz",
"integrity": "sha512-Yp+6UH5M0AlxAVGdC2/Deq0St+2qW73oKCnhJDr83bOZ12eflTLTT5uQF0p6KzvtFj86XWbq/7ApvO4yW6h1sA==", "integrity": "sha512-YqYAFTOqKthsFduM1IZCArIAwScFJKWoE3pEwmnR7UMw9mynEnOc6c4gBvAon+NtPdB0RAP6ppd3aOvLrVth2g==",
"requires": { "requires": {
"bson": "^4.2.2", "bson": "^4.2.2",
"kareem": "2.3.5", "kareem": "2.3.5",

2
package.json
View File

@@ -74,7 +74,7 @@
"marked-extended-tables": "^1.0.3", "marked-extended-tables": "^1.0.3",
"markedLegacy": "npm:marked@^0.3.19", "markedLegacy": "npm:marked@^0.3.19",
"moment": "^2.29.2", "moment": "^2.29.2",
"mongoose": "^6.2.10", "mongoose": "^6.2.11",
"nanoid": "3.3.2", "nanoid": "3.3.2",
"nconf": "^0.11.4", "nconf": "^0.11.4",
"query-string": "7.1.1", "query-string": "7.1.1",

2
server/app.js
View File

@@ -265,11 +265,11 @@ app.use((req, res)=>{
// Create configuration object // Create configuration object
const configuration = { const configuration = {
local : isLocalEnvironment, local : isLocalEnvironment,
publicUrl : config.get('publicUrl') ?? '',
environment : nodeEnv environment : nodeEnv
}; };
const props = { const props = {
version : require('./../package.json').version, version : require('./../package.json').version,
publicUrl : config.get('publicUrl') ?? '',
url : req.originalUrl, url : req.originalUrl,
brew : req.brew, brew : req.brew,
brews : req.brews, brews : req.brews,