diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx index ee9d6f03a..654806886 100644 --- a/client/homebrew/brewRenderer/brewRenderer.jsx +++ b/client/homebrew/brewRenderer/brewRenderer.jsx @@ -109,7 +109,12 @@ const BrewRenderer = createClass({ renderPageInfo : function(){ return
- {this.state.viewablePageNumber + 1} / {this.state.pages.length} +
+ {this.props.renderer} +
+
+ {this.state.viewablePageNumber + 1} / {this.state.pages.length} +
; }, diff --git a/client/homebrew/brewRenderer/brewRenderer.less b/client/homebrew/brewRenderer/brewRenderer.less index abb80fc5f..bde91c92e 100644 --- a/client/homebrew/brewRenderer/brewRenderer.less +++ b/client/homebrew/brewRenderer/brewRenderer.less @@ -21,11 +21,17 @@ right : 17px; bottom : 0; z-index : 1000; - padding : 8px 10px; background-color : #333; font-size : 10px; font-weight : 800; color : white; + div { + display: inline-block; + padding : 8px 10px; + &:not(:last-child){ + border-right: 1px solid #666; + } + } } .ppr_msg{ position : absolute; diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx index 79a4f7d0f..395d22b6f 100644 --- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx +++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx @@ -96,11 +96,15 @@ const BrewItem = createClass({ render : function(){ const brew = this.props.brew; if(Array.isArray(brew.tags)) { // temporary fix until dud tags are cleaned - brew.tags = brew.tags?.filter(tag => tag); //remove tags that are empty strings + brew.tags = brew.tags?.filter((tag)=>tag); //remove tags that are empty strings } const dateFormatString = 'YYYY-MM-DD HH:mm:ss'; return
+ {brew.thumbnail && +
+
+ }

{brew.title}

{brew.description}

@@ -112,7 +116,7 @@ const BrewItem = createClass({
{brew.tags.map((tag, idx)=>{ - let matches = tag.match(/^(?:([^:]+):)?([^:]+)$/); + const matches = tag.match(/^(?:([^:]+):)?([^:]+)$/); return {matches[2]}; })}
diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less index 5ee7758b5..42e0fd07e 100644 --- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less +++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less @@ -10,7 +10,7 @@ min-height : 105px; margin-right : 15px; margin-bottom : 15px; - padding : 5px 15px 2px 8px; + padding : 5px 15px 2px 6px; padding-right : 15px; border : 1px solid #c9ad6a; border-radius : 5px; @@ -19,6 +19,20 @@ break-inside : avoid; box-shadow : 0px 4px 5px 0px #333; background-color : #cab2802e; + .thumbnail { + position: absolute; + width: 150px; + height: 100%; + top: 0; + right: 0; + z-index: -1; + background-size: contain; + background-repeat: no-repeat; + background-position: right top; + mask-image: linear-gradient(80deg, #0000 20%, #050 40%); + -webkit-mask-image: linear-gradient(80deg, #0000 20%, #050 40%); + opacity: 50%; + } .text { min-height : 54px; h4{ diff --git a/server/app.js b/server/app.js index 98e2c778c..a3f66bb2c 100644 --- a/server/app.js +++ b/server/app.js @@ -180,6 +180,7 @@ app.get('/user/:username', async (req, res, next)=>{ 'createdAt', 'updatedAt', 'lastViewed', + 'thumbnail', 'tags' ];