Merge pull request #3796 from naturalcrit/FixGoogleLinksinUserPage

Fix links to google drive files in user page
User page was not marking Google Brews as "stubbed" if the brew belongs to another users' Google Drive or your own credentials are expired (it searches the current user drive for google files and checks if those are stubbed) This now sets *every* file found on Mongo as "Stubbed", whether the Drive file belongs to the current user or not.
2026-01-25 11:53:02 +00:00 · 2024-10-06 15:52:29 -04:00 · 2024-10-06 15:48:10 -04:00 · 2024-10-06 00:05:12 -04:00 · 2024-10-01 22:25:17 -04:00 · 2024-10-01 15:06:11 -04:00
42 changed files with 1198 additions and 1885 deletions
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,36 +0,0 @@
-<!--
-     Before submitting a Pull Request, please consider the following to speed up reviews:
-     - 👷‍♀️ Create small PRs. Large PRs can usually be broken down into incremental PRs.
-     - 🚩 Do you already have several open PRs? Consider finishing or asking for help with existing PRs first.
-     - 🔧 Does your PR reference a discussed and approved issue, especially for personal or edge-case requests?
-     - 💡 Is the solution agreed upon? Save rework time by discussing strategy before coding.
-->
-
-## Description
-
-
-## Related Issues or Discussions
-
- Closes #
-
-## QA Instructions, Screenshots, Recordings
-
-_Please replace this line with instructions on how to test or view your changes, as well as any before/after
-images for UI changes._
-
-### Reviewer Checklist
-
-_Please replace the list below with specific features you want reviewers to look at._
-
-*Reviewers, refer to this list when testing features, or suggest new items *
- [ ] Verify new features are functional
-  - [ ] Feature A does X
-  - [ ] Feature B does Y
- [ ] Verify old features have not broken
-  - [ ] Feature Z can still be used
- [ ] Test for edge cases / try to break things
-  - [ ] Feature A handles negative numbers
- [ ] Identify opportunities for simplification and refactoring
- [ ] Check for code legibility and appropriate comments
-
-<details><summary>Copy this list</summary>
--- a/client/homebrew/brewRenderer/brewRenderer.jsx
+++ b/client/homebrew/brewRenderer/brewRenderer.jsx
@@ -1,7 +1,7 @@
 /*eslint max-lines: ["warn", {"max": 300, "skipBlankLines": true, "skipComments": true}]*/
 require('./brewRenderer.less');
 const React = require('react');
-const { useState, useRef, useEffect, useCallback } = React;
+const { useState, useRef, useEffect } = React;
 const _ = require('lodash');

 const MarkdownLegacy = require('naturalcrit/markdownLegacy.js');
@@ -49,25 +49,23 @@ let rawPages      = [];

 const BrewRenderer = (props)=>{
 	props = {
-		text                       : '',
-		style                      : '',
-		renderer                   : 'legacy',
-		theme                      : '5ePHB',
-		lang                       : '',
-		errors                     : [],
-		currentEditorCursorPageNum : 1,
-		currentEditorViewPageNum   : 1,
-		currentBrewRendererPageNum : 1,
-		themeBundle                : {},
-		onPageChange               : ()=>{},
+		text              : '',
+		style             : '',
+		renderer          : 'legacy',
+		theme             : '5ePHB',
+		lang              : '',
+		errors            : [],
+		currentEditorPage : 0,
+		themeBundle       : {},
 		...props
 	};

 	const [state, setState] = useState({
-		height     : PAGE_HEIGHT,
-		isMounted  : false,
-		visibility : 'hidden',
-		zoom       : 100
+		height            : PAGE_HEIGHT,
+		isMounted         : false,
+		visibility        : 'hidden',
+		zoom              : 100,
+		currentPageNumber : 1,
 	});

 	const mainRef  = useRef(null);
@@ -89,22 +87,25 @@ const BrewRenderer = (props)=>{
 		}));
 	};

-	const updateCurrentPage = useCallback(_.throttle((e)=>{
+	const getCurrentPage = (e)=>{
 		const { scrollTop, clientHeight, scrollHeight } = e.target;
 		const totalScrollableHeight = scrollHeight - clientHeight;
-		const currentPageNumber = Math.max(Math.ceil((scrollTop / totalScrollableHeight) * rawPages.length), 1);
+		const currentPageNumber = Math.ceil((scrollTop / totalScrollableHeight) * rawPages.length);

-		props.onPageChange(currentPageNumber);
-	}, 200), []);
+		setState((prevState)=>({
+			...prevState,
+			currentPageNumber : currentPageNumber || 1
+		}));
+	};

 	const isInView = (index)=>{
 		if(!state.isMounted)
 			return false;

-		if(index == props.currentEditorCursorPageNum - 1)	//Already rendered before this step
+		if(index == props.currentEditorPage)	//Already rendered before this step
 			return false;

-		if(Math.abs(index - props.currentBrewRendererPageNum - 1) <= 3)
+		if(Math.abs(index - state.currentPageNumber) <= 3)
 			return true;

 		return false;
@@ -141,7 +142,7 @@ const BrewRenderer = (props)=>{
 			renderedPages.length = 0;

 		// Render currently-edited page first so cross-page effects (variables, links) can propagate out first
-		renderedPages[props.currentEditorCursorPageNum - 1] = renderPage(rawPages[props.currentEditorCursorPageNum - 1], props.currentEditorCursorPageNum - 1);
+		renderedPages[props.currentEditorPage] = renderPage(rawPages[props.currentEditorPage], props.currentEditorPage);

 		_.forEach(rawPages, (page, index)=>{
 			if((isInView(index) || !renderedPages[index]) && typeof window !== 'undefined'){
@@ -191,7 +192,7 @@ const BrewRenderer = (props)=>{
 		<>
 			{/*render dummy page while iFrame is mounting.*/}
 			{!state.isMounted
-				? <div className='brewRenderer' onScroll={updateCurrentPage}>
+				? <div className='brewRenderer' onScroll={getCurrentPage}>
 					<div className='pages'>
 						{renderDummyPage(1)}
 					</div>
@@ -204,7 +205,7 @@ const BrewRenderer = (props)=>{
 				<NotificationPopup />
 			</div>

-			<ToolBar onZoomChange={handleZoom} currentPage={props.currentBrewRendererPageNum}  totalPages={rawPages.length}/>
+			<ToolBar onZoomChange={handleZoom} currentPage={state.currentPageNumber}  totalPages={rawPages.length}/>

 			{/*render in iFrame so broken code doesn't crash the site.*/}
 			<Frame id='BrewRenderer' initialContent={INITIAL_CONTENT}
@@ -213,7 +214,7 @@ const BrewRenderer = (props)=>{
 				onClick={()=>{emitClick();}}
 			>
 				<div className={'brewRenderer'}
-					onScroll={updateCurrentPage}
+					onScroll={getCurrentPage}
 					onKeyDown={handleControlKeys}
 					tabIndex={-1}
 					style={{ height: state.height }}>
--- a/client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx
+++ b/client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx
@@ -4,7 +4,7 @@ const _     = require('lodash');

 import Dialog from '../../../components/dialog.jsx';

-const DISMISS_KEY = 'dismiss_notification04-09-24';
+const DISMISS_KEY = 'dismiss_notification01-10-24';
 const DISMISS_BUTTON = <i className='fas fa-times dismiss' />;

 const NotificationPopup = ()=>{
@@ -15,9 +15,37 @@ const NotificationPopup = ()=>{
 			<small>This website is always improving and we are still adding new features and squashing bugs. Keep the following in mind:</small>
 		</div>
 		<ul>
+			<li key='ThrottlingError' style={{
+					backgroundColor: '#910000',
+					margin: '-10px -10px -10px -20px',
+					padding: '10px 10px 10px 20px',
+					fontSize: '1.0em'
+				}}>
+				<em>Known issue with saving/creating Google Drive files</em><br />
+				Dear users. The <a href="https://github.com/naturalcrit/homebrewery/issues/3770">
+				issue with saving to Google Drive</a> has resurfaced as of Oct 1, 2024 22:00 UTC.
+				<br></br><br></br>
+				Earlier we submitted a bug report to Google and have all but confirmed the issue
+				lies on Google's end and the disruption has been affecting multiple other
+				organizations besides us. Unfortunately, it means reliable interaction with
+				Google remains out of our control until they can resolve their issue.
+				<br></br><br></br>
+				Brews saved to Google Drive are <em>not lost</em> and can still be viewed, just not updated.
+				You can also access them via your Google Drive interface in the <code>/Hombrewery</code> folder.
+				<br></br><br></br>
+				If you need to urgently edit documents, you can detatch them from your Google Drive
+				by transferring them to our Homebrewery storage. To do this, click the colored Google Drive
+				icon next to the save button when on an edit page; you can transfer them back later,
+				but this should allow you to edit while this issue is ongoing.
+				<br></br><br></br>
+				If you are experiencing errors creating new documents, you can similarly change your
+				account settings to create new brews by default in the Homebrewery storage. Click
+				your username and then "account", then change the "default save location".
+			</li>
+
 			<li key='Vault'>
 				<em>Search brews with our new page!</em><br />
-				We have been working very hard in making this possible, now you can share your work and look at it in the new <a href='/vault'>Vault</a> page!
+				We have been working very hard in making this possible, now you can share your work and look at it in the new <a href="/vault">Vault</a> page!
 				All PUBLISHED brews will be available to anyone searching there, by title or author, and filtering by renderer.

 				More features will be coming.
--- a/client/homebrew/brewRenderer/toolBar/toolBar.jsx
+++ b/client/homebrew/brewRenderer/toolBar/toolBar.jsx
@@ -11,7 +11,6 @@ const ToolBar = ({ onZoomChange, currentPage, onPageChange, totalPages })=>{

 	const [zoomLevel, setZoomLevel] = useState(100);
 	const [pageNum, setPageNum]     = useState(currentPage);
-	const [toolsVisible, setToolsVisible] = useState(true);

 	useEffect(()=>{
 		onZoomChange(zoomLevel);
@@ -56,7 +55,7 @@ const ToolBar = ({ onZoomChange, currentPage, onPageChange, totalPages })=>{

 		} else if(mode == 'fit'){
 			// find the page with the largest single dim (height or width) so that zoom can be adapted to fit it.
-			const minDimRatio = [...pages].reduce((minRatio, page)=>Math.min(minRatio, iframeWidth / page.offsetWidth, iframeHeight / page.offsetHeight), Infinity);
+			const minDimRatio = [...pages].reduce((minRatio, page) => Math.min(minRatio, iframeWidth / page.offsetWidth, iframeHeight / page.offsetHeight), Infinity);

 			desiredZoom = minDimRatio * 100;
 		}
@@ -68,8 +67,7 @@ const ToolBar = ({ onZoomChange, currentPage, onPageChange, totalPages })=>{
 	};

 	return (
-		<div className={`toolBar ${toolsVisible ? 'visible' : 'hidden'}`}>
-			<button className='toggleButton' title={`${toolsVisible ? 'Hide' : 'Show'} Preview Toolbar`} onClick={()=>{setToolsVisible(!toolsVisible);}}><i className='fas fa-glasses' /></button>
+		<div className='toolBar'>
 			{/*v=====----------------------< Zoom Controls >---------------------=====v*/}
 			<div className='group'>
 				<button
--- a/client/homebrew/brewRenderer/toolBar/toolBar.less
+++ b/client/homebrew/brewRenderer/toolBar/toolBar.less
@@ -15,10 +15,6 @@
 	font-family      : 'Open Sans', sans-serif;
 	color            : #CCCCCC;
 	background-color : #555555;
-	& > *:not(.toggleButton) {
-		opacity: 1;
-		transition: all .2s ease;
-	}

 	.group {
 		box-sizing       : border-box;
@@ -104,25 +100,4 @@
 			font-size:1.2em;
 		}
 	}
-
-	&.hidden {
-		width: 32px;
-		transition: all .3s ease;
-		flex-wrap:nowrap;
-		overflow: hidden;
-		background-color: unset;
-		opacity: .5;
-		& > *:not(.toggleButton) {
-			opacity: 0;
-			transition: all .2s ease;
-		}
-	}
-}
-
-button.toggleButton {
-	z-index : 5;
-	position:absolute;
-	left: 0;
-	width: 32px;
-	min-width: unset;
 }
--- a/client/homebrew/editor/editor.jsx
+++ b/client/homebrew/editor/editor.jsx
@@ -1,8 +1,9 @@
-/*eslint max-lines: ["warn", {"max": 500, "skipBlankLines": true, "skipComments": true}]*/
+/*eslint max-lines: ["warn", {"max": 300, "skipBlankLines": true, "skipComments": true}]*/
 require('./editor.less');
 const React = require('react');
 const createClass = require('create-react-class');
 const _ = require('lodash');
+const cx = require('classnames');
 const dedent = require('dedent-tabs').default;
 const Markdown = require('../../../shared/naturalcrit/markdown.js');

@@ -21,7 +22,6 @@ const DEFAULT_STYLE_TEXT = dedent`
 					color: black;
 				}`;

-let isJumping = false;

 const Editor = createClass({
 	displayName     : 'Editor',
@@ -37,15 +37,8 @@ const Editor = createClass({
 			onMetaChange  : ()=>{},
 			reportError   : ()=>{},

-			onCursorPageChange : ()=>{},
-			onViewPageChange   : ()=>{},
-
 			editorTheme : 'default',
-			renderer    : 'legacy',
-
-			currentEditorCursorPageNum : 1,
-			currentEditorViewPageNum   : 1,
-			currentBrewRendererPageNum : 1,
+			renderer    : 'legacy'
 		};
 	},
 	getInitialState : function() {
@@ -63,16 +56,12 @@ const Editor = createClass({
 	isMeta  : function() {return this.state.view == 'meta';},

 	componentDidMount : function() {
-
 		this.updateEditorSize();
 		this.highlightCustomMarkdown();
 		window.addEventListener('resize', this.updateEditorSize);
 		document.getElementById('BrewRenderer').addEventListener('keydown', this.handleControlKeys);
 		document.addEventListener('keydown', this.handleControlKeys);

-		this.codeEditor.current.codeMirror.on('cursorActivity', (cm)=>{this.updateCurrentCursorPage(cm.getCursor());});
-		this.codeEditor.current.codeMirror.on('scroll', _.throttle(()=>{this.updateCurrentViewPage(this.codeEditor.current.getTopVisibleLine());}, 200));
-
 		const editorTheme = window.localStorage.getItem(EDITOR_THEME_KEY);
 		if(editorTheme) {
 			this.setState({
@@ -86,37 +75,28 @@ const Editor = createClass({
 	},

 	componentDidUpdate : function(prevProps, prevState, snapshot) {
-
 		this.highlightCustomMarkdown();
-		if(prevProps.moveBrew !== this.props.moveBrew)
+		if(prevProps.moveBrew !== this.props.moveBrew) {
 			this.brewJump();
-
-		if(prevProps.moveSource !== this.props.moveSource)
+		};
+		if(prevProps.moveSource !== this.props.moveSource) {
 			this.sourceJump();
-
-		if(this.props.liveScroll) {
-			if(prevProps.currentBrewRendererPageNum !== this.props.currentBrewRendererPageNum) {
-				this.sourceJump(this.props.currentBrewRendererPageNum, false);
-			} else if(prevProps.currentEditorViewPageNum !== this.props.currentEditorViewPageNum) {
-				this.brewJump(this.props.currentEditorViewPageNum, false);
-			} else if(prevProps.currentEditorCursorPageNum !== this.props.currentEditorCursorPageNum) {
-				this.brewJump(this.props.currentEditorCursorPageNum, false);
-			}
-		}
+		};
 	},

 	handleControlKeys : function(e){
-		if(!(e.ctrlKey && e.metaKey && e.shiftKey)) return;
+		if(!(e.ctrlKey && e.metaKey)) return;
 		const LEFTARROW_KEY = 37;
 		const RIGHTARROW_KEY = 39;
-		if(e.keyCode == RIGHTARROW_KEY) this.brewJump();
-		if(e.keyCode == LEFTARROW_KEY) this.sourceJump();
-		if(e.keyCode == LEFTARROW_KEY || e.keyCode == RIGHTARROW_KEY) {
+		if (e.shiftKey && (e.keyCode == RIGHTARROW_KEY)) this.brewJump();
+		if (e.shiftKey && (e.keyCode == LEFTARROW_KEY)) this.sourceJump();
+		if ((e.keyCode == LEFTARROW_KEY) || (e.keyCode == RIGHTARROW_KEY)) {
 			e.stopPropagation();
 			e.preventDefault();
 		}
 	},

+
 	updateEditorSize : function() {
 		if(this.codeEditor.current) {
 			let paneHeight = this.editor.current.parentNode.clientHeight;
@@ -125,20 +105,6 @@ const Editor = createClass({
 		}
 	},

-	updateCurrentCursorPage : function(cursor) {
-		const lines = this.props.brew.text.split('\n').slice(0, cursor.line + 1);
-		const pageRegex = this.props.brew.renderer == 'V3' ? /^\\page$/ : /\\page/;
-		const currentPage = lines.reduce((count, line)=>count + (pageRegex.test(line) ? 1 : 0), 1);
-		this.props.onCursorPageChange(currentPage);
-	},
-
-	updateCurrentViewPage : function(topScrollLine) {
-		const lines = this.props.brew.text.split('\n').slice(0, topScrollLine + 1);
-		const pageRegex = this.props.brew.renderer == 'V3' ? /^\\page$/ : /\\page/;
-		const currentPage = lines.reduce((count, line)=>count + (pageRegex.test(line) ? 1 : 0), 1);
-		this.props.onViewPageChange(currentPage);
-	},
-
 	handleInject : function(injectText){
 		this.codeEditor.current?.injectText(injectText, false);
 	},
@@ -153,6 +119,18 @@ const Editor = createClass({
 		});	//TODO: not sure if updateeditorsize needed
 	},

+	getCurrentPage : function(){
+		const lines = this.props.brew.text.split('\n').slice(0, this.codeEditor.current.getCursorPosition().line + 1);
+		return _.reduce(lines, (r, line)=>{
+			if(
+				(this.props.renderer == 'legacy' && line.indexOf('\\page') !== -1)
+				||
+				(this.props.renderer == 'V3' && line.match(/^\\page$/))
+			) r++;
+			return r;
+		}, 1);
+	},
+
 	highlightCustomMarkdown : function(){
 		if(!this.codeEditor.current) return;
 		if(this.state.view === 'text')  {
@@ -161,13 +139,13 @@ const Editor = createClass({
 			codeMirror.operation(()=>{ // Batch CodeMirror styling

 				const foldLines = [];
-
+        
 				//reset custom text styles
 				const customHighlights = codeMirror.getAllMarks().filter((mark)=>{
 					// Record details of folded sections
 					if(mark.__isFold) {
 						const fold = mark.find();
-						foldLines.push({ from: fold.from?.line, to: fold.to?.line });
+						foldLines.push({from: fold.from?.line, to: fold.to?.line});
 					}
 					return !mark.__isFold;
 				}); //Don't undo code folding
@@ -185,7 +163,7 @@ const Editor = createClass({

 					// Don't process lines inside folded text
 					// If the current lineNumber is inside any folded marks, skip line styling
-					if(foldLines.some((fold)=>lineNumber >= fold.from && lineNumber <= fold.to))
+					if (foldLines.some(fold => lineNumber >= fold.from && lineNumber <= fold.to))
 						return;

 					// Styling for \page breaks
@@ -211,7 +189,7 @@ const Editor = createClass({

 						// definition lists
 						if(line.includes('::')){
-							if(/^:*$/.test(line) == true){ return; };
+							if(/^:*$/.test(line) == true){ return };
 							const regex = /^([^\n]*?:?\s?)(::[^\n]*)(?:\n|$)/ymd;  // the `d` flag, for match indices, throws an ESLint error.
 							let match;
 							while ((match = regex.exec(line)) != null){
@@ -219,10 +197,10 @@ const Editor = createClass({
 								codeMirror.markText({ line: lineNumber, ch: match.indices[1][0] }, { line: lineNumber, ch: match.indices[1][1] }, { className: 'dt-highlight' });
 								codeMirror.markText({ line: lineNumber, ch: match.indices[2][0] }, { line: lineNumber, ch: match.indices[2][1] }, { className: 'dd-highlight' });
 								const ddIndex = match.indices[2][0];
-								const colons = /::/g;
-								const colonMatches = colons.exec(match[2]);
+								let colons = /::/g;
+								let colonMatches = colons.exec(match[2]);
 								if(colonMatches !== null){
-									codeMirror.markText({ line: lineNumber, ch: colonMatches.index + ddIndex }, { line: lineNumber, ch: colonMatches.index + colonMatches[0].length + ddIndex }, { className: 'dl-colon-highlight' });
+									codeMirror.markText({ line: lineNumber, ch: colonMatches.index + ddIndex }, { line: lineNumber, ch: colonMatches.index + colonMatches[0].length + ddIndex }, { className: 'dl-colon-highlight'} )
 								}
 							}
 						}
@@ -232,12 +210,12 @@ const Editor = createClass({
 							let startIndex = line.indexOf('^');
 							const superRegex = /\^(?!\s)(?=([^\n\^]*[^\s\^]))\1\^/gy;
 							const subRegex   = /\^\^(?!\s)(?=([^\n\^]*[^\s\^]))\1\^\^/gy;
-
+							
 							while (startIndex >= 0) {
 								superRegex.lastIndex = subRegex.lastIndex = startIndex;
 								let isSuper = false;
-								const match = subRegex.exec(line) || superRegex.exec(line);
-								if(match) {
+								let match = subRegex.exec(line) || superRegex.exec(line);
+								if (match) {
 									isSuper = !subRegex.lastIndex;
 									codeMirror.markText({ line: lineNumber, ch: match.index }, { line: lineNumber, ch: match.index + match[0].length }, { className: isSuper ? 'superscript' : 'subscript' });
 								}
@@ -287,18 +265,18 @@ const Editor = createClass({

 							while (startIndex >= 0) {
 								emojiRegex.lastIndex = startIndex;
-								const match = emojiRegex.exec(line);
-								if(match) {
+								let match = emojiRegex.exec(line);
+								if (match) {
 									let tokens = Markdown.marked.lexer(match[0]);
-									tokens = tokens[0].tokens.filter((t)=>t.type == 'emoji');
-									if(!tokens.length)
+									tokens = tokens[0].tokens.filter(t => t.type == 'emoji')
+									if (!tokens.length)
 										return;

-									const startPos = { line: lineNumber, ch: match.index };
-									const endPos   = { line: lineNumber, ch: match.index + match[0].length };
+									let startPos = { line: lineNumber, ch: match.index };
+									let endPos   = { line: lineNumber, ch: match.index + match[0].length };

 									// Iterate over conflicting marks and clear them
-									const marks = codeMirror.findMarks(startPos, endPos);
+									var marks = codeMirror.findMarks(startPos, endPos);
 									marks.forEach(function(marker) {
 										if(!marker.__isFold) marker.clear();
 									});
@@ -313,93 +291,75 @@ const Editor = createClass({
 		}
 	},

-	brewJump : function(targetPage=this.props.currentEditorCursorPageNum, smooth=true){
-		if(!window || isJumping)
-			return;
-
-		// Get current brewRenderer scroll position and calculate target position
+	brewJump : function(targetPage=this.getCurrentPage()){
+		if(!window) return;
+		// console.log(`Scroll to: p${targetPage}`);
 		const brewRenderer = window.frames['BrewRenderer'].contentDocument.getElementsByClassName('brewRenderer')[0];
 		const currentPos = brewRenderer.scrollTop;
 		const targetPos = window.frames['BrewRenderer'].contentDocument.getElementById(`p${targetPage}`).getBoundingClientRect().top;
+		const interimPos = targetPos >= 0 ? -30 : 30;

-		const checkIfScrollComplete = ()=>{
-			let scrollingTimeout;
-			clearTimeout(scrollingTimeout); // Reset the timer every time a scroll event occurs
-			scrollingTimeout = setTimeout(()=>{
-				isJumping = false;
-				brewRenderer.removeEventListener('scroll', checkIfScrollComplete);
-			}, 150);	// If 150 ms pass without a brewRenderer scroll event, assume scrolling is done
+		const bounceDelay = 100;
+		const scrollDelay = 500;
+
+		if(!this.throttleBrewMove) {
+			this.throttleBrewMove = _.throttle((currentPos, interimPos, targetPos)=>{
+				brewRenderer.scrollTo({ top: currentPos + interimPos, behavior: 'smooth' });
+				setTimeout(()=>{
+					brewRenderer.scrollTo({ top: currentPos + targetPos, behavior: 'smooth', block: 'start' });
+				}, bounceDelay);
+			}, scrollDelay, { leading: true, trailing: false });
 		};
+		this.throttleBrewMove(currentPos, interimPos, targetPos);

-		isJumping = true;
-		checkIfScrollComplete();
-		brewRenderer.addEventListener('scroll', checkIfScrollComplete);
-
-		if(smooth) {
-			const bouncePos   = targetPos >= 0 ? -30 : 30; //Do a little bounce before scrolling
-			const bounceDelay = 100;
-			const scrollDelay = 500;
-
-			if(!this.throttleBrewMove) {
-				this.throttleBrewMove = _.throttle((currentPos, bouncePos, targetPos)=>{
-					brewRenderer.scrollTo({ top: currentPos + bouncePos, behavior: 'smooth' });
-					setTimeout(()=>{
-						brewRenderer.scrollTo({ top: currentPos + targetPos, behavior: 'smooth', block: 'start' });
-					}, bounceDelay);
-				}, scrollDelay, { leading: true, trailing: false });
-			};
-			this.throttleBrewMove(currentPos, bouncePos, targetPos);
-		} else {
-			brewRenderer.scrollTo({ top: currentPos + targetPos, behavior: 'instant', block: 'start' });
-		}
+		// const hashPage = (page != 1) ? `p${page}` : '';
+		// window.location.hash = hashPage;
 	},

-	sourceJump : function(targetPage=this.props.currentBrewRendererPageNum, smooth=true){
-		if(!this.isText || isJumping)
-			return;
+	sourceJump : function(targetLine=null){
+		if(this.isText()) {
+			if(targetLine == null) {
+				targetLine = 0;

-		const textSplit  = this.props.renderer == 'V3' ? /^\\page$/gm : /\\page/;
-		const textString = this.props.brew.text.split(textSplit).slice(0, targetPage-1).join(textSplit);
-		const targetLine = textString.match('\n') ? textString.split('\n').length - 1 : -1;
+				const pageCollection = window.frames['BrewRenderer'].contentDocument.getElementsByClassName('page');
+				const brewRendererHeight = window.frames['BrewRenderer'].contentDocument.getElementsByClassName('brewRenderer').item(0).getBoundingClientRect().height;

-		let currentY = this.codeEditor.current.codeMirror.getScrollInfo().top;
-		let targetY  = this.codeEditor.current.codeMirror.heightAtLine(targetLine, 'local', true);
-
-		const checkIfScrollComplete = ()=>{
-			let scrollingTimeout;
-			clearTimeout(scrollingTimeout); // Reset the timer every time a scroll event occurs
-			scrollingTimeout = setTimeout(()=>{
-				isJumping = false;
-				this.codeEditor.current.codeMirror.off('scroll', checkIfScrollComplete);
-			}, 150); // If 150 ms pass without a scroll event, assume scrolling is done
-		};
-
-		isJumping = true;
-		checkIfScrollComplete();
-		this.codeEditor.current.codeMirror.on('scroll', checkIfScrollComplete);
-
-		if(smooth) {
-			//Scroll 1/10 of the way every 10ms until 1px off.
-			const incrementalScroll = setInterval(()=>{
-				currentY += (targetY - currentY) / 10;
-				this.codeEditor.current.codeMirror.scrollTo(null, currentY);
-
-				// Update target: target height is not accurate until within +-10 lines of the visible window
-				if(Math.abs(targetY - currentY > 100))
-					targetY = this.codeEditor.current.codeMirror.heightAtLine(targetLine, 'local', true);
-
-				// End when close enough
-				if(Math.abs(targetY - currentY) < 1) {
-					this.codeEditor.current.codeMirror.scrollTo(null, targetY);  // Scroll any remaining difference
-					this.codeEditor.current.setCursorPosition({ line: targetLine + 1, ch: 0 });
-					this.codeEditor.current.codeMirror.addLineClass(targetLine + 1, 'wrap', 'sourceMoveFlash');
-					clearInterval(incrementalScroll);
+				let currentPage = 1;
+				for (const page of pageCollection) {
+					if(page.getBoundingClientRect().bottom > (brewRendererHeight / 2)) {
+						currentPage = parseInt(page.id.slice(1)) || 1;
+						break;
+					}
 				}
-			}, 10);
-		} else {
-			this.codeEditor.current.codeMirror.scrollTo(null, targetY);  // Scroll any remaining difference
-			this.codeEditor.current.setCursorPosition({ line: targetLine + 1, ch: 0 });
-			this.codeEditor.current.codeMirror.addLineClass(targetLine + 1, 'wrap', 'sourceMoveFlash');
+
+				const textSplit = this.props.renderer == 'V3' ? /^\\page$/gm : /\\page/;
+				const textString = this.props.brew.text.split(textSplit).slice(0, currentPage-1).join(textSplit);
+				const textPosition = textString.length;
+				const lineCount = textString.match('\n') ? textString.slice(0, textPosition).split('\n').length : 0;
+
+				targetLine = lineCount - 1; //Scroll to `\page`, which is one line back.
+
+				let currentY = this.codeEditor.current.codeMirror.getScrollInfo().top;
+				let targetY  = this.codeEditor.current.codeMirror.heightAtLine(targetLine, 'local', true);
+
+				//Scroll 1/10 of the way every 10ms until 1px off.
+				const incrementalScroll = setInterval(()=>{
+					currentY += (targetY - currentY) / 10;
+					this.codeEditor.current.codeMirror.scrollTo(null, currentY);
+
+					// Update target: target height is not accurate until within +-10 lines of the visible window
+					if(Math.abs(targetY - currentY > 100))
+						targetY = this.codeEditor.current.codeMirror.heightAtLine(targetLine, 'local', true);
+
+					// End when close enough
+					if(Math.abs(targetY - currentY) < 1) {
+						this.codeEditor.current.codeMirror.scrollTo(null, targetY);  // Scroll any remaining difference
+						this.codeEditor.current.setCursorPosition({ line: targetLine + 1, ch: 0 });
+						this.codeEditor.current.codeMirror.addLineClass(targetLine + 1, 'wrap', 'sourceMoveFlash');
+						clearInterval(incrementalScroll);
+					}
+				}, 10);
+			}
 		}
 	},

@@ -500,9 +460,7 @@ const Editor = createClass({
 					currentEditorTheme={this.state.editorTheme}
 					updateEditorTheme={this.updateEditorTheme}
 					snippetBundle={this.props.snippetBundle}
-					cursorPos={this.codeEditor.current?.getCursorPosition() || {}}
-					updateBrew={this.props.updateBrew}
-				/>
+					cursorPos={this.codeEditor.current?.getCursorPosition() || {}} />

 				{this.renderEditor()}
 			</div>
--- a/client/homebrew/editor/metadataEditor/metadataEditor.jsx
+++ b/client/homebrew/editor/metadataEditor/metadataEditor.jsx
@@ -304,14 +304,17 @@ const MetadataEditor = createClass({
 						onChange={(e)=>this.handleRenderer('V3', e)} />
 					V3
 				</label>
-				<small><a href='/legacy' target='_blank' rel='noopener noreferrer'>Click here to see the demo page for the old Legacy renderer!</a></small>
+
+				<a href='/legacy' target='_blank' rel='noopener noreferrer'>
+					Click here to see the demo page for the old Legacy renderer!
+				</a>
 			</div>
 		</div>;
 	},

 	render : function(){
 		return <div className='metadataEditor'>
-			<h1>Properties Editor</h1>
+			<h1 className='sectionHead'>Brew</h1>

 			<div className='field title'>
 				<label>title</label>
@@ -359,7 +362,9 @@ const MetadataEditor = createClass({

 			{this.renderRenderOptions()}

-			<h2>Authors</h2>
+			<hr/>
+
+			<h1 className='sectionHead'>Authors</h1>

 			{this.renderAuthors()}

@@ -370,13 +375,15 @@ const MetadataEditor = createClass({
 				notes={['Invited author usernames are case sensitive.', 'After adding an invited author, send them the edit link. There, they can choose to accept or decline the invitation.']}
 				onChange={(e)=>this.handleFieldChange('invitedAuthors', e)}/>

-			<h2>Privacy</h2>
+			<hr/>
+
+			<h1 className='sectionHead'>Privacy</h1>

 			<div className='field publish'>
 				<label>publish</label>
 				<div className='value'>
 					{this.renderPublish()}
-					<small>Published brews are searchable in <a href='/vault'>the Vault</a> and visible on your user page.  Unpublished brews are not indexed in the Vault or visible on your user page, but can still be shared and indexed by search engines.  You can unpublish a brew any time.</small>
+					<small>Published homebrews will be publicly viewable and searchable (eventually...)</small>
 				</div>
 			</div>

--- a/client/homebrew/editor/metadataEditor/metadataEditor.less
+++ b/client/homebrew/editor/metadataEditor/metadataEditor.less
@@ -1,6 +1,5 @@
@import 'naturalcrit/styles/colors.less';

-
 .metadataEditor {
 	position         : absolute;
 	z-index          : 5;
@@ -10,19 +9,12 @@
 	padding          : 25px;
 	overflow-y       : auto;
 	background-color : #999999;
-	font-size		 : 13px;

-	h1 {
-		margin: 0 0 40px;
-		font-weight: bold;
-		text-transform: uppercase;
-	}
-	
-	h2 {
+	.sectionHead {
 		margin      : 20px 0;
-		font-weight : bold;
-		border-bottom: 2px solid gray;
-		color: #555;
+		font-weight : 1000;
+
+		&:first-of-type { margin-top : 0; }
 	}

 	& > div { margin-bottom : 10px; }
@@ -51,21 +43,15 @@
 		min-width     : 200px;
 		& > label {
 			width          : 80px;
+			font-size      : 11px;
 			font-weight    : 800;
 			line-height    : 1.8em;
 			text-transform : uppercase;
-			font-size: .9em;
 		}
 		& > .value {
 			flex           : 1 1 auto;
 			width          : 50px;
 			&:invalid { background : #FFB9B9; }
-			small {
-				display     : block;
-				font-size   : 0.9em;
-				font-style  : italic;
-				line-height : 1.4em;
-			}
 		}
 		input[type='text'], textarea {
 			border : 1px solid gray;
@@ -92,6 +78,7 @@
 			textarea.value {
 				height      : auto;
 				font-family : 'Open Sans', sans-serif;
+				font-size   : 0.8em;
 				resize      : none;
 			}
 		}
@@ -100,6 +87,12 @@
 			z-index   : 200;
 			max-width : 150px;
 		}
+		small {
+			display     : inline-block;
+			font-size   : 0.6em;
+			font-style  : italic;
+			line-height : 1.4em;
+		}
 	}


@@ -120,13 +113,18 @@
 			display        : inline-flex;
 			align-items    : center;
 			margin-right   : 15px;
-			font-size      : 0.9em;
+			font-size      : 0.7em;
 			font-weight    : 800;
 			white-space    : nowrap;
 			vertical-align : middle;
 			cursor         : pointer;
 			user-select    : none;
 		}
+		a {
+			display     : inline-flex;
+			font-size   : 0.7em;
+			font-weight : 800;
+		}
 		input {
 			margin         : 3px;
 			vertical-align : middle;
@@ -151,10 +149,12 @@
 		}
 	}
 	.authors.field .value {
+		font-size      : 0.8em;
 		line-height    : 1.5em;
 	}

 	.themes.field {
+		font-size : 13.33px;
 		.navDropdownContainer {
 			position         : relative;
 			z-index          : 100;
@@ -165,9 +165,9 @@
 				background-color : darkgray;
 			}
 			& > div:first-child {
-				padding           : 3px 3px;
+				padding           : 6px 3px;
 				background-color  : inherit;
-				border            : 1px solid gray;
+				border            : 2px solid rgb(118,118,118);
 				i { float	: right; }
 				&:hover {
 					color            : white;
@@ -240,7 +240,6 @@
 			}
 		}
 	}
-
 	.field .list {
 		display   : flex;
 		flex      : 1 0;
@@ -259,15 +258,15 @@
 			color      : white;
 			text-align : center;
 			cursor     : pointer;
-	
+
 			i {
 				position  : relative;
 				top       : 50%;
 				transform : translateY(-50%);
 			}
-	
+
 			&:not(:last-child) { border-right : 1px solid black; }
-	
+
 			&:last-child { border-radius : 0 0.5em 0.5em 0; }
 		}

@@ -278,7 +277,8 @@
 			background-color : #DDDDDD;
 			border-radius    : 0.5em;

-			.icon { #groupedIcon; }
+			.icon {
+				#groupedIcon; }
 		}

 		.input-group {
@@ -294,30 +294,17 @@
 				height    : 100%;
 			}

-			.input-group {
-				height : ~'calc(.9em + 4px + .6em)';
+			.invalid:focus { background-color : pink; }

-				input { border-radius : 0.5em 0 0 0.5em; }
+			.icon {
+				#groupedIcon;
+				top       : -0.54em;
+				right     : 1px;
+				height    : 97%;
+				font-size : 0.8em;

-				input:last-child { border-radius : 0.5em; }
-
-				.value {
-					width     : 7.5vw;
-					min-width : 75px;
-					height    : 100%;
-				}
-
-				.invalid:focus { background-color : pink; }
-
-				.icon {
-					#groupedIcon;
-					top       : -0.54em;
-					right     : 1px;
-					height    : 97%;
-
-					i { font-size : 1.125em; }
-				}
+				i { font-size : 1.125em; }
 			}
 		}
 	}
-}
+}
--- a/client/homebrew/editor/snippetbar/snippetbar.jsx
+++ b/client/homebrew/editor/snippetbar/snippetbar.jsx
@@ -5,8 +5,6 @@ const createClass = require('create-react-class');
 const _     = require('lodash');
 const cx    = require('classnames');

-import { getHistoryItems, historyExists } from '../../utils/versionHistory.js';
-
 //Import all themes
 const ThemeSnippets = {};
 ThemeSnippets['Legacy_5ePHB'] = require('themes/Legacy/5ePHB/snippets.js');
@@ -40,8 +38,7 @@ const Snippetbar = createClass({
 			unfoldCode        : ()=>{},
 			updateEditorTheme : ()=>{},
 			cursorPos         : {},
-			snippetBundle     : [],
-			updateBrew        : ()=>{}
+			snippetBundle     : []
 		};
 	},

@@ -49,8 +46,7 @@ const Snippetbar = createClass({
 		return {
 			renderer      : this.props.renderer,
 			themeSelector : false,
-			snippets      : [],
-			historyExists : false
+			snippets      : []
 		};
 	},

@@ -63,23 +59,18 @@ const Snippetbar = createClass({

 	componentDidUpdate : async function(prevProps) {
 		if(prevProps.renderer != this.props.renderer || prevProps.theme != this.props.theme || prevProps.snippetBundle != this.props.snippetBundle) {
+			const snippets = this.compileSnippets();
 			this.setState({
-				snippets : this.compileSnippets()
+				snippets : snippets
 			});
-		};
-
-		if(historyExists(this.props.brew) != this.state.historyExists){
-			this.setState({
-					historyExists : !this.state.historyExists
-			});
-		};
-	
+		}
 	},

+
 	mergeCustomizer : function(oldValue, newValue, key) {
 		if(key == 'snippets') {
 			const result = _.reverse(_.unionBy(_.reverse(newValue), _.reverse(oldValue), 'name')); // Join snippets together, with preference for the child theme over the parent theme
-			return result.filter((snip)=>snip.gen || snip.subsnippets);
+			return _.filter(result, 'gen'); //Only keep snippets with a 'gen' property.
 		}
 	},

@@ -147,36 +138,6 @@ const Snippetbar = createClass({
 		});
 	},

-	replaceContent : function(item){
-		return this.props.updateBrew(item);
-	},
-
-	renderHistoryItems : function() {
-		const historyItems = getHistoryItems(this.props.brew);
-
-		return <div className='dropdown'>
-			{_.map(historyItems, (item, index)=>{
-				if(!item.savedAt) return;
-
-				const saveTime = new Date(item.savedAt);
-				const diffMs = new Date() - saveTime;
-				const diffSecs = Math.floor(diffMs / 1000);
-
-				let diffString = `about ${diffSecs} seconds ago`;
-
-				if(diffSecs > 60) diffString = `about ${Math.floor(diffSecs / 60)} minutes ago`;
-				if(diffSecs > (60 * 60)) diffString = `about ${Math.floor(diffSecs / (60 * 60))} hours ago`;
-				if(diffSecs > (24 * 60 * 60)) diffString = `about ${Math.floor(diffSecs / (24 * 60 * 60))} days ago`;
-				if(diffSecs > (7 * 24 * 60 * 60)) diffString = `about ${Math.floor(diffSecs / (7 * 24 * 60 * 60))} weeks ago`;
-
-				return <div className='snippet' key={index} onClick={()=>{this.replaceContent(item);}} >
-					<i className={`fas fa-${index+1}`} />
-					<span className='name' title={saveTime.toISOString()}>v{item.version} : {diffString}</span>
-				</div>;
-			})}
-		</div>;
-	},
-
 	renderEditorButtons : function(){
 		if(!this.props.showEditButtons) return;

@@ -197,10 +158,6 @@ const Snippetbar = createClass({
 		}

 		return <div className='editors'>
-			<div className={`editorTool snippetGroup history ${this.state.historyExists ? 'active' : ''}`} >
-				<i className='fas fa-clock-rotate-left' />
-				{this.state.historyExists && this.renderHistoryItems() }
-			</div>
 			<div className={`editorTool undo ${this.props.historySize.undo ? 'active' : ''}`}
 				onClick={this.props.undo} >
 				<i className='fas fa-undo' />
--- a/client/homebrew/editor/snippetbar/snippetbar.less
+++ b/client/homebrew/editor/snippetbar/snippetbar.less
@@ -53,21 +53,6 @@
 				font-size : 0.75em;
 				color     : inherit;
 			}
-			&.history {
-				.tooltipLeft('History');
-				font-size : 0.75em;
-				color     : grey;
-				position  : relative;
-				&.active {
-					color : inherit;
-				}
-				&>.dropdown{
-					right         : -1px;
-					&>.snippet{
-						padding-right : 10px;
-					}
-				}
-			}
 			&.editorTheme {
 				.tooltipLeft('Editor Themes');
 				font-size : 0.75em;
--- a/client/homebrew/editor/stringArrayEditor/stringArrayEditor.jsx
+++ b/client/homebrew/editor/stringArrayEditor/stringArrayEditor.jsx
@@ -128,7 +128,7 @@ const StringArrayEditor = createClass({

 		return <div className='field'>
 			<label>{this.props.label}</label>
-			<div style={{ flex: '1 0' }} className='value'>
+			<div style={{ flex: '1 0' }}>
 				<div className='list'>
 					{valueElements}
 					<div className='input-group'>
--- a/client/homebrew/navbar/error-navitem.jsx
+++ b/client/homebrew/navbar/error-navitem.jsx
@@ -111,7 +111,18 @@ const ErrorNavItem = createClass({
 					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!
+					{response.body.brewId}</a> still exists!
+				</div>
+			</Nav.item>;
+		}
+
+		if(HBErrorCode === '55') {
+			return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
+				Oops!
+				<div className='errorContainer' onClick={clearError}>
+					Looks like there are too many requests
+					from this IP address in a short time.
+					Please try again after a few minutes.
 				</div>
 			</Nav.item>;
 		}
--- a/client/homebrew/navbar/navbar.less
+++ b/client/homebrew/navbar/navbar.less
@@ -35,11 +35,6 @@
 		display     : flex;
 		align-items : center;
 		&:last-child .navItem { border-left : 1px solid #666666; }
-
-		&:has(.brewTitle) {
-			flex-grow : 1;
-			min-width : 300px; 
-		}
 	}
 	// "NaturalCrit" logo
 	.navLogo {
@@ -74,10 +69,6 @@
 	.navItem {
 		#backgroundColorsHover;
 		.animate(background-color);
-		display          : flex;
-		align-items      : center;
-		justify-content  : center;
-		height           : 100%;
 		padding          : 8px 12px;
 		font-size        : 10px;
 		font-weight      : 800;
@@ -103,20 +94,39 @@
 				animation-duration : 2s;
 			}
 		}
+		&.editTitle {  // this is not needed at all currently - you used to be able to edit the title via the navbar.
+			padding : 2px 12px;
+			input {
+				width            : 250px;
+				padding          : 2px;
+				margin           : 0;
+				font-family      : 'Open Sans', sans-serif;
+				font-size        : 12px;
+				font-weight      : 800;
+				color            : white;
+				text-align       : center;
+				background-color : transparent;
+				border           : 1px solid @blue;
+				outline          : none;
+			}
+			.charCount {
+				display        : inline-block;
+				margin-left    : 8px;
+				color          : #666666;
+				text-align     : right;
+				vertical-align : bottom;
+				&.max { color : @red; }
+			}
+		}
 		&.brewTitle {
-			display          : block;
-			width            : 100%;
-			overflow         : hidden;
+			flex-grow        : 1;
 			font-size        : 12px;
 			font-weight      : 800;
 			color            : white;
 			text-align       : center;
-			text-overflow    : ellipsis;
-			text-transform   : initial;	
-			white-space      : nowrap;
-			background-color : transparent;		
+			text-transform   : initial;
+			background-color : transparent;
 		}
-
 		// "The Homebrewery" logo
 		&.homebrewLogo {
 			.animate(color);
@@ -230,25 +240,23 @@
 	}
 	.navDropdownContainer {
 		position : relative;
-		height   : 100%;
-
 		.navDropdown {
-			position       : absolute;
-			//top: 28px;
-			right          : 0px;
-			z-index        : 10000;
-			display        : flex;
-			flex-direction : column;
-			align-items    : flex-end;
-			width          : max-content;
-			min-width      : 100%;
-			max-height     : calc(100vh - 28px);
-			overflow       : hidden auto;
+			position: absolute;
+			top: 28px;
+			right: 0px;
+			z-index: 10000;
+			width: max-content;
+			min-width:100%;
+			max-height: calc(100vh - 28px);
+			overflow: hidden auto;
+			display: flex;
+			flex-direction: column;
+			align-items: flex-end;
 			.navItem {
 				position           : relative;
 				display            : flex;
-				align-items        : center;
 				justify-content    : space-between;
+				align-items        : center;
 				width              : 100%;
 				border             : 1px solid #888888;
 				border-bottom      : 0;
@@ -270,10 +278,10 @@
 				overflow         : hidden auto;
 				color            : white;
 				text-decoration  : none;
-				scrollbar-color  : #666666 #333333;
-				scrollbar-width  : thin;
 				background-color : #333333;
 				border-top       : 1px solid #888888;
+				scrollbar-color  : #666666 #333333;
+				scrollbar-width  : thin;
 				.clear {
 					position         : absolute;
 					top              : 50%;
--- a/client/homebrew/navbar/recent.navitem.jsx
+++ b/client/homebrew/navbar/recent.navitem.jsx
@@ -36,7 +36,7 @@ const RecentItems = createClass({
 		//== Add current brew to appropriate recent items list (depending on storageKey) ==//
 		if(this.props.storageKey == 'edit'){
 			let editId = this.props.brew.editId;
-			if(this.props.brew.googleId){
+			if(this.props.brew.googleId && !this.props.brew.stubbed){
 				editId = `${this.props.brew.googleId}${this.props.brew.editId}`;
 			}
 			edited = _.filter(edited, (brew)=>{
@@ -51,7 +51,7 @@ const RecentItems = createClass({
 		}
 		if(this.props.storageKey == 'view'){
 			let shareId = this.props.brew.shareId;
-			if(this.props.brew.googleId){
+			if(this.props.brew.googleId && !this.props.brew.stubbed){
 				shareId = `${this.props.brew.googleId}${this.props.brew.shareId}`;
 			}
 			viewed = _.filter(viewed, (brew)=>{
@@ -83,7 +83,7 @@ const RecentItems = createClass({
 	 		let edited = JSON.parse(localStorage.getItem(EDIT_KEY) || '[]');
 			if(this.props.storageKey == 'edit') {
 				let prevEditId = prevProps.brew.editId;
-				if(prevProps.brew.googleId){
+				if(prevProps.brew.googleId && !this.props.brew.stubbed){
 					prevEditId = `${prevProps.brew.googleId}${prevProps.brew.editId}`;
 				}

@@ -91,7 +91,7 @@ const RecentItems = createClass({
 					return brew.id !== prevEditId;
 				});
 				let editId = this.props.brew.editId;
-				if(this.props.brew.googleId){
+				if(this.props.brew.googleId && !this.props.brew.stubbed){
 					editId = `${this.props.brew.googleId}${this.props.brew.editId}`;
 				}
 				edited.unshift({
--- a/client/homebrew/pages/editPage/editPage.jsx
+++ b/client/homebrew/pages/editPage/editPage.jsx
@@ -1,9 +1,8 @@
 /* eslint-disable max-lines */
 require('./editPage.less');
 const React = require('react');
-const _ = require('lodash');
 const createClass = require('create-react-class');
-
+const _ = require('lodash');
 const request = require('../../utils/request-middleware.js');
 const { Meta } = require('vitreum/headtags');

@@ -28,11 +27,9 @@ const Markdown = require('naturalcrit/markdown.js');
 const { DEFAULT_BREW_LOAD } = require('../../../../server/brewDefaults.js');
 const { printCurrentBrew, fetchThemeBundle } = require('../../../../shared/helpers.js');

-import { updateHistory, versionHistoryGarbageCollection } from '../../utils/versionHistory.js';
-
 const googleDriveIcon = require('../../googleDrive.svg');

-const SAVE_TIMEOUT = 10000;
+const SAVE_TIMEOUT = 16000;

 const EditPage = createClass({
 	displayName     : 'EditPage',
@@ -44,24 +41,22 @@ const EditPage = createClass({

 	getInitialState : function() {
 		return {
-			brew                       : this.props.brew,
-			isSaving                   : false,
-			isPending                  : 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                : {}
+			brew                   : this.props.brew,
+			isSaving               : false,
+			isPending              : 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(),
+			currentEditorPage      : 0,
+			displayLockMessage     : this.props.brew.lock || false,
+			themeBundle            : {}
 		};
 	},

@@ -118,27 +113,16 @@ const EditPage = createClass({
 		this.editor.current.update();
 	},

-	handleEditorViewPageChange : function(pageNumber){
-		this.setState({ currentEditorViewPageNum: pageNumber });
-	},
-
-	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 },
-			isPending  : true,
-			htmlErrors : htmlErrors,
+			brew              : { ...prevState.brew, text: text },
+			isPending         : true,
+			htmlErrors        : htmlErrors,
+			currentEditorPage : this.editor.current.getCurrentPage() - 1 //Offset index since Marked starts pages at 0
 		}), ()=>{if(this.state.autoSave) this.trySave();});
 	},

@@ -166,16 +150,6 @@ const EditPage = createClass({
 		return !_.isEqual(this.state.brew, this.savedBrew);
 	},

-	updateBrew : function(newData){
-		this.setState((prevState)=>({
-			brew : {
-				...prevState.brew,
-				style : newData.style,
-				text  : newData.text
-			}
-		}));
-	},
-
 	trySave : function(immediate=false){
 		if(!this.debounceSave) this.debounceSave = _.debounce(this.save, SAVE_TIMEOUT);
 		if(this.hasChanges()){
@@ -228,9 +202,6 @@ const EditPage = createClass({
 			htmlErrors : Markdown.validate(prevState.brew.text)
 		}));

-		updateHistory(this.state.brew);
-		versionHistoryGarbageCollection();
-
 		const transfer = this.state.saveGoogle == _.isNil(this.state.brew.googleId);

 		const brew = this.state.brew;
@@ -442,12 +413,6 @@ const EditPage = createClass({
 						renderer={this.state.brew.renderer}
 						userThemes={this.props.userThemes}
 						snippetBundle={this.state.themeBundle.snippets}
-						updateBrew={this.updateBrew}
-						onCursorPageChange={this.handleEditorCursorPageChange}
-						onViewPageChange={this.handleEditorViewPageChange}
-						currentEditorViewPageNum={this.state.currentEditorViewPageNum}
-						currentEditorCursorPageNum={this.state.currentEditorCursorPageNum}
-						currentBrewRendererPageNum={this.state.currentBrewRendererPageNum}
 					/>
 					<BrewRenderer
 						text={this.state.brew.text}
@@ -457,10 +422,7 @@ const EditPage = createClass({
 						themeBundle={this.state.themeBundle}
 						errors={this.state.htmlErrors}
 						lang={this.state.brew.lang}
-						onPageChange={this.handleBrewRendererPageChange}
-						currentEditorViewPageNum={this.state.currentEditorViewPageNum}
-						currentEditorCursorPageNum={this.state.currentEditorCursorPageNum}
-						currentBrewRendererPageNum={this.state.currentBrewRendererPageNum}
+						currentEditorPage={this.state.currentEditorPage}
 						allowPrint={true}
 					/>
 				</SplitPane>
--- a/client/homebrew/pages/homePage/homePage.jsx
+++ b/client/homebrew/pages/homePage/homePage.jsx
@@ -1,6 +1,7 @@
 require('./homePage.less');
 const React = require('react');
 const createClass = require('create-react-class');
+const _ = require('lodash');
 const cx = require('classnames');
 const request = require('../../utils/request-middleware.js');
 const { Meta } = require('vitreum/headtags');
@@ -31,13 +32,11 @@ const HomePage = createClass({
 	},
 	getInitialState : function() {
 		return {
-			brew                       : this.props.brew,
-			welcomeText                : this.props.brew.text,
-			error                      : undefined,
-			currentEditorViewPageNum   : 1,
-			currentEditorCursorPageNum : 1,
-			currentBrewRendererPageNum : 1,
-			themeBundle                : {}
+			brew              : this.props.brew,
+			welcomeText       : this.props.brew.text,
+			error             : undefined,
+			currentEditorPage : 0,
+			themeBundle       : {}
 		};
 	},

@@ -62,22 +61,10 @@ const HomePage = createClass({
 	handleSplitMove : function(){
 		this.editor.current.update();
 	},
-
-	handleEditorViewPageChange : function(pageNumber){
-		this.setState({ currentEditorViewPageNum: pageNumber });
-	},
-
-	handleEditorCursorPageChange : function(pageNumber){
-		this.setState({ currentEditorCursorPageNum: pageNumber });
-	},
-
-	handleBrewRendererPageChange : function(pageNumber){
-		this.setState({ currentBrewRendererPageNum: pageNumber });
-	},
-
 	handleTextChange : function(text){
 		this.setState((prevState)=>({
-			brew : { ...prevState.brew, text: text },
+			brew              : { ...prevState.brew, text: text },
+			currentEditorPage : this.editor.current.getCurrentPage() - 1 //Offset index since Marked starts pages at 0
 		}));
 	},
 	renderNavbar : function(){
@@ -110,20 +97,12 @@ const HomePage = createClass({
 						renderer={this.state.brew.renderer}
 						showEditButtons={false}
 						snippetBundle={this.state.themeBundle.snippets}
-						onCursorPageChange={this.handleEditorCursorPageChange}
-						onViewPageChange={this.handleEditorViewPageChange}
-						currentEditorViewPageNum={this.state.currentEditorViewPageNum}
-						currentEditorCursorPageNum={this.state.currentEditorCursorPageNum}
-						currentBrewRendererPageNum={this.state.currentBrewRendererPageNum}
 					/>
 					<BrewRenderer
 						text={this.state.brew.text}
 						style={this.state.brew.style}
 						renderer={this.state.brew.renderer}
-						onPageChange={this.handleBrewRendererPageChange}
-						currentEditorViewPageNum={this.state.currentEditorViewPageNum}
-						currentEditorCursorPageNum={this.state.currentEditorCursorPageNum}
-						currentBrewRendererPageNum={this.state.currentBrewRendererPageNum}
+						currentEditorPage={this.state.currentEditorPage}
 						themeBundle={this.state.themeBundle}
 					/>
 				</SplitPane>
--- a/client/homebrew/pages/newPage/newPage.jsx
+++ b/client/homebrew/pages/newPage/newPage.jsx
@@ -39,15 +39,13 @@ const NewPage = createClass({
 		const brew = this.props.brew;

 		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                : {}
+			brew              : brew,
+			isSaving          : false,
+			saveGoogle        : (global.account && global.account.googleId ? true : false),
+			error             : null,
+			htmlErrors        : Markdown.validate(brew.text),
+			currentEditorPage : 0,
+			themeBundle       : {}
 		};
 	},

@@ -110,26 +108,15 @@ const NewPage = createClass({
 		this.editor.current.update();
 	},

-	handleEditorViewPageChange : function(pageNumber){
-		this.setState({ currentEditorViewPageNum: pageNumber });
-	},
-
-	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,
+			brew              : { ...prevState.brew, text: text },
+			htmlErrors        : htmlErrors,
+			currentEditorPage : this.editor.current.getCurrentPage() - 1 //Offset index since Marked starts pages at 0
 		}));
 		localStorage.setItem(BREWKEY, text);
 	},
@@ -234,11 +221,6 @@ const NewPage = createClass({
 						renderer={this.state.brew.renderer}
 						userThemes={this.props.userThemes}
 						snippetBundle={this.state.themeBundle.snippets}
-						onCursorPageChange={this.handleEditorCursorPageChange}
-						onViewPageChange={this.handleEditorViewPageChange}
-						currentEditorViewPageNum={this.state.currentEditorViewPageNum}
-						currentEditorCursorPageNum={this.state.currentEditorCursorPageNum}
-						currentBrewRendererPageNum={this.state.currentBrewRendererPageNum}
 					/>
 					<BrewRenderer
 						text={this.state.brew.text}
@@ -248,10 +230,7 @@ const NewPage = createClass({
 						themeBundle={this.state.themeBundle}
 						errors={this.state.htmlErrors}
 						lang={this.state.brew.lang}
-						onPageChange={this.handleBrewRendererPageChange}
-						currentEditorViewPageNum={this.state.currentEditorViewPageNum}
-						currentEditorCursorPageNum={this.state.currentEditorCursorPageNum}
-						currentBrewRendererPageNum={this.state.currentBrewRendererPageNum}
+						currentEditorPage={this.state.currentEditorPage}
 						allowPrint={true}
 					/>
 				</SplitPane>
--- a/client/homebrew/pages/sharePage/sharePage.jsx
+++ b/client/homebrew/pages/sharePage/sharePage.jsx
@@ -25,8 +25,7 @@ const SharePage = createClass({

 	getInitialState : function() {
 		return {
-			themeBundle                : {},
-			currentBrewRendererPageNum : 1
+			themeBundle : {}
 		};
 	},

@@ -40,10 +39,6 @@ const SharePage = createClass({
 		document.removeEventListener('keydown', this.handleControlKeys);
 	},

-	handleBrewRendererPageChange : function(pageNumber){
-		this.setState({ currentBrewRendererPageNum: pageNumber });
-	},
-
 	handleControlKeys : function(e){
 		if(!(e.ctrlKey || e.metaKey)) return;
 		const P_KEY = 80;
@@ -122,8 +117,6 @@ const SharePage = createClass({
 					renderer={this.props.brew.renderer}
 					theme={this.props.brew.theme}
 					themeBundle={this.state.themeBundle}
-					onPageChange={this.handleBrewRendererPageChange}
-					currentBrewRendererPageNum={this.state.currentBrewRendererPageNum}
 					allowPrint={true}
 				/>
 			</div>
--- a/client/homebrew/pages/vaultPage/vaultPage.jsx
+++ b/client/homebrew/pages/vaultPage/vaultPage.jsx
@@ -1,5 +1,3 @@
-/*eslint max-lines: ["warn", {"max": 400, "skipBlankLines": true, "skipComments": true}]*/
-/*eslint max-params:["warn", { max: 10 }], */
 require('./vaultPage.less');

 const React = require('react');
@@ -20,15 +18,13 @@ const request = require('../../utils/request-middleware.js');
 const VaultPage = (props)=>{
 	const [pageState, setPageState] = useState(parseInt(props.query.page) || 1);

-	const [sortState, setSort] = useState(props.query.sort || 'title');
-	const [dirState, setdir] = useState(props.query.dir || 'asc');
-
 	//Response state
 	const [brewCollection, setBrewCollection] = useState(null);
 	const [totalBrews, setTotalBrews]         = useState(null);
 	const [searching, setSearching]           = useState(false);
 	const [error, setError]                   = useState(null);

+
 	const titleRef        = useRef(null);
 	const authorRef       = useRef(null);
 	const countRef        = useRef(null);
@@ -38,7 +34,7 @@ const VaultPage = (props)=>{

 	useEffect(()=>{
 		disableSubmitIfFormInvalid();
-		loadPage(pageState, true, props.query.sort, props.query.dir);
+		loadPage(pageState, true);
 	}, []);

 	const updateStateWithBrews = (brews, page)=>{
@@ -47,7 +43,7 @@ const VaultPage = (props)=>{
 		setSearching(false);
 	};

-	const updateUrl = (titleValue, authorValue, countValue, v3Value, legacyValue, page, sort, dir)=>{
+	const updateUrl = (titleValue, authorValue, countValue, v3Value, legacyValue, page)=>{
 		const url = new URL(window.location.href);
 		const urlParams = new URLSearchParams(url.search);

@@ -57,23 +53,21 @@ const VaultPage = (props)=>{
 		urlParams.set('v3', v3Value);
 		urlParams.set('legacy', legacyValue);
 		urlParams.set('page', page);
-		urlParams.set('sort', sort);
-		urlParams.set('dir', dir);

 		url.search = urlParams.toString();
 		window.history.replaceState(null, '', url.toString());
 	};

-	const performSearch = async (title, author, count, v3, legacy, page, sort, dir)=>{
-		updateUrl(title, author, count, v3, legacy, page, sort, dir);
+	const performSearch = async (title, author, count, v3, legacy, page)=>{
+		updateUrl(title, author, count, v3, legacy, page);

-		const response = await request
-			.get(`/api/vault?title=${title}&author=${author}&v3=${v3}&legacy=${legacy}&count=${count}&page=${page}&sort=${sort}&dir=${dir}`)
-			.catch((error)=>{
-				console.log('error at loadPage: ', error);
-				setError(error);
-				updateStateWithBrews([], 1);
-			});
+		const response = await request.get(
+			`/api/vault?title=${title}&author=${author}&v3=${v3}&legacy=${legacy}&count=${count}&page=${page}`
+		).catch((error)=>{
+			console.log('error at loadPage: ', error);
+			setError(error);
+			updateStateWithBrews([], 1);
+		});

 		if(response.ok)
 			updateStateWithBrews(response.body.brews, page);
@@ -82,8 +76,9 @@ const VaultPage = (props)=>{
 	const loadTotal = async (title, author, v3, legacy)=>{
 		setTotalBrews(null);

-		const response = await request.get(`/api/vault/total?title=${title}&author=${author}&v3=${v3}&legacy=${legacy}`)
-		.catch((error)=>{
+		const response = await request.get(
+			`/api/vault/total?title=${title}&author=${author}&v3=${v3}&legacy=${legacy}`
+		).catch((error)=>{
 			console.log('error at loadTotal: ', error);
 			setError(error);
 			updateStateWithBrews([], 1);
@@ -93,8 +88,9 @@ const VaultPage = (props)=>{
 			setTotalBrews(response.body.totalBrews);
 	};

-	const loadPage = async (page, updateTotal, sort, dir)=>{
-		if(!validateForm()) return;
+	const loadPage = async (page, updateTotal)=>{
+		if(!validateForm())
+			return;

 		setSearching(true);
 		setError(null);
@@ -104,14 +100,8 @@ const VaultPage = (props)=>{
 		const count  = countRef.current.value || 10;
 		const v3     = v3Ref.current.checked != false;
 		const legacy = legacyRef.current.checked != false;
-		const sortOption = sort || 'title';
-		const dirOption = dir || 'asc';
-		const pageProp = page || 1;

-		setSort(sortOption);
-		setdir(dirOption);
-
-		performSearch(title, author, count, v3, legacy, pageProp, sortOption, dirOption);
+		performSearch(title, author, count, v3, legacy, page);

 		if(updateTotal)
 			loadTotal(title, author, v3, legacy);
@@ -258,33 +248,6 @@ const VaultPage = (props)=>{
 		</div>
 	);

-	const renderSortOption = (optionTitle, optionValue)=>{
-		const oppositeDir = dirState === 'asc' ? 'desc' : 'asc';
-
-		return (
-			<div className={`sort-option ${sortState === optionValue ? `active` : ''}`}>
-				<button onClick={()=>loadPage(1, false, optionValue, oppositeDir)}>
-					{optionTitle}
-				</button>
-				{sortState === optionValue && (
-					<i className={`sortDir fas ${dirState === 'asc' ? 'fa-sort-up' : 'fa-sort-down'}`} />
-				)}
-			</div>
-		);
-	};
-
-	const renderSortBar = ()=>{
-
-		return (
-			<div className='sort-container'>
-				{renderSortOption('Title', 'title', props.query.dir)}
-				{renderSortOption('Created Date', 'createdAt', props.query.dir)}
-				{renderSortOption('Updated Date', 'updatedAt', props.query.dir)}
-				{renderSortOption('Views', 'views', props.query.dir)}
-			</div>
-		);
-	};
-
 	const renderPaginationControls = ()=>{
 		if(!totalBrews) return null;

@@ -308,8 +271,10 @@ const VaultPage = (props)=>{
 			.map((_, index)=>(
 				<a
 					key={startPage + index}
-					className={`pageNumber ${pageState === startPage + index ? 'currentPage' : ''}`}
-					onClick={()=>loadPage(startPage + index, false, sortState, dirState)}
+					className={`pageNumber ${
+						pageState === startPage + index ? 'currentPage' : ''
+					}`}
+					onClick={()=>loadPage(startPage + index, false)}
 				>
 					{startPage + index}
 				</a>
@@ -319,7 +284,7 @@ const VaultPage = (props)=>{
 			<div className='paginationControls'>
 				<button
 					className='previousPage'
-					onClick={()=>loadPage(pageState - 1, false, sortState, dirState)}
+					onClick={()=>loadPage(pageState - 1, false)}
 					disabled={pageState === startPage}
 				>
 					<i className='fa-solid fa-chevron-left'></i>
@@ -328,7 +293,7 @@ const VaultPage = (props)=>{
 					{startPage > 1 && (
 						<a
 							className='pageNumber firstPage'
-							onClick={()=>loadPage(1, false, sortState, dirState)}
+							onClick={()=>loadPage(1, false)}
 						>
 							1 ...
 						</a>
@@ -337,7 +302,7 @@ const VaultPage = (props)=>{
 					{endPage < totalPages && (
 						<a
 							className='pageNumber lastPage'
-							onClick={()=>loadPage(totalPages, false, sortState, dirState)}
+							onClick={()=>loadPage(totalPages, false)}
 						>
 							... {totalPages}
 						</a>
@@ -345,7 +310,7 @@ const VaultPage = (props)=>{
 				</ol>
 				<button
 					className='nextPage'
-					onClick={()=>loadPage(pageState + 1, false, sortState, dirState)}
+					onClick={()=>loadPage(pageState + 1, false)}
 					disabled={pageState === totalPages}
 				>
 					<i className='fa-solid fa-chevron-right'></i>
@@ -365,7 +330,7 @@ const VaultPage = (props)=>{

 		if(error) {
 			const errorText = ErrorIndex()[error.HBErrorCode.toString()] || '';
-
+			
 			return (
 				<div className='foundBrews noBrews'>
 					<h3>Error: {errorText}</h3>
@@ -420,7 +385,6 @@ const VaultPage = (props)=>{
 					<div className='form dataGroup'>{renderForm()}</div>

 					<div className='resultsContainer dataGroup'>
-						{renderSortBar()}
 						{renderFoundBrews()}
 					</div>
 				</SplitPane>
--- a/client/homebrew/pages/vaultPage/vaultPage.less
+++ b/client/homebrew/pages/vaultPage/vaultPage.less
@@ -6,8 +6,8 @@
 	*:not(input) { user-select : none; }

 	.content {
-		height     : 100%;
 		background : #2C3E50;
+		height: 100%;

 		.dataGroup {
 			width      : 100%;
@@ -27,9 +27,9 @@

 				code {
 					padding-inline : 5px;
-					font-family    : monospace;
 					background     : lightgrey;
 					border-radius  : 5px;
+					font-family    : monospace;
 				}

 				h1, h2, h3, h4 {
@@ -165,48 +165,6 @@
 					color       : white;
 				}

-				.sort-container {
-					display               : flex;
-					flex-wrap             : wrap;
-					column-gap            : 15px;
-					justify-content       : center;
-					height                : 30px;
-					color                 : white;
-					background-color      : #555555;
-					border-top            : 1px solid #666666;
-					border-bottom         : 1px solid #666666;
-					
-					.sort-option {
-						display     : flex;
-						align-items : center;
-						padding     : 0 8px;
-				
-						&:hover { background-color : #444444; }
-				
-						&.active {
-							background-color : #333333;
-				
-							button {
-								font-weight : 800;
-								color       : white;
-								
-								& + .sortDir { padding-left : 5px; }
-							}
-						}
-
-						button {
-							padding          : 0;
-							font-size        : 11px;
-							font-weight      : normal;
-							color            : #CCCCCC;
-							text-transform   : uppercase;
-							background-color : transparent;
-					
-							&:hover { background : none; }
-						}
-					}
-				}
-
 				.foundBrews {
 					position         : relative;
 					width            : 100%;
@@ -278,15 +236,15 @@
 						width            : 47%;
 						margin-right     : 40px;
 						color            : black;
-						isolation        : isolate;
+						isolation:isolate;
 						
-						&::after {
-							position         : absolute;
-							inset            : 0;
-							z-index          : -2;
-							display          : block;
-							content          : '';
+						&:after {
+							position:absolute;
+							inset:0;
+							display:block;
+							content:'';
 							background-image : url('/assets/parchmentBackground.jpg');
+							z-index:-1;
 						}

 						&:nth-child(even of .brewItem) { margin-right : 0; }
@@ -299,24 +257,28 @@
 							color       : var(--HB_Color_HeaderText);
 						}
 						.info {
-							position    : relative;
-							z-index     : 2;
 							font-family : 'ScalySansRemake';
 							font-size   : 1.2em;
+							position:relative;
+							z-index:2;

 							>span {
 								margin-right : 12px;
 								line-height  : 1.5em;
 							}
 						}
-						.links { z-index : 2; }
-
-						hr {
-							margin     : 0px;
-							visibility : hidden;
+						.links {
+							z-index:2;
 						}

-						.thumbnail { z-index : -1; }
+						hr {
+							margin: 0px;
+							visibility: hidden;
+						}
+
+						.thumbnail {
+							z-index:1;
+						}
 					}

 					.paginationControls {
--- a/client/homebrew/utils/versionHistory.js
+++ b/client/homebrew/utils/versionHistory.js
@@ -1,116 +0,0 @@
-export const HISTORY_PREFIX = 'HOMEBREWERY-HISTORY';
-export const HISTORY_SLOTS = 5;
-
-// History values in minutes
-const DEFAULT_HISTORY_SAVE_DELAYS = {
-	'0' : 0,
-	'1' : 2,
-	'2' : 10,
-	'3' : 60,
-	'4' : 12 * 60,
-	'5' : 2 * 24 * 60
-};
-
-const DEFAULT_GARBAGE_COLLECT_DELAY = 28 * 24 * 60;
-
-const HISTORY_SAVE_DELAYS = global.config?.historyData?.HISTORY_SAVE_DELAYS ?? DEFAULT_HISTORY_SAVE_DELAYS;
-const GARBAGE_COLLECT_DELAY = global.config?.historyData?.GARBAGE_COLLECT_DELAY ?? DEFAULT_GARBAGE_COLLECT_DELAY;
-
-
-
-function getKeyBySlot(brew, slot){
-	return `${HISTORY_PREFIX}-${brew.shareId}-${slot}`;
-};
-
-function getVersionBySlot(brew, slot){
-	// Read stored brew data
-	// - If it exists, parse data to object
-	// - If it doesn't exist, pass default object
-	const key = getKeyBySlot(brew, slot);
-	const storedVersion = localStorage.getItem(key);
-	const output = storedVersion ? JSON.parse(storedVersion) : { expireAt: '2000-01-01T00:00:00.000Z', shareId: brew.shareId, noData: true };
-	return output;
-};
-
-function updateStoredBrew(brew, slot = 0) {
-	const archiveBrew = {
-		title    : brew.title,
-		text     : brew.text,
-		style    : brew.style,
-		version  : brew.version,
-		shareId  : brew.shareId,
-		savedAt  : brew?.savedAt || new Date(),
-		expireAt : new Date()
-	};
-
-	archiveBrew.expireAt.setMinutes(archiveBrew.expireAt.getMinutes() + HISTORY_SAVE_DELAYS[slot]);
-
-	const key = getKeyBySlot(brew, slot);
-	localStorage.setItem(key, JSON.stringify(archiveBrew));
-}
-
-
-export function historyExists(brew){
-	return Object.keys(localStorage)
-		.some((key)=>{
-			return key.startsWith(`${HISTORY_PREFIX}-${brew.shareId}`);
-		});
-}
-
-export function loadHistory(brew){
-	const history = {};
-
-	// Load data from local storage to History object
-	for (let i = 1; i <= HISTORY_SLOTS; i++){
-		history[i] = getVersionBySlot(brew, i);
-	};
-
-	return history;
-}
-
-export function updateHistory(brew) {
-	const history = loadHistory(brew);
-
-	// Walk each version position
-	for (let slot = HISTORY_SLOTS; slot > 0; slot--){
-		const storedVersion = history[slot];
-
-		// If slot has expired, update all lower slots and break
-		if(new Date() >= new Date(storedVersion.expireAt)){
-			for (let updateSlot = slot - 1; updateSlot>0; updateSlot--){
-				// Move data from updateSlot to updateSlot + 1
-				!history[updateSlot]?.noData &&	updateStoredBrew(history[updateSlot], updateSlot + 1);
-			};
-
-			// Update the most recent brew
-			updateStoredBrew(brew, 1);
-
-			// Break out of data checks because we found an expired value
-			break;
-		}
-	};
-};
-
-export function getHistoryItems(brew){
-	const historyArray = [];
-
-	for (let i = 1; i <= HISTORY_SLOTS; i++){
-		historyArray.push(getVersionBySlot(brew, i));
-	}
-
-	return historyArray;
-};
-
-export function versionHistoryGarbageCollection(){
-	Object.keys(localStorage)
-		.filter((key)=>{
-			return key.startsWith(HISTORY_PREFIX);
-		})
-		.forEach((key)=>{
-			const collectAt = new Date(JSON.parse(localStorage.getItem(key)).savedAt);
-			collectAt.setMinutes(collectAt.getMinutes() + GARBAGE_COLLECT_DELAY);
-			if(new Date() > collectAt){
-				localStorage.removeItem(key);
-			}
-		});
-};
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,11 +21,12 @@
        "cookie-parser": "^1.4.6",
        "create-react-class": "^15.7.0",
        "dedent-tabs": "^0.10.3",
-        "dompurify": "^3.1.7",
+        "dompurify": "^3.1.6",
        "expr-eval": "^2.0.2",
-        "express": "^4.21.0",
+        "express": "^4.19.2",
        "express-async-handler": "^1.2.0",
-        "express-static-gzip": "2.1.8",
+        "express-rate-limit": "^7.4.0",
+        "express-static-gzip": "2.1.7",
        "fs-extra": "11.2.0",
        "js-yaml": "^4.1.0",
        "jwt-simple": "^0.5.6",
@@ -38,28 +39,28 @@
        "marked-smartypants-lite": "^1.0.2",
        "markedLegacy": "npm:marked@^0.3.19",
        "moment": "^2.30.1",
-        "mongoose": "^8.7.0",
+        "mongoose": "^8.6.1",
        "nanoid": "3.3.4",
        "nconf": "^0.12.1",
        "react": "^18.3.1",
        "react-dom": "^18.3.1",
        "react-frame-component": "^4.1.3",
-        "react-router-dom": "6.26.2",
+        "react-router-dom": "6.26.1",
        "sanitize-filename": "1.6.3",
        "superagent": "^10.1.0",
        "vitreum": "git+https://git@github.com/calculuschild/vitreum.git"
      },
      "devDependencies": {
-        "@stylistic/stylelint-plugin": "^3.1.0",
-        "eslint": "^9.11.1",
+        "@stylistic/stylelint-plugin": "^3.0.1",
+        "eslint": "^9.9.1",
        "eslint-plugin-jest": "^28.8.3",
-        "eslint-plugin-react": "^7.36.1",
+        "eslint-plugin-react": "^7.35.2",
        "globals": "^15.9.0",
        "jest": "^29.7.0",
        "jest-expect-message": "^1.1.3",
        "postcss-less": "^6.0.0",
        "stylelint": "^16.9.0",
-        "stylelint-config-recess-order": "^5.1.1",
+        "stylelint-config-recess-order": "^5.1.0",
        "stylelint-config-recommended": "^14.0.1",
        "supertest": "^7.0.0"
      },
@@ -2035,15 +2036,6 @@
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
      }
    },
-    "node_modules/@eslint/core": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.6.0.tgz",
-      "integrity": "sha512-8I2Q8ykA4J0x0o7cg67FPVnehcqWTBehu/lmY+bolPFHGjh49YzGBMXTvpqVgEbBdvNCSxj6iFgiIyHzf03lzg==",
-      "dev": true,
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      }
-    },
    "node_modules/@eslint/eslintrc": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.1.0.tgz",
@@ -2082,9 +2074,9 @@
      }
    },
    "node_modules/@eslint/js": {
-      "version": "9.11.1",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.11.1.tgz",
-      "integrity": "sha512-/qu+TWz8WwPWc7/HcIJKi+c+MOm46GdVaSlTTQcaqaL53+GsoA6MxWp5PtTx48qbSP7ylM1Kn7nhvkugfJvRSA==",
+      "version": "9.9.1",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.9.1.tgz",
+      "integrity": "sha512-xIDQRsfg5hNBqHz04H1R3scSVwmI+KUbqjsQKHKQ1DAUSaUjYPReZZmS/5PNiKu1fUvzDd6H7DEDKACSEhu+TQ==",
      "dev": true,
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2099,18 +2091,6 @@
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
      }
    },
-    "node_modules/@eslint/plugin-kit": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.0.tgz",
-      "integrity": "sha512-vH9PiIMMwvhCx31Af3HiGzsVNULDbyVkHXwlemn/B0TFj/00ho3y55efXrUZTfQipxoHC5u4xq6zblww1zm1Ig==",
-      "dev": true,
-      "dependencies": {
-        "levn": "^0.4.1"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      }
-    },
    "node_modules/@googleapis/drive": {
      "version": "8.14.0",
      "resolved": "https://registry.npmjs.org/@googleapis/drive/-/drive-8.14.0.tgz",
@@ -2988,9 +2968,9 @@
      }
    },
    "node_modules/@mongodb-js/saslprep": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.9.tgz",
-      "integrity": "sha512-tVkljjeEaAhCqTzajSdgbQ6gE6f3oneVwa3iXR6csiEwXXOFsiC6Uh9iAjAhXPtqa/XMDHWjjeNH/77m/Yq2dw==",
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.8.tgz",
+      "integrity": "sha512-qKwC/M/nNNaKUBMQ0nuzm47b7ZYWQHN3pcXq4IIcoSBc2hOIrflAxJduIvvqmhoz3gR2TacTAs8vlsCVPkiEdQ==",
      "dependencies": {
        "sparse-bitfield": "^3.0.3"
      }
@@ -3034,9 +3014,9 @@
      }
    },
    "node_modules/@remix-run/router": {
-      "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.19.2.tgz",
-      "integrity": "sha512-baiMx18+IMuD1yyvOGaHM9QrVUPGGG0jC+z+IPHnRJWUAUvaKuWKyE8gjDj2rzv3sz9zOGoRSPgeBVHRhZnBlA==",
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.19.1.tgz",
+      "integrity": "sha512-S45oynt/WH19bHbIXjtli6QmwNYvaz+vtnubvNpNDvUOoA/OWh6j1OikIP3G+v5GHdxyC6EXoChG3HgYGEUfcg==",
      "engines": {
        "node": ">=14.0.0"
      }
@@ -3069,14 +3049,14 @@
      }
    },
    "node_modules/@stylistic/stylelint-plugin": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@stylistic/stylelint-plugin/-/stylelint-plugin-3.1.0.tgz",
-      "integrity": "sha512-NU2XR6i1x163KdyDj3zqblA13890fBzHNZYqZ13aor/sB3Yq8kU/0NKCudv5pfl9Kb/UAteo/D7vKMHtaror/A==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@stylistic/stylelint-plugin/-/stylelint-plugin-3.0.1.tgz",
+      "integrity": "sha512-j3mH8HSw2Rob/KJFWZ627w3CQ8gQqVHtzCdPeEffUg5vOgpz4rgrR+Xw2kU0OQCDcdW8Y1nKfdXKKjM5Rn8X0g==",
      "dev": true,
      "dependencies": {
-        "@csstools/css-parser-algorithms": "^3.0.1",
-        "@csstools/css-tokenizer": "^3.0.1",
-        "@csstools/media-query-list-parser": "^3.0.1",
+        "@csstools/css-parser-algorithms": "^3.0.0",
+        "@csstools/css-tokenizer": "^3.0.0",
+        "@csstools/media-query-list-parser": "^3.0.0",
        "is-plain-object": "^5.0.0",
        "postcss-selector-parser": "^6.1.2",
        "postcss-value-parser": "^4.2.0",
@@ -3135,12 +3115,6 @@
        "@babel/types": "^7.20.7"
      }
    },
-    "node_modules/@types/estree": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
-      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
-      "dev": true
-    },
    "node_modules/@types/graceful-fs": {
      "version": "4.1.9",
      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
@@ -3178,12 +3152,6 @@
        "@types/istanbul-lib-report": "*"
      }
    },
-    "node_modules/@types/json-schema": {
-      "version": "7.0.15",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
-      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
-      "dev": true
-    },
    "node_modules/@types/node": {
      "version": "22.1.0",
      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.1.0.tgz",
@@ -4161,9 +4129,10 @@
      "license": "MIT"
    },
    "node_modules/body-parser": {
-      "version": "1.20.3",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
-      "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
+      "version": "1.20.2",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
+      "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
+      "license": "MIT",
      "dependencies": {
        "bytes": "3.1.2",
        "content-type": "~1.0.5",
@@ -4173,7 +4142,7 @@
        "http-errors": "2.0.0",
        "iconv-lite": "0.4.24",
        "on-finished": "2.4.1",
-        "qs": "6.13.0",
+        "qs": "6.11.0",
        "raw-body": "2.5.2",
        "type-is": "~1.6.18",
        "unpipe": "1.0.0"
@@ -5546,9 +5515,10 @@
      }
    },
    "node_modules/dompurify": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.7.tgz",
-      "integrity": "sha512-VaTstWtsneJY8xzy7DekmYWEOZcmzIe3Qb3zPd4STve1OBTa+e+WmS1ITQec1fZYXI3HCsOZZiSMpG6oxoWMWQ=="
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.6.tgz",
+      "integrity": "sha512-cTOAhc36AalkjtBpfG6O8JimdTMWNXjiePT2xQH/ppBGi/4uIpmj8eKyIkMJErXWARyINV/sB38yf8JCLF5pbQ==",
+      "license": "(MPL-2.0 OR Apache-2.0)"
    },
    "node_modules/duplexer2": {
      "version": "0.1.4",
@@ -5620,9 +5590,10 @@
      "license": "MIT"
    },
    "node_modules/encodeurl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
-      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "license": "MIT",
      "engines": {
        "node": ">= 0.8"
      }
@@ -5849,23 +5820,19 @@
      }
    },
    "node_modules/eslint": {
-      "version": "9.11.1",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.11.1.tgz",
-      "integrity": "sha512-MobhYKIoAO1s1e4VUrgx1l1Sk2JBR/Gqjjgw8+mfgoLE2xwsHur4gdfTxyTgShrhvdVFTaJSgMiQBl1jv/AWxg==",
+      "version": "9.9.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.9.1.tgz",
+      "integrity": "sha512-dHvhrbfr4xFQ9/dq+jcVneZMyRYLjggWjk6RVsIiHsP8Rz6yZ8LvZ//iU4TrZF+SXWG+JkNF2OyiZRvzgRDqMg==",
      "dev": true,
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.2.0",
        "@eslint-community/regexpp": "^4.11.0",
        "@eslint/config-array": "^0.18.0",
-        "@eslint/core": "^0.6.0",
        "@eslint/eslintrc": "^3.1.0",
-        "@eslint/js": "9.11.1",
-        "@eslint/plugin-kit": "^0.2.0",
+        "@eslint/js": "9.9.1",
        "@humanwhocodes/module-importer": "^1.0.1",
        "@humanwhocodes/retry": "^0.3.0",
        "@nodelib/fs.walk": "^1.2.8",
-        "@types/estree": "^1.0.6",
-        "@types/json-schema": "^7.0.15",
        "ajv": "^6.12.4",
        "chalk": "^4.0.0",
        "cross-spawn": "^7.0.2",
@@ -5885,6 +5852,7 @@
        "is-glob": "^4.0.0",
        "is-path-inside": "^3.0.3",
        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
        "lodash.merge": "^4.6.2",
        "minimatch": "^3.1.2",
        "natural-compare": "^1.4.0",
@@ -5936,9 +5904,9 @@
      }
    },
    "node_modules/eslint-plugin-react": {
-      "version": "7.36.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.36.1.tgz",
-      "integrity": "sha512-/qwbqNXZoq+VP30s1d4Nc1C5GTxjJQjk4Jzs4Wq2qzxFM7dSmuG2UkIjg2USMLh3A/aVcUNrK7v0J5U1XEGGwA==",
+      "version": "7.35.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.35.2.tgz",
+      "integrity": "sha512-Rbj2R9zwP2GYNcIak4xoAMV57hrBh3hTaR0k7hVjwCQgryE/pw5px4b13EYjduOI0hfXyZhwBxaGpOTbWSGzKQ==",
      "dev": true,
      "dependencies": {
        "array-includes": "^3.1.8",
@@ -6338,36 +6306,37 @@
      "license": "MIT"
    },
    "node_modules/express": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz",
-      "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==",
+      "version": "4.19.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
+      "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
+      "license": "MIT",
      "dependencies": {
        "accepts": "~1.3.8",
        "array-flatten": "1.1.1",
-        "body-parser": "1.20.3",
+        "body-parser": "1.20.2",
        "content-disposition": "0.5.4",
        "content-type": "~1.0.4",
        "cookie": "0.6.0",
        "cookie-signature": "1.0.6",
        "debug": "2.6.9",
        "depd": "2.0.0",
-        "encodeurl": "~2.0.0",
+        "encodeurl": "~1.0.2",
        "escape-html": "~1.0.3",
        "etag": "~1.8.1",
-        "finalhandler": "1.3.1",
+        "finalhandler": "1.2.0",
        "fresh": "0.5.2",
        "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.3",
+        "merge-descriptors": "1.0.1",
        "methods": "~1.1.2",
        "on-finished": "2.4.1",
        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.10",
+        "path-to-regexp": "0.1.7",
        "proxy-addr": "~2.0.7",
-        "qs": "6.13.0",
+        "qs": "6.11.0",
        "range-parser": "~1.2.1",
        "safe-buffer": "5.2.1",
-        "send": "0.19.0",
-        "serve-static": "1.16.2",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
        "setprototypeof": "1.2.0",
        "statuses": "2.0.1",
        "type-is": "~1.6.18",
@@ -6384,12 +6353,28 @@
      "integrity": "sha512-rCSVtPXRmQSW8rmik/AIb2P0op6l7r1fMW538yyvTMltCO4xQEWMmobfrIxN2V1/mVrgxB8Az3reYF6yUZw37w==",
      "license": "MIT"
    },
+    "node_modules/express-rate-limit": {
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.4.0.tgz",
+      "integrity": "sha512-v1204w3cXu5gCDmAvgvzI6qjzZzoMWKnyVDk3ACgfswTQLYiGen+r8w0VnXnGMmzEN/g8fwIQ4JrFFd4ZP6ssg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/express-rate-limit"
+      },
+      "peerDependencies": {
+        "express": "4 || 5 || ^5.0.0-beta.1"
+      }
+    },
    "node_modules/express-static-gzip": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/express-static-gzip/-/express-static-gzip-2.1.8.tgz",
-      "integrity": "sha512-g8tiJuI9Y9Ffy59ehVXvqb0hhP83JwZiLxzanobPaMbkB5qBWA8nuVgd+rcd5qzH3GkgogTALlc0BaADYwnMbQ==",
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/express-static-gzip/-/express-static-gzip-2.1.7.tgz",
+      "integrity": "sha512-QOCZUC+lhPPCjIJKpQGu1Oa61Axg9Mq09Qvit8Of7kzpMuwDeMSqjjQteQS3OVw/GkENBoSBheuQDWPlngImvw==",
+      "license": "MIT",
      "dependencies": {
-        "serve-static": "^1.16.2"
+        "serve-static": "^1.14.1"
      }
    },
    "node_modules/express/node_modules/cookie": {
@@ -6605,12 +6590,13 @@
      }
    },
    "node_modules/finalhandler": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
-      "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+      "license": "MIT",
      "dependencies": {
        "debug": "2.6.9",
-        "encodeurl": "~2.0.0",
+        "encodeurl": "~1.0.2",
        "escape-html": "~1.0.3",
        "on-finished": "2.4.1",
        "parseurl": "~1.3.3",
@@ -6625,6 +6611,7 @@
      "version": "2.6.9",
      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "license": "MIT",
      "dependencies": {
        "ms": "2.0.0"
      }
@@ -6632,7 +6619,8 @@
    "node_modules/finalhandler/node_modules/ms": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "license": "MIT"
    },
    "node_modules/find-up": {
      "version": "5.0.0",
@@ -10551,12 +10539,10 @@
      }
    },
    "node_modules/merge-descriptors": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
-      "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
+      "license": "MIT"
    },
    "node_modules/merge-stream": {
      "version": "2.0.0",
@@ -10824,13 +10810,13 @@
      }
    },
    "node_modules/mongoose": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.7.0.tgz",
-      "integrity": "sha512-rUCSF1mMYQXjXYdqEQLLlMD3xbcj2j1/hRn+9VnVj7ipzru/UoUZxlj/hWmteKMAh4EFnDZ+BIrmma9l/0Hi1g==",
+      "version": "8.6.1",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.6.1.tgz",
+      "integrity": "sha512-dppGcYqvsdg+VcnqXR5b467V4a+iNhmvkfYNpEPi6AjaUxnz6ioEDmrMLOi+sOWjvoHapuwPOigV4f2l7HC6ag==",
      "dependencies": {
        "bson": "^6.7.0",
        "kareem": "2.6.3",
-        "mongodb": "6.9.0",
+        "mongodb": "6.8.0",
        "mpath": "0.9.0",
        "mquery": "5.0.0",
        "ms": "2.1.3",
@@ -10902,9 +10888,9 @@
      }
    },
    "node_modules/mongoose/node_modules/mongodb": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.9.0.tgz",
-      "integrity": "sha512-UMopBVx1LmEUbW/QE0Hw18u583PEDVQmUmVzzBRH0o/xtE9DBRA5ZYLOjpLIa03i8FXjzvQECJcqoMvCXftTUA==",
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.8.0.tgz",
+      "integrity": "sha512-HGQ9NWDle5WvwMnrvUxsFYPd3JEbqD3RgABHBQRuoCEND0qzhsd0iH5ypHsf1eJ+sXmvmyKpP+FLOKY8Il7jMw==",
      "dependencies": {
        "@mongodb-js/saslprep": "^1.1.5",
        "bson": "^6.7.0",
@@ -11667,9 +11653,10 @@
      }
    },
    "node_modules/path-to-regexp": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
-      "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
+      "license": "MIT"
    },
    "node_modules/path-type": {
      "version": "4.0.0",
@@ -12103,11 +12090,12 @@
      "license": "MIT"
    },
    "node_modules/qs": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
-      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "license": "BSD-3-Clause",
      "dependencies": {
-        "side-channel": "^1.0.6"
+        "side-channel": "^1.0.4"
      },
      "engines": {
        "node": ">=0.6"
@@ -12232,11 +12220,11 @@
      "license": "MIT"
    },
    "node_modules/react-router": {
-      "version": "6.26.2",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.26.2.tgz",
-      "integrity": "sha512-tvN1iuT03kHgOFnLPfLJ8V95eijteveqdOSk+srqfePtQvqCExB8eHOYnlilbOcyJyKnYkr1vJvf7YqotAJu1A==",
+      "version": "6.26.1",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.26.1.tgz",
+      "integrity": "sha512-kIwJveZNwp7teQRI5QmwWo39A5bXRyqpH0COKKmPnyD2vBvDwgFXSqDUYtt1h+FEyfnE8eXr7oe0MxRzVwCcvQ==",
      "dependencies": {
-        "@remix-run/router": "1.19.2"
+        "@remix-run/router": "1.19.1"
      },
      "engines": {
        "node": ">=14.0.0"
@@ -12246,12 +12234,12 @@
      }
    },
    "node_modules/react-router-dom": {
-      "version": "6.26.2",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.26.2.tgz",
-      "integrity": "sha512-z7YkaEW0Dy35T3/QKPYB1LjMK2R1fxnHO8kWpUMTBdfVzZrWOiY9a7CtN8HqdWtDUWd5FY6Dl8HFsqVwH4uOtQ==",
+      "version": "6.26.1",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.26.1.tgz",
+      "integrity": "sha512-veut7m41S1fLql4pLhxeSW3jlqs+4MtjRLj0xvuCEXsxusJCbs6I8yn9BxzzDX2XDgafrccY6hwjmd/bL54tFw==",
      "dependencies": {
-        "@remix-run/router": "1.19.2",
-        "react-router": "6.26.2"
+        "@remix-run/router": "1.19.1",
+        "react-router": "6.26.1"
      },
      "engines": {
        "node": ">=14.0.0"
@@ -12749,9 +12737,10 @@
      }
    },
    "node_modules/send": {
-      "version": "0.19.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
-      "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+      "license": "MIT",
      "dependencies": {
        "debug": "2.6.9",
        "depd": "2.0.0",
@@ -12775,6 +12764,7 @@
      "version": "2.6.9",
      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "license": "MIT",
      "dependencies": {
        "ms": "2.0.0"
      }
@@ -12782,30 +12772,25 @@
    "node_modules/send/node_modules/debug/node_modules/ms": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
-    "node_modules/send/node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-      "engines": {
-        "node": ">= 0.8"
-      }
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "license": "MIT"
    },
    "node_modules/send/node_modules/ms": {
      "version": "2.1.3",
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "license": "MIT"
    },
    "node_modules/serve-static": {
-      "version": "1.16.2",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
-      "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+      "license": "MIT",
      "dependencies": {
-        "encodeurl": "~2.0.0",
+        "encodeurl": "~1.0.2",
        "escape-html": "~1.0.3",
        "parseurl": "~1.3.3",
-        "send": "0.19.0"
+        "send": "0.18.0"
      },
      "engines": {
        "node": ">= 0.8.0"
@@ -13649,9 +13634,9 @@
      }
    },
    "node_modules/stylelint-config-recess-order": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/stylelint-config-recess-order/-/stylelint-config-recess-order-5.1.1.tgz",
-      "integrity": "sha512-eDAHWVBelzDbMbdMj15pSw0Ycykv5eLeriJdbGCp0zd44yvhgZLI+wyVHegzXp5NrstxTPSxl0fuOVKdMm0XLA==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recess-order/-/stylelint-config-recess-order-5.1.0.tgz",
+      "integrity": "sha512-ddapCF6B/kEtQYIFhQFReQ0dvK1ZdgJDM/SGFtIyeooYDbqaJqcOlGkRRGaVErCQYJY/bPSPsLRS2LdQtLJUVQ==",
      "dev": true,
      "dependencies": {
        "stylelint-order": "^6.0.4"
@@ -14647,6 +14632,21 @@
      "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
      "license": "MIT"
    },
+    "node_modules/url/node_modules/qs": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "side-channel": "^1.0.6"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
    "node_modules/use": {
      "version": "3.1.1",
      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
--- a/package.json
+++ b/package.json
@@ -96,11 +96,12 @@
    "cookie-parser": "^1.4.6",
    "create-react-class": "^15.7.0",
    "dedent-tabs": "^0.10.3",
-    "dompurify": "^3.1.7",
+    "dompurify": "^3.1.6",
    "expr-eval": "^2.0.2",
-    "express": "^4.21.0",
+    "express": "^4.19.2",
    "express-async-handler": "^1.2.0",
-    "express-static-gzip": "2.1.8",
+    "express-rate-limit": "^7.4.0",
+    "express-static-gzip": "2.1.7",
    "fs-extra": "11.2.0",
    "js-yaml": "^4.1.0",
    "jwt-simple": "^0.5.6",
@@ -113,29 +114,29 @@
    "marked-smartypants-lite": "^1.0.2",
    "markedLegacy": "npm:marked@^0.3.19",
    "moment": "^2.30.1",
-    "mongoose": "^8.7.0",
+    "mongoose": "^8.6.1",
    "nanoid": "3.3.4",
    "nconf": "^0.12.1",
    "react": "^18.3.1",
    "react-dom": "^18.3.1",
    "react-frame-component": "^4.1.3",
-    "react-router-dom": "6.26.2",
+    "react-router-dom": "6.26.1",
    "sanitize-filename": "1.6.3",
    "superagent": "^10.1.0",
    "vitreum": "git+https://git@github.com/calculuschild/vitreum.git"
  },
  "devDependencies": {
-    "@stylistic/stylelint-plugin": "^3.1.0",
-    "eslint": "^9.11.1",
+    "@stylistic/stylelint-plugin": "^3.0.1",
+    "eslint": "^9.9.1",
    "eslint-plugin-jest": "^28.8.3",
-    "eslint-plugin-react": "^7.36.1",
+    "eslint-plugin-react": "^7.35.2",
    "globals": "^15.9.0",
    "jest": "^29.7.0",
    "jest-expect-message": "^1.1.3",
    "postcss-less": "^6.0.0",
    "stylelint": "^16.9.0",
-    "stylelint-config-recess-order": "^5.1.1",
+    "stylelint-config-recess-order": "^5.1.0",
    "stylelint-config-recommended": "^14.0.1",
    "supertest": "^7.0.0"
  }
-}
+}
--- a/server/app.js
+++ b/server/app.js
--- a/server/googleActions.js
+++ b/server/googleActions.js
@@ -25,6 +25,15 @@ if(!config.get('service_account')){

 const defaultAuth = serviceAuth || config.get('google_api_key');

+const retryConfig = {
+  retry: 3, // Number of retry attempts
+  retryDelay: 100, // Initial delay in milliseconds
+  retryDelayMultiplier: 2, // Multiplier for exponential backoff
+  maxRetryDelay: 32000, // Maximum delay in milliseconds
+  httpMethodsToRetry: ['PATCH'], // Only retry PATCH requests
+  statusCodesToRetry: [[429, 429]], // Only retry on 429 status code
+};
+
 const GoogleActions = {

 	authCheck : (account, res, updateTokens=true)=>{
@@ -112,9 +121,7 @@ const GoogleActions = {
 			})
 			.catch((err)=>{
 				console.log(`Error Listing Google Brews`);
-				console.error(err);
 				throw (err);
-				//TODO: Should break out here, but continues on for some reason.
 			});
 			fileList.push(...obj.data.files);
 			NextPageToken = obj.data.nextPageToken;
@@ -147,8 +154,9 @@ const GoogleActions = {
 	  return brews;
 	},

-	updateGoogleBrew : async (brew)=>{
-		const drive = googleDrive.drive({ version: 'v3', auth: defaultAuth });
+	updateGoogleBrew : async (brew, auth = defaultAuth, userIp)=>{
+		const drive = googleDrive.drive({ version: 'v3', auth: auth });
+		console.log(auth == defaultAuth ? 'UPDATE w SERVICEACC' : 'UPDATE w USERACC')

 		await drive.files.update({
 			fileId   : brew.googleId,
@@ -168,7 +176,11 @@ const GoogleActions = {
 			media : {
 				mimeType : 'text/plain',
 				body     : brew.text
-			}
+			},
+			headers: {
+				'X-Forwarded-For': userIp, // Set the X-Forwarded-For header
+			},
+			retryConfig
 		})
 		.catch((err)=>{
 			console.log('Error saving to google');
@@ -210,6 +222,7 @@ const GoogleActions = {
 		})
 		.catch((err)=>{
 			console.log('Error while creating new Google brew');
+			console.error(err);
 			throw (err);
 		});

--- a/server/homebrew.api.js
+++ b/server/homebrew.api.js
@@ -9,6 +9,7 @@ const yaml = require('js-yaml');
 const asyncHandler = require('express-async-handler');
 const { nanoid } = require('nanoid');
 const { splitTextStyleAndMetadata } = require('../shared/helpers.js');
+const rateLimit = require('express-rate-limit');

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

@@ -353,7 +354,7 @@ const api = {
 			if(!brew.googleId) return;
 		} else if(brew.googleId) {
 			// If the google id exists and no other actions are being performed, update the google brew
-			const updated = await GoogleActions.updateGoogleBrew(api.excludeGoogleProps(brew));
+			const updated = await api.updateGoogleBrew(req.account, api.excludeGoogleProps(brew), res, req);

 			if(!updated) return;
 		}
@@ -397,6 +398,15 @@ const api = {

 		res.status(200).send(saved);
 	},
+
+	updateGoogleBrew : async (account, brew, res, req)=>{
+		//let oAuth2Client;
+		//if(account.googleId)
+		//	oAuth2Client = GoogleActions.authCheck(account, res);
+
+		return await GoogleActions.updateGoogleBrew(brew, undefined, req.ip);
+	},
+
 	deleteGoogleBrew : async (account, id, editId, res)=>{
 		const auth = await GoogleActions.authCheck(account, res);
 		await GoogleActions.deleteGoogleBrew(auth, id, editId);
--- a/server/homebrew.api.spec.js
+++ b/server/homebrew.api.spec.js
@@ -924,7 +924,7 @@ brew`);
 			expect(req.brew).toEqual(testBrew);
 			expect(req.brew).toHaveProperty('style', '\nI Have a style!\n');
 			expect(res.status).toHaveBeenCalledWith(200);
-			expect(res.send).toHaveBeenCalledWith('\nI Have a style!\n');
+			expect(res.send).toHaveBeenCalledWith("\nI Have a style!\n");
 			expect(res.set).toHaveBeenCalledWith({
 				'Cache-Control' : 'no-cache',
 				'Content-Type'  : 'text/css'
--- a/server/vault.api.js
+++ b/server/vault.api.js
@@ -29,18 +29,12 @@ const rendererConditions = (legacy, v3)=>{
 	return {}; // If all renderers selected, renderer field not needed in query for speed
 };

-const sortConditions = (sort, dir) => {
-	return { [sort]: dir === 'asc' ? 1 : -1 };
-};
-
 const findBrews = async (req, res)=>{
 	const title  = req.query.title || '';
 	const author = req.query.author || '';
 	const page   = Math.max(parseInt(req.query.page)  || 1, 1);
 	const count  = Math.max(parseInt(req.query.count) || 20, 10);
 	const skip   = (page - 1) * count;
-	const sort = req.query.sort || 'title';
-	const dir = req.query.dir || 'asc';

 	const combinedQuery = {
 		$and : [
@@ -60,7 +54,6 @@ const findBrews = async (req, res)=>{
 	};

 	await HomebrewModel.find(combinedQuery, projection)
-		.sort(sortConditions(sort, dir))
 		.skip(skip)
 		.limit(count)
 		.maxTimeMS(5000)
--- a/shared/naturalcrit/codeEditor/codeEditor.jsx
+++ b/shared/naturalcrit/codeEditor/codeEditor.jsx
@@ -397,11 +397,6 @@ const CodeEditor = createClass({
 	getCursorPosition : function(){
 		return this.codeMirror.getCursor();
 	},
-	getTopVisibleLine : function(){
-		const rect = this.codeMirror.getWrapperElement().getBoundingClientRect();
-		const topVisibleLine = this.codeMirror.lineAtHeight(rect.top, 'window');
-		return topVisibleLine;
-	},
 	updateSize : function(){
 		this.codeMirror.refresh();
 	},
--- a/shared/naturalcrit/markdown.js
+++ b/shared/naturalcrit/markdown.js
@@ -105,16 +105,16 @@ renderer.link = function (href, title, text) {
 // Expose `src` attribute as `--HB_src` to make the URL accessible via CSS
 renderer.image = function (href, title, text) {
 	href = cleanUrl(href);
-	if(href === null)
+	if (href === null)
 		return text;

 	let out = `<img src="${href}" alt="${text}" style="--HB_src:url(${href});"`;
-	if(title)
+	if (title)
 		out += ` title="${title}"`;

 	out += '>';
 	return out;
-};
+}

 // Disable default reflink behavior, as it steps on our variables extension
 tokenizer.def = function () {
@@ -745,7 +745,7 @@ const tableTerminators = [
 	`:+\\n`,                // hardBreak
 	` *{[^\n]+}`,           // blockInjector
 	` *{{[^{\n]*\n.*?\n}}`  // mustacheDiv
-];
+]

 Marked.use(MarkedVariables());
 Marked.use({ extensions : [definitionListsMultiLine, definitionListsSingleLine, forcedParagraphBreaks, superSubScripts,
@@ -755,12 +755,12 @@ Marked.use({ renderer: renderer, tokenizer: tokenizer, mangle: false });
 Marked.use(MarkedExtendedTables(tableTerminators), MarkedGFMHeadingId({ globalSlugs: true }), MarkedSmartypantsLite(), MarkedEmojis(MarkedEmojiOptions));

 function cleanUrl(href) {
-	try {
-		href = encodeURI(href).replace(/%25/g, '%');
-	} catch {
-		return null;
-	}
-	return href;
+  try {
+    href = encodeURI(href).replace(/%25/g, '%');
+  } catch {
+    return null;
+  }
+  return href;
 }

 const escapeTest = /[&<>"']/;
--- a/shared/naturalcrit/splitPane/splitPane.jsx
+++ b/shared/naturalcrit/splitPane/splitPane.jsx
@@ -42,10 +42,6 @@ const SplitPane = createClass({
 			});
 		}
 		window.addEventListener('resize', this.handleWindowResize);
-
-		// This lives here instead of in the initial render because you cannot touch localStorage until the componant mounts.
-		const loadLiveScroll = window.localStorage.getItem('liveScroll') === 'true';
-		this.setState({ liveScroll: loadLiveScroll });
 	},

 	componentWillUnmount : function() {
@@ -93,11 +89,6 @@ const SplitPane = createClass({
 			userSetDividerPos : newSize
 		});
 	},
-
-	liveScrollToggle : function() {
-		window.localStorage.setItem('liveScroll', String(!this.state.liveScroll));
-		this.setState({ liveScroll: !this.state.liveScroll });
-	},
 	/*
 	unFocus : function() {
 		if(document.selection){
@@ -129,18 +120,13 @@ const SplitPane = createClass({
 					onClick={()=>this.setState({ moveBrew: !this.state.moveBrew })} >
 					<i className='fas fa-arrow-right' />
 				</div>
-				<div id='scrollToggleDiv' className={this.state.liveScroll ? 'arrow lock' : 'arrow unlock'}
-					style={{ left: this.state.currentDividerPos-4 }}
-					onClick={this.liveScrollToggle} >
-					<i id='scrollToggle' className={this.state.liveScroll ? 'fas fa-lock' : 'fas fa-unlock'} />
-				</div>
 			</>;
 		}
 	},

 	renderDivider : function(){
 		return <>
-			{this.props.showDividerButtons && this.renderMoveArrows()}
+			{this.renderMoveArrows()}
 			<div className='divider' onPointerDown={this.handleDown} >
 				<div className='dots'>
 					<i className='fas fa-circle' />
@@ -158,10 +144,9 @@ const SplitPane = createClass({
 			>
 				{React.cloneElement(this.props.children[0], {
 					...(this.props.showDividerButtons && {
-						moveBrew      : this.state.moveBrew,
-						moveSource    : this.state.moveSource,
-						liveScroll    : this.state.liveScroll,
-						setMoveArrows : this.setMoveArrows,
+						moveBrew: this.state.moveBrew,
+						moveSource: this.state.moveSource,
+						setMoveArrows: this.setMoveArrows,
 					}),
 				})}
 			</Pane>
--- a/shared/naturalcrit/splitPane/splitPane.less
+++ b/shared/naturalcrit/splitPane/splitPane.less
@@ -53,15 +53,6 @@
 			.tooltipRight('Jump to location in Preview');
 			top : 60px;
 		}
-		&.lock{
-			.tooltipRight('De-sync Editor and Preview locations.');
-			top : 90px;
-			background: #666;
-		}
-		&.unlock{
-			.tooltipRight('Sync Editor and Preview locations');
-			top : 90px;
-		}
 		&:hover{
 			background-color: #666;
 		}
--- a/themes/V3/5ePHB/snippets.js
+++ b/themes/V3/5ePHB/snippets.js
@@ -27,154 +27,35 @@ module.exports = [
 				experimental : true,
 				subsnippets  : [
 					{
-						name         : 'Generate Table of Contents',
+						name         : 'Table of Contents',
 						icon         : 'fas fa-book',
 						gen          : TableOfContentsGen,
 						experimental : true
 					},
 					{
-						name : 'Table of Contents Individual Inclusion',
-						icon : 'fas fa-book',
-						gen  : dedent `\n{{tocInclude# CHANGE # to your header level
-							}}\n`,
-						subsnippets : [
-							{
-								name : 'Individual Inclusion H1',
-								icon : 'fas fa-book',
-								gen  : dedent `\n{{tocIncludeH1 \n
-									}}\n`,
-							},
-							{
-								name : 'Individual Inclusion H2',
-								icon : 'fas fa-book',
-								gen  : dedent `\n{{tocIncludeH2 \n
-									}}\n`,
-							},
-							{
-								name : 'Individual Inclusion H3',
-								icon : 'fas fa-book',
-								gen  : dedent `\n{{tocIncludeH3 \n
-									}}\n`,
-							},
-							{
-								name : 'Individual Inclusion H4',
-								icon : 'fas fa-book',
-								gen  : dedent `\n{{tocIncludeH4 \n
-									}}\n`,
-							},
-							{
-								name : 'Individual Inclusion H5',
-								icon : 'fas fa-book',
-								gen  : dedent `\n{{tocIncludeH5 \n
-									}}\n`,
-							},
-							{
-								name : 'Individual Inclusion H6',
-								icon : 'fas fa-book',
-								gen  : dedent `\n{{tocIncludeH6 \n
-									}}\n`,
-							}
-						]
-					},
-					{
-						name : 'Table of Contents Range Inclusion',
-						icon : 'fas fa-book',
+						name : 'Include in ToC up to H3',
+						icon : 'fas fa-dice-three',
 						gen  : dedent `\n{{tocDepthH3
 							}}\n`,
-						subsnippets : [
-							{
-								name : 'Include in ToC up to H3',
-								icon : 'fas fa-dice-three',
-								gen  : dedent `\n{{tocDepthH3
-									}}\n`,

-							},
-							{
-								name : 'Include in ToC up to H4',
-								icon : 'fas fa-dice-four',
-								gen  : dedent `\n{{tocDepthH4
-									}}\n`,
-							},
-							{
-								name : 'Include in ToC up to H5',
-								icon : 'fas fa-dice-five',
-								gen  : dedent `\n{{tocDepthH5
-									}}\n`,
-							},
-							{
-								name : 'Include in ToC up to H6',
-								icon : 'fas fa-dice-six',
-								gen  : dedent `\n{{tocDepthH6
-									}}\n`,
-							},
-						]
 					},
 					{
-						name : 'Table of Contents Individual Exclusion',
-						icon : 'fas fa-book',
-						gen  : dedent `\n{{tocExcludeH1 \n
+						name : 'Include in ToC up to H4',
+						icon : 'fas fa-dice-four',
+						gen  : dedent `\n{{tocDepthH4
 							}}\n`,
-						subsnippets : [
-							{
-								name : 'Individual Exclusion H1',
-								icon : 'fas fa-book',
-								gen  : dedent `\n{{tocExcludeH1 \n
-									}}\n`,
-							},
-							{
-								name : 'Individual Exclusion H2',
-								icon : 'fas fa-book',
-								gen  : dedent `\n{{tocExcludeH2 \n
-									}}\n`,
-							},
-							{
-								name : 'Individual Exclusion H3',
-								icon : 'fas fa-book',
-								gen  : dedent `\n{{tocExcludeH3 \n
-									}}\n`,
-							},
-							{
-								name : 'Individual Exclusion H4',
-								icon : 'fas fa-book',
-								gen  : dedent `\n{{tocExcludeH4 \n
-									}}\n`,
-							},
-							{
-								name : 'Individual Exclusion H5',
-								icon : 'fas fa-book',
-								gen  : dedent `\n{{tocExcludeH5 \n
-									}}\n`,
-							},
-							{
-								name : 'Individual Exclusion H6',
-								icon : 'fas fa-book',
-								gen  : dedent `\n{{tocExcludeH6 \n
-									}}\n`,
-							},
-						]
 					},
-
 					{
-						name        : 'Table of Contents Toggles',
-						icon        : 'fas fa-book',
-						gen         : `{{tocGlobalH4}}\n\n`,
-						subsnippets : [
-							{
-								name : 'Enable H1-H4 all pages',
-								icon : 'fas fa-dice-four',
-								gen  : `{{tocGlobalH4}}\n\n`,
-							},
-							{
-								name : 'Enable H1-H5 all pages',
-								icon : 'fas fa-dice-five',
-								gen  : `{{tocGlobalH5}}\n\n`,
-							},
-							{
-								name : 'Enable H1-H6 all pages',
-								icon : 'fas fa-dice-six',
-								gen  : `{{tocGlobalH6}}\n\n`,
-							},
-						]
+						name : 'Include in ToC up to H5',
+						icon : 'fas fa-dice-five',
+						gen  : dedent `\n{{tocDepthH5
+							}}\n`,
+					},
+					{
+						name : 'Include in ToC up to H6',
+						icon : 'fas fa-dice-six',
+						gen  : dedent `\n{{tocDepthH6
+							}}\n`,
 					}
 				]
 			},
@@ -213,7 +94,7 @@ module.exports = [
 							background-image: linear-gradient(-45deg, #322814, #998250, #322814);
 							line-height: 1em;
 						}\n\n`
-			},
+			}
 		]
 	},

--- a/themes/V3/5ePHB/snippets/tableOfContents.gen.js
+++ b/themes/V3/5ePHB/snippets/tableOfContents.gen.js
@@ -1,78 +1,77 @@
+const _ = require('lodash');
 const dedent = require('dedent-tabs').default;

-// Map each actual page to its footer label, accounting for skips or numbering resets
-const mapPages = (pages)=>{
-	let actualPage = 0;
-	let mappedPage = 0; // Number displayed in footer
-	const pageMap    = [];
+const getTOC = (pages)=>{

-	pages.forEach((page)=>{
-		actualPage++;
-		const doSkip  = page.querySelector('.skipCounting');
-		const doReset = page.querySelector('.resetCounting');
-
-		if(doReset)
-			mappedPage = 1;
-		if(!doSkip && !doReset)
-			mappedPage++;
-
-		pageMap[actualPage] = {
-			mappedPage : mappedPage,
-			showPage   : !doSkip
-		};
-	});
-	return pageMap;
-};
-
-const getMarkdown = (headings, pageMap)=>{
-	const levelPad    = ['- ###', '  - ####', '    -', '      -', '        -', '          -'];
-
-	const allMarkdown = [];
-	const depthChain  = [0];
-
-	headings.forEach((heading)=>{
-		const page       = parseInt(heading.closest('.page').id?.replace(/^p/, ''));
-		const mappedPage = pageMap[page].mappedPage;
-		const showPage   = pageMap[page].showPage;
-		const title      = heading.textContent.trim();
-		const ToCExclude = getComputedStyle(heading).getPropertyValue('--TOC');
-		const depth      = parseInt(heading.tagName.substring(1));
-
-		if(!title || !showPage || ToCExclude == 'exclude')
-			return;
-
-		//If different header depth than last, remove indents until nearest higher-level header, then indent once
-		if(depth !== depthChain[depthChain.length -1]) {
-			while (depth <= depthChain[depthChain.length - 1]) {
-				depthChain.pop();
+	const recursiveAdd = (title, page, targetDepth, child, curDepth=0)=>{
+		if(curDepth > 5) return; // Something went wrong.
+		if(curDepth == targetDepth) {
+			child.push({
+				title    : title,
+				page     : page,
+				children : []
+			});
+		} else {
+			if(child.length == 0) {
+				child.push({
+					title    : null,
+					page     : page,
+					children : []
+				});
 			}
-			depthChain.push(depth);
+			recursiveAdd(title, page, targetDepth, _.last(child).children, curDepth+1,);
 		}
+	};

-		const markdown = `${levelPad[depthChain.length - 2]} [{{ ${title}}}{{ ${mappedPage}}}](#p${page})`;
-		allMarkdown.push(markdown);
-	});
-	return allMarkdown.join('\n');
-};
+	const res = [];

-const getTOC = ()=>{
 	const iframe = document.getElementById('BrewRenderer');
 	const iframeDocument = iframe.contentDocument || iframe.contentWindow.document;
 	const headings = iframeDocument.querySelectorAll('h1, h2, h3, h4, h5, h6');
-	const pages    = iframeDocument.querySelectorAll('.page');
+	const headerDepth = ['H1', 'H2', 'H3', 'H4', 'H5', 'H6'];

-	const pageMap = mapPages(pages);
-	return getMarkdown(headings, pageMap);
+	_.each(headings, (heading)=>{
+		const onPage = parseInt(heading.closest('.page').id?.replace(/^p/, ''));
+		const ToCExclude = getComputedStyle(heading).getPropertyValue('--TOC');
+
+		if(ToCExclude != 'exclude') {
+			recursiveAdd(heading.textContent.trim(), onPage, headerDepth.indexOf(heading.tagName), res);
+		}
+	});
+	return res;
+};
+
+
+const ToCIterate = (entries, curDepth=0)=>{
+	const levelPad = ['- ###', '  - ####', '    - ', '      - ', '        - ', '          - '];
+	const toc = [];
+	if(entries.title !== null){
+		toc.push(`${levelPad[curDepth]} [{{ ${entries.title}}}{{ ${entries.page}}}](#p${entries.page})`);
+	}
+	if(entries.children.length) {
+		_.each(entries.children, (entry, idx)=>{
+			const children = ToCIterate(entry, entry.title == null ? curDepth : curDepth+1);
+			if(children.length) {
+				toc.push(...children);
+			}
+		});
+	}
+	return toc;
 };

 module.exports = function(props){
-	const TOC = getTOC();
+	const pages = props.brew.text.split('\\page');
+	const TOC = getTOC(pages);
+	const markdown = _.reduce(TOC, (r, g1, idx1)=>{
+		r.push(ToCIterate(g1).join('\n'));
+		return r;
+	}, []).join('\n');

 	return dedent`
 		{{toc,wide
 		# Contents

-		${TOC}
+		${markdown}
 		}}
 		\n`;
-};
+};
--- a/themes/V3/5ePHB/style.less
+++ b/themes/V3/5ePHB/style.less
@@ -11,7 +11,6 @@
 	--HB_Color_CaptionText           : #766649; // Brown
 	--HB_Color_WatercolorStain       : #BBAD82; // Light brown
 	--HB_Color_Footnotes             : #C9AD6A; // Gold
-	--TOC                            : 'include';
 }

 .useSansSerif() {
@@ -798,7 +797,7 @@
 // *****************************/

 // Default Exclusions
-// Anything not excluded is included, default Headers are H1, H2, and H3.
+// Anything not exlcuded is included, default Headers are H1, H2, and H3.
 h4,
 h5,
 h6,
@@ -809,44 +808,18 @@ h6,
 .noToC,
 .toc { --TOC: exclude; }

-
-// Brew level default inclusion changes.
-// These add Headers 'back' to inclusion.
-.pages:has(.tocGlobalH4) {
-	h4 {--TOC: include; }
-}
-
-.pages:has(.tocGlobalH5) {
-	h4, h5 {--TOC: include; }
-}
-
-.pages:has(.tocGlobalH6) {
-	h4, h5, h6 {--TOC: include; }
-}
-
-// Block level inclusion changes
-// These include either a single  (include) or a range (depth)
-.tocIncludeH1 h1 {--TOC: include; }
-.tocIncludeH2 h2 {--TOC: include; }
-.tocIncludeH3 h3 {--TOC: include; }
-.tocIncludeH4 h4 {--TOC: include; }
-.tocIncludeH5 h5 {--TOC: include; }
-.tocIncludeH6 h6 {--TOC: include; }
-
 .tocDepthH2 :is(h1, h2) {--TOC: include; }
 .tocDepthH3 :is(h1, h2, h3) {--TOC: include; }
 .tocDepthH4 :is(h1, h2, h3, h4) {--TOC: include; }
 .tocDepthH5 :is(h1, h2, h3, h4, h5) {--TOC: include; }
 .tocDepthH6 :is(h1, h2, h3, h4, h5, h6) {--TOC: include; }

-// Block level exclusion changes
-// These exclude a single block level
-.tocExcludeH1 h1 {--TOC: exclude; }
-.tocExcludeH2 h2 {--TOC: exclude; }
-.tocExcludeH3 h3 {--TOC: exclude; }
-.tocExcludeH4 h4 {--TOC: exclude; }
-.tocExcludeH5 h5 {--TOC: exclude; }
-.tocExcludeH6 h6 {--TOC: exclude; }
+.tocIncludeH1 h1 {--TOC: include; }
+.tocIncludeH2 h2 {--TOC: include; }
+.tocIncludeH3 h3 {--TOC: include; }
+.tocIncludeH4 h4 {--TOC: include; }
+.tocIncludeH5 h5 {--TOC: include; }
+.tocIncludeH6 h6 {--TOC: include; }

 .page:has(.partCover) {
 	--TOC: exclude;
--- a/themes/V3/Blank/snippets.js
+++ b/themes/V3/Blank/snippets.js
@@ -23,30 +23,14 @@ module.exports = [
 				gen  : '\n\\page\n'
 			},
 			{
-				name        : 'Page Numbering',
-				icon        : 'fas fa-bookmark',
-				subsnippets : [
-					{
-						name : 'Page Number',
-						icon : 'fas fa-bookmark',
-						gen  : '{{pageNumber 1}}\n'
-					},
-					{
-						name : 'Auto-incrementing Page Number',
-						icon : 'fas fa-sort-numeric-down',
-						gen  : '{{pageNumber,auto}}\n'
-					},
-					{
-						name : 'Skip Page Number Increment this Page',
-						icon : 'fas fa-xmark',
-						gen  : '{{skipCounting}}\n'
-					},
-					{
-						name : 'Restart Numbering',
-						icon : 'fas fa-arrow-rotate-left',
-						gen  : '{{resetCounting}}\n'
-					},
-				]
+				name : 'Page Number',
+				icon : 'fas fa-bookmark',
+				gen  : '{{pageNumber 1}}\n'
+			},
+			{
+				name : 'Auto-incrementing Page Number',
+				icon : 'fas fa-sort-numeric-down',
+				gen  : '{{pageNumber,auto}}\n'
 			},
 			{
 				name        : 'Footer',
@@ -368,11 +352,6 @@ module.exports = [
 				icon : 'font MrEavesRemake',
 				gen	 : dedent`{{font-family:MrEavesRemake Dummy Text}}`
 			},
-			{
-				name : 'Pagella',
-				icon : 'font Pagella',
-				gen	 : dedent`{{font-family:Pagella Dummy Text}}`
-			},
 			{
 				name : 'Solbera Imitation',
 				icon : 'font SolberaImitationRemake',
@@ -431,40 +410,22 @@ module.exports = [
 		]
 	},

-	/**************** LAYOUT *************/
+	/**************** PAGE *************/

 	{
 		groupName : 'Print',
 		icon      : 'fas fa-print',
 		view      : 'style',
 		snippets  : [
-			{
-				name : 'A3 Page Size',
-				icon : 'far fa-file',
-				gen  : dedent`/* A3 Page Size */
-					.page {
-						width  : 297mm;
-						height : 420mm;
-					}\n\n`,
-			},
 			{
 				name : 'A4 Page Size',
 				icon : 'far fa-file',
 				gen  : dedent`/* A4 Page Size */
-					.page {
+					.page{
 						width  : 210mm;
 						height : 296.8mm;
 					}\n\n`
 			},
-			{
-				name : 'A5 Page Size',
-				icon : 'far fa-file',
-				gen  : dedent`/* A5 Page Size */
-					.page {
-						width  : 148mm;
-						height : 210mm;
-				}\n\n`,
-			},
 			{
 				name : 'Square Page Size',
 				icon : 'far fa-file',
@@ -476,17 +437,6 @@ module.exports = [
 						columns : unset;
 					}\n\n`
 			},
-			{
-				name : 'Card Page Size',
-				icon : 'far fa-file',
-				gen  : dedent`/* Card Size */
-					.page {
-						width     : 63.5mm;
-						height    : 88.9mm;
-						padding	  : 5mm;
-						columns	  : unset;
-					}\n\n`
-			},
 			{
 				name : 'Ink Friendly',
 				icon : 'fas fa-tint',
@@ -502,5 +452,5 @@ module.exports = [
 					}\n\n`
 			},
 		]
-	},
+	}
 ];
--- a/themes/V3/Blank/style.less
+++ b/themes/V3/Blank/style.less
@@ -1,4 +1,3 @@
-@import (less) './themes/fonts/Blank/fonts.less';
@import (less) './themes/fonts/5e/fonts.less';
@import (less) './themes/assets/assets.less';
@import (less) './themes/fonts/iconFonts/elderberryInn.less';
@@ -13,7 +12,7 @@
 }

@page { margin : 0; }
-body { counter-reset : page-numbers 0; }
+body { counter-reset : page-numbers; }
 * { -webkit-print-color-adjust : exact; }

 //*****************************
@@ -52,6 +51,7 @@ body { counter-reset : page-numbers 0; }
 	height            : 279.4mm;
 	padding           : 1.4cm 1.9cm 1.7cm;
 	overflow          : hidden;
+	counter-increment : page-numbers;
 	background-color  : var(--HB_Color_Background);
 	text-rendering    : optimizeLegibility;
 	contain           : size;
@@ -494,13 +494,4 @@ body { counter-reset : page-numbers 0; }
 	&:nth-child(even) {
 		.pageNumber { left : 30px; }
 	}
-
-	.resetCounting {
-		counter-set : page-numbers 1;
-	}
-
-	&:not(:has(.skipCounting)) {
-		counter-increment : page-numbers;
-	}
-
-}
+}
--- a/themes/fonts/Blank/fonts.less
+++ b/themes/fonts/Blank/fonts.less
@@ -1,46 +0,0 @@
-/* 
-TeX Gyre Pagella
-License:
-  % Copyright 2007--2018 for TeX Gyre extensions by B. Jackowski,
-  % J.M. Nowacki et al. (on behalf of TeX Users Groups). Vietnamese
-  % characters were added by Han The Thanh.
-  %
-  % This work can be freely used and distributed under
-  % the GUST Font License (GFL -- see GUST-FONT-LICENSE.txt)
-  % which is actually an instance of the LaTeX Project Public License
-  % (LPPL -- see http://www.latex-project.org/lppl.txt ).
-  %
-  % This work has the maintenance status "maintained". The Current Maintainer
-  % of this work is Bogus\l{}aw Jackowski and Janusz M. Nowacki.
-  %
-  % This work consists of the files listed
-  % in the MANIFEST-TeX-Gyre-Pagella.txt file.
-*/
-
-@font-face {
-	font-family: Pagella;
-	src: url('../../../fonts/Blank/texgyrepagella-regular.woff2');
-	font-weight: normal;
-	font-style: normal;
-}
-
-@font-face {
-	font-family: Pagella;
-	src: url('../../../fonts/Blank/texgyrepagella-bold.woff2');
-	font-weight: bold;
-	font-style: normal;
-}
-
-@font-face {
-	font-family: Pagella;
-	src: url('../../../fonts/Blank/texgyrepagella-italic.woff2');
-	font-weight: normal;
-	font-style: italic;
-}
-
-@font-face {
-	font-family: Pagella;
-	src: url('../../../fonts/Blank/texgyrepagella-bolditalic.woff2');
-	font-weight: bold;
-	font-style: italic;
-}
--- a/themes/fonts/Blank/texgyrepagella-bold.woff2
+++ b/themes/fonts/Blank/texgyrepagella-bold.woff2
--- a/themes/fonts/Blank/texgyrepagella-bolditalic.woff2
+++ b/themes/fonts/Blank/texgyrepagella-bolditalic.woff2
--- a/themes/fonts/Blank/texgyrepagella-italic.woff2
+++ b/themes/fonts/Blank/texgyrepagella-italic.woff2
--- a/themes/fonts/Blank/texgyrepagella-regular.woff2
+++ b/themes/fonts/Blank/texgyrepagella-regular.woff2
Author	SHA1	Message	Date
Trevor Buckner	10d4cd4ab3	Merge pull request #3796 from naturalcrit/FixGoogleLinksinUserPage	2024-10-06 15:52:29 -04:00
Trevor Buckner	2a523c4955	Fix links to google drive files in user page User page was not marking Google Brews as "stubbed" if the brew belongs to another users' Google Drive or your own credentials are expired (it searches the current user drive for google files and checks if those are stubbed) This now sets every file found on Mongo as "Stubbed", whether the Drive file belongs to the current user or not.	2024-10-06 15:48:10 -04:00
Víctor Losada Hernández	487a574f50	initital fix	2024-10-06 00:05:12 -04:00
Trevor Buckner	1a325fb3c5	New notification	2024-10-01 22:25:17 -04:00
Trevor Buckner	0110c6afed	Remove duplicate error log for googleActions.list	2024-10-01 15:06:11 -04:00
Trevor Buckner	0e29620710	Remove delayMiddleware and ratelimiter	2024-10-01 14:13:15 -04:00
Trevor Buckner	c33b44855a	Go back to service account for brew updates	2024-10-01 12:17:30 -04:00
Trevor Buckner	e7e35294c6	disable rate limiter	2024-09-30 10:59:43 -04:00
Trevor Buckner	e9c45b216c	Add retryconfig and forward user ip	2024-09-30 08:31:39 -04:00
Trevor Buckner	40925253bd	autosave to 16 seconds	2024-09-30 00:59:30 -04:00
Trevor Buckner	66433d9e77	5 requests	2024-09-30 00:45:10 -04:00
Trevor Buckner	3a6750613b	express proxy settings	2024-09-30 00:31:58 -04:00
Trevor Buckner	a7361f8450	add delay between get and update	2024-09-30 00:14:37 -04:00
Trevor Buckner	32fa272947	reduce rate limit to 60 requests in 5 minutes	2024-09-30 00:03:27 -04:00
Trevor Buckner	68895bdca2	Rate limit `/api` requests from each IP address 100 requests each 5 minutes.	2024-09-29 23:37:26 -04:00
Trevor Buckner	8ab6a8599d	Use personal auth if logged in via google.	2024-09-29 21:47:45 -04:00
Trevor Buckner	ea656e5119	Issue notice	2024-09-29 00:15:26 -04:00