diff --git a/client/homebrew/editor/metadataEditor/metadataEditor.jsx b/client/homebrew/editor/metadataEditor/metadataEditor.jsx index b84a30080..c7dea871b 100644 --- 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 ; - }, - renderSystems : function(){ return _.map(SYSTEMS, (val)=>{ return @@ -181,19 +161,6 @@ const MetadataEditor = createClass({ this.handleFieldChange('description', e)} /> - - thumbnail - this.handleFieldChange('thumbnail', e)} /> - - - - {this.renderThumbnail()} - - {/*} tags diff --git a/client/homebrew/editor/metadataEditor/metadataEditor.less b/client/homebrew/editor/metadataEditor/metadataEditor.less index cd6c535b3..4a43158d0 100644 --- 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; } } diff --git a/client/homebrew/thumbnail.png b/client/homebrew/thumbnail.png deleted file mode 100644 index 38b6d9699..000000000 Binary files a/client/homebrew/thumbnail.png and /dev/null differ diff --git a/client/template.js b/client/template.js index 0c6e4deae..e2e0893e3 100644 --- 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 ` @@ -8,12 +7,6 @@ module.exports = async(name, title = '', props = {})=>{ - - - - - - ${title.length ? `${title} - The Homebrewery`: 'The Homebrewery - NaturalCrit'} diff --git a/server/googleActions.js b/server/googleActions.js index fd4ca5914..72059cb2d 100644 --- 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 diff --git a/server/homebrew.model.js b/server/homebrew.model.js index be6b2f6cd..acc78a624 100644 --- 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 },