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

Merge branch 'master' into addSortType&DirToLocalStorage-#2326

Browse Source
This commit is contained in:
Trevor Buckner
2022-09-03 23:11:13 -04:00
committed by GitHub
parent cfbc089207 2f44c35ede
commit 8cf8c5cabb
2 changed files with 33 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -196,11 +196,16 @@ const ListPage = createClass({
getSortedBrews : function(brews){ getSortedBrews : function(brews){
const testString = _.deburr(this.state.filterString).toLowerCase(); const testString = _.deburr(this.state.filterString).toLowerCase();
brews = _.filter(brews, (brew)=>{
return (_.deburr(brew.title).toLowerCase().includes(testString)) ||
(_.deburr(brew.description).toLowerCase().includes(testString));
});
brews = _.filter(brews, (brew)=>{
const brewStrings = _.deburr([
brew.title,
brew.description,
brew.tags].join('\n')
.toLowerCase());
return brewStrings.includes(testString);
});
return _.orderBy(brews, (brew)=>{ return this.sortBrewOrder(brew); }, this.state.sortDir); return _.orderBy(brews, (brew)=>{ return this.sortBrewOrder(brew); }, this.state.sortDir);
}, },

61
client/homebrew/pages/newPage/newPage.jsx
View File

@@ -27,41 +27,30 @@ const NewPage = createClass({
getDefaultProps : function() { getDefaultProps : function() {
return { return {
brew : { brew : {
text : '', text : '',
style : undefined, style : undefined,
shareId : null,
editId : null,
createdAt : null,
updatedAt : null,
gDrive : false,
title : '', title : '',
description : '', description : '',
tags : '', renderer : 'V3'
published : false,
authors : [],
systems : []
} }
}; };
}, },
getInitialState : function() { getInitialState : function() {
const brew = this.props.brew; let brew = this.props.brew;
if(this.props.brew.shareId) {
brew = {
text : brew.text ?? '',
style : brew.style ?? undefined,
title : brew.title ?? '',
description : brew.description ?? '',
renderer : brew.renderer ?? 'legacy'
};
}
return { return {
brew : { brew : brew,
text : brew.text || '',
style : brew.style || undefined,
gDrive : false,
title : brew.title || '',
description : brew.description || '',
tags : brew.tags || '',
published : false,
authors : [],
systems : brew.systems || [],
renderer : brew.renderer || 'V3'
},
isSaving : false, isSaving : false,
saveGoogle : (global.account && global.account.googleId ? true : false), saveGoogle : (global.account && global.account.googleId ? true : false),
errors : null, errors : null,
@@ -74,22 +63,20 @@ const NewPage = createClass({
const brew = this.state.brew; const brew = this.state.brew;
if(typeof window !== 'undefined') { //Load from localStorage if in client browser if(!this.props.brew.shareId && typeof window !== 'undefined') { //Load from localStorage if in client browser
const brewStorage = localStorage.getItem(BREWKEY); const brewStorage = localStorage.getItem(BREWKEY);
const styleStorage = localStorage.getItem(STYLEKEY); const styleStorage = localStorage.getItem(STYLEKEY);
const metaStorage = JSON.parse(localStorage.getItem(METAKEY)); const metaStorage = JSON.parse(localStorage.getItem(METAKEY));
if(!brew.text || !brew.style){ brew.text = brewStorage ?? brew.text;
brew.text = brew.text || (brewStorage ?? ''); brew.style = styleStorage ?? brew.style;
brew.style = brew.style || (styleStorage ?? undefined); // brew.title = metaStorage?.title || this.state.brew.title;
// brew.title = metaStorage?.title || this.state.brew.title; // brew.description = metaStorage?.description || this.state.brew.description;
// brew.description = metaStorage?.description || this.state.brew.description; brew.renderer = metaStorage?.renderer ?? brew.renderer;
brew.renderer = brew.renderer || metaStorage?.renderer;
this.setState({ this.setState({
brew : brew brew : brew
}); });
}
} }
localStorage.setItem(BREWKEY, brew.text); localStorage.setItem(BREWKEY, brew.text);