f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-03 17:02:40 +00:00
Code Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Trevor Buckner
2024-05-17 16:53:58 -04:00
committed by GitHub
parent 25b4b3d906 d3080c03a4
commit f40d851d49
5 changed files with 15314 additions and 15308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,9 @@ const NotificationPopup = require('./notificationPopup/notificationPopup.jsx');
const Frame = require('react-frame-component').default; const Frame = require('react-frame-component').default;
const dedent = require('dedent-tabs').default; const dedent = require('dedent-tabs').default;
const DOMPurify = require('dompurify');
const purifyConfig = { FORCE_BODY: true, SANITIZE_DOM: false };
const Themes = require('themes/themes.json'); const Themes = require('themes/themes.json');
const PAGE_HEIGHT = 1056; const PAGE_HEIGHT = 1056;
@@ -33,8 +36,9 @@ const BrewPage = (props)=>{
index : 0, index : 0,
...props ...props
}; };
const cleanText = DOMPurify.sanitize(props.contents, purifyConfig);
return <div className={props.className} id={`p${props.index + 1}`} > return <div className={props.className} id={`p${props.index + 1}`} >
<div className='columnWrapper' dangerouslySetInnerHTML={{ __html: props.contents }} /> <div className='columnWrapper' dangerouslySetInnerHTML={{ __html: cleanText }} />
</div>; </div>;
}; };
@@ -102,13 +106,6 @@ const BrewRenderer = (props)=>{
return false; return false;
}; };
const sanitizeScriptTags = (content)=>{
return content
?.replace(/<script/ig, '&lt;script')
.replace(/<\/script>/ig, '&lt;/script&gt;')
|| '';
};
const renderPageInfo = ()=>{ const renderPageInfo = ()=>{
return <div className='pageInfo' ref={mainRef}> return <div className='pageInfo' ref={mainRef}>
<div> <div>
@@ -128,19 +125,18 @@ const BrewRenderer = (props)=>{
const renderStyle = ()=>{ const renderStyle = ()=>{
if(!props.style) return; if(!props.style) return;
const cleanStyle = sanitizeScriptTags(props.style); const cleanStyle = DOMPurify.sanitize(props.style, purifyConfig);
//return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style>@layer styleTab {\n${sanitizeScriptTags(props.style)}\n} </style>` }} />; //return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style>@layer styleTab {\n${sanitizeScriptTags(props.style)}\n} </style>` }} />;
return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style> ${cleanStyle} </style>` }} />; return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style> ${cleanStyle} </style>` }} />;
}; };
const renderPage = (pageText, index)=>{ const renderPage = (pageText, index)=>{
let cleanPageText = sanitizeScriptTags(pageText);
if(props.renderer == 'legacy') { if(props.renderer == 'legacy') {
const html = MarkdownLegacy.render(cleanPageText); const html = MarkdownLegacy.render(pageText);
return <BrewPage className='page phb' index={index} key={index} contents={html} />; return <BrewPage className='page phb' index={index} key={index} contents={html} />;
} else { } else {
cleanPageText += `\n\n&nbsp;\n\\column\n&nbsp;`; //Artificial column break at page end to emulate column-fill:auto (until `wide` is used, when column-fill:balance will reappear) pageText += `\n\n&nbsp;\n\\column\n&nbsp;`; //Artificial column break at page end to emulate column-fill:auto (until `wide` is used, when column-fill:balance will reappear)
const html = Markdown.render(cleanPageText, index); const html = Markdown.render(pageText, index);
return <BrewPage className='page' index={index} key={index} contents={html} />; return <BrewPage className='page' index={index} key={index} contents={html} />;
} }
}; };
@@ -211,11 +207,11 @@ const BrewRenderer = (props)=>{
<RenderWarnings /> <RenderWarnings />
<NotificationPopup /> <NotificationPopup />
</div> </div>
<link href={`/themes/${rendererPath}/Blank/style.css`} type="text/css" rel='stylesheet'/> <link href={`/themes/${rendererPath}/Blank/style.css`} type='text/css' rel='stylesheet'/>
{baseThemePath && {baseThemePath &&
<link href={`/themes/${rendererPath}/${baseThemePath}/style.css`} type="text/css" rel='stylesheet'/> <link href={`/themes/${rendererPath}/${baseThemePath}/style.css`} type='text/css' rel='stylesheet'/>
} }
<link href={`/themes/${rendererPath}/${themePath}/style.css`} type="text/css" rel='stylesheet'/> <link href={`/themes/${rendererPath}/${themePath}/style.css`} type='text/css' rel='stylesheet'/>
{/* Apply CSS from Style tab and render pages from Markdown tab */} {/* Apply CSS from Style tab and render pages from Markdown tab */}
{state.isMounted {state.isMounted

30282
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

1
package.json
View File

@@ -93,6 +93,7 @@
"cookie-parser": "^1.4.6", "cookie-parser": "^1.4.6",
"create-react-class": "^15.7.0", "create-react-class": "^15.7.0",
"dedent-tabs": "^0.10.3", "dedent-tabs": "^0.10.3",
"dompurify": "^3.1.1",
"expr-eval": "^2.0.2", "expr-eval": "^2.0.2",
"express": "^4.19.2", "express": "^4.19.2",
"express-async-handler": "^1.2.0", "express-async-handler": "^1.2.0",

1
themes/fonts/iconFonts/elderberryInn.js
View File

@@ -105,6 +105,7 @@ const elderberryInn = {
'ei_action1' : 'ei action-1', 'ei_action1' : 'ei action-1',
'ei_alter_self' : 'ei alter-self', 'ei_alter_self' : 'ei alter-self',
'ei_alter_self2' : 'ei alter-self-2', 'ei_alter_self2' : 'ei alter-self-2',
'ei_magic_beans' : 'ei magic-beans',
'ei_animal_friendship' : 'ei animal-friendship', 'ei_animal_friendship' : 'ei animal-friendship',
'ei_animate_dead' : 'ei animate-dead', 'ei_animate_dead' : 'ei animate-dead',
'ei_animate_objects' : 'ei animate-objects', 'ei_animate_objects' : 'ei animate-objects',

310
themes/fonts/iconFonts/elderberryInn.less
View File

@@ -4,7 +4,7 @@
font-style : normal; font-style : normal;
font-weight : normal; font-weight : normal;
src : url('../../../fonts/iconFonts/elderberryInn.woff2'); src : url('../../../fonts/iconFonts/elderberryInn.woff2');
} }
.ei { .ei {
display : inline-block; display : inline-block;
@@ -16,116 +16,118 @@
-webkit-font-smoothing : antialiased; -webkit-font-smoothing : antialiased;
text-rendering : auto; text-rendering : auto;
&.book::before { content : '\E900'; } &.book::before { content : '\E900'; }
&.screen::before { content : '\E901'; } &.screen::before { content : '\E901'; }
/* Spell levels */ /* Spell levels */
&.spell-0::before { content : '\E902'; } &.spell-0::before { content : '\E902'; }
&.spell-1::before { content : '\E903'; } &.spell-1::before { content : '\E903'; }
&.spell-2::before { content : '\E904'; } &.spell-2::before { content : '\E904'; }
&.spell-3::before { content : '\E905'; } &.spell-3::before { content : '\E905'; }
&.spell-4::before { content : '\E906'; } &.spell-4::before { content : '\E906'; }
&.spell-5::before { content : '\E907'; } &.spell-5::before { content : '\E907'; }
&.spell-6::before { content : '\E908'; } &.spell-6::before { content : '\E908'; }
&.spell-7::before { content : '\E909'; } &.spell-7::before { content : '\E909'; }
&.spell-8::before { content : '\E90A'; } &.spell-8::before { content : '\E90A'; }
&.spell-9::before { content : '\E90B'; } &.spell-9::before { content : '\E90B'; }
/* Damage types */ /* Damage types */
&.acid::before { content : '\E90C'; } &.acid::before { content : '\E90C'; }
&.bludgeoning::before { content : '\E90D'; } &.bludgeoning::before { content : '\E90D'; }
&.cold::before { content : '\E90E'; } &.cold::before { content : '\E90E'; }
&.fire::before { content : '\E90F'; } &.fire::before { content : '\E90F'; }
&.force::before { content : '\E910'; } &.force::before { content : '\E910'; }
&.lightning::before { content : '\E911'; } &.lightning::before { content : '\E911'; }
&.necrotic::before { content : '\E912'; } &.necrotic::before { content : '\E912'; }
&.piercing::before { content : '\E913'; } &.piercing::before { content : '\E913'; }
&.poison::before { content : '\E914'; } &.poison::before { content : '\E914'; }
&.psychic::before { content : '\E915'; } &.psychic::before { content : '\E915'; }
&.radiant::before { content : '\E916'; } &.radiant::before { content : '\E916'; }
&.slashing::before { content : '\E917'; } &.slashing::before { content : '\E917'; }
&.thunder::before { content : '\E918'; } &.thunder::before { content : '\E918'; }
/* DnD Conditions */ /* DnD Conditions */
&.blinded::before { content : '\E919'; } &.blinded::before { content : '\E919'; }
&.charmed::before { content : '\E91A'; } &.charmed::before { content : '\E91A'; }
&.deafened::before { content : '\E91B'; } &.deafened::before { content : '\E91B'; }
&.exhaust-1::before { content : '\E91C'; } &.exhaust-1::before { content : '\E91C'; }
&.exhaust-2::before { content : '\E91D'; } &.exhaust-2::before { content : '\E91D'; }
&.exhaust-3::before { content : '\E91E'; } &.exhaust-3::before { content : '\E91E'; }
&.exhaust-4::before { content : '\E91F'; } &.exhaust-4::before { content : '\E91F'; }
&.exhaust-5::before { content : '\E920'; } &.exhaust-5::before { content : '\E920'; }
&.exhaust-6::before { content : '\E921'; } &.exhaust-6::before { content : '\E921'; }
&.frightened::before { content : '\E922'; } &.frightened::before { content : '\E922'; }
&.grappled::before { content : '\E923'; } &.grappled::before { content : '\E923'; }
&.incapacitated::before { content : '\E924'; } &.incapacitated::before { content : '\E924'; }
&.invisible::before { content : '\E926'; }
&.paralyzed::before { content : '\E927'; }
&.petrified::before { content : '\E928'; }
&.poisoned::before { content : '\E929'; }
&.prone::before { content : '\E92A'; }
&.restrained::before { content : '\E92B'; }
&.stunned::before { content : '\E92C'; }
&.unconscious::before { content : '\E925'; } &.unconscious::before { content : '\E925'; }
&.invisible::before { content : '\E926'; }
&.paralyzed::before { content : '\E927'; }
&.petrified::before { content : '\E928'; }
&.poisoned::before { content : '\E929'; }
&.prone::before { content : '\E92A'; }
&.restrained::before { content : '\E92B'; }
&.stunned::before { content : '\E92C'; }
/* Character Classes and Features */ /* Character Classes and Features */
&.barbarian-rage::before { content : '\E92D'; } &.barbarian-rage::before { content : '\E92D'; }
&.barbarian-reckless-attack::before { content : '\E92E'; } &.barbarian-reckless-attack::before { content : '\E92E'; }
&.bardic-inspiration::before { content : '\E92F'; } &.bardic-inspiration::before { content : '\E92F'; }
&.cleric-channel-divinity::before { content : '\E930'; } &.cleric-channel-divinity::before { content : '\E930'; }
&.druid-wild-shape::before { content : '\E931'; } &.druid-wild-shape::before { content : '\E931'; }
&.fighter-action-surge::before { content : '\E932'; } &.fighter-action-surge::before { content : '\E932'; }
&.fighter-second-wind::before { content : '\E933'; } &.fighter-second-wind::before { content : '\E933'; }
&.monk-flurry-blows::before { content : '\E934'; } &.monk-flurry-blows::before { content : '\E934'; }
&.monk-patient-defense::before { content : '\E935'; } &.monk-patient-defense::before { content : '\E935'; }
&.monk-step-of-the-wind::before { content : '\E936'; } &.monk-step-of-the-wind::before { content : '\E936'; }
&.monk-step-of-the-wind-2::before { content : '\E937'; } &.monk-step-of-the-wind-2::before { content : '\E937'; }
&.monk-step-of-the-wind-3::before { content : '\E938'; } &.monk-step-of-the-wind-3::before { content : '\E938'; }
&.monk-stunning-strike::before { content : '\E939'; } &.monk-stunning-strike::before { content : '\E939'; }
&.monk-stunning-strike-2::before { content : '\E939'; } &.monk-stunning-strike-2::before { content : '\E93A'; }
&.paladin-divine-smite::before { content : '\E93B'; } &.paladin-divine-smite::before { content : '\E93B'; }
&.paladin-lay-on-hands::before { content : '\E93C'; } &.paladin-lay-on-hands::before { content : '\E93C'; }
&.barbarian-abilities::before { content : '\E93D'; } &.barbarian-abilities::before { content : '\E93D'; }
&.barbarian::before { content : '\E93E'; } &.barbarian::before { content : '\E93E'; }
&.bard-abilities::before { content : '\E93F'; } &.bard-abilities::before { content : '\E93F'; }
&.bard::before { content : '\E940'; } &.bard::before { content : '\E940'; }
&.cleric-abilities::before { content : '\E941'; } &.cleric-abilities::before { content : '\E941'; }
&.cleric::before { content : '\E942'; } &.cleric::before { content : '\E942'; }
&.druid-abilities::before { content : '\E943'; } &.druid-abilities::before { content : '\E943'; }
&.druid::before { content : '\E944'; } &.druid::before { content : '\E944'; }
&.fighter-abilities::before { content : '\E945'; } &.fighter-abilities::before { content : '\E945'; }
&.fighter::before { content : '\E946'; } &.fighter::before { content : '\E946'; }
&.monk-abilities::before { content : '\E947'; } &.monk-abilities::before { content : '\E947'; }
&.monk::before { content : '\E948'; } &.monk::before { content : '\E948'; }
&.paladin-abilities::before { content : '\E949'; } &.paladin-abilities::before { content : '\E949'; }
&.paladin::before { content : '\E94A'; } &.paladin::before { content : '\E94A'; }
&.ranger-abilities::before { content : '\E94B'; } &.ranger-abilities::before { content : '\E94B'; }
&.ranger::before { content : '\E94C'; } &.ranger::before { content : '\E94C'; }
&.rogue-abilities::before { content : '\E94D'; } &.rogue-abilities::before { content : '\E94D'; }
&.rogue::before { content : '\E94E'; } &.rogue::before { content : '\E94E'; }
&.sorcerer-abilities::before { content : '\E94F'; } &.sorcerer-abilities::before { content : '\E94F'; }
&.sorcerer::before { content : '\E950'; } &.sorcerer::before { content : '\E950'; }
&.warlock-abilities::before { content : '\E951'; } &.warlock-abilities::before { content : '\E951'; }
&.warlock::before { content : '\E952'; } &.warlock::before { content : '\E952'; }
&.wizard-abilities::before { content : '\E953'; } &.wizard-abilities::before { content : '\E953'; }
&.wizard::before { content : '\E954'; } &.wizard::before { content : '\E954'; }
/* Types of actions */ /* Types of actions */
&.movement::before { content : '\E955'; } &.movement::before { content : '\E955'; }
&.action::before { content : '\E956'; } &.action::before { content : '\E956'; }
&.bonus-action::before { content : '\E957'; } &.bonus-action::before { content : '\E957'; }
&.reaction::before { content : '\E958'; } &.reaction::before { content : '\E958'; }
/* SRD Spells */ /* SRD Spells */
&.acid-arrow::before { content : '\E959'; } &.acid-arrow::before { content : '\E959'; }
&.action-1::before { content : '\E95A'; } &.action-1::before { content : '\E95A'; }
&.alter-self::before { content : '\E95B'; } &.alter-self::before { content : '\E95B'; }
&.alter-self-2::before { content : '\E95C'; } &.alter-self-2::before { content : '\E95C'; }
&.animal-friendship::before { content : '\E95E'; } &.magic-beans::before { content : '\E95D'; }
&.animate-dead::before { content : '\E95F'; } &.animal-friendship::before { content : '\E95E'; }
&.animate-objects::before { content : '\E960'; } &.animate-dead::before { content : '\E95F'; }
&.animate-objects-2::before { content : '\E961'; } &.animate-objects::before { content : '\E960'; }
&.bane::before { content : '\E962'; } &.animate-objects-2::before { content : '\E961'; }
&.bane::before { content : '\E962'; }
&.bless::before { content : '\E963'; } &.bless::before { content : '\E963'; }
&.blur::before { content : '\E964'; } &.blur::before { content : '\E964'; }
&.bonus::before { content : '\E965'; } &.bonus::before { content : '\E965'; }
@@ -157,66 +159,66 @@
&.faerie-fire2::before { content : '\E97F'; } &.faerie-fire2::before { content : '\E97F'; }
&.feather-fall::before { content : '\E980'; } &.feather-fall::before { content : '\E980'; }
&.find-familiar::before { content : '\E981'; } &.find-familiar::before { content : '\E981'; }
&.finger-of-death::before { content : '\E982'; } &.finger-of-death::before { content : '\E982'; }
&.fireball::before { content : '\E983'; } &.fireball::before { content : '\E983'; }
&.floating-disk::before { content : '\E984'; } &.floating-disk::before { content : '\E984'; }
&.fly::before { content : '\E985'; } &.fly::before { content : '\E985'; }
&.fog-cloud::before { content : '\E986'; } &.fog-cloud::before { content : '\E986'; }
&.gaseous-form::before { content : '\E987'; } &.gaseous-form::before { content : '\E987'; }
&.gaseous-form2::before { content : '\E988'; } &.gaseous-form2::before { content : '\E988'; }
&.gentle-repose::before { content : '\E989'; } &.gentle-repose::before { content : '\E989'; }
&.gentle-repose2::before { content : '\E98A'; } &.gentle-repose2::before { content : '\E98A'; }
&.globe-of-invulnerability::before { content : '\E98B'; } &.globe-of-invulnerability::before { content : '\E98B'; }
&.guiding-bolt::before { content : '\E98C'; } &.guiding-bolt::before { content : '\E98C'; }
&.healing-word::before { content : '\E98D'; } &.healing-word::before { content : '\E98D'; }
&.heat-metal::before { content : '\E98E'; } &.heat-metal::before { content : '\E98E'; }
&.hellish-rebuke::before { content : '\E98F'; } &.hellish-rebuke::before { content : '\E98F'; }
&.heroes-feast::before { content : '\E990'; } &.heroes-feast::before { content : '\E990'; }
&.heroism::before { content : '\E991'; } &.heroism::before { content : '\E991'; }
&.hideous-laughter::before { content : '\E992'; } &.hideous-laughter::before { content : '\E992'; }
&.identify::before { content : '\E993'; } &.identify::before { content : '\E993'; }
&.illusory-script::before { content : '\E994'; } &.illusory-script::before { content : '\E994'; }
&.inflict-wounds::before { content : '\E995'; } &.inflict-wounds::before { content : '\E995'; }
&.light::before { content : '\E996'; } &.light::before { content : '\E996'; }
&.longstrider::before { content : '\E997'; } &.longstrider::before { content : '\E997'; }
&.mage-armor::before { content : '\E998'; } &.mage-armor::before { content : '\E998'; }
&.mage-hand::before { content : '\E999'; } &.mage-hand::before { content : '\E999'; }
&.magic-missile::before { content : '\E99A'; } &.magic-missile::before { content : '\E99A'; }
&.mass-cure-wounds::before { content : '\E99B'; } &.mass-cure-wounds::before { content : '\E99B'; }
&.mass-healing-word::before { content : '\E99C'; } &.mass-healing-word::before { content : '\E99C'; }
&.Mending::before { content : '\E99D'; } &.Mending::before { content : '\E99D'; }
&.message::before { content : '\E99E'; } &.message::before { content : '\E99E'; }
&.Minor-illusion::before { content : '\E99F'; } &.Minor-illusion::before { content : '\E99F'; }
&.movement1::before { content : '\E9A0'; } &.movement1::before { content : '\E9A0'; }
&.polymorph::before { content : '\E9A1'; } &.polymorph::before { content : '\E9A1'; }
&.power-word-kill::before { content : '\E9A2'; } &.power-word-kill::before { content : '\E9A2'; }
&.power-word-stun::before { content : '\E9A3'; } &.power-word-stun::before { content : '\E9A3'; }
&.prayer-of-healing::before { content : '\E9A4'; } &.prayer-of-healing::before { content : '\E9A4'; }
&.prestidigitation::before { content : '\E9A5'; } &.prestidigitation::before { content : '\E9A5'; }
&.protection-from-evil-and-good::before { content : '\E9A6'; } &.protection-from-evil-and-good::before { content : '\E9A6'; }
&.raise-dead::before { content : '\E9A7'; } &.raise-dead::before { content : '\E9A7'; }
&.raise-dead2::before { content : '\E9A8'; } &.raise-dead2::before { content : '\E9A8'; }
&.reaction1::before { content : '\E9A9'; } &.reaction1::before { content : '\E9A9'; }
&.resurrection::before { content : '\E9AA'; } &.resurrection::before { content : '\E9AA'; }
&.resurrection2::before { content : '\E9AB'; } &.resurrection2::before { content : '\E9AB'; }
&.revivify::before { content : '\E9AC'; } &.revivify::before { content : '\E9AC'; }
&.revivify2::before { content : '\E9AD'; } &.revivify2::before { content : '\E9AD'; }
&.sacred-flame::before { content : '\E9AE'; } &.sacred-flame::before { content : '\E9AE'; }
&.sanctuary::before { content : '\E9AF'; } &.sanctuary::before { content : '\E9AF'; }
&.scorching-ray::before { content : '\E9B0'; } &.scorching-ray::before { content : '\E9B0'; }
&.sending::before { content : '\E9B1'; } &.sending::before { content : '\E9B1'; }
&.shatter::before { content : '\E9B2'; } &.shatter::before { content : '\E9B2'; }
&.shield::before { content : '\E9B3'; } &.shield::before { content : '\E9B3'; }
&.silent-image::before { content : '\E9B4'; } &.silent-image::before { content : '\E9B4'; }
&.sleep::before { content : '\E9B5'; } &.sleep::before { content : '\E9B5'; }
&.speak-with-animals::before { content : '\E9B6'; } &.speak-with-animals::before { content : '\E9B6'; }
&.telekinesis::before { content : '\E9B7'; } &.telekinesis::before { content : '\E9B7'; }
&.true-strike::before { content : '\E9B8'; } &.true-strike::before { content : '\E9B8'; }
&.vicious-mockery::before { content : '\E9B9'; } &.vicious-mockery::before { content : '\E9B9'; }
&.wall-of-fire::before { content : '\E9BA'; } &.wall-of-fire::before { content : '\E9BA'; }
&.wall-of-force::before { content : '\E9BB'; } &.wall-of-force::before { content : '\E9BB'; }
&.wall-of-ice::before { content : '\E9BC'; } &.wall-of-ice::before { content : '\E9BC'; }
&.wall-of-stone::before { content : '\E9BD'; } &.wall-of-stone::before { content : '\E9BD'; }
&.wall-of-thorns::before { content : '\E9BE'; } &.wall-of-thorns::before { content : '\E9BE'; }
&.wish::before { content : '\E9BF'; } &.wish::before { content : '\E9BF'; }
} }