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

Merge pull request #2130 from G-Ambatte/userPublicUrlForLinkGen-#2128

Browse Source 
User public url for link gen #2128
This commit is contained in:
Trevor Buckner
2022-04-13 23:56:26 -04:00
committed by GitHub
parent 2bc3aaf796 b2bcc9ef95
commit e86c24943f
3 changed files with 4 additions and 4 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'>

2
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>

2
server/app.js
View File

@@ -281,11 +281,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,