f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-08 11:52:44 +00:00
Code Wiki Activity

Merge pull request #2969 from G-Ambatte/addGoogleFileLink

Browse Source 
Add Google file link to UserPage BrewItem
This commit is contained in:
Trevor Buckner
2023-08-10 17:19:18 -04:00
committed by GitHub
parent 64ce9ecfa6 54f8bb4b08
commit bac537244c
4 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx
View File

@@ -7,6 +7,7 @@ const moment = require('moment');
const request = require('../../../../utils/request-middleware.js'); const request = require('../../../../utils/request-middleware.js');
const googleDriveIcon = require('../../../../googleDrive.svg'); const googleDriveIcon = require('../../../../googleDrive.svg');
const homebreweryIcon = require('../../../../thumbnail.png');
const dedent = require('dedent-tabs').default; const dedent = require('dedent-tabs').default;
const BrewItem = createClass({ const BrewItem = createClass({
@@ -90,11 +91,17 @@ const BrewItem = createClass({
</a>; </a>;
}, },
renderGoogleDriveIcon : function(){ renderStorageIcon : function(){
if(!this.props.brew.googleId) return; if(this.props.brew.googleId) {
return <span title={this.props.brew.webViewLink ? 'Your Google Drive Storage': 'Another User\'s Google Drive Storage'}>
<a href={this.props.brew.webViewLink} target='_blank'>
<img className='googleDriveIcon' src={googleDriveIcon} alt='googleDriveIcon' />
</a>
</span>;
}
return <span> return <span title='Homebrewery Storage'>
<img className='googleDriveIcon' src={googleDriveIcon} alt='googleDriveIcon' /> <img className='homebreweryIcon' src={homebreweryIcon} alt='homebreweryIcon' />
</span>; </span>;
}, },
@@ -144,7 +151,7 @@ const BrewItem = createClass({
Last updated: ${moment(brew.updatedAt).local().format(dateFormatString)}`}> Last updated: ${moment(brew.updatedAt).local().format(dateFormatString)}`}>
<i className='fas fa-sync-alt' /> {moment(brew.updatedAt).fromNow()} <i className='fas fa-sync-alt' /> {moment(brew.updatedAt).fromNow()}
</span> </span>
{this.renderGoogleDriveIcon()} {this.renderStorageIcon()}
</div> </div>
<div className='links'> <div className='links'>

7
client/homebrew/pages/basePages/listPage/brewItem/brewItem.less
View File

@@ -98,4 +98,11 @@
padding : 0px; padding : 0px;
margin : -5px; margin : -5px;
} }
.homebreweryIcon {
mix-blend-mode : darken;
height : 24px;
position : relative;
top : 5px;
left : -5px;
}
} }

1
server/app.js
View File

@@ -257,6 +257,7 @@ app.get('/user/:username', async (req, res, next)=>{
brew.pageCount = googleBrews[match].pageCount; brew.pageCount = googleBrews[match].pageCount;
brew.renderer = googleBrews[match].renderer; brew.renderer = googleBrews[match].renderer;
brew.version = googleBrews[match].version; brew.version = googleBrews[match].version;
brew.webViewLink = googleBrews[match].webViewLink;
googleBrews.splice(match, 1); googleBrews.splice(match, 1);
} }
} }

5
server/googleActions.js
View File

@@ -106,7 +106,7 @@ const GoogleActions = {
const obj = await drive.files.list({ const obj = await drive.files.list({
pageSize : 1000, pageSize : 1000,
pageToken : NextPageToken || '', 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' q : 'mimeType != \'application/vnd.google-apps.folder\' and trashed = false'
}) })
.catch((err)=>{ .catch((err)=>{
@@ -139,7 +139,8 @@ const GoogleActions = {
published : file.properties.published ? file.properties.published == 'true' : false, published : file.properties.published ? file.properties.published == 'true' : false,
systems : [], systems : [],
lang : file.properties.lang, lang : file.properties.lang,
thumbnail : file.properties.thumbnail thumbnail : file.properties.thumbnail,
webViewLink : file.webViewLink
}; };
}); });
return brews; return brews;