f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-03 12:42:41 +00:00
Code Wiki Activity

Merge branch 'master' into addEditorThemes-#362

Browse Source
This commit is contained in:
G.Ambatte
2023-09-07 18:22:17 +12:00
committed by GitHub
parent e909bc8f35 bb66cffa13
commit 2b0bbfc2db
5 changed files with 439 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/homebrew/pages/basePages/listPage/listPage.jsx
View File

@@ -89,7 +89,7 @@ const ListPage = createClass({
sortBrewOrder : function(brew){ sortBrewOrder : function(brew){
if(!brew.title){brew.title = 'No Title';} if(!brew.title){brew.title = 'No Title';}
const mapping = { const mapping = {
'alpha' : _.deburr(brew.title.toLowerCase()), 'alpha' : _.deburr(brew.title.trim().toLowerCase()),
'created' : moment(brew.createdAt).format(), 'created' : moment(brew.createdAt).format(),
'updated' : moment(brew.updatedAt).format(), 'updated' : moment(brew.updatedAt).format(),
'views' : brew.views, 'views' : brew.views,

666
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@@ -106,7 +106,7 @@
"mongoose": "^7.5.0", "mongoose": "^7.5.0",
"nanoid": "3.3.4", "nanoid": "3.3.4",
"nconf": "^0.12.0", "nconf": "^0.12.0",
"npm": "^9.8.1", "npm": "^10.0.0",
"react": "^18.2.0", "react": "^18.2.0",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"react-frame-component": "^4.1.3", "react-frame-component": "^4.1.3",

3
server/app.js
View File

@@ -268,6 +268,9 @@ app.get('/user/:username', async (req, res, next)=>{
} }
req.brews = _.map(brews, (brew)=>{ req.brews = _.map(brews, (brew)=>{
// Clean up brew data
brew.title = brew.title?.trim();
brew.description = brew.description?.trim();
return sanitizeBrew(brew, ownAccount ? 'edit' : 'share'); return sanitizeBrew(brew, ownAccount ? 'edit' : 'share');
}); });

5
server/homebrew.api.js
View File

@@ -153,6 +153,9 @@ const api = {
brew.text = api.mergeBrewText(brew); brew.text = api.mergeBrewText(brew);
_.defaults(brew, DEFAULT_BREW); _.defaults(brew, DEFAULT_BREW);
brew.title = brew.title.trim();
brew.description = brew.description.trim();
}, },
newGoogleBrew : async (account, brew, res)=>{ newGoogleBrew : async (account, brew, res)=>{
const oAuth2Client = GoogleActions.authCheck(account, res); const oAuth2Client = GoogleActions.authCheck(account, res);
@@ -217,6 +220,8 @@ const api = {
const { saveToGoogle, removeFromGoogle } = req.query; const { saveToGoogle, removeFromGoogle } = req.query;
let afterSave = async ()=>true; let afterSave = async ()=>true;
brew.title = brew.title.trim();
brew.description = brew.description.trim() || '';
brew.text = api.mergeBrewText(brew); brew.text = api.mergeBrewText(brew);
if(brew.googleId && removeFromGoogle) { if(brew.googleId && removeFromGoogle) {