Update Package

.circleci/config.yml

@@ -2,23 +2,17 @@
 #
 # Check https://circleci.com/docs/2.0/language-javascript/ for more details
 #
-version: 2.1
-
-orbs:
-  node: circleci/node@3.0.0
-
+version: 2
 jobs:
   build:
     docker:
-      - image: cimg/node:16.11.0
-      - image: mongo:4.4
+      - image: circleci/node:16.10.0
+      - image: circleci/mongo:4.4
 
-    working_directory: ~/homebrewery
-    executor: node/default
+    working_directory: ~/repo
 
     steps:
-      - checkout:
-          path: ~/homebrewery
+      - checkout
 
       # Download and cache dependencies
       - restore_cache:
@@ -27,48 +21,12 @@ jobs:
           # fallback to using the latest cache if no exact match is found
           - v1-dependencies-
 
-      - node/install-npm
-      - node/install-packages:
-          app-dir: ~/homebrewery
-          cache-path: node_modules
-          override-ci-command: npm i
+      - run: npm install
 
       - save_cache:
           paths:
             - node_modules
           key: v1-dependencies-{{ checksum "package.json" }}
 
-      - persist_to_workspace:
-          root: .
-          paths:
-            - .
-
-  test:
-    docker:
-      - image: cimg/node:16.11.0
-
-    working_directory: ~/homebrewery
-    parallelism: 4
-
-    steps:
-      - attach_workspace:
-          at: .
-
       # run tests!
-      - run: 
-          name: Test - Basic
-          command: npm run test:basic
-      - run: 
-          name: Test - Mustache Spans
-          command: npm run test:mustache-span
-      - run: 
-          name: Test - Routes
-          command: npm run test:route
-
-workflows:
-  build_and_test:
-    jobs:
-      - build
-      - test:
-          requires:
-            - build
+      - run: npm run circleci

README.md

@@ -9,37 +9,37 @@ using [Markdown][markdown-url]. It is distributed under the terms of the [MIT Li
 [markdown-url]: https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet
 
 ## Quick Start
-The easiest way to get started using The Homebrewery is to use it
+The easiest way to get started using the Homebrewery is to use it
 [on our website][homebrewery-url]. The code is open source, so feel free to
-clone it and tinker with it. If you want to make changes to the code, you can run
+clone it, tinker with it. If you want to make changes to the code, you can run
 your own local version for testing by following the installation instructions
 below.
 
 [homebrewery-url]: https://homebrewery.naturalcrit.com
 
 ### Installation
-First, install three programs that The Homebrewery requires to run and retrieve
+First, install three programs that the Homebrewery requires to run and retrieve
 updates:
 
 1. install [node](https://nodejs.org/en/)
 1. install [mongodb](https://www.mongodb.com/try/download/community) (Community version)
 
-    For the easiest installation, follow these steps:
-    1. In the installer, uncheck the option to run as a service.
-    1. You can install MongoDB Compass if you want a GUI to view your database documents.
-    1. Go to the C:\ drive and create a folder called "data".
-    1. Inside the "data" folder, create a new folder called "db".
-    1. Open a command prompt or other terminal and navigate to your MongoDB install folder (C:\Program Files\Mongo\Server\4.4\bin).
-    1. In the command prompt, run "mongod", which will start up your local database server.
-    1. While MongoD is running, open a second command prompt and navigate to the MongoDB install folder.
-    1. In the second command prompt, run "mongo", which allows you to edit the database.
-    1. Type `use homebrewery` to create The Homebrewery database. You should see `switched to db homebrewery`.
-    1. Type `db.brews.insert({"title":"test"})` to create a blank document. You should see `WriteResult({ "nInserted" : 1 })`.
-    1. Search in Windows for "Advanced system settings" and open it.
-    1. Click "Environment variables", find the "path" variable, and double-click to open it.
-    1. Click "New" and paste in the path to the MongoDB "bin" folder.
-    1. Click "OK" three times to close all the windows.
-1. install [git](https://git-scm.com/downloads) (select the option that allows Git to run from the command prompt).
+    For easiest installation, follow these steps:
+    1. In the installer, uncheck the option to run as a service
+    1. You can install MongoDB Compass if you want a GUI to view your database documents
+    1. Go to the C drive and create a folder called "data"
+    1. Inside the "data" folder, create a new folder called "db"
+    1. Open a command prompt or other terminal and navigate to your mongodb install folder (c:program files\mongo\server\4.4\bin)
+    1. In the command prompt, run "mongod", which will start up your local database server
+    1. While MongoD is running, open a second command prompt and navigate to the mongodb install folder
+    1. In the second command prompt, run "mongo", which allows you to edit the database
+    1. Type `use homebrewery` to create the homebrewery database. You should see `switched to db homebrewery`
+    1. Type `db.brews.insert({"title":"test"})` to create a blank document. You should see `WriteResult({ "nInserted" : 1 })`
+    1. Search in Windows for "Advanced system settings" and open it
+    1. Click "Environment variables", find the "path" variable, and double-click to open it
+    1. Click "New" and paste in the path to the mongodb "bin" folder
+    1. Click "OK", "OK", "OK" to close all the windows
+1. install [git](https://git-scm.com/downloads) (select the option that allows Git to run from the command prompt)
 
 Checkout the repo ([documentation][github-clone-repo-docs-url]):
 ```
@@ -54,7 +54,7 @@ the project to run locally.
 You can set this temporarily in your shell of choice:
 * Windows Powershell: `$env:NODE_ENV="local"`
 * Windows CMD: `set NODE_ENV=local`
-* Linux / macOS: `export NODE_ENV=local`
+* Linux / OSX: `export NODE_ENV=local`
 
 Third, you will need to install the Node dependencies, compile the app, and run
 it using the two commands:
@@ -63,7 +63,7 @@ it using the two commands:
 1. `npm start`
 
 You should now be able to go to [http://localhost:8000](http://localhost:8000)
-in your browser and use The Homebrewery offline.
+in your browser and use the Homebrewery offline.
 
 ### Running the application via Docker
 
@@ -95,11 +95,11 @@ You can check out the [changelog](./changelog.md).
 
 ## License
 
-This project is licensed under the [MIT license](./license), which means you
+This project is licensed under the [MIT license](./license). Which means you
 are free to use The Homebrewery in any way that you want, except for claiming
 that you made it yourself.
 
-If you wish to sell, or in some way gain profit for, what's created on this site,
+If you wish to sell or in some way gain profit for what's created on this site,
 it's your responsibility to ensure you have the proper licenses/rights for any
 images or resources used.
 
@@ -108,12 +108,13 @@ images or resources used.
 You are welcome to contribute to the development and maintenance of the
 project! There are several ways of doing that:
 - At the moment, we have a huge backlog of [issues][repo-issues-url] and some
-  of them are outdated, duplicates, or don't contain any useful info. To help, you can [mark duplicates][github-mark-duplicate-url], try to
-  reproduce some complex or weird issues, try finding a workaround for a
-  reported bug, or just mention our issue managers team to let them know about
-  outdated issues via `@naturalcrit/issue-managers`.
+  of them are outdated, duplicates or doesn't contain any useful info. In order
+  to help you can [mark duplicates][github-mark-duplicate-url], try to
+  reproduce some complex or weird issues, try with finding a workaround for a
+  reported bug or just mention issue managers team to let them know about
+  outdated issue via `@naturalcrit/issue-managers`.
 - Our [subreddit][subreddit-url] is constantly growing and there are number of
-  bug reports. Any help with sorting them out is very welcome.
+  bug reports: any help with sorting them out is very welcome.
 - And of course you can contribute by fixing a bug or implementing a new
   feature by yourself, we are waiting for your
   [pull requests][github-pr-docs-url]!

changelog.md

@@ -29,189 +29,21 @@ pre {
 .page p + pre {
 	margin-top : 0.1cm;
 }
-
-.page .openSans {
-	font-family: 'Open Sans';
-	font-size: 0.9em;
-}
 ```
 
 ## changelog
 For a full record of development, visit our [Github Page](https://github.com/naturalcrit/homebrewery).
 
-### Friday 08/09/2022 - v3.2.2
-{{taskList
-
-##### Jeddai:
-
-* [x] Fix brews not deleting from User page when removed from Google Drive externally.
-
-  Fixes issues: [#2325](https://github.com/naturalcrit/homebrewery/issues/2325)
-
-##### G-Ambatte:
-
-* [x] Brew Tags are now searchable on the User page
-
-Fixes issues  [#2317](https://github.com/naturalcrit/homebrewery/issues/2317), [#2319](https://github.com/naturalcrit/homebrewery/issues/2319), [#2334](https://github.com/naturalcrit/homebrewery/issues/2334)
-
-* [x] Several tweaks to the User page
-
- Fixes issues:  [#1797](https://github.com/naturalcrit/homebrewery/issues/1797), [#2315](https://github.com/naturalcrit/homebrewery/issues/2315), [#2326](https://github.com/naturalcrit/homebrewery/issues/2326), [#2328](https://github.com/naturalcrit/homebrewery/issues/2328)
-}}
-
-### Wednesday 31/08/2022 - v3.2.1
-{{taskList
-
-##### Calculuschild
-
-* [x] Reference Links should now work inside tables
-
-	Fixes issues: [#2307](https://github.com/naturalcrit/homebrewery/issues/2307)
-
-##### Jeddai:
-
-* [x] Fix printing from `/new` not working
-
-  Fixes issues: [#1789](https://github.com/naturalcrit/homebrewery/issues/1789), [#1806](https://github.com/naturalcrit/homebrewery/issues/1806)
-
-* [x] Fix broken snippet buttons on `/new`
-
-  Fixes issues: [#2311](https://github.com/naturalcrit/homebrewery/issues/2311)
-
-##### G-Ambatte:
-
-* [x] Several small tweaks to the User page
-
-  Fixes issues: [#2301](https://github.com/naturalcrit/homebrewery/issues/2301), [#2303](https://github.com/naturalcrit/homebrewery/issues/2303), [#2121](https://github.com/naturalcrit/homebrewery/issues/2121)
-}}
-
-\page
-
-### Saturday 27/08/2022 - v3.2.0
-{{taskList
-
-##### Calculuschild
-
-* [x] The V3 renderer is now the default for new brews.
-
-* [x] Small tweaks to the spacing around the `classTable` style
-
-##### Jeddai:
-
-* [x] Brew transfers between Homebrewery and Google Drive now keep the same share and edit links! Metadata is now also kept across transfers.
-
-  Fixes issues: [#1838](https://github.com/naturalcrit/homebrewery/issues/1838)
-
-* [x] Brews can now be labeled with tags; these will be searchable on the My Brews page in a future update.
-
-  Fixes issues: [#758](https://github.com/naturalcrit/homebrewery/issues/758)
-
-##### Jlgraves:
-
-* [x] Small tweaks to the `ClassFeature` snippet
-
-  Fixes issues: [#2215](https://github.com/naturalcrit/homebrewery/issues/2215)
-}}
-
-
-### Thursday 09/06/2022 - v3.1.1
-{{taskList
-
-##### Calculuschild:
-
-* [x] Fixed class table decorations appearing on top of the table in PDF output.
-
-  Fixes issues: [#1784](https://github.com/naturalcrit/homebrewery/issues/1784)
-
-* [x] Fix bottom decoration on half class tables disappearing when the table is too short.
-
-  Fixes issues: [#2202](https://github.com/naturalcrit/homebrewery/issues/2202)
-}}
-
-### Monday 06/06/2022 - v3.1.0
-{{taskList
-
-##### G-Ambatte:
-
-* [x] "Jump to Preview/Editor" buttons added to the divider bar. Easily sync between the editor and preview panels!
-
-  Fixes issues: [#1756](https://github.com/naturalcrit/homebrewery/issues/1756)
-
-* [x] Speedups to the user page for users with large and/or many brews.
-
-  Fixes issues: [#2147](https://github.com/naturalcrit/homebrewery/issues/2147)
-
-* [x] Search text on the user page is saved to the URL for easy bookmarking in your browser
-
-  Fixes issues: [#1858](https://github.com/naturalcrit/homebrewery/issues/1858)
-
-* [x] Added easy login system for offline installs.
-
-  Fixes issues: [#269](https://github.com/naturalcrit/homebrewery/issues/269)
-
-* [x] New **THUMBNAIL** option in the {{fa,fa-info-circle}} **Properties** menu. This image will show up in social media links.
-
-  Fixes issues: [#820](https://github.com/naturalcrit/homebrewery/issues/820)
-}}
-
-### Wednesday 27/03/2022 - v3.0.8
-{{taskList
-* [x] Style updates to user page.
-
-* [x] Added a logout button (finally)! You can find it under {{openSans **USERNAME {{fa,fa-user}} → LOGOUT {{fas,fa-power-off}}**}}
-
-	Fixes issues: [#303](https://github.com/naturalcrit/homebrewery/issues/303)
-
-* [x] Clarified the default text when submitting an issue via Reddit post.
-
-* [x] Fixed broken Table of Contents links in PDFs. (Thanks lucastucious!)
-
-	Fixes issues: [#1749](https://github.com/naturalcrit/homebrewery/issues/1749)
-
-* [x] Fixed window resizing causing the edit page divider to get lost off of the edge of the page.
-
-	Fixes issues: [#2053](https://github.com/naturalcrit/homebrewery/issues/2053)
-
-* [x] Fixed Class Table decorations overlapping main text.
-
-	Fixes issues: [#1985](https://github.com/naturalcrit/homebrewery/issues/1985)
-
-* [x] Updated {{openSans **STYLE EDITOR {{fa,fa-pencil-alt}} → REMOVE DROP CAP {{fas,fa-remove-format}}**}} snippet to also remove small-caps first line font.
-
-* [x] Background work in preparation for brew themes.
-}}
-
-### Wednesday 02/02/2022 - v3.0.7
-{{taskList
-* [x] Revert active line highlighting.
-
-	Fixes issues: [#1913](https://github.com/naturalcrit/homebrewery/issues/1913)
-
-* [x] Added install steps for Ubuntu. [HERE](https://github.com/naturalcrit/homebrewery/blob/master/install/README.UBUNTU.md)
-
-	Fixes issues: [#1900](https://github.com/naturalcrit/homebrewery/issues/1900)
-
-* [x] Added social media links to home page.
-
-* [x] Increase brews visible on the user page to 1,000.
-
-	Fixes issues: [#1943](https://github.com/naturalcrit/homebrewery/issues/1943)
-
-* [x] Added a Legacy to V3 migration guide under {{openSans **NEED HELP? {{fa,fa-question-circle}} → MIGRATE {{fas,fa-file-import}}**}}
-
-* [x] Background refactoring and unit tests.
-}}
-
 ### Saturday 18/12/2021 - v3.0.6
 {{taskList
 * [x] Fixed text wrapping for long strings in code blocks.
 
 	Fixes issues: [#1736](https://github.com/naturalcrit/homebrewery/issues/1736)
-
-* [x] Code search/replace PC: `CTRL F / CTRL SHIFT F` / Mac: `CMD F / OPTION CMD F`
+	
+* [x] Code search/replace `CTRL F / CTRL SHIFT F`
 
 	Fixes issues: [#1201](https://github.com/naturalcrit/homebrewery/issues/1201)
-
+	
 * [x] Auto-closing HTML tags and curly braces `{{ }}`
 * [x] Highlight current active line
 
@@ -224,7 +56,7 @@ Fixes issues  [#2317](https://github.com/naturalcrit/homebrewery/issues/2317), [
 * [x] Make columns even in V3 Table of Contents.
 
 	Fixes issues: [#1671](https://github.com/naturalcrit/homebrewery/issues/1671)
-
+	
 * [x] Fix `CTRL P` failing to print from `/new` pages.
 
 	Fixes issues: [#1815](https://github.com/naturalcrit/homebrewery/issues/1815)

client/homebrew/brewRenderer/brewRenderer.jsx

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

client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx

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

client/homebrew/editor/editor.jsx

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

client/homebrew/editor/metadataEditor/metadataEditor.jsx

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

client/homebrew/editor/metadataEditor/metadataEditor.less

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

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

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

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

@@ -97,11 +97,7 @@ module.exports = [
 				gen  : dedent`/* Removes Drop Caps */
 						.page h1+p:first-letter {
 							all: unset;
-						}\n\n
-						/* Removes Small-Caps in first line */
-						.page h1+p:first-line {
-							all: unset;
-						}`
+						}\n\n`
 			},
 			{
 				name : 'Tweak Drop Cap',

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

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

client/homebrew/editor/stringArrayEditor/stringArrayEditor.jsx

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

client/homebrew/homebrew.jsx

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

client/homebrew/navbar/account.navitem.jsx

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

client/homebrew/navbar/help.navitem.jsx

@@ -1,30 +0,0 @@
-const React = require('react');
-const createClass = require('create-react-class');
-const _ = require('lodash');
-const dedent = require('dedent-tabs').default;
-
-const Nav = require('naturalcrit/nav/nav.jsx');
-
-module.exports = function(props){
-	return <Nav.dropdown>
-		<Nav.item color='grey' icon='fas fa-question-circle'>
-			need help?
-		</Nav.item>
-		<Nav.item color='red' icon='fas fa-fw fa-bug'
-			href={`https://www.reddit.com/r/homebrewery/submit?selftext=true&text=${encodeURIComponent(dedent`
-			**Browser(s)** :
-			**Operating System** :  
-			**Legacy or v3 Renderer** :
-			**Issue** :  `)}`}
-			newTab={true}
-			rel='noopener noreferrer'>
-			report issue
-		</Nav.item>
-		<Nav.item color='blue' icon='fas fa-fw fa-file-import'
-			href='/migrate'
-			newTab={true}
-			rel='noopener noreferrer'>
-			migrate
-		</Nav.item>
-	</Nav.dropdown>;
-};

client/homebrew/navbar/issue.navitem.jsx

@@ -0,0 +1,13 @@
+const React = require('react');
+const createClass = require('create-react-class');
+const Nav = require('naturalcrit/nav/nav.jsx');
+
+module.exports = function(props){
+	return <Nav.item
+		newTab={true}
+		color='red'
+		icon='fas fa-bug'
+		href={`https://www.reddit.com/r/homebrewery/submit?selftext=true&title=${encodeURIComponent('[Issue] Describe Your Issue Here')}`} >
+		report issue
+	</Nav.item>;
+};

client/homebrew/navbar/navbar.jsx

@@ -14,10 +14,12 @@ const Navbar = createClass({
 		};
 	},
 
-	getInitialState : function() {
-		return {
-			ver : global.version
-		};
+	componentDidMount : function() {
+		//const isChrome = /Chrome/.test(navigator.userAgent) && /Google Inc/.test(navigator.vendor);
+		this.setState({
+			//showNonChromeWarning : !isChrome,
+			ver : window.version
+		});
 	},
 
 	/*

client/homebrew/navbar/navbar.less

@@ -1,6 +1,5 @@
-@import 'naturalcrit/styles/colors.less';
 @navbarHeight : 28px;
-@keyframes pinkColoring {
+@keyframes coloring {
 	//from {color: white;}
 	//to {color: red;}
 	0%   {color: pink;}
@@ -63,21 +62,19 @@
 		}
 		i{
 			.animate(color);
-			animation-name: pinkColoring;
+			animation-name: coloring;
 			animation-duration: 2s;
 			color: pink;
 		}
 	}
-	.recent.navItem {
+	.recent.navItem{
 		position : relative;
 		.dropdown{
-			position   : absolute;
-			top        : 28px;
-			left       : 0px;
-			z-index    : 10000;
-			width      : 100%;
-			overflow   : hidden auto;
-			max-height : ~"calc(100vh - 28px)";
+			position : absolute;
+			top      : 28px;
+			left     : 0px;
+			z-index  : 10000;
+			width    : 100%;
 			h4{
 				display          : block;
 				box-sizing       : border-box;
@@ -91,12 +88,11 @@
 				&:nth-of-type(2){ background-color: darken(@purple, 30%); }
 			}
 			.item{
-				#backgroundColorsHover;
 				.animate(background-color);
 				position         : relative;
 				display          : block;
 				box-sizing       : border-box;
-				padding          : 8px 5px 13px;
+				padding          : 13px 5px;
 				background-color : #333;
 				color            : white;
 				text-decoration  : none;
@@ -142,7 +138,4 @@
 			text-align       : center;
 		}
 	}
-	.account.navItem{
-		min-width: 100px;
-	}
 }

client/homebrew/navbar/recent.navitem.jsx

@@ -123,8 +123,8 @@ const RecentItems = createClass({
 		if(!this.state.showDropdown) return null;
 
 		const makeItems = (brews)=>{
-			return _.map(brews, (brew, i)=>{
-				return <a href={brew.url} className='item' key={`${brew.id}-${i}`} target='_blank' rel='noopener noreferrer' title={brew.title || '[ no title ]'}>
+			return _.map(brews, (brew)=>{
+				return <a href={brew.url} className='item' key={brew.id} target='_blank' rel='noopener noreferrer' title={brew.title || '[ no title ]'}>
 					<span className='title'>{brew.title || '[ no title ]'}</span>
 					<span className='time'>{Moment(brew.ts).fromNow()}</span>
 				</a>;

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

@@ -1,247 +0,0 @@
-/*eslint max-lines: ["warn", {"max": 300, "skipBlankLines": true, "skipComments": true}]*/
-require('./listPage.less');
-const React       = require('react');
-const createClass = require('create-react-class');
-const _           = require('lodash');
-const moment      = require('moment');
-
-const BrewItem    = require('./brewItem/brewItem.jsx');
-
-const USERPAGE_KEY_PREFIX = 'HOMEBREWERY-LISTPAGE';
-
-const DEFAULT_SORT_TYPE = 'alpha';
-const DEFAULT_SORT_DIR = 'asc';
-
-const ListPage = createClass({
-	displayName     : 'ListPage',
-	getDefaultProps : function() {
-		return {
-			brewCollection : [
-				{
-					title : '',
-					class : '',
-					brews : []
-				}
-			],
-			navItems : <></>
-		};
-	},
-	getInitialState : function() {
-		// HIDE ALL GROUPS UNTIL LOADED
-		const brewCollection = this.props.brewCollection.map((brewGroup)=>{
-			brewGroup.visible = false;
-			return brewGroup;
-		});
-
-		return {
-			filterString   : this.props.query?.filter || '',
-			sortType       : this.props.query?.sort || null,
-			sortDir        : this.props.query?.dir || null,
-			query          : this.props.query,
-			brewCollection : brewCollection
-		};
-	},
-
-	componentDidMount : function() {
-		// SAVE TO LOCAL STORAGE WHEN LEAVING PAGE
-		window.onbeforeunload = this.saveToLocalStorage;
-
-		// LOAD FROM LOCAL STORAGE
-		if(typeof window !== 'undefined') {
-			const newSortType = (this.state.sortType ?? (localStorage.getItem(`${USERPAGE_KEY_PREFIX}-SORTTYPE`) || DEFAULT_SORT_TYPE));
-			const newSortDir = (this.state.sortDir ?? (localStorage.getItem(`${USERPAGE_KEY_PREFIX}-SORTDIR`) || DEFAULT_SORT_DIR));
-			this.updateUrl(this.state.filterString, newSortType, newSortDir);
-
-			const brewCollection = this.props.brewCollection.map((brewGroup)=>{
-				brewGroup.visible = (localStorage.getItem(`${USERPAGE_KEY_PREFIX}-VISIBILITY-${brewGroup.class}`) ?? 'true')=='true';
-				return brewGroup;
-			});
-
-			this.setState({
-				brewCollection : brewCollection,
-				sortType       : newSortType,
-				sortDir        : newSortDir
-			});
-		};
-	},
-
-	componentWillUnmount : function() {
-		window.onbeforeunload = function(){};
-	},
-
-	saveToLocalStorage : function() {
-		this.state.brewCollection.map((brewGroup)=>{
-			localStorage.setItem(`${USERPAGE_KEY_PREFIX}-VISIBILITY-${brewGroup.class}`, `${brewGroup.visible}`);
-		});
-		localStorage.setItem(`${USERPAGE_KEY_PREFIX}-SORTTYPE`, this.state.sortType);
-		localStorage.setItem(`${USERPAGE_KEY_PREFIX}-SORTDIR`, this.state.sortDir);
-	},
-
-	renderBrews : function(brews){
-		if(!brews || !brews.length) return <div className='noBrews'>No Brews.</div>;
-
-		return _.map(brews, (brew, idx)=>{
-			return <BrewItem brew={brew} key={idx}/>;
-		});
-	},
-
-	sortBrewOrder : function(brew){
-		if(!brew.title){brew.title = 'No Title';}
-		const mapping = {
-			'alpha'   : _.deburr(brew.title.toLowerCase()),
-			'created' : moment(brew.createdAt).format(),
-			'updated' : moment(brew.updatedAt).format(),
-			'views'   : brew.views,
-			'latest'  : moment(brew.lastViewed).format()
-		};
-		return mapping[this.state.sortType];
-	},
-
-	handleSortOptionChange : function(event){
-		this.updateUrl(this.state.filterString, event.target.value, this.state.sortDir);
-		this.setState({
-			sortType : event.target.value
-		});
-	},
-
-	handleSortDirChange : function(event){
-		const newDir = this.state.sortDir == 'asc' ? 'desc' : 'asc';
-
-		this.updateUrl(this.state.filterString, this.state.sortType, newDir);
-		this.setState({
-			sortDir : newDir
-		});
-	},
-
-	renderSortOption : function(sortTitle, sortValue){
-		return <td>
-				  <button
-					  value={`${sortValue}`}
-					  onClick={this.handleSortOptionChange}
-					  className={`${(this.state.sortType == sortValue ? 'active' : '')}`}
-				  >
-  					{`${sortTitle}`}
-		 		  </button>
-		  </td>;
-	},
-
-	handleFilterTextChange : function(e){
-		this.setState({
-			filterString : e.target.value,
-		});
-		this.updateUrl(e.target.value, this.state.sortType, this.state.sortDir);
-		return;
-	},
-
-	updateUrl : function(filterTerm, sortType, sortDir){
-		const url = new URL(window.location.href);
-		const urlParams = new URLSearchParams(url.search);
-
-		urlParams.set('sort', sortType);
-		urlParams.set('dir', sortDir);
-
-		if(!filterTerm)
-			urlParams.delete('filter');
-		else
-			urlParams.set('filter', filterTerm);
-
-		url.search = urlParams;
-		window.history.replaceState(null, null, url);
-	},
-
-	renderFilterOption : function(){
-		return <td>
-			<label>
-				<i className='fas fa-search'></i>
-				<input
-					type='search'
-					placeholder='filter title/description'
-					onChange={this.handleFilterTextChange}
-					value={this.state.filterString}
-				/>
-			</label>
-		</td>;
-	},
-
-	renderSortOptions : function(){
-		return <div className='sort-container'>
-			<table>
-				<tbody>
-					<tr>
-						<td>
-							<h6>Sort by :</h6>
-						</td>
-						{this.renderSortOption('Title', 'alpha')}
-						{this.renderSortOption('Created Date', 'created')}
-						{this.renderSortOption('Updated Date', 'updated')}
-						{this.renderSortOption('Views', 'views')}
-						{/* {this.renderSortOption('Latest', 'latest')} */}
-				    	<td>
-							<h6>Direction :</h6>
-						</td>
-						<td>
-							<button
-								onClick={this.handleSortDirChange}
-								className='sortDir'
-							>
-								{`${(this.state.sortDir == 'asc' ? '\u25B2 ASC' : '\u25BC DESC')}`}
-							</button>
-						</td>
-						{this.renderFilterOption()}
-					</tr>
-				</tbody>
-			</table>
-		</div>;
-	},
-
-	getSortedBrews : function(brews){
-		const testString = _.deburr(this.state.filterString).toLowerCase();
-
-		brews = _.filter(brews, (brew)=>{
-			const brewStrings = _.deburr([
-				brew.title,
-				brew.description,
-				brew.tags].join('\n')
-				.toLowerCase());
-
-			return brewStrings.includes(testString);
-		});
-		return _.orderBy(brews, (brew)=>{ return this.sortBrewOrder(brew); }, this.state.sortDir);
-	},
-
-	toggleBrewCollectionState : function(brewGroupClass) {
-		this.setState((prevState)=>({
-			brewCollection : prevState.brewCollection.map(
-				(brewGroup)=>brewGroup.class === brewGroupClass ? { ...brewGroup, visible: !brewGroup.visible } : brewGroup
-			)
-		}));
-	},
-
-	renderBrewCollection : function(brewCollection){
-		if(brewCollection == []) return <div className='brewCollection'>
-			<h1>No Brews</h1>
-		</div>;
-		return _.map(brewCollection, (brewGroup, idx)=>{
-			return <div key={idx} className={`brewCollection ${brewGroup.class ?? ''}`}>
-				<h1 className={brewGroup.visible ? 'active' : 'inactive'} onClick={()=>{this.toggleBrewCollectionState(brewGroup.class);}}>{brewGroup.title || 'No Title'}</h1>
-				{brewGroup.visible ? this.renderBrews(this.getSortedBrews(brewGroup.brews)) : <></>}
-			</div>;
-		});
-	},
-
-	render : function(){
-		return <div className='listPage sitePage'>
-			<link href='/themes/5ePhb.style.css' rel='stylesheet'/>
-			{this.props.navItems}
-
-			<div className='content V3'>
-				<div className='phb page'>
-					{this.renderSortOptions()}
-					{this.renderBrewCollection(this.state.brewCollection)}
-				</div>
-			</div>
-		</div>;
-	}
-});
-
-module.exports = ListPage;

client/homebrew/pages/editPage/editPage.jsx

@@ -10,7 +10,7 @@ const Nav = require('naturalcrit/nav/nav.jsx');
 const Navbar = require('../../navbar/navbar.jsx');
 
 const NewBrew = require('../../navbar/newbrew.navitem.jsx');
-const HelpNavItem = require('../../navbar/help.navitem.jsx');
+const ReportIssue = require('../../navbar/issue.navitem.jsx');
 const PrintLink = require('../../navbar/print.navitem.jsx');
 const Account = require('../../navbar/account.navitem.jsx');
 const RecentNavItem = require('../../navbar/recent.navitem.jsx').both;
@@ -114,7 +114,7 @@ const EditPage = createClass({
 		if(htmlErrors.length) htmlErrors = Markdown.validate(text);
 
 		this.setState((prevState)=>({
-			brew       : { ...prevState.brew, text: text },
+			brew       : _.merge({}, prevState.brew, { text: text }),
 			isPending  : true,
 			htmlErrors : htmlErrors
 		}), ()=>this.trySave());
@@ -122,17 +122,14 @@ const EditPage = createClass({
 
 	handleStyleChange : function(style){
 		this.setState((prevState)=>({
-			brew      : { ...prevState.brew, style: style },
+			brew      : _.merge({}, prevState.brew, { style: style }),
 			isPending : true
 		}), ()=>this.trySave());
 	},
 
 	handleMetaChange : function(metadata){
 		this.setState((prevState)=>({
-			brew : {
-				...prevState.brew,
-				...metadata
-			},
+			brew      : _.merge({}, prevState.brew, metadata),
 			isPending : true,
 		}), ()=>this.trySave());
 
@@ -203,24 +200,81 @@ const EditPage = createClass({
 		const brew = this.state.brew;
 		brew.pageCount = ((brew.renderer=='legacy' ? brew.text.match(/\\page/g) : brew.text.match(/^\\page$/gm)) || []).length + 1;
 
-		const params = `${transfer ? `?${this.state.saveGoogle ? 'saveToGoogle' : 'removeFromGoogle'}=true` : ''}`;
-		const res = await request
-			.put(`/api/update/${brew.editId}${params}`)
-			.send(brew)
-			.catch((err)=>{
-				console.log('Error Updating Local Brew');
-				this.setState({ errors: err });
-			});
+		if(this.state.saveGoogle) {
+			if(transfer) {
+				const res = await request
+				.post('/api/newGoogle/')
+				.send(brew)
+				.catch((err)=>{
+					console.log(err.status === 401
+						? 'Not signed in!'
+						: 'Error Transferring to Google!');
+					this.setState({ errors: err, saveGoogle: false });
+				});
 
-		this.savedBrew = res.body;
-		history.replaceState(null, null, `/edit/${this.savedBrew.editId}`);
+				if(!res) { return; }
+
+				console.log('Deleting Local Copy');
+				await request.delete(`/api/${brew.editId}`)
+				.send()
+				.catch((err)=>{
+					console.log('Error deleting Local Copy');
+				});
+
+				this.savedBrew = res.body;
+				history.replaceState(null, null, `/edit/${this.savedBrew.googleId}${this.savedBrew.editId}`); //update URL to match doc ID
+			} else {
+				const res = await request
+				.put(`/api/updateGoogle/${brew.editId}`)
+				.send(brew)
+				.catch((err)=>{
+					console.log(err.status === 401
+						? 'Not signed in!'
+						: 'Error Saving to Google!');
+					this.setState({ errors: err });
+					return;
+				});
+
+				this.savedBrew = res.body;
+			}
+		} else {
+			if(transfer) {
+				const res = await request.post('/api')
+				.send(brew)
+				.catch((err)=>{
+					console.log('Error creating Local Copy');
+					this.setState({ errors: err });
+					return;
+				});
+
+				await request.get(`/api/removeGoogle/${brew.googleId}${brew.editId}`)
+				.send()
+				.catch((err)=>{
+					console.log('Error Deleting Google Brew');
+				});
+
+				this.savedBrew = res.body;
+				history.replaceState(null, null, `/edit/${this.savedBrew.editId}`); //update URL to match doc ID
+			} else {
+				const res = await request
+				.put(`/api/update/${brew.editId}`)
+				.send(brew)
+				.catch((err)=>{
+					console.log('Error Updating Local Brew');
+					this.setState({ errors: err });
+					return;
+				});
+
+				this.savedBrew = res.body;
+			}
+		}
 
 		this.setState((prevState)=>({
-			brew : { ...prevState.brew,
+			brew : _.merge({}, prevState.brew, {
 				googleId : this.savedBrew.googleId ? this.savedBrew.googleId : null,
 				editId 	 : this.savedBrew.editId,
 				shareId  : this.savedBrew.shareId
-			},
+			}),
 			isPending : false,
 			isSaving  : false,
 		}));
@@ -277,26 +331,26 @@ const EditPage = createClass({
 				console.log(errMsg);
 			} catch (e){}
 
-			// if(this.state.errors.status == '401'){
-			// 	return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
-			// 		Oops!
-			// 		<div className='errorContainer' onClick={this.clearErrors}>
-			// 		You must be signed in to a Google account
-			// 			to save this to<br />Google Drive!<br />
-			// 			<a target='_blank' rel='noopener noreferrer'
-			// 				href={`https://www.naturalcrit.com/login?redirect=${this.state.url}`}>
-			// 				<div className='confirm'>
-			// 					Sign In
-			// 				</div>
-			// 			</a>
-			// 			<div className='deny'>
-			// 				Not Now
-			// 			</div>
-			// 		</div>
-			// 	</Nav.item>;
-			// }
+			if(this.state.errors.status == '401'){
+				return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
+					Oops!
+					<div className='errorContainer' onClick={this.clearErrors}>
+					You must be signed in to a Google account
+						to save this to<br />Google Drive!<br />
+						<a target='_blank' rel='noopener noreferrer'
+							href={`https://www.naturalcrit.com/login?redirect=${this.state.url}`}>
+							<div className='confirm'>
+								Sign In
+							</div>
+						</a>
+						<div className='deny'>
+							Not Now
+						</div>
+					</div>
+				</Nav.item>;
+			}
 
-			if(this.state.errors.response.req.url.match(/^\/api.*Google.*$/m)){
+			if(this.state.errors.response.req.url.match(/^\/api\/.*Google.*$/m)){
 				return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
 					Oops!
 					<div className='errorContainer' onClick={this.clearErrors}>
@@ -341,7 +395,7 @@ const EditPage = createClass({
 	},
 
 	processShareId : function() {
-		return this.state.brew.googleId && !this.state.brew.stubbed ?
+		return this.state.brew.googleId ?
 					 this.state.brew.googleId + this.state.brew.shareId :
 					 this.state.brew.shareId;
 	},
@@ -353,7 +407,7 @@ const EditPage = createClass({
 		const title = `${this.props.brew.title} ${systems}`;
 		const text = `Hey guys! I've been working on this homebrew. I'd love your feedback. Check it out.
 
-**[Homebrewery Link](${global.config.publicUrl}/share/${shareLink})**`;
+**[Homebrewery Link](https://homebrewery.naturalcrit.com/share/${shareLink})**`;
 
 		return `https://www.reddit.com/r/UnearthedArcana/submit?title=${encodeURIComponent(title)}&text=${encodeURIComponent(text)}`;
 	},
@@ -380,7 +434,7 @@ const EditPage = createClass({
 				{this.renderGoogleDriveIcon()}
 				{this.renderSaveButton()}
 				<NewBrew />
-				<HelpNavItem/>
+				<ReportIssue />
 				<Nav.dropdown>
 					<Nav.item color='teal' icon='fas fa-share-alt'>
 						share
@@ -388,7 +442,7 @@ const EditPage = createClass({
 					<Nav.item color='blue' href={`/share/${shareLink}`}>
 						view
 					</Nav.item>
-					<Nav.item color='blue' onClick={()=>{navigator.clipboard.writeText(`${global.config.publicUrl}/share/${shareLink}`);}}>
+					<Nav.item color='blue' onClick={()=>{navigator.clipboard.writeText(`https://homebrewery.naturalcrit.com/share/${shareLink}`);}}>
 						copy url
 					</Nav.item>
 					<Nav.item color='blue' href={this.getRedditLink()} newTab={true} rel='noopener noreferrer'>

client/homebrew/pages/errorPage/errorPage.jsx

@@ -7,8 +7,8 @@ const cx = require('classnames');
 const Nav = require('naturalcrit/nav/nav.jsx');
 const Navbar = require('../../navbar/navbar.jsx');
 const PatreonNavItem = require('../../navbar/patreon.navitem.jsx');
+const IssueNavItem = require('../../navbar/issue.navitem.jsx');
 const RecentNavItem = require('../../navbar/recent.navitem.jsx').both;
-const HelpNavItem = require('../../navbar/help.navitem.jsx');
 
 const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
 
@@ -33,7 +33,7 @@ const ErrorPage = createClass({
 
 				<Nav.section>
 					<PatreonNavItem />
-					<HelpNavItem />
+					<IssueNavItem />
 					<RecentNavItem />
 				</Nav.section>
 			</Navbar>

client/homebrew/pages/homePage/homePage.jsx

@@ -9,7 +9,7 @@ const { Meta } = require('vitreum/headtags');
 const Nav = require('naturalcrit/nav/nav.jsx');
 const Navbar = require('../../navbar/navbar.jsx');
 const NewBrewItem = require('../../navbar/newbrew.navitem.jsx');
-const HelpNavItem = require('../../navbar/help.navitem.jsx');
+const IssueNavItem = require('../../navbar/issue.navitem.jsx');
 const RecentNavItem = require('../../navbar/recent.navitem.jsx').both;
 const AccountNavItem = require('../../navbar/account.navitem.jsx');
 
@@ -52,14 +52,14 @@ const HomePage = createClass({
 	},
 	handleTextChange : function(text){
 		this.setState((prevState)=>({
-			brew : { ...prevState.brew, text: text }
+			brew : _.merge({}, prevState.brew, { text: text })
 		}));
 	},
 	renderNavbar : function(){
 		return <Navbar ver={this.props.ver}>
 			<Nav.section>
 				<NewBrewItem />
-				<HelpNavItem />
+				<IssueNavItem />
 				<RecentNavItem />
 				<AccountNavItem />
 			</Nav.section>

client/homebrew/pages/homePage/migrate.md

@@ -1,202 +0,0 @@
-# How to Convert a Legacy Document to v3
-Here you will find a number of steps to guide you through converting a Legacy document into a Homebrewery v3 document.
-
-**The first thing you'll want to do is switch the editor's rendering engine from `Legacy` to `v3`.** This will be the renderer we design features for moving forward.
-
-There are some examples of Legacy code in the code pane if you need more context behind some of the changes.
-
-**This document will evolve as users like yourself inform us of issues with it, or areas of conversion that it does not cover. _Please_ reach out if you have any suggestions for this document.**
-
-## Simple Replacements
-To make your life a little easier with this section, a text editor like [VSCode](https://code.visualstudio.com/) or Notepad will help a lot.
-
-The following table describes Legacy and other document elements and their Homebrewery counterparts. A simple find/replace should get these in working order.
-
-| Legacy / Other  | Homebrewery                  |
-|:----------------|:-----------------------------|
-| `\pagebreak`    | `\page`                      |
-| `======`        | `\page`                      |
-| `\pagebreaknum` | `{{pageNumber,auto}}\n\page` |
-| `@=====`        | `{{pageNumber,auto}}\n\page` |
-| `\columnbreak`  | `\column`                    |
-| `.phb`          | `.page`                      |
-
-## Classed or Styled Divs
-Anything that relies on the following syntax can be changed to the new Homebrewery v3 curly brace syntax:
-
-```
-<div class="classTable wide">
-...
-</div>
-```
-:
-The above example is equivalent to the following in v3 syntax.
-
-```
-{{classTable,wide
-...
-}}
-```
-:
-Some examples of this include class tables (as shown above), descriptive blocks, notes, and spell lists.
-
-\column
-
-## Margins and Padding
-Any manual margins and padding to push text down the page will likely need to be updated. Colons can be used on lines by themselves to push things down the page vertically if you'd rather not set pixel-perfect margins or padding.
-
-## Notes
-
-In Legacy, notes are denoted using markdown blockquote syntax. In Homebrewery v3, this is replaced by the curly brace syntax.
-
-<!--
-> ##### Catchy Title
-> Useful Information
--->
-
-{{note
-##### Title
-Information
-}}
-
-## Split Tables
-Split tables also use the curly brace syntax, as the new renderer can handle style values separately from class names.
-
-<!--
-<div style='column-count:2'>
-
-| d8  | Loot |
-|:---:|:-----------:|
-|  1  | 100gp |
-|  2  | 200gp |
-|  3  | 300gp |
-|  4  | 400gp |
-
-| d8  | Loot |
-|:---:|:-----------:|
-|  5  | 500gp |
-|  6  | 600gp |
-|  7  | 700gp |
-|  8  | 1000gp |
-
-</div>
--->
-
-##### Typical Difficulty Classes
-{{column-count:2
-| Task Difficulty | DC |
-|:----------------|:--:|
-| Very easy       | 5  |
-| Easy            | 10 |
-| Medium          | 15 |
-
-| Task Difficulty   | DC |
-|:------------------|:--:|
-| Hard              | 20 |
-| Very hard         | 25 |
-| Nearly impossible | 30 |
-}}
-
-## Blockquotes
-Blockquotes are denoted by the `>` character at the beginning of the line. In Homebrewery's v3 renderer, they hold virtually no meaning and have no CSS styling. You are free to use blockquotes when styling your document or creating themes without needing to worry about your CSS affecting other parts of the document.
-
-{{pageNumber,auto}}
-
-\page
-
-## Stat Blocks
-
-There are pretty significant differences between stat blocks on the Legacy renderer and Homebrewery v3. This section contains a list of changes that will need to be made to update the stat block.
-
-### Initial Changes
-You will want to **remove all leading** `___` that started the stat block in Legacy, and replace that with `{{monster` before the stat block, and `}}` after it.
-
-**If you want a frame** around the stat block, you can add `,frame` to the curly brace definition.
-
-**If the stat block was wide**, make sure to add `,wide` to the curly brace definition.
-
-### Blockquotes
-The key difference is the lack of blockquotes. Legacy documents use the `>` symbol at the start of the line for each line in the stat block, and the v3 renderer does not. **You will want to remove all `>` characters at the beginning of all lines, and delete any leading spaces.**
-
-### Lists
-The basic characteristics and advanced characteristics sections are not list elements in Homebrewery. You will want to **remove all `-` or `*` characters from the beginning of lines.**
-
-### Spacing
-In order to have the correct spacing after removing the list elements, you will want to **add two colons between the name of each basic/advanced characteristic and its value.** _(see example in the code pane)_
-
-Additionally, in the special traits and actions sections, you will want to add a colon at the beginning of each line that separates a trait/action from another, as seen below. **Any empty lines between special traits and actions should contain only a colon.** _(see example in the code pane)_
-
-\column
-
-{{margin-top:102px}}
-
-<!--
-### Legacy/Other Document Example:
-___
-> ## Centaur
-> *Large Monstrosity, neutral good*
->___
-> - **Armor Class** 12
-> - **Hit Points** 45(6d10 + 12)
-> - **Speed** 50ft.
->___
->|STR|DEX|CON|INT|WIS|CHA|
->|:---:|:---:|:---:|:---:|:---:|:---:|
->|18 (+4)|14 (+2)|14 (+2)|9 (-1)|13 (+1)|11 (+0)|
->___
-> - **Skills** Athletics +6, Perception +3, Survival +3
-> - **Senses** passive Perception 13
-> - **Languages** Elvish, Sylvan
-> - **Challenge** 2 (450 XP)
-> ___
-> ***Charge.*** If the centaur moves at least 30 feet straight toward a target and then hits it with a pike attack on the same turn, the target takes an extra 10 (3d6) piercing damage.
->
-> ***Second Thing*** More details.
->
-> ### Actions
-> ***Multiattack.*** The centaur makes two attacks: one with its pike and one with its hooves or two with its longbow.
->
-> ***Pike.*** *Melee Weapon Attack:* +6 to hit, reach 10 ft., one target. *Hit:* 9 (1d10 + 4) piercing damage.
->
-> ***Hooves.*** *Melee Weapon Attack:* +6 to hit, reach 5 ft., one target. *Hit:* 11 (2d6 + 4) bludgeoning damage.
->
-> ***Longbow.*** *Ranged Weapon Attack:* +4 to hit, range 150/600 ft., one target. *Hit:* 6 (1d8 + 2) piercing damage.
--->
-
-### Homebrewery v3 Example:
-
-{{monster
-## Centaur
-*Large monstrosity, neutral good*
-___
-**Armor Class** :: 12
-**Hit Points**  :: 45(6d10 + 12)
-**Speed**       :: 50ft.
-___
-|  STR  |  DEX  |  CON  |  INT  |  WIS  |  CHA  |
-|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|
-|18 (+4)|14 (+2)|14 (+2)|9 (-1) |13 (+1)|11 (+0)|
-___
-**Skills** :: Athletics +6, Perception +3, Survival +3
-**Senses** :: passive Perception 13
-**Languages** :: Elvish, Sylvan
-**Challenge** :: 2 (450 XP)
-___
-***Charge.*** If the centaur moves at least 30 feet straight toward a target and then hits it with a pike attack on the same turn, the target takes an extra 10 (3d6) piercing damage.
-:
-***Second Thing*** More details.
-
-### Actions
-***Multiattack.*** The centaur makes two attacks: one with its pike and one with its hooves or two with its longbow.
-:
-***Pike.*** *Melee Weapon Attack:* +6 to hit, reach 10 ft., one target. *Hit:* 9 (1d10 + 4) piercing damage.
-:
-***Hooves.*** *Melee Weapon Attack:* +6 to hit, reach 5 ft., one target. *Hit:* 11 (2d6 + 4) bludgeoning damage.
-:
-***Longbow.*** *Ranged Weapon Attack:* +4 to hit, range 150/600 ft., one target. *Hit:* 6 (1d8 + 2) piercing damage.
-}}
-
-{{pageNumber,auto}}
-
-
-

client/homebrew/pages/homePage/welcome_msg.md

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

client/homebrew/pages/homePage/welcome_msg_legacy.md

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

client/homebrew/pages/homePage/welcome_msg_v3.md

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

client/homebrew/pages/newPage/newPage.jsx

@@ -11,7 +11,7 @@ const Nav = require('naturalcrit/nav/nav.jsx');
 const Navbar = require('../../navbar/navbar.jsx');
 const AccountNavItem = require('../../navbar/account.navitem.jsx');
 const RecentNavItem = require('../../navbar/recent.navitem.jsx').both;
-const HelpNavItem = require('../../navbar/help.navitem.jsx');
+const IssueNavItem = require('../../navbar/issue.navitem.jsx');
 
 const SplitPane = require('naturalcrit/splitPane/splitPane.jsx');
 const Editor = require('../../editor/editor.jsx');
@@ -27,30 +27,55 @@ const NewPage = createClass({
 	getDefaultProps : function() {
 		return {
 			brew : {
-				text        : '',
-				style       : undefined,
+				text      : '',
+				style     : undefined,
+				shareId   : null,
+				editId    : null,
+				createdAt : null,
+				updatedAt : null,
+				gDrive    : false,
+
 				title       : '',
 				description : '',
-				renderer    : 'V3'
+				tags        : '',
+				published   : false,
+				authors     : [],
+				systems     : []
 			}
 		};
 	},
 
 	getInitialState : function() {
-		let brew = this.props.brew;
+		const brew = this.props.brew;
 
-		if(this.props.brew.shareId) {
-			brew = {
-				text        : brew.text        ?? '',
-				style       : brew.style       ?? undefined,
-				title       : brew.title       ?? '',
-				description : brew.description ?? '',
-				renderer    : brew.renderer    ?? 'legacy'
-			};
+		if(typeof window !== 'undefined') { //Load from localStorage if in client browser
+			const brewStorage  = localStorage.getItem(BREWKEY);
+			const styleStorage = localStorage.getItem(STYLEKEY);
+			const metaStorage = JSON.parse(localStorage.getItem(METAKEY));
+
+			if(!brew.text || !brew.style){
+				brew.text = brew.text  || (brewStorage  ?? '');
+				brew.style = brew.style || (styleStorage ?? undefined);
+				// brew.title = metaStorage?.title || this.state.brew.title;
+				// brew.description = metaStorage?.description || this.state.brew.description;
+				brew.renderer = metaStorage?.renderer || brew.renderer;
+			}
 		}
 
 		return {
-			brew       : brew,
+			brew : {
+				text        : brew.text || '',
+				style       : brew.style || undefined,
+				gDrive      : false,
+				title       : brew.title || '',
+				description : brew.description || '',
+				tags        : brew.tags || '',
+				published   : false,
+				authors     : [],
+				systems     : brew.systems || [],
+				renderer    : brew.renderer || 'legacy'
+			},
+
 			isSaving   : false,
 			saveGoogle : (global.account && global.account.googleId ? true : false),
 			errors     : null,
@@ -60,28 +85,6 @@ const NewPage = createClass({
 
 	componentDidMount : function() {
 		document.addEventListener('keydown', this.handleControlKeys);
-
-		const brew = this.state.brew;
-
-		if(!this.props.brew.shareId && typeof window !== 'undefined') { //Load from localStorage if in client browser
-			const brewStorage  = localStorage.getItem(BREWKEY);
-			const styleStorage = localStorage.getItem(STYLEKEY);
-			const metaStorage = JSON.parse(localStorage.getItem(METAKEY));
-
-			brew.text  = brewStorage  ?? brew.text;
-			brew.style = styleStorage ?? brew.style;
-			// brew.title = metaStorage?.title || this.state.brew.title;
-			// brew.description = metaStorage?.description || this.state.brew.description;
-			brew.renderer = metaStorage?.renderer ?? brew.renderer;
-
-			this.setState({
-				brew : brew
-			});
-		}
-
-		localStorage.setItem(BREWKEY, brew.text);
-		localStorage.setItem(STYLEKEY, brew.style);
-		localStorage.setItem(METAKEY, JSON.stringify({ 'renderer': brew.renderer }));
 	},
 	componentWillUnmount : function() {
 		document.removeEventListener('keydown', this.handleControlKeys);
@@ -109,7 +112,7 @@ const NewPage = createClass({
 		if(htmlErrors.length) htmlErrors = Markdown.validate(text);
 
 		this.setState((prevState)=>({
-			brew       : { ...prevState.brew, text: text },
+			brew       : _.merge({}, prevState.brew, { text: text }),
 			htmlErrors : htmlErrors
 		}));
 		localStorage.setItem(BREWKEY, text);
@@ -117,14 +120,14 @@ const NewPage = createClass({
 
 	handleStyleChange : function(style){
 		this.setState((prevState)=>({
-			brew : { ...prevState.brew, style: style },
+			brew : _.merge({}, prevState.brew, { style: style }),
 		}));
 		localStorage.setItem(STYLEKEY, style);
 	},
 
 	handleMetaChange : function(metadata){
 		this.setState((prevState)=>({
-			brew : { ...prevState.brew, ...metadata },
+			brew : _.merge({}, prevState.brew, metadata),
 		}));
 		localStorage.setItem(METAKEY, JSON.stringify({
 			// 'title'       : this.state.brew.title,
@@ -154,24 +157,45 @@ const NewPage = createClass({
 			const index = brew.text.indexOf('```\n\n');
 			brew.style = `${brew.style ? `${brew.style}\n` : ''}${brew.text.slice(7, index - 1)}`;
 			brew.text = brew.text.slice(index + 5);
-		}
+		};
 
 		brew.pageCount=((brew.renderer=='legacy' ? brew.text.match(/\\page/g) : brew.text.match(/^\\page$/gm)) || []).length + 1;
 
-		const res = await request
-			.post(`/api${this.state.saveGoogle ? '?saveToGoogle=true' : ''}`)
+		if(this.state.saveGoogle) {
+			const res = await request
+			.post('/api/newGoogle/')
 			.send(brew)
 			.catch((err)=>{
-				console.log(err);
+				console.log(err.status === 401
+					? 'Not signed in!'
+					: 'Error Creating New Google Brew!');
 				this.setState({ isSaving: false, errors: err });
+				return;
 			});
-		if(!res) return;
 
-		brew = res.body;
-		localStorage.removeItem(BREWKEY);
-		localStorage.removeItem(STYLEKEY);
-		localStorage.removeItem(METAKEY);
-		window.location = `/edit/${brew.editId}`;
+			brew = res.body;
+			localStorage.removeItem(BREWKEY);
+			localStorage.removeItem(STYLEKEY);
+			localStorage.removeItem(METAKEY);
+			window.location = `/edit/${brew.googleId}${brew.editId}`;
+		} else {
+			request.post('/api')
+			.send(brew)
+			.end((err, res)=>{
+				if(err){
+					this.setState({
+						isSaving : false
+					});
+					return;
+				}
+				window.onbeforeunload = function(){};
+				brew = res.body;
+				localStorage.removeItem(BREWKEY);
+				localStorage.removeItem(STYLEKEY);
+				localStorage.removeItem(METAKEY);
+				window.location = `/edit/${brew.editId}`;
+			});
+		}
 	},
 
 	renderSaveButton : function(){
@@ -184,26 +208,26 @@ const NewPage = createClass({
 				console.log(errMsg);
 			} catch (e){}
 
-			// if(this.state.errors.status == '401'){
-			// 	return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
-			// 		Oops!
-			// 		<div className='errorContainer' onClick={this.clearErrors}>
-			// 		You must be signed in to a Google account
-			// 			to save this to<br />Google Drive!<br />
-			// 			<a target='_blank' rel='noopener noreferrer'
-			// 				href={`https://www.naturalcrit.com/login?redirect=${this.state.url}`}>
-			// 				<div className='confirm'>
-			// 					Sign In
-			// 				</div>
-			// 			</a>
-			// 			<div className='deny'>
-			// 				Not Now
-			// 			</div>
-			// 		</div>
-			// 	</Nav.item>;
-			// }
+			if(this.state.errors.status == '401'){
+				return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
+					Oops!
+					<div className='errorContainer' onClick={this.clearErrors}>
+					You must be signed in to a Google account
+						to save this to<br />Google Drive!<br />
+						<a target='_blank' rel='noopener noreferrer'
+							href={`https://www.naturalcrit.com/login?redirect=${this.state.url}`}>
+							<div className='confirm'>
+								Sign In
+							</div>
+						</a>
+						<div className='deny'>
+							Not Now
+						</div>
+					</div>
+				</Nav.item>;
+			}
 
-			if(this.state.errors.response.req.url.match(/^\/api.*Google.*$/m)){
+			if(this.state.errors.response.req.url.match(/^\/api\/.*Google.*$/m)){
 				return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
 					Oops!
 					<div className='errorContainer' onClick={this.clearErrors}>
@@ -267,7 +291,7 @@ const NewPage = createClass({
 			<Nav.section>
 				{this.renderSaveButton()}
 				{this.renderLocalPrintButton()}
-				<HelpNavItem />
+				<IssueNavItem />
 				<RecentNavItem />
 				<AccountNavItem />
 			</Nav.section>

client/homebrew/pages/printPage/printPage.jsx

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

client/homebrew/pages/sharePage/sharePage.jsx

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

client/homebrew/pages/userPage/brewItem/brewItem.jsx

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

client/homebrew/pages/userPage/brewItem/brewItem.less

@@ -17,8 +17,6 @@
 	-webkit-column-break-inside : avoid;
 	page-break-inside           : avoid;
 	break-inside                : avoid;
-	box-shadow                  : 0px 4px 5px 0px #333;
-	background-color            : #cab2802e;
 	.text {
 		min-height : 54px;
 		h4{
@@ -29,23 +27,13 @@
 	.info{
 		position: initial;
 		bottom: 2px;
-		font-family : ScalySansRemake;
+		font-family : ScalySans;
 		font-size   : 1.2em;
 		&>span{
 			margin-right : 12px;
 			line-height  : 1.5em;
 		}
 	}
-	.brewTags span {
-		background-color: #c8ac6e3b;
-		margin: 2px;
-		padding: 2px;
-		border: 1px solid #c8ac6e;
-		border-radius: 4px;
-		white-space: nowrap;
-		display: inline-block;
-		font-weight: bold;
-	}
 	&:hover{
 		.links{
 			opacity : 1;

client/homebrew/pages/userPage/userPage.jsx

@@ -1,9 +1,10 @@
+require('./userPage.less');
 const React = require('react');
 const createClass = require('create-react-class');
 const _     = require('lodash');
 const cx    = require('classnames');
 
-const ListPage = require('../basePages/listPage/listPage.jsx');
+const moment = require('moment');
 
 const Nav = require('naturalcrit/nav/nav.jsx');
 const Navbar = require('../../navbar/navbar.jsx');
@@ -11,7 +12,16 @@ const Navbar = require('../../navbar/navbar.jsx');
 const RecentNavItem = require('../../navbar/recent.navitem.jsx').both;
 const Account = require('../../navbar/account.navitem.jsx');
 const NewBrew = require('../../navbar/newbrew.navitem.jsx');
-const HelpNavItem = require('../../navbar/help.navitem.jsx');
+const BrewItem = require('./brewItem/brewItem.jsx');
+const ReportIssue = require('../../navbar/issue.navitem.jsx');
+
+// const brew = {
+// 	title   : 'SUPER Long title woah now',
+// 	authors : []
+// };
+
+//const BREWS = _.times(25, ()=>{ return brew;});
+
 
 const UserPage = createClass({
 	displayName     : 'UserPage',
@@ -19,51 +29,163 @@ const UserPage = createClass({
 		return {
 			username : '',
 			brews    : [],
-			query    : ''
 		};
 	},
 	getInitialState : function() {
-		const usernameWithS = this.props.username + (this.props.username.endsWith('s') ? `’` : `’s`);
-
-		const brews = _.groupBy(this.props.brews, (brew)=>{
-			return (brew.published ? 'published' : 'private');
-		});
-
-		const brewCollection = [
-			{
-				title : `${usernameWithS} published brews`,
-				class : 'published',
-				brews : brews.published
-			}
-		];
-		if(this.props.username == global.account?.username){
-			brewCollection.push(
-				{
-					title : `${usernameWithS} unpublished brews`,
-					class : 'unpublished',
-					brews : brews.private
-				}
-			);
-		}
-
 		return {
-			brewCollection : brewCollection
+			sortType     : 'alpha',
+			sortDir      : 'asc',
+			filterString : ''
 		};
 	},
+	getUsernameWithS : function() {
+		if(this.props.username.endsWith('s'))
+			return `${this.props.username}'`;
+		return `${this.props.username}'s`;
+	},
 
-	navItems : function() {
-		return <Navbar>
-			<Nav.section>
-				<NewBrew />
-				<HelpNavItem />
-				<RecentNavItem />
-				<Account />
-			</Nav.section>
-		</Navbar>;
+	renderBrews : function(brews){
+		if(!brews || !brews.length) return <div className='noBrews'>No Brews.</div>;
+
+		const sortedBrews = this.sortBrews(brews);
+
+		return _.map(sortedBrews, (brew, idx)=>{
+			return <BrewItem brew={brew} key={idx}/>;
+		});
+	},
+
+	sortBrewOrder : function(brew){
+		if(!brew.title){brew.title = 'No Title';}
+		const mapping = {
+			'alpha'   : _.deburr(brew.title.toLowerCase()),
+			'created' : moment(brew.createdAt).format(),
+			'updated' : moment(brew.updatedAt).format(),
+			'views'   : brew.views,
+			'latest'  : moment(brew.lastViewed).format()
+		};
+		return mapping[this.state.sortType];
+	},
+
+	sortBrews : function(brews){
+		return _.orderBy(brews, (brew)=>{ return this.sortBrewOrder(brew); }, this.state.sortDir);
+	},
+
+	handleSortOptionChange : function(event){
+		this.setState({
+			sortType : event.target.value
+		});
+	},
+
+	handleSortDirChange : function(event){
+		this.setState({
+			sortDir : `${(this.state.sortDir == 'asc' ? 'desc' : 'asc')}`
+		});
+	},
+
+	renderSortOption : function(sortTitle, sortValue){
+		return <td>
+				  <button
+					  value={`${sortValue}`}
+					  onClick={this.handleSortOptionChange}
+					  className={`sortOption ${(this.state.sortType == sortValue ? 'active' : '')}`}
+				  >
+  					{`${sortTitle}`}
+		 		  </button>
+		  </td>;
+	},
+
+	handleFilterTextChange : function(e){
+		this.setState({
+			filterString : e.target.value
+		});
+		return;
+	},
+
+	renderFilterOption : function(){
+		return <td>
+			<label className='filterOption'>
+				<i className='fas fa-search'></i>
+				<input
+					type='search'
+					placeholder='search title/description'
+					onChange={this.handleFilterTextChange}
+				/>
+			</label>
+		</td>;
+	},
+
+	renderSortOptions : function(){
+		return <div className='sort-container'>
+			<table>
+				<tbody>
+					<tr>
+						<td>
+							<h6>Sort by :</h6>
+						</td>
+						{this.renderSortOption('Title', 'alpha')}
+						{this.renderSortOption('Created Date', 'created')}
+						{this.renderSortOption('Updated Date', 'updated')}
+						{this.renderSortOption('Views', 'views')}
+						{/* {this.renderSortOption('Latest', 'latest')} */}
+				    	<td>
+							<h6>Direction :</h6>
+						</td>
+						<td>
+							<button
+								onClick={this.handleSortDirChange}
+								className='sortDir'
+							>
+								{`${(this.state.sortDir == 'asc' ? '\u25B2 ASC' : '\u25BC DESC')}`}
+							</button>
+						</td>
+						{this.renderFilterOption()}
+					</tr>
+				</tbody>
+			</table>
+		</div>;
+	},
+
+	getSortedBrews : function(){
+		const testString = _.deburr(this.state.filterString).toLowerCase();
+		const brewCollection = this.state.filterString ? _.filter(this.props.brews, (brew)=>{
+			return (_.deburr(brew.title).toLowerCase().includes(testString)) ||
+			(_.deburr(brew.description).toLowerCase().includes(testString));
+		}) : this.props.brews;
+		return _.groupBy(brewCollection, (brew)=>{
+			return (brew.published ? 'published' : 'private');
+		});
 	},
 
 	render : function(){
-		return <ListPage brewCollection={this.state.brewCollection} navItems={this.navItems()} query={this.props.query}></ListPage>;
+		const brews = this.getSortedBrews();
+
+		return <div className='userPage sitePage'>
+			<link href='/themes/5ePhbLegacy.style.css' rel='stylesheet'/>
+			<Navbar>
+				<Nav.section>
+					<NewBrew />
+					<ReportIssue />
+					<RecentNavItem />
+					<Account />
+				</Nav.section>
+			</Navbar>
+
+			<div className='content V3'>
+				<div className='phb'>
+					{this.renderSortOptions()}
+					<div className='published'>
+						<h1>{this.getUsernameWithS()} published brews</h1>
+						{this.renderBrews(brews.published)}
+					</div>
+					{this.props.username == global.account?.username &&
+						<div className='unpublished'>
+							<h1>{this.getUsernameWithS()} unpublished brews</h1>
+							{this.renderBrews(brews.private)}
+						</div>
+					}
+				</div>
+			</div>
+		</div>;
 	}
 });
 

client/homebrew/pages/userPage/userPage.less

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

client/template.js

@@ -1,6 +1,4 @@
 module.exports = async(name, title = '', props = {})=>{
-	const HOMEBREWERY_PUBLIC_URL=props.config.publicUrl;
-
 	return `
 <!DOCTYPE html>
 <html>
@@ -8,14 +6,7 @@ module.exports = async(name, title = '', props = {})=>{
 		<link href="//use.fontawesome.com/releases/v5.15.1/css/all.css" rel="stylesheet" />
 		<link href="//fonts.googleapis.com/css?family=Open+Sans:400,300,600,700" rel="stylesheet" type="text/css" />
 		<link href=${`/${name}/bundle.css`} rel='stylesheet' />
-		<link rel="icon" href="/assets/favicon.ico" type="image/x-icon" />
-		<meta property="og:title" content="${props.brew?.title || 'Homebrewery - Untitled Brew'}">
-		<meta property="og:url" content="${HOMEBREWERY_PUBLIC_URL}/${props.brew?.shareId ? `share/${props.brew.shareId}` : ''}">
-		<meta property="og:image" content="${props.brew?.thumbnail || `${HOMEBREWERY_PUBLIC_URL}/thumbnail.png`}">
-		<meta property="og:description" content="${props.brew?.description || 'No description.'}">
-		<meta property="og:site_name" content="The Homebrewery - Make your Homebrew content look legit!">
-		<meta property="og:type" content="article">
-		<meta name="twitter:card" content="summary_large_image">
+		<link rel="icon" href="/assets/homebrew/favicon.ico" type="image/x-icon" />
 		<title>${title.length ? `${title} - The Homebrewery`: 'The Homebrewery - NaturalCrit'}</title>
 	</head>
 	<body>

config/default.json

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

package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebrewery",
   "description": "Create authentic looking D&D homebrews using only markdown",
-  "version": "3.2.2",
+  "version": "3.0.6",
   "engines": {
     "node": "16.11.x"
   },
@@ -20,9 +20,6 @@
     "verify": "npm run lint && npm test",
     "test": "jest",
     "test:dev": "jest --verbose --watch",
-    "test:basic": "jest tests/markdown/basic.test.js --verbose",
-    "test:mustache-span": "jest tests/markdown/mustache-span.test.js --verbose",
-    "test:route": "jest tests/routes/static-pages.test.js --verbose",
     "phb": "node scripts/phb.js",
     "prod": "set NODE_ENV=production && npm run build",
     "postinstall": "npm run buildall",
@@ -34,7 +31,6 @@
     "build/*"
   ],
   "jest": {
-    "testTimeout": 15000,
     "modulePaths": [
       "mode_modules",
       "shared",
@@ -51,44 +47,46 @@
     ]
   },
   "dependencies": {
-    "@babel/core": "^7.19.0",
-    "@babel/plugin-transform-runtime": "^7.18.10",
-    "@babel/preset-env": "^7.19.0",
-    "@babel/preset-react": "^7.18.6",
-    "body-parser": "^1.20.0",
+    "@babel/core": "^7.16.12",
+    "@babel/plugin-transform-runtime": "^7.16.10",
+    "@babel/preset-env": "^7.16.11",
+    "@babel/preset-react": "^7.16.7",
+    "body-parser": "^1.19.1",
     "classnames": "^2.3.1",
-    "codemirror": "^5.65.6",
+    "codemirror": "^5.65.1",
     "cookie-parser": "^1.4.6",
     "create-react-class": "^15.7.0",
     "dedent-tabs": "^0.10.1",
-    "express": "^4.18.1",
+    "express": "^4.17.2",
     "express-async-handler": "^1.2.0",
-    "express-static-gzip": "2.1.7",
-    "fs-extra": "10.1.0",
-    "googleapis": "107.0.0",
+    "express-static-gzip": "2.1.1",
+    "fs-extra": "10.0.0",
+    "googleapis": "92.0.0",
     "js-yaml": "^4.1.0",
     "jwt-simple": "^0.5.6",
     "less": "^3.13.1",
     "lodash": "^4.17.21",
-    "marked": "4.1.0",
-    "marked-extended-tables": "^1.0.5",
+    "marked": "4.0.11",
+    "marked-extended-tables": "^1.0.3",
     "markedLegacy": "npm:marked@^0.3.19",
-    "moment": "^2.29.4",
-    "mongoose": "^6.5.5",
-    "nanoid": "3.3.4",
-    "nconf": "^0.12.0",
+    "moment": "^2.29.1",
+    "mongoose": "^6.1.8",
+    "nanoid": "3.2.0",
+    "nconf": "^0.11.3",
+    "prop-types": "15.8.0",
+    "query-string": "7.1.0",
     "react": "^16.14.0",
     "react-dom": "^16.14.0",
-    "react-frame-component": "4.1.3",
-    "react-router-dom": "6.3.0",
+    "react-frame-component": "5.2.2-alpha.0",
+    "react-router-dom": "5.3.0",
     "sanitize-filename": "1.6.3",
     "superagent": "^6.1.0",
     "vitreum": "git+https://git@github.com/calculuschild/vitreum.git"
   },
   "devDependencies": {
-    "eslint": "^8.23.0",
-    "eslint-plugin-react": "^7.31.7",
-    "jest": "^29.0.2",
-    "supertest": "^6.2.4"
+    "eslint": "^8.7.0",
+    "eslint-plugin-react": "^7.28.0",
+    "jest": "^27.4.5",
+    "supertest": "^6.2.2"
   }
 }

scripts/buildHomebrew.js

@@ -25,8 +25,6 @@ const build = async ({ bundle, render, ssr })=>{
 	await fs.outputFile('./build/homebrew/bundle.js', bundle);
 	await fs.outputFile('./build/homebrew/ssr.js', ssr);
 	await fs.copy('./themes/fonts', './build/fonts');
-	await fs.copy('./themes/assets', './build/assets');
-	await fs.copy('./client/homebrew/favicon.ico', './build/assets/favicon.ico');
 	let src = './themes/5ePhbLegacy.style.less';
 	//Parse brew theme files
 	less.render(fs.readFileSync(src).toString(), {
@@ -75,6 +73,6 @@ pack('./client/homebrew/homebrew.jsx', {
 if(isDev){
 	livereload('./build');
 	watchFile('./server.js', {
-		watch : ['./client', './server'] // Watch additional folders if you want
+		watch : ['./client'] // Watch additional folders if you want
 	});
 }

scripts/project.json

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

server.js

@@ -1,6 +1,11 @@
 const DB = require('./server/db.js');
 const server = require('./server/app.js');
-const config = require('./server/config.js');
+
+const config = require('nconf')
+	.argv()
+	.env({ lowerCase: true })
+	.file('environment', { file: `config/${process.env.NODE_ENV}.json` })
+	.file('defaults', { file: 'config/default.json' });
 
 DB.connect(config).then(()=>{
 	// Ensure that we have successfully connected to the database

server/app.js

@@ -1,20 +1,51 @@
 /*eslint max-lines: ["warn", {"max": 300, "skipBlankLines": true, "skipComments": true}]*/
-// Set working directory to project root
-process.chdir(`${__dirname}/..`);
-
 const _ = require('lodash');
 const jwt = require('jwt-simple');
 const express = require('express');
 const yaml = require('js-yaml');
 const app = express();
-const config = require('./config.js');
 
-const { homebrewApi, getBrew } = require('./homebrew.api.js');
+const homebrewApi = require('./homebrew.api.js');
 const GoogleActions = require('./googleActions.js');
 const serveCompressedStaticAssets = require('./static-assets.mv.js');
 const sanitizeFilename = require('sanitize-filename');
 const asyncHandler = require('express-async-handler');
 
+const brewAccessTypes = ['edit', 'share', 'raw'];
+
+//Get the brew object from the HB database or Google Drive
+const getBrewFromId = asyncHandler(async (id, accessType)=>{
+	if(!brewAccessTypes.includes(accessType))
+		throw ('Invalid Access Type when getting brew');
+	let brew;
+	if(id.length > 12) {
+		const googleId = id.slice(0, -12);
+		id             = id.slice(-12);
+		brew = await GoogleActions.readFileMetadata(config.get('google_api_key'), googleId, id, accessType);
+	} else {
+		brew = await HomebrewModel.get(accessType == 'edit' ? { editId: id } : { shareId: id });
+		brew = brew.toObject(); // Convert MongoDB object to standard Javascript Object
+	}
+
+	brew = sanitizeBrew(brew, accessType === 'edit' ? false : true);
+	//Split brew.text into text and style
+	//unless the Access Type is RAW, in which case return immediately
+	if(accessType == 'raw') {
+		return brew;
+	}
+	splitTextStyleAndMetadata(brew);
+	return brew;
+});
+
+const sanitizeBrew = (brew, full=false)=>{
+	delete brew._id;
+	delete brew.__v;
+	if(full){
+		delete brew.editId;
+	}
+	return brew;
+};
+
 const splitTextStyleAndMetadata = (brew)=>{
 	brew.text = brew.text.replaceAll('\r\n', '\n');
 	if(brew.text.startsWith('```metadata')) {
@@ -31,22 +62,22 @@ const splitTextStyleAndMetadata = (brew)=>{
 	}
 };
 
-const sanitizeBrew = (brew, accessType)=>{
-	brew._id = undefined;
-	brew.__v = undefined;
-	if(accessType !== 'edit'){
-		brew.editId = undefined;
-	}
-	return brew;
-};
+app.use('/', serveCompressedStaticAssets(`${__dirname}/../build`));
 
-app.use('/', serveCompressedStaticAssets(`build`));
+process.chdir(__dirname);
 
 //app.use(express.static(`${__dirname}/build`));
 app.use(require('body-parser').json({ limit: '25mb' }));
 app.use(require('cookie-parser')());
 app.use(require('./forcessl.mw.js'));
 
+// FIXME: the config should be passed as an argument for the app
+const config = require('nconf')
+	.argv()
+	.env({ lowerCase: true })
+	.file('environment', { file: `config/${process.env.NODE_ENV}.json` })
+	.file('defaults', { file: 'config/default.json' });
+
 //Account Middleware
 app.use((req, res, next)=>{
 	if(req.cookies && req.cookies.nc_session){
@@ -67,75 +98,66 @@ app.use((req, res, next)=>{
 app.use(homebrewApi);
 app.use(require('./admin.api.js'));
 
-const HomebrewModel     = require('./homebrew.model.js').model;
-const welcomeText       = require('fs').readFileSync('client/homebrew/pages/homePage/welcome_msg.md', 'utf8');
-const welcomeTextLegacy = require('fs').readFileSync('client/homebrew/pages/homePage/welcome_msg_legacy.md', 'utf8');
-const migrateText       = require('fs').readFileSync('client/homebrew/pages/homePage/migrate.md', 'utf8');
-const changelogText     = require('fs').readFileSync('changelog.md', 'utf8');
-const faqText           = require('fs').readFileSync('faq.md', 'utf8');
+const HomebrewModel  = require('./homebrew.model.js').model;
+const welcomeText    = require('fs').readFileSync('./../client/homebrew/pages/homePage/welcome_msg.md', 'utf8');
+const welcomeTextV3  = require('fs').readFileSync('./../client/homebrew/pages/homePage/welcome_msg_v3.md', 'utf8');
+const changelogText  = require('fs').readFileSync('./../changelog.md', 'utf8');
+const faqText        = require('fs').readFileSync('./../faq.md', 'utf8');
 
 String.prototype.replaceAll = function(s, r){return this.split(s).join(r);};
 
 //Robots.txt
 app.get('/robots.txt', (req, res)=>{
-	return res.sendFile(`robots.txt`, { root: process.cwd() });
+	return res.sendFile(`${__dirname}/robots.txt`);
 });
 
 //Home page
-app.get('/', (req, res, next)=>{
-	req.brew = {
-		text     : welcomeText,
-		renderer : 'V3'
+app.get('/', async (req, res, next)=>{
+	const brew = {
+		text : welcomeText
 	};
-	splitTextStyleAndMetadata(req.brew);
+	req.brew = brew;
 	return next();
 });
 
 //Home page v3
-app.get('/legacy', (req, res, next)=>{
-	req.brew = {
-		text     : welcomeTextLegacy,
-		renderer : 'legacy'
-	};
-	splitTextStyleAndMetadata(req.brew);
-	return next();
-});
-
-//Legacy/Other Document -> v3 Migration Guide
-app.get('/migrate', (req, res, next)=>{
-	req.brew = {
-		text     : migrateText,
+app.get('/v3_preview', async (req, res, next)=>{
+	const brew = {
+		text     : welcomeTextV3,
 		renderer : 'V3'
 	};
-	splitTextStyleAndMetadata(req.brew);
+	splitTextStyleAndMetadata(brew);
+	req.brew = brew;
 	return next();
 });
 
 //Changelog page
 app.get('/changelog', async (req, res, next)=>{
-	req.brew = {
+	const brew = {
 		title    : 'Changelog',
 		text     : changelogText,
 		renderer : 'V3'
 	};
-	splitTextStyleAndMetadata(req.brew);
+	splitTextStyleAndMetadata(brew);
+	req.brew = brew;
 	return next();
 });
 
 //FAQ page
 app.get('/faq', async (req, res, next)=>{
-	req.brew = {
+	const brew = {
 		title    : 'FAQ',
 		text     : faqText,
 		renderer : 'V3'
 	};
-	splitTextStyleAndMetadata(req.brew);
+	splitTextStyleAndMetadata(brew);
+	req.brew = brew;
 	return next();
 });
 
 //Source page
-app.get('/source/:id', asyncHandler(getBrew('share')), (req, res)=>{
-	const { brew } = req;
+app.get('/source/:id', asyncHandler(async (req, res)=>{
+	const brew = await getBrewFromId(req.params.id, 'raw');
 
 	const replaceStrings = { '&': '&amp;', '<': '&lt;', '>': '&gt;' };
 	let text = brew.text;
@@ -144,12 +166,11 @@ app.get('/source/:id', asyncHandler(getBrew('share')), (req, res)=>{
 	}
 	text = `<code><pre style="white-space: pre-wrap;">${text}</pre></code>`;
 	res.status(200).send(text);
-});
+}));
 
 //Download brew source page
-app.get('/download/:id', asyncHandler(getBrew('share')), (req, res)=>{
-	const { brew } = req;
-	sanitizeBrew(brew, 'share');
+app.get('/download/:id', asyncHandler(async (req, res)=>{
+	const brew = await getBrewFromId(req.params.id, 'raw');
 	const prefix = 'HB - ';
 
 	let fileName = sanitizeFilename(`${prefix}${brew.title}`).replaceAll(' ', '');
@@ -160,131 +181,77 @@ app.get('/download/:id', asyncHandler(getBrew('share')), (req, res)=>{
 		'Content-Disposition' : `attachment; filename="${fileName}.txt"`
 	});
 	res.status(200).send(brew.text);
-});
+}));
 
 //User Page
 app.get('/user/:username', async (req, res, next)=>{
 	const ownAccount = req.account && (req.account.username == req.params.username);
 
-	const fields = [
-		'googleId',
-		'title',
-		'pageCount',
-		'description',
-		'authors',
-		'published',
-		'views',
-		'shareId',
-		'editId',
-		'createdAt',
-		'updatedAt',
-		'lastViewed',
-		'tags'
-	];
-
-	let brews = await HomebrewModel.getByUser(req.params.username, ownAccount, fields)
+	let brews = await HomebrewModel.getByUser(req.params.username, ownAccount)
 	.catch((err)=>{
 		console.log(err);
 	});
 
 	if(ownAccount && req?.account?.googleId){
-		const auth = await GoogleActions.authCheck(req.account, res);
-		let googleBrews = await GoogleActions.listGoogleBrews(auth)
-			.catch((err)=>{
-				console.error(err);
-			});
+		const googleBrews = await GoogleActions.listGoogleBrews(req, res)
+		.catch((err)=>{
+			console.error(err);
+		});
 
-		if(googleBrews && googleBrews.length > 0) {
-			for (const brew of brews.filter((brew)=>brew.googleId)) {
-				const match = googleBrews.findIndex((b)=>b.editId === brew.editId);
-				if(match !== -1) {
-					brew.googleId = googleBrews[match].googleId;
-					brew.stubbed = true;
-					brew.pageCount = googleBrews[match].pageCount;
-					brew.renderer = googleBrews[match].renderer;
-					brew.version = googleBrews[match].version;
-					googleBrews.splice(match, 1);
-				}
-			}
-
-			googleBrews = googleBrews.map((brew)=>({ ...brew, authors: [req.account.username] }));
+		if(googleBrews)
 			brews = _.concat(brews, googleBrews);
-		}
 	}
 
 	req.brews = _.map(brews, (brew)=>{
-		return sanitizeBrew(brew, ownAccount ? 'edit' : 'share');
+		return sanitizeBrew(brew, !ownAccount);
 	});
 
 	return next();
 });
 
 //Edit Page
-app.get('/edit/:id', asyncHandler(getBrew('edit')), (req, res, next)=>{
-	req.brew = req.brew.toObject ? req.brew.toObject() : req.brew;
-	sanitizeBrew(req.brew, 'edit');
-	splitTextStyleAndMetadata(req.brew);
+app.get('/edit/:id', asyncHandler(async (req, res, next)=>{
 	res.header('Cache-Control', 'no-cache, no-store');	//reload the latest saved brew when pressing back button, not the cached version before save.
+	const brew = await getBrewFromId(req.params.id, 'edit');
+	req.brew = brew;
 	return next();
-});
+}));
 
 //New Page
-app.get('/new/:id', asyncHandler(getBrew('share')), (req, res, next)=>{
-	sanitizeBrew(req.brew, 'share');
-	splitTextStyleAndMetadata(req.brew);
-	req.brew.title = `CLONE - ${req.brew.title}`;
+app.get('/new/:id', asyncHandler(async (req, res, next)=>{
+	const brew = await getBrewFromId(req.params.id, 'share');
+	brew.title = `CLONE - ${brew.title}`;
+	req.brew = brew;
 	return next();
-});
+}));
 
 //Share Page
-app.get('/share/:id', asyncHandler(getBrew('share')), asyncHandler(async (req, res, next)=>{
-	const { brew } = req;
+app.get('/share/:id', asyncHandler(async (req, res, next)=>{
+	const brew = await getBrewFromId(req.params.id, 'share');
 
-	if(req.params.id.length > 12 && !brew._id) {
+	if(req.params.id.length > 12) {
 		const googleId = req.params.id.slice(0, -12);
 		const shareId = req.params.id.slice(-12);
 		await GoogleActions.increaseView(googleId, shareId, 'share', brew)
-			.catch((err)=>{next(err);});
+					.catch((err)=>{next(err);});
 	} else {
 		await HomebrewModel.increaseView({ shareId: brew.shareId });
 	}
-	sanitizeBrew(req.brew, 'share');
-	splitTextStyleAndMetadata(req.brew);
+
+	req.brew = brew;
 	return next();
 }));
 
 //Print Page
-app.get('/print/:id', asyncHandler(getBrew('share')), (req, res, next)=>{
-	sanitizeBrew(req.brew, 'share');
-	splitTextStyleAndMetadata(req.brew);
-	next();
-});
-
-const nodeEnv = config.get('node_env');
-const isLocalEnvironment = config.get('local_environments').includes(nodeEnv);
-// Local only
-if(isLocalEnvironment){
-	// Login
-	app.post('/local/login', (req, res)=>{
-		const username = req.body.username;
-		if(!username) return;
-
-		const payload = jwt.encode({ username: username, issued: new Date }, config.get('secret'));
-		return res.json(payload);
-	});
-}
-
-
+app.get('/print/:id', asyncHandler(async (req, res, next)=>{
+	const brew = await getBrewFromId(req.params.id, 'share');
+	req.brew = brew;
+	return next();
+}));
 
 //Render the page
 const templateFn = require('./../client/template.js');
-app.use(asyncHandler(async (req, res, next)=>{
-	// Create configuration object
-	const configuration = {
-		local       : isLocalEnvironment,
-		publicUrl   : config.get('publicUrl') ?? '',
-		environment : nodeEnv
-	};
+app.use((req, res)=>{
 	const props = {
 		version     : require('./../package.json').version,
 		url         : req.originalUrl,
@@ -292,18 +259,16 @@ app.use(asyncHandler(async (req, res, next)=>{
 		brews       : req.brews,
 		googleBrews : req.googleBrews,
 		account     : req.account,
-		enable_v3   : config.get('enable_v3'),
-		config      : configuration
+		enable_v3   : config.get('enable_v3')
 	};
 	const title = req.brew ? req.brew.title : '';
-	const page = await templateFn('homebrew', title, props)
-		.catch((err)=>{
-			console.log(err);
-			return res.sendStatus(500);
-		});
-	if(!page) return;
-	res.send(page);
-}));
+	templateFn('homebrew', title, props)
+        .then((page)=>{ res.send(page); })
+        .catch((err)=>{
+        	console.log(err);
+        	return res.sendStatus(500);
+        });
+});
 
 //v=====----- Error-Handling Middleware -----=====v//
 //Format Errors so all fields will be sent
@@ -327,13 +292,6 @@ app.use((err, req, res, next)=>{
 	console.error(err);
 	res.status(status).send(getPureError(err));
 });
-
-app.use((req, res)=>{
-	if(!res.headersSent) {
-		console.error('Headers have not been sent, responding with a server error.', req.url);
-		res.status(500).send('An error occurred and the server did not send a response. The error has been logged, please note the time this occurred and report this issue.');
-	}
-});
 //^=====--------------------------------------=====^//
 
 module.exports = {

server/config.js

@@ -1,5 +0,0 @@
-module.exports = require('nconf')
-    .argv()
-    .env({ lowerCase: true })
-    .file('environment', { file: `config/${process.env.NODE_ENV}.json` })
-    .file('defaults', { file: 'config/default.json' });

server/googleActions.js

@@ -3,22 +3,13 @@ const _ = require('lodash');
 const { google } = require('googleapis');
 const { nanoid } = require('nanoid');
 const token = require('./token.js');
-const config = require('./config.js');
+const config = require('nconf')
+	.argv()
+	.env({ lowerCase: true })	// Load environment variables
+	.file('environment', { file: `config/${process.env.NODE_ENV}.json` })
+	.file('defaults', { file: 'config/default.json' });
 
-const keys = typeof(config.get('service_account')) == 'string' ?
-	JSON.parse(config.get('service_account')) :
-	config.get('service_account');
-let serviceAuth;
-try {
-	serviceAuth = google.auth.fromJSON(keys);
-	serviceAuth.scopes = [
-		'https://www.googleapis.com/auth/drive'
-	];
-} catch (err) {
-	console.warn(err);
-	console.log('Please make sure that a Google Service Account is set up properly in your config files.');
-}
-google.options({ auth: serviceAuth || config.get('google_api_key') });
+//let oAuth2Client;
 
 const GoogleActions = {
 
@@ -56,7 +47,7 @@ const GoogleActions = {
 	},
 
 	getGoogleFolder : async (auth)=>{
-		const drive = google.drive({ version: 'v3', auth });
+		const drive = google.drive({ version: 'v3', auth: auth });
 
 		fileMetadata = {
 			'name'     : 'Homebrewery',
@@ -92,8 +83,17 @@ const GoogleActions = {
 		return folderId;
 	},
 
-	listGoogleBrews : async (auth)=>{
-		const drive = google.drive({ version: 'v3', auth });
+	listGoogleBrews : async (req, res)=>{
+
+		oAuth2Client = GoogleActions.authCheck(req.account, res);
+
+		//TODO: Change to service account to allow non-owners to view published files.
+		// Requires a driveId parameter in the drive.files.list command
+		// const keys = JSON.parse(config.get('service_account'));
+		// const auth = google.auth.fromJSON(keys);
+		// auth.scopes = ['https://www.googleapis.com/auth/drive'];
+
+		const drive = google.drive({ version: 'v3', auth: oAuth2Client });
 
 		const obj = await drive.files.list({
 			pageSize : 1000,
@@ -101,18 +101,18 @@ const GoogleActions = {
 			q        : 'mimeType != \'application/vnd.google-apps.folder\' and trashed = false'
 		})
 		.catch((err)=>{
-			console.log(`Error Listing Google Brews`);
+	    console.log(`Error Listing Google Brews`);
 			console.error(err);
 			throw (err);
 			//TODO: Should break out here, but continues on for some reason.
-		});
+	  });
 
 		if(!obj.data.files.length) {
-			console.log('No files found.');
-		}
+	    console.log('No files found.');
+	  }
 
 		const brews = obj.data.files.map((file)=>{
-			return {
+	    return {
 				text        : '',
 				shareId     : file.properties.shareId,
 				editId      : file.properties.editId,
@@ -124,48 +124,67 @@ const GoogleActions = {
 				title       : file.properties.title,
 				description : file.description,
 				views       : parseInt(file.properties.views),
+				tags        : '',
 				published   : file.properties.published ? file.properties.published == 'true' : false,
-				systems     : [],
-				thumbnail   : file.properties.thumbnail
+				authors     : [req.account.username],	//TODO: properly save and load authors to google drive
+				systems     : []
 			};
 		});
 	  return brews;
 	},
 
-	updateGoogleBrew : async (brew)=>{
-		const drive = google.drive({ version: 'v3' });
+	existsGoogleBrew : async (auth, id)=>{
+		const drive = google.drive({ version: 'v3', auth: auth });
 
-		await drive.files.update({
-			fileId   : brew.googleId,
-			resource : {
-				name        : `${brew.title}.txt`,
-				description : `${brew.description}`,
-				properties  : {
-					title     : brew.title,
-					shareId   : brew.shareId || nanoid(12),
-					editId    : brew.editId || nanoid(12),
-					pageCount : brew.pageCount,
-					renderer  : brew.renderer || 'legacy',
-					isStubbed : true,
-					thumbnail : brew.thumbnail
-				}
-			},
-			media : {
-				mimeType : 'text/plain',
-				body     : brew.text
-			}
-		})
+		const result = await drive.files.get({ fileId: id })
 		.catch((err)=>{
-			console.log('Error saving to google');
+			console.log('error checking file exists...');
 			console.error(err);
-			throw (err);
+			return false;
 		});
 
-		return true;
+		if(result){return true;}
+
+		return false;
+	},
+
+	updateGoogleBrew : async (auth, brew)=>{
+		const drive = google.drive({ version: 'v3', auth: auth });
+
+		if(await GoogleActions.existsGoogleBrew(auth, brew.googleId) == true) {
+			await drive.files.update({
+				fileId   : brew.googleId,
+				resource : {
+					name        : `${brew.title}.txt`,
+					description : `${brew.description}`,
+					properties  : {
+						title     : brew.title,
+						published : brew.published,
+						version   : brew.version,
+						renderer  : brew.renderer,
+						tags      : brew.tags,
+						pageCount : brew.pageCount,
+						systems   : brew.systems.join()
+					}
+				},
+				media : {
+					mimeType : 'text/plain',
+					body     : brew.text
+				}
+			})
+			.catch((err)=>{
+				console.log('Error saving to google');
+				console.error(err);
+				throw (err);
+				//return res.status(500).send('Error while saving');
+			});
+		}
+
+		return (brew);
 	},
 
 	newGoogleBrew : async (auth, brew)=>{
-		const drive = google.drive({ version: 'v3', auth });
+		const drive = google.drive({ version: 'v3', auth: auth });
 
 		const media = {
 			mimeType : 'text/plain',
@@ -175,18 +194,16 @@ const GoogleActions = {
 		const folderId = await GoogleActions.getGoogleFolder(auth);
 
 		const fileMetadata = {
-			name        : `${brew.title}.txt`,
-			description : `${brew.description}`,
-			parents     : [folderId],
-			properties  : {								//AppProperties is not accessible
-				shareId   : brew.shareId || nanoid(12),
-				editId    : brew.editId || nanoid(12),
-				title     : brew.title,
-				pageCount : brew.pageCount,
-				renderer  : brew.renderer || 'legacy',
-				isStubbed : true,
-				version   : 1,
-				thumbnail : brew.thumbnail || ''
+			'name'        : `${brew.title}.txt`,
+			'description' : `${brew.description}`,
+			'parents'     : [folderId],
+			'properties'  : {								//AppProperties is not accessible
+				'shareId'   : nanoid(12),
+				'editId'    : nanoid(12),
+				'title'     : brew.title,
+				'views'     : '0',
+				'pageCount' : brew.pageCount,
+				'renderer'  : brew.renderer || 'legacy'
 			}
 		};
 
@@ -213,11 +230,31 @@ const GoogleActions = {
 			console.error(err);
 		});
 
-		return obj.data.id;
+		const newHomebrew = {
+			text      : brew.text,
+			shareId   : fileMetadata.properties.shareId,
+			editId    : fileMetadata.properties.editId,
+			createdAt : new Date(),
+			updatedAt : new Date(),
+			gDrive    : true,
+			googleId  : obj.data.id,
+			pageCount : fileMetadata.properties.pageCount,
+
+			title       : brew.title,
+			description : brew.description,
+			tags        : '',
+			published   : brew.published,
+			renderer    : brew.renderer,
+			authors     : [],
+			systems     : []
+		};
+
+		return newHomebrew;
 	},
 
-	getGoogleBrew : async (id, accessId, accessType)=>{
-		const drive = google.drive({ version: 'v3' });
+	readFileMetadata : async (auth, id, accessId, accessType)=>{
+
+		const drive = google.drive({ version: 'v3', auth: auth });
 
 		const obj = await drive.files.get({
 			fileId : id,
@@ -226,6 +263,7 @@ const GoogleActions = {
 		.catch((err)=>{
 			console.log('Error loading from Google');
 			throw (err);
+			return;
 		});
 
 		if(obj) {
@@ -235,7 +273,18 @@ const GoogleActions = {
 				throw ('Share ID does not match');
 			}
 
-			const file = await drive.files.get({
+			//Access file using service account. Using API key only causes "automated query" lockouts after a while.
+
+			const keys = typeof(config.get('service_account')) == 'string' ?
+				JSON.parse(config.get('service_account')) :
+				config.get('service_account');
+
+			const serviceAuth = google.auth.fromJSON(keys);
+			serviceAuth.scopes = ['https://www.googleapis.com/auth/drive'];
+
+			const serviceDrive = google.drive({ version: 'v3', auth: serviceAuth });
+
+			const file = await serviceDrive.files.get({
 				fileId : id,
 				fields : 'description, properties',
 				alt    : 'media'
@@ -252,7 +301,7 @@ const GoogleActions = {
 				text    : file.data,
 
 				description : obj.data.description,
-				tags        : obj.data.properties.tags ? obj.data.properties.tags : '',
+				tags        : obj.data.properties.tags    ? obj.data.properties.tags               : '',
 				systems     : obj.data.properties.systems ? obj.data.properties.systems.split(',') : [],
 				authors     : [],
 				published   : obj.data.properties.published ? obj.data.properties.published == 'true' : false,
@@ -265,8 +314,8 @@ const GoogleActions = {
 				views      : parseInt(obj.data.properties.views) || 0, //brews with no view parameter will return undefined
 				version    : parseInt(obj.data.properties.version) || 0,
 				renderer   : obj.data.properties.renderer ? obj.data.properties.renderer : 'legacy',
-				thumbnail  : obj.data.properties.thumbnail || '',
 
+				gDrive   : true,
 				googleId : id
 			};
 
@@ -274,34 +323,51 @@ const GoogleActions = {
 		}
 	},
 
-	deleteGoogleBrew : async (auth, id, accessId)=>{
-		const drive = google.drive({ version: 'v3', auth });
+	deleteGoogleBrew : async (req, res, id)=>{
+
+		oAuth2Client = GoogleActions.authCheck(req.account, res);
+		const drive = google.drive({ version: 'v3', auth: oAuth2Client });
+
+		const googleId = id.slice(0, -12);
+		const accessId = id.slice(-12);
 
 		const obj = await drive.files.get({
-			fileId : id,
+			fileId : googleId,
 			fields : 'properties'
 		})
 		.catch((err)=>{
 			console.log('Error loading from Google');
 			console.error(err);
+			return;
 		});
 
 		if(obj && obj.data.properties.editId != accessId) {
-			throw { status: 403, message: 'Not authorized to delete this Google brew' };
+			throw ('Not authorized to delete this Google brew');
 		}
 
 		await drive.files.update({
-			fileId   : id,
+			fileId   : googleId,
 			resource : { trashed: true }
 		})
 		.catch((err)=>{
 			console.log('Can\'t delete Google file');
 			console.error(err);
 		});
+
+		return res.status(200).send();
 	},
 
 	increaseView : async (id, accessId, accessType, brew)=>{
-		const drive = google.drive({ version: 'v3' });
+		//service account because this is modifying another user's file properties
+		//so we need extended scope
+		const keys = typeof(config.get('service_account')) == 'string' ?
+			JSON.parse(config.get('service_account')) :
+			config.get('service_account');
+
+		const auth = google.auth.fromJSON(keys);
+		auth.scopes = ['https://www.googleapis.com/auth/drive'];
+
+		const drive = google.drive({ version: 'v3', auth: auth });
 
 		await drive.files.update({
 			fileId   : brew.googleId,
@@ -318,6 +384,8 @@ const GoogleActions = {
 			console.error(err);
 			//return res.status(500).send('Error while saving');
 		});
+
+		return;
 	}
 };
 

server/homebrew.api.js

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

server/homebrew.model.js

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

server/token.js

@@ -1,7 +1,11 @@
 const jwt = require('jwt-simple');
 
 // Load configuration values
-const config = require('./config.js');
+const config = require('nconf')
+	.argv()
+	.env({ lowerCase: true })	// Load environment variables
+	.file('environment', { file: `config/${process.env.NODE_ENV}.json` })
+	.file('defaults', { file: 'config/default.json' });
 
 // Generate an Access Token for the given User ID
 const generateAccessToken = (account)=>{

shared/naturalcrit/codeEditor/codeEditor.jsx

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

shared/naturalcrit/codeEditor/codeEditor.less

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

shared/naturalcrit/nav/nav.less

@@ -1,4 +1,3 @@
-@import '../styles/colors';
 @keyframes glideDropDown {
 	0%   {transform : translate(0px, -100%);
 				opacity   : 0;
@@ -50,7 +49,6 @@ nav{
 		}
 	}
 	.navItem{
-		#backgroundColorsHover;
 		.animate(background-color);
 		padding          : 8px 12px;
 		cursor           : pointer;
@@ -60,12 +58,30 @@ nav{
 		color            : white;
 		text-decoration  : none;
 		text-transform   : uppercase;
-		line-height      : 13px;
 		i{
 			margin-left : 5px;
 			font-size   : 13px;
-			float       : right;
 		}
+		&.tealLight:hover{ background-color : @tealLight };
+		&.teal:hover{ background-color : @teal };
+		&.greenLight:hover{ background-color : @greenLight };
+		&.green:hover{ background-color : @green };
+		&.blueLight:hover{ background-color : @blueLight };
+		&.blue:hover{ background-color : @blue };
+		&.purpleLight:hover{ background-color : @purpleLight };
+		&.purple:hover{ background-color : @purple };
+		&.steelLight:hover{ background-color : @steelLight };
+		&.steel:hover{ background-color : @steel };
+		&.yellowLight:hover{ background-color : @yellowLight };
+		&.yellow:hover{ background-color : @yellow };
+		&.orangeLight:hover{ background-color : @orangeLight };
+		&.orange:hover{ background-color : @orange };
+		&.redLight:hover{ background-color : @redLight };
+		&.red:hover{ background-color : @red };
+		&.silverLight:hover{ background-color : @silverLight };
+		&.silver:hover{ background-color : @silver };
+		&.greyLight:hover{ background-color : @greyLight };
+		&.grey:hover{ background-color : @grey };
 	}
 	.navSection:last-child .navItem{
 		border-left : 1px solid #666;

shared/naturalcrit/splitPane/splitPane.jsx

@@ -10,77 +10,43 @@ const SplitPane = createClass({
 		return {
 			storageKey   : 'naturalcrit-pane-split',
 			onDragFinish : function(){} //fires when dragging
+
 		};
 	},
-
 	getInitialState : function() {
 		return {
-			currentDividerPos : null,
-			windowWidth       : 0,
-			isDragging        : false,
-			moveSource        : false,
-			moveBrew          : false,
-			showMoveArrows    : true
+			size       : null,
+			isDragging : false
 		};
 	},
-
 	componentDidMount : function() {
-		const dividerPos = window.localStorage.getItem(this.props.storageKey);
-		if(dividerPos){
+		const paneSize = window.localStorage.getItem(this.props.storageKey);
+		if(paneSize){
 			this.setState({
-				currentDividerPos : this.limitPosition(dividerPos, 0.1*(window.innerWidth-13), 0.9*(window.innerWidth-13)),
-				userSetDividerPos : dividerPos,
-				windowWidth       : window.innerWidth
-			});
-		} else {
-			this.setState({
-				currentDividerPos : window.innerWidth / 2,
-				userSetDividerPos : window.innerWidth / 2
+				size : paneSize
 			});
 		}
-		window.addEventListener('resize', this.handleWindowResize);
-	},
-
-	componentWillUnmount : function() {
-		window.removeEventListener('resize', this.handleWindowResize);
-	},
-
-	handleWindowResize : function() {
-		// Allow divider to increase in size to last user-set position
-		// Limit current position to between 10% and 90% of visible space
-		const newLoc = this.limitPosition(this.state.userSetDividerPos, 0.1*(window.innerWidth-13), 0.9*(window.innerWidth-13));
-
-		this.setState({
-			currentDividerPos : newLoc,
-			windowWidth       : window.innerWidth
-		});
-	},
-
-	limitPosition : function(x, min = 1, max = window.innerWidth - 13) {
-		const result = Math.round(Math.min(max, Math.max(min, x)));
-		return result;
 	},
 
 	handleUp : function(){
 		if(this.state.isDragging){
-			this.props.onDragFinish(this.state.currentDividerPos);
-			window.localStorage.setItem(this.props.storageKey, this.state.currentDividerPos);
+			this.props.onDragFinish(this.state.size);
+			window.localStorage.setItem(this.props.storageKey, this.state.size);
 		}
 		this.setState({ isDragging: false });
 	},
-
 	handleDown : function(){
 		this.setState({ isDragging: true });
 		//this.unFocus()
 	},
-
 	handleMove : function(e){
 		if(!this.state.isDragging) return;
 
-		const newSize = this.limitPosition(e.pageX);
+		const minWidth = 1;
+		const maxWidth = window.innerWidth - 13;
+		const newSize = Math.min(maxWidth, Math.max(minWidth, e.pageX));
 		this.setState({
-			currentDividerPos : newSize,
-			userSetDividerPos : newSize
+			size : newSize
 		});
 	},
 	/*
@@ -91,58 +57,20 @@ const SplitPane = createClass({
 			window.getSelection().removeAllRanges();
 		}
 	},
-	*/
-
-	setMoveArrows : function(newState) {
-		if(this.state.showMoveArrows != newState){
-			this.setState({
-				showMoveArrows : newState
-			});
-		}
-	},
-
-	renderMoveArrows : function(){
-		if(this.state.showMoveArrows) {
-			return <>
-				<div className='arrow left'
-					style={{ left: this.state.currentDividerPos-4 }}
-					onClick={()=>this.setState({ moveSource: !this.state.moveSource })} >
-					<i className='fas fa-arrow-left' />
-				</div>
-				<div className='arrow right'
-					style={{ left: this.state.currentDividerPos-4 }}
-					onClick={()=>this.setState({ moveBrew: !this.state.moveBrew })} >
-					<i className='fas fa-arrow-right' />
-				</div>
-			</>;
-		}
-	},
-
+*/
 	renderDivider : function(){
-		return <>
-			{this.renderMoveArrows()}
-			<div className='divider' onMouseDown={this.handleDown} >
-				<div className='dots'>
-					<i className='fas fa-circle' />
-					<i className='fas fa-circle' />
-					<i className='fas fa-circle' />
-				</div>
+		return <div className='divider' onMouseDown={this.handleDown} >
+			<div className='dots'>
+				<i className='fas fa-circle' />
+				<i className='fas fa-circle' />
+				<i className='fas fa-circle' />
 			</div>
-		</>;
+		</div>;
 	},
 
 	render : function(){
 		return <div className='splitPane' onMouseMove={this.handleMove} onMouseUp={this.handleUp}>
-			<Pane
-				ref='pane1'
-				width={this.state.currentDividerPos}
-			>
-				{React.cloneElement(this.props.children[0], {
-					moveBrew      : this.state.moveBrew,
-					moveSource    : this.state.moveSource,
-					setMoveArrows : this.setMoveArrows
-				})}
-			</Pane>
+			<Pane ref='pane1' width={this.state.size}>{this.props.children[0]}</Pane>
 			{this.renderDivider()}
 			<Pane ref='pane2' isDragging={this.state.isDragging}>{this.props.children[1]}</Pane>
 		</div>;

shared/naturalcrit/splitPane/splitPane.less

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

shared/naturalcrit/styles/colors.less

@@ -20,50 +20,4 @@
 @silverLight : #ECF0F1;
 @silver      : #BDC3C7;
 @greyLight   : #95A5A6;
-@grey        : #7F8C8D;
-
-#backgroundColors {
-  &.tealLight{ background-color : @tealLight };
-  &.teal{ background-color : @teal };
-  &.greenLight{ background-color : @greenLight };
-  &.green{ background-color : @green };
-  &.blueLight{ background-color : @blueLight };
-  &.blue{ background-color : @blue };
-  &.purpleLight{ background-color : @purpleLight };
-  &.purple{ background-color : @purple };
-  &.steelLight{ background-color : @steelLight };
-  &.steel{ background-color : @steel };
-  &.yellowLight{ background-color : @yellowLight };
-  &.yellow{ background-color : @yellow };
-  &.orangeLight{ background-color : @orangeLight };
-  &.orange{ background-color : @orange };
-  &.redLight{ background-color : @redLight };
-  &.red{ background-color : @red };
-  &.silverLight{ background-color : @silverLight };
-  &.silver{ background-color : @silver };
-  &.greyLight{ background-color : @greyLight };
-  &.grey{ background-color : @grey };
-}
-
-#backgroundColorsHover {
-  &.tealLight:hover{ background-color : @tealLight };
-  &.teal:hover{ background-color : @teal };
-  &.greenLight:hover{ background-color : @greenLight };
-  &.green:hover{ background-color : @green };
-  &.blueLight:hover{ background-color : @blueLight };
-  &.blue:hover{ background-color : @blue };
-  &.purpleLight:hover{ background-color : @purpleLight };
-  &.purple:hover{ background-color : @purple };
-  &.steelLight:hover{ background-color : @steelLight };
-  &.steel:hover{ background-color : @steel };
-  &.yellowLight:hover{ background-color : @yellowLight };
-  &.yellow:hover{ background-color : @yellow };
-  &.orangeLight:hover{ background-color : @orangeLight };
-  &.orange:hover{ background-color : @orange };
-  &.redLight:hover{ background-color : @redLight };
-  &.red:hover{ background-color : @red };
-  &.silverLight:hover{ background-color : @silverLight };
-  &.silver:hover{ background-color : @silver };
-  &.greyLight:hover{ background-color : @greyLight };
-  &.grey:hover{ background-color : @grey };
-}
+@grey        : #7F8C8D;

tests/routes/static-pages.test.js

@@ -21,7 +21,9 @@ describe('Tests for static pages', ()=>{
 		return app.get('/faq').expect(200);
 	});
 
-	it('robots.txt works', ()=>{
+	// FIXME: robots.txt file can't be properly loaded under testing environment,
+	// most likely due to __dirname being different from what is expected
+	it.skip('robots.txt works', ()=>{
 		return app.get('/robots.txt').expect(200);
 	});
 });

themes/5ePhb.style.less

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

themes/assets/discordOfManyThings.svg

@@ -1 +0,0 @@
-<svg id="Layer_3" data-name="Layer 3" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 350.028 390.552"><defs><style>.cls-1{opacity:0.9;}.cls-2{fill:#001013;}.cls-3{fill:#fff;}.cls-4{fill:#aa2a29;}</style></defs><title>Discord of Many Things blank</title><g class="cls-1"><path d="M100.991,82.743c-1.649,3.324-3.395,5.768-4.1,8.482-1.49,5.753-3.44,11.644-3.455,17.482q-.332,125.259-.141,250.519c.007,20.122,12.708,36.368,31.407,40.239a38.328,38.328,0,0,0,7.722.761q103.611,0,207.222-.088h6.314c-3.256-11.462-9.664-34.015-9.664-34.015l2.431,2.023s41.561,37.755,62.33,56.6c2.489,2.26,3.694,4.462,3.593,7.885-.241,8.186-.078,16.383-.078,25.492-6.333-5.527-11.928-10.35-17.457-15.247-9.586-8.493-19.2-16.957-28.644-25.6a10.032,10.032,0,0,0-7.39-2.774q-117.228-.1-234.457-.334c-20.632-.031-33.959-9.189-41.021-28.578-.852-2.339-.783-5.091-.784-7.653q-.057-116.5-.031-233.007V119.145C74.791,102.517,84.2,89.068,100.991,82.743Z" transform="translate(-74.79 -67.573)"/></g><path class="cls-2" d="M338.234,371.589s5.556,19.924,8.513,30.53h-5.075c-69.335,0-138.67-.1-208,.074-16.925.043-35.116-9.515-40.505-33.247a26.538,26.538,0,0,1-.379-5.827q-.027-128.172.025-256.344c.021-19.276,15.226-36.749,34.427-38.688a82.669,82.669,0,0,1,8.279-.447q123.288-.034,246.578-.067c13.265-.016,24.7,3.79,33.278,14.235a39.273,39.273,0,0,1,9.447,25.5q-.015,167.477-.012,334.955c0,1.245-.1,2.49-.2,4.645-4.075-3.565-7.6-6.552-11.018-9.655q-35.236-31.992-70.44-64.017c-1.2-1.091-3.713-3.147-3.713-3.147l-2-1.775Z" transform="translate(-74.79 -67.573)"/><path class="cls-3" d="M419.838,435.934c-7.848-6.892-15.026-12.977-21.961-19.329q-28.235-25.86-56.253-51.954c-2.314-2.157-4.59-3.247-7.356-1.784-3.036,1.607-2.77,4.676-2.022,7.359,2.286,8.2,4.817,16.338,7.24,24.5a17.108,17.108,0,0,1,.294,1.851c-1.486.084-2.872.233-4.258.233-67.363.012-134.726-.155-202.088.123-18.267.075-32.955-13.095-34.769-29.353a92.257,92.257,0,0,1-.886-10.108Q97.7,233.488,97.793,109.5c.013-10.518,3.19-20.063,11.156-27.471a31.92,31.92,0,0,1,20.439-8.917c1.948-.109,3.9-.181,5.852-.181q123.5-.014,247-.063c9.957-.012,18.894,2.145,26.329,9.1,7.956,7.441,11.177,16.934,11.214,27.457.142,40.84.057,81.681.057,122.522V435.934Z" transform="translate(-74.79 -67.573)"/><path class="cls-4" d="M311.029,170.975c-11.8,45.005-23.315,88.959-35.123,134.016l-97.168-98.883Z" transform="translate(-74.79 -67.573)"/><path class="cls-4" d="M380.8,265.712l-95.97,40.316c11.438-43.808,22.639-86.709,33.839-129.609l1.08-.272Z" transform="translate(-74.79 -67.573)"/><path class="cls-4" d="M165.3,322.955c2.91-36.463,5.761-72.179,8.709-109.116l94.711,96.472Z" transform="translate(-74.79 -67.573)"/><path class="cls-4" d="M223.458,107.926l83.127,55.063L178.71,196.919Z" transform="translate(-74.79 -67.573)"/><path class="cls-4" d="M366.285,281.366l-72.5,73.414c-3.524-13.182-6.849-25.617-10.306-38.549Z" transform="translate(-74.79 -67.573)"/><path class="cls-4" d="M274.874,318.478c3.445,12.8,6.765,25.143,10.376,38.559l-98.635-26.556.032-1.153Z" transform="translate(-74.79 -67.573)"/><path class="cls-4" d="M374.888,241.261l-51.71-75.57,26.8-21.529,25.831,96.619Z" transform="translate(-74.79 -67.573)"/><path class="cls-4" d="M165.492,207.523c-2.39,30.748-4.736,60.942-7.083,91.135l-1.063.159c-8.5-31.936-17-63.872-25.705-96.581Z" transform="translate(-74.79 -67.573)"/><path class="cls-4" d="M317.039,159.316l-68.251-45.24.307-.794,93.794,25.212Z" transform="translate(-74.79 -67.573)"/><path class="cls-4" d="M136.517,193.952,203.5,125.03l1.086.832L167.794,198.9Z" transform="translate(-74.79 -67.573)"/></svg>

themes/fonts/5e/fonts.less

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