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

Merge pull request #2324 from naturalcrit/FixNewPageCloning

Browse Source 
Fix conflicts on /new
This commit is contained in:
Trevor Buckner
2022-09-03 22:38:59 -04:00
committed by GitHub
parent 8d10800cb6 b4be9bb741
commit 62dee13881
2 changed files with 29 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,10 +30,10 @@ const ListPage = createClass({
});
return {
filterString : this.props.query?.filter || '',
sortType : this.props.query?.sort || 'alpha',
sortDir : this.props.query?.dir || 'asc',
query : this.props.query,
filterString : this.props.query?.filter || '',
sortType : this.props.query?.sort || 'alpha',
sortDir : this.props.query?.dir || 'asc',
query : this.props.query,
brewCollection : brewCollection
};
},

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

@@ -27,41 +27,30 @@ const NewPage = createClass({
getDefaultProps : function() {
return {
brew : {
text : '',
style : undefined,
shareId : null,
editId : null,
createdAt : null,
updatedAt : null,
gDrive : false,
text : '',
style : undefined,
title : '',
description : '',
tags : '',
published : false,
authors : [],
systems : []
renderer : 'V3'
}
};
},
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 {
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'
},
brew : brew,
isSaving : false,
saveGoogle : (global.account && global.account.googleId ? true : false),
errors : null,
@@ -74,27 +63,25 @@ const NewPage = createClass({
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 styleStorage = localStorage.getItem(STYLEKEY);
const metaStorage = JSON.parse(localStorage.getItem(METAKEY));
if(!brew.text || !brew.style){
brew.text = brew.text || (brewStorage ?? '');
brew.style = brew.style || (styleStorage ?? undefined);
// brew.title = metaStorage?.title || this.state.brew.title;
// brew.description = metaStorage?.description || this.state.brew.description;
brew.renderer = brew.renderer || metaStorage?.renderer;
brew.text = brewStorage ?? brew.text;
brew.style = styleStorage ?? brew.style;
// brew.title = metaStorage?.title || this.state.brew.title;
// brew.description = metaStorage?.description || this.state.brew.description;
brew.renderer = metaStorage?.renderer ?? brew.renderer;
this.setState({
brew : brew
});
}
this.setState({
brew : brew
});
}
localStorage.setItem(BREWKEY, brew.text);
localStorage.setItem(STYLEKEY, brew.style);
localStorage.setItem(METAKEY, JSON.stringify({'renderer' : brew.renderer}));
localStorage.setItem(METAKEY, JSON.stringify({ 'renderer': brew.renderer }));
},
componentWillUnmount : function() {
document.removeEventListener('keydown', this.handleControlKeys);