f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2025-12-31 17:22:45 +00:00
Code Wiki Activity

Merge pull request #1777 from G-Ambatte/experimentalAddMetadata-#820

Browse Source 
Add `<meta>` tags to template
This commit is contained in:
Trevor Buckner
2021-11-03 21:59:21 -04:00
committed by GitHub
parent fbcd4036f5 5bc3de1e0a
commit 3a4cf4f2dd
6 changed files with 81 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
client/homebrew/editor/metadataEditor/metadataEditor.jsx
View File

@@ -7,6 +7,8 @@ const request = require('superagent');
const SYSTEMS = ['5e', '4e', '3.5e', 'Pathfinder']; const SYSTEMS = ['5e', '4e', '3.5e', 'Pathfinder'];
const homebreweryThumbnail = require('../../thumbnail.png');
const MetadataEditor = createClass({ const MetadataEditor = createClass({
getDefaultProps : function() { getDefaultProps : function() {
return { return {
@@ -18,12 +20,19 @@ const MetadataEditor = createClass({
published : false, published : false,
authors : [], authors : [],
systems : [], systems : [],
renderer : 'legacy' renderer : 'legacy',
thumbnail : ''
}, },
onChange : ()=>{} onChange : ()=>{}
}; };
}, },
getInitialState : function(){
return {
showThumbnail : true
};
},
handleFieldChange : function(name, e){ handleFieldChange : function(name, e){
this.props.onChange(_.merge({}, this.props.metadata, { this.props.onChange(_.merge({}, this.props.metadata, {
[name] : e.target.value [name] : e.target.value
@@ -65,6 +74,17 @@ const MetadataEditor = createClass({
}); });
}, },
toggleThumbnailDisplay : function(){
this.setState({
showThumbnail : !this.state.showThumbnail
});
},
renderThumbnail : function(){
if(!this.state.showThumbnail) return;
return <img className='thumbnail-preview' src={this.props.metadata.thumbnail || homebreweryThumbnail}></img>;
},
renderSystems : function(){ renderSystems : function(){
return _.map(SYSTEMS, (val)=>{ return _.map(SYSTEMS, (val)=>{
return <label key={val}> return <label key={val}>
@@ -161,6 +181,19 @@ const MetadataEditor = createClass({
<textarea value={this.props.metadata.description} className='value' <textarea value={this.props.metadata.description} className='value'
onChange={(e)=>this.handleFieldChange('description', e)} /> onChange={(e)=>this.handleFieldChange('description', e)} />
</div> </div>
<div className='field thumbnail'>
<label>thumbnail</label>
<input type='text'
value={this.props.metadata.thumbnail}
placeholder='my.thumbnail.url'
className='value'
onChange={(e)=>this.handleFieldChange('thumbnail', e)} />
<button className='display' onClick={this.toggleThumbnailDisplay}>
<i className={`fas fa-caret-${this.state.showThumbnail ? 'right' : 'left'}`} />
</button>
{this.renderThumbnail()}
</div>
{/*} {/*}
<div className='field tags'> <div className='field tags'>
<label>tags</label> <label>tags</label>

31
client/homebrew/editor/metadataEditor/metadataEditor.less
View File

@@ -24,6 +24,33 @@
flex : 1 1 auto; flex : 1 1 auto;
min-width : 200px; min-width : 200px;
} }
&.thumbnail{
height : 1.4em;
label{
line-height: 2.0em;
}
.value{
overflow: hidden;
text-overflow: ellipsis;
}
button{
border: 1px solid #999;
color: white;
padding: 0px 5px;
background-color: black;
&:hover{
background-color: #777;
}
}
.thumbnail-preview{
position : relative;
width : 80px;
height : min-content;
border : 2px solid white;
margin-left : 5px;
max-height : 115px;
}
}
} }
.description.field textarea.value{ .description.field textarea.value{
resize : none; resize : none;
@@ -78,7 +105,7 @@
} }
} }
.authors.field .value{ .authors.field .value{
font-size: 0.8em; font-size : 0.8em;
line-height : 1.5em; line-height : 1.5em;
} }
} }

BIN
client/homebrew/thumbnail.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.9 KiB

7
client/template.js
View File

@@ -1,4 +1,5 @@
module.exports = async(name, title = '', props = {})=>{ module.exports = async(name, title = '', props = {})=>{
const HOMEBREWERY_PUBLIC_URL=(process.env.NODE_ENV == 'local' ? 'localhost:8000' : 'https://homebrewery.naturalcrit.com');
return ` return `
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
@@ -7,6 +8,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 ? 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:site_name" content="The Homebrewery - Make your Homebrew content look legit!">
<meta property="og:type" content="website">
<title>${title.length ? `${title} - The Homebrewery`: 'The Homebrewery - NaturalCrit'}</title> <title>${title.length ? `${title} - The Homebrewery`: 'The Homebrewery - NaturalCrit'}</title>
</head> </head>
<body> <body>

15
server/googleActions.js
View File

@@ -127,7 +127,8 @@ GoogleActions = {
tags : '', tags : '',
published : file.properties.published ? file.properties.published == 'true' : false, published : file.properties.published ? file.properties.published == 'true' : false,
authors : [req.account.username], //TODO: properly save and load authors to google drive authors : [req.account.username], //TODO: properly save and load authors to google drive
systems : [] systems : [],
thumbnail : file.properties.thumbnail
}; };
}); });
return brews; return brews;
@@ -164,7 +165,8 @@ GoogleActions = {
renderer : brew.renderer, renderer : brew.renderer,
tags : brew.tags, tags : brew.tags,
pageCount : brew.pageCount, pageCount : brew.pageCount,
systems : brew.systems.join() systems : brew.systems.join(),
thumbnail : brew.thumbnail
} }
}, },
media : { media : {
@@ -203,7 +205,8 @@ GoogleActions = {
'title' : brew.title, 'title' : brew.title,
'views' : '0', 'views' : '0',
'pageCount' : brew.pageCount, 'pageCount' : brew.pageCount,
'renderer' : brew.renderer || 'legacy' 'renderer' : brew.renderer || 'legacy',
'thumbnail' : brew.thumbnail
} }
}; };
@@ -246,7 +249,8 @@ GoogleActions = {
published : brew.published, published : brew.published,
renderer : brew.renderer, renderer : brew.renderer,
authors : [], authors : [],
systems : [] systems : [],
thumbnail : brew.thumbnail
}; };
return newHomebrew; return newHomebrew;
@@ -258,7 +262,7 @@ GoogleActions = {
const obj = await drive.files.get({ const obj = await drive.files.get({
fileId : id, fileId : id,
fields : 'properties, createdTime, modifiedTime, description, trashed' fields : 'properties, createdTime, modifiedTime, description, trashed, thumbnail'
}) })
.catch((err)=>{ .catch((err)=>{
console.log('Error loading from Google'); console.log('Error loading from Google');
@@ -314,6 +318,7 @@ GoogleActions = {
views : parseInt(obj.data.properties.views) || 0, //brews with no view parameter will return undefined views : parseInt(obj.data.properties.views) || 0, //brews with no view parameter will return undefined
version : parseInt(obj.data.properties.version) || 0, version : parseInt(obj.data.properties.version) || 0,
renderer : obj.data.properties.renderer ? obj.data.properties.renderer : 'legacy', renderer : obj.data.properties.renderer ? obj.data.properties.renderer : 'legacy',
thumbnail : obj.data.properties.thumbnail ? obj.data.properties.thumbnail : '',
gDrive : true, gDrive : true,
googleId : id googleId : id

1
server/homebrew.model.js
View File

@@ -17,6 +17,7 @@ const HomebrewSchema = mongoose.Schema({
renderer : { type: String, default: '' }, renderer : { type: String, default: '' },
authors : [String], authors : [String],
published : { type: Boolean, default: false }, published : { type: Boolean, default: false },
thumbnail : { type: String, default: '' },
createdAt : { type: Date, default: Date.now }, createdAt : { type: Date, default: Date.now },
updatedAt : { type: Date, default: Date.now }, updatedAt : { type: Date, default: Date.now },