f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2025-12-24 20:42:43 +00:00
Code Wiki Activity

(WIP) Unwinding refactoring to improve clarity and readability of new functions

Browse Source
This commit is contained in:
G.Ambatte
2021-01-22 16:44:34 +13:00
parent 4073536d96
commit da32845dd1
2 changed files with 71 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
client/homebrew/pages/userPage/brewItem/brewItem.jsx
View File

@@ -65,7 +65,7 @@ const BrewItem = createClass({
</a>;
},
renderSourceLink : function(path, icon){
renderSourceLink : function(){
if(!this.props.brew.shareId) return;
let shareLink = this.props.brew.shareId;
@@ -73,8 +73,21 @@ const BrewItem = createClass({
shareLink = this.props.brew.googleId + shareLink;
}
return <a href={`/${path}/${shareLink}`} target=`${(path != 'download') ? '_blank' : ''}` rel=`${(path != 'download') ? 'noopener noreferrer') ? '_blank' : ''}`>
<i className={`fa ${icon}`} />
return <a href={`/share/${shareLink}`} target='_blank' rel='noopener noreferrer'>
<i className={'fa fa-share-alt' />
</a>;
},
renderDownloadLink : function(){
if(!this.props.brew.shareId) return;
let shareLink = this.props.brew.shareId;
if(this.props.brew.googleId) {
shareLink = this.props.brew.googleId + shareLink;
}
return <a href={`/download/${shareLink}`}>
<i className={'fa fa-download' />
</a>;
},
@@ -107,9 +120,9 @@ const BrewItem = createClass({
</div>
<div className='links'>
{this.renderSourceLink('share', 'fa-share-alt')}
{this.renderShareLink()}
{this.renderEditLink()}
{this.renderSourceLink('download', 'fa-download')}
{this.renderDownloadLink()}
{this.renderDeleteBrewLink()}
</div>
</div>;

100
server.js
View File

@@ -71,14 +71,21 @@ app.get('/robots.txt', (req, res)=>{
return res.sendFile(`${__dirname}/robots.txt`);
});
const shareFunction = function(req, res, type) {
//Source page
app.get('/source/:id', (req, res)=>{
if(req.params.id.length > 12) {
const googleId = req.params.id.slice(0, -12);
const shareId = req.params.id.slice(-12);
GoogleActions.readFileMetadata(config.get('google_api_key'), googleId, shareId, 'share')
.then((brew)=>{
setSourceHeaders(res, brew.title, type);
res.send(getSourceText(brew.text, type));
.then((brew)=>{
const replaceStrings = { '&': '&amp;', '<': '&lt;', '>': '&gt;' };
const text = brew.text;
for (const replaceStr in replaceStrings) {
text = text.replaceAll(replaceStr, replaceStrings[replaceStr]);
}
text = `<code><pre style="white-space: pre-wrap;">${text}</pre></code>`;
res.status(200).send(text);
})
.catch((err)=>{
console.log(err);
@@ -86,54 +93,53 @@ const shareFunction = function(req, res, type) {
});
} else {
HomebrewModel.get({ shareId: req.params.id })
.then((brew)=>{
setSourceHeaders(res, brew.title, type);
res.send(getSourceText(brew.text, type));
})
.catch((err)=>{
console.log(err);
return res.status(404).send('Could not find Homebrew with that id');
});
}
};
const setSourceHeaders = function (res, title, type) {
res.status(200);
if(type == 'download') {
const fileName = sanitizeFilename(title).replaceAll(' ', '-');
res.set({
'Cache-Control' : 'no-cache',
'Content-Type' : 'text/plain',
'Content-Disposition' : `attachment; filename="HomeBrewery-${fileName}.txt"`
.then((brew)=>{
const replaceStrings = { '&': '&amp;', '<': '&lt;', '>': '&gt;' };
const text = brew.text;
for (const replaceStr in replaceStrings) {
text = text.replaceAll(replaceStr, replaceStrings[replaceStr]);
}
text = `<code><pre style="white-space: pre-wrap;">${text}</pre></code>`;
res.status(200).send(text);
})
.catch((err)=>{
console.log(err);
return res.status(404).send('Could not find Homebrew with that id');
});
}
};
const getSourceText = function (brewText, type) {
if(type == 'source') {
const replaceStrings = { '&': '&amp;', '<': '&lt;', '>': '&gt;' };
const text = brewText;
for (const replaceStr in replaceStrings) {
text = text.replaceAll(replaceStr, replaceStrings[replaceStr]);
}
return `<code><pre style="white-space: pre-wrap;">${text}</pre></code>`;
} else if(type == 'download') {
return brewText;
} else {
console.log('Unhandled source share type');
return;
}
};
//Source page
app.get('/source/:id', (req, res)=>{
return shareFunction(req, res, 'source');
});
//Source download page
//Download brew source page
app.get('/download/:id', (req, res)=>{
return shareFunction(req, res, 'download');
if(req.params.id.length > 12) {
const googleId = req.params.id.slice(0, -12);
const shareId = req.params.id.slice(-12);
GoogleActions.readFileMetadata(config.get('google_api_key'), googleId, shareId, 'share')
.then((brew)=>{
const fileName = sanitizeFilename(title).replaceAll(' ', '-');
if (!fileName || !fileName.length) { fileName = 'Untitled-Brew'; };
res.set({
'Cache-Control' : 'no-cache',
'Content-Type' : 'text/plain',
'Content-Disposition' : `attachment; filename="HomeBrewery-${fileName}.txt"`
});
res.status(200).send(getSourceText(brew.text, type));
})
.catch((err)=>{
console.log(err);
return res.status(400).send('Can\'t get brew from Google');
});
} else {
HomebrewModel.get({ shareId: req.params.id })
.then((brew)=>{
setSourceHeaders(res, brew.title, type);
res.send(getSourceText(brew.text, type));
})
.catch((err)=>{
console.log(err);
return res.status(404).send('Could not find Homebrew with that id');
});
}
});
//User Page