Merge pull request #1802 from naturalcrit/revert-1777-experimentalAddMetadata-#820

Revert "Add `<meta>` tags to template"
2025-12-24 20:42:43 +00:00 · 2021-11-03 22:09:28 -04:00
parent 3a4cf4f2dd f4529594a2
commit 34bc242b76
6 changed files with 8 additions and 81 deletions
--- a/client/homebrew/editor/metadataEditor/metadataEditor.jsx
+++ b/client/homebrew/editor/metadataEditor/metadataEditor.jsx
@@ -7,8 +7,6 @@ const request = require('superagent');

 const SYSTEMS = ['5e', '4e', '3.5e', 'Pathfinder'];

-const homebreweryThumbnail = require('../../thumbnail.png');
-
 const MetadataEditor = createClass({
 	getDefaultProps : function() {
 		return {
@@ -20,19 +18,12 @@ const MetadataEditor = createClass({
 				published   : false,
 				authors     : [],
 				systems     : [],
-				renderer    : 'legacy',
-				thumbnail   : ''
+				renderer    : 'legacy'
 			},
 			onChange : ()=>{}
 		};
 	},

-	getInitialState : function(){
-		return {
-			showThumbnail : true
-		};
-	},
-
 	handleFieldChange : function(name, e){
 		this.props.onChange(_.merge({}, this.props.metadata, {
 			[name] : e.target.value
@@ -74,17 +65,6 @@ 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(){
 		return _.map(SYSTEMS, (val)=>{
 			return <label key={val}>
@@ -181,19 +161,6 @@ const MetadataEditor = createClass({
 				<textarea value={this.props.metadata.description} className='value'
 					onChange={(e)=>this.handleFieldChange('description', e)} />
 			</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'>
 				<label>tags</label>
--- a/client/homebrew/editor/metadataEditor/metadataEditor.less
+++ b/client/homebrew/editor/metadataEditor/metadataEditor.less
@@ -24,33 +24,6 @@
 			flex           : 1 1 auto;
 			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{
 		resize      : none;
@@ -105,7 +78,7 @@
 		}
 	}
 	.authors.field .value{
-		font-size   : 0.8em;
-		line-height : 1.5em;
+		font-size: 0.8em;
+		line-height    : 1.5em;
 	}
 }
--- a/client/homebrew/thumbnail.png
+++ b/client/homebrew/thumbnail.png
--- a/client/template.js
+++ b/client/template.js
@@ -1,5 +1,4 @@
 module.exports = async(name, title = '', props = {})=>{
-	const HOMEBREWERY_PUBLIC_URL=(process.env.NODE_ENV == 'local' ? 'localhost:8000' : 'https://homebrewery.naturalcrit.com');
 	return `
 <!DOCTYPE html>
 <html>
@@ -8,12 +7,6 @@ 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=${`/${name}/bundle.css`} rel='stylesheet' />
 		<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>
 	</head>
 	<body>
--- a/server/googleActions.js
+++ b/server/googleActions.js
@@ -127,8 +127,7 @@ GoogleActions = {
 				tags        : '',
 				published   : file.properties.published ? file.properties.published == 'true' : false,
 				authors     : [req.account.username],	//TODO: properly save and load authors to google drive
-				systems     : [],
-				thumbnail   : file.properties.thumbnail
+				systems     : []
 			};
 		});
 	  return brews;
@@ -165,8 +164,7 @@ GoogleActions = {
 						renderer  : brew.renderer,
 						tags      : brew.tags,
 						pageCount : brew.pageCount,
-						systems   : brew.systems.join(),
-						thumbnail : brew.thumbnail
+						systems   : brew.systems.join()
 					}
 				},
 				media : {
@@ -205,8 +203,7 @@ GoogleActions = {
 				'title'     : brew.title,
 				'views'     : '0',
 				'pageCount' : brew.pageCount,
-				'renderer'  : brew.renderer || 'legacy',
-				'thumbnail' : brew.thumbnail
+				'renderer'  : brew.renderer || 'legacy'
 			}
 		};

@@ -249,8 +246,7 @@ GoogleActions = {
 			published   : brew.published,
 			renderer    : brew.renderer,
 			authors     : [],
-			systems     : [],
-			thumbnail   : brew.thumbnail
+			systems     : []
 		};

 		return newHomebrew;
@@ -262,7 +258,7 @@ GoogleActions = {

 		const obj = await drive.files.get({
 			fileId : id,
-			fields : 'properties, createdTime, modifiedTime, description, trashed, thumbnail'
+			fields : 'properties, createdTime, modifiedTime, description, trashed'
 		})
 		.catch((err)=>{
 			console.log('Error loading from Google');
@@ -318,7 +314,6 @@ GoogleActions = {
 				views      : parseInt(obj.data.properties.views) || 0, //brews with no view parameter will return undefined
 				version    : parseInt(obj.data.properties.version) || 0,
 				renderer   : obj.data.properties.renderer ? obj.data.properties.renderer : 'legacy',
-				thumbnail  : obj.data.properties.thumbnail ? obj.data.properties.thumbnail : '',

 				gDrive   : true,
 				googleId : id
--- a/server/homebrew.model.js
+++ b/server/homebrew.model.js
@@ -17,7 +17,6 @@ const HomebrewSchema = mongoose.Schema({
 	renderer    : { type: String, default: '' },
 	authors     : [String],
 	published   : { type: Boolean, default: false },
-	thumbnail   : { type: String, default: '' },

 	createdAt  : { type: Date, default: Date.now },
 	updatedAt  : { type: Date, default: Date.now },