Bump codemirror from 5.65.17 to 6.0.2

Bumps [codemirror](https://github.com/codemirror/basic-setup) from 5.65.17 to 6.0.2.
- [Changelog](https://github.com/codemirror/basic-setup/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/basic-setup/commits/6.0.2)

---
updated-dependencies:
- dependency-name: codemirror
  dependency-version: 6.0.2
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

client/homebrew/brewRenderer/brewRenderer.jsx

@@ -20,8 +20,6 @@ import HeaderNav from './headerNav/headerNav.jsx';
 import { safeHTML } from './safeHTML.js';
 
 const PAGEBREAK_REGEX_V3 = /^(?=\\page(?:break)?(?: *{[^\n{}]*})?$)/m;
-const PAGEBREAK_REGEX_LEGACY = /\\page(?:break)?/m;
-const COLUMNBREAK_REGEX_LEGACY = /\\column(:?break)?/m;
 const PAGE_HEIGHT = 1056;
 
 const INITIAL_CONTENT = dedent`
@@ -39,8 +37,8 @@ const BrewPage = (props)=>{
 		index    : 0,
 		...props
 	};
-	const pageRef   = useRef(null);
+	const pageRef = useRef(null);
-	const cleanText = safeHTML(props.contents);
+	const cleanText = safeHTML(`${props.contents}\n<div class="columnSplit"></div>\n`);
 
 	useEffect(()=>{
 		if(!pageRef.current) return;
@@ -132,7 +130,7 @@ const BrewRenderer = (props)=>{
 	const pagesRef = useRef(null);
 
 	if(props.renderer == 'legacy') {
-		rawPages = props.text.split(PAGEBREAK_REGEX_LEGACY);
+		rawPages = props.text.split('\\page');
 	} else {
 		rawPages = props.text.split(PAGEBREAK_REGEX_V3);
 	}
@@ -189,7 +187,6 @@ const BrewRenderer = (props)=>{
 		let attributes = {};
 
 		if(props.renderer == 'legacy') {
-			pageText.replace(COLUMNBREAK_REGEX_LEGACY, '```\n````\n'); // Allow Legacy brews to use `\column(break)`
 			const html = MarkdownLegacy.render(pageText);
 
 			return <BrewPage className='page phb' index={index} key={index} contents={html} style={styles} onVisibilityChange={handlePageVisibilityChange} />;

client/homebrew/editor/editor.jsx

@@ -40,8 +40,11 @@ const Editor = createClass({
 				style : ''
 			},
 
-			onBrewChange : ()=>{},
+			onTextChange  : ()=>{},
-			reportError  : ()=>{},
+			onStyleChange : ()=>{},
+			onMetaChange  : ()=>{},
+			onSnipChange  : ()=>{},
+			reportError   : ()=>{},
 
 			onCursorPageChange : ()=>{},
 			onViewPageChange   : ()=>{},
@@ -435,7 +438,7 @@ const Editor = createClass({
 					language='gfm'
 					view={this.state.view}
 					value={this.props.brew.text}
-					onChange={this.props.onBrewChange('text')}
+					onChange={this.props.onTextChange}
 					editorTheme={this.state.editorTheme}
 					rerenderParent={this.rerenderParent}
 					style={{  height: `calc(100% - ${this.state.snippetbarHeight}px)` }} />
@@ -448,7 +451,7 @@ const Editor = createClass({
 					language='css'
 					view={this.state.view}
 					value={this.props.brew.style ?? DEFAULT_STYLE_TEXT}
-					onChange={this.props.onBrewChange('style')}
+					onChange={this.props.onStyleChange}
 					enableFolding={true}
 					editorTheme={this.state.editorTheme}
 					rerenderParent={this.rerenderParent}
@@ -464,7 +467,7 @@ const Editor = createClass({
 				<MetadataEditor
 					metadata={this.props.brew}
 					themeBundle={this.props.themeBundle}
-					onChange={this.props.onBrewChange('metadata')}
+					onChange={this.props.onMetaChange}
 					reportError={this.props.reportError}
 					userThemes={this.props.userThemes}/>
 			</>;
@@ -478,7 +481,7 @@ const Editor = createClass({
 					language='gfm'
 					view={this.state.view}
 					value={this.props.brew.snippets}
-					onChange={this.props.onBrewChange('snippets')}
+					onChange={this.props.onSnipChange}
 					enableFolding={true}
 					editorTheme={this.state.editorTheme}
 					rerenderParent={this.rerenderParent}

client/homebrew/homebrew.jsx

@@ -1,75 +1,95 @@
-/* eslint-disable camelcase */
+//╔===--------------- Polyfills --------------===╗//
-import 'core-js/es/string/to-well-formed.js'; //Polyfill for older browsers
+import 'core-js/es/string/to-well-formed.js';
-import './homebrew.less';
+//╚===---------------          ---------------===╝//
-import React from 'react';
-import { StaticRouter as Router, Route, Routes, useParams, useSearchParams } from 'react-router';
 
-import HomePage    from './pages/homePage/homePage.jsx';
+require('./homebrew.less');
-import EditPage    from './pages/editPage/editPage.jsx';
+const React = require('react');
-import UserPage    from './pages/userPage/userPage.jsx';
+const createClass = require('create-react-class');
-import SharePage   from './pages/sharePage/sharePage.jsx';
+const { StaticRouter:Router } = require('react-router');
-import NewPage     from './pages/newPage/newPage.jsx';
+const { Route, Routes, useParams, useSearchParams } = require('react-router');
-import ErrorPage   from './pages/errorPage/errorPage.jsx';
-import VaultPage   from './pages/vaultPage/vaultPage.jsx';
-import AccountPage from './pages/accountPage/accountPage.jsx';
 
-const WithRoute = ({ el: Element, ...rest })=>{
+const HomePage = require('./pages/homePage/homePage.jsx');
+const EditPage = require('./pages/editPage/editPage.jsx');
+const UserPage = require('./pages/userPage/userPage.jsx');
+const SharePage = require('./pages/sharePage/sharePage.jsx');
+const NewPage = require('./pages/newPage/newPage.jsx');
+const ErrorPage = require('./pages/errorPage/errorPage.jsx');
+const VaultPage = require('./pages/vaultPage/vaultPage.jsx');
+const AccountPage = require('./pages/accountPage/accountPage.jsx');
+
+const WithRoute = (props)=>{
 	const params = useParams();
 	const [searchParams] = useSearchParams();
-	const queryParams = Object.fromEntries(searchParams?.entries() || []);
+	const queryParams = {};
-
+	for (const [key, value] of searchParams?.entries() || []) {
-	return <Element {...rest} {...params} query={queryParams} />;
+		queryParams[key] = value;
+	}
+	const Element = props.el;
+	const allProps = {
+		...props,
+		...params,
+		query : queryParams,
+		el    : undefined
+	};
+	return <Element {...allProps} />;
 };
 
-const Homebrew = (props)=>{
+const Homebrew = createClass({
-	const {
+	displayName     : 'Homebrewery',
-		url = '',
+	getDefaultProps : function() {
-		version = '0.0.0',
+		return {
-		account = null,
+			url         : '',
-		enable_v3 = false,
+			welcomeText : '',
-		enable_themes,
+			changelog   : '',
-		config,
+			version     : '0.0.0',
-		brew = {
+			account     : null,
-			title     : '',
+			enable_v3   : false,
-			text      : '',
+			brew        : {
-			shareId   : null,
+				title     : '',
-			editId    : null,
+				text      : '',
-			createdAt : null,
+				shareId   : null,
-			updatedAt : null,
+				editId    : null,
-			lang      : ''
+				createdAt : null,
-		},
+				updatedAt : null,
-		userThemes,
+				lang      : ''
-		brews
+			}
-	} = props;
+		};
+	},
 
-	global.account       = account;
+	getInitialState : function() {
-	global.version       = version;
+		global.account = this.props.account;
-	global.enable_v3     = enable_v3;
+		global.version = this.props.version;
-	global.enable_themes = enable_themes;
+		global.enable_v3 = this.props.enable_v3;
-	global.config        = config;
+		global.enable_themes = this.props.enable_themes;
+		global.config = this.props.config;
 
-	return (
+		return {};
-		<Router location={url}>
+	},
-			<div className='homebrew'>
+
-				<Routes>
+	render : function (){
-					<Route path='/edit/:id' element={<WithRoute el={EditPage} brew={brew} userThemes={userThemes}/>} />
+		return (
-					<Route path='/share/:id' element={<WithRoute el={SharePage} brew={brew} />} />
+			<Router location={this.props.url}>
-					<Route path='/new/:id' element={<WithRoute el={NewPage} brew={brew} userThemes={userThemes}/>} />
+				<div className='homebrew'>
-					<Route path='/new' element={<WithRoute el={NewPage} userThemes={userThemes}/> } />
+					<Routes>
-					<Route path='/user/:username' element={<WithRoute el={UserPage} brews={brews} />} />
+						<Route path='/edit/:id' element={<WithRoute el={EditPage} brew={this.props.brew} userThemes={this.props.userThemes}/>} />
-					<Route path='/vault' element={<WithRoute el={VaultPage}/>}/>
+						<Route path='/share/:id' element={<WithRoute el={SharePage} brew={this.props.brew} />} />
-					<Route path='/changelog' element={<WithRoute el={SharePage} brew={brew} disableMeta={true} />} />
+						<Route path='/new/:id' element={<WithRoute el={NewPage} brew={this.props.brew} userThemes={this.props.userThemes}/>} />
-					<Route path='/faq' element={<WithRoute el={SharePage} brew={brew} disableMeta={true} />} />
+						<Route path='/new' element={<WithRoute el={NewPage} userThemes={this.props.userThemes}/> } />
-					<Route path='/migrate' element={<WithRoute el={SharePage} brew={brew} disableMeta={true} />} />
+						<Route path='/user/:username' element={<WithRoute el={UserPage} brews={this.props.brews} />} />
-					<Route path='/account' element={<WithRoute el={AccountPage} brew={brew} accountDetails={brew.accountDetails} />} />
+						<Route path='/vault' element={<WithRoute el={VaultPage}/>}/>
-					<Route path='/legacy' element={<WithRoute el={HomePage} brew={brew} />} />
+						<Route path='/changelog' element={<WithRoute el={SharePage} brew={this.props.brew} disableMeta={true} />} />
-					<Route path='/error' element={<WithRoute el={ErrorPage} brew={brew} />} />
+						<Route path='/faq' element={<WithRoute el={SharePage} brew={this.props.brew} disableMeta={true} />} />
-					<Route path='/' element={<WithRoute el={HomePage} brew={brew} />} />
+						<Route path='/migrate' element={<WithRoute el={SharePage} brew={this.props.brew} disableMeta={true} />} />
-					<Route path='/*' element={<WithRoute el={HomePage} brew={brew} />} />
+						<Route path='/account' element={<WithRoute el={AccountPage} brew={this.props.brew} accountDetails={this.props.brew.accountDetails} />} />
-				</Routes>
+						<Route path='/legacy' element={<WithRoute el={HomePage} brew={this.props.brew} />} />
-			</div>
+						<Route path='/error' element={<WithRoute el={ErrorPage} brew={this.props.brew} />} />
-		</Router>
+						<Route path='/' element={<WithRoute el={HomePage} brew={this.props.brew} />} />
-	);
+						<Route path='/*' element={<WithRoute el={HomePage} brew={this.props.brew} />} />
-};
+					</Routes>
+				</div>
+			</Router>
+		);
+	}
+});
 
 module.exports = Homebrew;

client/homebrew/navbar/error-navitem.jsx

@@ -1,138 +1,157 @@
 require('./error-navitem.less');
 const React = require('react');
 const Nav = require('naturalcrit/nav/nav.jsx');
+const createClass = require('create-react-class');
 
-const ErrorNavItem = ({error = '', clearError})=>{
+const ErrorNavItem = createClass({
-	const response    = error.response;
+	getDefaultProps : function() {
-	const errorCode   = error.code
+		return {
-	const status      = response?.status;
+			error  : '',
-	const HBErrorCode = response?.body?.HBErrorCode;
+			parent : null
-	const message     = response?.body?.message;
+		};
+	},
+	render : function() {
+		const clearError = ()=>{
+			const state = {
+				error : null
+			};
+			if(this.props.parent.state.isSaving) {
+				state.isSaving = false;
+			}
+			this.props.parent.setState(state);
+		};
 
-	let errMsg = '';
+		const error       = this.props.error;
-	try {
+		const response    = error.response;
-		errMsg += `${error.toString()}\n\n`;
+		const status      = response?.status;
-		errMsg += `\`\`\`\n${error.stack}\n`;
+		const errorCode   = error.code
-		errMsg += `${JSON.stringify(response?.error, null, '  ')}\n\`\`\``;
+		const HBErrorCode = response?.body?.HBErrorCode;
-		console.log(errMsg);
+		const message     = response?.body?.message;
-	} catch (e){}
+		let errMsg = '';
+		try {
+			errMsg += `${error.toString()}\n\n`;
+			errMsg += `\`\`\`\n${error.stack}\n`;
+			errMsg += `${JSON.stringify(response?.error, null, '  ')}\n\`\`\``;
+			console.log(errMsg);
+		} catch (e){}
 
-	if(status === 409) {
+		if(status === 409) {
-		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={clearError}>
+				<div className='errorContainer' onClick={clearError}>
-				{message ?? 'Conflict: please refresh to get latest changes'}
+					{message ?? 'Conflict: please refresh to get latest changes'}
-			</div>
-		</Nav.item>;
-	}
-
-	if(status === 412) {
-		return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
-			Oops!
-			<div className='errorContainer' onClick={clearError}>
-				{message ?? 'Your client is out of date. Please save your changes elsewhere and refresh.'}
-			</div>
-		</Nav.item>;
-	}
-
-	if(HBErrorCode === '04') {
-		return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
-			Oops!
-			<div className='errorContainer' onClick={clearError}>
-				You are no longer signed in as an author of
-				this brew! Were you signed out from a different
-				window? Visit our log in page, then try again!
-				<br></br>
-				<a target='_blank' rel='noopener noreferrer'
-					href={`https://www.naturalcrit.com/login?redirect=${window.location.href}`}>
-					<div className='confirm'>
-						Sign In
-					</div>
-				</a>
-				<div className='deny'>
-					Not Now
 				</div>
-			</div>
+			</Nav.item>;
-		</Nav.item>;
+		}
-	}
 
-	if(response?.body?.errors?.[0].reason == 'storageQuotaExceeded') {
+		if(status === 412) {
-		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={clearError}>
+				<div className='errorContainer' onClick={clearError}>
-			Can't save because your Google Drive seems to be full!
+					{message ?? 'Your client is out of date. Please save your changes elsewhere and refresh.'}
-			</div>
-		</Nav.item>;
-	}
-
-	if(response?.req.url.match(/^\/api.*Google.*$/m)){
-		return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
-			Oops!
-			<div className='errorContainer' onClick={clearError}>
-				Looks like your Google credentials have
-				expired! Visit our log in page to sign out
-				and sign back in with Google,
-				then try saving again!
-				<br></br>
-				<a target='_blank' rel='noopener noreferrer'
-					href={`https://www.naturalcrit.com/login?redirect=${window.location.href}`}>
-					<div className='confirm'>
-						Sign In
-					</div>
-				</a>
-				<div className='deny'>
-					Not Now
 				</div>
-			</div>
+			</Nav.item>;
-		</Nav.item>;
+		}
-	}
+
+		if(HBErrorCode === '04') {
+			return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
+				Oops!
+				<div className='errorContainer' onClick={clearError}>
+					You are no longer signed in as an author of
+					this brew! Were you signed out from a different
+					window? Visit our log in page, then try again!
+					<br></br>
+					<a target='_blank' rel='noopener noreferrer'
+						href={`https://www.naturalcrit.com/login?redirect=${window.location.href}`}>
+						<div className='confirm'>
+							Sign In
+						</div>
+					</a>
+					<div className='deny'>
+						Not Now
+					</div>
+				</div>
+			</Nav.item>;
+		}
+
+		if(response?.body?.errors?.[0].reason == 'storageQuotaExceeded') {
+			return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
+			Oops!
+				<div className='errorContainer' onClick={clearError}>
+				Can't save because your Google Drive seems to be full!
+				</div>
+			</Nav.item>;
+		}
+
+		if(response?.req.url.match(/^\/api.*Google.*$/m)){
+			return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
+				Oops!
+				<div className='errorContainer' onClick={clearError}>
+					Looks like your Google credentials have
+					expired! Visit our log in page to sign out
+					and sign back in with Google,
+					then try saving again!
+					<br></br>
+					<a target='_blank' rel='noopener noreferrer'
+						href={`https://www.naturalcrit.com/login?redirect=${window.location.href}`}>
+						<div className='confirm'>
+							Sign In
+						</div>
+					</a>
+					<div className='deny'>
+						Not Now
+					</div>
+				</div>
+			</Nav.item>;
+		}
+
+		if(HBErrorCode === '09') {
+			return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
+				Oops!
+				<div className='errorContainer' onClick={clearError}>
+					Looks like there was a problem retreiving
+					the theme, or a theme that it inherits,
+					for this brew. Verify that brew <a className='lowercase' target='_blank' rel='noopener noreferrer' href={`/share/${response.body.brewId}`}>
+						{response.body.brewId}</a> still exists!
+				</div>
+			</Nav.item>;
+		}
+
+		if(HBErrorCode === '10') {
+			return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
+				Oops!
+				<div className='errorContainer' onClick={clearError}>
+					Looks like the brew you have selected
+					as a theme is not tagged for use as a
+					theme. Verify that
+					brew <a className='lowercase' target='_blank' rel='noopener noreferrer' href={`/share/${response.body.brewId}`}>
+						{response.body.brewId}</a> has the <span className='lowercase'>meta:theme</span> tag!
+				</div>
+			</Nav.item>;
+		}
+
+		if(errorCode === 'ECONNABORTED') {
+			return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
+				Oops!
+				<div className='errorContainer' onClick={clearError}>
+					The request to the server was interrupted or timed out.
+					This can happen due to a network issue, or if
+					trying to save a particularly large brew.
+					Please check your internet connection and try again.
+				</div>
+			</Nav.item>;
+		}
 
-	if(HBErrorCode === '09') {
 		return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
 			Oops!
-			<div className='errorContainer' onClick={clearError}>
+			<div className='errorContainer'>
-				Looks like there was a problem retreiving
+				Looks like there was a problem saving. <br />
-				the theme, or a theme that it inherits,
+				Report the issue <a target='_blank' rel='noopener noreferrer' href={`https://github.com/naturalcrit/homebrewery/issues/new?template=save_issue.yml&error-code=${encodeURIComponent(errMsg)}`}>
-				for this brew. Verify that brew <a className='lowercase' target='_blank' rel='noopener noreferrer' href={`/share/${response.body.brewId}`}>
+				here
-					{response.body.brewId}</a> still exists!
+				</a>.
 			</div>
 		</Nav.item>;
 	}
-
+});
-	if(HBErrorCode === '10') {
-		return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
-			Oops!
-			<div className='errorContainer' onClick={clearError}>
-				Looks like the brew you have selected
-				as a theme is not tagged for use as a
-				theme. Verify that
-				brew <a className='lowercase' target='_blank' rel='noopener noreferrer' href={`/share/${response.body.brewId}`}>
-					{response.body.brewId}</a> has the <span className='lowercase'>meta:theme</span> tag!
-			</div>
-		</Nav.item>;
-	}
-
-	if(errorCode === 'ECONNABORTED') {
-		return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
-			Oops!
-			<div className='errorContainer' onClick={clearError}>
-				The request to the server was interrupted or timed out.
-				This can happen due to a network issue, or if
-				trying to save a particularly large brew.
-				Please check your internet connection and try again.
-			</div>
-		</Nav.item>;
-	}
-
-	return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
-		Oops!
-		<div className='errorContainer'>
-			Looks like there was a problem saving. <br />
-			Report the issue <a target='_blank' rel='noopener noreferrer' href={`https://github.com/naturalcrit/homebrewery/issues/new?template=save_issue.yml&error-code=${encodeURIComponent(errMsg)}`}>
-			here
-			</a>.
-		</div>
-	</Nav.item>;
-};
 
 module.exports = ErrorNavItem;

client/homebrew/navbar/newbrew.navitem.jsx

@@ -5,45 +5,33 @@ const { splitTextStyleAndMetadata } = require('../../../shared/helpers.js'); //
 
 const BREWKEY  = 'homebrewery-new';
 const STYLEKEY = 'homebrewery-new-style';
-const METAKEY = 'homebrewery-new-meta';
+const METAKEY  = 'homebrewery-new-meta';
 
 const NewBrew = ()=>{
 	const handleFileChange = (e)=>{
 		const file = e.target.files[0];
-		if(!file) return;
+		if(file) {
-
+			const reader = new FileReader();
-		const currentNew = localStorage.getItem(BREWKEY);
+			reader.onload = (e)=>{
-		if(currentNew && !confirm(
+				const fileContent = e.target.result;
-			`You have some text in the new brew space, if you load a file that text will be lost, are you sure you want to load the file?`
+				const newBrew = {
-		)) return;
+					text  : fileContent,
-
+					style : ''
-		const reader = new FileReader();
+				};
-		reader.onload = (e)=>{
+				if(fileContent.startsWith('```metadata')) {
-			const fileContent = e.target.result;
+					splitTextStyleAndMetadata(newBrew); // Modify newBrew directly
-			const newBrew = { text: fileContent, style: '' };
+					localStorage.setItem(BREWKEY, newBrew.text);
-
+					localStorage.setItem(STYLEKEY, newBrew.style);
-			if(fileContent.startsWith('```metadata')) {
+					localStorage.setItem(METAKEY, JSON.stringify(_.pick(newBrew, ['title', 'description', 'tags', 'systems', 'renderer', 'theme', 'lang'])));
-				splitTextStyleAndMetadata(newBrew);
+					window.location.href = '/new';
-				localStorage.setItem(BREWKEY, newBrew.text);
+				} else {
-				localStorage.setItem(STYLEKEY, newBrew.style);
+					alert('This file is invalid, please, enter a valid file');
-				localStorage.setItem(METAKEY, JSON.stringify(
+				}
-					_.pick(newBrew, ['title', 'description', 'tags', 'systems', 'renderer', 'theme', 'lang'])
+			};
-				));
+			reader.readAsText(file);
-				window.location.href = '/new';
+		}
-				return;
-			}
-
-			const type = file.name.split('.').pop().toLowerCase();
-			
-			alert(`This file is invalid: ${!type ? "Missing file extension" :`.${type} files are not supported`}. Only .txt files exported from the Homebrewery are allowed.`);
-
-
-			console.log(file);
-		};
-		reader.readAsText(file);
 	};
 
-
 	return (
 		<Nav.dropdown>
 			<Nav.item

client/homebrew/navbar/share.navitem.jsx

@@ -1,35 +0,0 @@
-import React from 'react';
-import dedent from 'dedent-tabs';
-import Nav from 'naturalcrit/nav/nav.jsx';
-
-	const getShareId = (brew)=>(
-		brew.googleId && !brew.stubbed
-			? brew.googleId + brew.shareId
-			: brew.shareId
-	);
-
-	const getRedditLink = (brew)=>{
-		const text = dedent`
-			Hey guys! I've been working on this homebrew. I'd love your feedback. Check it out.
-
-			**[Homebrewery Link](${global.config.baseUrl}/share/${getShareId(brew)})**`;
-
-		return `https://www.reddit.com/r/UnearthedArcana/submit?title=${encodeURIComponent(brew.title.toWellFormed())}&text=${encodeURIComponent(text)}`;
-	};
-
-export default ({brew}) => (
-	<Nav.dropdown>
-		<Nav.item color='teal' icon='fas fa-share-alt'>
-			share
-		</Nav.item>
-		<Nav.item color='blue' href={`/share/${getShareId(brew)}`}>
-			view
-		</Nav.item>
-		<Nav.item color='blue' onClick={()=>{navigator.clipboard.writeText(`${global.config.baseUrl}/share/${getShareId(brew)}`);}}>
-			copy url
-		</Nav.item>
-		<Nav.item color='blue' href={getRedditLink(brew)} newTab rel='noopener noreferrer'>
-			post to reddit
-		</Nav.item>
-	</Nav.dropdown>
-);

client/homebrew/pages/basePages/uiPage/uiPage.less

@@ -29,7 +29,6 @@
 						&::before {
 							margin-right : 5px;
 							font-family  : 'Font Awesome 6 Free';
-							font-weight  : 900;
 							content      : '\f00c';
 						}
 					}

client/homebrew/pages/editPage/editPage.jsx

@@ -1,420 +1,529 @@
 /* eslint-disable max-lines */
-import './editPage.less';
+require('./editPage.less');
+const React = require('react');
+const _ = require('lodash');
+const createClass = require('create-react-class');
+import {makePatches, applyPatches, stringifyPatches, parsePatches} from '@sanity/diff-match-patch';
+import { md5 } from 'hash-wasm';
+import { gzipSync, strToU8 } from 'fflate';
 
-import React, { useState, useEffect, useRef, useCallback } from 'react';
+import request from '../../utils/request-middleware.js';
-import request                                from '../../utils/request-middleware.js';
+const { Meta } = require('vitreum/headtags');
-import Markdown                               from 'naturalcrit/markdown.js';
 
-import _                                 from 'lodash';;
+const Nav = require('naturalcrit/nav/nav.jsx');
-import { makePatches, stringifyPatches } from '@sanity/diff-match-patch';
+const Navbar = require('../../navbar/navbar.jsx');
-import { md5 }                           from 'hash-wasm';
-import { gzipSync, strToU8 }             from 'fflate';
-import { Meta }                          from 'vitreum/headtags';
 
-import Nav                       from 'naturalcrit/nav/nav.jsx';
+const NewBrew = require('../../navbar/newbrew.navitem.jsx');
-import Navbar                    from '../../navbar/navbar.jsx';
+const HelpNavItem = require('../../navbar/help.navitem.jsx');
-import NewBrewItem               from '../../navbar/newbrew.navitem.jsx';
+const PrintNavItem = require('../../navbar/print.navitem.jsx');
-import AccountNavItem            from '../../navbar/account.navitem.jsx';
+const ErrorNavItem = require('../../navbar/error-navitem.jsx');
-import ShareNavItem              from '../../navbar/share.navitem.jsx';
+const Account = require('../../navbar/account.navitem.jsx');
-import ErrorNavItem              from '../../navbar/error-navitem.jsx';
+const RecentNavItem = require('../../navbar/recent.navitem.jsx').both;
-import HelpNavItem               from '../../navbar/help.navitem.jsx';
+const VaultNavItem = require('../../navbar/vault.navitem.jsx');
-import VaultNavItem              from '../../navbar/vault.navitem.jsx';
-import PrintNavItem              from '../../navbar/print.navitem.jsx';
-import { both as RecentNavItem } from '../../navbar/recent.navitem.jsx';
 
-import SplitPane    from 'client/components/splitPane/splitPane.jsx';
+const SplitPane = require('naturalcrit/splitPane/splitPane.jsx');
-import Editor       from '../../editor/editor.jsx';
+const Editor = require('../../editor/editor.jsx');
-import BrewRenderer from '../../brewRenderer/brewRenderer.jsx';
+const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
 
-import LockNotification from './lockNotification/lockNotification.jsx';
+const LockNotification = require('./lockNotification/lockNotification.jsx');
 
-import { DEFAULT_BREW_LOAD }                  from '../../../../server/brewDefaults.js';
+import Markdown from 'naturalcrit/markdown.js';
-import { printCurrentBrew, fetchThemeBundle } from '../../../../shared/helpers.js';
+
+const { DEFAULT_BREW_LOAD } = require('../../../../server/brewDefaults.js');
+const { printCurrentBrew, fetchThemeBundle } = require('../../../../shared/helpers.js');
 
 import { updateHistory, versionHistoryGarbageCollection } from '../../utils/versionHistory.js';
 
-import googleDriveIcon from '../../googleDrive.svg';
+const googleDriveIcon = require('../../googleDrive.svg');
 
 const SAVE_TIMEOUT = 10000;
-const UNSAVED_WARNING_TIMEOUT = 900000; //Warn user afer 15 minutes of unsaved changes
-const UNSAVED_WARNING_POPUP_TIMEOUT = 4000; //Show the warning for 4 seconds
 
-const BREWKEY  = 'homebrewery-new';
+const EditPage = createClass({
-const STYLEKEY = 'homebrewery-new-style';
+	displayName     : 'EditPage',
-const SNIPKEY  = 'homebrewery-new-snippets';
+	getDefaultProps : function() {
-const METAKEY  = 'homebrewery-new-meta';
+		return {
+			brew : DEFAULT_BREW_LOAD
+		};
+	},
 
-const EditPage = (props)=>{
+	getInitialState : function() {
-	props = {
+		return {
-		brew : DEFAULT_BREW_LOAD,
+			brew                       : this.props.brew,
-		...props
+			isSaving                   : false,
-	};
+			unsavedChanges             : false,
+			alertTrashedGoogleBrew     : this.props.brew.trashed,
+			alertLoginToTransfer       : false,
+			saveGoogle                 : this.props.brew.googleId ? true : false,
+			confirmGoogleTransfer      : false,
+			error                      : null,
+			htmlErrors                 : Markdown.validate(this.props.brew.text),
+			url                        : '',
+			autoSave                   : true,
+			autoSaveWarning            : false,
+			unsavedTime                : new Date(),
+			currentEditorViewPageNum   : 1,
+			currentEditorCursorPageNum : 1,
+			currentBrewRendererPageNum : 1,
+			displayLockMessage         : this.props.brew.lock || false,
+			themeBundle                : {}
+		};
+	},
 
-	const [currentBrew               , setCurrentBrew               ] = useState(props.brew);
+	editor    : React.createRef(null),
-	const [isSaving                  , setIsSaving                  ] = useState(false);
+	savedBrew : null,
-	const [lastSavedTime             , setLastSavedTime             ] = useState(new Date());
-  const [saveGoogle                , setSaveGoogle                ] = useState(!!props.brew.googleId);
-	const [error                     , setError                     ] = useState(null);
-	const [HTMLErrors                , setHTMLErrors                ] = useState(Markdown.validate(props.brew.text));
-	const [currentEditorViewPageNum  , setCurrentEditorViewPageNum  ] = useState(1);
-	const [currentEditorCursorPageNum, setCurrentEditorCursorPageNum] = useState(1);
-	const [currentBrewRendererPageNum, setCurrentBrewRendererPageNum] = useState(1);
-	const [themeBundle               , setThemeBundle               ] = useState({});
-	const [unsavedChanges            , setUnsavedChanges            ] = useState(false);
-	const [alertTrashedGoogleBrew    , setAlertTrashedGoogleBrew    ] = useState(props.brew.trashed);
-	const [alertLoginToTransfer      , setAlertLoginToTransfer      ] = useState(false);
-	const [confirmGoogleTransfer     , setConfirmGoogleTransfer     ] = useState(false);
-	const [autoSaveEnabled           , setAutoSaveEnabled           ] = useState(true);
-	const [warnUnsavedChanges        , setWarnUnsavedChanges        ] = useState(true);
 
-	const editorRef          = useRef(null);
+	componentDidMount : function(){
-	const lastSavedBrew      = useRef(_.cloneDeep(props.brew));
+		this.setState({
-	const saveTimeout        = useRef(null);
+			url : window.location.href
-	const warnUnsavedTimeout = useRef(null);
+		});
-	const trySaveRef         = useRef(trySave); // CTRL+S listener lives outside React and needs ref to use trySave with latest copy of brew
-	const unsavedChangesRef  = useRef(unsavedChanges); // Similarly, onBeforeUnload lives outside React and needs ref to unsavedChanges
 
-	const useLocalStorage = false;
+		this.savedBrew = JSON.parse(JSON.stringify(this.props.brew)); //Deep copy
 
-	useEffect(()=>{
+		this.setState({ autoSave: JSON.parse(localStorage.getItem('AUTOSAVE_ON')) ?? true }, ()=>{
-		const autoSavePref = JSON.parse(localStorage.getItem('AUTOSAVE_ON') ?? true);
+			if(this.state.autoSave){
-		setAutoSaveEnabled(autoSavePref);
+				this.trySave();
-		setWarnUnsavedChanges(!autoSavePref);
+			} else {
-		setHTMLErrors(Markdown.validate(currentBrew.text));
+				this.setState({ autoSaveWarning: true });
-		fetchThemeBundle(setError, setThemeBundle, currentBrew.renderer, currentBrew.theme);
+			}
+		});
 
-		const handleControlKeys = (e)=>{
+		window.onbeforeunload = ()=>{
-			if(!(e.ctrlKey || e.metaKey)) return;
+			if(this.state.isSaving || this.state.unsavedChanges){
-			if(e.keyCode === 83) trySaveRef.current(true);
+				return 'You have unsaved changes!';
-			if(e.keyCode === 80) printCurrentBrew();
-			if([83, 80].includes(e.keyCode)) {
-				e.stopPropagation();
-				e.preventDefault();
 			}
 		};
 
-		document.addEventListener('keydown', handleControlKeys);
+		this.setState((prevState)=>({
-		window.onbeforeunload = ()=>{
+			htmlErrors : Markdown.validate(prevState.brew.text)
-			if(unsavedChangesRef.current)
+		}));
-				return 'You have unsaved changes!';
-		};
-		return ()=>{
-			document.removeEventListener('keydown', handleControlKeys);
-			window.onBeforeUnload = null;
-		};
-	}, []);
 
-	useEffect(()=>{
+		fetchThemeBundle(this, this.props.brew.renderer, this.props.brew.theme);
-		trySaveRef.current = trySave;
-		unsavedChangesRef.current = unsavedChanges;
-	});
 
-	useEffect(()=>{
+		document.addEventListener('keydown', this.handleControlKeys);
-		const hasChange = !_.isEqual(currentBrew, lastSavedBrew.current);
+	},
-		setUnsavedChanges(hasChange);
+	componentWillUnmount : function() {
-
+		window.onbeforeunload = function(){};
-		if(autoSaveEnabled) trySave(false, hasChange);
+		document.removeEventListener('keydown', this.handleControlKeys);
-	}, [currentBrew]);
+	},
-
+	componentDidUpdate : function(){
-	const handleSplitMove = ()=>{
+		const hasChange = this.hasChanges();
-		editorRef.current?.update();
+		if(this.state.unsavedChanges != hasChange){
-	};
+			this.setState({
-
+				unsavedChanges : hasChange
-	const handleEditorViewPageChange = (pageNumber)=>{
+			});
-		setCurrentEditorViewPageNum(pageNumber);
-	};
-
-	const handleEditorCursorPageChange = (pageNumber)=>{
-		setCurrentEditorCursorPageNum(pageNumber);
-	};
-
-	const handleBrewRendererPageChange = (pageNumber)=>{
-		setCurrentBrewRendererPageNum(pageNumber);
-	};
-
-	const handleBrewChange = (field) => (value, subfield) => {	//'text', 'style', 'snippets', 'metadata'
-		if (subfield == 'renderer' || subfield == 'theme')
-			fetchThemeBundle(setError, setThemeBundle, value.renderer, value.theme);
-
-		//If there are HTML errors, run the validator on every change to give quick feedback
-		if(HTMLErrors.length && (field == 'text' || field == 'snippets'))
-			setHTMLErrors(Markdown.validate(value));
-
-		if(field == 'metadata') setCurrentBrew(prev => ({ ...prev, ...value }));
-		else                    setCurrentBrew(prev => ({ ...prev, [field]: value }));
-
-		if(useLocalStorage) {
-			if(field == 'text')     localStorage.setItem(BREWKEY, value);
-			if(field == 'style')    localStorage.setItem(STYLEKEY, value);
-			if(field == 'snippets') localStorage.setItem(SNIPKEY, value);
-			if(field == 'metadata') localStorage.setItem(METAKEY, JSON.stringify({
-				renderer : value.renderer,
-				theme    : value.theme,
-				lang     : value.lang
-			}));
 		}
-	};
+	},
 
-	const updateBrew = (newData)=>setCurrentBrew((prevBrew)=>({
+	handleControlKeys : function(e){
-		...prevBrew,
+		if(!(e.ctrlKey || e.metaKey)) return;
-		style    : newData.style,
+		const S_KEY = 83;
-		text     : newData.text,
+		const P_KEY = 80;
-		snippets : newData.snippets
+		if(e.keyCode == S_KEY) this.trySave(true);
-	}));
+		if(e.keyCode == P_KEY) printCurrentBrew();
+		if(e.keyCode == P_KEY || e.keyCode == S_KEY){
+			e.stopPropagation();
+			e.preventDefault();
+		}
+	},
 
-	const resetWarnUnsavedTimer = ()=>{
+	handleSplitMove : function(){
-		setTimeout(()=>setWarnUnsavedChanges(false), UNSAVED_WARNING_POPUP_TIMEOUT); // Hide the warning after 4 seconds
+		this.editor.current.update();
-		clearTimeout(warnUnsavedTimeout.current);
+	},
-		warnUnsavedTimeout.current = setTimeout(()=>setWarnUnsavedChanges(true), UNSAVED_WARNING_TIMEOUT); // 15 minutes between unsaved work warnings
-	};
 
-	const handleGoogleClick = ()=>{
+	handleEditorViewPageChange : function(pageNumber){
-		if(!global.account?.googleId) {
+		this.setState({ currentEditorViewPageNum: pageNumber });
-			setAlertLoginToTransfer(true);
+	},
+
+	handleEditorCursorPageChange : function(pageNumber){
+		this.setState({ currentEditorCursorPageNum: pageNumber });
+	},
+
+	handleBrewRendererPageChange : function(pageNumber){
+		this.setState({ currentBrewRendererPageNum: pageNumber });
+	},
+
+	handleTextChange : function(text){
+		//If there are errors, run the validator on every change to give quick feedback
+		let htmlErrors = this.state.htmlErrors;
+		if(htmlErrors.length) htmlErrors = Markdown.validate(text);
+
+		this.setState((prevState)=>({
+			brew       : { ...prevState.brew, text: text },
+			htmlErrors : htmlErrors,
+		}), ()=>{if(this.state.autoSave) this.trySave();});
+	},
+
+	handleSnipChange : function(snippet){
+		//If there are errors, run the validator on every change to give quick feedback
+		let htmlErrors = this.state.htmlErrors;
+		if(htmlErrors.length) htmlErrors = Markdown.validate(snippet);
+
+		this.setState((prevState)=>({
+			brew           : { ...prevState.brew, snippets: snippet },
+			unsavedChanges : true,
+			htmlErrors     : htmlErrors,
+		}), ()=>{if(this.state.autoSave) this.trySave();});
+	},
+
+	handleStyleChange : function(style){
+		this.setState((prevState)=>({
+			brew : { ...prevState.brew, style: style }
+		}), ()=>{if(this.state.autoSave) this.trySave();});
+	},
+
+	handleMetaChange : function(metadata, field=undefined){
+		if(field == 'theme' || field == 'renderer')	// Fetch theme bundle only if theme or renderer was changed
+			fetchThemeBundle(this, metadata.renderer, metadata.theme);
+
+		this.setState((prevState)=>({
+			brew : {
+				...prevState.brew,
+				...metadata
+			}
+		}), ()=>{if(this.state.autoSave) this.trySave();});
+	},
+
+	hasChanges : function(){
+		return !_.isEqual(this.state.brew, this.savedBrew);
+	},
+
+	updateBrew : function(newData){
+		this.setState((prevState)=>({
+			brew : {
+				...prevState.brew,
+				style    : newData.style,
+				text     : newData.text,
+				snippets : newData.snippets
+			}
+		}));
+	},
+
+	trySave : function(immediate=false){
+		if(!this.debounceSave) this.debounceSave = _.debounce(this.save, SAVE_TIMEOUT);
+		if(this.state.isSaving)
+			return;
+
+		if(immediate) {
+			this.debounceSave();
+			this.debounceSave.flush();
 			return;
 		}
 		
-		setConfirmGoogleTransfer((prev)=>!prev);
+		if(this.hasChanges())
-		setError(null);
+			this.debounceSave();
-	};
+		else
+			this.debounceSave.cancel();
+	},
 
-	const closeAlerts = (e)=>{
+	handleGoogleClick : function(){
-		e.stopPropagation(); //Only handle click once so alert doesn't reopen
+		if(!global.account?.googleId) {
-		setAlertTrashedGoogleBrew(false);
+			this.setState({
-		setAlertLoginToTransfer(false);
+				alertLoginToTransfer : true
-		setConfirmGoogleTransfer(false);
-	};
-
-	const toggleGoogleStorage = ()=>{
-		setSaveGoogle((prev)=>!prev);
-		setError(null);
-		trySave(true);
-	};
-
-	const trySave = (immediate = false, hasChanges = true)=>{
-		clearTimeout(saveTimeout.current);
-		if(isSaving) return;
-		if(!hasChanges && !immediate) return;
-		const newTimeout = immediate ? 0 : SAVE_TIMEOUT;
-
-		saveTimeout.current = setTimeout(async ()=>{
-			setIsSaving(true);
-			setError(null);
-			await save(currentBrew, saveGoogle)
-			.catch((err)=>{
-				setError(err);
 			});
-			setIsSaving(false);
+			return;
-			setLastSavedTime(new Date());
+		}
-			if(!autoSaveEnabled) resetWarnUnsavedTimer();
+		this.setState((prevState)=>({
-		}, newTimeout);
+			confirmGoogleTransfer : !prevState.confirmGoogleTransfer
-	};
+		}));
+		this.setState({
+			error    : null
+		});
+	},
 
-	const save = async (brew, saveToGoogle)=>{
+	closeAlerts : function(event){
-		setHTMLErrors(Markdown.validate(brew.text));
+		event.stopPropagation();	//Only handle click once so alert doesn't reopen
+		this.setState({
+			alertTrashedGoogleBrew : false,
+			alertLoginToTransfer   : false,
+			confirmGoogleTransfer  : false
+		});
+	},
 
-		await updateHistory(brew).catch(console.error);
+	toggleGoogleStorage : function(){
+		this.setState((prevState)=>({
+			saveGoogle : !prevState.saveGoogle,
+			error      : null
+		}), ()=>this.trySave(true));
+	},
+
+	save : async function(){
+		if(this.debounceSave && this.debounceSave.cancel) this.debounceSave.cancel();
+
+		const brewState       = this.state.brew; // freeze the current state
+		const preSaveSnapshot = { ...brewState };
+
+		this.setState((prevState)=>({
+			isSaving   : true,
+			error      : null,
+			htmlErrors : Markdown.validate(prevState.brew.text)
+		}));
+
+		await updateHistory(this.state.brew).catch(console.error);
 		await versionHistoryGarbageCollection().catch(console.error);
 
 		//Prepare content to send to server
-		const brewToSave = {
+		const brew          = { ...brewState };
-			...brew,
+		brew.text           = brew.text.normalize('NFC');
-			text      : brew.text.normalize('NFC'),
+		this.savedBrew.text = this.savedBrew.text.normalize('NFC');
-			pageCount : ((brew.renderer === 'legacy' ? brew.text.match(/\\page/g) : brew.text.match(/^\\page$/gm)) || []).length + 1,
+		brew.pageCount      = ((brew.renderer=='legacy' ? brew.text.match(/\\page/g) : brew.text.match(/^\\page$/gm)) || []).length + 1;
-			patches   : stringifyPatches(makePatches(encodeURI(lastSavedBrew.current.text.normalize('NFC')), encodeURI(brew.text.normalize('NFC')))),
+		brew.patches        = stringifyPatches(makePatches(this.savedBrew.text, brew.text));
-			hash      : await md5(lastSavedBrew.current.text),
+		brew.hash           = await md5(this.savedBrew.text);
-			textBin   : undefined,
+		//brew.text           = undefined; - Temporary parallel path
-			version   : lastSavedBrew.current.version
+		brew.textBin        = undefined;
-		};
 
-		const compressedBrew = gzipSync(strToU8(JSON.stringify(brewToSave)));
+		const compressedBrew = gzipSync(strToU8(JSON.stringify(brew)));
-		const transfer = saveToGoogle === _.isNil(brew.googleId);
-		const params = transfer ? `?${saveToGoogle ? 'saveToGoogle' : 'removeFromGoogle'}=true` : '';
 
+		const transfer = this.state.saveGoogle == _.isNil(this.state.brew.googleId);
+		const params = `${transfer ? `?${this.state.saveGoogle ? 'saveToGoogle' : 'removeFromGoogle'}=true` : ''}`;
 		const res = await request
-			.put(`/api/update/${brewToSave.editId}${params}`)
+			.put(`/api/update/${brew.editId}${params}`)
 			.set('Content-Encoding', 'gzip')
 			.set('Content-Type', 'application/json')
 			.send(compressedBrew)
 			.catch((err)=>{
-				console.error('Error Updating Local Brew');
+				console.log('Error Updating Local Brew');
-				setError(err);
+				this.setState({ error: err });
 			});
 		if(!res) return;
 
-		const updatedFields = {
+		this.savedBrew = {
-			googleId : res.body.googleId ?? null,
+			...preSaveSnapshot,
-			editId   : res.body.editId,
+			googleId : res.body.googleId ? res.body.googleId : null,
+			editId 	 : res.body.editId,
 			shareId  : res.body.shareId,
 			version  : res.body.version
 		};
 
-		lastSavedBrew.current = {
+		this.setState((prevState) => ({
-			...brew,
+			brew: {
-			...updatedFields
+				...prevState.brew,
-		};
+				googleId : res.body.googleId ? res.body.googleId : null,
+				editId 	 : res.body.editId,
+				shareId  : res.body.shareId,
+				version  : res.body.version
+			},
+			isSaving    : false,
+			unsavedTime : new Date()
+		}), ()=>{
+			this.setState({ unsavedChanges : this.hasChanges() });
+		});
 
-		setCurrentBrew((prevBrew)=>({
+		history.replaceState(null, null, `/edit/${this.savedBrew.editId}`);
-			...prevBrew,
+	},
-			...updatedFields
-		}));
 
-		history.replaceState(null, null, `/edit/${res.body.editId}`);
+	renderGoogleDriveIcon : function(){
-	};
+		return <Nav.item className='googleDriveStorage' onClick={this.handleGoogleClick}>
+			<img src={googleDriveIcon} className={this.state.saveGoogle ? '' : 'inactive'} alt='Google Drive icon'/>
 
-	const renderGoogleDriveIcon = ()=>(
+			{this.state.confirmGoogleTransfer &&
-		<Nav.item className='googleDriveStorage' onClick={handleGoogleClick}>
+				<div className='errorContainer' onClick={this.closeAlerts}>
-			<img src={googleDriveIcon} className={saveGoogle ? '' : 'inactive'} alt='Google Drive icon' />
+					{ this.state.saveGoogle
-
+						?	`Would you like to transfer this brew from your Google Drive storage back to the Homebrewery?`
-			{confirmGoogleTransfer && (
+						: `Would you like to transfer this brew from the Homebrewery to your personal Google Drive storage?`
-				<div className='errorContainer' onClick={closeAlerts}>
+					}
-					{saveGoogle
-						? 'Would you like to transfer this brew from your Google Drive storage back to the Homebrewery?'
-						: 'Would you like to transfer this brew from the Homebrewery to your personal Google Drive storage?'}
 					<br />
-					<div className='confirm' onClick={toggleGoogleStorage}> Yes </div>
+					<div className='confirm' onClick={this.toggleGoogleStorage}>
-					<div className='deny'>                                  No  </div>
+						Yes
+					</div>
+					<div className='deny'>
+						No
+					</div>
 				</div>
-			)}
+			}
 
-			{alertLoginToTransfer && (
+			{this.state.alertLoginToTransfer &&
-				<div className='errorContainer' onClick={closeAlerts}>
+				<div className='errorContainer' onClick={this.closeAlerts}>
-					You must be signed in to a Google account to transfer between the homebrewery and Google Drive!
+					You must be signed in to a Google account to transfer
-					<a target='_blank' rel='noopener noreferrer' href={`https://www.naturalcrit.com/login?redirect=${window.location.href}`}>
+					between the homebrewery and Google Drive!
-						<div className='confirm'> Sign In </div>
+					<a target='_blank' rel='noopener noreferrer'
+						href={`https://www.naturalcrit.com/login?redirect=${this.state.url}`}>
+						<div className='confirm'>
+							Sign In
+						</div>
 					</a>
-					<div className='deny'>      Not Now </div>
+					<div className='deny'>
+						Not Now
+					</div>
 				</div>
-			)}
+			}
 
-			{alertTrashedGoogleBrew && (
+			{this.state.alertTrashedGoogleBrew &&
-				<div className='errorContainer' onClick={closeAlerts}>
+				<div className='errorContainer' onClick={this.closeAlerts}>
-					This brew is currently in your Trash folder on Google Drive!<br />
+				This brew is currently in your Trash folder on Google Drive!<br />If you want to keep it, make sure to move it before it is deleted permanently!<br />
-					If you want to keep it, make sure to move it before it is deleted permanently!<br />
+					<div className='confirm'>
-					<div className='confirm'> OK </div>
+						OK
+					</div>
 				</div>
-			)}
+			}
-		</Nav.item>
+		</Nav.item>;
-	);
+	},
+
+	renderSaveButton : function(){
 
-	const renderSaveButton = ()=>{
 		// #1 - Currently saving, show SAVING
-		if(isSaving)
+		if(this.state.isSaving){
 			return <Nav.item className='save' icon='fas fa-spinner fa-spin'>saving...</Nav.item>;
+		}
 
 		// #2 - Unsaved changes exist, autosave is OFF and warning timer has expired, show AUTOSAVE WARNING
-		if(unsavedChanges && warnUnsavedChanges) {
+		if(this.state.unsavedChanges && this.state.autoSaveWarning){
-			resetWarnUnsavedTimer();
+			this.setAutosaveWarning();
-			const elapsedTime = Math.round((new Date() - lastSavedTime) / 1000 / 60);
+			const elapsedTime = Math.round((new Date() - this.state.unsavedTime) / 1000 / 60);
-			const text = elapsedTime === 0
+			const text = elapsedTime == 0 ? 'Autosave is OFF.' : `Autosave is OFF, and you haven't saved for ${elapsedTime} minutes.`;
-				? 'Autosave is OFF.'
-				: `Autosave is OFF, and you haven't saved for ${elapsedTime} minutes.`;
 
 			return <Nav.item className='save error' icon='fas fa-exclamation-circle'>
-							Reminder...
+			Reminder...
-				<div className='errorContainer'>{text}</div>
+				<div className='errorContainer'>
+					{text}
+				</div>
 			</Nav.item>;
 		}
 
 		// #3 - Unsaved changes exist, click to save, show SAVE NOW
-		if(unsavedChanges)
+		// Use trySave(true) instead of save() to use debounced save function
-			return <Nav.item className='save' onClick={()=>trySave(true)} color='blue' icon='fas fa-save'>Save Now</Nav.item>;
+		if(this.state.unsavedChanges){
-
+			return <Nav.item className='save' onClick={()=>this.trySave(true)} color='blue' icon='fas fa-save'>Save Now</Nav.item>;
+		}
 		// #4 - No unsaved changes, autosave is ON, show AUTO-SAVED
-		if(autoSaveEnabled)
+		if(this.state.autoSave){
 			return <Nav.item className='save saved'>auto-saved.</Nav.item>;
-
+		}
 		// DEFAULT - No unsaved changes, show SAVED
 		return <Nav.item className='save saved'>saved.</Nav.item>;
-	};
+	},
 
-	const toggleAutoSave = ()=>{
+	handleAutoSave : function(){
-		clearTimeout(warnUnsavedTimeout.current);
+		if(this.warningTimer) clearTimeout(this.warningTimer);
-		clearTimeout(saveTimeout.current);
+		this.setState((prevState)=>({
-		localStorage.setItem('AUTOSAVE_ON', JSON.stringify(!autoSaveEnabled));
+			autoSave        : !prevState.autoSave,
-		setAutoSaveEnabled(!autoSaveEnabled);
+			autoSaveWarning : prevState.autoSave
-		setWarnUnsavedChanges(autoSaveEnabled);
+		}), ()=>{
-	};
+			localStorage.setItem('AUTOSAVE_ON', JSON.stringify(this.state.autoSave));
+		});
+	},
 
-	const renderAutoSaveButton = ()=>(
+	setAutosaveWarning : function(){
-		<Nav.item onClick={toggleAutoSave}>
+		setTimeout(()=>this.setState({ autoSaveWarning: false }), 4000);                           // 4 seconds to display
-			Autosave <i className={autoSaveEnabled ? 'fas fa-power-off active' : 'fas fa-power-off'}></i>
+		this.warningTimer = setTimeout(()=>{this.setState({ autoSaveWarning: true });}, 900000);   // 15 minutes between warnings
-		</Nav.item>
+		this.warningTimer;
-	);
+	},
 
-	const clearError = ()=>{
+	errorReported : function(error) {
-		setError(null);
+		this.setState({
-		setIsSaving(false);
+			error
-	};
+		});
+	},
+
+	renderAutoSaveButton : function(){
+		return <Nav.item onClick={this.handleAutoSave}>
+			Autosave <i className={this.state.autoSave ? 'fas fa-power-off active' : 'fas fa-power-off'}></i>
+		</Nav.item>;
+	},
+
+	processShareId : function() {
+		return this.state.brew.googleId && !this.state.brew.stubbed ?
+					 this.state.brew.googleId + this.state.brew.shareId :
+					 this.state.brew.shareId;
+	},
+
+	getRedditLink : function(){
+
+		const shareLink = this.processShareId();
+		const systems = this.props.brew.systems.length > 0 ? ` [${this.props.brew.systems.join(' - ')}]` : '';
+		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](${global.config.baseUrl}/share/${shareLink})**`;
+
+		return `https://www.reddit.com/r/UnearthedArcana/submit?title=${encodeURIComponent(title.toWellFormed())}&text=${encodeURIComponent(text)}`;
+	},
+
+	renderNavbar : function(){
+		const shareLink = this.processShareId();
 
-	const renderNavbar = ()=>{
 		return <Navbar>
 			<Nav.section>
-				<Nav.item className='brewTitle'>{currentBrew.title}</Nav.item>
+				<Nav.item className='brewTitle'>{this.state.brew.title}</Nav.item>
 			</Nav.section>
 
 			<Nav.section>
-				{renderGoogleDriveIcon()}
+				{this.renderGoogleDriveIcon()}
-				{error
+				{this.state.error ?
-					? <ErrorNavItem error={error} clearError={clearError} />
+					<ErrorNavItem error={this.state.error} parent={this}></ErrorNavItem> :
-					: <Nav.dropdown className='save-menu'>
+					<Nav.dropdown className='save-menu'>
-						{renderSaveButton()}
+						{this.renderSaveButton()}
-						{renderAutoSaveButton()}
+						{this.renderAutoSaveButton()}
-					</Nav.dropdown>}
+					</Nav.dropdown>
-				<NewBrewItem/>
+				}
+				<NewBrew />
 				<HelpNavItem/>
-				<ShareNavItem brew={currentBrew} />
+				<Nav.dropdown>
+					<Nav.item color='teal' icon='fas fa-share-alt'>
+						share
+					</Nav.item>
+					<Nav.item color='blue' href={`/share/${shareLink}`}>
+						view
+					</Nav.item>
+					<Nav.item color='blue' onClick={()=>{navigator.clipboard.writeText(`${global.config.baseUrl}/share/${shareLink}`);}}>
+						copy url
+					</Nav.item>
+					<Nav.item color='blue' href={this.getRedditLink()} newTab={true} rel='noopener noreferrer'>
+						post to reddit
+					</Nav.item>
+				</Nav.dropdown>
 				<PrintNavItem />
 				<VaultNavItem />
-				<RecentNavItem brew={currentBrew} storageKey='edit' />
+				<RecentNavItem brew={this.state.brew} storageKey='edit' />
-				<AccountNavItem/>
+				<Account />
 			</Nav.section>
+
 		</Navbar>;
-	};
+	},
 
-	return (
+	render : function(){
-		<div className='editPage sitePage'>
+		return <div className='editPage sitePage'>
 			<Meta name='robots' content='noindex, nofollow' />
+			{this.renderNavbar()}
 
-			{renderNavbar()}
+			{this.props.brew.lock && <LockNotification shareId={this.props.brew.shareId} message={this.props.brew.lock.editMessage} reviewRequested={this.props.brew.lock.reviewRequested} />}
-
-			{currentBrew.lock && <LockNotification shareId={currentBrew.shareId} message={currentBrew.lock.editMessage} reviewRequested={currentBrew.lock.reviewRequested}/>}
-
 			<div className='content'>
-				<SplitPane onDragFinish={handleSplitMove}>
+				<SplitPane onDragFinish={this.handleSplitMove}>
 					<Editor
-						ref={editorRef}
+						ref={this.editor}
-						brew={currentBrew}
+						brew={this.state.brew}
-						onBrewChange={handleBrewChange}
+						onTextChange={this.handleTextChange}
-						reportError={setError}
+						onStyleChange={this.handleStyleChange}
-						renderer={currentBrew.renderer}
+						onSnipChange={this.handleSnipChange}
-						userThemes={props.userThemes}
+						onMetaChange={this.handleMetaChange}
-						themeBundle={themeBundle}
+						reportError={this.errorReported}
-						updateBrew={updateBrew}
+						renderer={this.state.brew.renderer}
-						onCursorPageChange={handleEditorCursorPageChange}
+						userThemes={this.props.userThemes}
-						onViewPageChange={handleEditorViewPageChange}
+						themeBundle={this.state.themeBundle}
-						currentEditorViewPageNum={currentEditorViewPageNum}
+						updateBrew={this.updateBrew}
-						currentEditorCursorPageNum={currentEditorCursorPageNum}
+						onCursorPageChange={this.handleEditorCursorPageChange}
-						currentBrewRendererPageNum={currentBrewRendererPageNum}
+						onViewPageChange={this.handleEditorViewPageChange}
+						currentEditorViewPageNum={this.state.currentEditorViewPageNum}
+						currentEditorCursorPageNum={this.state.currentEditorCursorPageNum}
+						currentBrewRendererPageNum={this.state.currentBrewRendererPageNum}
 					/>
 					<BrewRenderer
-						text={currentBrew.text}
+						text={this.state.brew.text}
-						style={currentBrew.style}
+						style={this.state.brew.style}
-						renderer={currentBrew.renderer}
+						renderer={this.state.brew.renderer}
-						theme={currentBrew.theme}
+						theme={this.state.brew.theme}
-						themeBundle={themeBundle}
+						themeBundle={this.state.themeBundle}
-						errors={HTMLErrors}
+						errors={this.state.htmlErrors}
-						lang={currentBrew.lang}
+						lang={this.state.brew.lang}
-						onPageChange={handleBrewRendererPageChange}
+						onPageChange={this.handleBrewRendererPageChange}
-						currentEditorViewPageNum={currentEditorViewPageNum}
+						currentEditorViewPageNum={this.state.currentEditorViewPageNum}
-						currentEditorCursorPageNum={currentEditorCursorPageNum}
+						currentEditorCursorPageNum={this.state.currentEditorCursorPageNum}
-						currentBrewRendererPageNum={currentBrewRendererPageNum}
+						currentBrewRendererPageNum={this.state.currentBrewRendererPageNum}
 						allowPrint={true}
 					/>
 				</SplitPane>
 			</div>
-		</div>
+		</div>;
-	);
+	}
-};
+});
 
 module.exports = EditPage;

client/homebrew/pages/homePage/homePage.jsx

@@ -1,119 +1,90 @@
-import './homePage.less';
+require('./homePage.less');
+const React = require('react');
+const createClass = require('create-react-class');
+const cx = require('classnames');
+import request from '../../utils/request-middleware.js';
+const { Meta } = require('vitreum/headtags');
 
-import React                           from 'react';
+const Nav = require('naturalcrit/nav/nav.jsx');
-import { useEffect, useState, useRef } from 'react';
+const Navbar = require('../../navbar/navbar.jsx');
-import request                         from '../../utils/request-middleware.js';
+const NewBrewItem = require('../../navbar/newbrew.navitem.jsx');
-import Markdown                        from 'naturalcrit/markdown.js';
+const HelpNavItem = require('../../navbar/help.navitem.jsx');
-import { Meta }                        from 'vitreum/headtags';
+const VaultNavItem = require('../../navbar/vault.navitem.jsx');
+const RecentNavItem = require('../../navbar/recent.navitem.jsx').both;
+const AccountNavItem = require('../../navbar/account.navitem.jsx');
+const ErrorNavItem = require('../../navbar/error-navitem.jsx');
+const { fetchThemeBundle } = require('../../../../shared/helpers.js');
 
-import Nav                             from 'naturalcrit/nav/nav.jsx';
+const SplitPane = require('naturalcrit/splitPane/splitPane.jsx');
-import Navbar                          from '../../navbar/navbar.jsx';
+const Editor = require('../../editor/editor.jsx');
-import NewBrewItem                     from '../../navbar/newbrew.navitem.jsx';
+const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
-import HelpNavItem                     from '../../navbar/help.navitem.jsx';
-import VaultNavItem                    from '../../navbar/vault.navitem.jsx';
-import { both as RecentNavItem }       from '../../navbar/recent.navitem.jsx';
-import AccountNavItem                  from '../../navbar/account.navitem.jsx';
-import ErrorNavItem                    from '../../navbar/error-navitem.jsx';
-import { fetchThemeBundle }            from '../../../../shared/helpers.js';
 
-import SplitPane                       from 'client/components/splitPane/splitPane.jsx';
+const { DEFAULT_BREW } = require('../../../../server/brewDefaults.js');
-import Editor                          from '../../editor/editor.jsx';
-import BrewRenderer                    from '../../brewRenderer/brewRenderer.jsx';
 
-import { DEFAULT_BREW }                from '../../../../server/brewDefaults.js';
+const HomePage = createClass({
+	displayName     : 'HomePage',
+	getDefaultProps : function() {
+		return {
+			brew : DEFAULT_BREW,
+			ver  : '0.0.0'
+		};
+	},
+	getInitialState : function() {
+		return {
+			brew                       : this.props.brew,
+			welcomeText                : this.props.brew.text,
+			error                      : undefined,
+			currentEditorViewPageNum   : 1,
+			currentEditorCursorPageNum : 1,
+			currentBrewRendererPageNum : 1,
+			themeBundle                : {}
+		};
+	},
 
-const BREWKEY  = 'homebrewery-new';
+	editor : React.createRef(null),
-const STYLEKEY = 'homebrewery-new-style';
-const SNIPKEY  = 'homebrewery-new-snippets';
-const METAKEY  = 'homebrewery-new-meta';
 
-const HomePage =(props)=>{
+	componentDidMount : function() {
-	props = {
+		fetchThemeBundle(this, this.props.brew.renderer, this.props.brew.theme);
-		brew : DEFAULT_BREW,
+	},
-		ver  : '0.0.0',
-    ...props
-  };
 
-	const [currentBrew               , setCurrentBrew]                = useState(props.brew);
+	handleSave : function(){
-	const [welcomeText               , setWelcomeText]                = useState(props.brew.text);
-	const [error                     , setError]                      = useState(undefined);
-	const [HTMLErrors                , setHTMLErrors                ] = useState(Markdown.validate(props.brew.text));
-	const [currentEditorViewPageNum  , setCurrentEditorViewPageNum]   = useState(1);
-	const [currentEditorCursorPageNum, setCurrentEditorCursorPageNum] = useState(1);
-	const [currentBrewRendererPageNum, setCurrentBrewRendererPageNum] = useState(1);
-	const [themeBundle               , setThemeBundle]                = useState({});
-	const [isSaving                  , setIsSaving]                   = useState(false);
-
-	const editorRef = useRef(null);
-
-	const useLocalStorage = false;
-
-	useEffect(()=>{
-		fetchThemeBundle(setError, setThemeBundle, currentBrew.renderer, currentBrew.theme);
-	}, []);
-
-	const save = ()=>{
 		request.post('/api')
-			.send(currentBrew)
+			.send(this.state.brew)
 			.end((err, res)=>{
 				if(err) {
-					setError(err);
+					this.setState({ error: err });
 					return;
 				}
-				const saved = res.body;
+				const brew = res.body;
-				window.location = `/edit/${saved.editId}`;
+				window.location = `/edit/${brew.editId}`;
 			});
-	};
+	},
+	handleSplitMove : function(){
+		this.editor.current.update();
+	},
 
-	const handleSplitMove = ()=>{
+	handleEditorViewPageChange : function(pageNumber){
-		editorRef.current.update();
+		this.setState({ currentEditorViewPageNum: pageNumber });
-	};
+	},
 
-	const handleEditorViewPageChange = (pageNumber)=>{
+	handleEditorCursorPageChange : function(pageNumber){
-		setCurrentEditorViewPageNum(pageNumber);
+		this.setState({ currentEditorCursorPageNum: pageNumber });
-	};
+	},
 
-	const handleEditorCursorPageChange = (pageNumber)=>{
+	handleBrewRendererPageChange : function(pageNumber){
-		setCurrentEditorCursorPageNum(pageNumber);
+		this.setState({ currentBrewRendererPageNum: pageNumber });
-	};
+	},
 
-	const handleBrewRendererPageChange = (pageNumber)=>{
+	handleTextChange : function(text){
-		setCurrentBrewRendererPageNum(pageNumber);
+		this.setState((prevState)=>({
-	};
+			brew : { ...prevState.brew, text: text },
-
+		}));
-	const handleBrewChange = (field) => (value, subfield) => {	//'text', 'style', 'snippets', 'metadata'
+	},
-		if (subfield == 'renderer' || subfield == 'theme')
+	renderNavbar : function(){
-			fetchThemeBundle(setError, setThemeBundle, value.renderer, value.theme);
+		return <Navbar ver={this.props.ver}>
-
-		//If there are HTML errors, run the validator on every change to give quick feedback
-		if(HTMLErrors.length && (field == 'text' || field == 'snippets'))
-			setHTMLErrors(Markdown.validate(value));
-
-		if(field == 'metadata') setCurrentBrew(prev => ({ ...prev, ...value }));
-		else                    setCurrentBrew(prev => ({ ...prev, [field]: value }));
-
-		if(useLocalStorage) {
-			if(field == 'text')     localStorage.setItem(BREWKEY, value);
-			if(field == 'style')    localStorage.setItem(STYLEKEY, value);
-			if(field == 'snippets') localStorage.setItem(SNIPKEY, value);
-			if(field == 'metadata') localStorage.setItem(METAKEY, JSON.stringify({
-				renderer : value.renderer,
-				theme    : value.theme,
-				lang     : value.lang
-			}));
-		}
-	};
-
-	const clearError = ()=>{
-		setError(null);
-		setIsSaving(false);
-	};
-
-	const renderNavbar = ()=>{
-		return <Navbar ver={props.ver}>
 			<Nav.section>
-				{error ?
+				{this.state.error ?
-					<ErrorNavItem error={error} clearError={clearError}></ErrorNavItem> :
+					<ErrorNavItem error={this.state.error} parent={this}></ErrorNavItem> :
 					null
 				}
 				<NewBrewItem />
@@ -123,48 +94,48 @@ const HomePage =(props)=>{
 				<AccountNavItem />
 			</Nav.section>
 		</Navbar>;
-	};
+	},
 
-	return (
+	render : function(){
-		<div className='homePage sitePage'>
+		return <div className='homePage sitePage'>
 			<Meta name='google-site-verification' content='NwnAQSSJZzAT7N-p5MY6ydQ7Njm67dtbu73ZSyE5Fy4' />
-			{renderNavbar()}
+			{this.renderNavbar()}
 			<div className='content'>
-				<SplitPane onDragFinish={handleSplitMove}>
+				<SplitPane onDragFinish={this.handleSplitMove}>
 					<Editor
-						ref={editorRef}
+						ref={this.editor}
-						brew={currentBrew}
+						brew={this.state.brew}
-						onBrewChange={handleBrewChange}
+						onTextChange={this.handleTextChange}
-						renderer={currentBrew.renderer}
+						renderer={this.state.brew.renderer}
 						showEditButtons={false}
-						themeBundle={themeBundle}
+						themeBundle={this.state.themeBundle}
-						onCursorPageChange={handleEditorCursorPageChange}
+						onCursorPageChange={this.handleEditorCursorPageChange}
-						onViewPageChange={handleEditorViewPageChange}
+						onViewPageChange={this.handleEditorViewPageChange}
-						currentEditorViewPageNum={currentEditorViewPageNum}
+						currentEditorViewPageNum={this.state.currentEditorViewPageNum}
-						currentEditorCursorPageNum={currentEditorCursorPageNum}
+						currentEditorCursorPageNum={this.state.currentEditorCursorPageNum}
-						currentBrewRendererPageNum={currentBrewRendererPageNum}
+						currentBrewRendererPageNum={this.state.currentBrewRendererPageNum}
 					/>
 					<BrewRenderer
-						text={currentBrew.text}
+						text={this.state.brew.text}
-						style={currentBrew.style}
+						style={this.state.brew.style}
-						renderer={currentBrew.renderer}
+						renderer={this.state.brew.renderer}
-						onPageChange={handleBrewRendererPageChange}
+						onPageChange={this.handleBrewRendererPageChange}
-						currentEditorViewPageNum={currentEditorViewPageNum}
+						currentEditorViewPageNum={this.state.currentEditorViewPageNum}
-						currentEditorCursorPageNum={currentEditorCursorPageNum}
+						currentEditorCursorPageNum={this.state.currentEditorCursorPageNum}
-						currentBrewRendererPageNum={currentBrewRendererPageNum}
+						currentBrewRendererPageNum={this.state.currentBrewRendererPageNum}
-						themeBundle={themeBundle}
+						themeBundle={this.state.themeBundle}
 					/>
 				</SplitPane>
 			</div>
-			<div className={`floatingSaveButton${welcomeText !== currentBrew.text ? ' show' : ''}`} onClick={save}>
+			<div className={cx('floatingSaveButton', { show: this.state.welcomeText != this.state.brew.text })} onClick={this.handleSave}>
 				Save current <i className='fas fa-save' />
 			</div>
 
 			<a href='/new' className='floatingNewButton'>
 				Create your own <i className='fas fa-magic' />
 			</a>
-		</div>
+		</div>;
-	)
+	}
-};
+});
 
 module.exports = HomePage;

client/homebrew/pages/newPage/newPage.jsx

@@ -1,239 +1,275 @@
 /*eslint max-lines: ["warn", {"max": 300, "skipBlankLines": true, "skipComments": true}]*/
-import './newPage.less';
+require('./newPage.less');
+const React = require('react');
+const createClass = require('create-react-class');
+import request from '../../utils/request-middleware.js';
 
-import React, { useState, useEffect, useRef } from 'react';
+import Markdown from 'naturalcrit/markdown.js';
-import request                                from '../../utils/request-middleware.js';
-import Markdown                               from 'naturalcrit/markdown.js';
 
-import Nav                       from 'naturalcrit/nav/nav.jsx';
+const Nav = require('naturalcrit/nav/nav.jsx');
-import Navbar                    from '../../navbar/navbar.jsx';
+const PrintNavItem = require('../../navbar/print.navitem.jsx');
-import AccountNavItem            from '../../navbar/account.navitem.jsx';
+const Navbar = require('../../navbar/navbar.jsx');
-import ErrorNavItem              from '../../navbar/error-navitem.jsx';
+const AccountNavItem = require('../../navbar/account.navitem.jsx');
-import HelpNavItem               from '../../navbar/help.navitem.jsx';
+const ErrorNavItem = require('../../navbar/error-navitem.jsx');
-import PrintNavItem              from '../../navbar/print.navitem.jsx';
+const RecentNavItem = require('../../navbar/recent.navitem.jsx').both;
-import { both as RecentNavItem } from '../../navbar/recent.navitem.jsx';
+const HelpNavItem = require('../../navbar/help.navitem.jsx');
 
-import SplitPane    from 'client/components/splitPane/splitPane.jsx';
+const SplitPane = require('naturalcrit/splitPane/splitPane.jsx');
-import Editor       from '../../editor/editor.jsx';
+const Editor = require('../../editor/editor.jsx');
-import BrewRenderer from '../../brewRenderer/brewRenderer.jsx';
+const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
 
-import { DEFAULT_BREW }                       from '../../../../server/brewDefaults.js';
+const { DEFAULT_BREW } = require('../../../../server/brewDefaults.js');
-import { printCurrentBrew, fetchThemeBundle, splitTextStyleAndMetadata } from '../../../../shared/helpers.js';
+const { printCurrentBrew, fetchThemeBundle } = require('../../../../shared/helpers.js');
 
 const BREWKEY  = 'homebrewery-new';
 const STYLEKEY = 'homebrewery-new-style';
-const SNIPKEY  = 'homebrewery-new-snippets';
 const METAKEY  = 'homebrewery-new-meta';
-const SAVEKEYPREFIX  = 'HOMEBREWERY-DEFAULT-SAVE-LOCATION-';
+let SAVEKEY;
 
-const NewPage = (props) => {
-	props = {
-		brew: DEFAULT_BREW,
-		...props
-	};
 
-	const [currentBrew               , setCurrentBrew               ] = useState(props.brew);
+const NewPage = createClass({
-	const [isSaving                  , setIsSaving                  ] = useState(false);
+	displayName     : 'NewPage',
-	const [saveGoogle                , setSaveGoogle                ] = useState(global.account?.googleId ? true : false);
+	getDefaultProps : function() {
-	const [error                     , setError                     ] = useState(null);
+		return {
-	const [HTMLErrors                , setHTMLErrors                ] = useState(Markdown.validate(props.brew.text));
+			brew : DEFAULT_BREW
-	const [currentEditorViewPageNum  , setCurrentEditorViewPageNum  ] = useState(1);
-	const [currentEditorCursorPageNum, setCurrentEditorCursorPageNum] = useState(1);
-	const [currentBrewRendererPageNum, setCurrentBrewRendererPageNum] = useState(1);
-	const [themeBundle               , setThemeBundle               ] = useState({});
-
-	const editorRef = useRef(null);
-
-	const useLocalStorage = true;
-
-	useEffect(() => {
-		document.addEventListener('keydown', handleControlKeys);
-		loadBrew();
-		fetchThemeBundle(setError, setThemeBundle, currentBrew.renderer, currentBrew.theme);
-
-		return () => {
-			document.removeEventListener('keydown', handleControlKeys);
 		};
-	}, []);
+	},
 
-	const loadBrew = ()=>{
+	getInitialState : function() {
-		const brew = { ...currentBrew };
+		const brew = this.props.brew;
-		if(!brew.shareId && typeof window !== 'undefined') { //Load from localStorage if in client browser
+
+		return {
+			brew                       : brew,
+			isSaving                   : false,
+			saveGoogle                 : (global.account && global.account.googleId ? true : false),
+			error                      : null,
+			htmlErrors                 : Markdown.validate(brew.text),
+			currentEditorViewPageNum   : 1,
+			currentEditorCursorPageNum : 1,
+			currentBrewRendererPageNum : 1,
+			themeBundle                : {}
+		};
+	},
+
+	editor : React.createRef(null),
+
+	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));
+			const metaStorage = JSON.parse(localStorage.getItem(METAKEY));
 
-			brew.text     = brewStorage           ?? brew.text;
+			brew.text  = brewStorage  ?? brew.text;
-			brew.style    = styleStorage          ?? brew.style;
+			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;
 			brew.theme    = metaStorage?.theme    ?? brew.theme;
 			brew.lang     = metaStorage?.lang     ?? brew.lang;
 		}
 
-		const SAVEKEY = `${SAVEKEYPREFIX}${global.account?.username}`;
+		SAVEKEY = `HOMEBREWERY-DEFAULT-SAVE-LOCATION-${global.account?.username || ''}`;
 		const saveStorage = localStorage.getItem(SAVEKEY) || 'HOMEBREWERY';
 
-		setCurrentBrew(brew);
+		this.setState({
-		setSaveGoogle(saveStorage == 'GOOGLE-DRIVE' && saveGoogle);
+			brew       : brew,
+			saveGoogle : (saveStorage == 'GOOGLE-DRIVE' && this.state.saveGoogle)
+		});
+
+		fetchThemeBundle(this, this.props.brew.renderer, this.props.brew.theme);
 
 		localStorage.setItem(BREWKEY, brew.text);
 		if(brew.style)
 			localStorage.setItem(STYLEKEY, brew.style);
-		localStorage.setItem(METAKEY, JSON.stringify({ renderer: brew.renderer, theme: brew.theme, lang: brew.lang }));
+		localStorage.setItem(METAKEY, JSON.stringify({ 'renderer': brew.renderer, 'theme': brew.theme, 'lang': brew.lang }));
-		if(window.location.pathname !== '/new')
+		if(window.location.pathname != '/new') {
 			window.history.replaceState({}, window.location.title, '/new/');
-	};
+		}
+	},
+	componentWillUnmount : function() {
+		document.removeEventListener('keydown', this.handleControlKeys);
+	},
 
-	const handleControlKeys = (e) => {
+	handleControlKeys : function(e){
-		if (!(e.ctrlKey || e.metaKey)) return;
+		if(!(e.ctrlKey || e.metaKey)) return;
 		const S_KEY = 83;
 		const P_KEY = 80;
-		if (e.keyCode === S_KEY) save();
+		if(e.keyCode == S_KEY) this.save();
-		if (e.keyCode === P_KEY) printCurrentBrew();
+		if(e.keyCode == P_KEY) printCurrentBrew();
-		if (e.keyCode === S_KEY || e.keyCode === P_KEY) {
+		if(e.keyCode == P_KEY || e.keyCode == S_KEY){
-			e.preventDefault();
 			e.stopPropagation();
+			e.preventDefault();
 		}
-	};
+	},
 
-	const handleSplitMove = ()=>{
+	handleSplitMove : function(){
-		editorRef.current.update();
+		this.editor.current.update();
-	};
+	},
 
-	const handleEditorViewPageChange = (pageNumber)=>{
+	handleEditorViewPageChange : function(pageNumber){
-		setCurrentEditorViewPageNum(pageNumber);
+		this.setState({ currentEditorViewPageNum: pageNumber });
-	};
+	},
 
-	const handleEditorCursorPageChange = (pageNumber)=>{
+	handleEditorCursorPageChange : function(pageNumber){
-		setCurrentEditorCursorPageNum(pageNumber);
+		this.setState({ currentEditorCursorPageNum: pageNumber });
-	};
+	},
 
-	const handleBrewRendererPageChange = (pageNumber)=>{
+	handleBrewRendererPageChange : function(pageNumber){
-		setCurrentBrewRendererPageNum(pageNumber);
+		this.setState({ currentBrewRendererPageNum: pageNumber });
-	};
+	},
 
-	const handleBrewChange = (field) => (value, subfield) => {	//'text', 'style', 'snippets', 'metadata'
+	handleTextChange : function(text){
-		if (subfield == 'renderer' || subfield == 'theme')
+		//If there are errors, run the validator on every change to give quick feedback
-			fetchThemeBundle(setError, setThemeBundle, value.renderer, value.theme);
+		let htmlErrors = this.state.htmlErrors;
+		if(htmlErrors.length) htmlErrors = Markdown.validate(text);
 
-		//If there are HTML errors, run the validator on every change to give quick feedback
+		this.setState((prevState)=>({
-		if(HTMLErrors.length && (field == 'text' || field == 'snippets'))
+			brew       : { ...prevState.brew, text: text },
-			setHTMLErrors(Markdown.validate(value));
+			htmlErrors : htmlErrors,
+		}));
+		localStorage.setItem(BREWKEY, text);
+	},
 
-		if(field == 'metadata') setCurrentBrew(prev => ({ ...prev, ...value }));
+	handleStyleChange : function(style){
-		else                    setCurrentBrew(prev => ({ ...prev, [field]: value }));
+		this.setState((prevState)=>({
+			brew : { ...prevState.brew, style: style },
+		}));
+		localStorage.setItem(STYLEKEY, style);
+	},
 
-		if(useLocalStorage) {
+	handleSnipChange : function(snippet){
-			if(field == 'text')     localStorage.setItem(BREWKEY, value);
+		//If there are errors, run the validator on every change to give quick feedback
-			if(field == 'style')    localStorage.setItem(STYLEKEY, value);
+		let htmlErrors = this.state.htmlErrors;
-			if(field == 'snippets') localStorage.setItem(SNIPKEY, value);
+		if(htmlErrors.length) htmlErrors = Markdown.validate(snippet);
-			if(field == 'metadata') localStorage.setItem(METAKEY, JSON.stringify({
+
-				renderer : value.renderer,
+		this.setState((prevState)=>({
-				theme    : value.theme,
+			brew       : { ...prevState.brew, snippets: snippet },
-				lang     : value.lang
+			htmlErrors : htmlErrors,
+		}), ()=>{if(this.state.autoSave) this.trySave();});
+	},
+
+	handleMetaChange : function(metadata, field=undefined){
+		if(field == 'theme' || field == 'renderer')	// Fetch theme bundle only if theme or renderer was changed
+			fetchThemeBundle(this, metadata.renderer, metadata.theme);
+
+		this.setState((prevState)=>({
+			brew : { ...prevState.brew, ...metadata },
+		}), ()=>{
+			localStorage.setItem(METAKEY, JSON.stringify({
+				// 'title'       : this.state.brew.title,
+				// 'description' : this.state.brew.description,
+				'renderer' : this.state.brew.renderer,
+				'theme'    : this.state.brew.theme,
+				'lang'     : this.state.brew.lang
 			}));
+		});
+		;
+	},
+
+	save : async function(){
+		this.setState({
+			isSaving : true
+		});
+
+		let brew = this.state.brew;
+		// Split out CSS to Style if CSS codefence exists
+		if(brew.text.startsWith('```css') && brew.text.indexOf('```\n\n') > 0) {
+			const index = brew.text.indexOf('```\n\n');
+			brew.style = `${brew.style ? `${brew.style}\n` : ''}${brew.text.slice(7, index - 1)}`;
+			brew.text = brew.text.slice(index + 5);
 		}
-	};
-
-	const save = async () => {
-  	setIsSaving(true);
-
-		let updatedBrew = { ...currentBrew };
-		splitTextStyleAndMetadata(updatedBrew);
-
-		const pageRegex = updatedBrew.renderer === 'legacy' ? /\\page/g : /^\\page$/gm;
-		updatedBrew.pageCount = (updatedBrew.text.match(pageRegex) || []).length + 1;
 
+		brew.pageCount=((brew.renderer=='legacy' ? brew.text.match(/\\page/g) : brew.text.match(/^\\page$/gm)) || []).length + 1;
 		const res = await request
-			.post(`/api${saveGoogle ? '?saveToGoogle=true' : ''}`)
+			.post(`/api${this.state.saveGoogle ? '?saveToGoogle=true' : ''}`)
-			.send(updatedBrew)
+			.send(brew)
-			.catch((err) => {
+			.catch((err)=>{
-				setIsSaving(false);
+				this.setState({ isSaving: false, error: err });
-				setError(err);
 			});
+		if(!res) return;
 
-		setIsSaving(false)
+		brew = res.body;
-		if (!res) return;
-
-		const savedBrew = res.body;
-
 		localStorage.removeItem(BREWKEY);
 		localStorage.removeItem(STYLEKEY);
 		localStorage.removeItem(METAKEY);
-		window.location = `/edit/${savedBrew.editId}`;
+		window.location = `/edit/${brew.editId}`;
-	};
+	},
 
-	const renderSaveButton = ()=>{
+	renderSaveButton : function(){
-		if(isSaving){
+		if(this.state.isSaving){
 			return <Nav.item icon='fas fa-spinner fa-spin' className='save'>
 				save...
 			</Nav.item>;
 		} else {
-			return <Nav.item icon='fas fa-save' className='save' onClick={save}>
+			return <Nav.item icon='fas fa-save' className='save' onClick={this.save}>
 				save
 			</Nav.item>;
 		}
-	};
+	},
 
-	const clearError = ()=>{
+	renderNavbar : function(){
-		setError(null);
+		return <Navbar>
-		setIsSaving(false);
-	};
 
-	const renderNavbar = () => (
-		<Navbar>
 			<Nav.section>
-				<Nav.item className='brewTitle'>{currentBrew.title}</Nav.item>
+				<Nav.item className='brewTitle'>{this.state.brew.title}</Nav.item>
 			</Nav.section>
 
 			<Nav.section>
-				{error
+				{this.state.error ?
-					? <ErrorNavItem error={error} clearError={clearError} />
+					<ErrorNavItem error={this.state.error} parent={this}></ErrorNavItem> :
-					: renderSaveButton()}
+					this.renderSaveButton()
+				}
 				<PrintNavItem />
 				<HelpNavItem />
 				<RecentNavItem />
 				<AccountNavItem />
 			</Nav.section>
-		</Navbar>
+		</Navbar>;
-	);
+	},
 
-	return (
+	render : function(){
-			<div className='newPage sitePage'>
+		return <div className='newPage sitePage'>
-			{renderNavbar()}
+			{this.renderNavbar()}
 			<div className='content'>
-				<SplitPane onDragFinish={handleSplitMove}>
+				<SplitPane onDragFinish={this.handleSplitMove}>
 					<Editor
-						ref={editorRef}
+						ref={this.editor}
-						brew={currentBrew}
+						brew={this.state.brew}
-						onBrewChange={handleBrewChange}
+						onTextChange={this.handleTextChange}
-						renderer={currentBrew.renderer}
+						onStyleChange={this.handleStyleChange}
-						userThemes={props.userThemes}
+						onMetaChange={this.handleMetaChange}
-						themeBundle={themeBundle}
+						onSnipChange={this.handleSnipChange}
-						onCursorPageChange={handleEditorCursorPageChange}
+						renderer={this.state.brew.renderer}
-						onViewPageChange={handleEditorViewPageChange}
+						userThemes={this.props.userThemes}
-						currentEditorViewPageNum={currentEditorViewPageNum}
+						themeBundle={this.state.themeBundle}
-						currentEditorCursorPageNum={currentEditorCursorPageNum}
+						onCursorPageChange={this.handleEditorCursorPageChange}
-						currentBrewRendererPageNum={currentBrewRendererPageNum}
+						onViewPageChange={this.handleEditorViewPageChange}
+						currentEditorViewPageNum={this.state.currentEditorViewPageNum}
+						currentEditorCursorPageNum={this.state.currentEditorCursorPageNum}
+						currentBrewRendererPageNum={this.state.currentBrewRendererPageNum}
 					/>
 					<BrewRenderer
-						text={currentBrew.text}
+						text={this.state.brew.text}
-						style={currentBrew.style}
+						style={this.state.brew.style}
-						renderer={currentBrew.renderer}
+						renderer={this.state.brew.renderer}
-						theme={currentBrew.theme}
+						theme={this.state.brew.theme}
-						themeBundle={themeBundle}
+						themeBundle={this.state.themeBundle}
-						errors={HTMLErrors}
+						errors={this.state.htmlErrors}
-						lang={currentBrew.lang}
+						lang={this.state.brew.lang}
-						onPageChange={handleBrewRendererPageChange}
+						onPageChange={this.handleBrewRendererPageChange}
-						currentEditorViewPageNum={currentEditorViewPageNum}
+						currentEditorViewPageNum={this.state.currentEditorViewPageNum}
-						currentEditorCursorPageNum={currentEditorCursorPageNum}
+						currentEditorCursorPageNum={this.state.currentEditorCursorPageNum}
-						currentBrewRendererPageNum={currentBrewRendererPageNum}
+						currentBrewRendererPageNum={this.state.currentBrewRendererPageNum}
 						allowPrint={true}
 					/>
 				</SplitPane>
 			</div>
-		</div>
+		</div>;
-	);
+	}
-};
+});
 
 module.exports = NewPage;

client/homebrew/pages/sharePage/sharePage.jsx

@@ -17,11 +17,15 @@ const { printCurrentBrew, fetchThemeBundle } = require('../../../../shared/helpe
 const SharePage = (props)=>{
 	const { brew = DEFAULT_BREW_LOAD, disableMeta = false } = props;
 
-	const [themeBundle,                setThemeBundle]                = useState({});
+	const [state, setState] = useState({
-	const [currentBrewRendererPageNum, setCurrentBrewRendererPageNum] = useState(1);
+		themeBundle                : {},
+		currentBrewRendererPageNum : 1,
+	});
 
 	const handleBrewRendererPageChange = useCallback((pageNumber)=>{
-		setCurrentBrewRendererPageNum(pageNumber);
+		setState((prevState)=>({
+			currentBrewRendererPageNum : pageNumber,
+			...prevState }));
 	}, []);
 
 	const handleControlKeys = (e)=>{
@@ -36,7 +40,11 @@ const SharePage = (props)=>{
 
 	useEffect(()=>{
 		document.addEventListener('keydown', handleControlKeys);
-		fetchThemeBundle(undefined, setThemeBundle, brew.renderer, brew.theme);
+		fetchThemeBundle(
+			{ setState },
+			brew.renderer,
+			brew.theme
+		);
 
 		return ()=>{
 			document.removeEventListener('keydown', handleControlKeys);
@@ -106,9 +114,9 @@ const SharePage = (props)=>{
 					lang={brew.lang}
 					renderer={brew.renderer}
 					theme={brew.theme}
-					themeBundle={themeBundle}
+					themeBundle={state.themeBundle}
 					onPageChange={handleBrewRendererPageChange}
-					currentBrewRendererPageNum={currentBrewRendererPageNum}
+					currentBrewRendererPageNum={state.currentBrewRendererPageNum}
 					allowPrint={true}
 				/>
 			</div>

client/homebrew/pages/userPage/userPage.jsx

@@ -39,14 +39,10 @@ const UserPage = (props)=>{
 		}] : [])
 	];
 
-	const clearError = ()=>{
-		setError(null);
-	};
-
 	const navItems = (
 		<Navbar>
 			<Nav.section>
-				{error && (<ErrorNavItem error={error} clearError={clearError}></ErrorNavItem>)}
+				{error && (<ErrorNavItem error={error} parent={null}></ErrorNavItem>)}
 				<NewBrew />
 				<HelpNavItem />
 				<VaultNavitem />

client/homebrew/pages/vaultPage/vaultPage.jsx

@@ -12,7 +12,7 @@ const Account       = require('../../navbar/account.navitem.jsx');
 const NewBrew       = require('../../navbar/newbrew.navitem.jsx');
 const HelpNavItem   = require('../../navbar/help.navitem.jsx');
 const BrewItem      = require('../basePages/listPage/brewItem/brewItem.jsx');
-const SplitPane     = require('client/components/splitPane/splitPane.jsx');
+const SplitPane     = require('../../../../shared/naturalcrit/splitPane/splitPane.jsx');
 const ErrorIndex    = require('../errorPage/errors/errorIndex.js');
 
 import request from '../../utils/request-middleware.js';

client/homebrew/utils/request-middleware.spec.js

@@ -1,74 +0,0 @@
-import requestMiddleware from './request-middleware';
-
-jest.mock('superagent');
-import request from 'superagent';
-
-describe('request-middleware', ()=>{
-	let version;
-
-	let setFn;
-	let testFn;
-
-	beforeEach(()=>{
-		jest.resetAllMocks();
-		version = global.version;
-
-		global.version = '999';
-
-		setFn = jest.fn();
-		testFn = jest.fn(()=>{ return { set: setFn }; });
-	});
-
-	afterEach(()=>{
-		global.version = version;
-	});
-
-	it('should add header to get', ()=>{
-		// Ensure tests functions have been reset
-		expect(testFn).not.toHaveBeenCalled();
-		expect(setFn).not.toHaveBeenCalled();
-
-		request.get = testFn;
-
-		requestMiddleware.get('path');
-
-		expect(testFn).toHaveBeenCalledWith('path');
-		expect(setFn).toHaveBeenCalledWith('Homebrewery-Version', '999');
-	});
-
-	it('should add header to put', ()=>{
-		expect(testFn).not.toHaveBeenCalled();
-		expect(setFn).not.toHaveBeenCalled();
-
-		request.put = testFn;
-
-		requestMiddleware.put('path');
-
-		expect(testFn).toHaveBeenCalledWith('path');
-		expect(setFn).toHaveBeenCalledWith('Homebrewery-Version', '999');
-	});
-
-	it('should add header to post', ()=>{
-		expect(testFn).not.toHaveBeenCalled();
-		expect(setFn).not.toHaveBeenCalled();
-
-		request.post = testFn;
-
-		requestMiddleware.post('path');
-
-		expect(testFn).toHaveBeenCalledWith('path');
-		expect(setFn).toHaveBeenCalledWith('Homebrewery-Version', '999');
-	});
-
-	it('should add header to delete', ()=>{
-		expect(testFn).not.toHaveBeenCalled();
-		expect(setFn).not.toHaveBeenCalled();
-
-		request.delete = testFn;
-
-		requestMiddleware.delete('path');
-
-		expect(testFn).toHaveBeenCalledWith('path');
-		expect(setFn).toHaveBeenCalledWith('Homebrewery-Version', '999');
-	});
-});

package.json

@@ -93,7 +93,7 @@
     "@sanity/diff-match-patch": "^3.2.0",
     "body-parser": "^2.2.0",
     "classnames": "^2.5.1",
-    "codemirror": "^5.65.6",
+    "codemirror": "^6.0.2",
     "cookie-parser": "^1.4.7",
     "core-js": "^3.44.0",
     "cors": "^2.8.5",
@@ -136,19 +136,19 @@
     "written-number": "^0.11.1"
   },
   "devDependencies": {
-    "@stylistic/stylelint-plugin": "^4.0.0",
+    "@stylistic/stylelint-plugin": "^3.1.3",
     "babel-plugin-transform-import-meta": "^2.3.3",
-    "eslint": "^9.35.0",
+    "eslint": "^9.31.0",
     "eslint-plugin-jest": "^29.0.1",
     "eslint-plugin-react": "^7.37.5",
     "globals": "^16.3.0",
-    "jest": "^30.1.3",
+    "jest": "^30.0.4",
     "jest-expect-message": "^1.1.3",
     "jsdom-global": "^3.0.2",
     "postcss-less": "^6.0.0",
-    "stylelint": "^16.24.0",
+    "stylelint": "^16.21.1",
-    "stylelint-config-recess-order": "^7.3.0",
+    "stylelint-config-recess-order": "^7.1.0",
-    "stylelint-config-recommended": "^17.0.0",
+    "stylelint-config-recommended": "^16.0.0",
-    "supertest": "^7.1.4"
+    "supertest": "^7.1.3"
   }
 }

server/app.js

@@ -383,7 +383,6 @@ app.get('/edit/:id', asyncHandler(getBrew('edit')), asyncHandler(async(req, res,
 		title       : req.brew.title || 'Untitled Brew',
 		description : req.brew.description || 'No description.',
 		image       : req.brew.thumbnail || defaultMetaTags.image,
-		locale      : req.brew.lang,
 		type        : 'article'
 	};
 
@@ -487,8 +486,8 @@ app.get('/account', asyncHandler(async (req, res, next)=>{
 		const query = { authors: req.account.username, googleId: { $exists: false } };
 		const mongoCount = await HomebrewModel.countDocuments(query)
 			.catch((err)=>{
+				mongoCount = 0;
 				console.log(err);
-				return 0;
 			});
 
 		data.accountDetails = {

server/homebrew.api.js

@@ -52,13 +52,13 @@ const api = {
 		// ID Validation Checks
 		// Homebrewery ID
 		// Typically 12 characters, but the DB shows a range of 7 to 14 characters
-		if(!id.match(/^[a-zA-Z0-9-_]{7,14}$/)){
+		if(!id.match(/^[A-Za-z0-9_-]{7,14}$/)){
 			throw { name: 'ID Error', message: 'Invalid ID', status: 404, HBErrorCode: '11', brewId: id };
 		}
 		// Google ID
 		// Typically 33 characters, old format is 44 - always starts with a 1
 		// Managed by Google, may change outside of our control, so any length between 33 and 44 is acceptable
-		if(googleId && !googleId.match(/^1(?:[a-zA-Z0-9-_]{32,43})$/)){
+		if(googleId && !googleId.match(/^1(?:[A-Za-z0-9+\/]{32,43})$/)){
 			throw { name: 'Google ID Error', message: 'Invalid ID', status: 404, HBErrorCode: '12', brewId: id };
 		}
 
@@ -375,14 +375,14 @@ const api = {
 		try {
 			const patches = parsePatch(brewFromClient.patches);
 			// Patch to a throwaway variable while parallelizing - we're more concerned with error/no error.
-			const patchedResult = decodeURI(applyPatches(patches, encodeURI(brewFromServer.text))[0]);
+			const patchedResult = applyPatches(patches, brewFromServer.text, { allowExceedingIndices: true })[0];
 			if(patchedResult != brewFromClient.text)
 				throw("Patches did not apply cleanly, text mismatch detected");
 			// brew.text = applyPatches(patches, brewFromServer.text)[0];
 		} catch (err) {
 			//debugTextMismatch(brewFromClient.text, brewFromServer.text, `edit/${brewFromClient.editId}`);
 			console.error('Failed to apply patches:', {
-				//patches : brewFromClient.patches,
+				patches : brewFromClient.patches,
 				brewId  : brewFromClient.editId || 'unknown',
 				error   : err
 			});

shared/helpers.js

@@ -116,21 +116,27 @@ const printCurrentBrew = ()=>{
 	}
 };
 
-const fetchThemeBundle = async (setError, setThemeBundle, renderer, theme)=>{
+const fetchThemeBundle = async (obj, renderer, theme)=>{
 	if(!renderer || !theme) return;
 	const res = await request
 			.get(`/api/theme/${renderer}/${theme}`)
 			.catch((err)=>{
-				setError(err)
+				obj.setState({ error: err });
 			});
 	if(!res) {
-		setThemeBundle({});
+		obj.setState((prevState)=>({
+			...prevState,
+			themeBundle : {}
+		}));
 		return;
 	}
 	const themeBundle = res.body;
 	themeBundle.joinedStyles = themeBundle.styles.map((style)=>`<style>${style}</style>`).join('\n\n');
-	setThemeBundle(themeBundle);
+	obj.setState((prevState)=>({
-	setError(null);
+		...prevState,
+		themeBundle : themeBundle,
+		error       : null
+	}));
 };
 
 const debugTextMismatch = (clientTextRaw, serverTextRaw, label) => {

shared/naturalcrit/codeEditor/codeEditor.less

@@ -38,6 +38,15 @@
 		animation-duration : 0.4s;
 	}
 
+	.CodeMirror-vscrollbar {
+		&::-webkit-scrollbar { width : 20px; }
+		&::-webkit-scrollbar-thumb {
+			width      : 20px;
+			background : linear-gradient(90deg, #858585 15px, #808080 15px);
+		}
+	}
+
+
 	//.cm-tab {
 	//  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAMCAQAAACOs/baAAAARUlEQVR4nGJgIAG8JkXxUAcCtDWemcGR1lY4MvgzCEKY7jSBjgxBDAG09UEQzAe0AMwMHrSOAwEGRtpaMIwAAAAA//8DAG4ID9EKs6YqAAAAAElFTkSuQmCC) no-repeat right;
 	//}

shared/naturalcrit/markdown.js

@@ -185,7 +185,7 @@ const mustacheSpans = {
 	start(src) { return src.match(/{{[^{]/)?.index; },  // Hint to Marked.js to stop and check for a match
 	tokenizer(src, tokens) {
 		const completeSpan = /^{{[^\n]*}}/;               // Regex for the complete token
-		const inlineRegex = /{{(?=((?:[:=](?:"['\w,\-+*/()#%=?. ]*"|[\w\-+*/()#%.]*)|[^"=':{}\s]*)*))\1 *|}}/g;
+		const inlineRegex = /{{(?=((?:[:=](?:"['\w,\-()#%=?. ]*"|[\w\-()#%.]*)|[^"=':{}\s]*)*))\1 *|}}/g;
 		const match = completeSpan.exec(src);
 		if(match) {
 			//Find closing delimiter
@@ -242,7 +242,7 @@ const mustacheDivs = {
 	start(src) { return src.match(/\n *{{[^{]/m)?.index; },  // Hint to Marked.js to stop and check for a match
 	tokenizer(src, tokens) {
 		const completeBlock = /^ *{{[^\n}]* *\n.*\n *}}/s;                // Regex for the complete token
-		const blockRegex = /^ *{{(?=((?:[:=](?:"['\w,\-+*/()#%=?. ]*"|[\w\-+*/()#%.]*)|[^"=':{}\s]*)*))\1 *$|^ *}}$/gm;
+		const blockRegex = /^ *{{(?=((?:[:=](?:"['\w,\-()#%=?. ]*"|[\w\-()#%.]*)|[^"=':{}\s]*)*))\1 *$|^ *}}$/gm;
 		const match = completeBlock.exec(src);
 		if(match) {
 			//Find closing delimiter
@@ -297,7 +297,7 @@ const mustacheInjectInline = {
 	level : 'inline',
 	start(src) { return src.match(/ *{[^{\n]/)?.index; },  // Hint to Marked.js to stop and check for a match
 	tokenizer(src, tokens) {
-		const inlineRegex = /^ *{(?=((?:[:=](?:"['\w,\-+*/()#%=?. ]*"|[\w\-+*/()#%.]*)|[^"=':{}\s]*)*))\1}/g;
+		const inlineRegex = /^ *{(?=((?:[:=](?:"['\w,\-()#%=?. ]*"|[\w\-()#%.]*)|[^"=':{}\s]*)*))\1}/g;
 		const match = inlineRegex.exec(src);
 		if(match) {
 			const lastToken = tokens[tokens.length - 1];
@@ -343,7 +343,7 @@ const mustacheInjectBlock = {
 		level : 'block',
 		start(src) { return src.match(/\n *{[^{\n]/m)?.index; },  // Hint to Marked.js to stop and check for a match
 		tokenizer(src, tokens) {
-			const inlineRegex = /^ *{(?=((?:[:=](?:"['\w,\-+*/()#%=?. ]*"|[\w\-+*/()#%.]*)|[^"=':{}\s]*)*))\1}/ym;
+			const inlineRegex = /^ *{(?=((?:[:=](?:"['\w,\-()#%=?. ]*"|[\w\-()#%.]*)|[^"=':{}\s]*)*))\1}/ym;
 			const match = inlineRegex.exec(src);
 			if(match) {
 				const lastToken = tokens[tokens.length - 1];

themes/V3/UnearthedArcana/settings.json

@@ -1,6 +0,0 @@
-{
-  "name" : "UnearthedArcana",
-  "renderer" : "V3",
-  "baseTheme" : false,
-  "baseSnippets" : false
-}

themes/V3/UnearthedArcana/style.less

@@ -1,38 +0,0 @@
-@import (less) './themes/fonts/5e/fonts.less';
-@import (less) './themes/assets/assets.less';
-
-:root {
-	//Colors
-	--HB_Color_Background            : #FFFFFF; // White
-	--HB_Color_WatercolorStain       : #000000; // Black
-}
-
-.page {
-	font-family: Cambria,Georgia,serif;
-	font-size: 14px;
-	h1, h2, h3, h4 {
-  		font-variant: small-caps;
-  		font-weight: normal;
-	}
-	h1 {
-		column-span: all;
-		-webkit-column-span: all;
-		font-size: 40px;
-	}
-	h2 {
-		font-size: 26px;
-	}
-	h3 {
-		font-size: 20px;
-		border-bottom: 2px solid black;
-	}
-	h4 {
-		font-size: 18px;
-	}
-	h5 {
-		font-size: 16px;
-	}
-	h6 {
-		font-size: 14px;
-	}
-}

themes/themes.json

@@ -35,13 +35,6 @@
       "baseTheme": "Blank",
       "baseSnippets": "5ePHB",
       "path": "Journal"
-    },
-    "UnearthedArcana": {
-      "name": "UnearthedArcana",
-      "renderer": "V3",
-      "baseTheme": false,
-      "baseSnippets": false,
-      "path": "UnearthedArcana"
     }
   }
 }