Update changelog

update deletion to delete brews when the google brew cannot be found

changelog.md

@@ -39,6 +39,121 @@ pre {
 ## changelog
 For a full record of development, visit our [Github Page](https://github.com/naturalcrit/homebrewery).
 
+### Friday 08/09/2022 - v3.2.2
+{{taskList
+
+##### Jeddai:
+
+* [x] Fix brews not deleting from User page when removed from Google Drive externally.
+
+  Fixes issues: [#2325](https://github.com/naturalcrit/homebrewery/issues/2325)
+
+##### G-Ambatte:
+
+* [x] Brew Tags are now searchable on the User page
+
+Fixes issues  [#2317](https://github.com/naturalcrit/homebrewery/issues/2317), [#2319](https://github.com/naturalcrit/homebrewery/issues/2319), [#2334](https://github.com/naturalcrit/homebrewery/issues/2334)
+
+* [x] Several tweaks to the User page
+
+ Fixes issues:  [#1797](https://github.com/naturalcrit/homebrewery/issues/1797), [#2315](https://github.com/naturalcrit/homebrewery/issues/2315), [#2326](https://github.com/naturalcrit/homebrewery/issues/2326), [#2328](https://github.com/naturalcrit/homebrewery/issues/2328)
+}}
+
+### Wednesday 31/08/2022 - v3.2.1
+{{taskList
+
+##### Calculuschild
+
+* [x] Reference Links should now work inside tables
+
+	Fixes issues: [#2307](https://github.com/naturalcrit/homebrewery/issues/2307)
+
+##### Jeddai:
+
+* [x] Fix printing from `/new` not working
+
+  Fixes issues: [#1789](https://github.com/naturalcrit/homebrewery/issues/1789), [#1806](https://github.com/naturalcrit/homebrewery/issues/1806)
+
+* [x] Fix broken snippet buttons on `/new`
+
+  Fixes issues: [#2311](https://github.com/naturalcrit/homebrewery/issues/2311)
+
+##### G-Ambatte:
+
+* [x] Several small tweaks to the User page
+
+  Fixes issues: [#2301](https://github.com/naturalcrit/homebrewery/issues/2301), [#2303](https://github.com/naturalcrit/homebrewery/issues/2303), [#2121](https://github.com/naturalcrit/homebrewery/issues/2121)
+}}
+
+\page
+
+### Saturday 27/08/2022 - v3.2.0
+{{taskList
+
+##### Calculuschild
+
+* [x] The V3 renderer is now the default for new brews.
+
+* [x] Small tweaks to the spacing around the `classTable` style
+
+##### Jeddai:
+
+* [x] Brew transfers between Homebrewery and Google Drive now keep the same share and edit links! Metadata is now also kept across transfers.
+
+  Fixes issues: [#1838](https://github.com/naturalcrit/homebrewery/issues/1838)
+
+* [x] Brews can now be labeled with tags; these will be searchable on the My Brews page in a future update.
+
+  Fixes issues: [#758](https://github.com/naturalcrit/homebrewery/issues/758)
+
+##### Jlgraves:
+
+* [x] Small tweaks to the `ClassFeature` snippet
+
+  Fixes issues: [#2215](https://github.com/naturalcrit/homebrewery/issues/2215)
+}}
+
+
+### Thursday 09/06/2022 - v3.1.1
+{{taskList
+
+##### Calculuschild:
+
+* [x] Fixed class table decorations appearing on top of the table in PDF output.
+
+  Fixes issues: [#1784](https://github.com/naturalcrit/homebrewery/issues/1784)
+
+* [x] Fix bottom decoration on half class tables disappearing when the table is too short.
+
+  Fixes issues: [#2202](https://github.com/naturalcrit/homebrewery/issues/2202)
+}}
+
+### Monday 06/06/2022 - v3.1.0
+{{taskList
+
+##### G-Ambatte:
+
+* [x] "Jump to Preview/Editor" buttons added to the divider bar. Easily sync between the editor and preview panels!
+
+  Fixes issues: [#1756](https://github.com/naturalcrit/homebrewery/issues/1756)
+
+* [x] Speedups to the user page for users with large and/or many brews.
+
+  Fixes issues: [#2147](https://github.com/naturalcrit/homebrewery/issues/2147)
+
+* [x] Search text on the user page is saved to the URL for easy bookmarking in your browser
+
+  Fixes issues: [#1858](https://github.com/naturalcrit/homebrewery/issues/1858)
+
+* [x] Added easy login system for offline installs.
+
+  Fixes issues: [#269](https://github.com/naturalcrit/homebrewery/issues/269)
+
+* [x] New **THUMBNAIL** option in the {{fa,fa-info-circle}} **Properties** menu. This image will show up in social media links.
+
+  Fixes issues: [#820](https://github.com/naturalcrit/homebrewery/issues/820)
+}}
+
 ### Wednesday 27/03/2022 - v3.0.8
 {{taskList
 * [x] Style updates to user page.

client/homebrew/brewRenderer/brewRenderer.jsx

@@ -188,7 +188,7 @@ const BrewRenderer = createClass({
 					</div>
 	        : null}
 
-				<Frame initialContent={this.state.initialContent}
+				<Frame id='BrewRenderer' initialContent={this.state.initialContent}
 					style={{ width: '100%', height: '100%', visibility: this.state.visibility }}
 					contentDidMount={this.frameDidMount}>
 					<div className={'brewRenderer'}

client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx

@@ -4,7 +4,7 @@ const createClass = require('create-react-class');
 const _     = require('lodash');
 const cx    = require('classnames');	//Unused variable
 
-const DISMISS_KEY = 'dismiss_notification09-9-21';
+const DISMISS_KEY = 'dismiss_notification08-27-22';
 
 const NotificationPopup = createClass({
 	displayName     : 'NotificationPopup',
@@ -22,45 +22,45 @@ const NotificationPopup = createClass({
 	},
 	notifications : {
 		psa : function(){
-			return <li key='psa'>
+			return (
-				<em>V3.0.0 Released!</em> <br />
+				<>
-				After a long and bumpy road, we decided it was high time we finally release version 3 of the homebrewery into the wild. You can check out a
+					<li key='psa'>
-				brief overview and see how to opt-in to the new features here:&nbsp;
+						<em>V3.2.0 Released!</em> <br />
-				<a target='_blank' href='https://homebrewery.naturalcrit.com/v3_preview'>V3 Welcome Page</a> and&nbsp;
+						We are happy to announce that after nearly a year of use by our many users,
-				<a target='_blank' href='https://homebrewery.naturalcrit.com/changelog'>the Changelog</a>.
+						we are making the V3 render mode the default setting for all new brews.
-				<br /><br />
+						This mode has become quite popular, and has proven to be stable and powerful.
-				<em>BE WARNED:</em> As we continue to develop V3, expect small tweaks in the styling, fonts, and snippets; your brews may look slightly
+						Of course, we will always keep the option to use the Legacy renderer for any
-				different from day-to-day. All of your old documents will continue to work as normal; we are not touching them. If you don't want to deal
+						brew, which can still be accessed from the Properties menu.
-				with the possibility of slight formatting changes, you may choose to stick with the Legacy renderer on any of your brews for as long as you like.
+					</li>
-				<br /><br />
+
-				With this in mind, if you still wish to try out V3, you can opt-in any of your brews to the the V3 renderer.
+					<li key='stubs'>
-				This will likely break much of your formatting as a lot of the Markdown code has been updated, and starting from scratch may be cleaner.
+						<em>Change to Google Drive Storage!</em> <br />
-				(Don't worry, you can always change the renderer back to Legacy	for any brew at any time).
+						We have made a change to the process of tranferring brews between Google
-			</li>;
+						Drive and the Homebrewery storage. Starting now, any time a brew is
-		},
+						transferred, it will keep the same links instead of generating new ones!
-		refreshGoogle : function (){
+						We hope this change will help reduce issues where people "lost" their work
-			return <li key='refreshGoogle'>
+						by trying to visit old links.
-				<em>Refresh your Google Drive Credentials!</em> <br />
+					</li>
-				Currently a lot of people are striking issues with their Google credentials expiring, which happens one year after the last sign in via
+
-				Google. This can cause errors when trying to save your brews. If this happens, simply visit the&nbsp;
+					<li key='googleDriveFolder'>
-				<a target='_blank' href='https://www.naturalcrit.com/login'>
+						<em>Don't delete your Homebrewery folder on Google Drive!</em> <br />
-				logout page
+						We have had several reports of users losing their brews, not realizing
-				</a>
+						that they had deleted the files on their Google Drive. If you have a Homebrewery folder
-				, sign out, and then sign	back in "with Google" to refresh your credentials. See&nbsp;
+						on your Google Drive with *.txt files inside, <em>do not delete it</em>!
-				<a target='_blank' href='https://github.com/naturalcrit/homebrewery/discussions/1580'>
+						We cannot help you recover files that you have deleted from your own
-					this discussion on Github
+						Google Drive.
-				</a> for more details.
+					</li>
-			</li>;
+
-		},
+					<li key='faq'>
-		faq : function(){
+						<em>Protect your work! </em> <br />
-			return <li key='faq'>
+						If you opt not to use your Google Drive, keep in mind that we do not save a history of your projects. Please make frequent backups of your brews!&nbsp;
-				<em>Protect your work! </em> <br />
+						<a target='_blank' href='https://www.reddit.com/r/homebrewery/comments/adh6lh/faqs_psas_announcements/'>
-				If you opt not to use your Google Drive, keep in mind that we do not save a history of your projects. Please make frequent backups of your brews!&nbsp;
+							See the FAQ
-				<a target='_blank' href='https://www.reddit.com/r/homebrewery/comments/adh6lh/faqs_psas_announcements/'>
+						</a> to learn how to avoid losing your work!
-					See the FAQ
+					</li>
-				</a> to learn how to avoid losing your work!
+				</>
-			</li>;
+			);
-		},
+		}
 	},
 	checkNotifications : function(){
 		const hideDismiss = localStorage.getItem(DISMISS_KEY);

client/homebrew/editor/editor.jsx

@@ -61,8 +61,14 @@ const Editor = createClass({
 		window.removeEventListener('resize', this.updateEditorSize);
 	},
 
-	componentDidUpdate : function() {
+	componentDidUpdate : function(prevProps, prevState, snapshot) {
 		this.highlightCustomMarkdown();
+		if(prevProps.moveBrew !== this.props.moveBrew) {
+			this.brewJump();
+		};
+		if(prevProps.moveSource !== this.props.moveSource) {
+			this.sourceJump();
+		};
 	},
 
 	updateEditorSize : function() {
@@ -90,15 +96,20 @@ const Editor = createClass({
 	},
 
 	handleViewChange : function(newView){
+		this.props.setMoveArrows(newView === 'text');
 		this.setState({
 			view : newView
 		}, this.updateEditorSize);	//TODO: not sure if updateeditorsize needed
 	},
 
 	getCurrentPage : function(){
-		const lines = this.props.brew.text.split('\n').slice(0, this.cursorPosition.line + 1);
+		const lines = this.props.brew.text.split('\n').slice(0, this.refs.codeEditor.getCursorPosition().line + 1);
 		return _.reduce(lines, (r, line)=>{
-			if(line.indexOf('\\page') !== -1) r++;
+			if(
+				(this.props.renderer == 'legacy' && line.indexOf('\\page') !== -1)
+				||
+				(this.props.renderer == 'V3' && line.match(/^\\page$/))
+			) r++;
 			return r;
 		}, 1);
 	},
@@ -120,6 +131,7 @@ const Editor = createClass({
 					//reset custom line styles
 					codeMirror.removeLineClass(lineNumber, 'background', 'pageLine');
 					codeMirror.removeLineClass(lineNumber, 'text');
+					codeMirror.removeLineClass(lineNumber, 'wrap', 'sourceMoveFlash');
 
 					// Styling for \page breaks
 					if((this.props.renderer == 'legacy' && line.includes('\\page')) ||
@@ -174,9 +186,76 @@ const Editor = createClass({
 		}
 	},
 
-	brewJump : function(){
+	brewJump : function(targetPage=this.getCurrentPage()){
-		const currentPage = this.getCurrentPage();
+		if(!window) return;
-		window.location.hash = `p${currentPage}`;
+		// console.log(`Scroll to: p${targetPage}`);
+		const brewRenderer = window.frames['BrewRenderer'].contentDocument.getElementsByClassName('brewRenderer')[0];
+		const currentPos = brewRenderer.scrollTop;
+		const targetPos = window.frames['BrewRenderer'].contentDocument.getElementById(`p${targetPage}`).getBoundingClientRect().top;
+		const interimPos = targetPos >= 0 ? -30 : 30;
+
+		const bounceDelay = 100;
+		const scrollDelay = 500;
+
+		if(!this.throttleBrewMove) {
+			this.throttleBrewMove = _.throttle((currentPos, interimPos, targetPos)=>{
+				brewRenderer.scrollTo({ top: currentPos + interimPos, behavior: 'smooth' });
+				setTimeout(()=>{
+					brewRenderer.scrollTo({ top: currentPos + targetPos, behavior: 'smooth', block: 'start' });
+				}, bounceDelay);
+			}, scrollDelay, { leading: true, trailing: false });
+		};
+		this.throttleBrewMove(currentPos, interimPos, targetPos);
+
+		// const hashPage = (page != 1) ? `p${page}` : '';
+		// window.location.hash = hashPage;
+	},
+
+	sourceJump : function(targetLine=null){
+		if(this.isText()) {
+			if(targetLine == null) {
+				targetLine = 0;
+
+				const pageCollection = window.frames['BrewRenderer'].contentDocument.getElementsByClassName('page');
+				const brewRendererHeight = window.frames['BrewRenderer'].contentDocument.getElementsByClassName('brewRenderer').item(0).getBoundingClientRect().height;
+
+				let currentPage = 1;
+				for (const page of pageCollection) {
+					if(page.getBoundingClientRect().bottom > (brewRendererHeight / 2)) {
+						currentPage = parseInt(page.id.slice(1)) || 1;
+						break;
+					}
+				}
+
+				const textSplit = this.props.renderer == 'V3' ? /^\\page$/gm : /\\page/;
+				const textString = this.props.brew.text.split(textSplit).slice(0, currentPage-1).join(textSplit);
+				const textPosition = textString.length;
+				const lineCount = textString.match('\n') ? textString.slice(0, textPosition).split('\n').length : 0;
+
+				targetLine = lineCount - 1; //Scroll to `\page`, which is one line back.
+
+				let currentY = this.refs.codeEditor.codeMirror.getScrollInfo().top;
+				let targetY  = this.refs.codeEditor.codeMirror.heightAtLine(targetLine, 'local', true);
+
+				//Scroll 1/10 of the way every 10ms until 1px off.
+				const incrementalScroll = setInterval(()=>{
+					currentY += (targetY - currentY) / 10;
+					this.refs.codeEditor.codeMirror.scrollTo(null, currentY);
+
+					// Update target: target height is not accurate until within +-10 lines of the visible window
+					if(Math.abs(targetY - currentY > 100))
+						targetY = this.refs.codeEditor.codeMirror.heightAtLine(targetLine, 'local', true);
+
+					// End when close enough
+					if(Math.abs(targetY - currentY) < 1) {
+						this.refs.codeEditor.codeMirror.scrollTo(null, targetY);  // Scroll any remaining difference
+						this.refs.codeEditor.setCursorPosition({ line: targetLine + 1, ch: 0 });
+						this.refs.codeEditor.codeMirror.addLineClass(targetLine + 1, 'wrap', 'sourceMoveFlash');
+						clearInterval(incrementalScroll);
+					}
+				}, 10);
+			}
+		}
 	},
 
 	//Called when there are changes to the editor's dimensions

client/homebrew/editor/metadataEditor/metadataEditor.jsx

@@ -1,12 +1,16 @@
+/* eslint-disable max-lines */
 require('./metadataEditor.less');
 const React = require('react');
 const createClass = require('create-react-class');
 const _     = require('lodash');
 const cx    = require('classnames');
 const request = require('superagent');
+const StringArrayEditor = require('../stringArrayEditor/stringArrayEditor.jsx');
 
 const SYSTEMS = ['5e', '4e', '3.5e', 'Pathfinder'];
 
+const homebreweryThumbnail = require('../../thumbnail.png');
+
 const MetadataEditor = createClass({
 	displayName     : 'MetadataEditor',
 	getDefaultProps : function() {
@@ -15,7 +19,7 @@ const MetadataEditor = createClass({
 				editId      : null,
 				title       : '',
 				description : '',
-				tags        : '',
+				tags        : [],
 				published   : false,
 				authors     : [],
 				systems     : [],
@@ -25,10 +29,28 @@ const MetadataEditor = createClass({
 		};
 	},
 
+	getInitialState : function(){
+		return {
+			showThumbnail : true
+		};
+	},
+
+	toggleThumbnailDisplay : function(){
+		this.setState({
+			showThumbnail : !this.state.showThumbnail
+		});
+	},
+
+	renderThumbnail : function(){
+		if(!this.state.showThumbnail) return;
+		return <img className='thumbnail-preview' src={this.props.metadata.thumbnail || homebreweryThumbnail}></img>;
+	},
+
 	handleFieldChange : function(name, e){
-		this.props.onChange(_.merge({}, this.props.metadata, {
+		this.props.onChange({
+			...this.props.metadata,
 			[name] : e.target.value
-		}));
+		});
 	},
 	handleSystem : function(system, e){
 		if(e.target.checked){
@@ -45,9 +67,10 @@ const MetadataEditor = createClass({
 		this.props.onChange(this.props.metadata);
 	},
 	handlePublish : function(val){
-		this.props.onChange(_.merge({}, this.props.metadata, {
+		this.props.onChange({
+			...this.props.metadata,
 			published : val
-		}));
+		});
 	},
 
 	handleDelete : function(){
@@ -59,7 +82,7 @@ const MetadataEditor = createClass({
 			if(!confirm('Are you REALLY sure? You will lose editor access to this document.')) return;
 		}
 
-		request.delete(`/api/${this.props.metadata.googleId}${this.props.metadata.editId}`)
+		request.delete(`/api/${this.props.metadata.googleId ?? ''}${this.props.metadata.editId}`)
 			.send()
 			.end(function(err, res){
 				window.location.href = '/';
@@ -142,8 +165,8 @@ const MetadataEditor = createClass({
 					V3
 				</label>
 
-				<a href='/v3_preview' target='_blank' rel='noopener noreferrer'>
+				<a href='/legacy' target='_blank' rel='noopener noreferrer'>
-					Click here for a quick intro to V3!
+					Click here to see the demo page for the old Legacy renderer!
 				</a>
 			</div>
 		</div>;
@@ -162,13 +185,23 @@ const MetadataEditor = createClass({
 				<textarea value={this.props.metadata.description} className='value'
 					onChange={(e)=>this.handleFieldChange('description', e)} />
 			</div>
-			{/*}
+			<div className='field thumbnail'>
-			<div className='field tags'>
+				<label>thumbnail</label>
-				<label>tags</label>
+				<input type='text'
-				<textarea value={this.props.metadata.tags}
+					value={this.props.metadata.thumbnail}
-					onChange={(e)=>this.handleFieldChange('tags', e)} />
+					placeholder='my.thumbnail.url'
+					className='value'
+					onChange={(e)=>this.handleFieldChange('thumbnail', e)} />
+				<button className='display' onClick={this.toggleThumbnailDisplay}>
+					<i className={`fas fa-caret-${this.state.showThumbnail ? 'right' : 'left'}`} />
+				</button>
+				{this.renderThumbnail()}
 			</div>
-			*/}
+
+			<StringArrayEditor label='tags' valuePatterns={[/^(?:(?:group|meta|system|type):)?[A-Za-z0-9][A-Za-z0-9 \/.\-]{0,40}$/]}
+				placeholder='add tag' unique={true}
+				values={this.props.metadata.tags}
+				onChange={(e)=>this.handleFieldChange('tags', e)}/>
 
 			{this.renderAuthors()}
 

client/homebrew/editor/metadataEditor/metadataEditor.less

@@ -1,3 +1,4 @@
+@import 'naturalcrit/styles/colors.less';
 
 .metadataEditor{
 	position         : absolute;
@@ -24,6 +25,33 @@
 			flex           : 1 1 auto;
 			min-width      : 200px;
 		}
+		&.thumbnail{
+			height      : 1.4em;
+			label{
+				line-height: 2.0em;
+			}
+			.value{
+  				overflow: hidden;
+  				text-overflow: ellipsis;
+			}
+			button{
+				border: 1px solid #999;
+				color: white;
+				padding: 0px 5px;
+				background-color: black;
+				&:hover{
+					background-color: #777;
+				}
+			}
+			.thumbnail-preview{
+				position    : relative;
+				width       : 80px;
+				height      : min-content;
+				border      : 2px solid white;
+				margin-left : 5px;
+				max-height  : 115px;
+			}
+		}
 	}
 	.description.field textarea.value{
 		resize      : none;
@@ -81,4 +109,86 @@
 		font-size: 0.8em;
 		line-height    : 1.5em;
 	}
+
+	.field .list {
+		display: flex;
+		flex-wrap: wrap;
+
+		> * {
+			flex: 0 0 auto;
+		}
+
+		#groupedIcon {
+			#backgroundColors;
+			display: inline-block;
+			height: ~"calc(100% + 0.6em)";
+			position: relative;
+			top: -0.3em;
+			right: -0.3em;
+			cursor: pointer;
+			min-width: 20px;
+			text-align: center;
+			color: white;
+
+			i {
+				position: relative;
+				top: 50%;
+				transform: translateY(-50%);
+			}
+
+			&:not(:last-child) {
+				border-right: 1px solid black;
+			}
+
+			&:last-child {
+				border-radius: 0 0.5em 0.5em 0;
+			}
+		}
+
+		.badge {
+			background-color: #dddddd;
+			border-radius: .5em;
+			font-size: .9em;
+			margin: 2px;
+			padding: .3em;
+
+			.icon {
+				#groupedIcon
+			}
+		}
+
+		.input-group {
+			height: ~"calc(.9em + 4px + .6em)";
+
+			input {
+				border-radius: .5em 0 0 .5em;
+			}
+
+			input:last-child {
+				border-radius: .5em;
+			}
+
+			.value {
+				width: 7.5vw;
+				min-width: 75px;
+				height: 100%;
+			}
+
+			.invalid:focus {
+				background-color: pink;
+			}
+
+			.icon {
+				#groupedIcon;
+				height: 97%;
+				font-size: .8em;
+				right: 1px;
+				top: -.54em;
+
+				i {
+					font-size: 1.125em;
+				}
+			}
+		}
+	}
 }

client/homebrew/editor/snippetbar/snippets/classfeature.gen.js

@@ -9,6 +9,7 @@ module.exports = function(classname){
 	classname = classname.toLowerCase();
 
 	const hitDie = _.sample([4, 6, 8, 10, 12]);
+	const spellSkill = _.sample(['Wisdom', 'Charisma', 'Intelligence']);
 
 	const abilityList = ['Strength', 'Dexerity', 'Constitution', 'Wisdom', 'Charisma', 'Intelligence'];
 	const skillList = ['Acrobatics', 'Animal Handling', 'Arcana', 'Athletics', 'Deception', 'History', 'Insight', 'Intimidation', 'Investigation', 'Medicine', 'Nature', 'Perception', 'Performance', 'Persuasion', 'Religion', 'Sleight of Hand', 'Stealth', 'Survival'];
@@ -27,11 +28,19 @@ module.exports = function(classname){
 
 		**Armor:**   :: ${_.sampleSize(['Light armor', 'Medium armor', 'Heavy armor', 'Shields'], _.random(0, 3)).join(', ') || 'None'}
 		**Weapons:** :: ${_.sampleSize(['Squeegee', 'Rubber Chicken', 'Simple weapons', 'Martial weapons'], _.random(0, 2)).join(', ') || 'None'}
-		**Tools:**   :: ${_.sampleSize(['Artian\'s tools', 'one musical instrument', 'Thieve\'s tools'], _.random(0, 2)).join(', ') || 'None'}
+		**Tools:**   :: ${_.sampleSize(['Artisan\'s tools', 'one musical instrument', 'Thieves\' tools'], _.random(0, 2)).join(', ') || 'None'}
 
 		**Saving Throws:** :: ${_.sampleSize(abilityList, 2).join(', ')}
 		**Skills:**        :: Choose two from ${_.sampleSize(skillList, _.random(4, 6)).join(', ')}
 
+		#### Spellcasting Ability
+
+		{{text-align:center
+		**Spell save DC**:: = ${_.sample([6, 8, 10])} + your proficiency bonus + your ${spellSkill} modifier
+
+		**Spell attack modifier**:: = your proficiency bonus + your ${spellSkill} modifier
+		}}
+
 		#### Equipment
 		You start with the following equipment, in addition to the equipment granted by your background:
 		- *(a)* a martial weapon and a shield or *(b)* two martial weapons

client/homebrew/editor/snippetbar/snippetsLegacy/classfeature.gen.js

@@ -8,6 +8,7 @@ module.exports = function(classname){
 	classname = classname.toLowerCase();
 
 	const hitDie = _.sample([4, 6, 8, 10, 12]);
+	const spellSkill = _.sample(['Wisdom', 'Charisma', 'Intelligence']);
 
 	const abilityList = ['Strength', 'Dexerity', 'Constitution', 'Wisdom', 'Charisma', 'Intelligence'];
 	const skillList = ['Acrobatics ', 'Animal Handling', 'Arcana', 'Athletics', 'Deception', 'History', 'Insight', 'Intimidation', 'Investigation', 'Medicine', 'Nature', 'Perception', 'Performance', 'Persuasion', 'Religion', 'Sleight of Hand', 'Stealth', 'Survival'];
@@ -26,12 +27,21 @@ module.exports = function(classname){
 		'___',
 		`- **Armor:** ${_.sampleSize(['Light armor', 'Medium armor', 'Heavy armor', 'Shields'], _.random(0, 3)).join(', ') || 'None'}`,
 		`- **Weapons:** ${_.sampleSize(['Squeegee', 'Rubber Chicken', 'Simple weapons', 'Martial weapons'], _.random(0, 2)).join(', ') || 'None'}`,
-		`- **Tools:** ${_.sampleSize(['Artian\'s tools', 'one musical instrument', 'Thieve\'s tools'], _.random(0, 2)).join(', ') || 'None'}`,
+		`- **Tools:** ${_.sampleSize(['Artisan\'s tools', 'one musical instrument', 'Thieves\' tools'], _.random(0, 2)).join(', ') || 'None'}`,
 		'',
 		'___',
 		`- **Saving Throws:** ${_.sampleSize(abilityList, 2).join(', ')}`,
 		`- **Skills:** Choose two from ${_.sampleSize(skillList, _.random(4, 6)).join(', ')}`,
 		'',
+		'#### Spellcasting Ability',
+		'',
+		`<div style=text-align:center>`,
+		'___',
+		`- **Spell save DC** = ${_.sample([6, 8, 10])} + your proficiency bonus + your ${spellSkill} modifier`,
+		'',
+		`- **Spell attack modifier** = your proficiency bonus + your ${spellSkill} modifier`,
+		`</div>`,
+		'',
 		'#### Equipment',
 		'You start with the following equipment, in addition to the equipment granted by your background:',
 		'- *(a)* a martial weapon and a shield or *(b)* two martial weapons',

client/homebrew/editor/stringArrayEditor/stringArrayEditor.jsx

@@ -0,0 +1,142 @@
+const React = require('react');
+const createClass = require('create-react-class');
+const _     = require('lodash');
+
+const StringArrayEditor = createClass({
+	displayName     : 'StringArrayEditor',
+	getDefaultProps : function() {
+		return {
+			label         : '',
+			values        : [],
+			valuePatterns : null,
+			placeholder   : '',
+			unique        : false,
+			cannotEdit    : [],
+			onChange      : ()=>{}
+		};
+	},
+
+	getInitialState : function() {
+		return {
+			valueContext : !!this.props.values ? this.props.values.map((value)=>({
+				value,
+				editing : false
+			})) : [],
+			temporaryValue : '',
+			updateValue    : ''
+		};
+	},
+
+	componentDidUpdate : function(prevProps) {
+		if(!_.eq(this.props.values, prevProps.values)) {
+			this.setState({
+				valueContext : this.props.values ? this.props.values.map((newValue)=>({
+					value   : newValue,
+					editing : this.state.valueContext.find(({ value })=>value === newValue)?.editing || false
+				})) : []
+			});
+		}
+	},
+
+	handleChange : function(value) {
+		this.props.onChange({
+			target : {
+				value
+			}
+		});
+	},
+
+	addValue : function(value){
+		this.handleChange(_.uniq([...this.props.values, value]));
+		this.setState({
+			temporaryValue : ''
+		});
+	},
+
+	removeValue : function(index){
+		this.handleChange(this.props.values.filter((_, i)=>i !== index));
+	},
+
+	updateValue : function(value, index){
+		const valueContext = this.state.valueContext;
+		valueContext[index].value = value;
+		valueContext[index].editing = false;
+		this.handleChange(valueContext.map((context)=>context.value));
+		this.setState({ valueContext, updateValue: '' });
+	},
+
+	editValue : function(index){
+		if(!!this.props.cannotEdit && this.props.cannotEdit.includes(this.props.values[index])) {
+			return;
+		}
+		const valueContext = this.state.valueContext.map((context, i)=>{
+			context.editing = index === i;
+			return context;
+		});
+		this.setState({ valueContext, updateValue: this.props.values[index] });
+	},
+
+	valueIsValid : function(value, index) {
+		const values = _.clone(this.props.values);
+		if(index !== undefined) {
+			values.splice(index, 1);
+		}
+		const matchesPatterns = !this.props.valuePatterns || this.props.valuePatterns.some((pattern)=>!!(value || '').match(pattern));
+		const uniqueIfSet = !this.props.unique || !values.includes(value);
+		return matchesPatterns && uniqueIfSet;
+	},
+
+	handleValueInputKeyDown : function(event, index) {
+		if(event.key === 'Enter') {
+			if(this.valueIsValid(event.target.value, index)) {
+				if(index !== undefined) {
+					this.updateValue(event.target.value, index);
+				} else {
+					this.addValue(event.target.value);
+				}
+			}
+		} else if(event.key === 'Escape') {
+			this.closeEditInput(index);
+		}
+	},
+
+	closeEditInput : function(index) {
+		const valueContext = this.state.valueContext;
+		valueContext[index].editing = false;
+		this.setState({ valueContext, updateValue: '' });
+	},
+
+	render : function() {
+		const valueElements = Object.values(this.state.valueContext).map((context, i)=>context.editing
+			? <React.Fragment key={i}>
+				<div className='input-group'>
+					<input type='text' className={`value ${this.valueIsValid(this.state.updateValue, i) ? '' : 'invalid'}`} autoFocus placeholder={this.props.placeholder}
+						value={this.state.updateValue}
+						onKeyDown={(e)=>this.handleValueInputKeyDown(e, i)}
+						onChange={(e)=>this.setState({ updateValue: e.target.value })}/>
+					{<div className='icon steel' onClick={(e)=>{ e.stopPropagation(); this.closeEditInput(i); }}><i className='fa fa-undo fa-fw'/></div>}
+					{this.valueIsValid(this.state.updateValue, i) ? <div className='icon steel'  onClick={(e)=>{ e.stopPropagation(); this.updateValue(this.state.updateValue, i); }}><i className='fa fa-check fa-fw'/></div> : null}
+				</div>
+			</React.Fragment>
+			: <div className='badge' key={i} onClick={()=>this.editValue(i)}>{context.value}
+				{!!this.props.cannotEdit && this.props.cannotEdit.includes(context.value) ? null : <div className='icon steel' onClick={(e)=>{ e.stopPropagation(); this.removeValue(i); }}><i className='fa fa-times fa-fw'/></div>}
+			</div>
+		);
+
+		return <div className='field values'>
+			<label>{this.props.label}</label>
+			<div className='list'>
+				{valueElements}
+				<div className='input-group'>
+					<input type='text' className={`value ${this.valueIsValid(this.state.temporaryValue) ? '' : 'invalid'}`} placeholder={this.props.placeholder}
+						value={this.state.temporaryValue}
+						onKeyDown={(e)=>this.handleValueInputKeyDown(e)}
+						onChange={(e)=>this.setState({ temporaryValue: e.target.value })}/>
+					{this.valueIsValid(this.state.temporaryValue) ? <div className='icon steel' onClick={(e)=>{ e.stopPropagation(); this.addValue(this.state.temporaryValue); }}><i className='fa fa-check fa-fw'/></div> : null}
+				</div>
+			</div>
+		</div>;
+	}
+});
+
+module.exports = StringArrayEditor;

client/homebrew/homebrew.jsx

@@ -1,8 +1,8 @@
 require('./homebrew.less');
 const React = require('react');
 const createClass = require('create-react-class');
-const { StaticRouter:Router, Switch, Route } = require('react-router-dom');
+const { StaticRouter:Router } = require('react-router-dom/server');
-const queryString = require('query-string');
+const { Route, Routes, useParams, useSearchParams } = require('react-router-dom');
 
 const HomePage = require('./pages/homePage/homePage.jsx');
 const EditPage = require('./pages/editPage/editPage.jsx');
@@ -12,6 +12,23 @@ const NewPage = require('./pages/newPage/newPage.jsx');
 //const ErrorPage = require('./pages/errorPage/errorPage.jsx');
 const PrintPage = require('./pages/printPage/printPage.jsx');
 
+const WithRoute = (props)=>{
+	const params = useParams();
+	const [searchParams] = useSearchParams();
+	const queryParams = {};
+	for (const [key, value] of searchParams?.entries() || []) {
+		queryParams[key] = value;
+	}
+	const Element = props.el;
+	const allProps = {
+		...props,
+		...params,
+		query : queryParams,
+		el    : undefined
+	};
+	return <Element {...allProps} />;
+};
+
 const Homebrew = createClass({
 	displayName     : 'Homebrewery',
 	getDefaultProps : function() {
@@ -33,33 +50,34 @@ const Homebrew = createClass({
 		};
 	},
 
-	getInitialState : function(){
+	getInitialState : function() {
-		global.version = this.props.version;
 		global.account = this.props.account;
+		global.version = this.props.version;
 		global.enable_v3 = this.props.enable_v3;
+		global.config = this.props.config;
+
 		return {};
 	},
 
 	render : function (){
-		return (
+		return <Router location={this.props.url}>
-			<Router location={this.props.url}>
+			<div className='homebrew'>
-				<div className='homebrew'>
+				<Routes>
-					<Switch>
+					<Route path='/edit/:id' element={<WithRoute el={EditPage} brew={this.props.brew} />} />
-						<Route path='/edit/:id' component={(routeProps)=><EditPage id={routeProps.match.params.id} brew={this.props.brew} />}/>
+					<Route path='/share/:id' element={<WithRoute el={SharePage} brew={this.props.brew} />} />
-						<Route path='/share/:id' component={(routeProps)=><SharePage id={routeProps.match.params.id} brew={this.props.brew} />}/>
+					<Route path='/new/:id' element={<WithRoute el={NewPage} brew={this.props.brew} />} />
-						<Route path='/new/:id' component={(routeProps)=><NewPage id={routeProps.match.params.id} brew={this.props.brew} />}/>
+					<Route path='/new' element={<WithRoute el={NewPage}/>} />
-						<Route path='/new' exact component={(routeProps)=><NewPage />}/>
+					<Route path='/user/:username' element={<WithRoute el={UserPage} brews={this.props.brews} />} />
-						<Route path='/user/:username' component={(routeProps)=><UserPage username={routeProps.match.params.username} brews={this.props.brews} />}/>
+					<Route path='/print/:id' element={<WithRoute el={PrintPage} brew={this.props.brew} />} />
-						<Route path='/print/:id' component={(routeProps)=><PrintPage brew={this.props.brew} query={queryString.parse(routeProps.location.search)} />}/>
+					<Route path='/print' element={<WithRoute el={PrintPage} />} />
-						<Route path='/print' exact component={(routeProps)=><PrintPage query={queryString.parse(routeProps.location.search)} />}/>
+					<Route path='/changelog' element={<WithRoute el={SharePage} brew={this.props.brew} />} />
-						<Route path='/changelog' exact component={()=><SharePage brew={this.props.brew} />}/>
+					<Route path='/faq' element={<WithRoute el={SharePage} brew={this.props.brew} />} />
-						<Route path='/faq' exact component={()=><SharePage brew={this.props.brew} />}/>
+					<Route path='/legacy' element={<WithRoute el={HomePage} brew={this.props.brew} />} />
-						<Route path='/v3_preview' exact component={()=><HomePage brew={this.props.brew} />}/>
+					<Route path='/' element={<WithRoute el={HomePage} brew={this.props.brew} />} />
-						<Route path='/' component={()=><HomePage brew={this.props.brew} />}/>
+					<Route path='/*' element={<WithRoute el={HomePage} brew={this.props.brew} />} />
-					</Switch>
+				</Routes>
-				</div>
+			</div>
-			</Router>
+		</Router>;
-		);
 	}
 });
 

client/homebrew/navbar/account.navitem.jsx

@@ -1,6 +1,7 @@
 const React = require('react');
 const createClass = require('create-react-class');
 const Nav = require('naturalcrit/nav/nav.jsx');
+const request = require('superagent');
 
 const Account = createClass({
 	displayName     : 'AccountNavItem',
@@ -23,12 +24,42 @@ const Account = createClass({
 			// Reset divider position
 			window.localStorage.removeItem('naturalcrit-pane-split');
 			// Clear login cookie
-			document.cookie = `nc_session=;expires=Thu, 01 Jan 1970 00:00:01 GMT;path=/;samesite=lax;${window.domain ? `domain=${window.domain}` : ''}`;
+			let domain = '';
+			if(window.location?.hostname) {
+				let domainArray = window.location.hostname.split('.');
+				if(domainArray.length > 2){
+					domainArray = [''].concat(domainArray.slice(-2));
+				}
+				domain = domainArray.join('.');
+			}
+			document.cookie = `nc_session=;expires=Thu, 01 Jan 1970 00:00:01 GMT;path=/;samesite=lax;${domain ? `domain=${domain}` : ''}`;
 			window.location = '/';
-		};
+		}
+	},
+
+	localLogin : async function(){
+		const username = prompt('Enter username:');
+		if(!username) {return;}
+
+		const expiry = new Date;
+		expiry.setFullYear(expiry.getFullYear() + 1);
+
+		const token = await request.post('/local/login')
+				.send({ username })
+				.then((response)=>{
+					return response.body;
+				})
+				.catch((err)=>{
+					console.warn(err);
+				});
+		if(!token) return;
+
+		document.cookie = `nc_session=${token};expires=${expiry};path=/;samesite=lax;${window.domain ? `domain=${window.domain}` : ''}`;
+		window.location.reload(true);
 	},
 
 	render : function(){
+		//  Logged in
 		if(global.account){
 			return <Nav.dropdown>
 				<Nav.item
@@ -56,6 +87,16 @@ const Account = createClass({
 			</Nav.dropdown>;
 		}
 
+		//  Logged out
+		//  LOCAL ONLY
+		if(global.config.local) {
+			return <Nav.item color='teal' icon='fas fa-sign-in-alt' onClick={this.localLogin}>
+				login
+			</Nav.item>;
+		};
+
+		// Logged out
+		// Production site
 		return <Nav.item href={`https://www.naturalcrit.com/login?redirect=${this.state.url}`} color='teal' icon='fas fa-sign-in-alt'>
 			login
 		</Nav.item>;

client/homebrew/navbar/navbar.less

@@ -91,7 +91,7 @@
 				&:nth-of-type(2){ background-color: darken(@purple, 30%); }
 			}
 			.item{
-				#backgroundColors;
+				#backgroundColorsHover;
 				.animate(background-color);
 				position         : relative;
 				display          : block;

client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx

@@ -16,8 +16,8 @@ const BrewItem = createClass({
 			brew : {
 				title       : '',
 				description : '',
-
+				authors     : [],
-				authors : []
+				stubbed     : true
 			}
 		};
 	},
@@ -31,7 +31,7 @@ const BrewItem = createClass({
 			if(!confirm('Are you REALLY sure? You will lose editor access to this document.')) return;
 		}
 
-		request.delete(`/api/${this.props.brew.googleId}${this.props.brew.editId}`)
+		request.delete(`/api/${this.props.brew.googleId ?? ''}${this.props.brew.editId}`)
 			.send()
 			.end(function(err, res){
 				location.reload();
@@ -50,7 +50,7 @@ const BrewItem = createClass({
 		if(!this.props.brew.editId) return;
 
 		let editLink = this.props.brew.editId;
-		if(this.props.brew.googleId) {
+		if(this.props.brew.googleId && !this.props.brew.stubbed) {
 			editLink = this.props.brew.googleId + editLink;
 		}
 
@@ -63,7 +63,7 @@ const BrewItem = createClass({
 		if(!this.props.brew.shareId) return;
 
 		let shareLink = this.props.brew.shareId;
-		if(this.props.brew.googleId) {
+		if(this.props.brew.googleId && !this.props.brew.stubbed) {
 			shareLink = this.props.brew.googleId + shareLink;
 		}
 
@@ -76,7 +76,7 @@ const BrewItem = createClass({
 		if(!this.props.brew.shareId) return;
 
 		let shareLink = this.props.brew.shareId;
-		if(this.props.brew.googleId) {
+		if(this.props.brew.googleId && !this.props.brew.stubbed) {
 			shareLink = this.props.brew.googleId + shareLink;
 		}
 
@@ -86,7 +86,7 @@ const BrewItem = createClass({
 	},
 
 	renderGoogleDriveIcon : function(){
-		if(!this.props.brew.gDrive) return;
+		if(!this.props.brew.googleId) return;
 
 		return <span>
 			<img className='googleDriveIcon' src={googleDriveIcon} alt='googleDriveIcon' />
@@ -95,6 +95,9 @@ const BrewItem = createClass({
 
 	render : function(){
 		const brew = this.props.brew;
+		if(Array.isArray(brew.tags)) {               // temporary fix until dud tags are cleaned
+			brew.tags = brew.tags?.filter(tag => tag); //remove tags that are empty strings
+		}
 		const dateFormatString = 'YYYY-MM-DD HH:mm:ss';
 
 		return <div className='brewItem'>
@@ -104,8 +107,19 @@ const BrewItem = createClass({
 			</div>
 			<hr />
 			<div className='info'>
-				<span title={`Authors:\n${brew.authors.join('\n')}`}>
+
-					<i className='fas fa-user'/> {brew.authors.join(', ')}
+				{brew.tags?.length ? <>
+					<div className='brewTags' title={`Tags:\n${brew.tags.join('\n')}`}>
+						<i className='fas fa-tags'/>
+						{brew.tags.map((tag, idx)=>{
+							let matches = tag.match(/^(?:([^:]+):)?([^:]+)$/);
+							return <span className={matches[1]}>{matches[2]}</span>;
+						})}
+					</div>
+				</> : <></>
+				}
+				<span title={`Authors:\n${brew.authors?.join('\n')}`}>
+					<i className='fas fa-user'/> {brew.authors?.join(', ')}
 				</span>
 				<br />
 				<span title={`Last viewed: ${moment(brew.lastViewed).local().format(dateFormatString)}`}>

client/homebrew/pages/basePages/listPage/brewItem/brewItem.less

@@ -29,13 +29,23 @@
 	.info{
 		position: initial;
 		bottom: 2px;
-		font-family : ScalySans;
+		font-family : ScalySansRemake;
 		font-size   : 1.2em;
 		&>span{
 			margin-right : 12px;
 			line-height  : 1.5em;
 		}
 	}
+	.brewTags span {
+		background-color: #c8ac6e3b;
+		margin: 2px;
+		padding: 2px;
+		border: 1px solid #c8ac6e;
+		border-radius: 4px;
+		white-space: nowrap;
+		display: inline-block;
+		font-weight: bold;
+	}
 	&:hover{
 		.links{
 			opacity : 1;

client/homebrew/pages/basePages/listPage/listPage.jsx

@@ -1,3 +1,4 @@
+/*eslint max-lines: ["warn", {"max": 300, "skipBlankLines": true, "skipComments": true}]*/
 require('./listPage.less');
 const React       = require('react');
 const createClass = require('create-react-class');
@@ -6,6 +7,11 @@ const moment      = require('moment');
 
 const BrewItem    = require('./brewItem/brewItem.jsx');
 
+const USERPAGE_KEY_PREFIX = 'HOMEBREWERY-LISTPAGE';
+
+const DEFAULT_SORT_TYPE = 'alpha';
+const DEFAULT_SORT_DIR = 'asc';
+
 const ListPage = createClass({
 	displayName     : 'ListPage',
 	getDefaultProps : function() {
@@ -21,13 +27,56 @@ const ListPage = createClass({
 		};
 	},
 	getInitialState : function() {
+		// HIDE ALL GROUPS UNTIL LOADED
+		const brewCollection = this.props.brewCollection.map((brewGroup)=>{
+			brewGroup.visible = false;
+			return brewGroup;
+		});
+
 		return {
-			sortType     : 'alpha',
+			filterString   : this.props.query?.filter || '',
-			sortDir      : 'asc',
+			sortType       : this.props.query?.sort || null,
-			filterString : ''
+			sortDir        : this.props.query?.dir || null,
+			query          : this.props.query,
+			brewCollection : brewCollection
 		};
 	},
 
+	componentDidMount : function() {
+		// SAVE TO LOCAL STORAGE WHEN LEAVING PAGE
+		window.onbeforeunload = this.saveToLocalStorage;
+
+		// LOAD FROM LOCAL STORAGE
+		if(typeof window !== 'undefined') {
+			const newSortType = (this.state.sortType ?? (localStorage.getItem(`${USERPAGE_KEY_PREFIX}-SORTTYPE`) || DEFAULT_SORT_TYPE));
+			const newSortDir = (this.state.sortDir ?? (localStorage.getItem(`${USERPAGE_KEY_PREFIX}-SORTDIR`) || DEFAULT_SORT_DIR));
+			this.updateUrl(this.state.filterString, newSortType, newSortDir);
+
+			const brewCollection = this.props.brewCollection.map((brewGroup)=>{
+				brewGroup.visible = (localStorage.getItem(`${USERPAGE_KEY_PREFIX}-VISIBILITY-${brewGroup.class}`) ?? 'true')=='true';
+				return brewGroup;
+			});
+
+			this.setState({
+				brewCollection : brewCollection,
+				sortType       : newSortType,
+				sortDir        : newSortDir
+			});
+		};
+	},
+
+	componentWillUnmount : function() {
+		window.onbeforeunload = function(){};
+	},
+
+	saveToLocalStorage : function() {
+		this.state.brewCollection.map((brewGroup)=>{
+			localStorage.setItem(`${USERPAGE_KEY_PREFIX}-VISIBILITY-${brewGroup.class}`, `${brewGroup.visible}`);
+		});
+		localStorage.setItem(`${USERPAGE_KEY_PREFIX}-SORTTYPE`, this.state.sortType);
+		localStorage.setItem(`${USERPAGE_KEY_PREFIX}-SORTDIR`, this.state.sortDir);
+	},
+
 	renderBrews : function(brews){
 		if(!brews || !brews.length) return <div className='noBrews'>No Brews.</div>;
 
@@ -49,14 +98,18 @@ const ListPage = createClass({
 	},
 
 	handleSortOptionChange : function(event){
+		this.updateUrl(this.state.filterString, event.target.value, this.state.sortDir);
 		this.setState({
 			sortType : event.target.value
 		});
 	},
 
 	handleSortDirChange : function(event){
+		const newDir = this.state.sortDir == 'asc' ? 'desc' : 'asc';
+
+		this.updateUrl(this.state.filterString, this.state.sortType, newDir);
 		this.setState({
-			sortDir : `${(this.state.sortDir == 'asc' ? 'desc' : 'asc')}`
+			sortDir : newDir
 		});
 	},
 
@@ -74,19 +127,37 @@ const ListPage = createClass({
 
 	handleFilterTextChange : function(e){
 		this.setState({
-			filterString : e.target.value
+			filterString : e.target.value,
 		});
+		this.updateUrl(e.target.value, this.state.sortType, this.state.sortDir);
 		return;
 	},
 
+	updateUrl : function(filterTerm, sortType, sortDir){
+		const url = new URL(window.location.href);
+		const urlParams = new URLSearchParams(url.search);
+
+		urlParams.set('sort', sortType);
+		urlParams.set('dir', sortDir);
+
+		if(!filterTerm)
+			urlParams.delete('filter');
+		else
+			urlParams.set('filter', filterTerm);
+
+		url.search = urlParams;
+		window.history.replaceState(null, null, url);
+	},
+
 	renderFilterOption : function(){
 		return <td>
 			<label>
 				<i className='fas fa-search'></i>
 				<input
 					type='search'
-					placeholder='search title/description'
+					placeholder='filter title/description'
 					onChange={this.handleFilterTextChange}
+					value={this.state.filterString}
 				/>
 			</label>
 		</td>;
@@ -125,32 +196,48 @@ const ListPage = createClass({
 
 	getSortedBrews : function(brews){
 		const testString = _.deburr(this.state.filterString).toLowerCase();
-		brews = _.filter(brews, (brew)=>{
-			return (_.deburr(brew.title).toLowerCase().includes(testString)) ||
-			(_.deburr(brew.description).toLowerCase().includes(testString));
-		});
 
+		brews = _.filter(brews, (brew)=>{
+			const brewStrings = _.deburr([
+				brew.title,
+				brew.description,
+				brew.tags].join('\n')
+				.toLowerCase());
+
+			return brewStrings.includes(testString);
+		});
 		return _.orderBy(brews, (brew)=>{ return this.sortBrewOrder(brew); }, this.state.sortDir);
 	},
 
+	toggleBrewCollectionState : function(brewGroupClass) {
+		this.setState((prevState)=>({
+			brewCollection : prevState.brewCollection.map(
+				(brewGroup)=>brewGroup.class === brewGroupClass ? { ...brewGroup, visible: !brewGroup.visible } : brewGroup
+			)
+		}));
+	},
+
 	renderBrewCollection : function(brewCollection){
+		if(brewCollection == []) return <div className='brewCollection'>
+			<h1>No Brews</h1>
+		</div>;
 		return _.map(brewCollection, (brewGroup, idx)=>{
 			return <div key={idx} className={`brewCollection ${brewGroup.class ?? ''}`}>
-				<h1>{brewGroup.title || 'No Title'}</h1>
+				<h1 className={brewGroup.visible ? 'active' : 'inactive'} onClick={()=>{this.toggleBrewCollectionState(brewGroup.class);}}>{brewGroup.title || 'No Title'}</h1>
-				{this.renderBrews(this.getSortedBrews(brewGroup.brews))}
+				{brewGroup.visible ? this.renderBrews(this.getSortedBrews(brewGroup.brews)) : <></>}
 			</div>;
 		});
 	},
 
 	render : function(){
 		return <div className='listPage sitePage'>
-			<link href='/themes/5ePhbLegacy.style.css' rel='stylesheet'/>
+			<link href='/themes/5ePhb.style.css' rel='stylesheet'/>
 			{this.props.navItems}
 
 			<div className='content V3'>
-				<div className='phb'>
+				<div className='phb page'>
 					{this.renderSortOptions()}
-					{this.renderBrewCollection(this.props.brewCollection)}
+					{this.renderBrewCollection(this.state.brewCollection)}
 				</div>
 			</div>
 		</div>;

client/homebrew/pages/basePages/listPage/listPage.less

@@ -13,7 +13,7 @@
 }
 .listPage{
 	.content{
-		overflow-y : scroll;
+		overflow-y : overlay;
 		.phb{
 			.noColumns();
 			height     : auto;
@@ -34,7 +34,7 @@
 		font-family        : 'Open Sans', sans-serif;
 		position           : fixed;
 		top                : 35px;
-		left               : calc(50vw - 408px);
+		left               : calc(50vw - 400px);
 		border             : 2px solid #58180D;
 		width              : 800px;
 		background-color   : #EEE5CE;
@@ -74,4 +74,26 @@
 			}
 		}
 	}
+	h1 {
+		cursor: pointer;
+		&.active {
+			color: #58180D;
+		}
+		&.inactive {
+			color: #707070;
+			
+		}
+		&.active::before, &.inactive::before {
+			font-family: 'Font Awesome 5 Free';
+			font-weight: 900;
+			font-size: 0.6cm;
+    			padding-right: 0.5em;
+		}
+		&.active::before {
+			content: '\f107';
+		}
+		&.inactive::before {
+			content: '\f105';
+		}
+	}
 }

client/homebrew/pages/editPage/editPage.jsx

@@ -114,7 +114,7 @@ const EditPage = createClass({
 		if(htmlErrors.length) htmlErrors = Markdown.validate(text);
 
 		this.setState((prevState)=>({
-			brew       : _.merge({}, prevState.brew, { text: text }),
+			brew       : { ...prevState.brew, text: text },
 			isPending  : true,
 			htmlErrors : htmlErrors
 		}), ()=>this.trySave());
@@ -122,14 +122,17 @@ const EditPage = createClass({
 
 	handleStyleChange : function(style){
 		this.setState((prevState)=>({
-			brew      : _.merge({}, prevState.brew, { style: style }),
+			brew      : { ...prevState.brew, style: style },
 			isPending : true
 		}), ()=>this.trySave());
 	},
 
 	handleMetaChange : function(metadata){
 		this.setState((prevState)=>({
-			brew      : _.merge({}, prevState.brew, metadata),
+			brew : {
+				...prevState.brew,
+				...metadata
+			},
 			isPending : true,
 		}), ()=>this.trySave());
 
@@ -200,7 +203,7 @@ const EditPage = createClass({
 		const brew = this.state.brew;
 		brew.pageCount = ((brew.renderer=='legacy' ? brew.text.match(/\\page/g) : brew.text.match(/^\\page$/gm)) || []).length + 1;
 
-		const params = `${transfer ? `?transfer${this.state.saveGoogle ? 'To' : 'From'}Google=true` : ''}`;
+		const params = `${transfer ? `?${this.state.saveGoogle ? 'saveToGoogle' : 'removeFromGoogle'}=true` : ''}`;
 		const res = await request
 			.put(`/api/update/${brew.editId}${params}`)
 			.send(brew)
@@ -210,16 +213,14 @@ const EditPage = createClass({
 			});
 
 		this.savedBrew = res.body;
-		if(transfer) {
+		history.replaceState(null, null, `/edit/${this.savedBrew.editId}`);
-			history.replaceState(null, null, `/edit/${this.savedBrew.googleId ?? ''}${this.savedBrew.editId}`);
-		}
 
 		this.setState((prevState)=>({
-			brew : _.merge({}, prevState.brew, {
+			brew : { ...prevState.brew,
 				googleId : this.savedBrew.googleId ? this.savedBrew.googleId : null,
 				editId 	 : this.savedBrew.editId,
 				shareId  : this.savedBrew.shareId
-			}),
+			},
 			isPending : false,
 			isSaving  : false,
 		}));
@@ -276,26 +277,26 @@ const EditPage = createClass({
 				console.log(errMsg);
 			} catch (e){}
 
-			if(this.state.errors.status == '401'){
+			// if(this.state.errors.status == '401'){
-				return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
+			// 	return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
-					Oops!
+			// 		Oops!
-					<div className='errorContainer' onClick={this.clearErrors}>
+			// 		<div className='errorContainer' onClick={this.clearErrors}>
-					You must be signed in to a Google account
+			// 		You must be signed in to a Google account
-						to save this to<br />Google Drive!<br />
+			// 			to save this to<br />Google Drive!<br />
-						<a target='_blank' rel='noopener noreferrer'
+			// 			<a target='_blank' rel='noopener noreferrer'
-							href={`https://www.naturalcrit.com/login?redirect=${this.state.url}`}>
+			// 				href={`https://www.naturalcrit.com/login?redirect=${this.state.url}`}>
-							<div className='confirm'>
+			// 				<div className='confirm'>
-								Sign In
+			// 					Sign In
-							</div>
+			// 				</div>
-						</a>
+			// 			</a>
-						<div className='deny'>
+			// 			<div className='deny'>
-							Not Now
+			// 				Not Now
-						</div>
+			// 			</div>
-					</div>
+			// 		</div>
-				</Nav.item>;
+			// 	</Nav.item>;
-			}
+			// }
 
-			if(this.state.errors.response.req.url.match(/^\/api\/.*Google.*$/m)){
+			if(this.state.errors.response.req.url.match(/^\/api.*Google.*$/m)){
 				return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
 					Oops!
 					<div className='errorContainer' onClick={this.clearErrors}>
@@ -340,7 +341,7 @@ const EditPage = createClass({
 	},
 
 	processShareId : function() {
-		return this.state.brew.googleId ?
+		return this.state.brew.googleId && !this.state.brew.stubbed ?
 					 this.state.brew.googleId + this.state.brew.shareId :
 					 this.state.brew.shareId;
 	},
@@ -352,7 +353,7 @@ const EditPage = createClass({
 		const title = `${this.props.brew.title} ${systems}`;
 		const text = `Hey guys! I've been working on this homebrew. I'd love your feedback. Check it out.
 
-**[Homebrewery Link](https://homebrewery.naturalcrit.com/share/${shareLink})**`;
+**[Homebrewery Link](${global.config.publicUrl}/share/${shareLink})**`;
 
 		return `https://www.reddit.com/r/UnearthedArcana/submit?title=${encodeURIComponent(title)}&text=${encodeURIComponent(text)}`;
 	},
@@ -387,7 +388,7 @@ const EditPage = createClass({
 					<Nav.item color='blue' href={`/share/${shareLink}`}>
 						view
 					</Nav.item>
-					<Nav.item color='blue' onClick={()=>{navigator.clipboard.writeText(`https://homebrewery.naturalcrit.com/share/${shareLink}`);}}>
+					<Nav.item color='blue' onClick={()=>{navigator.clipboard.writeText(`${global.config.publicUrl}/share/${shareLink}`);}}>
 						copy url
 					</Nav.item>
 					<Nav.item color='blue' href={this.getRedditLink()} newTab={true} rel='noopener noreferrer'>

client/homebrew/pages/homePage/homePage.jsx

@@ -52,7 +52,7 @@ const HomePage = createClass({
 	},
 	handleTextChange : function(text){
 		this.setState((prevState)=>({
-			brew : _.merge({}, prevState.brew, { text: text })
+			brew : { ...prevState.brew, text: text }
 		}));
 	},
 	renderNavbar : function(){

client/homebrew/pages/homePage/welcome_msg.md

@@ -1,50 +1,68 @@
-# The Homebrewery
+```css
+.page #example + table td {
+	border:1px dashed #00000030;
+}
+.page {
+	padding-bottom : 1.1cm;
+}
+```
 
+# The Homebrewery *V3*
 Welcome traveler from an antique land. Please sit and tell us of what you have seen. The unheard of monsters, who slither and bite. Tell us of the wondrous items and and artifacts you have found, their mysteries yet to be unlocked. Of the vexing vocations and surprising skills you have seen.
 
 ### Homebrew D&D made easy
 The Homebrewery makes the creation and sharing of authentic looking Fifth-Edition homebrews easy. It uses [Markdown](https://help.github.com/articles/markdown-basics/) with a little CSS magic to make your brews come to life.
 
-**Try it!** Simply edit the text on the left and watch it *update live* on the right.
+**Try it!** Simply edit the text on the left and watch it *update live* on the right. Note that not every button is visible on this demo page. Click New {{fas,fa-plus-square}} in the navbar above to start brewing with all the features!
-
-
 
 ### Editing and Sharing
-When you create your own homebrew you will be given a *edit url* and a *share url*.  Any changes you make will be automatically saved to the database within a few seconds. Anyone with the edit url will be able to make edits to your homebrew. So be careful about who you share it with.
+When you create your own homebrew, you will be given a *edit url* and a *share url*.
+
+Any changes you make while on the *edit url* will be automatically saved to the database within a few seconds. Anyone with the edit url will be able to make edits to your homebrew, so be careful about who you share it with.
 
 Anyone with the *share url* will be able to access a read-only version of your homebrew.
 
-## Helping out
+{{note
+##### PDF Creation
+PDF Printing works best in Google Chrome. If you are having quality/consistency issues, try using Chrome to print instead.
+
+After clicking the "Print" item in the navbar a new page will open and a print dialog will pop-up.
+* Set the **Destination** to "Save as PDF"
+* Set **Paper Size** to "Letter"
+* If you are printing on A4 paper, make sure to have the **PRINT → {{far,fa-file}} A4 Pagesize** snippet in your brew
+* In **Options** make sure "Background Images" is selected.
+* Hit print and enjoy! You're done!
+
+If you want to save ink or have a monochrome printer, add the **PRINT → {{fas,fa-tint}} Ink Friendly** snippet to your brew!
+}}
+
+![homebrew mug](http://i.imgur.com/hMna6G0.png) {position:absolute,bottom:20px,left:130px,width:220px}
+
+{{artist,bottom:160px,left:100px
+##### Homebrew Mug
+[naturalcrit](https://homebrew.naturalcrit.com)
+}}
+
+{{pageNumber 1}}
+{{footnote PART 1 | FANCINESS}}
+
+\column
+
+## New in V3.0.0
+We've implemented an extended Markdown-like syntax for block and span elements, plus a few other changes, eliminating the need for HTML tags like `div` and `span` in most cases. No raw HTML tags should be needed in a brew (*but can still be used if you insist*).
+
+Much of the syntax and styling has changed in V3, so converting a Legacy brew to V3 (or vice-versa) will require tweaking your document. *However*, all brews made prior to the release of v3.0.0 will still render normally, and you may switch between the "Legacy" brew renderer and the newer "V3" renderer via the {{fa,fa-info-circle}} **Properties** button on your brew at any time.
+
+Scroll down to the next page for a brief summary of the changes and new features available in V3!
+
+#### New Things All The Time!
+Check out the latest updates in the full changelog [here](/changelog).
+
+### Helping out
 Like this tool? Want to buy me a beer? [Head here](https://www.patreon.com/Naturalcrit) to help me keep the servers running.
 
 This tool will **always** be free, never have ads, and I will never offer any "premium" features or whatever.
 
-
-
->##### PDF Exporting
-> PDF Printing works best in Chrome. If you are having quality/consistency issues, try using Chrome to print instead.
->
-> After clicking the "Print" item in the navbar a new page will open and a print dialog will pop-up.
-> * Set the **Destination** to "Save as PDF"
-> * Set **Paper Size** to "Letter"
-> * If you are printing on A4 paper, make sure to have the "A4 page size snippet" in your brew
-> * In **Options** make sure "Background Images" is selected.
-> * Hit print and enjoy! You're done!
->
-> If you want to save ink or have a monochrome printer, add the **Ink Friendly** snippet to your brew before you print
-
-
-```
-```
-
-## V3.0.0 Released!
-With the latest major update to *The Homebrewery* we've implemented an extended Markdown-like syntax for block and span elements, plus a few other changes, eliminating the need for HTML tags like **div** and **span** in most cases. No raw HTML tags should be needed in a brew, and going forward, raw HTML will no longer receive debugging support (*but can still be used if you insist*).
-
-**You can enable V3 via the <span class="fa fa-info-circle" style="text-indent:0"></span> Properties button!**
-
-## New Things All The Time!
-What's new in the latest update? Check out the full changelog [here](/changelog)
-
 ### Bugs, Issues, Suggestions?
 Take a quick look at our [Frequently Asked Questions page](/faq) to see if your question has a handy answer.
 
@@ -53,56 +71,105 @@ Need help getting started or just the right look for your brew? Head to [r/Homeb
 Have an idea to make The Homebrewery better? Or did you find something that wasn't quite right? Check out the [GitHub Repo](https://github.com/naturalcrit/homebrewery/) to report technical issues.
 
 ### Legal Junk
-The Homebrewery is licensed using the [MIT License](https://github.com/naturalcrit/homebrewery/blob/master/license). This means you are free to use The Homebrewery codebase any way that you want, except for claiming that you made it yourself.
+The Homebrewery is licensed using the [MIT License](https://github.com/naturalcrit/homebrewery/blob/master/license). Which means you are free to use The Homebrewery codebase any way that you want, except for claiming that you made it yourself.
 
-If you wish to sell or in some way gain profit for what you make on this site, it's your responsibility to ensure you have the proper licenses/rights for any images or resources used.
+If you wish to sell or in some way gain profit for what's created on this site, it's your responsibility to ensure you have the proper licenses/rights for any images or resources used.
 
-### More Resources
+#### Crediting Me
+If you'd like to credit me in your brew, I'd be flattered! Just reference that you made it with The Homebrewery.
+
+### More Homebrew Resources
 <a href='https://discord.gg/by3deKx' target='_blank'><img src='/assets/discordOfManyThings.svg' alt='Discord of Many Things Logo' title='Discord of Many Things Logo' style='width:50px; float: right; padding-left: 10px;'/></a>
 If you are looking for more 5e Homebrew resources check out [r/UnearthedArcana](https://www.reddit.com/r/UnearthedArcana/) and their list of useful resources [here](https://www.reddit.com/r/UnearthedArcana/wiki/resources). The <a href='https://discord.gg/by3deKx' target='_blank' title='Discord of Many Things'>Discord of Many Things</a> is another great resource to connect with fellow homebrewers for help and feedback.
 
-<img src='https://i.imgur.com/hMna6G0.png' style='position:absolute;bottom:40px;right:30px;width:280px' />
+{{position:absolute;top:20px;right:20px;width:auto
-
+<a href='https://discord.gg/by3deKx' target='_blank' title='Discord of Many Things' style='color: black;'><img src='/assets/discord.png' style='height:30px'/></a>
-<div class='pageNumber'>1</div>
-<div class='footnote'>PART 1 | FANCINESS</div>
-
-<div style='position: absolute; top: 20px; right: 20px;'>
-<a href='https://discord.gg/by3deKx' target='_blank' title='Discord of Many Things'><img src='/assets/discord.png' style='height:30px'/></a>
 <a href='https://github.com/naturalcrit/homebrewery' target='_blank' title='Github' style='color: black; padding-left: 5px;'><img src='/assets/github.png' style='height:30px'/></a>
 <a href='https://patreon.com/NaturalCrit' target='_blank' title='Patreon' style='color: black; padding-left: 5px;'><img src='/assets/patreon.png' style='height:30px'/></a>
 <a href='https://www.reddit.com/r/homebrewery/' target='_blank' title='Reddit' style='color: black; padding-left: 5px;'><img src='/assets/reddit.png' style='height:30px'/></a>
-</div>
+}}
 
 \page
 
-# Appendix
+## Markdown+
+The Homebrewery aims to make homebrewing as simple as possible, providing a live editor with Markdown syntax that is more human-readable and faster to write with than raw HTML.
 
-### Not quite Markdown
+In version 3.0.0, with a goal of adding maximum flexibility without users resorting to complex HTML to accomplish simple tasks, Homebrewery provides an extended verision of Markdown with additional syntax.
-Although the Homebrewery uses Markdown, to get all the styling features from the PHB, we had to get a little creative. Some base HTML elements are not used as expected and I've had to include a few new keywords.
+**You can enable V3 via the {{fa,fa-info-circle}} Properties button!**
 
-___
+### Curly Brackets
-* **Horizontal Rules** are generally used to *modify* existing elements into a different style. For example, a horizontal rule before a blockquote will give it the style of a Monster Stat Block instead of a note.
+The biggest change in V3 is the replacement of `<span></span>` and `<div></div>` with `{{ }}` for a cleaner custom formatting.  Inline spans and block elements can be created and given ID's and Classes, as well as css properties, each of which are comma separated with no spaces. Use double quotes if a value requires spaces. Spans and Blocks start the same:
-* **New Pages** are controlled by the author. It's impossible for the site to detect when the end of a page is reached, so indicate you'd like to start a new page, use the new page snippet to get the syntax.
+
-* **Code Blocks** are used only to indicate column breaks. Since they don't allow for styling within them, they weren't that useful to use.
+#### Span
-* **HTML** can be used to get *just* the right look for your homebrew. I've included some examples in the snippet icons above the editor.
+My favorite author is {{pen,#author,color:orange,font-family:"trebuchet ms" Brandon Sanderson}}.  The orange text has a class of `pen`, an id of `author`, is colored orange, and given a new font. The first space outside of quotes marks the beginning of the content.
 
 
+#### Block
+{{purple,#book,text-align:center,background:#aa88aa55
+My favorite book is Wheel of Time. This block has a class of `purple`, an id of `book`, and centered text with a colored background. The opening and closing brackets are on lines separate from the block contents.
+}}
 
-```
+#### Injection
-```
+For any element not inside a span or block, you can *inject* attributes using the same syntax but with single brackets in a single line immediately after the element.
 
+Inline elements like *italics* {color:#D35400} or images require the injection on the same line.
 
-### Images
+Block elements like headers require the injection to start on the line immediately following.
-Images must be hosted online somewhere, like imgur. You use the address to that image to reference it in your brew. Images can be included 'inline' with the text using Markdown-style images. However for background images more control is needed.
 
-Background images should be included as HTML-style img tags. Using inline CSS you can precisely position your image where you'd like it to be. I have added both a inflow image snippet and a background image snippet to give you exmaples of how to do it.
+##### A Purple Header
+{color:purple,text-align:center}
 
+\* *this does not currently work for tables yet*
 
+### Vertical Spacing
+A blank line can be achieved with a run of one or more `:` alone on a line. More `:`'s will create more space.
 
-### Crediting Me
+::
-If you'd like to credit The Homebrewery in your brew, I'd be flattered! Just reference that you made it with The Homebrewery.
 
+Much nicer than `<br><br><br><br><br>`
 
+### Definition Lists
+**Example** :: V3 uses HTML *definition lists* to create "lists" with hanging indents.
 
-<div class='pageNumber'>2</div>
+### Column Breaks
-<div class='footnote'>PART 2 | BORING STUFF</div>
+Column and page breaks with `\column` and `\page`.
+
+\column
+
+### Tables
+Tables now allow column & row spanning between cells. This is included in some updated snippets, but a simplified example is given below.
+
+A cell can be spanned across columns by grouping multiple pipe `|` characters at the end of a cell.
+
+Row spanning is achieved by adding a `^` at the end of a cell just before the `|`.  
+
+These can be combined to span a cell across both columns and rows. Cells must have the same colspan if they are to be rowspan'd.
+
+##### Example
+| Head A | Spanned Header ||
+| Head B | Head C | Head D |
+|:-------|:------:|:------:|
+| 1A     |    1B  |    1C  |
+| 2A    ^|    2B  |    2C  |
+| 3A    ^|    3B       3C ||
+| 4A     |    4B       4C^||
+| 5A    ^|    5B  |    5C  |
+| 6A     |    6B ^|    6C  |
+
+## Images
+Images must be hosted online somewhere, like [Imgur](https://www.imgur.com). You use the address to that image to reference it in your brew\*.
+
+Using *Curly Injection* you can assign an id, classes, or inline CSS properties to the Markdown image syntax.
+
+![alt-text](https://s-media-cache-ak0.pinimg.com/736x/4a/81/79/4a8179462cfdf39054a418efd4cb743e.jpg) {width:100px,border:"2px solid",border-radius:10px}
+
+\* *When using Imgur-hosted images, use the "direct link", which can be found when you click into your image in the Imgur interace.*
+
+## Snippets
+Homebrewery comes with a series of *code snippets* found at the top of the editor pane that make it easy to create brews as quickly as possible.  Just set your cursor where you want the code to appear in the editor pane, choose a snippet, and make the adjustments you need.
+
+## Style Editor Panel
+{{fa,fa-paint-brush}} Technically released prior to v3 but still new to many users, check out the new **Style Editor** located on the right side of the Snippet bar.  This editor accepts CSS for styling without requiring `<style>` tags-- anything that would have gone inside style tags before can now be placed here, and snippets that insert CSS styles are now located on that tab.
+
+{{pageNumber 2}}
+{{footnote PART 2 | BORING STUFF}}

client/homebrew/pages/homePage/welcome_msg_legacy.md

@@ -0,0 +1,108 @@
+# The Homebrewery
+
+Welcome traveler from an antique land. Please sit and tell us of what you have seen. The unheard of monsters, who slither and bite. Tell us of the wondrous items and and artifacts you have found, their mysteries yet to be unlocked. Of the vexing vocations and surprising skills you have seen.
+
+### Homebrew D&D made easy
+The Homebrewery makes the creation and sharing of authentic looking Fifth-Edition homebrews easy. It uses [Markdown](https://help.github.com/articles/markdown-basics/) with a little CSS magic to make your brews come to life.
+
+**Try it!** Simply edit the text on the left and watch it *update live* on the right.
+
+
+
+### Editing and Sharing
+When you create your own homebrew you will be given a *edit url* and a *share url*.  Any changes you make will be automatically saved to the database within a few seconds. Anyone with the edit url will be able to make edits to your homebrew. So be careful about who you share it with.
+
+Anyone with the *share url* will be able to access a read-only version of your homebrew.
+
+## Helping out
+Like this tool? Want to buy me a beer? [Head here](https://www.patreon.com/Naturalcrit) to help me keep the servers running.
+
+This tool will **always** be free, never have ads, and I will never offer any "premium" features or whatever.
+
+
+
+>##### PDF Exporting
+> PDF Printing works best in Chrome. If you are having quality/consistency issues, try using Chrome to print instead.
+>
+> After clicking the "Print" item in the navbar a new page will open and a print dialog will pop-up.
+> * Set the **Destination** to "Save as PDF"
+> * Set **Paper Size** to "Letter"
+> * If you are printing on A4 paper, make sure to have the "A4 page size snippet" in your brew
+> * In **Options** make sure "Background Images" is selected.
+> * Hit print and enjoy! You're done!
+>
+> If you want to save ink or have a monochrome printer, add the **Ink Friendly** snippet to your brew before you print
+
+
+```
+```
+
+## V3.0.0 Released!
+With the latest major update to *The Homebrewery* we've implemented an extended Markdown-like syntax for block and span elements, plus a few other changes, eliminating the need for HTML tags like **div** and **span** in most cases. No raw HTML tags should be needed in a brew, and going forward, raw HTML will no longer receive debugging support (*but can still be used if you insist*).
+
+**You can enable V3 via the <span class="fa fa-info-circle" style="text-indent:0"></span> Properties button!**
+
+## New Things All The Time!
+What's new in the latest update? Check out the full changelog [here](/changelog)
+
+### Bugs, Issues, Suggestions?
+Take a quick look at our [Frequently Asked Questions page](/faq) to see if your question has a handy answer.
+
+Need help getting started or just the right look for your brew? Head to [r/Homebrewery](https://www.reddit.com/r/homebrewery/submit?selftext=true&title=%5BIssue%5D%20Describe%20Your%20Issue%20Here) and let us know!
+
+Have an idea to make The Homebrewery better? Or did you find something that wasn't quite right? Check out the [GitHub Repo](https://github.com/naturalcrit/homebrewery/) to report technical issues.
+
+### Legal Junk
+The Homebrewery is licensed using the [MIT License](https://github.com/naturalcrit/homebrewery/blob/master/license). This means you are free to use The Homebrewery codebase any way that you want, except for claiming that you made it yourself.
+
+If you wish to sell or in some way gain profit for what you make on this site, it's your responsibility to ensure you have the proper licenses/rights for any images or resources used.
+
+### More Resources
+<a href='https://discord.gg/by3deKx' target='_blank'><img src='/assets/discordOfManyThings.svg' alt='Discord of Many Things Logo' title='Discord of Many Things Logo' style='width:50px; float: right; padding-left: 10px;'/></a>
+If you are looking for more 5e Homebrew resources check out [r/UnearthedArcana](https://www.reddit.com/r/UnearthedArcana/) and their list of useful resources [here](https://www.reddit.com/r/UnearthedArcana/wiki/resources). The <a href='https://discord.gg/by3deKx' target='_blank' title='Discord of Many Things'>Discord of Many Things</a> is another great resource to connect with fellow homebrewers for help and feedback.
+
+<img src='https://i.imgur.com/hMna6G0.png' style='position:absolute;bottom:40px;right:30px;width:280px' />
+
+<div class='pageNumber'>1</div>
+<div class='footnote'>PART 1 | FANCINESS</div>
+
+<div style='position: absolute; top: 20px; right: 20px;'>
+<a href='https://discord.gg/by3deKx' target='_blank' title='Discord of Many Things'><img src='/assets/discord.png' style='height:30px'/></a>
+<a href='https://github.com/naturalcrit/homebrewery' target='_blank' title='Github' style='color: black; padding-left: 5px;'><img src='/assets/github.png' style='height:30px'/></a>
+<a href='https://patreon.com/NaturalCrit' target='_blank' title='Patreon' style='color: black; padding-left: 5px;'><img src='/assets/patreon.png' style='height:30px'/></a>
+<a href='https://www.reddit.com/r/homebrewery/' target='_blank' title='Reddit' style='color: black; padding-left: 5px;'><img src='/assets/reddit.png' style='height:30px'/></a>
+</div>
+
+\page
+
+# Appendix
+
+### Not quite Markdown
+Although the Homebrewery uses Markdown, to get all the styling features from the PHB, we had to get a little creative. Some base HTML elements are not used as expected and I've had to include a few new keywords.
+
+___
+* **Horizontal Rules** are generally used to *modify* existing elements into a different style. For example, a horizontal rule before a blockquote will give it the style of a Monster Stat Block instead of a note.
+* **New Pages** are controlled by the author. It's impossible for the site to detect when the end of a page is reached, so indicate you'd like to start a new page, use the new page snippet to get the syntax.
+* **Code Blocks** are used only to indicate column breaks. Since they don't allow for styling within them, they weren't that useful to use.
+* **HTML** can be used to get *just* the right look for your homebrew. I've included some examples in the snippet icons above the editor.
+
+
+
+```
+```
+
+
+### Images
+Images must be hosted online somewhere, like imgur. You use the address to that image to reference it in your brew. Images can be included 'inline' with the text using Markdown-style images. However for background images more control is needed.
+
+Background images should be included as HTML-style img tags. Using inline CSS you can precisely position your image where you'd like it to be. I have added both a inflow image snippet and a background image snippet to give you exmaples of how to do it.
+
+
+
+### Crediting Me
+If you'd like to credit The Homebrewery in your brew, I'd be flattered! Just reference that you made it with The Homebrewery.
+
+
+
+<div class='pageNumber'>2</div>
+<div class='footnote'>PART 2 | BORING STUFF</div>

client/homebrew/pages/homePage/welcome_msg_v3.md

@@ -1,175 +0,0 @@
-```css
-.page #example + table td {
-	border:1px dashed #00000030;
-}
-.page {
-	padding-bottom : 1.1cm;
-}
-```
-
-# The Homebrewery *V3*
-Welcome traveler from an antique land. Please sit and tell us of what you have seen. The unheard of monsters, who slither and bite. Tell us of the wondrous items and and artifacts you have found, their mysteries yet to be unlocked. Of the vexing vocations and surprising skills you have seen.
-
-### Homebrew D&D made easy
-The Homebrewery makes the creation and sharing of authentic looking Fifth-Edition homebrews easy. It uses [Markdown](https://help.github.com/articles/markdown-basics/) with a little CSS magic to make your brews come to life.
-
-**Try it!** Simply edit the text on the left and watch it *update live* on the right. Note that not every button is visible on this demo page. Click New {{fas,fa-plus-square}} in the navbar above to start brewing with all the features!
-
-### Editing and Sharing
-When you create your own homebrew, you will be given a *edit url* and a *share url*.
-
-Any changes you make while on the *edit url* will be automatically saved to the database within a few seconds. Anyone with the edit url will be able to make edits to your homebrew, so be careful about who you share it with.
-
-Anyone with the *share url* will be able to access a read-only version of your homebrew.
-
-{{note
-##### PDF Creation
-PDF Printing works best in Google Chrome. If you are having quality/consistency issues, try using Chrome to print instead.
-
-After clicking the "Print" item in the navbar a new page will open and a print dialog will pop-up.
-* Set the **Destination** to "Save as PDF"
-* Set **Paper Size** to "Letter"
-* If you are printing on A4 paper, make sure to have the **PRINT → {{far,fa-file}} A4 Pagesize** snippet in your brew
-* In **Options** make sure "Background Images" is selected.
-* Hit print and enjoy! You're done!
-
-If you want to save ink or have a monochrome printer, add the **PRINT → {{fas,fa-tint}} Ink Friendly** snippet to your brew!
-}}
-
-![homebrew mug](http://i.imgur.com/hMna6G0.png) {position:absolute,bottom:20px,left:130px,width:220px}
-
-{{artist,bottom:160px,left:100px
-##### Homebrew Mug
-[naturalcrit](https://homebrew.naturalcrit.com)
-}}
-
-{{pageNumber 1}}
-{{footnote PART 1 | FANCINESS}}
-
-\column
-
-## New in V3.0.0
-We've implemented an extended Markdown-like syntax for block and span elements, plus a few other changes, eliminating the need for HTML tags like `div` and `span` in most cases. No raw HTML tags should be needed in a brew (*but can still be used if you insist*).
-
-Much of the syntax and styling has changed in V3, so converting a Legacy brew to V3 (or vice-versa) will require tweaking your document. *However*, all brews made prior to the release of v3.0.0 will still render normally, and you may switch between the "Legacy" brew renderer and the newer "V3" renderer via the {{fa,fa-info-circle}} **Properties** button on your brew at any time.
-
-Scroll down to the next page for a brief summary of the changes and new features available in V3!
-
-#### New Things All The Time!
-Check out the latest updates in the full changelog [here](/changelog).
-
-### Helping out
-Like this tool? Want to buy me a beer? [Head here](https://www.patreon.com/Naturalcrit) to help me keep the servers running.
-
-This tool will **always** be free, never have ads, and I will never offer any "premium" features or whatever.
-
-### Bugs, Issues, Suggestions?
-Take a quick look at our [Frequently Asked Questions page](/faq) to see if your question has a handy answer.
-
-Need help getting started or just the right look for your brew? Head to [r/Homebrewery](https://www.reddit.com/r/homebrewery/submit?selftext=true&title=%5BIssue%5D%20Describe%20Your%20Issue%20Here) and let us know!
-
-Have an idea to make The Homebrewery better? Or did you find something that wasn't quite right? Check out the [GitHub Repo](https://github.com/naturalcrit/homebrewery/) to report technical issues.
-
-### Legal Junk
-The Homebrewery is licensed using the [MIT License](https://github.com/naturalcrit/homebrewery/blob/master/license). Which means you are free to use The Homebrewery codebase any way that you want, except for claiming that you made it yourself.
-
-If you wish to sell or in some way gain profit for what's created on this site, it's your responsibility to ensure you have the proper licenses/rights for any images or resources used.
-
-#### Crediting Me
-If you'd like to credit me in your brew, I'd be flattered! Just reference that you made it with The Homebrewery.
-
-### More Homebrew Resources
-<a href='https://discord.gg/by3deKx' target='_blank'><img src='/assets/discordOfManyThings.svg' alt='Discord of Many Things Logo' title='Discord of Many Things Logo' style='width:50px; float: right; padding-left: 10px;'/></a>
-If you are looking for more 5e Homebrew resources check out [r/UnearthedArcana](https://www.reddit.com/r/UnearthedArcana/) and their list of useful resources [here](https://www.reddit.com/r/UnearthedArcana/wiki/resources). The <a href='https://discord.gg/by3deKx' target='_blank' title='Discord of Many Things'>Discord of Many Things</a> is another great resource to connect with fellow homebrewers for help and feedback.
-
-{{position:absolute;top:20px;right:20px;width:auto
-<a href='https://discord.gg/by3deKx' target='_blank' title='Discord of Many Things' style='color: black;'><img src='/assets/discord.png' style='height:30px'/></a>
-<a href='https://github.com/naturalcrit/homebrewery' target='_blank' title='Github' style='color: black; padding-left: 5px;'><img src='/assets/github.png' style='height:30px'/></a>
-<a href='https://patreon.com/NaturalCrit' target='_blank' title='Patreon' style='color: black; padding-left: 5px;'><img src='/assets/patreon.png' style='height:30px'/></a>
-<a href='https://www.reddit.com/r/homebrewery/' target='_blank' title='Reddit' style='color: black; padding-left: 5px;'><img src='/assets/reddit.png' style='height:30px'/></a>
-}}
-
-\page
-
-## Markdown+
-The Homebrewery aims to make homebrewing as simple as possible, providing a live editor with Markdown syntax that is more human-readable and faster to write with than raw HTML.
-
-In version 3.0.0, with a goal of adding maximum flexibility without users resorting to complex HTML to accomplish simple tasks, Homebrewery provides an extended verision of Markdown with additional syntax.
-**You can enable V3 via the {{fa,fa-info-circle}} Properties button!**
-
-### Curly Brackets
-The biggest change in V3 is the replacement of `<span></span>` and `<div></div>` with `{{ }}` for a cleaner custom formatting.  Inline spans and block elements can be created and given ID's and Classes, as well as css properties, each of which are comma separated with no spaces. Use double quotes if a value requires spaces. Spans and Blocks start the same:
-
-#### Span
-My favorite author is {{pen,#author,color:orange,font-family:"trebuchet ms" Brandon Sanderson}}.  The orange text has a class of `pen`, an id of `author`, is colored orange, and given a new font. The first space outside of quotes marks the beginning of the content.
-
-
-#### Block
-{{purple,#book,text-align:center,background:#aa88aa55
-My favorite book is Wheel of Time. This block has a class of `purple`, an id of `book`, and centered text with a colored background. The opening and closing brackets are on lines separate from the block contents.
-}}
-
-#### Injection
-For any element not inside a span or block, you can *inject* attributes using the same syntax but with single brackets in a single line immediately after the element.
-
-Inline elements like *italics* {color:#D35400} or images require the injection on the same line.
-
-Block elements like headers require the injection to start on the line immediately following.
-
-##### A Purple Header
-{color:purple,text-align:center}
-
-\* *this does not currently work for tables yet*
-
-### Vertical Spacing
-A blank line can be achieved with a run of one or more `:` alone on a line. More `:`'s will create more space.
-
-::
-
-Much nicer than `<br><br><br><br><br>`
-
-### Definition Lists
-**Example** :: V3 uses HTML *definition lists* to create "lists" with hanging indents.
-
-### Column Breaks
-Column and page breaks with `\column` and `\page`.
-
-\column
-
-### Tables
-Tables now allow column & row spanning between cells. This is included in some updated snippets, but a simplified example is given below.
-
-A cell can be spanned across columns by grouping multiple pipe `|` characters at the end of a cell.
-
-Row spanning is achieved by adding a `^` at the end of a cell just before the `|`.  
-
-These can be combined to span a cell across both columns and rows. Cells must have the same colspan if they are to be rowspan'd.
-
-##### Example
-| Head A | Spanned Header ||
-| Head B | Head C | Head D |
-|:-------|:------:|:------:|
-| 1A     |    1B  |    1C  |
-| 2A    ^|    2B  |    2C  |
-| 3A    ^|    3B       3C ||
-| 4A     |    4B       4C^||
-| 5A    ^|    5B  |    5C  |
-| 6A     |    6B ^|    6C  |
-
-## Images
-Images must be hosted online somewhere, like [Imgur](https://www.imgur.com). You use the address to that image to reference it in your brew\*.
-
-Using *Curly Injection* you can assign an id, classes, or inline CSS properties to the Markdown image syntax.
-
-![alt-text](https://s-media-cache-ak0.pinimg.com/736x/4a/81/79/4a8179462cfdf39054a418efd4cb743e.jpg) {width:100px,border:"2px solid",border-radius:10px}
-
-\* *When using Imgur-hosted images, use the "direct link", which can be found when you click into your image in the Imgur interace.*
-
-## Snippets
-Homebrewery comes with a series of *code snippets* found at the top of the editor pane that make it easy to create brews as quickly as possible.  Just set your cursor where you want the code to appear in the editor pane, choose a snippet, and make the adjustments you need.
-
-## Style Editor Panel
-{{fa,fa-paint-brush}} Technically released prior to v3 but still new to many users, check out the new **Style Editor** located on the right side of the Snippet bar.  This editor accepts CSS for styling without requiring `<style>` tags-- anything that would have gone inside style tags before can now be placed here, and snippets that insert CSS styles are now located on that tab.
-
-{{pageNumber 2}}
-{{footnote PART 2 | BORING STUFF}}

client/homebrew/pages/newPage/newPage.jsx

@@ -27,55 +27,30 @@ const NewPage = createClass({
 	getDefaultProps : function() {
 		return {
 			brew : {
-				text      : '',
+				text        : '',
-				style     : undefined,
+				style       : undefined,
-				shareId   : null,
-				editId    : null,
-				createdAt : null,
-				updatedAt : null,
-				gDrive    : false,
-
 				title       : '',
 				description : '',
-				tags        : '',
+				renderer    : 'V3'
-				published   : false,
-				authors     : [],
-				systems     : []
 			}
 		};
 	},
 
 	getInitialState : function() {
-		const brew = this.props.brew;
+		let brew = this.props.brew;
 
-		if(typeof window !== 'undefined') { //Load from localStorage if in client browser
+		if(this.props.brew.shareId) {
-			const brewStorage  = localStorage.getItem(BREWKEY);
+			brew = {
-			const styleStorage = localStorage.getItem(STYLEKEY);
+				text        : brew.text        ?? '',
-			const metaStorage = JSON.parse(localStorage.getItem(METAKEY));
+				style       : brew.style       ?? undefined,
-
+				title       : brew.title       ?? '',
-			if(!brew.text || !brew.style){
+				description : brew.description ?? '',
-				brew.text = brew.text  || (brewStorage  ?? '');
+				renderer    : brew.renderer    ?? 'legacy'
-				brew.style = brew.style || (styleStorage ?? undefined);
+			};
-				// brew.title = metaStorage?.title || this.state.brew.title;
-				// brew.description = metaStorage?.description || this.state.brew.description;
-				brew.renderer = metaStorage?.renderer || brew.renderer;
-			}
 		}
 
 		return {
-			brew : {
+			brew       : brew,
-				text        : brew.text || '',
-				style       : brew.style || undefined,
-				gDrive      : false,
-				title       : brew.title || '',
-				description : brew.description || '',
-				tags        : brew.tags || '',
-				published   : false,
-				authors     : [],
-				systems     : brew.systems || [],
-				renderer    : brew.renderer || 'legacy'
-			},
-
 			isSaving   : false,
 			saveGoogle : (global.account && global.account.googleId ? true : false),
 			errors     : null,
@@ -85,6 +60,28 @@ const NewPage = createClass({
 
 	componentDidMount : function() {
 		document.addEventListener('keydown', this.handleControlKeys);
+
+		const brew = this.state.brew;
+
+		if(!this.props.brew.shareId && typeof window !== 'undefined') { //Load from localStorage if in client browser
+			const brewStorage  = localStorage.getItem(BREWKEY);
+			const styleStorage = localStorage.getItem(STYLEKEY);
+			const metaStorage = JSON.parse(localStorage.getItem(METAKEY));
+
+			brew.text  = brewStorage  ?? brew.text;
+			brew.style = styleStorage ?? brew.style;
+			// brew.title = metaStorage?.title || this.state.brew.title;
+			// brew.description = metaStorage?.description || this.state.brew.description;
+			brew.renderer = metaStorage?.renderer ?? brew.renderer;
+
+			this.setState({
+				brew : brew
+			});
+		}
+
+		localStorage.setItem(BREWKEY, brew.text);
+		localStorage.setItem(STYLEKEY, brew.style);
+		localStorage.setItem(METAKEY, JSON.stringify({ 'renderer': brew.renderer }));
 	},
 	componentWillUnmount : function() {
 		document.removeEventListener('keydown', this.handleControlKeys);
@@ -112,7 +109,7 @@ const NewPage = createClass({
 		if(htmlErrors.length) htmlErrors = Markdown.validate(text);
 
 		this.setState((prevState)=>({
-			brew       : _.merge({}, prevState.brew, { text: text }),
+			brew       : { ...prevState.brew, text: text },
 			htmlErrors : htmlErrors
 		}));
 		localStorage.setItem(BREWKEY, text);
@@ -120,14 +117,14 @@ const NewPage = createClass({
 
 	handleStyleChange : function(style){
 		this.setState((prevState)=>({
-			brew : _.merge({}, prevState.brew, { style: style }),
+			brew : { ...prevState.brew, style: style },
 		}));
 		localStorage.setItem(STYLEKEY, style);
 	},
 
 	handleMetaChange : function(metadata){
 		this.setState((prevState)=>({
-			brew : _.merge({}, prevState.brew, metadata),
+			brew : { ...prevState.brew, ...metadata },
 		}));
 		localStorage.setItem(METAKEY, JSON.stringify({
 			// 'title'       : this.state.brew.title,
@@ -162,7 +159,7 @@ const NewPage = createClass({
 		brew.pageCount=((brew.renderer=='legacy' ? brew.text.match(/\\page/g) : brew.text.match(/^\\page$/gm)) || []).length + 1;
 
 		const res = await request
-			.post(`/api${this.state.saveGoogle ? '?transferToGoogle=true' : ''}`)
+			.post(`/api${this.state.saveGoogle ? '?saveToGoogle=true' : ''}`)
 			.send(brew)
 			.catch((err)=>{
 				console.log(err);
@@ -174,7 +171,7 @@ const NewPage = createClass({
 		localStorage.removeItem(BREWKEY);
 		localStorage.removeItem(STYLEKEY);
 		localStorage.removeItem(METAKEY);
-		window.location = `/edit/${brew.googleId ?? ''}${brew.editId}`;
+		window.location = `/edit/${brew.editId}`;
 	},
 
 	renderSaveButton : function(){
@@ -187,26 +184,26 @@ const NewPage = createClass({
 				console.log(errMsg);
 			} catch (e){}
 
-			if(this.state.errors.status == '401'){
+			// if(this.state.errors.status == '401'){
-				return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
+			// 	return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
-					Oops!
+			// 		Oops!
-					<div className='errorContainer' onClick={this.clearErrors}>
+			// 		<div className='errorContainer' onClick={this.clearErrors}>
-					You must be signed in to a Google account
+			// 		You must be signed in to a Google account
-						to save this to<br />Google Drive!<br />
+			// 			to save this to<br />Google Drive!<br />
-						<a target='_blank' rel='noopener noreferrer'
+			// 			<a target='_blank' rel='noopener noreferrer'
-							href={`https://www.naturalcrit.com/login?redirect=${this.state.url}`}>
+			// 				href={`https://www.naturalcrit.com/login?redirect=${this.state.url}`}>
-							<div className='confirm'>
+			// 				<div className='confirm'>
-								Sign In
+			// 					Sign In
-							</div>
+			// 				</div>
-						</a>
+			// 			</a>
-						<div className='deny'>
+			// 			<div className='deny'>
-							Not Now
+			// 				Not Now
-						</div>
+			// 			</div>
-					</div>
+			// 		</div>
-				</Nav.item>;
+			// 	</Nav.item>;
-			}
+			// }
 
-			if(this.state.errors.response.req.url.match(/^\/api\/.*Google.*$/m)){
+			if(this.state.errors.response.req.url.match(/^\/api.*Google.*$/m)){
 				return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
 					Oops!
 					<div className='errorContainer' onClick={this.clearErrors}>

client/homebrew/pages/printPage/printPage.jsx

@@ -45,7 +45,7 @@ const PrintPage = createClass({
 					brew : {
 						text     : brewStorage,
 						style    : styleStorage,
-						renderer : metaStorage.renderer || 'legacy'
+						renderer : metaStorage?.renderer || 'legacy'
 					}
 				};
 			});

client/homebrew/pages/sharePage/sharePage.jsx

@@ -49,7 +49,7 @@ const SharePage = createClass({
 	},
 
 	processShareId : function() {
-		return this.props.brew.googleId ?
+		return this.props.brew.googleId && !this.props.brew.stubbed ?
 					 this.props.brew.googleId + this.props.brew.shareId :
 					 this.props.brew.shareId;
 	},

client/homebrew/pages/userPage/userPage.jsx

@@ -19,10 +19,11 @@ const UserPage = createClass({
 		return {
 			username : '',
 			brews    : [],
+			query    : ''
 		};
 	},
 	getInitialState : function() {
-		const usernameWithS = this.props.username + (this.props.username.endsWith('s') ? `'` : `'s`);
+		const usernameWithS = this.props.username + (this.props.username.endsWith('s') ? `’` : `’s`);
 
 		const brews = _.groupBy(this.props.brews, (brew)=>{
 			return (brew.published ? 'published' : 'private');
@@ -62,7 +63,7 @@ const UserPage = createClass({
 	},
 
 	render : function(){
-		return <ListPage brewCollection={this.state.brewCollection} navItems={this.navItems()}></ListPage>;
+		return <ListPage brewCollection={this.state.brewCollection} navItems={this.navItems()} query={this.props.query}></ListPage>;
 	}
 });
 

client/template.js

@@ -1,4 +1,6 @@
 module.exports = async(name, title = '', props = {})=>{
+	const HOMEBREWERY_PUBLIC_URL=props.config.publicUrl;
+
 	return `
 <!DOCTYPE html>
 <html>
@@ -6,7 +8,14 @@ module.exports = async(name, title = '', props = {})=>{
 		<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' />
-		<link rel="icon" href="/assets/homebrew/favicon.ico" type="image/x-icon" />
+		<link rel="icon" href="/assets/favicon.ico" type="image/x-icon" />
+		<meta property="og:title" content="${props.brew?.title || 'Homebrewery - Untitled Brew'}">
+		<meta property="og:url" content="${HOMEBREWERY_PUBLIC_URL}/${props.brew?.shareId ? `share/${props.brew.shareId}` : ''}">
+		<meta property="og:image" content="${props.brew?.thumbnail || `${HOMEBREWERY_PUBLIC_URL}/thumbnail.png`}">
+		<meta property="og:description" content="${props.brew?.description || 'No description.'}">
+		<meta property="og:site_name" content="The Homebrewery - Make your Homebrew content look legit!">
+		<meta property="og:type" content="article">
+		<meta name="twitter:card" content="summary_large_image">
 		<title>${title.length ? `${title} - The Homebrewery`: 'The Homebrewery - NaturalCrit'}</title>
 	</head>
 	<body>

config/default.json

@@ -3,5 +3,7 @@
 	"naturalcrit_url" : "local.naturalcrit.com:8010",
 	"secret" : "secret",
 	"web_port" : 8000,
-	"enable_v3" : true
+	"enable_v3" : true,
+	"local_environments" : ["docker", "local"],
+	"publicUrl" : "https://homebrewery.naturalcrit.com"
 }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebrewery",
   "description": "Create authentic looking D&D homebrews using only markdown",
-  "version": "3.0.8",
+  "version": "3.2.2",
   "engines": {
     "node": "16.11.x"
   },
@@ -34,7 +34,7 @@
     "build/*"
   ],
   "jest": {
-    "testTimeout" : 15000,
+    "testTimeout": 15000,
     "modulePaths": [
       "mode_modules",
       "shared",
@@ -51,45 +51,44 @@
     ]
   },
   "dependencies": {
-    "@babel/core": "^7.17.8",
+    "@babel/core": "^7.19.0",
-    "@babel/plugin-transform-runtime": "^7.17.0",
+    "@babel/plugin-transform-runtime": "^7.18.10",
-    "@babel/preset-env": "^7.16.11",
+    "@babel/preset-env": "^7.19.0",
-    "@babel/preset-react": "^7.16.7",
+    "@babel/preset-react": "^7.18.6",
-    "body-parser": "^1.19.2",
+    "body-parser": "^1.20.0",
     "classnames": "^2.3.1",
-    "codemirror": "^5.65.2",
+    "codemirror": "^5.65.6",
     "cookie-parser": "^1.4.6",
     "create-react-class": "^15.7.0",
     "dedent-tabs": "^0.10.1",
-    "express": "^4.17.3",
+    "express": "^4.18.1",
     "express-async-handler": "^1.2.0",
-    "express-static-gzip": "2.1.5",
+    "express-static-gzip": "2.1.7",
-    "fs-extra": "10.0.1",
+    "fs-extra": "10.1.0",
-    "googleapis": "98.0.0",
+    "googleapis": "107.0.0",
     "js-yaml": "^4.1.0",
     "jwt-simple": "^0.5.6",
     "less": "^3.13.1",
     "lodash": "^4.17.21",
-    "marked": "4.0.12",
+    "marked": "4.1.0",
-    "marked-extended-tables": "^1.0.3",
+    "marked-extended-tables": "^1.0.5",
     "markedLegacy": "npm:marked@^0.3.19",
-    "moment": "^2.29.1",
+    "moment": "^2.29.4",
-    "mongoose": "^6.2.8",
+    "mongoose": "^6.5.5",
-    "nanoid": "3.3.1",
+    "nanoid": "3.3.4",
-    "nconf": "^0.11.3",
+    "nconf": "^0.12.0",
-    "query-string": "7.1.1",
     "react": "^16.14.0",
     "react-dom": "^16.14.0",
     "react-frame-component": "4.1.3",
-    "react-router-dom": "5.3.0",
+    "react-router-dom": "6.3.0",
     "sanitize-filename": "1.6.3",
     "superagent": "^6.1.0",
     "vitreum": "git+https://git@github.com/calculuschild/vitreum.git"
   },
   "devDependencies": {
-    "eslint": "^8.11.0",
+    "eslint": "^8.23.0",
-    "eslint-plugin-react": "^7.29.4",
+    "eslint-plugin-react": "^7.31.7",
-    "jest": "^27.5.1",
+    "jest": "^29.0.2",
-    "supertest": "^6.2.2"
+    "supertest": "^6.2.4"
   }
 }

scripts/buildHomebrew.js

@@ -26,6 +26,7 @@ const build = async ({ bundle, render, ssr })=>{
 	await fs.outputFile('./build/homebrew/ssr.js', ssr);
 	await fs.copy('./themes/fonts', './build/fonts');
 	await fs.copy('./themes/assets', './build/assets');
+	await fs.copy('./client/homebrew/favicon.ico', './build/assets/favicon.ico');
 	let src = './themes/5ePhbLegacy.style.less';
 	//Parse brew theme files
 	less.render(fs.readFileSync(src).toString(), {

scripts/project.json

@@ -15,6 +15,7 @@
 		"codemirror/addon/fold/foldcode.js",
 		"codemirror/addon/fold/foldgutter.js",
 		"codemirror/addon/fold/xml-fold.js",
+		"codemirror/addon/scroll/scrollpastend.js",
 		"codemirror/addon/search/search.js",
 		"codemirror/addon/search/searchcursor.js",
 		"codemirror/addon/search/jump-to-line.js",

server/app.js

@@ -9,47 +9,12 @@ const yaml = require('js-yaml');
 const app = express();
 const config = require('./config.js');
 
-const homebrewApi = require('./homebrew.api.js');
+const { homebrewApi, getBrew } = require('./homebrew.api.js');
 const GoogleActions = require('./googleActions.js');
 const serveCompressedStaticAssets = require('./static-assets.mv.js');
 const sanitizeFilename = require('sanitize-filename');
 const asyncHandler = require('express-async-handler');
 
-const brewAccessTypes = ['edit', 'share', 'raw'];
-
-//Get the brew object from the HB database or Google Drive
-const getBrewFromId = asyncHandler(async (id, accessType)=>{
-	if(!brewAccessTypes.includes(accessType))
-		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.getGoogleBrew(googleId, id, accessType);
-	} else {
-		brew = await HomebrewModel.get(accessType == 'edit' ? { editId: id } : { shareId: id });
-		brew = brew.toObject(); // Convert MongoDB object to standard Javascript Object
-	}
-
-	brew = sanitizeBrew(brew, accessType === 'edit' ? false : true);
-	//Split brew.text into text and style
-	//unless the Access Type is RAW, in which case return immediately
-	if(accessType == 'raw') {
-		return brew;
-	}
-	splitTextStyleAndMetadata(brew);
-	return brew;
-});
-
-const sanitizeBrew = (brew, full=false)=>{
-	delete brew._id;
-	delete brew.__v;
-	if(full){
-		delete brew.editId;
-	}
-	return brew;
-};
-
 const splitTextStyleAndMetadata = (brew)=>{
 	brew.text = brew.text.replaceAll('\r\n', '\n');
 	if(brew.text.startsWith('```metadata')) {
@@ -66,6 +31,15 @@ const splitTextStyleAndMetadata = (brew)=>{
 	}
 };
 
+const sanitizeBrew = (brew, accessType)=>{
+	brew._id = undefined;
+	brew.__v = undefined;
+	if(accessType !== 'edit'){
+		brew.editId = undefined;
+	}
+	return brew;
+};
+
 app.use('/', serveCompressedStaticAssets(`build`));
 
 //app.use(express.static(`${__dirname}/build`));
@@ -93,12 +67,12 @@ app.use((req, res, next)=>{
 app.use(homebrewApi);
 app.use(require('./admin.api.js'));
 
-const HomebrewModel  = require('./homebrew.model.js').model;
+const HomebrewModel     = require('./homebrew.model.js').model;
-const welcomeText    = require('fs').readFileSync('client/homebrew/pages/homePage/welcome_msg.md', 'utf8');
+const welcomeText       = require('fs').readFileSync('client/homebrew/pages/homePage/welcome_msg.md', 'utf8');
-const welcomeTextV3  = require('fs').readFileSync('client/homebrew/pages/homePage/welcome_msg_v3.md', 'utf8');
+const welcomeTextLegacy = require('fs').readFileSync('client/homebrew/pages/homePage/welcome_msg_legacy.md', 'utf8');
-const migrateText    = require('fs').readFileSync('client/homebrew/pages/homePage/migrate.md', 'utf8');
+const migrateText       = require('fs').readFileSync('client/homebrew/pages/homePage/migrate.md', 'utf8');
-const changelogText  = require('fs').readFileSync('changelog.md', 'utf8');
+const changelogText     = require('fs').readFileSync('changelog.md', 'utf8');
-const faqText        = require('fs').readFileSync('faq.md', 'utf8');
+const faqText           = require('fs').readFileSync('faq.md', 'utf8');
 
 String.prototype.replaceAll = function(s, r){return this.split(s).join(r);};
 
@@ -108,63 +82,60 @@ app.get('/robots.txt', (req, res)=>{
 });
 
 //Home page
-app.get('/', async (req, res, next)=>{
+app.get('/', (req, res, next)=>{
-	const brew = {
+	req.brew = {
-		text : welcomeText
+		text     : welcomeText,
+		renderer : 'V3'
 	};
-	req.brew = brew;
+	splitTextStyleAndMetadata(req.brew);
 	return next();
 });
 
 //Home page v3
-app.get('/v3_preview', async (req, res, next)=>{
+app.get('/legacy', (req, res, next)=>{
-	const brew = {
+	req.brew = {
-		text     : welcomeTextV3,
+		text     : welcomeTextLegacy,
-		renderer : 'V3'
+		renderer : 'legacy'
 	};
-	splitTextStyleAndMetadata(brew);
+	splitTextStyleAndMetadata(req.brew);
-	req.brew = brew;
 	return next();
 });
 
 //Legacy/Other Document -> v3 Migration Guide
-app.get('/migrate', async (req, res, next)=>{
+app.get('/migrate', (req, res, next)=>{
-	const brew = {
+	req.brew = {
 		text     : migrateText,
 		renderer : 'V3'
 	};
-	splitTextStyleAndMetadata(brew);
+	splitTextStyleAndMetadata(req.brew);
-	req.brew = brew;
 	return next();
 });
 
 //Changelog page
 app.get('/changelog', async (req, res, next)=>{
-	const brew = {
+	req.brew = {
 		title    : 'Changelog',
 		text     : changelogText,
 		renderer : 'V3'
 	};
-	splitTextStyleAndMetadata(brew);
+	splitTextStyleAndMetadata(req.brew);
-	req.brew = brew;
 	return next();
 });
 
 //FAQ page
 app.get('/faq', async (req, res, next)=>{
-	const brew = {
+	req.brew = {
 		title    : 'FAQ',
 		text     : faqText,
 		renderer : 'V3'
 	};
-	splitTextStyleAndMetadata(brew);
+	splitTextStyleAndMetadata(req.brew);
-	req.brew = brew;
 	return next();
 });
 
 //Source page
-app.get('/source/:id', asyncHandler(async (req, res)=>{
+app.get('/source/:id', asyncHandler(getBrew('share')), (req, res)=>{
-	const brew = await getBrewFromId(req.params.id, 'raw');
+	const { brew } = req;
 
 	const replaceStrings = { '&': '&amp;', '<': '&lt;', '>': '&gt;' };
 	let text = brew.text;
@@ -173,11 +144,12 @@ app.get('/source/:id', asyncHandler(async (req, res)=>{
 	}
 	text = `<code><pre style="white-space: pre-wrap;">${text}</pre></code>`;
 	res.status(200).send(text);
-}));
+});
 
 //Download brew source page
-app.get('/download/:id', asyncHandler(async (req, res)=>{
+app.get('/download/:id', asyncHandler(getBrew('share')), (req, res)=>{
-	const brew = await getBrewFromId(req.params.id, 'raw');
+	const { brew } = req;
+	sanitizeBrew(brew, 'share');
 	const prefix = 'HB - ';
 
 	let fileName = sanitizeFilename(`${prefix}${brew.title}`).replaceAll(' ', '');
@@ -188,13 +160,29 @@ app.get('/download/:id', asyncHandler(async (req, res)=>{
 		'Content-Disposition' : `attachment; filename="${fileName}.txt"`
 	});
 	res.status(200).send(brew.text);
-}));
+});
 
 //User Page
 app.get('/user/:username', async (req, res, next)=>{
 	const ownAccount = req.account && (req.account.username == req.params.username);
 
-	let brews = await HomebrewModel.getByUser(req.params.username, ownAccount)
+	const fields = [
+		'googleId',
+		'title',
+		'pageCount',
+		'description',
+		'authors',
+		'published',
+		'views',
+		'shareId',
+		'editId',
+		'createdAt',
+		'updatedAt',
+		'lastViewed',
+		'tags'
+	];
+
+	let brews = await HomebrewModel.getByUser(req.params.username, ownAccount, fields)
 	.catch((err)=>{
 		console.log(err);
 	});
@@ -206,62 +194,97 @@ app.get('/user/:username', async (req, res, next)=>{
 				console.error(err);
 			});
 
-		if(googleBrews) {
+		if(googleBrews && googleBrews.length > 0) {
+			for (const brew of brews.filter((brew)=>brew.googleId)) {
+				const match = googleBrews.findIndex((b)=>b.editId === brew.editId);
+				if(match !== -1) {
+					brew.googleId = googleBrews[match].googleId;
+					brew.stubbed = true;
+					brew.pageCount = googleBrews[match].pageCount;
+					brew.renderer = googleBrews[match].renderer;
+					brew.version = googleBrews[match].version;
+					googleBrews.splice(match, 1);
+				}
+			}
+
 			googleBrews = googleBrews.map((brew)=>({ ...brew, authors: [req.account.username] }));
 			brews = _.concat(brews, googleBrews);
 		}
 	}
 
 	req.brews = _.map(brews, (brew)=>{
-		return sanitizeBrew(brew, !ownAccount);
+		return sanitizeBrew(brew, ownAccount ? 'edit' : 'share');
 	});
 
 	return next();
 });
 
 //Edit Page
-app.get('/edit/:id', asyncHandler(async (req, res, next)=>{
+app.get('/edit/:id', asyncHandler(getBrew('edit')), (req, res, next)=>{
+	req.brew = req.brew.toObject ? req.brew.toObject() : req.brew;
+	sanitizeBrew(req.brew, 'edit');
+	splitTextStyleAndMetadata(req.brew);
 	res.header('Cache-Control', 'no-cache, no-store');	//reload the latest saved brew when pressing back button, not the cached version before save.
-	const brew = await getBrewFromId(req.params.id, 'edit');
-	req.brew = brew;
 	return next();
-}));
+});
 
 //New Page
-app.get('/new/:id', asyncHandler(async (req, res, next)=>{
+app.get('/new/:id', asyncHandler(getBrew('share')), (req, res, next)=>{
-	const brew = await getBrewFromId(req.params.id, 'share');
+	sanitizeBrew(req.brew, 'share');
-	brew.title = `CLONE - ${brew.title}`;
+	splitTextStyleAndMetadata(req.brew);
-	req.brew = brew;
+	req.brew.title = `CLONE - ${req.brew.title}`;
 	return next();
-}));
+});
 
 //Share Page
-app.get('/share/:id', asyncHandler(async (req, res, next)=>{
+app.get('/share/:id', asyncHandler(getBrew('share')), asyncHandler(async (req, res, next)=>{
-	const brew = await getBrewFromId(req.params.id, 'share');
+	const { brew } = req;
 
-	if(req.params.id.length > 12) {
+	if(req.params.id.length > 12 && !brew._id) {
 		const googleId = req.params.id.slice(0, -12);
 		const shareId = req.params.id.slice(-12);
 		await GoogleActions.increaseView(googleId, shareId, 'share', brew)
-					.catch((err)=>{next(err);});
+			.catch((err)=>{next(err);});
 	} else {
 		await HomebrewModel.increaseView({ shareId: brew.shareId });
 	}
-
+	sanitizeBrew(req.brew, 'share');
-	req.brew = brew;
+	splitTextStyleAndMetadata(req.brew);
 	return next();
 }));
 
 //Print Page
-app.get('/print/:id', asyncHandler(async (req, res, next)=>{
+app.get('/print/:id', asyncHandler(getBrew('share')), (req, res, next)=>{
-	const brew = await getBrewFromId(req.params.id, 'share');
+	sanitizeBrew(req.brew, 'share');
-	req.brew = brew;
+	splitTextStyleAndMetadata(req.brew);
-	return next();
+	next();
-}));
+});
+
+const nodeEnv = config.get('node_env');
+const isLocalEnvironment = config.get('local_environments').includes(nodeEnv);
+// Local only
+if(isLocalEnvironment){
+	// Login
+	app.post('/local/login', (req, res)=>{
+		const username = req.body.username;
+		if(!username) return;
+
+		const payload = jwt.encode({ username: username, issued: new Date }, config.get('secret'));
+		return res.json(payload);
+	});
+}
+
+
 
 //Render the page
 const templateFn = require('./../client/template.js');
-app.use((req, res)=>{
+app.use(asyncHandler(async (req, res, next)=>{
+	// Create configuration object
+	const configuration = {
+		local       : isLocalEnvironment,
+		publicUrl   : config.get('publicUrl') ?? '',
+		environment : nodeEnv
+	};
 	const props = {
 		version     : require('./../package.json').version,
 		url         : req.originalUrl,
@@ -269,16 +292,18 @@ app.use((req, res)=>{
 		brews       : req.brews,
 		googleBrews : req.googleBrews,
 		account     : req.account,
-		enable_v3   : config.get('enable_v3')
+		enable_v3   : config.get('enable_v3'),
+		config      : configuration
 	};
 	const title = req.brew ? req.brew.title : '';
-	templateFn('homebrew', title, props)
+	const page = await templateFn('homebrew', title, props)
-        .then((page)=>{ res.send(page); })
+		.catch((err)=>{
-        .catch((err)=>{
+			console.log(err);
-        	console.log(err);
+			return res.sendStatus(500);
-        	return res.sendStatus(500);
+		});
-        });
+	if(!page) return;
-});
+	res.send(page);
+}));
 
 //v=====----- Error-Handling Middleware -----=====v//
 //Format Errors so all fields will be sent
@@ -302,6 +327,13 @@ app.use((err, req, res, next)=>{
 	console.error(err);
 	res.status(status).send(getPureError(err));
 });
+
+app.use((req, res)=>{
+	if(!res.headersSent) {
+		console.error('Headers have not been sent, responding with a server error.', req.url);
+		res.status(500).send('An error occurred and the server did not send a response. The error has been logged, please note the time this occurred and report this issue.');
+	}
+});
 //^=====--------------------------------------=====^//
 
 module.exports = {

server/googleActions.js

@@ -124,9 +124,9 @@ const GoogleActions = {
 				title       : file.properties.title,
 				description : file.description,
 				views       : parseInt(file.properties.views),
-				tags        : '',
 				published   : file.properties.published ? file.properties.published == 'true' : false,
-				systems     : []
+				systems     : [],
+				thumbnail   : file.properties.thumbnail
 			};
 		});
 	  return brews;
@@ -142,12 +142,12 @@ const GoogleActions = {
 				description : `${brew.description}`,
 				properties  : {
 					title     : brew.title,
-					published : brew.published,
+					shareId   : brew.shareId || nanoid(12),
-					version   : brew.version,
+					editId    : brew.editId || nanoid(12),
-					renderer  : brew.renderer,
-					tags      : brew.tags,
 					pageCount : brew.pageCount,
-					systems   : brew.systems.join()
+					renderer  : brew.renderer || 'legacy',
+					isStubbed : true,
+					thumbnail : brew.thumbnail
 				}
 			},
 			media : {
@@ -159,10 +159,9 @@ const GoogleActions = {
 			console.log('Error saving to google');
 			console.error(err);
 			throw (err);
-			//return res.status(500).send('Error while saving');
 		});
 
-		return (brew);
+		return true;
 	},
 
 	newGoogleBrew : async (auth, brew)=>{
@@ -176,16 +175,18 @@ const GoogleActions = {
 		const folderId = await GoogleActions.getGoogleFolder(auth);
 
 		const fileMetadata = {
-			'name'        : `${brew.title}.txt`,
+			name        : `${brew.title}.txt`,
-			'description' : `${brew.description}`,
+			description : `${brew.description}`,
-			'parents'     : [folderId],
+			parents     : [folderId],
-			'properties'  : {								//AppProperties is not accessible
+			properties  : {								//AppProperties is not accessible
-				'shareId'   : brew.shareId || nanoid(12),
+				shareId   : brew.shareId || nanoid(12),
-				'editId'    : brew.editId || nanoid(12),
+				editId    : brew.editId || nanoid(12),
-				'title'     : brew.title,
+				title     : brew.title,
-				'views'     : '0',
+				pageCount : brew.pageCount,
-				'pageCount' : brew.pageCount,
+				renderer  : brew.renderer || 'legacy',
-				'renderer'  : brew.renderer || 'legacy'
+				isStubbed : true,
+				version   : 1,
+				thumbnail : brew.thumbnail || ''
 			}
 		};
 
@@ -212,26 +213,7 @@ const GoogleActions = {
 			console.error(err);
 		});
 
-		const newHomebrew = {
+		return obj.data.id;
-			text      : brew.text,
-			shareId   : fileMetadata.properties.shareId,
-			editId    : fileMetadata.properties.editId,
-			createdAt : new Date(),
-			updatedAt : new Date(),
-			gDrive    : true,
-			googleId  : obj.data.id,
-			pageCount : fileMetadata.properties.pageCount,
-
-			title       : brew.title,
-			description : brew.description,
-			tags        : '',
-			published   : brew.published,
-			renderer    : brew.renderer,
-			authors     : [],
-			systems     : []
-		};
-
-		return newHomebrew;
 	},
 
 	getGoogleBrew : async (id, accessId, accessType)=>{
@@ -244,7 +226,6 @@ const GoogleActions = {
 		.catch((err)=>{
 			console.log('Error loading from Google');
 			throw (err);
-			return;
 		});
 
 		if(obj) {
@@ -254,9 +235,7 @@ const GoogleActions = {
 				throw ('Share ID does not match');
 			}
 
-			const serviceDrive = google.drive({ version: 'v3' });
+			const file = await drive.files.get({
-
-			const file = await serviceDrive.files.get({
 				fileId : id,
 				fields : 'description, properties',
 				alt    : 'media'
@@ -273,7 +252,7 @@ const GoogleActions = {
 				text    : file.data,
 
 				description : obj.data.description,
-				tags        : obj.data.properties.tags    ? obj.data.properties.tags               : '',
+				tags        : obj.data.properties.tags ? obj.data.properties.tags : '',
 				systems     : obj.data.properties.systems ? obj.data.properties.systems.split(',') : [],
 				authors     : [],
 				published   : obj.data.properties.published ? obj.data.properties.published == 'true' : false,
@@ -286,8 +265,8 @@ const GoogleActions = {
 				views      : parseInt(obj.data.properties.views) || 0, //brews with no view parameter will return undefined
 				version    : parseInt(obj.data.properties.version) || 0,
 				renderer   : obj.data.properties.renderer ? obj.data.properties.renderer : 'legacy',
+				thumbnail  : obj.data.properties.thumbnail || '',
 
-				gDrive   : true,
 				googleId : id
 			};
 
@@ -295,14 +274,11 @@ const GoogleActions = {
 		}
 	},
 
-	deleteGoogleBrew : async (auth, id)=>{
+	deleteGoogleBrew : async (auth, id, accessId)=>{
 		const drive = google.drive({ version: 'v3', auth });
 
-		const googleId = id.slice(0, -12);
-		const accessId = id.slice(-12);
-
 		const obj = await drive.files.get({
-			fileId : googleId,
+			fileId : id,
 			fields : 'properties'
 		})
 		.catch((err)=>{
@@ -311,11 +287,11 @@ const GoogleActions = {
 		});
 
 		if(obj && obj.data.properties.editId != accessId) {
-			throw ('Not authorized to delete this Google brew');
+			throw { status: 403, message: 'Not authorized to delete this Google brew' };
 		}
 
 		await drive.files.update({
-			fileId   : googleId,
+			fileId   : id,
 			resource : { trashed: true }
 		})
 		.catch((err)=>{

server/homebrew.api.js

@@ -1,3 +1,4 @@
+/* eslint-disable max-lines */
 const _ = require('lodash');
 const HomebrewModel = require('./homebrew.model.js').model;
 const router = require('express').Router();
@@ -5,6 +6,8 @@ const zlib = require('zlib');
 const GoogleActions = require('./googleActions.js');
 const Markdown = require('../shared/naturalcrit/markdown.js');
 const yaml = require('js-yaml');
+const asyncHandler = require('express-async-handler');
+const { nanoid } = require('nanoid');
 
 // const getTopBrews = (cb) => {
 // 	HomebrewModel.find().sort({ views: -1 }).limit(5).exec(function(err, brews) {
@@ -12,6 +15,63 @@ const yaml = require('js-yaml');
 // 	});
 // };
 
+const getId = (req)=>{
+	// Set the id and initial potential google id, where the google id is present on the existing brew.
+	let id = req.params.id, googleId = req.body?.googleId;
+
+	// If the id is longer than 12, then it's a google id + the edit id. This splits the longer id up.
+	if(id.length > 12) {
+		googleId = id.slice(0, -12);
+		id = id.slice(-12);
+	}
+	return { id, googleId };
+};
+
+const getBrew = (accessType)=>{
+	// Create middleware with the accessType passed in as part of the scope
+	return async (req, res, next)=>{
+		// Get relevant IDs for the brew
+		const { id, googleId } = getId(req);
+
+		// Try to find the document in the Homebrewery database -- if it doesn't exist, that's fine.
+		let stub = await HomebrewModel.get(accessType === 'edit' ? { editId: id } : { shareId: id })
+			.catch((err)=>{
+				if(googleId) {
+					console.warn(`Unable to find document stub for ${accessType}Id ${id}`);
+				} else {
+					console.warn(err);
+				}
+			});
+		stub = stub?.toObject();
+
+		// If there is a google id, try to find the google brew
+		if(googleId || stub?.googleId) {
+			let googleError;
+			const googleBrew = await GoogleActions.getGoogleBrew(googleId || stub?.googleId, id, accessType)
+				.catch((err)=>{
+					console.warn(err);
+					googleError = err;
+				});
+			// If we can't find the google brew and there is a google id for the brew, throw an error.
+			if(!googleBrew) throw googleError;
+			// Combine the Homebrewery stub with the google brew, or if the stub doesn't exist just use the google brew
+			stub = stub ? _.assign({ ...excludeStubProps(stub), stubbed: true }, excludeGoogleProps(googleBrew)) : googleBrew;
+		}
+
+		// If after all of that we still don't have a brew, throw an exception
+		if(!stub) {
+			throw 'Brew not found in Homebrewery database or Google Drive';
+		}
+
+		if(typeof stub.tags === 'string') {
+			stub.tags = [];
+		}
+		req.brew = stub;
+
+		next();
+	};
+};
+
 const mergeBrewText = (brew)=>{
 	let text = brew.text;
 	if(brew.style !== undefined) {
@@ -32,15 +92,33 @@ const MAX_TITLE_LENGTH = 100;
 
 const getGoodBrewTitle = (text)=>{
 	const tokens = Markdown.marked.lexer(text);
- 	return (tokens.find((token)=>token.type == 'heading' ||	token.type == 'paragraph')?.text || 'No Title')
+ 	return (tokens.find((token)=>token.type === 'heading' || token.type === 'paragraph')?.text || 'No Title')
 				 .slice(0, MAX_TITLE_LENGTH);
 };
 
 const excludePropsFromUpdate = (brew)=>{
 	// Remove undesired properties
-	const propsToExclude = ['views', 'lastViewed'];
+	const modified = _.clone(brew);
+	const propsToExclude = ['_id', 'views', 'lastViewed', 'editId', 'shareId', 'googleId'];
 	for (const prop of propsToExclude) {
-		delete brew[prop];
+		delete modified[prop];
+	}
+	return modified;
+};
+
+const excludeGoogleProps = (brew)=>{
+	const modified = _.clone(brew);
+	const propsToExclude = ['tags', 'systems', 'published', 'authors', 'owner', 'views'];
+	for (const prop of propsToExclude) {
+		delete modified[prop];
+	}
+	return modified;
+};
+
+const excludeStubProps = (brew)=>{
+	const propsToExclude = ['text', 'textBin', 'renderer', 'pageCount', 'version'];
+	for (const prop of propsToExclude) {
+		brew[prop] = undefined;
 	}
 	return brew;
 };
@@ -54,33 +132,17 @@ const beforeNewSave = (account, brew)=>{
 	brew.text = mergeBrewText(brew);
 };
 
-const newLocalBrew = async (brew)=>{
-	const newHomebrew = new HomebrewModel(brew);
-	// Compress brew text to binary before saving
-	newHomebrew.textBin = zlib.deflateRawSync(newHomebrew.text);
-	// Delete the non-binary text field since it's not needed anymore
-	newHomebrew.text = undefined;
-
-	let saved = await newHomebrew.save()
-		.catch((err)=>{
-			console.error(err, err.toString(), err.stack);
-			throw `Error while creating new brew, ${err.toString()}`;
-		});
-
-	saved = saved.toObject();
-	saved.gDrive = false;
-	return saved;
-};
-
 const newGoogleBrew = async (account, brew, res)=>{
 	const oAuth2Client = GoogleActions.authCheck(account, res);
 
-	return await GoogleActions.newGoogleBrew(oAuth2Client, brew);
+	const newBrew = excludeGoogleProps(brew);
+
+	return await GoogleActions.newGoogleBrew(oAuth2Client, newBrew);
 };
 
 const newBrew = async (req, res)=>{
 	const brew = req.body;
-	const { transferToGoogle } = req.query;
+	const { saveToGoogle } = req.query;
 
 	delete brew.editId;
 	delete brew.shareId;
@@ -88,148 +150,189 @@ const newBrew = async (req, res)=>{
 
 	beforeNewSave(req.account, brew);
 
-	let saved;
+	const newHomebrew = new HomebrewModel(brew);
-	if(transferToGoogle) {
+	newHomebrew.editId = nanoid(12);
-		saved = await newGoogleBrew(req.account, brew, res)
+	newHomebrew.shareId = nanoid(12);
+
+	let googleId, saved;
+	if(saveToGoogle) {
+		googleId = await newGoogleBrew(req.account, newHomebrew, res)
 			.catch((err)=>{
-				res.status(err.status || err.response.status).send(err.message || err);
+				console.error(err);
+				res.status(err?.status || err?.response?.status || 500).send(err?.message || err);
 			});
+		if(!googleId) return;
+		excludeStubProps(newHomebrew);
+		newHomebrew.googleId = googleId;
 	} else {
-		saved = await newLocalBrew(brew)
+		// Compress brew text to binary before saving
-			.catch((err)=>{
+		newHomebrew.textBin = zlib.deflateRawSync(newHomebrew.text);
-				res.status(500).send(err);
+		// Delete the non-binary text field since it's not needed anymore
-			});
+		newHomebrew.text = undefined;
 	}
+
+	saved = await newHomebrew.save()
+		.catch((err)=>{
+			console.error(err, err.toString(), err.stack);
+			throw `Error while creating new brew, ${err.toString()}`;
+		});
 	if(!saved) return;
-	return res.status(200).send(saved);
+	saved = saved.toObject();
+
+	res.status(200).send(saved);
 };
 
 const updateBrew = async (req, res)=>{
-	let brew = excludePropsFromUpdate(req.body);
+	// Initialize brew from request and body, destructure query params, set a constant for the google id, and set the initial value for the after-save method
-	const { transferToGoogle, transferFromGoogle } = req.query;
+	let brew = _.assign(req.brew, excludePropsFromUpdate(req.body));
+	const { saveToGoogle, removeFromGoogle } = req.query;
+	const googleId = brew.googleId;
+	let afterSave = async ()=>true;
 
-	let saved;
+	brew.text = mergeBrewText(brew);
-	if(brew.googleId && transferFromGoogle) {
-		beforeNewSave(req.account, brew);
 
-		saved = await newLocalBrew(brew)
+	if(brew.googleId && removeFromGoogle) {
-			.catch((err)=>{
+		// If the google id exists and we're removing it from google, set afterSave to delete the google brew and mark the brew's google id as undefined
-				console.error(err);
+		afterSave = async ()=>{
-				res.status(500).send(err);
+			return await deleteGoogleBrew(req.account, googleId, brew.editId, res)
-			});
+				.catch((err)=>{
-		if(!saved) return;
+					console.error(err);
+					res.status(err?.status || err?.response?.status || 500).send(err.message || err);
+				});
+		};
 
-		await deleteGoogleBrew(req.account, `${brew.googleId}${brew.editId}`, res)
+		brew.googleId = undefined;
+	} else if(!brew.googleId && saveToGoogle) {
+		// If we don't have a google id and the user wants to save to google, create the google brew and set the google id on the brew
+		brew.googleId = await newGoogleBrew(req.account, excludeGoogleProps(brew), res)
 			.catch((err)=>{
 				console.error(err);
 				res.status(err.status || err.response.status).send(err.message || err);
 			});
-	} else if(!brew.googleId && transferToGoogle) {
+		if(!brew.googleId) return;
-		saved = await newGoogleBrew(req.account, brew, res)
-			.catch((err)=>{
-				console.error(err);
-				res.status(err.status || err.response.status).send(err.message || err);
-			});
-		if(!saved) return;
-
-		await deleteLocalBrew(req.account, brew.editId)
-			.catch((err)=>{
-				console.error(err);
-				res.status(err.status).send(err.message);
-			});
 	} else if(brew.googleId) {
-		brew.text = mergeBrewText(brew);
+		// If the google id exists and no other actions are being performed, update the google brew
-
+		const updated = await GoogleActions.updateGoogleBrew(excludeGoogleProps(brew))
-		saved = await GoogleActions.updateGoogleBrew(brew)
 			.catch((err)=>{
 				console.error(err);
-				res.status(err.response?.status || 500).send(err);
+				res.status(err?.response?.status || 500).send(err);
 			});
+		if(!updated) return;
+	}
+
+	if(brew.googleId) {
+		// If the google id exists after all those actions, exclude the props that are stored in google and aren't needed for rendering the brew items
+		excludeStubProps(brew);
 	} else {
-		const dbBrew = await HomebrewModel.get({ editId: req.params.id })
-			.catch((err)=>{
-				console.error(err);
-				return res.status(500).send('Error while saving');
-			});
-
-		brew = _.merge(dbBrew, brew);
-		brew.text = mergeBrewText(brew);
-
 		// Compress brew text to binary before saving
 		brew.textBin = zlib.deflateRawSync(brew.text);
 		// Delete the non-binary text field since it's not needed anymore
 		brew.text = undefined;
-		brew.updatedAt = new Date();
-
-		if(req.account) {
-			brew.authors = _.uniq(_.concat(brew.authors, req.account.username));
-		}
-
-		brew.markModified('authors');
-		brew.markModified('systems');
-
-		saved = await brew.save();
 	}
+	brew.updatedAt = new Date();
+
+	if(req.account) {
+		brew.authors = _.uniq(_.concat(brew.authors, req.account.username));
+	}
+
+	// Fetch the brew from the database again (if it existed there to begin with), and assign the existing brew to it
+	brew = _.assign(await HomebrewModel.findOne({ _id: brew._id }), brew);
+
+	if(!brew.markModified) {
+		// If it wasn't in the database, create a new db brew
+		brew = new HomebrewModel(brew);
+	}
+
+	brew.markModified('authors');
+	brew.markModified('systems');
+
+	// Save the database brew
+	const saved = await brew.save()
+		.catch((err)=>{
+			console.error(err);
+			res.status(err.status || 500).send(err.message || 'Unable to save brew to Homebrewery database');
+		});
 	if(!saved) return;
+	// Call and wait for afterSave to complete
+	const after = await afterSave();
+	if(!after) return;
 
-	if(!res.headersSent) return res.status(200).send(saved);
+	res.status(200).send(saved);
 };
 
-const deleteBrew = async (req, res)=>{
+const deleteGoogleBrew = async (account, id, editId, res)=>{
-	if(req.params.id.length > 12) {
-		const deleted = await deleteGoogleBrew(req.account, req.params.id, res)
-			.catch((err)=>{
-				res.status(500).send(err);
-			});
-		if(deleted) return res.status(200).send();
-	} else {
-		const deleted = await deleteLocalBrew(req.account, req.params.id)
-			.catch((err)=>{
-				res.status(err.status).send(err.message);
-			});
-		if(deleted) return res.status(200).send(deleted);
-		return res.status(200).send();
-	}
-};
-
-const deleteLocalBrew = async (account, id)=>{
-	const brew = await HomebrewModel.findOne({ editId: id });
-	if(!brew) {
-		throw { status: 404, message: 'Can not find homebrew with that id' };
-	}
-
-	if(account) {
-		// Remove current user as author
-		brew.authors = _.pull(brew.authors, account.username);
-		brew.markModified('authors');
-	}
-
-	if(brew.authors.length === 0) {
-		// Delete brew if there are no authors left
-		await brew.remove()
-			.catch((err)=>{
-				console.error(err);
-				throw { status: 500, message: 'Error while removing' };
-			});
-	} else {
-		// Otherwise, save the brew with updated author list
-		return await brew.save()
-			.catch((err)=>{
-				throw { status: 500, message: err };
-			});
-	}
-};
-
-const deleteGoogleBrew = async (account, id, res)=>{
 	const auth = await GoogleActions.authCheck(account, res);
-	await GoogleActions.deleteGoogleBrew(auth, id);
+	await GoogleActions.deleteGoogleBrew(auth, id, editId);
 	return true;
 };
 
-router.post('/api', newBrew);
+const deleteBrew = async (req, res, next)=>{
-router.put('/api/:id', updateBrew);
+	// Delete an orphaned stub if its Google brew doesn't exist
-router.put('/api/update/:id', updateBrew);
+	try {
-router.delete('/api/:id', deleteBrew);
+		await getBrew('edit')(req, res, ()=>{});
-router.get('/api/remove/:id', deleteBrew);
+	} catch (err) {
+		const { id, googleId } = getId(req);
+		console.warn(`No google brew found for id ${googleId}, the stub with id ${id} will be deleted.`);
+		await HomebrewModel.deleteOne({ editId: id });
+		return next();
+	}
 
-module.exports = router;
+	let brew = req.brew;
+	const { googleId, editId } = brew;
+	const account = req.account;
+	const isOwner = account && (brew.authors.length === 0 || brew.authors[0] === account.username);
+	// If the user is the owner and the file is saved to google, mark the google brew for deletion
+	const shouldDeleteGoogleBrew = googleId && isOwner;
+
+	if(brew._id) {
+		brew = _.assign(await HomebrewModel.findOne({ _id: brew._id }), brew);
+		if(account) {
+			// Remove current user as author
+			brew.authors = _.pull(brew.authors, account.username);
+			brew.markModified('authors');
+		}
+
+		if(brew.authors.length === 0) {
+			// Delete brew if there are no authors left
+			await brew.remove()
+				.catch((err)=>{
+					console.error(err);
+					throw { status: 500, message: 'Error while removing' };
+				});
+		} else {
+			if(shouldDeleteGoogleBrew) {
+				// When there are still authors remaining, we delete the google brew but store the full brew in the Homebrewery database
+				brew.googleId = undefined;
+				brew.textBin = zlib.deflateRawSync(brew.text);
+				brew.text = undefined;
+			}
+
+			// Otherwise, save the brew with updated author list
+			await brew.save()
+				.catch((err)=>{
+					throw { status: 500, message: err };
+				});
+		}
+	}
+	if(shouldDeleteGoogleBrew) {
+		const deleted = await deleteGoogleBrew(account, googleId, editId, res)
+			.catch((err)=>{
+				console.error(err);
+				res.status(500).send(err);
+			});
+		if(!deleted) return;
+	}
+
+	res.status(204).send();
+};
+
+router.post('/api', asyncHandler(newBrew));
+router.put('/api/:id', asyncHandler(getBrew('edit')), asyncHandler(updateBrew));
+router.put('/api/update/:id', asyncHandler(getBrew('edit')), asyncHandler(updateBrew));
+router.delete('/api/:id', asyncHandler(deleteBrew));
+router.get('/api/remove/:id', asyncHandler(deleteBrew));
+
+module.exports = {
+	homebrewApi : router,
+	getBrew
+};

server/homebrew.model.js

@@ -6,17 +6,19 @@ const zlib = require('zlib');
 const HomebrewSchema = mongoose.Schema({
 	shareId   : { type: String, default: ()=>{return nanoid(12);}, index: { unique: true } },
 	editId    : { type: String, default: ()=>{return nanoid(12);}, index: { unique: true } },
+	googleId  : { type: String },
 	title     : { type: String, default: '' },
 	text      : { type: String, default: '' },
 	textBin   : { type: Buffer },
 	pageCount : { type: Number, default: 1 },
 
 	description : { type: String, default: '' },
-	tags        : { type: String, default: '' },
+	tags        : [String],
 	systems     : [String],
 	renderer    : { type: String, default: '' },
 	authors     : [String],
 	published   : { type: Boolean, default: false },
+	thumbnail   : { type: String, default: '' },
 
 	createdAt  : { type: Date, default: Date.now },
 	updatedAt  : { type: Date, default: Date.now },
@@ -36,9 +38,9 @@ HomebrewSchema.statics.increaseView = async function(query) {
 	return brew;
 };
 
-HomebrewSchema.statics.get = function(query){
+HomebrewSchema.statics.get = function(query, fields=null){
 	return new Promise((resolve, reject)=>{
-		Homebrew.find(query, (err, brews)=>{
+		Homebrew.find(query, fields, null, (err, brews)=>{
 			if(err || !brews.length) return reject('Can not find brew');
 			if(!_.isNil(brews[0].textBin)) {			// Uncompress zipped text field
 				unzipped = zlib.inflateRawSync(brews[0].textBin);
@@ -51,13 +53,13 @@ HomebrewSchema.statics.get = function(query){
 	});
 };
 
-HomebrewSchema.statics.getByUser = function(username, allowAccess=false){
+HomebrewSchema.statics.getByUser = function(username, allowAccess=false, fields=null){
 	return new Promise((resolve, reject)=>{
 		const query = { authors: username, published: true };
 		if(allowAccess){
 			delete query.published;
 		}
-		Homebrew.find(query).lean().exec((err, brews)=>{ //lean() converts results to JSObjects
+		Homebrew.find(query, fields).lean().exec((err, brews)=>{ //lean() converts results to JSObjects
 			if(err) return reject('Can not find brew');
 			return resolve(brews);
 		});

shared/naturalcrit/codeEditor/codeEditor.jsx

@@ -30,6 +30,8 @@ if(typeof navigator !== 'undefined'){
 	// require('codemirror/addon/edit/trailingspace.js');
 	//Active line highlighting
 	// require('codemirror/addon/selection/active-line.js');
+	//Scroll past last line
+	require('codemirror/addon/scroll/scrollpastend.js');
 	//Auto-closing
 	//XML code folding is a requirement of the auto-closing tag feature and is not enabled
 	require('codemirror/addon/fold/xml-fold.js');
@@ -98,6 +100,7 @@ const CodeEditor = createClass({
 			indentWithTabs    : true,
 			tabSize           : 2,
 			historyEventDelay : 250,
+			scrollPastEnd     : true,
 			extraKeys         : {
 				'Ctrl-B'           : this.makeBold,
 				'Cmd-B'            : this.makeBold,

shared/naturalcrit/codeEditor/codeEditor.less

@@ -3,6 +3,11 @@
 @import (less) 'codemirror/addon/search/matchesonscrollbar.css';
 @import (less) 'codemirror/addon/dialog/dialog.css';
 
+@keyframes sourceMoveAnimation {
+	50%  {background-color: red;   color: white;}
+	100% {background-color: unset; color: unset;}
+}
+
 .codeEditor{
   .CodeMirror-foldmarker {
     font-family: inherit;
@@ -10,6 +15,11 @@
     font-weight: 600;
   }
 
+  .sourceMoveFlash .CodeMirror-line{
+    animation-name: sourceMoveAnimation;
+    animation-duration: 0.4s;
+  }
+
   //.cm-tab {
   //  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAMCAQAAACOs/baAAAARUlEQVR4nGJgIAG8JkXxUAcCtDWemcGR1lY4MvgzCEKY7jSBjgxBDAG09UEQzAe0AMwMHrSOAwEGRtpaMIwAAAAA//8DAG4ID9EKs6YqAAAAAElFTkSuQmCC) no-repeat right;
   //}
@@ -19,4 +29,4 @@
   //    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAQAgMAAABW5NbuAAAACVBMVEVHcEwAAAAAAAAWawmTAAAAA3RSTlMAPBJ6PMxpAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAFUlEQVQI12NgwACcCQysASAEZGAAACMuAX06aCQUAAAAAElFTkSuQmCC) no-repeat right;
   //  }
   //}
-}
+}

shared/naturalcrit/nav/nav.less

@@ -50,7 +50,7 @@ nav{
 		}
 	}
 	.navItem{
-		#backgroundColors;
+		#backgroundColorsHover;
 		.animate(background-color);
 		padding          : 8px 12px;
 		cursor           : pointer;

shared/naturalcrit/splitPane/splitPane.jsx

@@ -17,7 +17,10 @@ const SplitPane = createClass({
 		return {
 			currentDividerPos : null,
 			windowWidth       : 0,
-			isDragging        : false
+			isDragging        : false,
+			moveSource        : false,
+			moveBrew          : false,
+			showMoveArrows    : true
 		};
 	},
 
@@ -29,6 +32,11 @@ const SplitPane = createClass({
 				userSetDividerPos : dividerPos,
 				windowWidth       : window.innerWidth
 			});
+		} else {
+			this.setState({
+				currentDividerPos : window.innerWidth / 2,
+				userSetDividerPos : window.innerWidth / 2
+			});
 		}
 		window.addEventListener('resize', this.handleWindowResize);
 	},
@@ -83,20 +91,58 @@ const SplitPane = createClass({
 			window.getSelection().removeAllRanges();
 		}
 	},
-*/
+	*/
+
+	setMoveArrows : function(newState) {
+		if(this.state.showMoveArrows != newState){
+			this.setState({
+				showMoveArrows : newState
+			});
+		}
+	},
+
+	renderMoveArrows : function(){
+		if(this.state.showMoveArrows) {
+			return <>
+				<div className='arrow left'
+					style={{ left: this.state.currentDividerPos-4 }}
+					onClick={()=>this.setState({ moveSource: !this.state.moveSource })} >
+					<i className='fas fa-arrow-left' />
+				</div>
+				<div className='arrow right'
+					style={{ left: this.state.currentDividerPos-4 }}
+					onClick={()=>this.setState({ moveBrew: !this.state.moveBrew })} >
+					<i className='fas fa-arrow-right' />
+				</div>
+			</>;
+		}
+	},
+
 	renderDivider : function(){
-		return <div className='divider' onMouseDown={this.handleDown} >
+		return <>
-			<div className='dots'>
+			{this.renderMoveArrows()}
-				<i className='fas fa-circle' />
+			<div className='divider' onMouseDown={this.handleDown} >
-				<i className='fas fa-circle' />
+				<div className='dots'>
-				<i className='fas fa-circle' />
+					<i className='fas fa-circle' />
+					<i className='fas fa-circle' />
+					<i className='fas fa-circle' />
+				</div>
 			</div>
-		</div>;
+		</>;
 	},
 
 	render : function(){
 		return <div className='splitPane' onMouseMove={this.handleMove} onMouseUp={this.handleUp}>
-			<Pane ref='pane1' width={this.state.currentDividerPos}>{this.props.children[0]}</Pane>
+			<Pane
+				ref='pane1'
+				width={this.state.currentDividerPos}
+			>
+				{React.cloneElement(this.props.children[0], {
+					moveBrew      : this.state.moveBrew,
+					moveSource    : this.state.moveSource,
+					setMoveArrows : this.setMoveArrows
+				})}
+			</Pane>
 			{this.renderDivider()}
 			<Pane ref='pane2' isDragging={this.state.isDragging}>{this.props.children[1]}</Pane>
 		</div>;

shared/naturalcrit/splitPane/splitPane.less

@@ -13,7 +13,7 @@
 	.divider{
 		display          : table;
 		height           : 100%;
-		width            : 12px;
+		width            : 15px;
 		cursor           : ew-resize;
 		background-color : #bbb;
 		text-align       : center;
@@ -32,4 +32,28 @@
 			background-color: #999;
 		}
 	}
+	.arrow{
+		position         : absolute;
+		width            : 25px;
+		height           : 25px;
+		border           : 2px solid #bbb;
+		border-radius    : 15px;
+		text-align       : center;
+		font-size        : 1.2em;
+		cursor           : pointer;
+		background-color : #ddd;
+		z-index          : 999;
+		box-shadow      : 0 4px 5px #0000007f;
+		&.left{
+			.tooltipLeft('Jump to location in Editor');
+			top : 30px;
+		}
+		&.right{
+			.tooltipRight('Jump to location in Preview');
+			top : 60px;
+		}
+		&:hover{
+			background-color: #666;
+		}
+	}
 }

shared/naturalcrit/styles/colors.less

@@ -23,6 +23,29 @@
 @grey        : #7F8C8D;
 
 #backgroundColors {
+  &.tealLight{ background-color : @tealLight };
+  &.teal{ background-color : @teal };
+  &.greenLight{ background-color : @greenLight };
+  &.green{ background-color : @green };
+  &.blueLight{ background-color : @blueLight };
+  &.blue{ background-color : @blue };
+  &.purpleLight{ background-color : @purpleLight };
+  &.purple{ background-color : @purple };
+  &.steelLight{ background-color : @steelLight };
+  &.steel{ background-color : @steel };
+  &.yellowLight{ background-color : @yellowLight };
+  &.yellow{ background-color : @yellow };
+  &.orangeLight{ background-color : @orangeLight };
+  &.orange{ background-color : @orange };
+  &.redLight{ background-color : @redLight };
+  &.red{ background-color : @red };
+  &.silverLight{ background-color : @silverLight };
+  &.silver{ background-color : @silver };
+  &.greyLight{ background-color : @greyLight };
+  &.grey{ background-color : @grey };
+}
+
+#backgroundColorsHover {
   &.tealLight:hover{ background-color : @tealLight };
   &.teal:hover{ background-color : @teal };
   &.greenLight:hover{ background-color : @greenLight };

themes/5ePhb.style.less

@@ -545,7 +545,6 @@ body {
 		-webkit-column-break-after : always;
 		break-after                : always;
 		-moz-column-break-after    : always;
-		break-before               : column;
 	}
 	//Avoid breaking up
 	blockquote,table{
@@ -604,8 +603,8 @@ body {
 		white-space : nowrap;
 	}
 	&.frame {
-		margin-top          : 0.66cm;
+		margin-top          : 0.7cm;
-		margin-bottom       : 1.05cm;
+		margin-bottom       : 0.9cm;
 		margin-left         : -0.1cm;
 		margin-right        : -0.1cm;
 		width               : calc(100% + 0.2cm);
@@ -613,34 +612,38 @@ body {
 		background-color    : white;
 		border              : initial;
 		border-style        : solid;
-		border-image-outset : 0.55cm 0.3cm;
+		border-image-outset : 0.4cm 0.3cm;
 		border-image-repeat : stretch;
 		border-image-slice  : 200;
 		border-image-source : @frameBorderImage;
 		border-image-width  : 47px;
+		&.wide:first-child {
+			margin-top: 0.12cm;
+		}
 	}
 	&.decoration {
-		transform-style : preserve-3d;
-		z-index: -1;
 		position:relative;
 	}
 	&.decoration::before {
-		content           :'';
+		content             :'';
-		position          : absolute;
+		position            : absolute;
-		background-image  : @classTableDecoration;
+		background-image    : @classTableDecoration,
-		background-size   : contain;
+		                      @classTableDecoration;
-		background-repeat : space;
+		background-size     : contain, contain;
-		width             : 7.75cm;
+		background-repeat   : no-repeat, no-repeat;
-		height            : calc(100% + 3.3cm);
+		background-position : top, bottom;
-		top               : 50%;
+		width               : 7.75cm;
-		left              : 50%;
+		height              : calc(100% + 3.3cm);
-		transform         : translateY(-50%) translateX(-50%) translateZ(-1px);
+		top                 : 50%;
-		filter            : drop-shadow(0px 0px 1px #C8C5C080)
+		left                : 50%;
+		transform           : translateY(-50%) translateX(-50%);
+		filter              : drop-shadow(0px 0px 1px #C8C5C080);
+		z-index             : -1;
 	}
 	&.decoration.wide::before {
-		width             : calc(100% + 3.3cm);
+		width               : calc(100% + 3.3cm);
-		height            : 7.75cm;
+		height              : 7.75cm;
-		top               : calc(50% + 0.4cm);
+		background-position : left, right;
 	}
 	h5 + table{
 		margin-top : 0.2cm;

themes/fonts/5e/fonts.less

@@ -77,3 +77,32 @@
 	font-weight: normal;
 	font-style: normal;
 }
+
+/* Cover Page */
+@font-face {
+	font-family: NodestoCapsCondensed;
+	src: url('../fonts/5e/Nodesto Caps Condensed.woff2');
+	font-weight: normal;
+	font-style: normal;
+}
+
+@font-face {
+	font-family: NodestoCapsCondensed;
+	src: url('../fonts/5e/Nodesto Caps Condensed Bold.woff2');
+	font-weight: bold;
+	font-style: normal;
+}
+
+@font-face {
+	font-family: NodestoCapsCondensed;
+	src: url('../fonts/5e/Nodesto Caps Condensed Italic.woff2');
+	font-weight: normal;
+	font-style: italic;
+}
+
+@font-face {
+	font-family: NodestoCapsCondensed;
+	src: url('../fonts/5e/Nodesto Caps Condensed Bold Italic.woff2');
+	font-weight: bold;
+	font-style: italic;
+}