From 1fb3ec405748b0ca10713ceff4afd0e24e85749d Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sun, 4 Sep 2022 00:18:08 +1200 Subject: [PATCH 1/9] Add thumbnail to UserPage data --- server/app.js | 1 + 1 file changed, 1 insertion(+) diff --git a/server/app.js b/server/app.js index cbbc3e3fe..27326caf4 100644 --- a/server/app.js +++ b/server/app.js @@ -179,6 +179,7 @@ app.get('/user/:username', async (req, res, next)=>{ 'createdAt', 'updatedAt', 'lastViewed', + 'thumbnail', 'tags' ]; From 0f1c585567e3dde8ff71b0980197965766800d2c Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sun, 4 Sep 2022 00:19:05 +1200 Subject: [PATCH 2/9] Add thumbnail functionality to BrewItem --- .../homebrew/pages/basePages/listPage/brewItem/brewItem.jsx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx index fc69466f1..f81066d8f 100644 --- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx +++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx @@ -98,6 +98,12 @@ const BrewItem = createClass({ const dateFormatString = 'YYYY-MM-DD HH:mm:ss'; return
+ {brew.thumbnail ? +
+ +
: + <> + }

{brew.title}

{brew.description}

From 3975c74b2bcdba17cf92d8ccd169356dd030d6f7 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sun, 4 Sep 2022 00:19:26 +1200 Subject: [PATCH 3/9] Add thumbnail styling to BrewItem.less --- .../basePages/listPage/brewItem/brewItem.less | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less index 762a0b8d5..40799c1d5 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 { + width: 80px; + height: 100px; + border: 2px solid #58180D; + border-radius: 8px; + float: left; + margin-right: 5px; + display: flex; + img.thumbnailImage { + max-width: 100%; + max-height: 100%; + margin: auto; + } + } .text { min-height : 54px; h4{ From 4a89d73f731006490e03f461a3de766ad4d432a0 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sun, 4 Sep 2022 16:44:18 +1200 Subject: [PATCH 4/9] Update brewItem.less Co-authored-by: Trevor Buckner --- .../pages/basePages/listPage/brewItem/brewItem.less | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less index 40799c1d5..8746c61d3 100644 --- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less +++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less @@ -28,9 +28,10 @@ margin-right: 5px; display: flex; img.thumbnailImage { - max-width: 100%; - max-height: 100%; - margin: auto; + width : 100%; + height : 100%; + object-fit : cover; + border-radius : inherit; } } .text { From a179f8d124dcc7e5be114546606cf04ac05ccb6c Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Wed, 21 Sep 2022 18:16:36 +1200 Subject: [PATCH 5/9] Lint fix --- .../homebrew/pages/basePages/listPage/brewItem/brewItem.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx index 40179b617..d34df5a3b 100644 --- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx +++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx @@ -96,7 +96,7 @@ 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'; @@ -118,7 +118,7 @@ const BrewItem = createClass({
{brew.tags.map((tag, idx)=>{ - let matches = tag.match(/^(?:([^:]+):)?([^:]+)$/); + const matches = tag.match(/^(?:([^:]+):)?([^:]+)$/); return {matches[2]}; })}
From f218f48f0f9b7030aec6f5811c58efae097b519c Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Wed, 21 Sep 2022 18:38:45 +1200 Subject: [PATCH 6/9] Apply Gazook89's thumbnail style --- .../basePages/listPage/brewItem/brewItem.jsx | 3 +-- .../basePages/listPage/brewItem/brewItem.less | 23 ++++++++----------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx index d34df5a3b..196fd27c6 100644 --- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx +++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx @@ -102,8 +102,7 @@ const BrewItem = createClass({ return
{brew.thumbnail ? -
- +
: <> } diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less index 7e0e65e19..eecb25997 100644 --- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less +++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less @@ -20,19 +20,16 @@ box-shadow : 0px 4px 5px 0px #333; background-color : #cab2802e; .thumbnail { - width: 80px; - height: 100px; - border: 2px solid #58180D; - border-radius: 8px; - float: left; - margin-right: 5px; - display: flex; - img.thumbnailImage { - width : 100%; - height : 100%; - object-fit : cover; - border-radius : inherit; - } + position: absolute; + width: 150px; + height: 100%; + top: 0; + right: 0; + z-index: -1; + background-size: cover; + 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; From 90a65d0a57d12e42c002294b1d3bf989d1885cf4 Mon Sep 17 00:00:00 2001 From: Gazook89 <58999374+Gazook89@users.noreply.github.com> Date: Wed, 21 Sep 2022 11:37:14 -0500 Subject: [PATCH 7/9] Add renderer to pageInfo --- client/homebrew/brewRenderer/brewRenderer.jsx | 7 ++++++- client/homebrew/brewRenderer/brewRenderer.less | 8 +++++++- 2 files changed, 13 insertions(+), 2 deletions(-) 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; From 09d161f3a67f1d2736c295dfa9c401bcce4e31be Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Thu, 22 Sep 2022 07:48:51 +1200 Subject: [PATCH 8/9] Adjust background image properties --- .../homebrew/pages/basePages/listPage/brewItem/brewItem.less | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less index eecb25997..42e0fd07e 100644 --- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less +++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less @@ -26,7 +26,9 @@ top: 0; right: 0; z-index: -1; - background-size: cover; + 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%; From fa0d8e86fc848fb3cc72a7e36f9eb6b4116abc5d Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Thu, 22 Sep 2022 20:25:18 +1200 Subject: [PATCH 9/9] Remove unnecessary empty element --- .../homebrew/pages/basePages/listPage/brewItem/brewItem.jsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx index 196fd27c6..395d22b6f 100644 --- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx +++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx @@ -101,10 +101,9 @@ const BrewItem = createClass({ const dateFormatString = 'YYYY-MM-DD HH:mm:ss'; return
- {brew.thumbnail ? + {brew.thumbnail &&
-
: - <> +
}

{brew.title}