From cca882869d1b1ba47b3afa0ecce6aae03be6df8f Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Mon, 7 Aug 2023 22:03:17 +1200 Subject: [PATCH 1/3] Add file link to Google icon on User Page --- .../homebrew/pages/basePages/listPage/brewItem/brewItem.jsx | 4 +++- server/app.js | 1 + server/googleActions.js | 5 +++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx index 99bcc9351..c601760a9 100644 --- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx +++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx @@ -94,7 +94,9 @@ const BrewItem = createClass({ if(!this.props.brew.googleId) return; return - googleDriveIcon + + googleDriveIcon + ; }, diff --git a/server/app.js b/server/app.js index 3db1897dd..520dd154e 100644 --- a/server/app.js +++ b/server/app.js @@ -257,6 +257,7 @@ app.get('/user/:username', async (req, res, next)=>{ brew.pageCount = googleBrews[match].pageCount; brew.renderer = googleBrews[match].renderer; brew.version = googleBrews[match].version; + brew.webViewLink = googleBrews[match].webViewLink; googleBrews.splice(match, 1); } } diff --git a/server/googleActions.js b/server/googleActions.js index 898164db1..a5ff61d62 100644 --- a/server/googleActions.js +++ b/server/googleActions.js @@ -106,7 +106,7 @@ const GoogleActions = { const obj = await drive.files.list({ pageSize : 1000, pageToken : NextPageToken || '', - fields : 'nextPageToken, files(id, name, description, createdTime, modifiedTime, properties)', + fields : 'nextPageToken, files(id, name, description, createdTime, modifiedTime, properties, webViewLink)', q : 'mimeType != \'application/vnd.google-apps.folder\' and trashed = false' }) .catch((err)=>{ @@ -139,7 +139,8 @@ const GoogleActions = { published : file.properties.published ? file.properties.published == 'true' : false, systems : [], lang : file.properties.lang, - thumbnail : file.properties.thumbnail + thumbnail : file.properties.thumbnail, + webViewLink : file.webViewLink }; }); return brews; From d28e85209e61f872017f6c178b78bf44b9900e36 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Mon, 7 Aug 2023 22:03:49 +1200 Subject: [PATCH 2/3] Add HB icon for Mongo brews --- .../pages/basePages/listPage/brewItem/brewItem.jsx | 11 +++++++---- .../pages/basePages/listPage/brewItem/brewItem.less | 7 +++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx index c601760a9..4e6af6cb7 100644 --- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx +++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx @@ -7,6 +7,7 @@ const moment = require('moment'); const request = require('../../../../utils/request-middleware.js'); const googleDriveIcon = require('../../../../googleDrive.svg'); +const homebreweryIcon = require('../../../../thumbnail.png'); const dedent = require('dedent-tabs').default; const BrewItem = createClass({ @@ -90,10 +91,12 @@ const BrewItem = createClass({ ; }, - renderGoogleDriveIcon : function(){ - if(!this.props.brew.googleId) return; + renderStorageIcon : function(){ + if(!this.props.brew.googleId) return + homebreweryIcon + ; - return + return googleDriveIcon @@ -146,7 +149,7 @@ const BrewItem = createClass({ Last updated: ${moment(brew.updatedAt).local().format(dateFormatString)}`}> {moment(brew.updatedAt).fromNow()} - {this.renderGoogleDriveIcon()} + {this.renderStorageIcon()}
diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less index da46eeb01..e8c7aa39a 100644 --- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less +++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less @@ -98,4 +98,11 @@ padding : 0px; margin : -5px; } + .homebreweryIcon { + mix-blend-mode : darken; + height : 24px; + position : relative; + top : 5px; + left : -5px; + } } From 38f6929c1ddb9963d4b8b62610a0916bc5b1ab6b Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Thu, 10 Aug 2023 16:46:45 +1200 Subject: [PATCH 3/3] Reverse StorageIcons logic --- .../basePages/listPage/brewItem/brewItem.jsx | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx index 4e6af6cb7..56c08e2af 100644 --- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx +++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx @@ -92,14 +92,16 @@ const BrewItem = createClass({ }, renderStorageIcon : function(){ - if(!this.props.brew.googleId) return - homebreweryIcon - ; + if(this.props.brew.googleId) { + return + + googleDriveIcon + + ; + } - return - - googleDriveIcon - + return + homebreweryIcon ; },