Merge pull request #1342 from naturalcrit/master

v2.11.2
This commit is contained in:
Trevor Buckner authored and GitHub committed 2021-05-02 22:15:43 -04:00
commit 1e4aa4b3a7
32 files changed
+1481 -1780

No files matched your search

+69
View File
@@ -0,0 +1,69 @@
version: 2
updates:
- package-ecosystem: npm
directory: "/"
schedule:
interval: daily
open-pull-requests-limit: 99
ignore:
- dependency-name: eslint
versions:
- 7.19.0
- 7.22.0
- 7.23.0
- 7.24.0
- dependency-name: "@babel/core"
versions:
- 7.12.13
- 7.12.16
- 7.12.17
- 7.13.13
- 7.13.14
- 7.13.15
- dependency-name: googleapis
versions:
- 68.0.0
- 70.0.0
- 71.0.0
- dependency-name: "@babel/preset-env"
versions:
- 7.12.13
- 7.12.16
- 7.12.17
- 7.13.0
- 7.13.12
- 7.13.8
- dependency-name: mongoose
versions:
- 5.11.14
- 5.11.15
- 5.11.16
- 5.11.17
- 5.11.18
- 5.11.19
- 5.12.1
- 5.12.2
- 5.12.3
- dependency-name: eslint-plugin-react
versions:
- 7.23.0
- 7.23.1
- dependency-name: query-string
versions:
- 7.0.0
- dependency-name: nanoid
versions:
- 3.1.22
- dependency-name: "@babel/preset-react"
versions:
- 7.13.13
- dependency-name: codemirror
versions:
- 5.59.3
- 5.60.0
- dependency-name: classnames
versions:
- 2.3.0
- dependency-name: marked
versions:
- 1.2.8
+14 -12
View File
@@ -6,6 +6,11 @@ h5 {
# changelog
### Saturday, 02/5/2021 - v2.11.2
- Fix for edge case where brews could accidentally transfer from Google Drive back to Homebrewery.
- Move cursor to end of snippet after insertion
### Saturday, 20/3/2021 - v2.11.1
- Warning when opening brew in your Google Drive trash
@@ -52,10 +57,6 @@ h5 {
### Monday, 19/10/2020 - v2.10.2
- Fixed issue with "recent" item links not updating when transferring between Google Drive.
```
```
### Monday, 12/10/2020 - v2.10.1
- Fixed issue with users unable to create new brews
- Fixing brews being lost when loaded via back button
@@ -73,6 +74,13 @@ h5 {
### Wednesday, 20/05/2020 - v2.9.0
- Major refactoring of site backend to work with updated dependencies for security (should be invisible to users)
\page
### Wednesday, 11/03/2020 - v2.8.2
- Fixed delete button removing everyone's copy for brews with multiple authors
- Compressed homebrew text in database
@@ -100,9 +108,6 @@ h5 {
### Saturday, 22/04/2017 - v2.7.4
- Give ability to hide the render warning notification
\page
### Friday, 03/03/2017 - v2.7.3
- Increasing the range on the Partial Page Rendering for a quick-fix for it getting out of sync on long brews.
@@ -144,9 +149,6 @@ h5 {
- Added in a snippet for a split table
- Added an account nav item to new page
```
```
### Sunday, 27/11/2016 - v2.5.1
- Fixed the column rendering on the new user page. Really should have tested that better
- Added a hover tooltip to fully read the brew description
@@ -167,6 +169,8 @@ h5 {
- You can now print from a new page without saving
- Added the ability to use ctrl+p and ctrl+s to print and save respectively.
\page
### Monday, 07/11/2016
- Added final touches to the html validator and updating the rest of the branch
- If anyone finds issues with the new HTML validator, please let me know. I hope this will bring a more consistent feel to Homebrewery rendering.
@@ -186,8 +190,6 @@ h5 {
- Fixed the noteblock overlapping into titles (thanks u/dsompura!)
- Fixed a bad search route in the admin panel (thanks u/SnappyTom!)
\page
### Friday, 29/07/2016 - v2.2.7
- Adding in descriptive note blocks. (Thanks calculuschild!)
+1 -1
View File
@@ -64,7 +64,7 @@ const Editor = createClass({
lines[this.cursorPosition.line] = splice(lines[this.cursorPosition.line], this.cursorPosition.ch, injectText);
this.handleTextChange(lines.join('\n'));
this.refs.codeEditor.setCursorPosition(this.cursorPosition.line, this.cursorPosition.ch + injectText.length);
this.refs.codeEditor.setCursorPosition(this.cursorPosition.line + injectText.split('\n').length, this.cursorPosition.ch + injectText.length);
},
handgleToggle : function(){
this.setState({
@@ -88,7 +88,7 @@ module.exports = {
`- **Components:** ${components}`,
`- **Duration:** ${_.sample(['Until dispelled', '1 round', 'Instantaneous', 'Concentration, up to 10 minutes', '1 hour'])}`,
'',
'A flame, equivalent in brightness to a torch, springs from from an object that you touch. ',
'A flame, equivalent in brightness to a torch, springs from an object that you touch. ',
'The effect look like a regular flame, but it creates no heat and doesn\'t use oxygen. ',
'A *continual flame* can be covered or hidden but not smothered or quenched.',
'\n\n\n'
@@ -1,4 +1,5 @@
const _ = require('lodash');
const dedent = require('dedent-tabs').default;
const genList = function(list, max){
return _.sampleSize(list, _.random(0, max)).join(', ') || 'None';
@@ -86,7 +87,7 @@ const getAlignment = function(){
};
const getStats = function(){
return `>|${_.times(6, function(){
return `|${_.times(6, function(){
const num = _.random(1, 20);
const mod = Math.ceil(num/2 - 5);
return `${num} (${mod >= 0 ? `+${mod}` : mod})`;
@@ -95,12 +96,12 @@ const getStats = function(){
const genAbilities = function(){
return _.sample([
'> ***Pack Tactics.*** These guys work together. Like super well, you don\'t even know.',
'> ***Fowl Appearance.*** While the creature remains motionless, it is indistinguishable from a normal chicken.',
'> ***Onion Stench.*** Any creatures within 5 feet of this thing develops an irrational craving for onion rings.',
'> ***Enormous Nose.*** This creature gains advantage on any check involving putting things in its nose.',
'> ***Sassiness.*** When questioned, this creature will talk back instead of answering.',
'> ***Big Jerk.*** Thinks he is just *waaaay* better than you.',
'***Pack Tactics.*** These guys work together like peanut butter and jelly.',
'***Fowl Appearance.*** While the creature remains motionless, it is indistinguishable from a normal chicken.',
'***Onion Stench.*** Any creatures within 5 feet of this thing develops an irrational craving for onion rings.',
'***Enormous Nose.*** This creature gains advantage on any check involving putting things in its nose.',
'***Sassiness.*** When questioned, this creature will talk back instead of answering.',
'***Big Jerk.*** Whenever this creature makes an attack, it starts telling you how much cooler it is than you.',
]);
};
@@ -133,68 +134,37 @@ const genAction = function(){
'Turnbuckle Roll'
]);
return `> ***${name}.*** *Melee Weapon Attack:* +4 to hit, reach 5ft., one target. *Hit* 5 (1d6 + 2) `;
return `***${name}.*** *Melee Weapon Attack:* +4 to hit, reach 5ft., one target. *Hit* 5 (1d6 + 2) `;
};
module.exports = {
full : function(){
return `${[
'___',
'___',
`> ## ${getMonsterName()}`,
`>*${getType()}, ${getAlignment()}*`,
'> ___',
`> - **Armor Class** ${_.random(10, 20)}`,
`> - **Hit Points** ${_.random(1, 150)}(1d4 + 5)`,
`> - **Speed** ${_.random(0, 50)}ft.`,
'>___',
'>|STR|DEX|CON|INT|WIS|CHA|',
'>|:---:|:---:|:---:|:---:|:---:|:---:|',
getStats(),
'>___',
`> - **Condition Immunities** ${genList(['groggy', 'swagged', 'weak-kneed', 'buzzed', 'groovy', 'melancholy', 'drunk'], 3)}`,
`> - **Senses** passive Perception ${_.random(3, 20)}`,
`> - **Languages** ${genList(['Common', 'Pottymouth', 'Gibberish', 'Latin', 'Jive'], 2)}`,
`> - **Challenge** ${_.random(0, 15)} (${_.random(10, 10000)} XP)`,
'> ___',
_.times(_.random(3, 6), function(){
return genAbilities();
}).join('\n>\n'),
'> ### Actions',
_.times(_.random(4, 6), function(){
return genAction();
}).join('\n>\n'),
].join('\n')}\n\n\n`;
},
half : function(){
return `${[
'___',
`> ## ${getMonsterName()}`,
`>*${getType()}, ${getAlignment()}*`,
'> ___',
`> - **Armor Class** ${_.random(10, 20)}`,
`> - **Hit Points** ${_.random(1, 150)}(1d4 + 5)`,
`> - **Speed** ${_.random(0, 50)}ft.`,
'>___',
'>|STR|DEX|CON|INT|WIS|CHA|',
'>|:---:|:---:|:---:|:---:|:---:|:---:|',
getStats(),
'>___',
`> - **Condition Immunities** ${genList(['groggy', 'swagged', 'weak-kneed', 'buzzed', 'groovy', 'melancholy', 'drunk'], 3)}`,
`> - **Senses** passive Perception ${_.random(3, 20)}`,
`> - **Languages** ${genList(['Common', 'Pottymouth', 'Gibberish', 'Latin', 'Jive'], 2)}`,
`> - **Challenge** ${_.random(0, 15)} (${_.random(10, 10000)} XP)`,
'> ___',
_.times(_.random(2, 3), function(){
return genAbilities();
}).join('\n>\n'),
'> ### Actions',
_.times(_.random(1, 2), function(){
return genAction();
}).join('\n>\n'),
].join('\n')}\n\n\n`;
monster : function(classes, genLines){
return dedent`
{{${classes}
## ${getMonsterName()}
*${getType()}, ${getAlignment()}*
___
: **Armor Class** : ${_.random(10, 20)} (chain mail, shield)
: **Hit Points** : ${_.random(1, 150)}(1d4 + 5)
: **Speed** : ${_.random(0, 50)}ft.
___
| STR | DEX | CON | INT | WIS | CHA |
|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|
${getStats()}
___
: **Condition Immunities** : ${genList(['groggy', 'swagged', 'weak-kneed', 'buzzed', 'groovy', 'melancholy', 'drunk'], 3)}
: **Senses** : darkvision 60 ft., passive Perception ${_.random(3, 20)}
: **Languages** : ${genList(['Common', 'Pottymouth', 'Gibberish', 'Latin', 'Jive'], 2)}
: **Challenge** : ${_.random(0, 15)} (${_.random(10, 10000)} XP)
___
:
${_.times(_.random(genLines, genLines + 2), function(){return genAbilities();}).join('\n\t\t\t\n\t\t\t')}
:
### Actions
${_.times(_.random(genLines, genLines + 2), function(){return genAction();}).join('\n\t\t\t\n\t\t\t')}
}}
\n`;
}
};
@@ -6,6 +6,7 @@ const MonsterBlockGen = require('./monsterblock.gen.js');
const ClassFeatureGen = require('./classfeature.gen.js');
const CoverPageGen = require('./coverpage.gen.js');
const TableOfContentsGen = require('./tableOfContents.gen.js');
const dedent = require('dedent-tabs').default;
module.exports = [
@@ -151,15 +152,20 @@ module.exports = [
].join('\n');
},
},
{
name : 'Monster Stat Block (unframed)',
icon : 'fas fa-paw',
gen : MonsterBlockGen.monster('monster', 2),
},
{
name : 'Monster Stat Block',
icon : 'fas fa-spider',
gen : MonsterBlockGen.half,
gen : MonsterBlockGen.monster('monster,frame', 2),
},
{
name : 'Wide Monster Stat Block',
icon : 'fas fa-dragon',
gen : MonsterBlockGen.full,
gen : MonsterBlockGen.monster('monster,frame,wide', 4),
},
{
name : 'Cover Page',
@@ -196,63 +202,61 @@ module.exports = [
name : 'Table',
icon : 'fas fa-th-list',
gen : function(){
return [
'##### Cookie Tastiness',
'| Tastiness | Cookie Type |',
'|:----:|:-------------|',
'| -5 | Raisin |',
'| 8th | Chocolate Chip |',
'| 11th | 2 or lower |',
'| 14th | 3 or lower |',
'| 17th | 4 or lower |\n\n',
].join('\n');
},
return dedent`
##### Character Advancement
| Experience Points | Level | Proficiency Bonus |
|:------------------|:-----:|:-----------------:|
| 0 | 1 | +2 |
| 300 | 2 | +2 |
| 900 | 3 | +2 |
| 2,700 | 4 | +2 |
| 6,500 | 5 | +3 |
| 14,000 | 6 | +3 |
\n`;
}
},
{
name : 'Wide Table',
icon : 'fas fa-list',
gen : function(){
return [
'<div class=\'wide\'>',
'##### Cookie Tastiness',
'| Tastiness | Cookie Type |',
'|:----:|:-------------|',
'| -5 | Raisin |',
'| 8th | Chocolate Chip |',
'| 11th | 2 or lower |',
'| 14th | 3 or lower |',
'| 17th | 4 or lower |',
'</div>\n\n'
].join('\n');
},
return dedent`
{{wide
##### Weapons
| Name | Cost | Damage | Weight | Properties |
|:------------------------|:-----:|:----------------|--------:|:-----------|
| *Simple Melee Weapons* | | | | |
| &emsp; Club | 1 sp | 1d4 bludgeoning | 2 lb. | Light |
| &emsp; Dagger | 2 gp | 1d4 piercing | 1 lb. | Finesse |
| &emsp; Spear | 1 gp | 1d6 piercing | 3 lb. | Thrown |
| *Simple Ranged Weapons* | | | | |
| &emsp; Dart | 5 cp | 1d4 piercig | 1/4 lb. | Finesse |
| &emsp; Shortbow | 25 gp | 1d6 piercing | 2 lb. | Ammunition |
| &emsp; Sling | 1 sp | 1d4 bludgeoning | &mdash; | Ammunition |
}}
\n`;
}
},
{
name : 'Split Table',
icon : 'fas fa-th-large',
gen : function(){
return [
'<div style=\'column-count:2\'>',
'| d10 | Damage Type |',
'|:---:|:------------|',
'| 1 | Acid |',
'| 2 | Cold |',
'| 3 | Fire |',
'| 4 | Force |',
'| 5 | Lightning |',
'',
'```',
'```',
'',
'| d10 | Damage Type |',
'|:---:|:------------|',
'| 6 | Necrotic |',
'| 7 | Poison |',
'| 8 | Psychic |',
'| 9 | Radiant |',
'| 10 | Thunder |',
'</div>\n\n',
].join('\n');
},
return dedent`
##### Typical Difficulty Classes
{{column-count="2"
| Task Difficulty | DC |
|:----------------|:--:|
| Very easy | 5 |
| Easy | 10 |
| Medium | 15 |
| Task Difficulty | DC |
|:------------------|:--:|
| Hard | 20 |
| Very hard | 25 |
| Nearly impossible | 30 |
}}
\n`;
}
}
]
},
@@ -82,7 +82,7 @@ module.exports = {
`- **Components:** ${components}`,
`- **Duration:** ${_.sample(['Until dispelled', '1 round', 'Instantaneous', 'Concentration, up to 10 minutes', '1 hour'])}`,
'',
'A flame, equivalent in brightness to a torch, springs from from an object that you touch. ',
'A flame, equivalent in brightness to a torch, springs from an object that you touch. ',
'The effect look like a regular flame, but it creates no heat and doesn\'t use oxygen. ',
'A *continual flame* can be covered or hidden but not smothered or quenched.',
'\n\n\n'
+49 -33
View File
@@ -55,6 +55,7 @@ const EditPage = createClass({
isSaving : false,
isPending : false,
alertTrashedGoogleBrew : this.props.brew.trashed,
alertLoginToTransfer : false,
saveGoogle : this.props.brew.googleId ? true : false,
confirmGoogleTransfer : false,
errors : null,
@@ -140,15 +141,25 @@ const EditPage = createClass({
},
handleGoogleClick : function(){
console.log('handlegoogleclick');
if(!global.account?.googleId) {
this.setState({
alertLoginToTransfer : true
});
return;
}
this.setState((prevState)=>({
confirmGoogleTransfer : !prevState.confirmGoogleTransfer
}));
this.clearErrors();
},
closeAlerts : function(){
closeAlerts : function(event){
event.stopPropagation(); //Only handle click once so alert doesn't reopen
this.setState({
alertTrashedGoogleBrew : false
alertTrashedGoogleBrew : false,
alertLoginToTransfer : false,
confirmGoogleTransfer : false
});
},
@@ -187,7 +198,7 @@ const EditPage = createClass({
.catch((err)=>{
console.log(err.status === 401
? 'Not signed in!'
: 'Error Saving to Google!');
: 'Error Transferring to Google!');
this.setState({ errors: err, saveGoogle: false });
});
@@ -210,7 +221,7 @@ const EditPage = createClass({
console.log(err.status === 401
? 'Not signed in!'
: 'Error Saving to Google!');
this.setState({ errors: err, saveGoogle: false });
this.setState({ errors: err });
return;
});
@@ -260,39 +271,44 @@ const EditPage = createClass({
},
renderGoogleDriveIcon : function(){
if(this.state.saveGoogle) {
return <Nav.item className='googleDriveStorage' onClick={this.handleGoogleClick}>
<img src={googleDriveActive} alt='googleDriveActive' />
return <Nav.item className='googleDriveStorage' onClick={this.handleGoogleClick}>
{this.state.saveGoogle
? <img src={googleDriveActive} alt='googleDriveActive'/>
: <img src={googleDriveInactive} alt='googleDriveInactive'/>
}
{this.state.confirmGoogleTransfer &&
<div className='errorContainer'>
Would you like to transfer this brew from your Google Drive storage back to the Homebrewery?<br />
<div className='confirm' onClick={this.toggleGoogleStorage}>
Yes
</div>
<div className='deny'>
No
</div>
{this.state.confirmGoogleTransfer &&
<div className='errorContainer' onClick={this.closeAlerts}>
{ this.state.saveGoogle
? `Would you like to transfer this brew from your Google Drive storage back to the Homebrewery?`
: `Would you like to transfer this brew from the Homebrewery to your personal Google Drive storage?`
}
<br />
<div className='confirm' onClick={this.toggleGoogleStorage}>
Yes
</div>
}
</Nav.item>;
} else {
return <Nav.item className='googleDriveStorage' onClick={this.handleGoogleClick}>
<img src={googleDriveInactive} alt='googleDriveInactive' />
<div className='deny'>
No
</div>
</div>
}
{this.state.confirmGoogleTransfer &&
<div className='errorContainer'>
Would you like to transfer this brew from the Homebrewery to your personal Google Drive storage?<br />
<div className='confirm' onClick={this.toggleGoogleStorage}>
Yes
</div>
<div className='deny'>
No
{this.state.alertLoginToTransfer &&
<div className='errorContainer' onClick={this.closeAlerts}>
You must be signed in to a Google account to transfer
between the homebrewery and Google Drive!
<a target='_blank' rel='noopener noreferrer'
href={`http://naturalcrit.com/login?redirect=${this.state.url}`}>
<div className='confirm'>
Sign In
</div>
</a>
<div className='deny'>
Not Now
</div>
}
</Nav.item>;
}
</div>
}
</Nav.item>;
},
renderSaveButton : function(){
@@ -311,7 +327,7 @@ const EditPage = createClass({
to save this to<br />Google Drive!<br />
<a target='_blank' rel='noopener noreferrer'
href={`http://naturalcrit.com/login?redirect=${this.state.url}`}>
<div className='confirm' onClick={this.toggleGoogleStorage}>
<div className='confirm'>
Sign In
</div>
</a>
+5 -5
View File
@@ -43,14 +43,14 @@ const NewPage = createClass({
getInitialState : function() {
return {
brew : {
text : this.props.brew.text,
text : this.props.brew.text || '',
gDrive : false,
title : '',
description : '',
tags : '',
title : this.props.brew.title || '',
description : this.props.brew.description || '',
tags : this.props.brew.tags || '',
published : false,
authors : [],
systems : []
systems : this.props.brew.systems || []
},
isSaving : false,
Binary file not shown.
Binary file not shown.

After

Width:  |  Height:  |  Size: 311 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 135 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 274 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 170 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 160 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 864 B

+9 -7
View File
@@ -1,7 +1,9 @@
@footerAccentImage : url(data:image/png;base64,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 truncated
@frameBorderImage: url(data:image/png;base64,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 truncated
@backgroundImage: url(data:image/jpeg;base64,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 truncated
@redTriangleImage: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAAAeCAYAAACR82geAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAOwgAADsIBFShKgAAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4zjOaXUAAAAt5JREFUaEPtWTtoVEEUHf8iaEjMZt/ME6Jx3X1zlwgavyAICoL4aRWFIFYWAUURLZQo+GkUTGHc92Y2q2AKI0oKLbQIKRS0UPxCilgEFIKCTYIfyBrPi4NImGKJyWZ3Xw4cpth9b84c7ty59w3TaXdAS3FXEz8VkLtNp5YuZjNgoTGj/1KRGNEkXoEqkM4RmLamlbG55u/RwXhj7BRDMKw3kPyKkmKflk69ebxyYTeiAJL4CLO6AynOaI/v8Buqq8wrKwPWRU+Ef7bgOy3dm4p4i0456/wmNs9MU36wLnKySO4wzHqCyLoGsw4EyfiKUcZmmalLG9YFTSVJDMKkB0ryc1np7OxsrKo2UkoLVvHFJLl5GNWHpH5bS35UUXxDWyKxwMibPljFTjdJfMP2ewbDrgee06xWxhIoGWYbycWBVViJMQvCqM/go4D4Be25u/wkr4X8qctXNiFlwjwiqx9RdQfj8ZznbvI5X2SW9f+wTFi+JPEdfIHaysd4SKdEqnXrBKt26wQVQrMFv+IE7MlKcakjLfbkKOYUVDLYXljhzOMEHEBU3UMfeDJLfIu1cbY8GDmqtPiJyHoDaph1OJOqa5wxBgyNCUi8DY3pgDEqWbc6csaotPsLUTEAE+7rdES30t/kS7wHJlzGSbU349Xy6CVfEj9gwksk1yDKxzV6LPEBlXAXxhPaE5v9pogVeOGWQAR8AR/DhIuBJ3ZnE04M8iPWEqCJRIJ8jmhohynNimKJLsbmGMnFgVVYMTn22cHtgxGdgcePZWR8Y66+fqGRN32wip1KkhgEHwaSnw8/VClaVmOklBas4ieL5A7jlHiK4qlNEz/YvqquIXqfNkmMoIJ8j+R4C2a0+ElnfSux+Waa8oN1kQUwS+ITzOhWnjir05G9PhFDMKEX7ftV1Av7b6Tiy83jlYvxJmArhPdDrzHq8Io24/G1Ub2iHbvURzN1GuP2tkTNEvNThMHYbySiA8IawOrpAAAAAElFTkSuQmCC);
@monsterBorderImage: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAMAAADG+c2+AAAACVBMVEX///8AAADmmihtJc8lAAAAAXRSTlMAQObYZgAAACxJREFUeAHt2EEBACAAwkCwf2hL8NK7AAuwdCw9U5Og4FgeAAAAAK7IBxPjAl3qBs+hfAnLAAAAAElFTkSuQmCC);
@noteBorderImage: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAMAAADG+c2+AAAANlBMVEX///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABHL6OuAAAAEXRSTlMABAwYJDRIXHSLo7fL2+fz+6go4VUAAAB6SURBVHgB7dg5DsJQAANRZ9+Xuf9lQUKKEHT5LlL4HWB6W5d61m1zrT/dhm5j6/RjPCkJco761ixQFoSl0aXfKQ+y9/qoJnAEYar01q64gqytNBz4ghyDMPMHnyYiIiIiIgIzYeYfj/Z56x3g7ovAf2L4bxb/EWS/ql7LZCDx/Ry3RwAAAABJRU5ErkJggg==);
@descriptiveBoxImage : url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAMAAADG+c2+AAAAM1BMVEUAAAAAAAAAAAAkAAA1GwA0GgA5GgA5GwA4HgA7HgA5HgA7HgA7HwA7HgA8HgA7HgA8HwDn6RpAAAAAEHRSTlMAAQcHMDExQ1ZW1dXY3t7+02zZCAAAAKNJREFUWMPt2LEOwyAMBNCkSXGpKfb/f20G3AGUiWOJdNlueYrt6di2J3xHrmZF9mVCdnd3T/NgCO+ItUWdB0P4RrQWfR4chOVggUcu/cgCH0X6o+ynuivg3QjIAm8FggQJEiRIkCBBggQJEoTApO56An15EFIrVgJ4vaAtlnlwEKKbGrLATlgOxg9XeORfv9IMH+Xzb7tSzGo+gL7chNcjXpUulIwXVrjWS+0AAAAASUVORK5CYII=");
@footerAccentImage : data-uri('./client/homebrew/phbStyle/images/footerAccent.png');
@frameBorderImage : data-uri('./client/homebrew/phbStyle/images/frameBorder.png');
@backgroundImage : data-uri('./client/homebrew/phbStyle/images/parchmentBackground.jpg');
@redTriangleImage : data-uri('./client/homebrew/phbStyle/images/redTriangle.png');
@monsterBorderImageLegacy : data-uri('./client/homebrew/phbStyle/images/monsterBorderLegacy.png');
@noteBorderImage : data-uri('./client/homebrew/phbStyle/images/noteBorder.png');
@descriptiveBoxImage : data-uri('./client/homebrew/phbStyle/images/descriptiveBorder.png');
@monsterBlockBackground : data-uri('./client/homebrew/phbStyle/images/parchmentBackgroundGrayscale.jpg');
@monsterBorderImage : data-uri('./client/homebrew/phbStyle/images/monsterBorderFancy.png');
+120 -71
View File
@@ -7,7 +7,7 @@
@headerUnderline : #c9ad6a;
@horizontalRule : #9c2b1b;
@headerText : #58180D;
@monsterStatBackground : #FDF1DC;
@monsterStatBackground : #EEDBAB;
@page { margin: 0; }
body {
counter-reset : phb-page-numbers;
@@ -17,7 +17,11 @@ body {
}
.useSansSerif(){
font-family : ScalySansRemake;
font-size : 10pt;
font-size : 0.325cm;
line-height : 1.2em;
p,dl,ul {
line-height : 1.2em;
}
em{
font-style : italic;
}
@@ -29,14 +33,14 @@ body {
.useColumns(@multiplier : 1){
column-count : 2;
column-fill : auto;
column-gap : 1cm;
column-gap : 0.9cm;
column-width : 8cm * @multiplier;
-webkit-column-count : 2;
-moz-column-count : 2;
-webkit-column-width : 8cm * @multiplier;
-moz-column-width : 8cm * @multiplier;
-webkit-column-gap : 1cm;
-moz-column-gap : 1cm;
-webkit-column-gap : 0.9cm;
-moz-column-gap : 0.9cm;
}
.phb3{
.useColumns();
@@ -47,11 +51,11 @@ body {
overflow : hidden;
height : 279.4mm;
width : 215.9mm;
padding : 1.0cm 1.7cm 1.5cm;
padding : 1.4cm 1.9cm 1.7cm;
background-color : @background;
background-image : @backgroundImage;
font-family : BookInsanityRemake;
font-size : 0.317cm;
font-size : 0.34cm;
text-rendering : optimizeLegibility;
page-break-before : always;
page-break-after : always;
@@ -59,11 +63,11 @@ body {
// * BASE
// *****************************/
p{
overflow-wrap : break-word;
padding-top : 0em;
line-height : 1.3em;
overflow-wrap : break-word; //TODO: MAKE ALL MARGINS TOP-ONLY. USE * + * STYLE SELECTORS
margin-bottom : 1em;
line-height : 1.3em;
&+p{
padding-top : 0em;
margin-top : -1em;
}
}
ul{
@@ -89,7 +93,7 @@ body {
}
strong{
font-weight : bold;
letter-spacing : 0.03em;
letter-spacing : -0.02em;
}
em{
font-style : italic;
@@ -108,15 +112,14 @@ body {
// * HEADERS
// *****************************/
h1,h2,h3,h4{
margin-top : 0.2em;
margin-bottom : 0.2em;
font-family : MrEavesRemake;
font-weight : 800;
color : @headerText;
}
h1{
margin-bottom : 0.18cm;
column-span : all;
font-size : 0.987cm;
font-size : 0.89cm;
-webkit-column-span : all;
-moz-column-span : all;
&+p::first-letter{
@@ -136,23 +139,28 @@ body {
color: rgba(0, 0, 0, 0);
}
&+p::first-line{
font-size : .385cm;
font-variant : small-caps;
}
}
h2{
font-size : 0.705cm;
margin-top : 0px;
margin-bottom : 0.05cm;
font-size : 0.75cm;
}
h3{
font-size : 0.529cm;
margin-top : -0.1cm;
margin-bottom : 0.1cm;
font-size : 0.575cm;
border-bottom : 2px solid @headerUnderline;
}
h4{
margin-bottom : 0.00em;
margin-top : -0.02cm;
margin-bottom : 0.02cm;
font-size : 0.458cm;
}
h5{
margin-bottom : 0.2em;
margin-top : -0.02cm;
margin-bottom : 0.02cm;
font-family : ScalySansSmallCapsRemake;
font-size : 0.423cm;
font-weight : 900;
@@ -164,21 +172,18 @@ body {
.useSansSerif();
width : 100%;
margin-bottom : 1em;
font-size : 10pt;
thead{
display: table-row-group;
font-weight : 800;
th{
vertical-align : bottom;
padding-bottom : 0.3em;
padding-right : 0.1em;
padding-left : 0.1em;
padding : 0.14em 0.4em;
}
}
tbody{
tr{
td{
padding : 0.3em 0.1em;
padding : 0.14em 0.4em;
}
&:nth-child(odd){
background-color : @noteGreen;
@@ -213,66 +218,101 @@ body {
//*****************************
// * MONSTER STAT BLOCK
// *****************************/
hr+blockquote{
position : relative;
padding-top : 15px;
background-color : @monsterStatBackground;
border-style : solid;
border-width : 10px;
border-image : @monsterBorderImage 10;
.monster {
&.frame {
border-style : solid;
border-width : 7px 6px;
background-color : @monsterStatBackground;
background-image : @monsterBlockBackground;
border-image : @monsterBorderImage 14 round;
border-image-outset : 0px 2px;
background-blend-mode : overlay;
background-attachment : fixed;
box-shadow : 1px 4px 14px #888;
padding : 4px 2px;
margin : 0px -6px 1em;
}
.useSansSerif();
//-webkit-transform : translateZ(0); //Prevents shadows from breaking across columns, but breaks internal columns...
position : relative;
padding : 0px;
margin-bottom : 1em;
p{
margin-bottom : 0.3cm;
}
p+p {
margin-top : 0; //May not be needed
text-indent : 0;
}
p:last-of-type {
margin-bottom: 0;
}
//Headers
h2{
margin-top : -8px;
margin-bottom : 0px;
&+p{
padding-bottom : 0px;
font-size : 0.62cm;
line-height : 1em;
margin : 0;
&+p {
font-size : 0.304cm; //Monster size and type subtext
margin-bottom : 0;
}
}
h3{
font-family : ScalySansRemake;
font-weight : 400;
border-bottom : 1px solid @headerText;
}
hr+ul{
color : @headerText;
}
ul{
.useSansSerif();
padding-left : 1em;
font-size : 0.352cm;
}
// Monster Ability table
hr+table{
margin : 0;
column-span : 1;
background-color : transparent;
border-style : none;
border-image : none;
-webkit-column-span : 1;
tbody{
tr:nth-child(odd), tr:nth-child(even){
background-color : transparent;
}
}
}
table{
color : @headerText;
}
p+p{
margin-top : 0em;
padding-bottom : 0.5em;
text-indent : 0em;
font-family : ScalySansRemake;
font-weight : 800;
font-variant : small-caps;
border-bottom : 2px solid @headerText;
margin-top : 0.05cm;
padding-bottom : 0.05cm;
}
//Triangle dividers
hr{
visibility : visible;
height : 6px;
margin : 4px 0px;
margin : 0.12cm 0cm;
background-image : @redTriangleImage;
background-size : 100% 100%;
border : none;
}
//Attribute Lists
dl {
.useSansSerif();
color : @headerText;
padding-left :1.3em;
text-indent :-1.3em;
}
dd {
text-indent : 0px;
}
// Monster Ability table
hr + table:first-of-type{
margin : 0;
column-span : 1;
color : @headerText;
background-color : transparent;
border-style : none;
border-image : none;
-webkit-column-span : 1;
tr {
background-color : transparent;
}
td,th {
padding: 0px;
}
}
}
//Full Width
.monster.wide{
.useColumns(0.96);
}
hr+hr+blockquote{
.useColumns(0.96);
}
@@ -485,9 +525,15 @@ body {
// * MUSTACHE DIVS/SPANS
// *****************************/
.phb3 {
.block {
break-inside : avoid;
}
.inline-block {
display : block;
}
div {
column-gap : 0.5cm; //Default spacing if a div uses multicolumns
}
}
//*****************************
@@ -512,6 +558,9 @@ body {
// *****************************/
.phb3 {
.blank {
height: 0.8em;
height: 0.75em;
}
p + .blank {
margin-top: -1em;
}
}
@@ -206,7 +206,7 @@ body {
background-color : @monsterStatBackground;
border-style : solid;
border-width : 10px;
border-image : @monsterBorderImage 10;
border-image : @monsterBorderImageLegacy 10;
h2{
margin-top : -8px;
margin-bottom : 0px;
+1013 -1341
View File
File diff suppressed because it is too large. Load diff
+17 -15
View File
@@ -1,7 +1,7 @@
{
"name": "homebrewery",
"description": "Create authentic looking D&D homebrews using only markdown",
"version": "2.11.1",
"version": "2.11.2",
"engines": {
"node": "14.15.x"
},
@@ -40,40 +40,42 @@
]
},
"dependencies": {
"@babel/core": "^7.13.10",
"@babel/preset-env": "^7.13.10",
"@babel/preset-react": "^7.12.13",
"@babel/core": "^7.14.0",
"@babel/preset-env": "^7.14.0",
"@babel/preset-react": "^7.13.13",
"body-parser": "^1.19.0",
"classnames": "^2.2.6",
"codemirror": "^5.59.4",
"classnames": "^2.3.1",
"codemirror": "^5.61.0",
"cookie-parser": "^1.4.5",
"create-react-class": "^15.7.0",
"dedent-tabs": "^0.9.0",
"express": "^4.17.1",
"express-async-handler": "^1.1.4",
"express-static-gzip": "2.1.1",
"fs-extra": "9.1.0",
"googleapis": "67.1.1",
"googleapis": "73.0.0",
"jwt-simple": "^0.5.6",
"less": "^3.13.1",
"lodash": "^4.17.21",
"moment": "^2.29.1",
"mongoose": "^5.12.0",
"nanoid": "3.1.21",
"marked": "2.0.3",
"markedLegacy": "npm:marked@^0.3.19",
"marked": "2.0.1",
"moment": "^2.29.1",
"mongoose": "^5.12.7",
"nanoid": "3.1.22",
"nconf": "^0.11.2",
"prop-types": "15.7.2",
"query-string": "6.14.1",
"query-string": "7.0.0",
"react": "^16.14.0",
"react-dom": "^16.14.0",
"react-frame-component": "4.1.3",
"react-router-dom": "5.2.0",
"sanitize-filename": "1.6.3",
"superagent": "^6.1.0",
"vitreum": "github:calculuschild/vitreum#21a8e1c9421f1d3a3b474c12f480feb2fbd28c5b"
"vitreum": "git+https://github.com/calculuschild/vitreum.git"
},
"devDependencies": {
"eslint": "^7.21.0",
"eslint-plugin-react": "^7.22.0",
"eslint": "^7.25.0",
"eslint-plugin-react": "^7.23.2",
"pico-check": "^2.0.3"
}
}
+87 -175
View File
@@ -8,6 +8,23 @@ const homebrewApi = require('./server/homebrew.api.js');
const GoogleActions = require('./server/googleActions.js');
const serveCompressedStaticAssets = require('./server/static-assets.mv.js');
const sanitizeFilename = require('sanitize-filename');
const asyncHandler = require('express-async-handler');
//Get the brew object from the HB database or Google Drive
const getBrewFromId = asyncHandler(async (id, accessType)=>{
if(accessType !== 'edit' && accessType !== 'share')
throw ('Invalid Access Type when getting brew');
let brew;
if(id.length > 12) {
const googleId = id.slice(0, -12);
id = id.slice(-12);
brew = await GoogleActions.readFileMetadata(config.get('google_api_key'), googleId, id, accessType);
} else {
brew = await HomebrewModel.get(accessType == 'edit' ? { editId: id } : { shareId: id });
brew.sanatize(true);
}
return brew;
});
app.use('/', serveCompressedStaticAssets(`${__dirname}/build`));
@@ -65,84 +82,33 @@ app.get('/robots.txt', (req, res)=>{
return res.sendFile(`${__dirname}/robots.txt`);
});
//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)=>{
const replaceStrings = { '&': '&amp;', '<': '&lt;', '>': '&gt;' };
let 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(400).send('Can\'t get brew from Google');
});
} else {
HomebrewModel.get({ shareId: req.params.id })
.then((brew)=>{
const replaceStrings = { '&': '&amp;', '<': '&lt;', '>': '&gt;' };
let 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');
});
app.get('/source/:id', asyncHandler(async (req, res)=>{
const brew = await getBrewFromId(req.params.id, 'share');
const replaceStrings = { '&': '&amp;', '<': '&lt;', '>': '&gt;' };
let 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);
}));
//Download brew source page
app.get('/download/:id', (req, res)=>{
app.get('/download/:id', asyncHandler(async (req, res)=>{
const brew = await getBrewFromId(req.params.id, 'share');
const prefix = 'HB - ';
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)=>{
let fileName = sanitizeFilename(`${prefix}${brew.title}`).replaceAll(' ', '');
if(!fileName || !fileName.length) { fileName = `${prefix}-Untitled-Brew`; };
res.set({
'Cache-Control' : 'no-cache',
'Content-Type' : 'text/plain',
'Content-Disposition' : `attachment; filename="${fileName}.txt"`
});
res.status(200).send(brew.text);
})
.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)=>{
let fileName = sanitizeFilename(`${prefix}${brew.title}`).replaceAll(' ', '');
if(!fileName || !fileName.length) { fileName = `${prefix}-Untitled-Brew`; };
res.set({
'Cache-Control' : 'no-cache',
'Content-Type' : 'text/plain',
'Content-Disposition' : `attachment; filename="${fileName}.txt"`
});
res.status(200).send(brew.text);
})
.catch((err)=>{
console.log(err);
return res.status(404).send('Could not find Homebrew with that id');
});
}
});
let fileName = sanitizeFilename(`${prefix}${brew.title}`).replaceAll(' ', '');
if(!fileName || !fileName.length) { fileName = `${prefix}-Untitled-Brew`; };
res.set({
'Cache-Control' : 'no-cache',
'Content-Type' : 'text/plain',
'Content-Disposition' : `attachment; filename="${fileName}.txt"`
});
res.status(200).send(brew.text);
}));
//User Page
app.get('/user/:username', async (req, res, next)=>{
@@ -170,123 +136,45 @@ app.get('/user/:username', async (req, res, next)=>{
});
//Edit Page
app.get('/edit/:id', (req, res, next)=>{
app.get('/edit/:id', asyncHandler(async (req, res, next)=>{
res.header('Cache-Control', 'no-cache, no-store'); //reload the latest saved brew when pressing back button, not the cached version before save.
if(req.params.id.length > 12) {
const googleId = req.params.id.slice(0, -12);
const editId = req.params.id.slice(-12);
GoogleActions.readFileMetadata(config.get('google_api_key'), googleId, editId, 'edit')
.then((brew)=>{
req.brew = brew; //TODO Need to sanitize later
return next();
})
.catch((err)=>{
console.log(err);
return res.status(400).send('Can\'t get brew from Google');
});
} else {
HomebrewModel.get({ editId: req.params.id })
.then((brew)=>{
req.brew = brew.sanatize();
return next();
})
.catch((err)=>{
console.log(err);
return res.status(400).send(`Can't get that`);
});
}
});
const brew = await getBrewFromId(req.params.id, 'edit');
req.brew = brew;
return next();
}));
//New Page
app.get('/new/:id', (req, res, next)=>{
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)=>{
req.brew = brew; //TODO Need to sanitize later
return next();
})
.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)=>{
req.brew = brew;
return next();
})
.catch((err)=>{
console.log(err);
return res.status(400).send(`Can't get that`);
});
}
});
app.get('/new/:id', asyncHandler(async (req, res, next)=>{
const brew = await getBrewFromId(req.params.id, 'share');
req.brew = brew;
return next();
}));
//Share Page
app.get('/share/:id', (req, res, next)=>{
app.get('/share/:id', asyncHandler(async (req, res, next)=>{
const brew = await getBrewFromId(req.params.id, 'share');
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)=>{
GoogleActions.increaseView(googleId, shareId, 'share', brew);
return brew;
})
.then((brew)=>{
req.brew = brew; //TODO Need to sanitize later
return next();
})
.catch((err)=>{
console.log(err);
return res.status(400).send('Can\'t get brew from Google');
});
await GoogleActions.increaseView(googleId, shareId, 'share', brew)
.catch((err)=>{next(err);});
} else {
HomebrewModel.get({ shareId: req.params.id })
.then((brew)=>{
return brew.increaseView();
})
.then((brew)=>{
req.brew = brew.sanatize(true);
return next();
})
.catch((err)=>{
console.log(err);
return res.status(400).send(`Can't get that`);
});
await brew.increaseView();
}
});
req.brew = brew;
return next();
}));
//Print Page
app.get('/print/:id', (req, res, next)=>{
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)=>{
req.brew = brew; //TODO Need to sanitize later
return next();
})
.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)=>{
req.brew = brew.sanatize(true);
return next();
})
.catch((err)=>{
console.log(err);
return res.status(400).send(`Can't get that`);
});
}
});
app.get('/print/:id', asyncHandler(async (req, res, next)=>{
const brew = await getBrewFromId(req.params.id, 'share');
req.brew = brew;
return next();
}));
//Render the page
//const render = require('.build/render');
const templateFn = require('./client/template.js');
app.use((req, res)=>{
const props = {
@@ -303,11 +191,35 @@ app.use((req, res)=>{
templateFn('homebrew', title = req.brew ? req.brew.title : '', props)
.then((page)=>{ res.send(page); })
.catch((err)=>{
console.log('TEMPLATE ERROR');
console.log(err);
return res.sendStatus(500);
});
});
//v=====----- Error-Handling Middleware -----=====v//
//Format Errors so all fields will be sent
const replaceErrors = (key, value)=>{
if(value instanceof Error) {
const error = {};
Object.getOwnPropertyNames(value).forEach(function (key) {
error[key] = value[key];
});
return error;
}
return value;
};
const getPureError = (error)=>{
return JSON.parse(JSON.stringify(error, replaceErrors));
};
app.use((err, req, res, next)=>{
const status = err.status || 500;
console.error(err);
res.status(status).send(getPureError(err));
});
//^=====--------------------------------------=====^//
const PORT = process.env.PORT || config.get('web_port') || 8000;
app.listen(PORT);
+6 -2
View File
@@ -240,6 +240,7 @@ GoogleActions = {
},
readFileMetadata : async (auth, id, accessId, accessType)=>{
const drive = google.drive({ version: 'v3', auth: auth });
const obj = await drive.files.get({
@@ -248,7 +249,7 @@ GoogleActions = {
})
.catch((err)=>{
console.log('Error loading from Google');
console.error(err);
throw (err);
return;
});
@@ -345,7 +346,10 @@ GoogleActions = {
increaseView : async (id, accessId, accessType, brew)=>{
//service account because this is modifying another user's file properties
//so we need extended scope
const keys = JSON.parse(config.get('service_account'));
const keys = typeof(config.get('service_account')) == 'string' ?
JSON.parse(config.get('service_account')) :
config.get('service_account');
const auth = google.auth.fromJSON(keys);
auth.scopes = ['https://www.googleapis.com/auth/drive'];
-1
View File
@@ -190,7 +190,6 @@ module.exports = {
.replace(/(<dt>.*<\/dt><dd>.*<\/dd>\n?)+/gm, `<dl>$1</dl>\n\n`)
.replace(/^}}/gm, '\n}}')
.replace(/^({{[^\n]*)$/gm, '$1\n');
console.log(rawBrewText);
return Markdown(
sanatizeScriptTags(rawBrewText),
{ renderer: renderer }