Merge branch 'master' into experimentalNotificationDB

2025-12-24 20:42:43 +00:00 · 2023-08-28 07:51:31 +12:00
parent c8ac3f36fd 3ba15a068a
commit e211b0858d
19 changed files with 1251 additions and 791 deletions
--- a/changelog.md
+++ b/changelog.md
@@ -80,6 +80,53 @@ pre {
 ## changelog
 For a full record of development, visit our [Github Page](https://github.com/naturalcrit/homebrewery).

+### Thursday 17/08/2023 - v3.9.2
+{{taskList
+
+##### Calculuschild
+
+* [x] Fix links to certain old Google Drive files
+
+Fixes issue [#2917](https://github.com/naturalcrit/homebrewery/issues/2917)
+
+##### G-Ambatte
+
+* [x] Menus now open on click, and internally consistent
+
+Fixes issue [#2702](https://github.com/naturalcrit/homebrewery/issues/2702), [#2782](https://github.com/naturalcrit/homebrewery/issues/2782) 
+
+* [x] Add smarter footer snippet
+
+Fixes issue [#2289](https://github.com/naturalcrit/homebrewery/issues/2289) 
+
+* [x] Add sanitization in Style editor
+
+Fixes issue [#1437](https://github.com/naturalcrit/homebrewery/issues/1437) 
+
+* [x] Rework class table snippets to remove unnecessary randomness
+
+Fixes issue [#2964](https://github.com/naturalcrit/homebrewery/issues/2964) 
+
+* [x] Add User Page link to Google Drive file for file owners, add icons for additional storage locations
+
+Fixes issue [#2954](https://github.com/naturalcrit/homebrewery/issues/2954) 
+
+* [x] Add default save location selection to Account Page
+
+Fixes issue [#2943](https://github.com/naturalcrit/homebrewery/issues/2943) 
+
+##### 5e-Cleric
+
+* [x] Exclude cover pages from Table of Content generation (editing on mobile is still not recommended)
+
+Fixes issue [#2920](https://github.com/naturalcrit/homebrewery/issues/2920) 
+
+##### Gazook89
+
+* [x] Adjustments to improve mobile viewing
+
+}}
+
 ### Wednesday 28/06/2023 - v3.9.1
 {{taskList

--- a/client/homebrew/brewRenderer/brewRenderer.jsx
+++ b/client/homebrew/brewRenderer/brewRenderer.jsx
@@ -147,11 +147,11 @@ const BrewRenderer = createClass({
 	},

 	renderPage : function(pageText, index){
-		const cleanPageText = this.sanitizeScriptTags(pageText);
+		let cleanPageText = this.sanitizeScriptTags(pageText);
 		if(this.props.renderer == 'legacy')
 			return <div className='phb page' id={`p${index + 1}`} dangerouslySetInnerHTML={{ __html: MarkdownLegacy.render(cleanPageText) }} key={index} />;
 		else {
-			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)
+			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)
 			return (
 				<div className='page' id={`p${index + 1}`} key={index} >
 					<div className='columnWrapper' dangerouslySetInnerHTML={{ __html: Markdown.render(cleanPageText) }} />
--- a/client/homebrew/pages/accountPage/accountPage.jsx
+++ b/client/homebrew/pages/accountPage/accountPage.jsx
@@ -16,6 +16,8 @@ const HelpNavItem = require('../../navbar/help.navitem.jsx');

 const NaturalCritIcon = require('naturalcrit/svg/naturalcrit.svg.jsx');

+let SAVEKEY = '';
+
 const AccountPage = createClass({
 	displayName     : 'AccountPage',
 	getDefaultProps : function() {
@@ -29,6 +31,27 @@ const AccountPage = createClass({
 			uiItems : this.props.uiItems
 		};
 	},
+	componentDidMount : function(){
+		if(!this.state.saveLocation && this.props.uiItems.username) {
+			SAVEKEY = `HOMEBREWERY-DEFAULT-SAVE-LOCATION-${this.props.uiItems.username}`;
+			let saveLocation =  window.localStorage.getItem(SAVEKEY);
+			saveLocation = saveLocation ?? (this.state.uiItems.googleId ? 'GOOGLE-DRIVE' : 'HOMEBREWERY');
+			this.makeActive(saveLocation);
+		}
+	},
+
+	makeActive : function(newSelection){
+		if(this.state.saveLocation == newSelection) return;
+		window.localStorage.setItem(SAVEKEY, newSelection);
+		this.setState({
+			saveLocation : newSelection
+		});
+	},
+
+	renderButton : function(name, key, shouldRender=true){
+		if(!shouldRender) return;
+		return <button className={this.state.saveLocation==key ? 'active' :	''}	onClick={()=>{this.makeActive(key);}}>{name}</button>;
+	},

 	renderNavItems : function() {
 		return <Navbar>
@@ -61,6 +84,11 @@ const AccountPage = createClass({
 					</p>
 				}
 			</div>
+			<div className='dataGroup'>
+				<h4>Default Save Location</h4>
+				{this.renderButton('Homebrewery', 'HOMEBREWERY')}
+				{this.renderButton('Google Drive', 'GOOGLE-DRIVE', this.state.uiItems.googleId)}
+			</div>
 		</>;
 	},

--- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx
+++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx
@@ -7,6 +7,7 @@ const moment = require('moment');
 const request = require('../../../../utils/request-middleware.js');

 const googleDriveIcon = require('../../../../googleDrive.svg');
+const homebreweryIcon = require('../../../../thumbnail.png');
 const dedent = require('dedent-tabs').default;

 const BrewItem = createClass({
@@ -90,11 +91,17 @@ const BrewItem = createClass({
 		</a>;
 	},

-	renderGoogleDriveIcon : function(){
-		if(!this.props.brew.googleId) return;
+	renderStorageIcon : function(){
+		if(this.props.brew.googleId) {
+			return <span title={this.props.brew.webViewLink ? 'Your Google Drive Storage': 'Another User\'s Google Drive Storage'}>
+				<a href={this.props.brew.webViewLink} target='_blank'>
+					<img className='googleDriveIcon' src={googleDriveIcon} alt='googleDriveIcon' />
+				</a>
+			</span>;
+		}

-		return <span>
-			<img className='googleDriveIcon' src={googleDriveIcon} alt='googleDriveIcon' />
+		return <span title='Homebrewery Storage'>
+			<img className='homebreweryIcon' src={homebreweryIcon} alt='homebreweryIcon' />
 		</span>;
 	},

@@ -144,7 +151,7 @@ const BrewItem = createClass({
 					Last updated: ${moment(brew.updatedAt).local().format(dateFormatString)}`}>
 					<i className='fas fa-sync-alt' /> {moment(brew.updatedAt).fromNow()}
 				</span>
-				{this.renderGoogleDriveIcon()}
+				{this.renderStorageIcon()}
 			</div>

 			<div className='links'>
--- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less
+++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less
@@ -98,4 +98,11 @@
 		padding : 0px;
 		margin  : -5px;
 	}
+	.homebreweryIcon {
+		mix-blend-mode : darken;
+		height         : 24px;
+		position       : relative;
+		top            : 5px;
+		left           : -5px;
+	}
 }
--- a/client/homebrew/pages/basePages/uiPage/uiPage.less
+++ b/client/homebrew/pages/basePages/uiPage/uiPage.less
@@ -16,6 +16,23 @@
 				margin        : 5px 0px;
 				border        : 2px solid black;
 				border-radius : 5px;
+				button {
+					background-color : transparent;
+					border           : 1px solid black;
+					border-radius    : 5px;
+					width            : 125px;
+					color            : black;
+					margin-right     : 5px;
+					&.active {
+						background-color: #0007;
+						color: white;
+						&:before {
+							content: '\f00c';
+    						font-family: 'FONT AWESOME 5 FREE';
+    						margin-right: 5px;
+						}
+					}
+				}
 			}
 			h1, h2, h3, h4 {
 				width          : 100%;
--- a/client/homebrew/pages/newPage/newPage.jsx
+++ b/client/homebrew/pages/newPage/newPage.jsx
@@ -20,9 +20,10 @@ const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');

 const { DEFAULT_BREW } = require('../../../../server/brewDefaults.js');

-const BREWKEY = 'homebrewery-new';
+const BREWKEY  = 'homebrewery-new';
 const STYLEKEY = 'homebrewery-new-style';
-const METAKEY = 'homebrewery-new-meta';
+const METAKEY  = 'homebrewery-new-meta';
+let SAVEKEY;


 const NewPage = createClass({
@@ -62,12 +63,16 @@ const NewPage = createClass({
 			brew.renderer = metaStorage?.renderer ?? brew.renderer;
 			brew.theme    = metaStorage?.theme    ?? brew.theme;
 			brew.lang     = metaStorage?.lang     ?? brew.lang;
-
-			this.setState({
-				brew : brew
-			});
 		}

+		SAVEKEY = `HOMEBREWERY-DEFAULT-SAVE-LOCATION-${global.account?.username || ''}`;
+		const saveStorage = localStorage.getItem(SAVEKEY) || 'HOMEBREWERY';
+
+		this.setState({
+			brew       : brew,
+			saveGoogle : (saveStorage == 'GOOGLE-DRIVE' && this.state.saveGoogle)
+		});
+
 		localStorage.setItem(BREWKEY, brew.text);
 		if(brew.style)
 			localStorage.setItem(STYLEKEY, brew.style);
--- a/client/template.js
+++ b/client/template.js
@@ -11,6 +11,7 @@ const template = async function(name, title='', props = {}){
 	return `<!DOCTYPE html>
 	<html>
 		<head>
+			<meta name="viewport" content="width=device-width, initial-scale=1, height=device-height, interactive-widget=resizes-visual" />
 			<link href="//use.fontawesome.com/releases/v5.15.1/css/all.css" rel="stylesheet" />
 			<link href="//fonts.googleapis.com/css?family=Open+Sans:400,300,600,700" rel="stylesheet" type="text/css" />
 			<link href=${`/${name}/bundle.css`} rel='stylesheet' />
--- a/install/freebsd/install.sh
+++ b/install/freebsd/install.sh
@@ -13,7 +13,7 @@ npm install
 npm audit fix
 npm run postinstall

-cp freebsd/rc.d/homebrewery /usr/local/etc/rc.d/
+cp install/freebsd/rc.d/homebrewery /usr/local/etc/rc.d/
 chmod +x /usr/local/etc/rc.d/homebrewery

 sysrc homebrewery_enable=YES
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "homebrewery",
  "description": "Create authentic looking D&D homebrews using only markdown",
-  "version": "3.9.1",
+  "version": "3.9.2",
  "engines": {
    "node": ">=18.16.x"
  },
@@ -78,9 +78,9 @@
    ]
  },
  "dependencies": {
-    "@babel/core": "^7.22.8",
-    "@babel/plugin-transform-runtime": "^7.22.7",
-    "@babel/preset-env": "^7.22.7",
+    "@babel/core": "^7.22.10",
+    "@babel/plugin-transform-runtime": "^7.22.10",
+    "@babel/preset-env": "^7.22.10",
    "@babel/preset-react": "^7.22.5",
    "@googleapis/drive": "^5.1.0",
    "body-parser": "^1.20.2",
@@ -99,30 +99,30 @@
    "lodash": "^4.17.21",
    "marked": "5.1.1",
    "marked-extended-tables": "^1.0.6",
-    "marked-gfm-heading-id": "^3.0.4",
+    "marked-gfm-heading-id": "^3.0.6",
    "marked-smartypants-lite": "^1.0.0",
    "markedLegacy": "npm:marked@^0.3.19",
    "moment": "^2.29.4",
-    "mongoose": "^7.3.2",
+    "mongoose": "^7.4.3",
    "nanoid": "3.3.4",
    "nconf": "^0.12.0",
-    "npm": "^9.8.0",
+    "npm": "^9.8.1",
    "react": "^18.2.0",
    "react-dom": "^18.2.0",
    "react-frame-component": "^4.1.3",
-    "react-router-dom": "6.14.1",
+    "react-router-dom": "6.15.0",
    "sanitize-filename": "1.6.3",
    "superagent": "^6.1.0",
    "vitreum": "git+https://git@github.com/calculuschild/vitreum.git"
  },
  "devDependencies": {
-    "eslint": "^8.44.0",
-    "eslint-plugin-jest": "^27.2.2",
-    "eslint-plugin-react": "^7.32.2",
-    "jest": "^29.6.1",
+    "eslint": "^8.47.0",
+    "eslint-plugin-jest": "^27.2.3",
+    "eslint-plugin-react": "^7.33.2",
+    "jest": "^29.6.2",
    "jest-expect-message": "^1.1.3",
    "postcss-less": "^6.0.0",
-    "stylelint": "^15.10.1",
+    "stylelint": "^15.10.3",
    "stylelint-config-recess-order": "^4.3.0",
    "stylelint-config-recommended": "^13.0.0",
    "stylelint-stylistic": "^0.4.3",
--- a/server/app.js
+++ b/server/app.js
@@ -257,6 +257,7 @@ app.get('/user/:username', async (req, res, next)=>{
 					brew.pageCount = googleBrews[match].pageCount;
 					brew.renderer = googleBrews[match].renderer;
 					brew.version = googleBrews[match].version;
+					brew.webViewLink = googleBrews[match].webViewLink;
 					googleBrews.splice(match, 1);
 				}
 			}
--- a/server/googleActions.js
+++ b/server/googleActions.js
@@ -106,7 +106,7 @@ const GoogleActions = {
 			const obj = await drive.files.list({
 				pageSize  : 1000,
 				pageToken : NextPageToken || '',
-				fields    : 'nextPageToken, files(id, name, description, createdTime, modifiedTime, properties)',
+				fields    : 'nextPageToken, files(id, name, description, createdTime, modifiedTime, properties, webViewLink)',
 				q         : 'mimeType != \'application/vnd.google-apps.folder\' and trashed = false'
 			})
 			.catch((err)=>{
@@ -139,7 +139,8 @@ const GoogleActions = {
 				published   : file.properties.published ? file.properties.published == 'true' : false,
 				systems     : [],
 				lang        : file.properties.lang,
-				thumbnail   : file.properties.thumbnail
+				thumbnail   : file.properties.thumbnail,
+				webViewLink : file.webViewLink
 			};
 		});
 	  return brews;
--- a/shared/naturalcrit/codeEditor/codeEditor.less
+++ b/shared/naturalcrit/codeEditor/codeEditor.less
@@ -9,6 +9,9 @@
 }

 .codeEditor{
+  @media screen and (pointer : coarse) {
+    font-size : 16px;
+  }
  .CodeMirror-foldmarker {
    font-family: inherit;
    text-shadow: none;
--- a/shared/naturalcrit/splitPane/splitPane.jsx
+++ b/shared/naturalcrit/splitPane/splitPane.jsx
@@ -61,7 +61,8 @@ const SplitPane = createClass({
 		return result;
 	},

-	handleUp : function(){
+	handleUp : function(e){
+		e.preventDefault();
 		if(this.state.isDragging){
 			this.props.onDragFinish(this.state.currentDividerPos);
 			window.localStorage.setItem(this.props.storageKey, this.state.currentDividerPos);
@@ -78,6 +79,7 @@ const SplitPane = createClass({
 	handleMove : function(e){
 		if(!this.state.isDragging) return;

+		e.preventDefault();
 		const newSize = this.limitPosition(e.pageX);
 		this.setState({
 			currentDividerPos : newSize,
@@ -122,7 +124,7 @@ const SplitPane = createClass({
 	renderDivider : function(){
 		return <>
 			{this.renderMoveArrows()}
-			<div className='divider' onMouseDown={this.handleDown} >
+			<div className='divider' onPointerDown={this.handleDown} >
 				<div className='dots'>
 					<i className='fas fa-circle' />
 					<i className='fas fa-circle' />
@@ -133,7 +135,7 @@ const SplitPane = createClass({
 	},

 	render : function(){
-		return <div className='splitPane' onMouseMove={this.handleMove} onMouseUp={this.handleUp}>
+		return <div className='splitPane' onPointerMove={this.handleMove} onPointerUp={this.handleUp}>
 			<Pane
 				ref='pane1'
 				width={this.state.currentDividerPos}
--- a/shared/naturalcrit/splitPane/splitPane.less
+++ b/shared/naturalcrit/splitPane/splitPane.less
@@ -11,6 +11,7 @@
 		flex       : 1;
 	}
 	.divider{
+		touch-action     : none;
 		display          : table;
 		height           : 100%;
 		width            : 15px;
--- a/themes/V3/5ePHB/snippets.js
+++ b/themes/V3/5ePHB/snippets.js
@@ -220,34 +220,51 @@ module.exports = [
 		view      : 'text',
 		snippets  : [
 			{
-				name : 'Class Table',
-				icon : 'fas fa-table',
-				gen  : ClassTableGen.full('classTable,frame,decoration,wide'),
-			},
-			{
-				name : 'Class Table (unframed)',
-				icon : 'fas fa-border-none',
-				gen  : ClassTableGen.full('classTable,wide'),
-			},
-			{
-				name : '1/2 Class Table',
-				icon : 'fas fa-list-alt',
-				gen  : ClassTableGen.half('classTable,decoration,frame'),
-			},
-			{
-				name : '1/2 Class Table (unframed)',
-				icon : 'fas fa-border-none',
-				gen  : ClassTableGen.half('classTable'),
-			},
-			{
-				name : '1/3 Class Table',
-				icon : 'fas fa-border-all',
-				gen  : ClassTableGen.third('classTable,frame'),
-			},
-			{
-				name : '1/3 Class Table (unframed)',
-				icon : 'fas fa-border-none',
-				gen  : ClassTableGen.third('classTable'),
+				name        : 'Class Tables',
+				icon        : 'fas fa-table',
+				gen         : ClassTableGen.full('classTable,frame,decoration,wide'),
+				subsnippets : [
+					{
+						name : 'Martial Class Table',
+						icon : 'fas fa-table',
+						gen  : ClassTableGen.non('classTable,frame,decoration'),
+					},
+					{
+						name : 'Martial Class Table (unframed)',
+						icon : 'fas fa-border-none',
+						gen  : ClassTableGen.non('classTable'),
+					},
+					{
+						name : 'Full Caster Class Table',
+						icon : 'fas fa-table',
+						gen  : ClassTableGen.full('classTable,frame,decoration,wide'),
+					},
+					{
+						name : 'Full Caster Class Table (unframed)',
+						icon : 'fas fa-border-none',
+						gen  : ClassTableGen.full('classTable,wide'),
+					},
+					{
+						name : 'Half Caster Class Table',
+						icon : 'fas fa-list-alt',
+						gen  : ClassTableGen.half('classTable,frame,decoration,wide'),
+					},
+					{
+						name : 'Half Caster Class Table (unframed)',
+						icon : 'fas fa-border-none',
+						gen  : ClassTableGen.half('classTable,wide'),
+					},
+					{
+						name : 'Third Caster Spell Table',
+						icon : 'fas fa-border-all',
+						gen  : ClassTableGen.third('classTable,frame,decoration'),
+					},
+					{
+						name : 'Third Caster Spell Table (unframed)',
+						icon : 'fas fa-border-none',
+						gen  : ClassTableGen.third('classTable'),
+					}
+				]
 			},
 			{
 				name         : 'Rune Table',
--- a/themes/V3/5ePHB/snippets/classtable.gen.js
+++ b/themes/V3/5ePHB/snippets/classtable.gen.js
@@ -1,132 +1,138 @@
 const _ = require('lodash');
+const dedent = require('dedent-tabs').default;

 const features = [
-	'Astrological Botany',
-	'Biochemical Sorcery',
-	'Civil Divination',
-	'Consecrated Augury',
-	'Demonic Anthropology',
-	'Divinatory Mineralogy',
-	'Exo Interfacer',
-	'Genetic Banishing',
-	'Gunpowder Torturer',
-	'Gunslinger Corruptor',
-	'Hermetic Geography',
-	'Immunological Cultist',
-	'Malefic Chemist',
-	'Mathematical Pharmacy',
-	'Nuclear Biochemistry',
-	'Orbital Gravedigger',
-	'Pharmaceutical Outlaw',
-	'Phased Linguist',
-	'Plasma Gunslinger',
-	'Police Necromancer',
-	'Ritual Astronomy',
-	'Sixgun Poisoner',
-	'Seismological Alchemy',
-	'Spiritual Illusionism',
-	'Statistical Occultism',
-	'Spell Analyst',
-	'Torque Interfacer'
+	'Astrological Botany',   'Biochemical Sorcery',   'Civil Divination',
+	'Consecrated Augury',    'Demonic Anthropology',  'Divinatory Mineralogy',
+	'Exo Interfacer',        'Genetic Banishing',     'Gunpowder Torturer',
+	'Gunslinger Corruptor',  'Hermetic Geography',    'Immunological Cultist',
+	'Malefic Chemist',       'Mathematical Pharmacy', 'Nuclear Biochemistry',
+	'Orbital Gravedigger',   'Pharmaceutical Outlaw', 'Phased Linguist',
+	'Plasma Gunslinger',     'Police Necromancer',    'Ritual Astronomy',
+	'Sixgun Poisoner',       'Seismological Alchemy', 'Spiritual Illusionism',
+	'Statistical Occultism', 'Spell Analyst',         'Torque Interfacer'
+].map((f)=>_.padEnd(f, 21)); // Pad to equal length of 21 chars long
+
+const classnames = [
+	'Ackerman', 'Berserker-Typist', 'Concierge', 'Fishmonger',
+	'Haberdasher', 'Manicurist', 'Netrunner', 'Weirkeeper'
 ];

-const classnames = ['Ackerman', 'Berserker-Typist', 'Concierge', 'Fishmonger',
-	                  'Haberdasher', 'Manicurist', 'Netrunner', 'Weirkeeper'];
-
-const levels = ['1st', '2nd', '3rd', '4th', '5th',
-              	'6th', '7th', '8th', '9th', '10th',
-	              '11th', '12th', '13th', '14th', '15th',
-              	'16th', '17th', '18th', '19th', '20th'];
-
-const profBonus = [2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6];
-
-const maxes = [4, 3, 3, 3, 3, 2, 2, 1, 1];
-
-const drawSlots = function(Slots, rows, padding){
-	let slots = Number(Slots);
-	return _.times(rows, function(i){
-		const max = maxes[i];
-		if(slots < 1) return _.pad('—', padding);
-		const res = _.min([max, slots]);
-		slots -= res;
-		return _.pad(res.toString(), padding);
-	}).join(' | ');
-};
-
 module.exports = {
-	full : function(classes){
-		const classname = _.sample(classnames);
-
-
-		let cantrips = 3;
-		let spells = 1;
-		let slots = 2;
-		return `{{${classes}\n##### The ${classname}\n` +
-		`| Level | Proficiency | Features     | Cantrips | Spells | --- Spell Slots Per Spell Level ---|||||||||\n`+
-		`|      ^| Bonus      ^|             ^| Known   ^| Known ^|1st |2nd |3rd |4th |5th |6th |7th |8th |9th |\n`+
-		`|:-----:|:-----------:|:-------------|:--------:|:------:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|\n${
-			_.map(levels, function(levelName, level){
-				const res = [
-					_.pad(levelName, 5),
-					_.pad(`+${profBonus[level]}`, 2),
-					_.padEnd(_.sample(features), 21),
-					_.pad(cantrips.toString(), 8),
-					_.pad(spells.toString(), 6),
-					drawSlots(slots, 9, 2),
-				].join(' | ');
-
-				cantrips += _.random(0, 1);
-				spells += _.random(0, 1);
-				slots += _.random(0, 2);
-
-				return `| ${res} |`;
-			}).join('\n')}\n}}\n\n`;
+	non : function(snippetClasses){
+		return dedent`
+		{{${snippetClasses}
+		##### The ${_.sample(classnames)}
+		| Level | Proficiency Bonus | Features | ${_.sample(features)} |
+		|:-----:|:-----------------:|:---------|:---------------------:|
+		|  1st  |  +2  | ${_.sample(features)} |          2            |
+		|  2nd  |  +2  | ${_.sample(features)} |          2            |
+		|  3rd  |  +2  | ${_.sample(features)} |          3            |
+		|  4th  |  +2  | ${_.sample(features)} |          3            |
+		|  5th  |  +3  | ${_.sample(features)} |          3            |
+		|  6th  |  +3  | ${_.sample(features)} |          4            |
+		|  7th  |  +3  | ${_.sample(features)} |          4            |
+		|  8th  |  +3  | ${_.sample(features)} |          4            |
+		|  9th  |  +4  | ${_.sample(features)} |          4            |
+		| 10th  |  +4  | ${_.sample(features)} |          4            |
+		| 11th  |  +4  | ${_.sample(features)} |          4            |
+		| 12th  |  +4  | ${_.sample(features)} |          5            |
+		| 13th  |  +5  | ${_.sample(features)} |          5            |
+		| 14th  |  +5  | ${_.sample(features)} |          5            |
+		| 15th  |  +5  | ${_.sample(features)} |          5            |
+		| 16th  |  +5  | ${_.sample(features)} |          5            |
+		| 17th  |  +6  | ${_.sample(features)} |          6            |
+		| 18th  |  +6  | ${_.sample(features)} |          6            |
+		| 19th  |  +6  | ${_.sample(features)} |          6            |
+		| 20th  |  +6  | ${_.sample(features)} |      unlimited        |
+		}}\n\n`;
 	},

-	half : function(classes){
-		const classname =  _.sample(classnames);
-
-		let featureScore = 1;
-		return `{{${classes}\n##### The ${classname}\n` +
-		`| Level | Proficiency Bonus | Features | ${_.pad(_.sample(features), 21)} |\n` +
-		`|:-----:|:-----------------:|:---------|:---------------------:|\n${
-			_.map(levels, function(levelName, level){
-				const res = [
-					_.pad(levelName, 5),
-					_.pad(`+${profBonus[level]}`, 2),
-					_.padEnd(_.sample(features), 23),
-					_.pad(`+${featureScore}`, 21),
-				].join(' | ');
-
-				featureScore += _.random(0, 1);
-
-				return `| ${res} |`;
-			}).join('\n')}\n}}\n\n`;
+	full : function(snippetClasses){
+		return dedent`
+		{{${snippetClasses}
+		##### The ${_.sample(classnames)}
+		| Level | Proficiency | Features     | Cantrips | --- Spell Slots Per Spell Level ---|||||||||
+		|      ^| Bonus      ^|             ^| Known   ^|1st |2nd |3rd |4th |5th |6th |7th |8th |9th |
+		|:-----:|:-----------:|:-------------|:--------:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:|
+		|  1st  | +2 | ${_.sample(features)} |    2     | 2  | —  | —  | —  | —  | —  | —  | —  | —  |
+		|  2nd  | +2 | ${_.sample(features)} |    2     | 3  | —  | —  | —  | —  | —  | —  | —  | —  |
+		|  3rd  | +2 | ${_.sample(features)} |    2     | 4  | 2  | —  | —  | —  | —  | —  | —  | —  |
+		|  4th  | +2 | ${_.sample(features)} |    3     | 4  | 3  | —  | —  | —  | —  | —  | —  | —  |
+		|  5th  | +3 | ${_.sample(features)} |    3     | 4  | 3  | 2  | —  | —  | —  | —  | —  | —  |
+		|  6th  | +3 | ${_.sample(features)} |    3     | 4  | 3  | 3  | —  | —  | —  | —  | —  | —  |
+		|  7th  | +3 | ${_.sample(features)} |    3     | 4  | 3  | 3  | 1  | —  | —  | —  | —  | —  |
+		|  8th  | +3 | ${_.sample(features)} |    3     | 4  | 3  | 3  | 2  | —  | —  | —  | —  | —  |
+		|  9th  | +4 | ${_.sample(features)} |    3     | 4  | 3  | 3  | 2  | 1  | —  | —  | —  | —  |
+		| 10th  | +4 | ${_.sample(features)} |    3     | 4  | 3  | 3  | 2  | 1  | —  | —  | —  | —  |
+		| 11th  | +4 | ${_.sample(features)} |    4     | 4  | 3  | 3  | 2  | 1  | 1  | —  | —  | —  |
+		| 12th  | +4 | ${_.sample(features)} |    4     | 4  | 3  | 3  | 2  | 1  | 1  | —  | —  | —  |
+		| 13th  | +5 | ${_.sample(features)} |    4     | 4  | 3  | 3  | 2  | 1  | 1  | 1  | —  | —  |
+		| 14th  | +5 | ${_.sample(features)} |    4     | 4  | 3  | 3  | 2  | 1  | 1  | 1  | —  | —  |
+		| 15th  | +5 | ${_.sample(features)} |    4     | 4  | 3  | 3  | 2  | 1  | 1  | 1  | 1  | —  |
+		| 16th  | +5 | ${_.sample(features)} |    4     | 4  | 3  | 3  | 2  | 1  | 1  | 1  | 1  | —  |
+		| 17th  | +6 | ${_.sample(features)} |    4     | 4  | 3  | 3  | 2  | 1  | 1  | 1  | 1  | 1  |
+		| 18th  | +6 | ${_.sample(features)} |    4     | 4  | 3  | 3  | 3  | 1  | 1  | 1  | 1  | 1  |
+		| 19th  | +6 | ${_.sample(features)} |    4     | 4  | 3  | 3  | 3  | 2  | 2  | 1  | 1  | 1  |
+		| 20th  | +6 | ${_.sample(features)} |    4     | 4  | 3  | 3  | 3  | 2  | 2  | 2  | 1  | 1  |
+		}}\n\n`;
 	},

-	third : function(classes){
-		const classname = _.sample(classnames);
+	half : function(snippetClasses){
+		return dedent`
+		{{${snippetClasses}
+		##### The ${_.sample(classnames)}
+		| Level | Proficiency | Features     | Spells |--- Spell Slots Per Spell Level ---|||||
+		|      ^| Bonus      ^|             ^| Known ^|  1st  |  2nd  |  3rd  |  4th  |  5th  |
+		|:-----:|:-----------:|:-------------|:------:|:-----:|:-----:|:-----:|:-----:|:-----:|
+		|  1st  | +2 | ${_.sample(features)} |   —    |   —   |   —   |   —   |   —   |   —   |
+		|  2nd  | +2 | ${_.sample(features)} |   2    |   2   |   —   |   —   |   —   |   —   |
+		|  3rd  | +2 | ${_.sample(features)} |   3    |   3   |   —   |   —   |   —   |   —   |
+		|  4th  | +2 | ${_.sample(features)} |   3    |   3   |   —   |   —   |   —   |   —   |
+		|  5th  | +3 | ${_.sample(features)} |   4    |   4   |   2   |   —   |   —   |   —   |
+		|  6th  | +3 | ${_.sample(features)} |   4    |   4   |   2   |   —   |   —   |   —   |
+		|  7th  | +3 | ${_.sample(features)} |   5    |   4   |   3   |   —   |   —   |   —   |
+		|  8th  | +3 | ${_.sample(features)} |   5    |   4   |   3   |   —   |   —   |   —   |
+		|  9th  | +4 | ${_.sample(features)} |   6    |   4   |   3   |   2   |   —   |   —   |
+		| 10th  | +4 | ${_.sample(features)} |   6    |   4   |   3   |   2   |   —   |   —   |
+		| 11th  | +4 | ${_.sample(features)} |   7    |   4   |   3   |   3   |   —   |   —   |
+		| 12th  | +4 | ${_.sample(features)} |   7    |   4   |   3   |   3   |   —   |   —   |
+		| 13th  | +5 | ${_.sample(features)} |   8    |   4   |   3   |   3   |   1   |   —   |
+		| 14th  | +5 | ${_.sample(features)} |   8    |   4   |   3   |   3   |   1   |   —   |
+		| 15th  | +5 | ${_.sample(features)} |   9    |   4   |   3   |   3   |   2   |   —   |
+		| 16th  | +5 | ${_.sample(features)} |   9    |   4   |   3   |   3   |   2   |   —   |
+		| 17th  | +6 | ${_.sample(features)} |   10   |   4   |   3   |   3   |   3   |   1   |
+		| 18th  | +6 | ${_.sample(features)} |   10   |   4   |   3   |   3   |   3   |   1   |
+		| 19th  | +6 | ${_.sample(features)} |   11   |   4   |   3   |   3   |   3   |   2   |
+		| 20th  | +6 | ${_.sample(features)} |   11   |   4   |   3   |   3   |   3   |   2   |
+		}}\n\n`;
+	},

-		let cantrips = 3;
-		let spells = 1;
-		let slots = 2;
-		return `{{${classes}\n##### ${classname} Spellcasting\n` +
-		`| Class  | Cantrips | Spells  |--- Spells Slots per Spell Level ---||||\n` +
-		`| Level ^| Known   ^| Known  ^|   1st   |   2nd   |   3rd   |   4th   |\n` +
-		`|:------:|:--------:|:-------:|:-------:|:-------:|:-------:|:-------:|\n${
-			_.map(levels, function(levelName, level){
-				const res = [
-					_.pad(levelName, 6),
-					_.pad(cantrips.toString(), 8),
-					_.pad(spells.toString(), 7),
-					drawSlots(slots, 4, 7),
-				].join(' | ');
-
-				cantrips += _.random(0, 1);
-				spells += _.random(0, 1);
-				slots += _.random(0, 1);
-
-				return `| ${res} |`;
-			}).join('\n')}\n}}\n\n`;
+	third : function(snippetClasses){
+		return dedent`
+		{{${snippetClasses}
+		##### ${_.sample(classnames)} Spellcasting
+		| Level | Cantrips | Spells |--- Spells Slots per Spell Level ---||||
+		|      ^| Known   ^| Known ^|   1st   |   2nd   |   3rd   |   4th   |
+		|:-----:|:--------:|:------:|:-------:|:-------:|:-------:|:-------:|
+		|  3rd  |    2     |   3    |    2    |    —    |    —    |    —    |
+		|  4th  |    2     |   4    |    3    |    —    |    —    |    —    |
+		|  5th  |    2     |   4    |    3    |    —    |    —    |    —    |
+		|  6th  |    2     |   4    |    3    |    —    |    —    |    —    |
+		|  7th  |    2     |   5    |    4    |    2    |    —    |    —    |
+		|  8th  |    2     |   6    |    4    |    2    |    —    |    —    |
+		|  9th  |    2     |   6    |    4    |    2    |    —    |    —    |
+		| 10th  |    3     |   7    |    4    |    3    |    —    |    —    |
+		| 11th  |    3     |   8    |    4    |    3    |    —    |    —    |
+		| 12th  |    3     |   8    |    4    |    3    |    —    |    —    |
+		| 13th  |    3     |   9    |    4    |    3    |    2    |    —    |
+		| 14th  |    3     |   10   |    4    |    3    |    2    |    —    |
+		| 15th  |    3     |   10   |    4    |    3    |    2    |    —    |
+		| 16th  |    3     |   11   |    4    |    3    |    3    |    —    |
+		| 17th  |    3     |   11   |    4    |    3    |    3    |    —    |
+		| 18th  |    3     |   11   |    4    |    3    |    3    |    —    |
+		| 19th  |    3     |   12   |    4    |    3    |    3    |    1    |
+		| 20th  |    3     |   13   |    4    |    3    |    3    |    1    |
+		}}\n\n`;
 	}
 };
--- a/themes/V3/5ePHB/snippets/tableOfContents.gen.js
+++ b/themes/V3/5ePHB/snippets/tableOfContents.gen.js
@@ -29,21 +29,23 @@ const getTOC = (pages)=>{

 	const res = [];
 	_.each(pages, (page, pageNum)=>{
-		const lines = page.split('\n');
-		_.each(lines, (line)=>{
-			if(_.startsWith(line, '# ')){
-				const title = line.replace('# ', '');
-				add1(title, pageNum);
-			}
-			if(_.startsWith(line, '## ')){
-				const title = line.replace('## ', '');
-				add2(title, pageNum);
-			}
-			if(_.startsWith(line, '### ')){
-				const title = line.replace('### ', '');
-				add3(title, pageNum);
-			}
-		});
+		if(!page.includes("{{frontCover}}") && !page.includes("{{insideCover}}") && !page.includes("{{partCover}}") && !page.includes("{{backCover}}")) {
+			const lines = page.split('\n');
+			_.each(lines, (line)=>{
+				if(_.startsWith(line, '# ')){
+					const title = line.replace('# ', '');
+					add1(title, pageNum);
+				}
+				if(_.startsWith(line, '## ')){
+					const title = line.replace('## ', '');
+					add2(title, pageNum);
+				}
+				if(_.startsWith(line, '### ')){
+					const title = line.replace('### ', '');
+					add3(title, pageNum);
+				}
+			});
+		}
 	});
 	return res;
 };