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

Merge branch 'master' into WatercolorImageMask

Browse Source
This commit is contained in:
Trevor Buckner
2023-02-22 13:06:20 -05:00
parent 9e2aec18ad 66c80c3891
commit 2a75c702b9
13 changed files with 2518 additions and 2533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -12,3 +12,5 @@ todo.md
startDB.bat startDB.bat
startMViewer.bat startMViewer.bat
.vscode .vscode
coverage

10
changelog.md
View File

@@ -61,6 +61,16 @@ pre {
## changelog ## changelog
For a full record of development, visit our [Github Page](https://github.com/naturalcrit/homebrewery). For a full record of development, visit our [Github Page](https://github.com/naturalcrit/homebrewery).
### Saturday 18/02/2023 - v3.6.1
{{taskList
##### G-Ambatte
* [x] Fix users not being removed from Authors list correctly
Fixes issues [#2674](https://github.com/naturalcrit/homebrewery/issues/2674)
}}
### Friday 23/01/2023 - v3.6.0 ### Friday 23/01/2023 - v3.6.0
{{taskList {{taskList
##### calculuschild ##### calculuschild

3
client/homebrew/brewRenderer/brewRenderer.jsx
View File

@@ -134,7 +134,8 @@ const BrewRenderer = createClass({
renderStyle : function() { renderStyle : function() {
if(!this.props.style) return; if(!this.props.style) return;
return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style>@layer styleTab {\n${this.props.style}\n} </style>` }} />; //return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style>@layer styleTab {\n${this.props.style}\n} </style>` }} />;
return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style>\n${this.props.style}\n</style>` }} />;
}, },
renderPage : function(pageText, index){ renderPage : function(pageText, index){

3
client/homebrew/pages/printPage/printPage.jsx
View File

@@ -60,7 +60,8 @@ const PrintPage = createClass({
renderStyle : function() { renderStyle : function() {
if(!this.state.brew.style) return; if(!this.state.brew.style) return;
return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style>@layer styleTab {\n${this.state.brew.style}\n} </style>` }} />; //return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style>@layer styleTab {\n${this.state.brew.style}\n} </style>` }} />;
return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style>\n${this.state.brew.style}\n</style>` }} />;
}, },
renderPages : function(){ renderPages : function(){

1444
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

14
package.json
View File

@@ -1,7 +1,7 @@
{ {
"name": "homebrewery", "name": "homebrewery",
"description": "Create authentic looking D&D homebrews using only markdown", "description": "Create authentic looking D&D homebrews using only markdown",
"version": "3.6.0", "version": "3.6.1",
"engines": { "engines": {
"node": "16.11.x" "node": "16.11.x"
}, },
@@ -69,7 +69,7 @@
}, },
"dependencies": { "dependencies": {
"@babel/core": "^7.20.12", "@babel/core": "^7.20.12",
"@babel/plugin-transform-runtime": "^7.19.6", "@babel/plugin-transform-runtime": "^7.21.0",
"@babel/preset-env": "^7.19.4", "@babel/preset-env": "^7.19.4",
"@babel/preset-react": "^7.18.6", "@babel/preset-react": "^7.18.6",
"body-parser": "^1.20.1", "body-parser": "^1.20.1",
@@ -82,7 +82,7 @@
"express-async-handler": "^1.2.0", "express-async-handler": "^1.2.0",
"express-static-gzip": "2.1.7", "express-static-gzip": "2.1.7",
"fs-extra": "11.1.0", "fs-extra": "11.1.0",
"googleapis": "110.0.0", "googleapis": "111.0.0",
"js-yaml": "^4.1.0", "js-yaml": "^4.1.0",
"jwt-simple": "^0.5.6", "jwt-simple": "^0.5.6",
"less": "^3.13.1", "less": "^3.13.1",
@@ -91,22 +91,22 @@
"marked-extended-tables": "^1.0.5", "marked-extended-tables": "^1.0.5",
"markedLegacy": "npm:marked@^0.3.19", "markedLegacy": "npm:marked@^0.3.19",
"moment": "^2.29.4", "moment": "^2.29.4",
"mongoose": "^6.9.0", "mongoose": "^6.9.2",
"nanoid": "3.3.4", "nanoid": "3.3.4",
"nconf": "^0.12.0", "nconf": "^0.12.0",
"npm": "^8.10.0", "npm": "^8.10.0",
"react": "^17.0.2", "react": "^17.0.2",
"react-dom": "^17.0.2", "react-dom": "^17.0.2",
"react-frame-component": "4.1.3", "react-frame-component": "4.1.3",
"react-router-dom": "6.8.0", "react-router-dom": "6.8.1",
"sanitize-filename": "1.6.3", "sanitize-filename": "1.6.3",
"superagent": "^6.1.0", "superagent": "^6.1.0",
"vitreum": "git+https://git@github.com/calculuschild/vitreum.git" "vitreum": "git+https://git@github.com/calculuschild/vitreum.git"
}, },
"devDependencies": { "devDependencies": {
"eslint": "^8.33.0", "eslint": "^8.34.0",
"eslint-plugin-react": "^7.32.2", "eslint-plugin-react": "^7.32.2",
"jest": "^29.4.1", "jest": "^29.4.3",
"supertest": "^6.3.3" "supertest": "^6.3.3"
} }
} }

3
server/homebrew.api.js
View File

@@ -317,8 +317,7 @@ If you believe you should have access to this brew, ask the file owner to invite
brew.textBin = zlib.deflateRawSync(brew.text); brew.textBin = zlib.deflateRawSync(brew.text);
brew.text = undefined; brew.text = undefined;
} }
brew.markModified('authors'); //Mongo will not properly update arrays without markModified()
// Otherwise, save the brew with updated author list
await brew.save() await brew.save()
.catch((err)=>{ .catch((err)=>{
throw { status: 500, message: err }; throw { status: 500, message: err };

6
server/homebrew.api.spec.js
View File

@@ -11,6 +11,7 @@ describe('Tests for api', ()=>{
let modelBrew; let modelBrew;
let saveFunc; let saveFunc;
let removeFunc; let removeFunc;
let markModifiedFunc;
let saved; let saved;
beforeEach(()=>{ beforeEach(()=>{
@@ -20,15 +21,18 @@ describe('Tests for api', ()=>{
return saved; return saved;
}); });
removeFunc = jest.fn(async function() {}); removeFunc = jest.fn(async function() {});
markModifiedFunc = jest.fn(()=>true);
modelBrew = (brew)=>({ modelBrew = (brew)=>({
...brew, ...brew,
save : saveFunc, save : saveFunc,
remove : removeFunc, remove : removeFunc,
markModified : markModifiedFunc,
toObject : function() { toObject : function() {
delete this.save; delete this.save;
delete this.toObject; delete this.toObject;
delete this.remove; delete this.remove;
delete this.markModified;
return this; return this;
} }
}); });
@@ -627,6 +631,7 @@ brew`);
await api.deleteBrew(req, res); await api.deleteBrew(req, res);
expect(api.getBrew).toHaveBeenCalled(); expect(api.getBrew).toHaveBeenCalled();
expect(markModifiedFunc).toHaveBeenCalled();
expect(model.findOne).toHaveBeenCalled(); expect(model.findOne).toHaveBeenCalled();
expect(removeFunc).not.toHaveBeenCalled(); expect(removeFunc).not.toHaveBeenCalled();
expect(saveFunc).toHaveBeenCalled(); expect(saveFunc).toHaveBeenCalled();
@@ -716,6 +721,7 @@ brew`);
await api.deleteBrew(req, res); await api.deleteBrew(req, res);
expect(api.getBrew).toHaveBeenCalled(); expect(api.getBrew).toHaveBeenCalled();
expect(markModifiedFunc).toHaveBeenCalled();
expect(model.findOne).toHaveBeenCalled(); expect(model.findOne).toHaveBeenCalled();
expect(removeFunc).not.toHaveBeenCalled(); expect(removeFunc).not.toHaveBeenCalled();
expect(api.deleteGoogleBrew).toHaveBeenCalled(); expect(api.deleteGoogleBrew).toHaveBeenCalled();

2
shared/naturalcrit/splitPane/splitPane.less
View File

@@ -22,7 +22,7 @@
vertical-align : middle; vertical-align : middle;
text-align : center; text-align : center;
i{ i{
display : block; display : block !important;
margin : 10px 0px; margin : 10px 0px;
font-size : 6px; font-size : 6px;
color : #666; color : #666;

108
themes/Legacy/5ePHB/style.less
View File

@@ -1,23 +1,22 @@
@layer Legacy_5ePHB { @import (less) './themes/fonts/5e legacy/fonts.less';
@import (less) './themes/fonts/5e legacy/fonts.less'; @import (less) './themes/assets/assets.less';
@import (less) './themes/assets/assets.less'; @import (less) './themes/phb.depricated.less';
@import (less) './themes/phb.depricated.less'; //Colors
//Colors @background : #EEE5CE; // Light parchment
@background : #EEE5CE; // Light parchment @noteGreen : #e0e5c1; // Pastel green
@noteGreen : #e0e5c1; // Pastel green @headerUnderline : #c9ad6a; // Gold
@headerUnderline : #c9ad6a; // Gold @horizontalRule : #9c2b1b; // Maroon
@horizontalRule : #9c2b1b; // Maroon @headerText : #58180D; // Dark maroon
@headerText : #58180D; // Dark maroon @monsterStatBackground : #FDF1DC; // Lighter parchment
@monsterStatBackground : #FDF1DC; // Lighter parchment @captionText : #766649; // Brown
@captionText : #766649; // Brown @page { margin: 0; }
@page { margin: 0; } body {
body {
counter-reset : phb-page-numbers; counter-reset : phb-page-numbers;
} }
*{ *{
-webkit-print-color-adjust : exact; -webkit-print-color-adjust : exact;
} }
.useSansSerif(){ .useSansSerif(){
font-family : ScalySans; font-family : ScalySans;
em{ em{
font-family : ScalySans; font-family : ScalySans;
@@ -28,8 +27,8 @@
font-weight : 800; font-weight : 800;
letter-spacing : -0.02em; letter-spacing : -0.02em;
} }
} }
.useColumns(@multiplier : 1){ .useColumns(@multiplier : 1){
column-count : 2; column-count : 2;
column-fill : auto; column-fill : auto;
column-gap : 1cm; column-gap : 1cm;
@@ -40,8 +39,8 @@
-moz-column-width : 8cm * @multiplier; -moz-column-width : 8cm * @multiplier;
-webkit-column-gap : 1cm; -webkit-column-gap : 1cm;
-moz-column-gap : 1cm; -moz-column-gap : 1cm;
} }
.phb{ .phb{
.useColumns(); .useColumns();
counter-increment : phb-page-numbers; counter-increment : phb-page-numbers;
position : relative; position : relative;
@@ -358,11 +357,11 @@
page-break-inside : avoid; page-break-inside : avoid;
break-inside : avoid; break-inside : avoid;
} }
} }
//***************************** //*****************************
// * SPELL LIST // * SPELL LIST
// *****************************/ // *****************************/
.phb .spellList{ .phb .spellList{
.useSansSerif(); .useSansSerif();
column-count : 4; column-count : 4;
column-span : all; column-span : all;
@@ -384,19 +383,19 @@
page-break-inside : auto; page-break-inside : auto;
break-inside : auto; break-inside : auto;
} }
} }
//***************************** //*****************************
// * WIDE // * WIDE
// *****************************/ // *****************************/
.phb .wide{ .phb .wide{
column-span : all; column-span : all;
-webkit-column-span : all; -webkit-column-span : all;
-moz-column-span : all; -moz-column-span : all;
} }
//***************************** //*****************************
// * CLASS TABLE // * CLASS TABLE
// *****************************/ // *****************************/
.phb .classTable{ .phb .classTable{
margin-top : 25px; margin-top : 25px;
margin-bottom : 40px; margin-bottom : 40px;
border-collapse : separate; border-collapse : separate;
@@ -411,11 +410,11 @@
h5{ h5{
margin-bottom : 10px; margin-bottom : 10px;
} }
} }
//************************************ //************************************
// * DESCRIPTIVE TEXT BOX // * DESCRIPTIVE TEXT BOX
// ************************************/ // ************************************/
.phb .descriptive{ .phb .descriptive{
margin-bottom : 1em; margin-bottom : 1em;
background-color : #faf7ea; background-color : #faf7ea;
font-family : ScalySans; font-family : ScalySans;
@@ -441,15 +440,15 @@
font-weight : 800; font-weight : 800;
letter-spacing : -0.02em; letter-spacing : -0.02em;
} }
} }
.phb pre+.descriptive{ .phb pre+.descriptive{
margin-top : 8px; margin-top : 8px;
} }
//***************************** //*****************************
// * ARTIST CREDIT BLOCK // * ARTIST CREDIT BLOCK
// *****************************/ // *****************************/
.phb { .phb {
.artist { .artist {
position : absolute; position : absolute;
text-align : center; text-align : center;
@@ -473,11 +472,11 @@
} }
} }
} }
} }
//***************************** //*****************************
// * TABLE OF CONTENTS // * TABLE OF CONTENTS
// *****************************/ // *****************************/
.phb .toc{ .phb .toc{
-webkit-column-break-inside : avoid; -webkit-column-break-inside : avoid;
page-break-inside : avoid; page-break-inside : avoid;
break-inside : avoid; break-inside : avoid;
@@ -495,5 +494,4 @@
&>ul>li{ &>ul>li{
margin-bottom : 10px; margin-bottom : 10px;
} }
}
} }

8
themes/V3/5eDMG/style.less
View File

@@ -1,11 +1,10 @@
@layer V3_5eDMG { :root {
:root {
//Colors //Colors
--HB_Color_Accent : #EBCEC3; // Salmon --HB_Color_Accent : #EBCEC3; // Salmon
--HB_Color_Footnotes : #5C5C5C; // Dark gray --HB_Color_Footnotes : #5C5C5C; // Dark gray
} }
.page { .page {
background-image : url(/assets/DMG_background.png); background-image : url(/assets/DMG_background.png);
background-size : cover; background-size : cover;
@@ -17,5 +16,4 @@
.footnote { .footnote {
bottom : 40px; bottom : 40px;
} }
}
} }

100
themes/V3/5ePHB/style.less
View File

@@ -1,8 +1,7 @@
@layer V3_5ePHB { @import (less) './themes/fonts/5e/fonts.less';
@import (less) './themes/fonts/5e/fonts.less'; @import (less) './themes/assets/assets.less';
@import (less) './themes/assets/assets.less';
:root { :root {
//Colors //Colors
--HB_Color_Background : #EEE5CE; // Light parchment --HB_Color_Background : #EEE5CE; // Light parchment
--HB_Color_Accent : #E0E5C1; // Pastel green --HB_Color_Accent : #E0E5C1; // Pastel green
@@ -13,16 +12,16 @@
--HB_Color_CaptionText : #766649; // Brown --HB_Color_CaptionText : #766649; // Brown
--HB_Color_WatercolorStain : #BBAD82; // Light brown --HB_Color_WatercolorStain : #BBAD82; // Light brown
--HB_Color_Footnotes : #C9AD6A; // Gold --HB_Color_Footnotes : #C9AD6A; // Gold
} }
@page { margin: 0; } @page { margin: 0; }
body { body {
counter-reset : phb-page-numbers; counter-reset : phb-page-numbers;
} }
*{ *{
-webkit-print-color-adjust : exact; -webkit-print-color-adjust : exact;
} }
.useSansSerif(){ .useSansSerif(){
font-family : ScalySansRemake; font-family : ScalySansRemake;
font-size : 0.318cm; font-size : 0.318cm;
line-height : 1.2em; line-height : 1.2em;
@@ -42,8 +41,8 @@
h5 + * { h5 + * {
margin-top : 0.1cm; margin-top : 0.1cm;
} }
} }
.useColumns(@multiplier : 1, @fillMode: balance){ .useColumns(@multiplier : 1, @fillMode: balance){
column-count : 2; column-count : 2;
column-fill : @fillMode; column-fill : @fillMode;
column-gap : 0.9cm; column-gap : 0.9cm;
@@ -54,14 +53,14 @@
-moz-column-width : 8cm * @multiplier; -moz-column-width : 8cm * @multiplier;
-webkit-column-gap : 0.9cm; -webkit-column-gap : 0.9cm;
-moz-column-gap : 0.9cm; -moz-column-gap : 0.9cm;
} }
.columnWrapper{ .columnWrapper{
max-height : 100%; max-height : 100%;
column-span : all; column-span : all;
columns : inherit; columns : inherit;
column-gap : inherit; column-gap : inherit;
} }
.page{ .page{
.useColumns(); .useColumns();
counter-increment : phb-page-numbers; counter-increment : phb-page-numbers;
position : relative; position : relative;
@@ -78,12 +77,12 @@
text-rendering : optimizeLegibility; text-rendering : optimizeLegibility;
page-break-before : always; page-break-before : always;
page-break-after : always; page-break-after : always;
} }
//***************************** //*****************************
// * BASE // * BASE
// *****************************/ // *****************************/
.page{ .page{
p{ p{
overflow-wrap : break-word; //TODO: MAKE ALL MARGINS TOP-ONLY. USE * + * STYLE SELECTORS overflow-wrap : break-word; //TODO: MAKE ALL MARGINS TOP-ONLY. USE * + * STYLE SELECTORS
display : block; display : block;
@@ -593,11 +592,11 @@
page-break-inside : avoid; page-break-inside : avoid;
break-inside : avoid; break-inside : avoid;
} }
} }
//***************************** //*****************************
// * SPELL LIST // * SPELL LIST
// *****************************/ // *****************************/
.page .spellList{ .page .spellList{
.useSansSerif(); .useSansSerif();
column-count : 2; column-count : 2;
ul+h5{ ul+h5{
@@ -619,12 +618,12 @@
&.wide{ &.wide{
column-count : 4; column-count : 4;
} }
} }
//***************************** //*****************************
// * CLASS TABLE // * CLASS TABLE
// *****************************/ // *****************************/
.page .classTable{ .page .classTable{
th[colspan]:not([rowspan]) { th[colspan]:not([rowspan]) {
white-space : nowrap; white-space : nowrap;
} }
@@ -677,11 +676,11 @@
h5 + table{ h5 + table{
margin-top : 0.2cm; margin-top : 0.2cm;
} }
} }
//***************************** //*****************************
// * TABLE OF CONTENTS // * TABLE OF CONTENTS
// *****************************/ // *****************************/
.page { .page {
&:has(.toc):after { &:has(.toc):after {
display: none; display: none;
} }
@@ -753,12 +752,12 @@
.useColumns(0.96, @fillMode: balance); .useColumns(0.96, @fillMode: balance);
} }
} }
} }
//***************************** //*****************************
// * DEFINITION LISTS // * DEFINITION LISTS
// *****************************/ // *****************************/
.page { .page {
dl { dl {
line-height : 1.25em; line-height : 1.25em;
padding-left : 1em; padding-left : 1em;
@@ -783,16 +782,15 @@
margin-left : 0px; margin-left : 0px;
text-indent : 0px; text-indent : 0px;
} }
} }
//***************************** //*****************************
// * WIDE // * WIDE
// *****************************/ // *****************************/
.page .wide{ .page .wide{
margin-bottom : 0.325cm; margin-bottom : 0.325cm;
} }
.page h1 + *{ .page h1 + *{
margin-top : 0; margin-top : 0;
}
} }

68
themes/V3/Journal/style.less
View File

@@ -1,8 +1,7 @@
@layer V3_Journal { @import (less) './themes/fonts/Journal/fonts.less';
@import (less) './themes/fonts/Journal/fonts.less'; @import (less) './themes/assets/assets.less';
@import (less) './themes/assets/assets.less';
:root { :root {
//Colors //Colors
--HB_Color_Background : unset; // Light parchment --HB_Color_Background : unset; // Light parchment
--HB_Color_Text : #412121; // Dark Maroon Brown --HB_Color_Text : #412121; // Dark Maroon Brown
@@ -10,9 +9,9 @@
--HB_Color_HeaderText : #58180D; // Dark Maroon --HB_Color_HeaderText : #58180D; // Dark Maroon
--HB_Color_CaptionText : #766649; // Brown --HB_Color_CaptionText : #766649; // Brown
--HB_Color_WatercolorStain : #BBAD82; // Light brown --HB_Color_WatercolorStain : #BBAD82; // Light brown
} }
.useSansSerif(){ .useSansSerif(){
font-family : PermanentMarker; font-family : PermanentMarker;
font-size : 0.3cm; font-size : 0.3cm;
line-height : 1.2em; line-height : 1.2em;
@@ -33,12 +32,12 @@
h5 + * { h5 + * {
margin-top : 0.1cm; margin-top : 0.1cm;
} }
} }
.useColumns(@multiplier : 1, @fillMode: balance){ .useColumns(@multiplier : 1, @fillMode: balance){
column-gap : 0.5cm; column-gap : 0.5cm;
} }
.page{ .page{
background-size : 200% 100%; background-size : 200% 100%;
background-repeat : no-repeat; background-repeat : no-repeat;
filter : drop-shadow(1px 4px 14px black); filter : drop-shadow(1px 4px 14px black);
@@ -58,12 +57,12 @@
& .columnWrapper { & .columnWrapper {
//transform: rotate(-0.5deg); // Breaks absolute positioning of images/footers. Wait for Chrome fix //transform: rotate(-0.5deg); // Breaks absolute positioning of images/footers. Wait for Chrome fix
} }
} }
//***************************** //*****************************
// * BASE // * BASE
// *****************************/ // *****************************/
.page{ .page{
color : var(--HB_Color_Text); color : var(--HB_Color_Text);
font-family : ReenieBeanie; font-family : ReenieBeanie;
font-size : 0.53cm; font-size : 0.53cm;
@@ -444,12 +443,12 @@
a:hover { a:hover {
color:red; color:red;
} }
} }
//***************************** //*****************************
// * SPELL LIST // * SPELL LIST
// *****************************/ // *****************************/
.page .spellList{ .page .spellList{
.useSansSerif(); .useSansSerif();
font-family : PermanentMarker; font-family : PermanentMarker;
column-count : 2; column-count : 2;
@@ -468,23 +467,23 @@
&.wide{ &.wide{
column-count : 4; column-count : 4;
} }
} }
//***************************** //*****************************
// * CLASS TABLE // * CLASS TABLE
// *****************************/ // *****************************/
.page .classTable{ .page .classTable{
th[colspan]:not([rowspan]) { th[colspan]:not([rowspan]) {
white-space : nowrap; white-space : nowrap;
} }
h5 + table{ h5 + table{
margin-top : 0.2cm; margin-top : 0.2cm;
} }
} }
//***************************** //*****************************
// * TABLE OF CONTENTS // * TABLE OF CONTENTS
// *****************************/ // *****************************/
.page .toc{ .page .toc{
-webkit-column-break-inside : avoid; -webkit-column-break-inside : avoid;
page-break-inside : avoid; page-break-inside : avoid;
break-inside : avoid; break-inside : avoid;
@@ -550,12 +549,11 @@
&.wide{ &.wide{
.useColumns(0.96, @fillMode: balance); .useColumns(0.96, @fillMode: balance);
} }
} }
//***************************** //*****************************
// * WIDE // * WIDE
// *****************************/ // *****************************/
.page .wide { .page .wide {
margin-bottom : 0.45cm; margin-bottom : 0.45cm;
}
} }