mirror of
https://github.com/naturalcrit/homebrewery.git
synced 2025-12-24 16:22:44 +00:00
Default 'legacy' if not set. Auto-change styles.
* Fix brew styles overwriting each other. * Word wrapping, start fixing spacing on Title letter * Fix \page in legacy brews when not at line start * Fix Page Padding * Set 'legacy' as default value if not set in brew saved file.
This commit is contained in:
@@ -18,7 +18,7 @@ const MetadataEditor = createClass({
|
|||||||
published : false,
|
published : false,
|
||||||
authors : [],
|
authors : [],
|
||||||
systems : [],
|
systems : [],
|
||||||
renderer : ''
|
renderer : 'legacy'
|
||||||
},
|
},
|
||||||
onChange : ()=>{}
|
onChange : ()=>{}
|
||||||
};
|
};
|
||||||
@@ -151,8 +151,8 @@ const MetadataEditor = createClass({
|
|||||||
type='radio'
|
type='radio'
|
||||||
value = 'legacy'
|
value = 'legacy'
|
||||||
name = 'renderer'
|
name = 'renderer'
|
||||||
checked={!this.props.metadata.renderer}
|
checked={this.props.metadata.renderer === 'legacy'}
|
||||||
onChange={(e)=>this.handleRenderer('', e)} />
|
onChange={(e)=>this.handleRenderer('legacy', e)} />
|
||||||
Legacy
|
Legacy
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ const EditPage = createClass({
|
|||||||
published : false,
|
published : false,
|
||||||
authors : [],
|
authors : [],
|
||||||
systems : [],
|
systems : [],
|
||||||
renderer : ''
|
renderer : 'legacy'
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
@@ -105,7 +105,6 @@ const EditPage = createClass({
|
|||||||
|
|
||||||
handleMetadataChange : function(metadata){
|
handleMetadataChange : function(metadata){
|
||||||
if(metadata.renderer != this.savedBrew.renderer){
|
if(metadata.renderer != this.savedBrew.renderer){
|
||||||
console.log('renderer changed!');
|
|
||||||
this.setState({
|
this.setState({
|
||||||
alertRenderChange : true
|
alertRenderChange : true
|
||||||
});
|
});
|
||||||
@@ -345,19 +344,19 @@ const EditPage = createClass({
|
|||||||
return <Nav.item className='save' onClick={this.save} color='blue' icon='fas fa-save'>Save Now</Nav.item>;
|
return <Nav.item className='save' onClick={this.save} color='blue' icon='fas fa-save'>Save Now</Nav.item>;
|
||||||
}
|
}
|
||||||
if(!this.state.isPending && !this.state.isSaving){
|
if(!this.state.isPending && !this.state.isSaving){
|
||||||
return <Nav.item className='save saved'>saved.
|
return <Nav.item className='save saved'>saved.</Nav.item>;
|
||||||
{this.state.alertRenderChange &&
|
|
||||||
<div className='errorContainer' onClick={this.closeAlerts}>
|
|
||||||
Rendering mode for this brew has been changed! Refresh the page to load the new renderer.<br />
|
|
||||||
<div className='confirm'>
|
|
||||||
OK
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
</Nav.item>;
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
// {this.state.alertRenderChange &&
|
||||||
|
// <div className='errorContainer' onClick={this.closeAlerts}>
|
||||||
|
// Rendering mode for this brew has been changed! Refresh the page to load the new renderer.<br />
|
||||||
|
// <div className='confirm'>
|
||||||
|
// OK
|
||||||
|
// </div>
|
||||||
|
// </div>
|
||||||
|
// }
|
||||||
|
|
||||||
processShareId : function() {
|
processShareId : function() {
|
||||||
return this.state.brew.googleId ?
|
return this.state.brew.googleId ?
|
||||||
this.state.brew.googleId + this.state.brew.shareId :
|
this.state.brew.googleId + this.state.brew.shareId :
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ body {
|
|||||||
overflow : hidden;
|
overflow : hidden;
|
||||||
height : 279.4mm;
|
height : 279.4mm;
|
||||||
width : 215.9mm;
|
width : 215.9mm;
|
||||||
padding : 1.0cm 1.7cm, 1.5cm;
|
padding : 1.0cm 1.7cm 1.5cm;
|
||||||
background-color : @background;
|
background-color : @background;
|
||||||
background-image : @backgroundImage;
|
background-image : @backgroundImage;
|
||||||
font-family : BookSanity;
|
font-family : BookSanity;
|
||||||
|
|||||||
@@ -157,6 +157,7 @@ GoogleActions = {
|
|||||||
lastViewed : brew.lastViewed,
|
lastViewed : brew.lastViewed,
|
||||||
views : brew.views,
|
views : brew.views,
|
||||||
version : brew.version,
|
version : brew.version,
|
||||||
|
renderer : brew.renderer,
|
||||||
tags : brew.tags,
|
tags : brew.tags,
|
||||||
systems : brew.systems.join() }
|
systems : brew.systems.join() }
|
||||||
},
|
},
|
||||||
@@ -230,6 +231,7 @@ GoogleActions = {
|
|||||||
description : brew.description,
|
description : brew.description,
|
||||||
tags : '',
|
tags : '',
|
||||||
published : brew.published,
|
published : brew.published,
|
||||||
|
renderer : brew.renderer,
|
||||||
authors : [],
|
authors : [],
|
||||||
systems : []
|
systems : []
|
||||||
};
|
};
|
||||||
@@ -291,6 +293,7 @@ GoogleActions = {
|
|||||||
lastViewed : obj.data.properties.lastViewed,
|
lastViewed : obj.data.properties.lastViewed,
|
||||||
views : parseInt(obj.data.properties.views) || 0, //brews with no view parameter will return undefined
|
views : parseInt(obj.data.properties.views) || 0, //brews with no view parameter will return undefined
|
||||||
version : parseInt(obj.data.properties.version) || 0,
|
version : parseInt(obj.data.properties.version) || 0,
|
||||||
|
renderer : obj.data.properties.renderer ? obj.data.properties.renderer : 'legacy',
|
||||||
|
|
||||||
gDrive : true,
|
gDrive : true,
|
||||||
googleId : id
|
googleId : id
|
||||||
|
|||||||
@@ -122,8 +122,6 @@ const newGoogleBrew = async (req, res, next)=>{
|
|||||||
|
|
||||||
req.body = brew;
|
req.body = brew;
|
||||||
|
|
||||||
console.log(oAuth2Client);
|
|
||||||
|
|
||||||
const newBrew = await GoogleActions.newGoogleBrew(oAuth2Client, brew);
|
const newBrew = await GoogleActions.newGoogleBrew(oAuth2Client, brew);
|
||||||
|
|
||||||
return res.status(200).send(newBrew);
|
return res.status(200).send(newBrew);
|
||||||
|
|||||||
@@ -56,6 +56,8 @@ HomebrewSchema.statics.get = function(query){
|
|||||||
unzipped = zlib.inflateRawSync(brews[0].textBin);
|
unzipped = zlib.inflateRawSync(brews[0].textBin);
|
||||||
brews[0].text = unzipped.toString();
|
brews[0].text = unzipped.toString();
|
||||||
}
|
}
|
||||||
|
if(!brews[0].renderer)
|
||||||
|
brews[0].renderer = 'legacy';
|
||||||
return resolve(brews[0]);
|
return resolve(brews[0]);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -62,15 +62,11 @@ const CodeEditor = createClass({
|
|||||||
},
|
},
|
||||||
|
|
||||||
componentDidUpdate : function(prevProps) {
|
componentDidUpdate : function(prevProps) {
|
||||||
if(this.codeMirror && this.props.value !== undefined && this.codeMirror.getValue() != this.props.value) {
|
if(this.codeMirror && this.codeMirror.getValue() != this.props.value) {
|
||||||
this.codeMirror.setValue(this.props.value);
|
this.codeMirror.setValue(this.props.value);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
shouldComponentUpdate : function(nextProps, nextState) {
|
|
||||||
return false;
|
|
||||||
},
|
|
||||||
|
|
||||||
setCursorPosition : function(line, char){
|
setCursorPosition : function(line, char){
|
||||||
setTimeout(()=>{
|
setTimeout(()=>{
|
||||||
this.codeMirror.focus();
|
this.codeMirror.focus();
|
||||||
|
|||||||
Reference in New Issue
Block a user