lint

Refactor homePage.jsx into a functional component

client/homebrew/brewRenderer/brewRenderer.jsx

@@ -39,8 +39,8 @@ const BrewPage = (props)=>{
 		index    : 0,
 		...props
 	};
-	const pageRef = useRef(null);
+	const pageRef   = useRef(null);
-	const cleanText = safeHTML(`${props.contents}\n<div class="columnSplit"></div>\n`);
+	const cleanText = safeHTML(props.contents);
 
 	useEffect(()=>{
 		if(!pageRef.current) return;

client/homebrew/navbar/error-navitem.jsx

@@ -1,157 +1,138 @@
 require('./error-navitem.less');
 const React = require('react');
 const Nav = require('naturalcrit/nav/nav.jsx');
-const createClass = require('create-react-class');
 
-const ErrorNavItem = createClass({
+const ErrorNavItem = ({error = '', clearError})=>{
-	getDefaultProps : function() {
+	const response    = error.response;
-		return {
+	const errorCode   = error.code
-			error  : '',
+	const status      = response?.status;
-			parent : null
+	const HBErrorCode = response?.body?.HBErrorCode;
-		};
+	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);
-		};
 
-		const error       = this.props.error;
+	let errMsg = '';
-		const response    = error.response;
+	try {
-		const status      = response?.status;
+		errMsg += `${error.toString()}\n\n`;
-		const errorCode   = error.code
+		errMsg += `\`\`\`\n${error.stack}\n`;
-		const HBErrorCode = response?.body?.HBErrorCode;
+		errMsg += `${JSON.stringify(response?.error, null, '  ')}\n\`\`\``;
-		const message     = response?.body?.message;
+		console.log(errMsg);
-		let errMsg = '';
+	} catch (e){}
-		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) {
-			return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
-				Oops!
-				<div className='errorContainer' onClick={clearError}>
-					{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>;
-		}
-
-		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(status === 409) {
 		return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
 			Oops!
-			<div className='errorContainer'>
+			<div className='errorContainer' onClick={clearError}>
-				Looks like there was a problem saving. <br />
+				{message ?? 'Conflict: please refresh to get latest changes'}
-				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>;
 	}
-});
+
+	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>;
+	}
+
+	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>;
+	}
+
+	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,33 +5,45 @@ 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) {
+		if(!file) return;
-			const reader = new FileReader();
+
-			reader.onload = (e)=>{
+		const currentNew = localStorage.getItem(BREWKEY);
-				const fileContent = e.target.result;
+		if(currentNew && !confirm(
-				const newBrew = {
+			`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?`
-					text  : fileContent,
+		)) return;
-					style : ''
+
-				};
+		const reader = new FileReader();
-				if(fileContent.startsWith('```metadata')) {
+		reader.onload = (e)=>{
-					splitTextStyleAndMetadata(newBrew); // Modify newBrew directly
+			const fileContent = e.target.result;
-					localStorage.setItem(BREWKEY, newBrew.text);
+			const newBrew = { text: fileContent, style: '' };
-					localStorage.setItem(STYLEKEY, newBrew.style);
+
-					localStorage.setItem(METAKEY, JSON.stringify(_.pick(newBrew, ['title', 'description', 'tags', 'systems', 'renderer', 'theme', 'lang'])));
+			if(fileContent.startsWith('```metadata')) {
-					window.location.href = '/new';
+				splitTextStyleAndMetadata(newBrew);
-				} else {
+				localStorage.setItem(BREWKEY, newBrew.text);
-					alert('This file is invalid, please, enter a valid file');
+				localStorage.setItem(STYLEKEY, newBrew.style);
-				}
+				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/pages/basePages/uiPage/uiPage.less

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

client/homebrew/pages/editPage/editPage.jsx

@@ -21,7 +21,7 @@ const Account = require('../../navbar/account.navitem.jsx');
 const RecentNavItem = require('../../navbar/recent.navitem.jsx').both;
 const VaultNavItem = require('../../navbar/vault.navitem.jsx');
 
-const SplitPane = require('naturalcrit/splitPane/splitPane.jsx');
+const SplitPane = require('client/components/splitPane/splitPane.jsx');
 const Editor = require('../../editor/editor.jsx');
 const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
 
@@ -97,7 +97,7 @@ const EditPage = createClass({
 			htmlErrors : Markdown.validate(prevState.brew.text)
 		}));
 
-		fetchThemeBundle(this, this.props.brew.renderer, this.props.brew.theme);
+		fetchThemeBundle((err)=>{this.setState({ error: err })}, (theme)=>{this.setState({ themeBundle: theme })}, this.props.brew.renderer, this.props.brew.theme);
 
 		document.addEventListener('keydown', this.handleControlKeys);
 	},
@@ -173,7 +173,7 @@ const EditPage = createClass({
 
 	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);
+			fetchThemeBundle((err)=>{this.setState({ error: err })}, (theme)=>{this.setState({ themeBundle: theme })}, metadata.renderer, metadata.theme);
 
 		this.setState((prevState)=>({
 			brew : {
@@ -266,7 +266,7 @@ const EditPage = createClass({
 		brew.text           = brew.text.normalize('NFC');
 		this.savedBrew.text = this.savedBrew.text.normalize('NFC');
 		brew.pageCount      = ((brew.renderer=='legacy' ? brew.text.match(/\\page/g) : brew.text.match(/^\\page$/gm)) || []).length + 1;
-		brew.patches        = stringifyPatches(makePatches(this.savedBrew.text, brew.text));
+		brew.patches        = stringifyPatches(makePatches(encodeURI(this.savedBrew.text), encodeURI(brew.text)));
 		brew.hash           = await md5(this.savedBrew.text);
 		//brew.text           = undefined; - Temporary parallel path
 		brew.textBin        = undefined;
@@ -438,6 +438,13 @@ const EditPage = createClass({
 		return `https://www.reddit.com/r/UnearthedArcana/submit?title=${encodeURIComponent(title.toWellFormed())}&text=${encodeURIComponent(text)}`;
 	},
 
+	clearError : function(){
+		setState({
+			error    : null,
+			isSaving : false
+		})
+	},
+
 	renderNavbar : function(){
 		const shareLink = this.processShareId();
 
@@ -449,7 +456,7 @@ const EditPage = createClass({
 			<Nav.section>
 				{this.renderGoogleDriveIcon()}
 				{this.state.error ?
-					<ErrorNavItem error={this.state.error} parent={this}></ErrorNavItem> :
+					<ErrorNavItem error={this.state.error} clearError={this.clearError}></ErrorNavItem> :
 					<Nav.dropdown className='save-menu'>
 						{this.renderSaveButton()}
 						{this.renderAutoSaveButton()}

client/homebrew/pages/homePage/homePage.jsx

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

client/homebrew/pages/sharePage/sharePage.jsx

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

client/homebrew/pages/userPage/userPage.jsx

@@ -39,10 +39,14 @@ const UserPage = (props)=>{
 		}] : [])
 	];
 
+	const clearError = ()=>{
+		setError(null);
+	};
+
 	const navItems = (
 		<Navbar>
 			<Nav.section>
-				{error && (<ErrorNavItem error={error} parent={null}></ErrorNavItem>)}
+				{error && (<ErrorNavItem error={error} clearError={clearError}></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('../../../../shared/naturalcrit/splitPane/splitPane.jsx');
+const SplitPane     = require('client/components/splitPane/splitPane.jsx');
 const ErrorIndex    = require('../errorPage/errors/errorIndex.js');
 
 import request from '../../utils/request-middleware.js';

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

@@ -0,0 +1,74 @@
+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

@@ -136,19 +136,19 @@
     "written-number": "^0.11.1"
   },
   "devDependencies": {
-    "@stylistic/stylelint-plugin": "^3.1.3",
+    "@stylistic/stylelint-plugin": "^4.0.0",
     "babel-plugin-transform-import-meta": "^2.3.3",
-    "eslint": "^9.31.0",
+    "eslint": "^9.34.0",
     "eslint-plugin-jest": "^29.0.1",
     "eslint-plugin-react": "^7.37.5",
     "globals": "^16.3.0",
-    "jest": "^30.0.4",
+    "jest": "^30.0.5",
     "jest-expect-message": "^1.1.3",
     "jsdom-global": "^3.0.2",
     "postcss-less": "^6.0.0",
-    "stylelint": "^16.21.1",
+    "stylelint": "^16.23.1",
-    "stylelint-config-recess-order": "^7.1.0",
+    "stylelint-config-recess-order": "^7.2.0",
-    "stylelint-config-recommended": "^16.0.0",
+    "stylelint-config-recommended": "^17.0.0",
-    "supertest": "^7.1.3"
+    "supertest": "^7.1.4"
   }
 }

server/app.js

@@ -383,6 +383,7 @@ 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'
 	};
 
@@ -486,8 +487,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 = applyPatches(patches, brewFromServer.text, { allowExceedingIndices: true })[0];
+			const patchedResult = decodeURI(applyPatches(patches, encodeURI(brewFromServer.text))[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,27 +116,21 @@ const printCurrentBrew = ()=>{
 	}
 };
 
-const fetchThemeBundle = async (obj, renderer, theme)=>{
+const fetchThemeBundle = async (setError, setThemeBundle, renderer, theme)=>{
 	if(!renderer || !theme) return;
 	const res = await request
 			.get(`/api/theme/${renderer}/${theme}`)
 			.catch((err)=>{
-				obj.setState({ error: err });
+				setError(err)
 			});
 	if(!res) {
-		obj.setState((prevState)=>({
+		setThemeBundle({});
-			...prevState,
-			themeBundle : {}
-		}));
 		return;
 	}
 	const themeBundle = res.body;
 	themeBundle.joinedStyles = themeBundle.styles.map((style)=>`<style>${style}</style>`).join('\n\n');
-	obj.setState((prevState)=>({
+	setThemeBundle(themeBundle);
-		...prevState,
+	setError(null);
-		themeBundle : themeBundle,
-		error       : null
-	}));
 };
 
 const debugTextMismatch = (clientTextRaw, serverTextRaw, label) => {