V2.10.7 (#1215)

* Fix for box-shadow/border-image issues on blockquotes in new columns (#1179)

* Fix for issues with box-shadow and border-images on blockquotes when they appear at the top of columns other than the first.

* Update phb.style.less

Change to `-webkit-transform` IAW Github PR discussion

* Add comment

Co-authored-by: Sean Robertson <srobertson@fqnz.co.nz>
Co-authored-by: Trevor Buckner <calculuschild@gmail.com>

* Title will always return *something*, and not CSS (#1214)

* Bump codemirror from 5.59.1 to 5.59.2 (#1200)

Bumps [codemirror](https://github.com/codemirror/CodeMirror) from 5.59.1 to 5.59.2.
- [Release notes](https://github.com/codemirror/CodeMirror/releases)
- [Changelog](https://github.com/codemirror/CodeMirror/blob/master/CHANGELOG.md)
- [Commits](https://github.com/codemirror/CodeMirror/compare/5.59.1...5.59.2)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump mongoose from 5.11.9 to 5.11.13 (#1199)

Bumps [mongoose](https://github.com/Automattic/mongoose) from 5.11.9 to 5.11.13.
- [Release notes](https://github.com/Automattic/mongoose/releases)
- [Changelog](https://github.com/Automattic/mongoose/blob/master/History.md)
- [Commits](https://github.com/Automattic/mongoose/compare/5.11.9...5.11.13)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump fs-extra from 9.0.1 to 9.1.0 (#1197)

Bumps [fs-extra](https://github.com/jprichardson/node-fs-extra) from 9.0.1 to 9.1.0.
- [Release notes](https://github.com/jprichardson/node-fs-extra/releases)
- [Changelog](https://github.com/jprichardson/node-fs-extra/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jprichardson/node-fs-extra/compare/9.0.1...9.1.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump eslint from 7.17.0 to 7.18.0 (#1195)

Bumps [eslint](https://github.com/eslint/eslint) from 7.17.0 to 7.18.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.17.0...v7.18.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump nconf from 0.11.0 to 0.11.1 (#1190)

Bumps [nconf](https://github.com/flatiron/nconf) from 0.11.0 to 0.11.1.
- [Release notes](https://github.com/flatiron/nconf/releases)
- [Changelog](https://github.com/indexzero/nconf/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flatiron/nconf/compare/v0.11.0...v0.11.1)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump googleapis from 66.0.0 to 67.0.0 (#1189)

Bumps [googleapis](https://github.com/googleapis/google-api-nodejs-client) from 66.0.0 to 67.0.0.
- [Release notes](https://github.com/googleapis/google-api-nodejs-client/releases)
- [Changelog](https://github.com/googleapis/google-api-nodejs-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/googleapis/google-api-nodejs-client/compare/v66.0.0...v67.0.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Trevor Buckner <calculuschild@gmail.com>

* Bump express-static-gzip from 2.1.0 to 2.1.1 (#1180)

Bumps [express-static-gzip](https://github.com/tkoenig89/express-static-gzip) from 2.1.0 to 2.1.1.
- [Release notes](https://github.com/tkoenig89/express-static-gzip/releases)
- [Commits](https://github.com/tkoenig89/express-static-gzip/compare/v2.1.0...v2.1.1)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Trevor Buckner <calculuschild@gmail.com>

* use fa-info-circle instead of fa-bars (#1109)

* use fa-info-circle instead of fa-bars

* Change Metadata button to Info Icon with Text

Co-authored-by: Trevor Buckner <calculuschild@gmail.com>

* Up Version

Co-authored-by: G.Ambatte <sean@robertson-family.nz>
Co-authored-by: Sean Robertson <srobertson@fqnz.co.nz>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: ericscheid <ericscheid@users.noreply.github.com>

.babelrc

@@ -1,6 +0,0 @@
-{
-  "presets": [
-    "env",
-    "react"
-  ]
-}

.bithoundrc

@@ -0,0 +1,7 @@
+{
+  "dependencies": {
+    "unused-ignores": [
+      "react-dom"
+    ]
+  }
+}

.circleci/config.yml

@@ -0,0 +1,32 @@
+# Javascript Node CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-javascript/ for more details
+#
+version: 2
+jobs:
+  build:
+    docker:
+      - image: circleci/node:12.16.3
+      - image: circleci/mongo:3.4-jessie
+
+    working_directory: ~/repo
+
+    steps:
+      - checkout
+
+      # Download and cache dependencies
+      - restore_cache:
+          keys:
+          - v1-dependencies-{{ checksum "package.json" }}
+          # fallback to using the latest cache if no exact match is found
+          - v1-dependencies-
+
+      - run: npm install
+
+      - save_cache:
+          paths:
+            - node_modules
+          key: v1-dependencies-{{ checksum "package.json" }}
+
+      # run tests!
+      - run: npm run circleci

.dockerignore

@@ -0,0 +1,6 @@
+node_modules
+npm-debug.log
+.git
+Dockerfile
+docker-compose.yml
+tests

.eslintrc.js

@@ -0,0 +1,78 @@
+module.exports = {
+	root          : true,
+	parserOptions : {
+		ecmaVersion  : 9,
+		sourceType   : 'module',
+		ecmaFeatures : {
+			jsx : true
+		}
+	},
+	env : {
+		browser : true,
+		node    : true
+	},
+	plugins : ['react'],
+	rules   : {
+		/** Errors **/
+		'camelcase'              : ['error', { properties: 'never' }],
+		'func-style'             : ['error', 'expression', { allowArrowFunctions: true }],
+		'no-array-constructor'   : 'error',
+		'no-iterator'            : 'error',
+		'no-nested-ternary'      : 'error',
+		'no-new-object'          : 'error',
+		'no-proto'               : 'error',
+		'react/jsx-no-bind'      : ['error', { allowArrowFunctions: true }],
+		'react/jsx-uses-react'   : 'error',
+		'react/prefer-es6-class' : ['error', 'never'],
+
+		/** Warnings **/
+		'max-lines' : ['warn', {
+			max            : 200,
+			skipComments   : true,
+			skipBlankLines : true,
+		}],
+		'max-depth'            : ['warn', { max: 4 }],
+		'max-params'           : ['warn', { max: 4 }],
+		'no-restricted-syntax' : ['warn', 'ClassDeclaration', 'SwitchStatement'],
+		'no-unused-vars'       : ['warn', {
+			vars              : 'all',
+			args              : 'none',
+			varsIgnorePattern : 'config|_|cx|createClass'
+		}],
+		'react/jsx-uses-vars' : 'warn',
+
+		/** Fixable **/
+		'arrow-parens'    : ['warn', 'always'],
+		'brace-style'     : ['warn', '1tbs', { allowSingleLine: true }],
+		'jsx-quotes'      : ['warn', 'prefer-single'],
+		'no-var'          : 'warn',
+		'prefer-const'    : 'warn',
+		'prefer-template' : 'warn',
+		'quotes'          : ['warn', 'single', { 'allowTemplateLiterals': true }],
+		'semi'            : ['warn', 'always'],
+
+		/** Whitespace **/
+		'array-bracket-spacing' : ['warn', 'never'],
+		'arrow-spacing'         : ['warn', { before: false, after: false }],
+		'comma-spacing'         : ['warn', { before: false, after: true }],
+		'indent'                : ['warn', 'tab', { 'MemberExpression': 'off' }],
+		'keyword-spacing'       : ['warn', {
+			before    : true,
+			after     : true,
+			overrides : {
+				if : { 'before': false, 'after': false }
+			}
+		}],
+		'key-spacing' : ['warn', {
+			multiLine  : { beforeColon: true, afterColon: true, align: 'colon' },
+			singleLine : { beforeColon: false, afterColon: true }
+		}],
+		'linebreak-style'               : 'off',
+		'no-trailing-spaces'            : 'warn',
+		'no-whitespace-before-property' : 'warn',
+		'object-curly-spacing'          : ['warn', 'always'],
+		'react/jsx-indent-props'        : ['warn', 'tab'],
+		'space-in-parens'               : ['warn', 'never'],
+		'template-curly-spacing'        : ['warn', 'never'],
+	}
+};

.gitattributes

@@ -0,0 +1 @@
+package-lock.json binary

.github/issue_template.md

@@ -1,9 +1,21 @@
+<!-- CLICK "Preview" FOR INSTRUCTIONS IN A MORE READABLE FORMAT -->
+
+## Before you submit
+
+- Support questions are better asked on the subreddit [r/homebrewery](https://www.reddit.com/r/homebrewery/)
+- Read the [contributing guidelines](https://github.com/stolksdorf/homebrewery/blob/master/contributing.md).
+- If it's an issue, please make sure it's reproducible
+- Ensure the issue isn't already reported.
 
 
+*Delete the above section and the instructions in the sections below before submitting*
 
 
+## Description
 
-### Additional Details
+If this is a *feature request*, explain why it should be added. Specific use-cases are best.
+
+For *bug reports*, please provide as much *relevant* info as possible.
 
 **Share Link** :
 

.gitignore

@@ -1,16 +1,12 @@
-# Logs
-logs
-*.log
-
-#Ignore our built files
-build/*
-
-# Ignore sensitive stuff
-config/local.json
-
 node_modules
 storage
 .idea
 *.swp
 
-todo.md
+*.log
+build/*
+config/local.*
+
+todo.md
+startDB.bat
+startMViewer.bat

Dockerfile

@@ -0,0 +1,19 @@
+FROM node:8
+
+ENV NODE_ENV=docker
+
+# Create app directory
+WORKDIR /usr/src/app
+
+# Copy package.json into the image, then run yarn install
+# This improves caching so we don't have to download the dependencies every time the code changes
+COPY package.json ./
+# --ignore-scripts tells yarn not to run postbuild.  We run it explicitly later
+RUN yarn install --ignore-scripts
+
+# Bundle app source and build application
+COPY . .
+RUN yarn build
+
+EXPOSE 8000
+CMD [ "yarn", "start" ]

README.DOCKER.md

@@ -0,0 +1,12 @@
+# Running Homebrewery via Docker
+
+The repo includes a Dockerfile and a docker-compose.yml file.
+
+To run the application via docker-compose.yml:
+`docker-compose up -d`
+
+To stop the application:
+`docker-compose down`
+
+To stop the application and remove all data:
+`docker-compose down -v`

README.FREEBSD.md

@@ -0,0 +1,35 @@
+# FreeBSD/FreeNAS Installation Instructions
+
+## Before Installing
+
+These instructions assume that you are installing to a completely new, fresh FreeBSD/FreeNAS jail. As such, some steps will not be necessary if you are installing to an existing FreeBSD/FreeNAS install.
+
+## Installation instructions
+
+1. Create a new jail, with the appropriate network settings to access the internet.
+
+2. Install wget (`pkg install -y wget`). On a fresh jail, you will be prompted to press 'Y' to set up `pkg`.
+
+3. Download the installation script (`wget --no-check-certificate https://raw.githubusercontent.com/naturalcrit/homebrewery/master/freebsd/install.sh`). The parameter `--no-check-certificate` is required as we haven't set up any trusted certificates/authorities yet.
+
+4. Make the downloaded file executable (`chmod +x install.sh`).
+
+5. Run the script (`./install.sh`). This will automatically download all of the required packages, install both them and HomeBrewery, configure the system and finally start HomeBrewery.
+
+**NOTE:** At this time, the script **ONLY** installs HomeBrewery. It does **NOT** install the NaturalCrit login system, as that is currently a completely separate project.
+
+---
+
+### Testing
+
+These installation instructions have been tested on the following FreeBSD/FreeNAS platforms:
+
+* FreeNAS-11.3-U5; Jail 11.4-RELEASE-p2
+
+## Final Notes
+
+While this installation process works successfully at the time of writing (December 28, 2020), it relies on all of the Node.JS packages used in the HomeBrewery project retaining their cross-platform capabilities to continue to function under FreeBSD. This is one of the inherent advantages of Node.JS, but it is by no means guaranteed and as such, functionality or even installation under FreeBSD may fail without warning at some point in the future.
+
+Regards,  
+G  
+December 28, 2020

README.md

@@ -1,33 +1,127 @@
 # The Homebrewery
-The Homebrewery is a tool for making authnetic looking [D&D content](http://dnd.wizards.com/products/tabletop-games/rpg-products/rpg_playershandbook) using only [Markdown](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet). Check it out [here](http://homebrewery.naturalcrit.com).
 
+[![Homebrewery](https://circleci.com/gh/naturalcrit/homebrewery/tree/master.svg?style=svg)](https://app.circleci.com/pipelines/github/naturalcrit/homebrewery?branch=master)
 
-### issues, suggestions, bugs
-If you run into any issues using The Homebrewery, please submit an issues [here](/issues)
+The Homebrewery is a tool for making authentic looking [D&D content][dnd-content-url]
+using [Markdown][markdown-url]. It is distributed under the terms of the [MIT License](./license).
 
+[dnd-content-url]: https://dnd.wizards.com/products/tabletop-games/rpg-products/rpg_playershandbook
+[markdown-url]: https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet
 
-### local dev
-Homebrewery is open source, so feel free to clone it, tinker with it, or run your own local version.
+## Quick Start
+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, 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
+updates:
 
-#### pre-reqs
 1. install [node](https://nodejs.org/en/)
-1. install [mongodb](https://www.mongodb.com/)
+1. install [mongodb](https://www.mongodb.com/try/download/community) (Community version)
+
+    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]):
+```
+git clone https://github.com/naturalcrit/homebrewery.git
+```
+
+[github-clone-repo-docs-url]: https://docs.github.com/en/free-pro-team@latest/github/creating-cloning-and-archiving-repositories/cloning-a-repository
+
+Second, you will need to add the environment variable `NODE_ENV=local` to allow
+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 / OSX: `export NODE_ENV=local`
+
+Third, you will need to install the Node dependencies, compile the app, and run
+it using the two commands:
 
-#### getting started
-1. clone it
 1. `npm install`
-1. `npm build`
 1. `npm start`
 
-#### standalone PHB stylesheet
-If you just want the stylesheet that is generated to make pages look like they are from the PLayer's Handbook, you have find it [here](https://github.com/stolksdorf/homebrewery/blob/master/phb.standalone.css)
+You should now be able to go to [http://localhost:8000](http://localhost:8000)
+in your browser and use the Homebrewery offline.
 
-If you are developing locally and would like to generate your own, follow the above steps and then run `npm run phb`.
+### Running the application via Docker
 
-### changelog
+Please see the docs here: [README.DOCKER.md](./README.DOCKER.md)
 
-You can check out the changelog [here](https://github.com/stolksdorf/homebrewery/blob/master/changelog.md)
+### Running the application on FreeBSD or FreeNAS
 
-### license
+Please see the docs here: [README.FreeBSD.md](./README.FREEBSD.md)
 
-This project is licensed under [MIT](./license)
+### Standalone PHB Stylesheet
+If you just want the stylesheet that is generated to make pages look like they
+are from the Player's Handbook, you will find it in the
+[phb.standalone.css](./phb.standalone.css) file.
+
+If you are developing locally and would like to generate your own, follow the
+above steps and then run `npm run phb`.
+
+## Issues, Suggestions, and Bugs
+If you run into any issues using The Homebrewery or have suggestions for
+improvement, please submit an issue [on GitHub][repo-issues-url].
+You can also get help for issues on the subreddit [r/homebrewery][subreddit-url]
+
+[repo-issues-url]: https://github.com/naturalcrit/homebrewery/issues
+[subreddit-url]: https://www.reddit.com/r/homebrewery
+
+## Changelog
+
+You can check out the [changelog](./changelog.md).
+
+## License
+
+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,
+it's your responsibility to ensure you have the proper licenses/rights for any
+images or resources used.
+
+## Contributing
+
+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 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.
+- 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]!
+
+Anyway, if you would like to get in touch with the team and discuss/coordinate
+your contribution to the project, please join our [gitter chat][gitter-url].
+
+[github-mark-duplicate-url]: https://docs.github.com/en/free-pro-team@latest/github/managing-your-work-on-github/about-duplicate-issues-and-pull-requests
+[github-pr-docs-url]: https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request
+[gitter-url]: https://gitter.im/naturalcrit/Lobby

changelog.md

@@ -1,23 +1,94 @@
 # changelog
 
+### Friday, 25/1/2021 - v2.10.7
+- Cover Page snippet now flips left-right page numbering.
+- Added instructions for [installing on a FreeBSD Jail](https://github.com/naturalcrit/homebrewery/blob/master/README.FREEBSD.md).
+- Fix for box-shadows breaking across columns. <br>(Thanks @G-Ambatte for all of these!)
+- Small user interface tweaks (Thanks @Ericsheid)
+
+### Friday, 02/1/2021 - v2.10.6
+- Fixed punctuation for usernames ending with 's' on the user page. (Thanks @AlexeySachkov)
+- Fixed server crashes due to excessive long lines in brews
+- Fixed "automated request" lockouts from Google
+
+### Friday, 18/12/2020 - v2.10.5
+- Brews now immediately save when transferring between Google Drive and Homebrewery storage.
+- Added confirmation popup to clarify the transfer process.
+- Brews transferred or deleted from Google will be found in your Google Drive trash.
+- Dependency updates.
+
+### Wednesday, 25/11/2020 - v2.10.4
+- Fixed Google Drive brews not saving metadata (view count, description, etc.) Note that we are still working on making published Google brews visible to the public when viewing your profile page.
+
+### Thursday, 22/10/2020 - v2.10.3
+- Fixed brews with broken code crashing the edit page when loaded (the "blue screen of death" bug).
+
+### Monday, 19/10/2020 - v2.10.2
+- Fixed issue with "recent" item links not updating when transferring between Google Drive.
+
+### Monday, 12/10/2020 - v2.10.1
+- Fixed issue with users unable to create new brews
+- Fixing brews being lost when loaded via back button
+
+### Wednesday, 07/10/2020 - v2.10.0
+- Google Drive integration -- Sign in with your Google account to link it with your Homebrewery profile. A new button in the Edit page will let you transfer your file to your personal Google Drive storage, and Google will keep a backup of each version! No more lost work surprises!
+
+```
+```
+
+### Friday, 28/08/2020 - v2.9.2
+- Many dependency updates
+- Finally fixed this changelog page to not run off the edge :P
+
+### Sunday, 19/07/2020 - v2.9.1
+- Fixed paragraphs appearing blank on new columns
+
+### Wednesday, 20/05/2020 - v2.9.0
+- Major refactoring of site backend to work with updated dependencies for security (should be invisible to users)
+
+### Wednesday, 11/03/2020 - v2.8.2
+- Fixed delete button removing everyone's copy for brews with multiple authors
+- Compressed homebrew text in database
+
+### Monday, 26/11/2018 - v2.8.1
+- Fixed some SSL issues with images in the example page so they appear now
+- Fixed duplicate scrollbars in Edit Page
+- Fixed issue of being unable to change brew metadata
+- Sanitized script tags-javascript typed into the editor was crashing brews
+
+### Sunday, 08/04/2018 - v2.8.0
+- Re-enabled box shadows for PDF output
+- Added a "contributing guide" for the GitHub
+- "Report Issue" navbar button now links to the subreddit
+- Refactored background code
+
+### Sunday, 04/06/2017 - v2.7.5
+- Fixed the class feature snippet duplicating the entire brew
+- Fixed headers in tables being duplicated
+- Fixed border-image being scrambled on class tables and descriptive text boxes
+- Fixed pages going out of sync in large brews, causing them to be rendered off-page
+- Improved performance in the preview window when scrolling through large brews
+- Text in the "view source" page now wraps
+
+### Saturday, 22/04/2017 - v2.7.4
+- Give ability to hide the render warning notification
+
+### Friday, 03/03/2017 - v2.7.3
+- Increasing the range on the Partial Page Rendering for a quick-fix for it getting out of sync on long brews.
+
 ### Saturday, 18/02/2017 - v2.7.2
 - Adding ability to delete a brew from the user page, incase the user creates a brew that makes the edit page unrender-able. (re:309)
 
-## BIG NEWS
-With the next major release of Homebrewery, v3.0.0, this tool *will no longer support raw HTML input for brew code*. Most issues and errors users are having are because of this feature and it's become too taxing to help and fix these issues.
+\page
 
-All brews made previous to the release of v3.0.0 will still render normally.
-
-### Thursday, 19/01/2017 - v2.7.0
+### Thursday, 19/01/2017 - v2.7.1
 - Fixed saving multiple authors and multiple systems on brew metadata (thanks u/PalaNolho re:282)
 - Adding in line highlight for new pages
 - Added in a simple brew lookup for admin
 
-
 ### Saturday, 14/01/2017 - v2.7.0
 - Added a new Render Warning overlay. It detects situations where the brew may not be rendering correctly (wrong browser, browser is zoomed in...) and let's the user know
 
-
 ### Sunday, 25/12/2016 - v2.7.0
 - Switching over to using Vitreum v4
   - Removed gulp, all tasks are run through npm scripts
@@ -30,8 +101,6 @@ All brews made previous to the release of v3.0.0 will still render normally.
 - Removed a lot of unused files in shared
 - vitreum v4 now lets me use codemirror as a pure node dependacy
 
-
-
 ### Saturday, 03/12/2016 - v2.6.0
 - Added report back to the edit page
 - Changed metaeditor icon
@@ -43,18 +112,19 @@ All brews made previous to the release of v3.0.0 will still render normally.
 - Added a table of contents snippet (thanks u/tullisar)
 - Added a multicolumn snippet
 
-
-
 ### Thursday, 01/12/2016
 - Added in a snippet for a split table
 - Added an account nav item to new page
 
-
 ### Sunday, 27/11/2016 - v2.5.1
 - Fixed the column rendering on the new user page. Really should have tested that better
 - Added a hover tooltip to fully read the brew description
 - Made the brew items take up only 25% allowing you to view more per row.
 
+
+```
+```
+
 ### Wednesday, 23/11/2016 - v2.5.0
 - Metadata can now be added to brews
 - Added a metadata editor onto the edit and new pages
@@ -90,7 +160,6 @@ All brews made previous to the release of v3.0.0 will still render normally.
 - Fixed the noteblock overlapping into titles (thanks u/dsompura!)
 - Fixed a bad search route in the admin panel (thanks u/SnappyTom!)
 
-
 ### Friday, 29/07/2016 - v2.2.7
 - Adding in descriptive note blocks. (Thanks calculuschild!)
 
@@ -102,6 +171,9 @@ All brews made previous to the release of v3.0.0 will still render normally.
 - Allows adding in hyperlinks to specific pages
 - Even works after you print to pdf!
 
+
+\page
+
 ### Tuesday, 07/06/2016 - v2.2.2
 - Fixed bug with new markdown lexer and aprser not working on print page
 
@@ -111,12 +183,9 @@ All brews made previous to the release of v3.0.0 will still render normally.
 - Added in a new auto-incremeting page number snippet (thakns u/Ryrok!)
 - Lists in monster stat blocks should be fixed now
 
-
 ### Saturday, 04/06/2016 - v2.2.0
 - MIgrating The Homebrewery over to hombrewery.naturalcrit.com. It know runs on it's own server, with it's own repo separate from the other tools I'm working on. Makes updating and deploying much easier.
 
-\page
-
 ### Sunday, 29/05/2016 - v2.1.0
 - Finally added a syntax for doing spell lists. A bit in-depth about why this took so long. Essentially I'm running out of syntax to use in stardard Markdown. There are too many unique elements in the PHB-style to be mapped. I solved this earlier by stacking certain elements together (eg. an `<hr>` before a `blockquote` turns it into moster state block), but those are getting unweildly. I would like to simply wrap these in `div`s with classes, but unfortunately Markdown stops processing when within HTML blocks. To get around this I wrote my own override to the Markdown parser and lexer to process Markdown within a simple div class wrapper. This should open the door for more unique syntaxes in the future. Big step!
 - Override Ctrl+P (and cmd+P) to launch to the print page. Many people try to just print either the editing or share page to get a PDF. While this dones;t make much sense, I do get a ton of issues about it. So now if you try to do this, it'll just bring you imediately to the print page. Everybody wins!
@@ -128,6 +197,10 @@ All brews made previous to the release of v3.0.0 will still render normally.
 - Updated the issue template for (hopefully) better reporting
 - Added suggestion to use chrome while PDF printing
 
+
+```
+```
+
 ### Wednesday, 25/05/2016 -v2.0.5
 - The class table generators have the proper ability score improvement progression.
 
@@ -182,8 +255,6 @@ Massive changelog incoming:
 - Source now opens to it's own route `/source/:sharedId` instead of just a window. Now easier to share, and won't be blocked by some browsers.
 - Print page now auto-opens print dialog. If you want to share your print page link, just remove the `?dialog=true` parameter and it won't open the dialog.
 
-
-
 \page
 
 ### Wednesday, 20/04/2016
@@ -243,7 +314,6 @@ Massive changelog incoming:
 * Increased padding on table cells
 * Raw html now shows in view source
 
-
 ## v1.0.0 - Release
 
 ### Wednesday, 3/01/2016
@@ -251,4 +321,3 @@ Massive changelog incoming:
 * Added `phb.standalone.css` plus a build system for creating it
 * Added page numbers and footer text
 * Page accent now flips each page
-

client/admin/admin.jsx

@@ -1,39 +1,38 @@
-var React = require('react');
-var _ = require('lodash');
-var cx = require('classnames');
-
-var HomebrewAdmin = require('./homebrewAdmin/homebrewAdmin.jsx');
-
-var Admin = React.createClass({
-	getDefaultProps: function() {
-		return {
-			url : "",
-			admin_key : "",
-			homebrews : [],
-		};
-	},
-
-	render : function(){
-		var self = this;
-		return(
-			<div className='admin'>
-
-				<header>
-					<div className='container'>
-						<i className='fa fa-rocket' />
-						naturalcrit admin
-					</div>
-				</header>
-
-				<div className='container'>
-
-					<HomebrewAdmin homebrews={this.props.homebrews} admin_key={this.props.admin_key} />
-				</div>
-
-
-			</div>
-		);
-	}
-});
-
-module.exports = Admin;
+require('./admin.less');
+const React = require('react');
+const createClass = require('create-react-class');
+
+
+const BrewCleanup = require('./brewCleanup/brewCleanup.jsx');
+const BrewLookup = require('./brewLookup/brewLookup.jsx');
+const BrewCompress = require ('./brewCompress/brewCompress.jsx');
+const Stats = require('./stats/stats.jsx');
+
+const Admin = createClass({
+	getDefaultProps : function() {
+		return {};
+	},
+
+	render : function(){
+		return <div className='admin'>
+
+			<header>
+				<div className='container'>
+					<i className='fa fa-rocket' />
+					homebrewery admin
+				</div>
+			</header>
+			<div className='container'>
+				<Stats />
+				<hr />
+				<BrewLookup />
+				<hr />
+				<BrewCleanup />
+				<hr />
+				<BrewCompress />
+			</div>
+		</div>;
+	}
+});
+
+module.exports = Admin;

client/admin/admin.less

@@ -36,4 +36,9 @@ body{
 		}
 	}
 
-}
+	hr{
+		margin : 30px 0px;
+	}
+
+
+}

client/admin/brewCleanup/brewCleanup.jsx

@@ -0,0 +1,75 @@
+require('./brewCleanup.less');
+const React       = require('react');
+const createClass = require('create-react-class');
+const cx          = require('classnames');
+
+const request = require('superagent');
+
+
+const BrewCleanup = createClass({
+	displayName : 'BrewCleanup',
+	getDefaultProps(){
+		return {};
+	},
+	getInitialState() {
+		return {
+			count : 0,
+
+			pending : false,
+			primed  : false,
+			err     : null
+		};
+	},
+	prime(){
+		this.setState({ pending: true });
+
+		request.get('/admin/cleanup')
+			.then((res)=>this.setState({ count: res.body.count, primed: true }))
+			.catch((err)=>this.setState({ error: err }))
+			.finally(()=>this.setState({ pending: false }));
+	},
+	cleanup(){
+		this.setState({ pending: true });
+
+		request.post('/admin/cleanup')
+			.then((res)=>this.setState({ count: res.body.count }))
+			.catch((err)=>this.setState({ error: err }))
+			.finally(()=>this.setState({ pending: false, primed: false }));
+	},
+	renderPrimed(){
+		if(!this.state.primed) return;
+
+		if(!this.state.count){
+			return <div className='removeBox'>No Matching Brews found.</div>;
+		}
+		return <div className='removeBox'>
+			<button onClick={this.cleanup} className='remove'>
+				{this.state.pending
+					? <i className='fa fa-spin fa-spinner' />
+					: <span><i className='fa fa-times' /> Remove</span>
+				}
+			</button>
+			<span>Found {this.state.count} Brews that could be removed. </span>
+		</div>;
+	},
+	render(){
+		return <div className='BrewCleanup'>
+			<h2> Brew Cleanup </h2>
+			<p>Removes very short brews to tidy up the database</p>
+
+			<button onClick={this.prime} className='query'>
+				{this.state.pending
+					? <i className='fa fa-spin fa-spinner' />
+					: 'Query Brews'
+				}
+			</button>
+			{this.renderPrimed()}
+
+			{this.state.error
+				&& <div className='error'>{this.state.error.toString()}</div>
+			}
+		</div>;
+	}
+});
+
+module.exports = BrewCleanup;

client/admin/brewCleanup/brewCleanup.less

@@ -0,0 +1,10 @@
+.BrewCleanup{
+	.removeBox{
+		margin-top: 20px;
+		button{
+			background-color: @red;
+			margin-right: 10px;
+		}
+	}
+
+}

client/admin/brewCompress/brewCompress.jsx

@@ -0,0 +1,92 @@
+require('./brewCompress.less');
+const React       = require('react');
+const createClass = require('create-react-class');
+const cx          = require('classnames');
+
+const request = require('superagent');
+
+
+const BrewCompress = createClass({
+	displayName : 'BrewCompress',
+	getDefaultProps(){
+		return {};
+	},
+	getInitialState() {
+		return {
+			count      : 0,
+			batchRange : 0,
+
+			pending : false,
+			primed  : false,
+			err     : null,
+			ids     : null
+		};
+	},
+	prime(){
+		this.setState({ pending: true });
+
+		request.get('/admin/finduncompressed')
+			.then((res)=>this.setState({ count: res.body.count, primed: true, ids: res.body.ids }))
+			.catch((err)=>this.setState({ error: err }))
+			.finally(()=>this.setState({ pending: false }));
+	},
+	cleanup(){
+		const brews = this.state.ids;
+		const compressBatches = ()=>{
+			if(brews.length == 0){
+				this.setState({ pending: false, primed: false });
+				return;
+			}
+			const batch = brews.splice(0, 1000);	// Process brews in batches of 1000
+			this.setState({ batchRange: this.state.count - brews.length });
+			batch.forEach((id, idx)=>{
+				request.put(`/admin/compress/${id}`)
+					.catch((err)=>this.setState({ error: err }));
+			});
+			setTimeout(compressBatches, 10000);		//Wait 10 seconds between batches
+		};
+
+		this.setState({ pending: true });
+
+		compressBatches();
+	},
+	renderPrimed(){
+		if(!this.state.primed) return;
+
+		if(!this.state.count){
+			return <div className='removeBox'>No Matching Brews found.</div>;
+		}
+		return <div className='removeBox'>
+			<button onClick={this.cleanup} className='remove'>
+				{this.state.pending
+					? <i className='fa fa-spin fa-spinner' />
+					: <span><i className='fa fa-compress' /> compress </span>
+				}
+			</button>
+			{this.state.pending
+				? <span>Compressing {this.state.batchRange} brews. </span>
+				: <span>Found {this.state.count} Brews that could be compressed. </span>
+			}
+		</div>;
+	},
+	render(){
+		return <div className='BrewCompress'>
+			<h2> Brew Compression </h2>
+			<p>Compresses the text in brews to binary</p>
+
+			<button onClick={this.prime} className='query'>
+				{this.state.pending
+					? <i className='fa fa-spin fa-spinner' />
+					: 'Query Brews'
+				}
+			</button>
+			{this.renderPrimed()}
+
+			{this.state.error
+				&& <div className='error'>{this.state.error.toString()}</div>
+			}
+		</div>;
+	}
+});
+
+module.exports = BrewCompress;

client/admin/brewCompress/brewCompress.less

@@ -0,0 +1,10 @@
+.BrewCompress{
+	.removeBox{
+		margin-top: 20px;
+		button{
+			background-color: @red;
+			margin-right: 10px;
+		}
+	}
+
+}

client/admin/brewLookup/brewLookup.jsx

@@ -0,0 +1,82 @@
+require('./brewLookup.less');
+const React = require('react');
+const createClass = require('create-react-class');
+const cx    = require('classnames');
+
+const request = require('superagent');
+const Moment = require('moment');
+
+
+const BrewLookup = createClass({
+	getDefaultProps() {
+		return {};
+	},
+	getInitialState() {
+		return {
+			query     : '',
+			foundBrew : null,
+			searching : false,
+			error     : null
+		};
+	},
+	handleChange(e){
+		this.setState({ query: e.target.value });
+	},
+	lookup(){
+		this.setState({ searching: true, error: null });
+
+		request.get(`/admin/lookup/${this.state.query}`)
+			.then((res)=>this.setState({ foundBrew: res.body }))
+			.catch((err)=>this.setState({ error: err }))
+			.finally(()=>this.setState({ searching: false }));
+	},
+
+	renderFoundBrew(){
+		const brew = this.state.foundBrew;
+		return <div className='foundBrew'>
+			<dl>
+				<dt>Title</dt>
+				<dd>{brew.title}</dd>
+
+				<dt>Authors</dt>
+				<dd>{brew.authors.join(', ')}</dd>
+
+				<dt>Edit Link</dt>
+				<dd><a href={`/edit/${brew.editId}`} target='_blank' rel='noopener noreferrer'>/edit/{brew.editId}</a></dd>
+
+				<dt>Share Link</dt>
+				<dd><a href={`/share/${brew.shareId}`} target='_blank' rel='noopener noreferrer'>/share/{brew.shareId}</a></dd>
+
+				<dt>Last Updated</dt>
+				<dd>{Moment(brew.updatedAt).fromNow()}</dd>
+
+				<dt>Num of Views</dt>
+				<dd>{brew.views}</dd>
+			</dl>
+		</div>;
+	},
+
+	render(){
+		return <div className='brewLookup'>
+			<h2>Brew Lookup</h2>
+			<input type='text' value={this.state.query} onChange={this.handleChange} placeholder='edit or share id' />
+			<button onClick={this.lookup}>
+				<i className={cx('fa', {
+					'fa-search'          : !this.state.searching,
+					'fa-spin fa-spinner' : this.state.searching,
+				})} />
+			</button>
+
+			{this.state.error
+				&& <div className='error'>{this.state.error.toString()}</div>
+			}
+
+			{this.state.foundBrew
+				? this.renderFoundBrew()
+				: <div className='noBrew'>No brew found.</div>
+			}
+		</div>;
+	}
+});
+
+module.exports = BrewLookup;

client/admin/brewLookup/brewLookup.less

@@ -0,0 +1,30 @@
+
+.brewLookup{
+	input{
+		height        : 33px;
+		margin-bottom : 20px;
+		padding       : 0px 10px;
+		font-family   : monospace;
+	}
+	button{
+		vertical-align : middle;
+		height         : 37px;
+	}
+	dl{
+		@maxItemWidth : 132px;
+		dt{
+			float      : left;
+			clear      : left;
+			width      : @maxItemWidth;
+			text-align : right;
+			&::after {
+				content: " : ";
+			}
+		}
+		dd{
+			height      : 1em;
+			margin-left : @maxItemWidth + 6px;
+			padding     : 0 0 0.5em 0;
+		}
+	}
+}

client/admin/homebrewAdmin/brewLookup/brewLookup.jsx

@@ -1,67 +0,0 @@
-const React = require('react');
-const _     = require('lodash');
-const cx    = require('classnames');
-
-const request = require('superagent');
-const Moment = require('moment');
-
-
-const BrewLookup = React.createClass({
-	getDefaultProps: function() {
-		return {
-			adminKey : '',
-		};
-	},
-	getInitialState: function() {
-		return {
-			query:'',
-			resultBrew : null,
-			searching : false
-		};
-	},
-
-	handleChange : function(e){
-		this.setState({
-			query : e.target.value
-		})
-	},
-	lookup : function(){
-		this.setState({ searching : true });
-
-		request.get(`/admin/lookup/${this.state.query}`)
-			.query({ admin_key : this.props.adminKey })
-			.end((err, res) => {
-				this.setState({
-					searching : false,
-					resultBrew : (err ? null : res.body)
-				});
-			})
-	},
-
-	renderFoundBrew : function(){
-		if(this.state.searching) return <div className='searching'><i className='fa fa-spin fa-spinner' /></div>;
-		if(!this.state.resultBrew) return <div className='noBrew'>No brew found.</div>;
-
-		const brew = this.state.resultBrew;
-		return <div className='brewRow'>
-			<div>{brew.title}</div>
-			<div>{brew.authors.join(', ')}</div>
-			<div><a href={'/edit/' + brew.editId} target='_blank'>/edit/{brew.editId}</a></div>
-			<div><a href={'/share/' + brew.shareId} target='_blank'>/share/{brew.shareId}</a></div>
-			<div>{Moment(brew.updatedAt).fromNow()}</div>
-			<div>{brew.views}</div>
-		</div>
-	},
-
-	render: function(){
-		return <div className='brewLookup'>
-			<h1>Brew Lookup</h1>
-			<input type='text' value={this.state.query} onChange={this.handleChange} placeholder='edit or share id...' />
-			<button onClick={this.lookup}><i className='fa fa-search'/></button>
-
-			{this.renderFoundBrew()}
-		</div>
-	}
-});
-
-module.exports = BrewLookup;

client/admin/homebrewAdmin/brewLookup/brewLookup.less

@@ -1,8 +0,0 @@
-.brewLookup{
-	height : 200px;
-	input{
-		height  : 33px;
-		padding : 0px 10px;
-		margin-bottom: 20px;
-	}
-}

client/admin/homebrewAdmin/brewSearch.jsx

@@ -1,72 +0,0 @@
-var React = require('react');
-var _ = require('lodash');
-var cx = require('classnames');
-
-var request = require('superagent');
-
-var BrewSearch = React.createClass({
-
-	getDefaultProps: function() {
-		return {
-			admin_key : ''
-		};
-	},
-
-	getInitialState: function() {
-		return {
-			searchTerm: '',
-			brew : null,
-			searching : false
-		};
-	},
-
-
-	search : function(){
-		this.setState({
-			searching : true
-		});
-
-		request.get('/homebrew/api/search?id=' + this.state.searchTerm)
-			.query({
-				admin_key : this.props.admin_key,
-			})
-			.end((err, res)=>{
-				console.log(err, res, res.body.brews[0]);
-				this.setState({
-					brew : res.body.brews[0],
-
-					searching : false
-				})
-			});
-	},
-
-	handleChange : function(e){
-		this.setState({
-			searchTerm : e.target.value
-		});
-	},
-	handleSearchClick : function(){
-		this.search();
-	},
-
-	renderBrew : function(){
-		if(!this.state.brew) return null;
-		return <div className='brew'>
-			<div>Edit id : {this.state.brew.editId}</div>
-			<div>Share id : {this.state.brew.shareId}</div>
-		</div>
-	},
-
-	render : function(){
-		return <div className='search'>
-			<input type='text' value={this.state.searchTerm} onChange={this.handleChange} />
-
-			<button onClick={this.handleSearchClick}>Search</button>
-
-			{this.renderBrew()}
-		</div>
-	},
-
-});
-
-module.exports = BrewSearch;

client/admin/homebrewAdmin/homebrewAdmin.jsx

@@ -1,172 +0,0 @@
-var React = require('react');
-var _ = require('lodash');
-var cx = require('classnames');
-var request = require('superagent');
-
-var Moment = require('moment');
-
-var BrewSearch = require('./brewSearch.jsx');
-
-var BrewLookup = require('./brewLookup/brewLookup.jsx');
-
-
-var HomebrewAdmin = React.createClass({
-	getDefaultProps: function() {
-		return {
-			admin_key : ''
-		};
-	},
-
-	getInitialState: function() {
-		return {
-			page: 0,
-			count : 20,
-			brewCache : {},
-			total : 0,
-
-			processingOldBrews : false
-		};
-	},
-
-
-	fetchBrews : function(page){
-		request.get('/api/search')
-			.query({
-				admin_key : this.props.admin_key,
-				count : this.state.count,
-				page : page
-			})
-			.end((err, res)=>{
-				if(err || !res.body || !res.body.brews) return;
-				this.state.brewCache[page] = res.body.brews;
-				this.setState({
-					brewCache : this.state.brewCache,
-					total : res.body.total,
-					count : res.body.count
-				})
-			})
-	},
-
-	componentDidMount: function() {
-		this.fetchBrews(this.state.page);
-	},
-
-	changePageTo : function(page){
-		if(!this.state.brewCache[page]){
-			this.fetchBrews(page);
-		}
-		this.setState({
-			page : page
-		})
-	},
-
-
-	clearInvalidBrews : function(){
-		request.get('/api/invalid')
-			.query({admin_key : this.props.admin_key})
-			.end((err, res)=>{
-				if(!confirm("This will remove " + res.body.count + " brews. Are you sure?")) return;
-				request.get('/api/invalid')
-					.query({admin_key : this.props.admin_key, do_it : true})
-					.end((err, res)=>{
-						alert("Done!")
-					});
-			});
-	},
-
-
-	deleteBrew : function(brewId){
-		if(!confirm("Are you sure you want to delete '" + brewId + "'?")) return;
-		request.get('/api/remove/' + brewId)
-			.query({admin_key : this.props.admin_key})
-			.end(function(err, res){
-				window.location.reload();
-			})
-	},
-
-	handlePageChange : function(dir){
-		this.changePageTo(this.state.page + dir);
-	},
-
-
-	renderPagnination : function(){
-		var outOf;
-		if(this.state.total){
-			outOf = this.state.page + ' / ' + Math.round(this.state.total/this.state.count);
-		}
-		return <div className='pagnination'>
-			<i className='fa fa-chevron-left' onClick={this.handlePageChange.bind(this, -1)}/>
-			{outOf}
-			<i className='fa fa-chevron-right' onClick={this.handlePageChange.bind(this, 1)}/>
-		</div>
-	},
-
-
-	renderBrews : function(){
-		var brews = this.state.brewCache[this.state.page] || _.times(this.state.count);
-		return _.map(brews, (brew)=>{
-			return <tr className={cx('brewRow', {'isEmpty' : brew.text == "false"})} key={brew.shareId || brew}>
-				<td><a href={'/edit/' + brew.editId} target='_blank'>{brew.editId}</a></td>
-				<td><a href={'/share/' + brew.shareId} target='_blank'>{brew.shareId}</a></td>
-				<td>{Moment(brew.createdAt).fromNow()}</td>
-				<td>{Moment(brew.updatedAt).fromNow()}</td>
-				<td>{Moment(brew.lastViewed).fromNow()}</td>
-				<td>{brew.views}</td>
-				<td>
-					<div className='deleteButton' onClick={this.deleteBrew.bind(this, brew.editId)}>
-						<i className='fa fa-trash' />
-					</div>
-				</td>
-			</tr>
-		});
-	},
-
-	renderBrewTable : function(){
-		return <div className='brewTable'>
-			<table>
-				<thead>
-					<tr>
-						<th>Edit Id</th>
-						<th>Share Id</th>
-						<th>Created At</th>
-						<th>Last Updated</th>
-						<th>Last Viewed</th>
-						<th>Views</th>
-					</tr>
-				</thead>
-				<tbody>
-					{this.renderBrews()}
-				</tbody>
-			</table>
-		</div>
-	},
-
-	render : function(){
-		var self = this;
-		return <div className='homebrewAdmin'>
-
-			<BrewLookup adminKey={this.props.admin_key} />
-
-			{/*
-			<h2>
-				Homebrews - {this.state.total}
-			</h2>
-
-
-
-
-
-			{this.renderPagnination()}
-			{this.renderBrewTable()}
-
-			<button className='clearOldButton' onClick={this.clearInvalidBrews}>
-				Clear Old
-			</button>
-
-			<BrewSearch admin_key={this.props.admin_key} />
-		*/}
-		</div>
-	}
-});
-
-module.exports = HomebrewAdmin;

client/admin/homebrewAdmin/homebrewAdmin.less

@@ -1,53 +0,0 @@
-
-.homebrewAdmin{
-	margin-bottom: 80px;
-	.brewTable{
-		table{
-
-			th{
-				padding     : 10px;
-				font-weight : 800;
-			}
-			tr:nth-child(even){
-				background-color : fade(@green, 10%);
-			}
-			tr.isEmpty{
-				background-color : fade(@red, 30%);
-			}
-			td{
-				min-width  : 100px;
-				padding    : 10px;
-				text-align : center;
-
-				&.preview{
-					position : relative;
-					&:hover{
-						.content{
-							display : block;
-						}
-					}
-					.content{
-						position         : absolute;
-						display          : none;
-						top              : 100%;
-						left             : 0px;
-						z-index          : 1000;
-						max-height       : 500px;
-						width            : 300px;
-						padding          : 30px;
-						background-color : white;
-						font-family      : monospace;
-						text-align       : left;
-						pointer-events   : none;
-					}
-				}
-			}
-		}
-	}
-	.deleteButton{
-		cursor: pointer;
-	}
-	button.clearOldButton{
-		float : right;
-	}
-}

client/admin/stats/stats.jsx

@@ -0,0 +1,46 @@
+require('./stats.less');
+const React       = require('react');
+const createClass = require('create-react-class');
+const cx          = require('classnames');
+
+const request = require('superagent');
+
+
+const Stats = createClass({
+	displayName : 'Stats',
+	getDefaultProps(){
+		return {};
+	},
+	getInitialState(){
+		return {
+			stats : {
+				totalBrews : 0
+			},
+			fetching : false
+		};
+	},
+	componentDidMount(){
+		this.fetchStats();
+	},
+	fetchStats(){
+		this.setState({ fetching: true });
+		request.get('/admin/stats')
+			.then((res)=>this.setState({ stats: res.body }))
+			.finally(()=>this.setState({ fetching: false }));
+	},
+	render(){
+		return <div className='Stats'>
+			<h2> Stats </h2>
+			<dl>
+				<dt>Total Brew Count</dt>
+				<dd>{this.state.stats.totalBrews}</dd>
+			</dl>
+
+			{this.state.fetching
+				&& <div className='pending'><i className='fa fa-spin fa-spinner' /></div>
+			}
+		</div>;
+	}
+});
+
+module.exports = Stats;

client/admin/stats/stats.less

@@ -0,0 +1,28 @@
+
+.Stats{
+	position : relative;
+	.pending{
+		position         : absolute;
+		top              : 0px;
+		left             : 0px;
+		height           : 100%;
+		width            : 100%;
+		background-color : rgba(238,238,238, 0.5);
+	}
+	dl{
+		@maxItemWidth : 132px;
+		dt{
+			float      : left;
+			clear      : left;
+			width      : @maxItemWidth;
+			text-align : right;
+			&::after {
+				content: " : ";
+			}
+		}
+		dd{
+			margin  : 0 0 0 @maxItemWidth + 10px;
+			padding : 0 0 0.5em 0;
+		}
+	}
+}

client/homebrew/brewRenderer/brewRenderer.jsx

@@ -1,4 +1,6 @@
+require('./brewRenderer.less');
 const React = require('react');
+const createClass = require('create-react-class');
 const _ = require('lodash');
 const cx = require('classnames');
 
@@ -6,80 +8,78 @@ const Markdown = require('naturalcrit/markdown.js');
 const ErrorBar = require('./errorBar/errorBar.jsx');
 
 //TODO: move to the brew renderer
-const RenderWarnings = require('homebrewery/renderWarnings/renderWarnings.jsx')
+const RenderWarnings = require('homebrewery/renderWarnings/renderWarnings.jsx');
+const NotificationPopup = require('./notificationPopup/notificationPopup.jsx');
+const Frame = require('react-frame-component').default;
 
 const PAGE_HEIGHT = 1056;
 const PPR_THRESHOLD = 50;
 
-const BrewRenderer = React.createClass({
-	getDefaultProps: function() {
+const BrewRenderer = createClass({
+	getDefaultProps : function() {
 		return {
-			text : '',
+			text   : '',
 			errors : []
 		};
 	},
-	getInitialState: function() {
+	getInitialState : function() {
 		const pages = this.props.text.split('\\page');
 
 		return {
-			viewablePageNumber: 0,
-			height : 0,
-			isMounted : false,
+			viewablePageNumber : 0,
+			height             : 0,
+			isMounted          : false,
 
-			usePPR : true,
-
-			pages : pages,
-			usePPR : pages.length >= PPR_THRESHOLD,
-
-			errors : []
+			pages          : pages,
+			usePPR         : pages.length >= PPR_THRESHOLD,
+			visibility     : 'hidden',
+			initialContent : `<!DOCTYPE html><html><head>
+												<link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" />
+												<link href="//fonts.googleapis.com/css?family=Open+Sans:400,300,600,700" rel="stylesheet" type="text/css" />
+												<link href='/homebrew/bundle.css' rel='stylesheet' />
+												<base target=_blank>
+												</head><body style='overflow: hidden'><div></div></body></html>`
 		};
 	},
-	height : 0,
-	pageHeight : PAGE_HEIGHT,
+	height     : 0,
 	lastRender : <div></div>,
 
-	componentDidMount: function() {
-		this.updateSize();
-		window.addEventListener("resize", this.updateSize);
-	},
-	componentWillUnmount: function() {
-		window.removeEventListener("resize", this.updateSize);
+	componentWillUnmount : function() {
+		window.removeEventListener('resize', this.updateSize);
 	},
 
-	componentWillReceiveProps: function(nextProps) {
-		if(this.refs.pages && this.refs.pages.firstChild) this.pageHeight = this.refs.pages.firstChild.clientHeight;
-
+	componentWillReceiveProps : function(nextProps) {
 		const pages = nextProps.text.split('\\page');
 		this.setState({
-			pages : pages,
+			pages  : pages,
 			usePPR : pages.length >= PPR_THRESHOLD
-		})
+		});
 	},
 
 	updateSize : function() {
-		setTimeout(()=>{
-			if(this.refs.pages && this.refs.pages.firstChild) this.pageHeight = this.refs.pages.firstChild.clientHeight;
-		}, 1);
-
 		this.setState({
 			height : this.refs.main.parentNode.clientHeight,
-			isMounted : true
 		});
 	},
 
 	handleScroll : function(e){
-		this.setState({
-			viewablePageNumber : Math.floor(e.target.scrollTop / this.pageHeight)
-		});
+		const target = e.target;
+		this.setState((prevState)=>({
+			viewablePageNumber : Math.floor(target.scrollTop / target.scrollHeight * prevState.pages.length)
+		}));
 	},
 
 	shouldRender : function(pageText, index){
 		if(!this.state.isMounted) return false;
 
-		var viewIndex = this.state.viewablePageNumber;
+		const viewIndex = this.state.viewablePageNumber;
+		if(index == viewIndex - 3) return true;
+		if(index == viewIndex - 2) return true;
 		if(index == viewIndex - 1) return true;
 		if(index == viewIndex)     return true;
 		if(index == viewIndex + 1) return true;
+		if(index == viewIndex + 2) return true;
+		if(index == viewIndex + 3) return true;
 
 		//Check for style tages
 		if(pageText.indexOf('<style>') !== -1) return true;
@@ -88,9 +88,9 @@ const BrewRenderer = React.createClass({
 	},
 
 	renderPageInfo : function(){
-		return <div className='pageInfo'>
+		return <div className='pageInfo' ref='main'>
 			{this.state.viewablePageNumber + 1} / {this.state.pages.length}
-		</div>
+		</div>;
 	},
 
 	renderPPRmsg : function(){
@@ -98,51 +98,88 @@ const BrewRenderer = React.createClass({
 
 		return <div className='ppr_msg'>
 			Partial Page Renderer enabled, because your brew is so large. May effect rendering.
-		</div>
+		</div>;
 	},
 
 	renderDummyPage : function(index){
 		return <div className='phb' id={`p${index + 1}`} key={index}>
 			<i className='fa fa-spinner fa-spin' />
-		</div>
+		</div>;
 	},
 
 	renderPage : function(pageText, index){
-		return <div className='phb' id={`p${index + 1}`} dangerouslySetInnerHTML={{__html:Markdown.render(pageText)}} key={index} />
+		return <div className='phb' id={`p${index + 1}`} dangerouslySetInnerHTML={{ __html: Markdown.render(pageText) }} key={index} />;
 	},
 
 	renderPages : function(){
 		if(this.state.usePPR){
 			return _.map(this.state.pages, (page, index)=>{
-				if(this.shouldRender(page, index)){
+				if(this.shouldRender(page, index) && typeof window !== 'undefined'){
 					return this.renderPage(page, index);
-				}else{
+				} else {
 					return this.renderDummyPage(index);
 				}
 			});
 		}
 		if(this.props.errors && this.props.errors.length) return this.lastRender;
 		this.lastRender = _.map(this.state.pages, (page, index)=>{
-			return this.renderPage(page, index);
+			if(typeof window !== 'undefined') {
+				return this.renderPage(page, index);
+			} else {
+				return this.renderDummyPage(index);
+			}
 		});
 		return this.lastRender;
 	},
 
+	frameDidMount : function(){	//This triggers when iFrame finishes internal "componentDidMount"
+		setTimeout(()=>{	//We still see a flicker where the style isn't applied yet, so wait 100ms before showing iFrame
+			this.updateSize();
+			window.addEventListener('resize', this.updateSize);
+			this.renderPages(); //Make sure page is renderable before showing
+			this.setState({
+				isMounted  : true,
+				visibility : 'visible'
+			});
+		}, 100);
+	},
+
 	render : function(){
-		return <div className='brewRenderer'
-			onScroll={this.handleScroll}
-			ref='main'
-			style={{height : this.state.height}}>
+		//render in iFrame so broken code doesn't crash the site.
+		//Also render dummy page while iframe is mounting.
 
-			<ErrorBar errors={this.props.errors} />
-			<RenderWarnings />
+		return (
+			<React.Fragment>
+				{!this.state.isMounted
+					? <div className='brewRenderer' onScroll={this.handleScroll}>
+						<div className='pages' ref='pages'>
+							{this.renderDummyPage(1)}
+						</div>
+					</div>
+	        : null}
 
-			<div className='pages' ref='pages'>
-				{this.renderPages()}
-			</div>
-			{this.renderPageInfo()}
-			{this.renderPPRmsg()}
-		</div>
+				<Frame initialContent={this.state.initialContent} style={{ width: '100%', height: '100%', visibility: this.state.visibility }} contentDidMount={this.frameDidMount}>
+					<div className='brewRenderer'
+						onScroll={this.handleScroll}
+						style={{ height: this.state.height }}>
+
+						<ErrorBar errors={this.props.errors} />
+						<div className='popups'>
+							<RenderWarnings />
+							<NotificationPopup />
+						</div>
+
+						<div className='pages' ref='pages'>
+							{this.state.isMounted
+								? this.renderPages()
+							  : null}
+						</div>
+					</div>
+				</Frame>
+				{this.renderPageInfo()}
+				{this.renderPPRmsg()}
+			</React.Fragment>
+		);
 	}
 });
 

client/homebrew/brewRenderer/brewRenderer.less

@@ -4,29 +4,8 @@
 	position : relative;
 }
 .brewRenderer{
-	overflow-y : scroll;
-	.pageInfo{
-		position         : absolute;
-		right            : 17px;
-		bottom           : 0;
-		z-index          : 1000;
-		padding          : 8px 10px;
-		background-color : #333;
-		font-size        : 10px;
-		font-weight      : 800;
-		color            : white;
-	}
-	.ppr_msg{
-		position         : absolute;
-		left             : 0px;
-		bottom           : 0;
-		z-index          : 1000;
-		padding          : 8px 10px;
-		background-color : #333;
-		font-size        : 10px;
-		font-weight      : 800;
-		color            : white;
-	}
+	will-change : transform;
+	overflow-y  : scroll;
 	.pages{
 		margin : 30px 0px;
 		&>.phb{
@@ -36,4 +15,26 @@
 			box-shadow    : 1px 4px 14px #000;
 		}
 	}
+}
+.pageInfo{
+	position         : absolute;
+	right            : 17px;
+	bottom           : 0;
+	z-index          : 1000;
+	padding          : 8px 10px;
+	background-color : #333;
+	font-size        : 10px;
+	font-weight      : 800;
+	color            : white;
+}
+.ppr_msg{
+	position         : absolute;
+	left             : 0px;
+	bottom           : 0;
+	z-index          : 1000;
+	padding          : 8px 10px;
+	background-color : #333;
+	font-size        : 10px;
+	font-weight      : 800;
+	color            : white;
 }

client/homebrew/brewRenderer/errorBar/errorBar.jsx

@@ -1,15 +1,17 @@
-var React = require('react');
-var _     = require('lodash');
-var cx    = require('classnames');
+require('./errorBar.less');
+const React = require('react');
+const createClass = require('create-react-class');
+const _     = require('lodash');
+const cx    = require('classnames');
 
-var ErrorBar = React.createClass({
-	getDefaultProps: function() {
+const ErrorBar = createClass({
+	getDefaultProps : function() {
 		return {
 			errors : []
 		};
 	},
 
-	hasOpenError : false,
+	hasOpenError  : false,
 	hasCloseError : false,
 	hasMatchError : false,
 
@@ -19,29 +21,29 @@ var ErrorBar = React.createClass({
 		this.hasMatchError = false;
 
 
-		var errors = _.map(this.props.errors, (err, idx) => {
+		const errors = _.map(this.props.errors, (err, idx)=>{
 			if(err.id == 'OPEN') this.hasOpenError = true;
 			if(err.id == 'CLOSE') this.hasCloseError = true;
 			if(err.id == 'MISMATCH') this.hasMatchError = true;
 			return <li key={idx}>
 				Line {err.line} : {err.text}, '{err.type}' tag
-			</li>
+			</li>;
 		});
 
-		return <ul>{errors}</ul>
+		return <ul>{errors}</ul>;
 	},
 
 	renderProtip : function(){
-		var msg = [];
+		const msg = [];
 		if(this.hasOpenError){
 			msg.push(<div>
-				An unmatched opening tag means there's an opened tag that isn't closed, you need to close a tag, like this {'</div>'}. Make sure to match types!
+				An unmatched opening tag means there's an opened tag that isn't closed. You need to close your tags, like this {'</div>'}. Make sure to match types!
 			</div>);
 		}
 
 		if(this.hasCloseError){
 			msg.push(<div>
-				An unmatched closing tag means you closed a tag without opening it. Either remove it, you check to where you think you opened it.
+				An unmatched closing tag means you closed a tag without opening it. Either remove it, or check to where you think you opened it.
 			</div>);
 		}
 
@@ -53,7 +55,7 @@ var ErrorBar = React.createClass({
 		return <div className='protips'>
 			<h4>Protips!</h4>
 			{msg}
-		</div>
+		</div>;
 	},
 
 	render : function(){
@@ -66,7 +68,7 @@ var ErrorBar = React.createClass({
 			{this.renderErrors()}
 			<hr />
 			{this.renderProtip()}
-		</div>
+		</div>;
 	}
 });
 

client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx

@@ -0,0 +1,72 @@
+require('./notificationPopup.less');
+const React = require('react');
+const createClass = require('create-react-class');
+const _     = require('lodash');
+const cx    = require('classnames');	//Unused variable
+
+const DISMISS_KEY = 'dismiss_notification7-10-20';
+
+const NotificationPopup = createClass({
+	getInitialState : function() {
+		return {
+			notifications : {}
+		};
+	},
+	componentDidMount : function() {
+		this.checkNotifications();
+		window.addEventListener('resize', this.checkNotifications);
+	},
+	componentWillUnmount : function() {
+		window.removeEventListener('resize', this.checkNotifications);
+	},
+	notifications : {
+		psa : function(){
+			return <li key='psa'>
+				<em>Google Drive Integration!</em> <br />
+				We have added Google Drive integration to the Homebrewery! <a target='_blank' href='http://naturalcrit.com/login'>Sign in</a> with
+				your Google account to link it with your Homebrewery profile. A new button in the Edit page will let you transfer your file to your personal
+				Google Drive storage, and Google will keep a backup of each version! No more lost work surprises!
+				<br /><br />
+				However, we are aware that there may be uncaught bugs. We encourage you to copy your brew into a text document before transferring to Google
+				Drive just in case any issues arise as this update is rolled out.
+				<br /><br />
+				<b>Note:</b> Transferring an existing brew to Google Drive will change the edit and share links of your document. If you have shared your
+				document online, remember to update the links there as well.
+			</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);
+		if(hideDismiss) return this.setState({ notifications: {} });
+
+		this.setState({
+			notifications : _.mapValues(this.notifications, (fn)=>{ return fn(); })	//Convert notification functions into their return text value
+		});
+	},
+	dismiss : function(){
+		localStorage.setItem(DISMISS_KEY, true);
+		this.checkNotifications();
+	},
+	render : function(){
+		if(_.isEmpty(this.state.notifications)) return null;
+
+		return <div className='notificationPopup'>
+			<i className='fa fa-times dismiss' onClick={this.dismiss}/>
+			<i className='fa fa-info-circle info' />
+			<h3>Notice</h3>
+			<small>This website is always improving and we are still adding new features and squashing bugs. Keep the following in mind:</small>
+			<ul>{_.values(this.state.notifications)}</ul>
+		</div>;
+	}
+});
+
+module.exports = NotificationPopup;

client/homebrew/brewRenderer/notificationPopup/notificationPopup.less

@@ -0,0 +1,62 @@
+.popups{
+	position         : fixed;
+	top				 : @navbarHeight;
+	right            : 15px;
+	z-index          : 10001;
+	width            : 350px;
+}
+
+.notificationPopup{
+	position		 : relative;
+	float			 : right;
+	display          : inline-block;
+	width            : 350px;
+	padding          : 15px;
+	padding-bottom   : 10px;
+	padding-left     : 55px;
+	background-color : @blue;
+	color            : white;
+	a{
+		color       : @steel;
+		font-weight : 800;
+	}
+	i.info{
+		position  : absolute;
+		top       : 12px;
+		left      : 12px;
+		opacity   : 0.8;
+		font-size : 2.5em;
+	}
+	i.dismiss{
+		position : absolute;
+		top      : 10px;
+		right    : 10px;
+		cursor   : pointer;
+		opacity  : 0.6;
+		&:hover{
+			opacity : 1;
+		}
+	}
+	small{
+		opacity   : 0.7;
+		font-size : 0.6em;
+	}
+	h3{
+		font-size   : 1.1em;
+		font-weight : 800;
+	}
+	ul{
+		margin-top          : 15px;
+		font-size           : 0.8em;
+		list-style-position : outside;
+		list-style-type     : disc;
+		li{
+			font-size   : 0.8em;
+			line-height : 1.4em;
+			margin-top  : 1.4em;
+			em{
+				font-weight : 800;
+			}
+		}
+	}
+}

client/homebrew/editor/editor.jsx

@@ -1,145 +1,143 @@
-const React = require('react');
-const _ = require('lodash');
-const cx = require('classnames');
-
-const CodeEditor = require('naturalcrit/codeEditor/codeEditor.jsx');
-const SnippetBar = require('./snippetbar/snippetbar.jsx');
-const MetadataEditor = require('./metadataEditor/metadataEditor.jsx');
-
-
-const splice = function(str, index, inject){
-	return str.slice(0, index) + inject + str.slice(index);
-};
-
-const SNIPPETBAR_HEIGHT = 25;
-
-const Editor = React.createClass({
-	getDefaultProps: function() {
-		return {
-			value : '',
-			onChange : ()=>{},
-
-			metadata : {},
-			onMetadataChange : ()=>{},
-		};
-	},
-	getInitialState: function() {
-		return {
-			showMetadataEditor: false
-		};
-	},
-	cursorPosition : {
-		line : 0,
-		ch : 0
-	},
-
-	componentDidMount: function() {
-		this.updateEditorSize();
-		this.highlightPageLines();
-		window.addEventListener("resize", this.updateEditorSize);
-	},
-	componentWillUnmount: function() {
-		window.removeEventListener("resize", this.updateEditorSize);
-	},
-
-	updateEditorSize : function() {
-		let paneHeight = this.refs.main.parentNode.clientHeight;
-		paneHeight -= SNIPPETBAR_HEIGHT + 1;
-		this.refs.codeEditor.codeMirror.setSize(null, paneHeight);
-	},
-
-	handleTextChange : function(text){
-		this.props.onChange(text);
-	},
-	handleCursorActivty : function(curpos){
-		this.cursorPosition = curpos;
-	},
-	handleInject : function(injectText){
-		const lines = this.props.value.split('\n');
-		lines[this.cursorPosition.line] = splice(lines[this.cursorPosition.line], this.cursorPosition.ch, injectText);
-
-		this.handleTextChange(lines.join('\n'));
-		this.refs.codeEditor.setCursorPosition(this.cursorPosition.line, this.cursorPosition.ch  + injectText.length);
-	},
-	handgleToggle : function(){
-		this.setState({
-			showMetadataEditor : !this.state.showMetadataEditor
-		})
-	},
-
-	getCurrentPage : function(){
-		const lines = this.props.value.split('\n').slice(0, this.cursorPosition.line + 1);
-		return _.reduce(lines, (r, line) => {
-			if(line.indexOf('\\page') !== -1) r++;
-			return r;
-		}, 1);
-	},
-
-	highlightPageLines : function(){
-		if(!this.refs.codeEditor) return;
-		const codeMirror = this.refs.codeEditor.codeMirror;
-
-		const lineNumbers = _.reduce(this.props.value.split('\n'), (r, line, lineNumber)=>{
-			if(line.indexOf('\\page') !== -1){
-				codeMirror.addLineClass(lineNumber, 'background', 'pageLine');
-				r.push(lineNumber);
-			}
-			return r;
-		}, []);
-		return lineNumbers
-	},
-
-
-	brewJump : function(){
-		const currentPage = this.getCurrentPage();
-		window.location.hash = 'p' + currentPage;
-	},
-
-	//Called when there are changes to the editor's dimensions
-	update : function(){
-		this.refs.codeEditor.updateSize();
-	},
-
-	renderMetadataEditor : function(){
-		if(!this.state.showMetadataEditor) return;
-		return <MetadataEditor
-			metadata={this.props.metadata}
-			onChange={this.props.onMetadataChange}
-		/>
-	},
-
-	render : function(){
-		this.highlightPageLines();
-		return(
-			<div className='editor' ref='main'>
-				<SnippetBar
-					brew={this.props.value}
-					onInject={this.handleInject}
-					onToggle={this.handgleToggle}
-					showmeta={this.state.showMetadataEditor} />
-				{this.renderMetadataEditor()}
-				<CodeEditor
-					ref='codeEditor'
-					wrap={true}
-					language='gfm'
-					value={this.props.value}
-					onChange={this.handleTextChange}
-					onCursorActivity={this.handleCursorActivty} />
-
-				{/*
-				<div className='brewJump' onClick={this.brewJump}>
-					<i className='fa fa-arrow-right' />
-				</div>
-				*/}
-			</div>
-		);
-	}
-});
-
-module.exports = Editor;
-
-
-
-
-
-
+require('./editor.less');
+const React = require('react');
+const createClass = require('create-react-class');
+const _ = require('lodash');
+const cx = require('classnames');
+
+const CodeEditor = require('naturalcrit/codeEditor/codeEditor.jsx');
+const SnippetBar = require('./snippetbar/snippetbar.jsx');
+const MetadataEditor = require('./metadataEditor/metadataEditor.jsx');
+
+
+const splice = function(str, index, inject){
+	return str.slice(0, index) + inject + str.slice(index);
+};
+
+const SNIPPETBAR_HEIGHT = 25;
+
+const Editor = createClass({
+	getDefaultProps : function() {
+		return {
+			value    : '',
+			onChange : ()=>{},
+
+			metadata         : {},
+			onMetadataChange : ()=>{},
+			showMetaButton   : true
+		};
+	},
+	getInitialState : function() {
+		return {
+			showMetadataEditor : false
+		};
+	},
+	cursorPosition : {
+		line : 0,
+		ch   : 0
+	},
+
+	componentDidMount : function() {
+		this.updateEditorSize();
+		this.highlightPageLines();
+		window.addEventListener('resize', this.updateEditorSize);
+	},
+	componentWillUnmount : function() {
+		window.removeEventListener('resize', this.updateEditorSize);
+	},
+
+	updateEditorSize : function() {
+		let paneHeight = this.refs.main.parentNode.clientHeight;
+		paneHeight -= SNIPPETBAR_HEIGHT + 1;
+		this.refs.codeEditor.codeMirror.setSize(null, paneHeight);
+	},
+
+	handleTextChange : function(text){
+		this.props.onChange(text);
+	},
+	handleCursorActivty : function(curpos){
+		this.cursorPosition = curpos;
+	},
+	handleInject : function(injectText){
+		const lines = this.props.value.split('\n');
+		lines[this.cursorPosition.line] = splice(lines[this.cursorPosition.line], this.cursorPosition.ch, injectText);
+
+		this.handleTextChange(lines.join('\n'));
+		this.refs.codeEditor.setCursorPosition(this.cursorPosition.line, this.cursorPosition.ch  + injectText.length);
+	},
+	handgleToggle : function(){
+		this.setState({
+			showMetadataEditor : !this.state.showMetadataEditor
+		});
+	},
+
+	getCurrentPage : function(){
+		const lines = this.props.value.split('\n').slice(0, this.cursorPosition.line + 1);
+		return _.reduce(lines, (r, line)=>{
+			if(line.indexOf('\\page') !== -1) r++;
+			return r;
+		}, 1);
+	},
+
+	highlightPageLines : function(){
+		if(!this.refs.codeEditor) return;
+		const codeMirror = this.refs.codeEditor.codeMirror;
+
+		const lineNumbers = _.reduce(this.props.value.split('\n'), (r, line, lineNumber)=>{
+			if(line.indexOf('\\page') !== -1){
+				codeMirror.addLineClass(lineNumber, 'background', 'pageLine');
+				r.push(lineNumber);
+			}
+			return r;
+		}, []);
+		return lineNumbers;
+	},
+
+
+	brewJump : function(){
+		const currentPage = this.getCurrentPage();
+		window.location.hash = `p${currentPage}`;
+	},
+
+	//Called when there are changes to the editor's dimensions
+	update : function(){
+		this.refs.codeEditor.updateSize();
+	},
+
+	renderMetadataEditor : function(){
+		if(!this.state.showMetadataEditor) return;
+		return <MetadataEditor
+			metadata={this.props.metadata}
+			onChange={this.props.onMetadataChange}
+		/>;
+	},
+
+	render : function(){
+		this.highlightPageLines();
+		return (
+			<div className='editor' ref='main'>
+				<SnippetBar
+					brew={this.props.value}
+					onInject={this.handleInject}
+					onToggle={this.handgleToggle}
+					showmeta={this.state.showMetadataEditor}
+					showMetaButton={this.props.showMetaButton} />
+				{this.renderMetadataEditor()}
+				<CodeEditor
+					ref='codeEditor'
+					wrap={true}
+					language='gfm'
+					value={this.props.value}
+					onChange={this.handleTextChange}
+					onCursorActivity={this.handleCursorActivty} />
+
+				{/*
+				<div className='brewJump' onClick={this.brewJump}>
+					<i className='fa fa-arrow-right' />
+				</div>
+				*/}
+			</div>
+		);
+	}
+});
+
+module.exports = Editor;

client/homebrew/editor/metadataEditor/metadataEditor.jsx

@@ -1,21 +1,23 @@
+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 request = require('superagent');
 
-const SYSTEMS = ['5e', '4e', '3.5e', 'Pathfinder']
+const SYSTEMS = ['5e', '4e', '3.5e', 'Pathfinder'];
 
-const MetadataEditor = React.createClass({
-	getDefaultProps: function() {
+const MetadataEditor = createClass({
+	getDefaultProps : function() {
 		return {
-			metadata: {
-				editId : null,
-				title : '',
+			metadata : {
+				editId      : null,
+				title       : '',
 				description : '',
-				tags : '',
-				published : false,
-				authors : [],
-				systems : []
+				tags        : '',
+				published   : false,
+				authors     : [],
+				systems     : []
 			},
 			onChange : ()=>{}
 		};
@@ -24,12 +26,12 @@ const MetadataEditor = React.createClass({
 	handleFieldChange : function(name, e){
 		this.props.onChange(_.merge({}, this.props.metadata, {
 			[name] : e.target.value
-		}))
+		}));
 	},
 	handleSystem : function(system, e){
 		if(e.target.checked){
 			this.props.metadata.systems.push(system);
-		}else{
+		} else {
 			this.props.metadata.systems = _.without(this.props.metadata.systems, system);
 		}
 		this.props.onChange(this.props.metadata);
@@ -41,10 +43,15 @@ const MetadataEditor = React.createClass({
 	},
 
 	handleDelete : function(){
-		if(!confirm("are you sure you want to delete this brew?")) return;
-		if(!confirm("are you REALLY sure? You will not be able to recover it")) return;
+		if(this.props.metadata.authors.length <= 1){
+			if(!confirm('Are you sure you want to delete this brew? Because you are the only owner of this brew, the document will be deleted permanently.')) return;
+			if(!confirm('Are you REALLY sure? You will not be able to recover the document.')) return;
+		} else {
+			if(!confirm('Are you sure you want to remove this brew from your collection? This will remove you as an editor, but other owners will still be able to access the document.')) return;
+			if(!confirm('Are you REALLY sure? You will lose editor access to this document.')) return;
+		}
 
-		request.get('/api/remove/' + this.props.metadata.editId)
+		request.delete(`/api/${this.props.metadata.editId}`)
 			.send()
 			.end(function(err, res){
 				window.location.href = '/';
@@ -67,21 +74,21 @@ const MetadataEditor = React.createClass({
 				<input
 					type='checkbox'
 					checked={_.includes(this.props.metadata.systems, val)}
-					onChange={this.handleSystem.bind(null, val)} />
+					onChange={(e)=>this.handleSystem(val, e)} />
 				{val}
-			</label>
+			</label>;
 		});
 	},
 
 	renderPublish : function(){
 		if(this.props.metadata.published){
-			return <button className='unpublish' onClick={this.handlePublish.bind(null, false)}>
+			return <button className='unpublish' onClick={()=>this.handlePublish(false)}>
 				<i className='fa fa-ban' /> unpublish
-			</button>
-		}else{
-			return <button className='publish' onClick={this.handlePublish.bind(null, true)}>
+			</button>;
+		} else {
+			return <button className='publish' onClick={()=>this.handlePublish(true)}>
 				<i className='fa fa-globe' /> publish
-			</button>
+			</button>;
 		}
 	},
 
@@ -95,7 +102,7 @@ const MetadataEditor = React.createClass({
 					<i className='fa fa-trash' /> delete brew
 				</button>
 			</div>
-		</div>
+		</div>;
 	},
 
 	renderAuthors : function(){
@@ -108,7 +115,7 @@ const MetadataEditor = React.createClass({
 			<div className='value'>
 				{text}
 			</div>
-		</div>
+		</div>;
 	},
 
 	renderShareToReddit : function(){
@@ -117,13 +124,13 @@ const MetadataEditor = React.createClass({
 		return <div className='field reddit'>
 			<label>reddit</label>
 			<div className='value'>
-				<a href={this.getRedditLink()} target='_blank'>
+				<a href={this.getRedditLink()} target='_blank' rel='noopener noreferrer'>
 					<button className='publish'>
 						<i className='fa fa-reddit-alien' /> share to reddit
 					</button>
 				</a>
 			</div>
-		</div>
+		</div>;
 	},
 
 	render : function(){
@@ -132,18 +139,18 @@ const MetadataEditor = React.createClass({
 				<label>title</label>
 				<input type='text' className='value'
 					value={this.props.metadata.title}
-					onChange={this.handleFieldChange.bind(null, 'title')} />
+					onChange={(e)=>this.handleFieldChange('title', e)} />
 			</div>
 			<div className='field description'>
 				<label>description</label>
 				<textarea value={this.props.metadata.description} className='value'
-					onChange={this.handleFieldChange.bind(null, 'description')} />
+					onChange={(e)=>this.handleFieldChange('description', e)} />
 			</div>
 			{/*}
 			<div className='field tags'>
 				<label>tags</label>
 				<textarea value={this.props.metadata.tags}
-					onChange={this.handleFieldChange.bind(null, 'tags')} />
+					onChange={(e)=>this.handleFieldChange('tags', e)} />
 			</div>
 			*/}
 
@@ -168,7 +175,7 @@ const MetadataEditor = React.createClass({
 
 			{this.renderDelete()}
 
-		</div>
+		</div>;
 	}
 });
 

client/homebrew/editor/snippetbar/snippetbar.jsx

@@ -1,4 +1,6 @@
+require('./snippetbar.less');
 const React = require('react');
+const createClass = require('create-react-class');
 const _     = require('lodash');
 const cx    = require('classnames');
 
@@ -8,22 +10,21 @@ const Snippets = require('./snippets/snippets.js');
 const execute = function(val, brew){
 	if(_.isFunction(val)) return val(brew);
 	return val;
-}
+};
 
-
-
-const Snippetbar = React.createClass({
-	getDefaultProps: function() {
+const Snippetbar = createClass({
+	getDefaultProps : function() {
 		return {
-			brew : '',
-			onInject : ()=>{},
-			onToggle : ()=>{},
-			showmeta : false
+			brew           : '',
+			onInject       : ()=>{},
+			onToggle       : ()=>{},
+			showmeta       : false,
+			showMetaButton : true
 		};
 	},
 
 	handleSnippetClick : function(injectedText){
-		this.props.onInject(injectedText)
+		this.props.onInject(injectedText);
 	},
 
 	renderSnippetGroups : function(){
@@ -35,18 +36,24 @@ const Snippetbar = React.createClass({
 				snippets={snippetGroup.snippets}
 				key={snippetGroup.groupName}
 				onSnippetClick={this.handleSnippetClick}
-			/>
-		})
+			/>;
+		});
+	},
+
+	renderMetadataButton : function(){
+		if(!this.props.showMetaButton) return;
+		return <div className={cx('snippetBarButton', 'toggleMeta', { selected: this.props.showmeta })}
+			onClick={this.props.onToggle}>
+			<i className='fa fa-info-circle' />
+			<span className='groupName'>Properties</span>
+		</div>;
 	},
 
 	render : function(){
 		return <div className='snippetBar'>
 			{this.renderSnippetGroups()}
-			<div className={cx('toggleMeta', {selected: this.props.showmeta})}
-				onClick={this.props.onToggle}>
-				<i className='fa fa-bars' />
-			</div>
-		</div>
+			{this.renderMetadataButton()}
+		</div>;
 	}
 });
 
@@ -57,13 +64,13 @@ module.exports = Snippetbar;
 
 
 
-const SnippetGroup = React.createClass({
-	getDefaultProps: function() {
+const SnippetGroup = createClass({
+	getDefaultProps : function() {
 		return {
-			brew : '',
-			groupName : '',
-			icon : 'fa-rocket',
-			snippets : [],
+			brew           : '',
+			groupName      : '',
+			icon           : 'fa-rocket',
+			snippets       : [],
 			onSnippetClick : function(){},
 		};
 	},
@@ -72,23 +79,23 @@ const SnippetGroup = React.createClass({
 	},
 	renderSnippets : function(){
 		return _.map(this.props.snippets, (snippet)=>{
-			return <div className='snippet' key={snippet.name} onClick={this.handleSnippetClick.bind(this, snippet)}>
-				<i className={'fa fa-fw ' + snippet.icon} />
+			return <div className='snippet' key={snippet.name} onClick={()=>this.handleSnippetClick(snippet)}>
+				<i className={`fa fa-fw ${snippet.icon}`} />
 				{snippet.name}
-			</div>
-		})
+			</div>;
+		});
 	},
 
 	render : function(){
-		return <div className='snippetGroup'>
+		return <div className='snippetGroup snippetBarButton'>
 			<div className='text'>
-				<i className={'fa fa-fw ' + this.props.icon} />
+				<i className={`fa fa-fw ${this.props.icon}`} />
 				<span className='groupName'>{this.props.groupName}</span>
 			</div>
 			<div className='dropdown'>
 				{this.renderSnippets()}
 			</div>
-		</div>
+		</div>;
 	},
 
-});
+});

client/homebrew/editor/snippetbar/snippetbar.less

@@ -4,44 +4,33 @@
 	position         : relative;
 	height           : @height;
 	background-color : #ddd;
-	.toggleMeta{
-		position    : absolute;
-		top         : 0px;
-		right       : 0px;
-		height      : @height;
-		width       : @height;
-		cursor      : pointer;
-		line-height : @height;
-		text-align  : center;
-		.tooltipLeft("Edit Brew Metadata");
+	.snippetBarButton{
+		height         : @height;
+		line-height    : @height;
+		display        : inline-block;
+		padding        : 0px 5px;
+		font-weight    : 800;
+		font-size      : 0.625em;
+		text-transform : uppercase;
+		cursor         : pointer;
 		&:hover, &.selected{
 			background-color : #999;
 		}
-	}
-	.snippetGroup{
-		display        : inline-block;
-		height         : @height;
-		padding        : 0px 5px;
-		cursor         : pointer;
-		font-size      : 0.6em;
-		font-weight    : 800;
-		line-height    : @height;
-		text-transform : uppercase;
-		border-right   : 1px solid black;
 		i{
 			vertical-align : middle;
 			margin-right   : 3px;
-			font-size      : 1.2em;
-		}
-		&:hover, &.selected{
-			background-color : #999;
-		}
-		.text{
-			line-height : @height;
-			.groupName{
-				font-size : 10px;
-			}
+			font-size      : 1.4em;
 		}
+	}
+	.toggleMeta{
+		position     : absolute;
+		top          : 0px;
+		right        : 0px;
+		border-left  : 1px solid black;
+		.tooltipLeft("Edit Brew Properties");
+	}
+	.snippetGroup{
+		border-right   : 1px solid black;
 		&:hover{
 			.dropdown{
 				visibility : visible;
@@ -62,7 +51,7 @@
 				font-size : 10px;
 				i{
 					margin-right : 8px;
-					font-size    : 13px;
+					font-size    : 1.2em;
 				}
 				&:hover{
 					background-color : #999;
@@ -70,4 +59,4 @@
 			}
 		}
 	}
-}
+}

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

@@ -1,42 +1,42 @@
-var _ = require('lodash');
-
-module.exports = function(classname){
-
-	classname = classname || _.sample(['archivist', 'fancyman', 'linguist', 'fletcher',
-			'notary', 'berserker-typist', 'fishmongerer', 'manicurist', 'haberdasher', 'concierge'])
-
-	classname = classname.toLowerCase();
-
-	var hitDie = _.sample([4, 6, 8, 10, 12]);
-
-	var abilityList = ["Strength", "Dexerity", "Constitution", "Wisdom", "Charisma", "Intelligence"];
-	var skillList = ["Acrobatics ", "Animal Handling", "Arcana", "Athletics", "Deception", "History", "Insight", "Intimidation", "Investigation", "Medicine", "Nature", "Perception", "Performance", "Persuasion", "Religion", "Sleight of Hand", "Stealth", "Survival"];
-
-
-	return [
-		"## Class Features",
-		"As a " + classname + ", you gain the following class features",
-		"#### Hit Points",
-		"___",
-		"- **Hit Dice:** 1d" + hitDie + " per " + classname + " level",
-		"- **Hit Points at 1st Level:** " + hitDie + " + your Constitution modifier",
-		"- **Hit Points at Higher Levels:** 1d" + hitDie + " (or " + (hitDie/2 + 1) + ") + your Constitution modifier per " + classname + " level after 1st",
-		"",
-		"#### Proficiencies",
-		"___",
-		"- **Armor:** " + (_.sampleSize(["Light armor", "Medium armor", "Heavy armor", "Shields"], _.random(0,3)).join(', ') || "None"),
-		"- **Weapons:** " + (_.sampleSize(["Squeegee", "Rubber Chicken", "Simple weapons", "Martial weapons"], _.random(0,2)).join(', ') || "None"),
-		"- **Tools:** " + (_.sampleSize(["Artian's tools", "one musical instrument", "Thieve's tools"], _.random(0,2)).join(', ') || "None"),
-		"",
-		"___",
-		"- **Saving Throws:** " + (_.sampleSize(abilityList, 2).join(', ')),
-		"- **Skills:** Choose two from " + (_.sampleSize(skillList, _.random(4, 6)).join(', ')),
-		"",
-		"#### 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",
-		"- *(a)* five javelins or *(b)* any simple melee weapon",
-		"- " + (_.sample(["10 lint fluffs", "1 button", "a cherished lost sock"])),
-		"\n\n\n"
-	].join('\n');
-}
+const _ = require('lodash');
+
+module.exports = function(classname){
+
+	classname = _.sample(['archivist', 'fancyman', 'linguist', 'fletcher',
+		'notary', 'berserker-typist', 'fishmongerer', 'manicurist', 'haberdasher', 'concierge']);
+
+	classname = classname.toLowerCase();
+
+	const hitDie = _.sample([4, 6, 8, 10, 12]);
+
+	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'];
+
+
+	return [
+		'## Class Features',
+		`As a ${classname}, you gain the following class features`,
+		'#### Hit Points',
+		'___',
+		`- **Hit Dice:** 1d${hitDie} per ${classname} level`,
+		`- **Hit Points at 1st Level:** ${hitDie} + your Constitution modifier`,
+		`- **Hit Points at Higher Levels:** 1d${hitDie} (or ${hitDie/2 + 1}) + your Constitution modifier per ${classname} level after 1st`,
+		'',
+		'#### Proficiencies',
+		'___',
+		`- **Armor:** ${_.sampleSize(['Light armor', 'Medium armor', 'Heavy armor', 'Shields'], _.random(0, 3)).join(', ') || 'None'}`,
+		`- **Weapons:** ${_.sampleSize(['Squeegee', 'Rubber Chicken', 'Simple weapons', 'Martial weapons'], _.random(0, 2)).join(', ') || 'None'}`,
+		`- **Tools:** ${_.sampleSize(['Artian\'s tools', 'one musical instrument', 'Thieve\'s tools'], _.random(0, 2)).join(', ') || 'None'}`,
+		'',
+		'___',
+		`- **Saving Throws:** ${_.sampleSize(abilityList, 2).join(', ')}`,
+		`- **Skills:** Choose two from ${_.sampleSize(skillList, _.random(4, 6)).join(', ')}`,
+		'',
+		'#### 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',
+		'- *(a)* five javelins or *(b)* any simple melee weapon',
+		`- ${_.sample(['10 lint fluffs', '1 button', 'a cherished lost sock'])}`,
+		'\n\n\n'
+	].join('\n');
+};

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

@@ -1,114 +1,114 @@
-var _ = require('lodash');
-
-var features = [
-	"Astrological Botany",
-	"Astrological Chemistry",
-	"Biochemical Sorcery",
-	"Civil Alchemy",
-	"Consecrated Biochemistry",
-	"Demonic Anthropology",
-	"Divinatory Mineralogy",
-	"Genetic Banishing",
-	"Hermetic Geography",
-	"Immunological Incantations",
-	"Nuclear Illusionism",
-	"Ritual Astronomy",
-	"Seismological Divination",
-	"Spiritual Biochemistry",
-	"Statistical Occultism",
-	"Police Necromancer",
-	"Sixgun Poisoner",
-	"Pharmaceutical Gunslinger",
-	"Infernal Banker",
-	"Spell Analyst",
-	"Gunslinger Corruptor",
-	"Torque Interfacer",
-	"Exo Interfacer",
-	"Gunpowder Torturer",
-	"Orbital Gravedigger",
-	"Phased Linguist",
-	"Mathematical Pharmacist",
-	"Plasma Outlaw",
-	"Malefic Chemist",
-	"Police Cultist"
-];
-
-var classnames = ['Archivist', 'Fancyman', 'Linguist', 'Fletcher',
-				'Notary', 'Berserker-Typist', 'Fishmongerer', 'Manicurist', 'Haberdasher', 'Concierge'];
-
-var levels = ["1st", "2nd", "3rd", "4th", "5th", "6th", "7th", "8th", "9th", "10th", "11th", "12th", "13th", "14th", "15th", "16th", "17th", "18th", "19th", "20th"]
-
-var profBonus = [2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,6,6,6,6];
-
-var getFeature = (level)=>{
-	var res = []
-	if(_.includes([4,6,8,12,14,16,19], level+1)){
-		res = ["Ability Score Improvement"]
-	}
-	res = _.union(res, _.sampleSize(features, _.sample([0,1,1,1,1,1])));
-	if(!res.length) return "─";
-	return res.join(', ');
-}
-
-module.exports = {
-	full : function(){
-		var classname = _.sample(classnames)
-
-		var maxes = [4,3,3,3,3,2,2,1,1]
-		var drawSlots = function(Slots){
-			var slots = Number(Slots);
-			return _.times(9, function(i){
-				var max = maxes[i];
-				if(slots < 1) return "—";
-				var res = _.min([max, slots]);
-				slots -= res;
-				return res;
-			}).join(' | ')
-		}
-
-
-		var cantrips = 3;
-		var spells = 1;
-		var slots = 2;
-		return "<div class='classTable wide'>\n##### The " + classname + "\n" +
-		"| Level | Proficiency Bonus | Features | Cantrips Known | Spells Known | 1st | 2nd | 3rd | 4th | 5th | 6th | 7th | 8th | 9th |\n"+
-		"|:---:|:---:|:---|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|\n" +
-		_.map(levels, function(levelName, level){
-			var res = [
-				levelName,
-				"+" + profBonus[level],
-				getFeature(level),
-				cantrips,
-				spells,
-				drawSlots(slots)
-			].join(' | ');
-
-			cantrips += _.random(0,1);
-			spells += _.random(0,1);
-			slots += _.random(0,2);
-
-			return "| " + res + " |";
-		}).join('\n') +'\n</div>\n\n';
-	},
-
-	half : function(){
-		var classname =  _.sample(classnames)
-
-		var featureScore = 1
-		return "<div class='classTable'>\n##### The " + classname + "\n" +
-		"| Level | Proficiency Bonus | Features | " + _.sample(features) + "|\n" +
-		"|:---:|:---:|:---|:---:|\n" +
-		_.map(levels, function(levelName, level){
-			var res = [
-				levelName,
-				"+" + profBonus[level],
-				getFeature(level),
-				"+" + featureScore
-			].join(' | ');
-
-			featureScore += _.random(0,1);
-
-			return "| " + res + " |";
-		}).join('\n') +'\n</div>\n\n';
-	}
-};
+const _ = require('lodash');
+
+const features = [
+	'Astrological Botany',
+	'Astrological Chemistry',
+	'Biochemical Sorcery',
+	'Civil Alchemy',
+	'Consecrated Biochemistry',
+	'Demonic Anthropology',
+	'Divinatory Mineralogy',
+	'Genetic Banishing',
+	'Hermetic Geography',
+	'Immunological Incantations',
+	'Nuclear Illusionism',
+	'Ritual Astronomy',
+	'Seismological Divination',
+	'Spiritual Biochemistry',
+	'Statistical Occultism',
+	'Police Necromancer',
+	'Sixgun Poisoner',
+	'Pharmaceutical Gunslinger',
+	'Infernal Banker',
+	'Spell Analyst',
+	'Gunslinger Corruptor',
+	'Torque Interfacer',
+	'Exo Interfacer',
+	'Gunpowder Torturer',
+	'Orbital Gravedigger',
+	'Phased Linguist',
+	'Mathematical Pharmacist',
+	'Plasma Outlaw',
+	'Malefic Chemist',
+	'Police Cultist'
+];
+
+const classnames = ['Archivist', 'Fancyman', 'Linguist', 'Fletcher',
+	'Notary', 'Berserker-Typist', 'Fishmongerer', 'Manicurist', 'Haberdasher', 'Concierge'];
+
+const levels = ['1st', '2nd', '3rd', '4th', '5th', '6th', '7th', '8th', '9th', '10th', '11th', '12th', '13th', '14th', '15th', '16th', '17th', '18th', '19th', '20th'];
+
+const profBonus = [2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6];
+
+const getFeature = (level)=>{
+	let res = [];
+	if(_.includes([4, 6, 8, 12, 14, 16, 19], level+1)){
+		res = ['Ability Score Improvement'];
+	}
+	res = _.union(res, _.sampleSize(features, _.sample([0, 1, 1, 1, 1, 1])));
+	if(!res.length) return '─';
+	return res.join(', ');
+};
+
+module.exports = {
+	full : function(){
+		const classname = _.sample(classnames);
+
+		const maxes = [4, 3, 3, 3, 3, 2, 2, 1, 1];
+		const drawSlots = function(Slots){
+			let slots = Number(Slots);
+			return _.times(9, function(i){
+				const max = maxes[i];
+				if(slots < 1) return '—';
+				const res = _.min([max, slots]);
+				slots -= res;
+				return res;
+			}).join(' | ');
+		};
+
+
+		let cantrips = 3;
+		let spells = 1;
+		let slots = 2;
+		return `<div class='classTable wide'>\n##### The ${classname}\n` +
+		`| Level | Proficiency Bonus | Features | Cantrips Known | Spells Known | 1st | 2nd | 3rd | 4th | 5th | 6th | 7th | 8th | 9th |\n`+
+		`|:---:|:---:|:---|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|\n${
+			_.map(levels, function(levelName, level){
+				const res = [
+					levelName,
+					`+${profBonus[level]}`,
+					getFeature(level),
+					cantrips,
+					spells,
+					drawSlots(slots)
+				].join(' | ');
+
+				cantrips += _.random(0, 1);
+				spells += _.random(0, 1);
+				slots += _.random(0, 2);
+
+				return `| ${res} |`;
+			}).join('\n')}\n</div>\n\n`;
+	},
+
+	half : function(){
+		const classname =  _.sample(classnames);
+
+		let featureScore = 1;
+		return `<div class='classTable'>\n##### The ${classname}\n` +
+		`| Level | Proficiency Bonus | Features | ${_.sample(features)}|\n` +
+		`|:---:|:---:|:---|:---:|\n${
+			_.map(levels, function(levelName, level){
+				const res = [
+					levelName,
+					`+${profBonus[level]}`,
+					getFeature(level),
+					`+${featureScore}`
+				].join(' | ');
+
+				featureScore += _.random(0, 1);
+
+				return `| ${res} |`;
+			}).join('\n')}\n</div>\n\n`;
+	}
+};

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

@@ -1,107 +1,114 @@
-var _ = require('lodash');
+const _ = require('lodash');
 
-var titles = [
-	"The Burning Gallows",
-	"The Ring of Nenlast",
-	"Below the Blind Tavern",
-	"Below the Hungering River",
-	"Before Bahamut's Land",
-	"The Cruel Grave from Within",
-	"The Strength of Trade Road",
-	"Through The Raven Queen's Worlds",
-	"Within the Settlement",
-	"The Crown from Within",
-	"The Merchant Within the Battlefield",
-	"Ioun's Fading Traveler",
-	"The Legion Ingredient",
-	"The Explorer Lure",
-	"Before the Charming Badlands",
-	"The Living Dead Above the Fearful Cage",
-	"Vecna's Hidden Sage",
-	"Bahamut's Demonspawn",
-	"Across Gruumsh's Elemental Chaos",
-	"The Blade of Orcus",
-	"Beyond Revenge",
-	"Brain of Insanity",
-	"Breed Battle!, A New Beginning",
-	"Evil Lake, A New Beginning",
-	"Invasion of the Gigantic Cat, Part II",
-	"Kraken War 2020",
-	"The Body Whisperers",
-	"The Diabolical Tales of the Ape-Women",
-	"The Doctor Immortal",
-	"The Doctor from Heaven",
-	"The Graveyard",
-	"Azure Core",
-	"Core Battle",
-	"Core of Heaven: The Guardian of Amazement",
-	"Deadly Amazement III",
-	"Dry Chaos IX",
-	"Gate Thunder",
-	"Guardian: Skies of the Dark Wizard",
-	"Lute of Eternity",
-	"Mercury's Planet: Brave Evolution",
-	"Ruby of Atlantis: The Quake of Peace",
-	"Sky of Zelda: The Thunder of Force",
-	"Vyse's Skies",
-	"White Greatness III",
-	"Yellow Divinity",
-	"Zidane's Ghost"
+const titles = [
+	'The Burning Gallows',
+	'The Ring of Nenlast',
+	'Below the Blind Tavern',
+	'Below the Hungering River',
+	'Before Bahamut\'s Land',
+	'The Cruel Grave from Within',
+	'The Strength of Trade Road',
+	'Through The Raven Queen\'s Worlds',
+	'Within the Settlement',
+	'The Crown from Within',
+	'The Merchant Within the Battlefield',
+	'Ioun\'s Fading Traveler',
+	'The Legion Ingredient',
+	'The Explorer Lure',
+	'Before the Charming Badlands',
+	'The Living Dead Above the Fearful Cage',
+	'Vecna\'s Hidden Sage',
+	'Bahamut\'s Demonspawn',
+	'Across Gruumsh\'s Elemental Chaos',
+	'The Blade of Orcus',
+	'Beyond Revenge',
+	'Brain of Insanity',
+	'Breed Battle!, A New Beginning',
+	'Evil Lake, A New Beginning',
+	'Invasion of the Gigantic Cat, Part II',
+	'Kraken War 2020',
+	'The Body Whisperers',
+	'The Diabolical Tales of the Ape-Women',
+	'The Doctor Immortal',
+	'The Doctor from Heaven',
+	'The Graveyard',
+	'Azure Core',
+	'Core Battle',
+	'Core of Heaven: The Guardian of Amazement',
+	'Deadly Amazement III',
+	'Dry Chaos IX',
+	'Gate Thunder',
+	'Guardian: Skies of the Dark Wizard',
+	'Lute of Eternity',
+	'Mercury\'s Planet: Brave Evolution',
+	'Ruby of Atlantis: The Quake of Peace',
+	'Sky of Zelda: The Thunder of Force',
+	'Vyse\'s Skies',
+	'White Greatness III',
+	'Yellow Divinity',
+	'Zidane\'s Ghost'
 ];
 
-var subtitles = [
-	"In an ominous universe, a botanist opposes terrorism.",
-	"In a demon-haunted city, in an age of lies and hate, a physicist tries to find an ancient treasure and battles a mob of aliens.",
-	"In a land of corruption, two cyberneticists and a dungeon delver search for freedom.",
-	"In an evil empire of horror, two rangers battle the forces of hell.",
-	"In a lost city, in an age of sorcery, a librarian quests for revenge.",
-	"In a universe of illusions and danger, three time travellers and an adventurer search for justice.",
-	"In a forgotten universe of barbarism, in an era of terror and mysticism, a virtual reality programmer and a spy try to find vengance and battle crime.",
-	"In a universe of demons, in an era of insanity and ghosts, three bodyguards and a bodyguard try to find vengance.",
-	"In a kingdom of corruption and battle, seven artificial intelligences try to save the last living fertile woman.",
-	"In a universe of virutal reality and agony, in an age of ghosts and ghosts, a fortune-teller and a wanderer try to avert the apocalypse.",
-	"In a crime-infested kingdom, three martial artists quest for the truth and oppose evil.",
-	"In a terrifying universe of lost souls, in an era of lost souls, eight dancers fight evil.",
-	"In a galaxy of confusion and insanity, three martial artists and a duke battle a mob of psychics.",
-	"In an amazing kingdom, a wizard and a secretary hope to prevent the destruction of mankind.",
-	"In a kingdom of deception, a reporter searches for fame.",
-	"In a hellish empire, a swordswoman and a duke try to find the ultimate weapon and battle a conspiracy.",
-	"In an evil galaxy of illusion, in a time of technology and misery, seven psychiatrists battle crime.",
-	"In a dark city of confusion, three swordswomen and a singer battle lawlessness.",
-	"In an ominous empire, in an age of hate, two philosophers and a student try to find justice and battle a mob of mages intent on stealing the souls of the innocent.",
-	"In a kingdom of panic, six adventurers oppose lawlessness.",
-	"In a land of dreams and hopelessness, three hackers and a cyborg search for justice.",
-	"On a planet of mysticism, three travelers and a fire fighter quest for the ultimate weapon and oppose evil.",
-	"In a wicked universe, five seers fight lawlessness.",
-	"In a kingdom of death, in an era of illusion and blood, four colonists search for fame.",
-	"In an amazing kingdom, in an age of sorcery and lost souls, eight space pirates quest for freedom.",
-	"In a cursed empire, five inventors oppose terrorism.",
-	"On a crime-ridden planet of conspiracy, a watchman and an artificial intelligence try to find love and oppose lawlessness.",
-	"In a forgotten land, a reporter and a spy try to stop the apocalypse.",
-	"In a forbidden land of prophecy, a scientist and an archivist oppose a cabal of barbarians intent on stealing the souls of the innocent.",
-	"On an infernal world of illusion, a grave robber and a watchman try to find revenge and combat a syndicate of mages intent on stealing the source of all magic.",
-	"In a galaxy of dark magic, four fighters seek freedom.",
-	"In an empire of deception, six tomb-robbers quest for the ultimate weapon and combat an army of raiders.",
-	"In a kingdom of corruption and lost souls, in an age of panic, eight planetologists oppose evil.",
-	"In a galaxy of misery and hopelessness, in a time of agony and pain, five planetologists search for vengance.",
-	"In a universe of technology and insanity, in a time of sorcery, a computer techician quests for hope.",
-	"On a planet of dark magic and barbarism, in an age of horror and blasphemy, seven librarians search for fame.",
-	"In an empire of dark magic, in a time of blood and illusions, four monks try to find the ultimate weapon and combat terrorism.",
-	"In a forgotten empire of dark magic, six kings try to prevent the destruction of mankind.",
-	"In a galaxy of dark magic and horror, in an age of hopelessness, four marines and an outlaw combat evil.",
-	"In a mysterious city of illusion, in an age of computerization, a witch-hunter tries to find the ultimate weapon and opposes an evil corporation.",
-	"In a damned kingdom of technology, a virtual reality programmer and a fighter seek fame.",
-	"In a hellish kingdom, in an age of blasphemy and blasphemy, an astrologer searches for fame.",
-	"In a damned world of devils, an alien and a ranger quest for love and oppose a syndicate of demons.",
-	"In a cursed galaxy, in a time of pain, seven librarians hope to avert the apocalypse.",
-	"In a crime-infested galaxy, in an era of hopelessness and panic, three champions and a grave robber try to solve the ultimate crime."
+const subtitles = [
+	'In an ominous universe, a botanist opposes terrorism.',
+	'In a demon-haunted city, in an age of lies and hate, a physicist tries to find an ancient treasure and battles a mob of aliens.',
+	'In a land of corruption, two cyberneticists and a dungeon delver search for freedom.',
+	'In an evil empire of horror, two rangers battle the forces of hell.',
+	'In a lost city, in an age of sorcery, a librarian quests for revenge.',
+	'In a universe of illusions and danger, three time travellers and an adventurer search for justice.',
+	'In a forgotten universe of barbarism, in an era of terror and mysticism, a virtual reality programmer and a spy try to find vengance and battle crime.',
+	'In a universe of demons, in an era of insanity and ghosts, three bodyguards and a bodyguard try to find vengance.',
+	'In a kingdom of corruption and battle, seven artificial intelligences try to save the last living fertile woman.',
+	'In a universe of virutal reality and agony, in an age of ghosts and ghosts, a fortune-teller and a wanderer try to avert the apocalypse.',
+	'In a crime-infested kingdom, three martial artists quest for the truth and oppose evil.',
+	'In a terrifying universe of lost souls, in an era of lost souls, eight dancers fight evil.',
+	'In a galaxy of confusion and insanity, three martial artists and a duke battle a mob of psychics.',
+	'In an amazing kingdom, a wizard and a secretary hope to prevent the destruction of mankind.',
+	'In a kingdom of deception, a reporter searches for fame.',
+	'In a hellish empire, a swordswoman and a duke try to find the ultimate weapon and battle a conspiracy.',
+	'In an evil galaxy of illusion, in a time of technology and misery, seven psychiatrists battle crime.',
+	'In a dark city of confusion, three swordswomen and a singer battle lawlessness.',
+	'In an ominous empire, in an age of hate, two philosophers and a student try to find justice and battle a mob of mages intent on stealing the souls of the innocent.',
+	'In a kingdom of panic, six adventurers oppose lawlessness.',
+	'In a land of dreams and hopelessness, three hackers and a cyborg search for justice.',
+	'On a planet of mysticism, three travelers and a fire fighter quest for the ultimate weapon and oppose evil.',
+	'In a wicked universe, five seers fight lawlessness.',
+	'In a kingdom of death, in an era of illusion and blood, four colonists search for fame.',
+	'In an amazing kingdom, in an age of sorcery and lost souls, eight space pirates quest for freedom.',
+	'In a cursed empire, five inventors oppose terrorism.',
+	'On a crime-ridden planet of conspiracy, a watchman and an artificial intelligence try to find love and oppose lawlessness.',
+	'In a forgotten land, a reporter and a spy try to stop the apocalypse.',
+	'In a forbidden land of prophecy, a scientist and an archivist oppose a cabal of barbarians intent on stealing the souls of the innocent.',
+	'On an infernal world of illusion, a grave robber and a watchman try to find revenge and combat a syndicate of mages intent on stealing the source of all magic.',
+	'In a galaxy of dark magic, four fighters seek freedom.',
+	'In an empire of deception, six tomb-robbers quest for the ultimate weapon and combat an army of raiders.',
+	'In a kingdom of corruption and lost souls, in an age of panic, eight planetologists oppose evil.',
+	'In a galaxy of misery and hopelessness, in a time of agony and pain, five planetologists search for vengance.',
+	'In a universe of technology and insanity, in a time of sorcery, a computer techician quests for hope.',
+	'On a planet of dark magic and barbarism, in an age of horror and blasphemy, seven librarians search for fame.',
+	'In an empire of dark magic, in a time of blood and illusions, four monks try to find the ultimate weapon and combat terrorism.',
+	'In a forgotten empire of dark magic, six kings try to prevent the destruction of mankind.',
+	'In a galaxy of dark magic and horror, in an age of hopelessness, four marines and an outlaw combat evil.',
+	'In a mysterious city of illusion, in an age of computerization, a witch-hunter tries to find the ultimate weapon and opposes an evil corporation.',
+	'In a damned kingdom of technology, a virtual reality programmer and a fighter seek fame.',
+	'In a hellish kingdom, in an age of blasphemy and blasphemy, an astrologer searches for fame.',
+	'In a damned world of devils, an alien and a ranger quest for love and oppose a syndicate of demons.',
+	'In a cursed galaxy, in a time of pain, seven librarians hope to avert the apocalypse.',
+	'In a crime-infested galaxy, in an era of hopelessness and panic, three champions and a grave robber try to solve the ultimate crime.'
 ];
 
 
-module.exports = () => {
+module.exports = ()=>{
 	return `<style>
   .phb#p1{ text-align:center; }
   .phb#p1:after{ display:none; }
+  .phb#p2 { counter-reset:phb-page-numbers; }
+  .phb:nth-child(2n) .pageNumber { left: inherit !important; right: 2px !important; }
+  .phb:nth-child(2n+1) .pageNumber { right: inherit !important; left: 2px !important; }
+  .phb:nth-child(2n)::after { transform: scaleX(1); }
+  .phb:nth-child(2n+1)::after { transform: scaleX(-1); }
+  .phb:nth-child(2n) .footnote { left: inherit; text-align: right; }
+  .phb:nth-child(2n+1) .footnote { left: 80px; text-align: left; }
 </style>
 
 <div style='margin-top:450px;'></div>
@@ -113,5 +120,5 @@ module.exports = () => {
 ##### ${_.sample(subtitles)}
 </div>
 
-\\page`
-}
+\\page`;
+};

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

@@ -1,43 +1,43 @@
-var _ = require('lodash');
+const _ = require('lodash');
 
-var ClassFeatureGen = require('./classfeature.gen.js');
+const ClassFeatureGen = require('./classfeature.gen.js');
 
-var ClassTableGen = require('./classtable.gen.js');
+const ClassTableGen = require('./classtable.gen.js');
 
 module.exports = function(){
 
-	var classname = _.sample(['Archivist', 'Fancyman', 'Linguist', 'Fletcher',
-			'Notary', 'Berserker-Typist', 'Fishmongerer', 'Manicurist', 'Haberdasher', 'Concierge'])
+	const classname = _.sample(['Archivist', 'Fancyman', 'Linguist', 'Fletcher',
+		'Notary', 'Berserker-Typist', 'Fishmongerer', 'Manicurist', 'Haberdasher', 'Concierge']);
 
 
-	var image = _.sample(_.map([
-			"http://orig01.deviantart.net/4682/f/2007/099/f/c/bard_stick_figure_by_wrpigeek.png",
-			"http://img07.deviantart.net/a3c9/i/2007/099/3/a/archer_stick_figure_by_wrpigeek.png",
-			"http://pre04.deviantart.net/d596/th/pre/f/2007/099/5/2/adventurer_stick_figure_by_wrpigeek.png",
-			"http://img13.deviantart.net/d501/i/2007/099/d/4/black_mage_stick_figure_by_wrpigeek.png",
-			"http://img09.deviantart.net/5cf3/i/2007/099/d/d/dark_knight_stick_figure_by_wrpigeek.png",
-			"http://pre01.deviantart.net/7a34/th/pre/f/2007/099/6/3/monk_stick_figure_by_wrpigeek.png",
-			"http://img11.deviantart.net/5dcc/i/2007/099/d/1/mystic_knight_stick_figure_by_wrpigeek.png",
-			"http://pre08.deviantart.net/ad45/th/pre/f/2007/099/a/0/thief_stick_figure_by_wrpigeek.png",
-		], function(url){
-			return "<img src = '" + url + "' style='max-width:8cm;max-height:25cm' />"
-	}))
+	const image = _.sample(_.map([
+		'http://orig01.deviantart.net/4682/f/2007/099/f/c/bard_stick_figure_by_wrpigeek.png',
+		'http://img07.deviantart.net/a3c9/i/2007/099/3/a/archer_stick_figure_by_wrpigeek.png',
+		'http://pre04.deviantart.net/d596/th/pre/f/2007/099/5/2/adventurer_stick_figure_by_wrpigeek.png',
+		'http://img13.deviantart.net/d501/i/2007/099/d/4/black_mage_stick_figure_by_wrpigeek.png',
+		'http://img09.deviantart.net/5cf3/i/2007/099/d/d/dark_knight_stick_figure_by_wrpigeek.png',
+		'http://pre01.deviantart.net/7a34/th/pre/f/2007/099/6/3/monk_stick_figure_by_wrpigeek.png',
+		'http://img11.deviantart.net/5dcc/i/2007/099/d/1/mystic_knight_stick_figure_by_wrpigeek.png',
+		'http://pre08.deviantart.net/ad45/th/pre/f/2007/099/a/0/thief_stick_figure_by_wrpigeek.png',
+	], function(url){
+		return `<img src = '${url}' style='max-width:8cm;max-height:25cm' />`;
+	}));
 
 
-	return [
+	return `${[
 		image,
-		"",
-		"```",
-		"```",
-		"<div style='margin-top:240px'></div>\n\n",
-		"## " + classname,
-		"Cool intro stuff will go here",
+		'',
+		'```',
+		'```',
+		'<div style=\'margin-top:240px\'></div>\n\n',
+		`## ${classname}`,
+		'Cool intro stuff will go here',
 
-		"\\page",
+		'\\page',
 		ClassTableGen(classname),
 		ClassFeatureGen(classname),
 
 
 
-	].join('\n') + '\n\n\n';
+	].join('\n')}\n\n\n`;
 };

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

@@ -1,60 +1,60 @@
-var _ = require('lodash');
+const _ = require('lodash');
 
-var spellNames = [
-	"Astral Rite of Acne",
-	"Create Acne",
-	"Cursed Ramen Erruption",
-	"Dark Chant of the Dentists",
-	"Erruption of Immaturity",
-	"Flaming Disc of Inconvenience",
-	"Heal Bad Hygene",
-	"Heavenly Transfiguration of the Cream Devil",
-	"Hellish Cage of Mucus",
-	"Irritate Peanut Butter Fairy",
-	"Luminous Erruption of Tea",
-	"Mystic Spell of the Poser",
-	"Sorcerous Enchantment of the Chimneysweep",
-	"Steak Sauce Ray",
-	"Talk to Groupie",
-	"Astonishing Chant of Chocolate",
-	"Astounding Pasta Puddle",
-	"Ball of Annoyance",
-	"Cage of Yarn",
-	"Control Noodles Elemental",
-	"Create Nervousness",
-	"Cure Baldness",
-	"Cursed Ritual of Bad Hair",
-	"Dispell Piles in Dentist",
-	"Eliminate Florists",
-	"Illusionary Transfiguration of the Babysitter",
-	"Necromantic Armor of Salad Dressing",
-	"Occult Transfiguration of Foot Fetish",
-	"Protection from Mucus Giant",
-	"Tinsel Blast",
-	"Alchemical Evocation of the Goths",
-	"Call Fangirl",
-	"Divine Spell of Crossdressing",
-	"Dominate Ramen Giant",
-	"Eliminate Vindictiveness in Gym Teacher",
-	"Extra-Planar Spell of Irritation",
-	"Induce Whining in Babysitter",
-	"Invoke Complaining",
-	"Magical Enchantment of Arrogance",
-	"Occult Globe of Salad Dressing",
-	"Overwhelming Enchantment of the Chocolate Fairy",
-	"Sorcerous Dandruff Globe",
-	"Spiritual Invocation of the Costumers",
-	"Ultimate Rite of the Confetti Angel",
-	"Ultimate Ritual of Mouthwash",
+const spellNames = [
+	'Astral Rite of Acne',
+	'Create Acne',
+	'Cursed Ramen Erruption',
+	'Dark Chant of the Dentists',
+	'Erruption of Immaturity',
+	'Flaming Disc of Inconvenience',
+	'Heal Bad Hygene',
+	'Heavenly Transfiguration of the Cream Devil',
+	'Hellish Cage of Mucus',
+	'Irritate Peanut Butter Fairy',
+	'Luminous Erruption of Tea',
+	'Mystic Spell of the Poser',
+	'Sorcerous Enchantment of the Chimneysweep',
+	'Steak Sauce Ray',
+	'Talk to Groupie',
+	'Astonishing Chant of Chocolate',
+	'Astounding Pasta Puddle',
+	'Ball of Annoyance',
+	'Cage of Yarn',
+	'Control Noodles Elemental',
+	'Create Nervousness',
+	'Cure Baldness',
+	'Cursed Ritual of Bad Hair',
+	'Dispell Piles in Dentist',
+	'Eliminate Florists',
+	'Illusionary Transfiguration of the Babysitter',
+	'Necromantic Armor of Salad Dressing',
+	'Occult Transfiguration of Foot Fetish',
+	'Protection from Mucus Giant',
+	'Tinsel Blast',
+	'Alchemical Evocation of the Goths',
+	'Call Fangirl',
+	'Divine Spell of Crossdressing',
+	'Dominate Ramen Giant',
+	'Eliminate Vindictiveness in Gym Teacher',
+	'Extra-Planar Spell of Irritation',
+	'Induce Whining in Babysitter',
+	'Invoke Complaining',
+	'Magical Enchantment of Arrogance',
+	'Occult Globe of Salad Dressing',
+	'Overwhelming Enchantment of the Chocolate Fairy',
+	'Sorcerous Dandruff Globe',
+	'Spiritual Invocation of the Costumers',
+	'Ultimate Rite of the Confetti Angel',
+	'Ultimate Ritual of Mouthwash',
 ];
 
 module.exports = {
 
 	spellList : function(){
-		var levels = ['Cantrips (0 Level)', '2nd Level', '3rd Level', '4th Level', '5th Level', '6th Level', '7th Level', '8th Level', '9th Level'];
+		const levels = ['Cantrips (0 Level)', '2nd Level', '3rd Level', '4th Level', '5th Level', '6th Level', '7th Level', '8th Level', '9th Level'];
 
-		var content = _.map(levels, (level)=>{
-			var spells = _.map(_.sampleSize(spellNames, _.random(5, 15)), (spell)=>{
+		const content = _.map(levels, (level)=>{
+			const spells = _.map(_.sampleSize(spellNames, _.random(5, 15)), (spell)=>{
 				return `- ${spell}`;
 			}).join('\n');
 			return `##### ${level} \n${spells} \n`;
@@ -64,28 +64,28 @@ module.exports = {
 	},
 
 	spell : function(){
-		var level = ["1st", "2nd", "3rd", "4th", "5th", "6th", "7th", "8th", "9th"];
-		var spellSchools = ["abjuration", "conjuration", "divination", "enchantment", "evocation", "illusion", "necromancy", "transmutation"];
+		const level = ['1st', '2nd', '3rd', '4th', '5th', '6th', '7th', '8th', '9th'];
+		const spellSchools = ['abjuration', 'conjuration', 'divination', 'enchantment', 'evocation', 'illusion', 'necromancy', 'transmutation'];
 
 
-		var components = _.sampleSize(["V", "S", "M"], _.random(1,3)).join(', ');
-		if(components.indexOf("M") !== -1){
-			components += " (" +  _.sampleSize(['a small doll', 'a crushed button worth at least 1cp', 'discarded gum wrapper'], _.random(1,3)).join(', ') + ")"
+		let components = _.sampleSize(['V', 'S', 'M'], _.random(1, 3)).join(', ');
+		if(components.indexOf('M') !== -1){
+			components += ` (${_.sampleSize(['a small doll', 'a crushed button worth at least 1cp', 'discarded gum wrapper'], _.random(1, 3)).join(', ')})`;
 		}
 
 		return [
-			"#### " + _.sample(spellNames),
-			"*" + _.sample(level) + "-level " + _.sample(spellSchools) + "*",
-			"___",
-			"- **Casting Time:** 1 action",
-			"- **Range:** " + _.sample(["Self", "Touch", "30 feet", "60 feet"]),
-			"- **Components:** " + components,
-			"- **Duration:** " + _.sample(["Until dispelled", "1 round", "Instantaneous", "Concentration, up to 10 minutes", "1 hour"]),
-			"",
-			"A flame, equivalent in brightness to a torch, springs from from an object that you touch. ",
-			"The effect look like a regular flame, but it creates no heat and doesn't use oxygen. ",
-			"A *continual flame* can be covered or hidden but not smothered or quenched.",
-			"\n\n\n"
+			`#### ${_.sample(spellNames)}`,
+			`*${_.sample(level)}-level ${_.sample(spellSchools)}*`,
+			'___',
+			'- **Casting Time:** 1 action',
+			`- **Range:** ${_.sample(['Self', 'Touch', '30 feet', '60 feet'])}`,
+			`- **Components:** ${components}`,
+			`- **Duration:** ${_.sample(['Until dispelled', '1 round', 'Instantaneous', 'Concentration, up to 10 minutes', '1 hour'])}`,
+			'',
+			'A flame, equivalent in brightness to a torch, springs from from an object that you touch. ',
+			'The effect look like a regular flame, but it creates no heat and doesn\'t use oxygen. ',
+			'A *continual flame* can be covered or hidden but not smothered or quenched.',
+			'\n\n\n'
 		].join('\n');
 	}
-}
+};

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

@@ -1,196 +1,200 @@
-var _ = require('lodash');
-
-var genList = function(list, max){
-	return _.sampleSize(list, _.random(0,max)).join(', ') || "None";
-}
-
-var getMonsterName = function(){
-	return _.sample([
-		"All-devouring Baseball Imp",
-		"All-devouring Gumdrop Wraith",
-		"Chocolate Hydra",
-		"Devouring Peacock",
-		"Economy-sized Colossus of the Lemonade Stand",
-		"Ghost Pigeon",
-		"Gibbering Duck",
-		"Sparklemuffin Peacock Spider",
-		"Gum Elemental",
-		"Illiterate Construct of the Candy Store",
-		"Ineffable Chihuahua",
-		"Irritating Death Hamster",
-		"Irritating Gold Mouse",
-		"Juggernaut Snail",
-		"Juggernaut of the Sock Drawer",
-		"Koala of the Cosmos",
-		"Mad Koala of the West",
-		"Milk Djinni of the Lemonade Stand",
-		"Mind Ferret",
-		"Mystic Salt Spider",
-		"Necrotic Halitosis Angel",
-		"Pinstriped Famine Sheep",
-		"Ritalin Leech",
-		"Shocker Kangaroo",
-		"Stellar Tennis Juggernaut",
-		"Wailing Quail of the Sun",
-		"Angel Pigeon",
-		"Anime Sphinx",
-		"Bored Avalanche Sheep of the Wasteland",
-		"Devouring Nougat Sphinx of the Sock Drawer",
-		"Djinni of the Footlocker",
-		"Ectoplasmic Jazz Devil",
-		"Flatuent Angel",
-		"Gelatinous Duck of the Dream-Lands",
-		"Gelatinous Mouse",
-		"Golem of the Footlocker",
-		"Lich Wombat",
-		"Mechanical Sloth of the Past",
-		"Milkshake Succubus",
-		"Puffy Bone Peacock of the East",
-		"Rainbow Manatee",
-		"Rune Parrot",
-		"Sand Cow",
-		"Sinister Vanilla Dragon",
-		"Snail of the North",
-		"Spider of the Sewer",
-		"Stellar Sawdust Leech",
-		"Storm Anteater of Hell",
-		"Stupid Spirit of the Brewery",
-		"Time Kangaroo",
-		"Tomb Poodle",
-	]);
-}
-
-var getType = function(){
-	return _.sample(['Tiny', 'Small', 'Medium', 'Large', 'Gargantuan', 'Stupidly vast']) + " " + _.sample(['beast', 'fiend', 'annoyance', 'guy', 'cutie'])
-}
-
-var getAlignment = function(){
-	return _.sample([
-		"annoying evil",
-		"chaotic gossipy",
-		"chaotic sloppy",
-		"depressed neutral",
-		"lawful bogus",
-		"lawful coy",
-		"manic-depressive evil",
-		"narrow-minded neutral",
-		"neutral annoying",
-		"neutral ignorant",
-		"oedpipal neutral",
-		"silly neutral",
-		"unoriginal neutral",
-		"weird neutral",
-		"wordy evil",
-		"unaligned"
-	]);
-};
-
-var getStats = function(){
-	return '>|' + _.times(6, function(){
-		var num = _.random(1,20);
-		var mod = Math.ceil(num/2 - 5)
-		return num + " (" + (mod >= 0 ? '+'+mod : mod ) + ")"
-	}).join('|') + '|';
-}
-
-var genAbilities = function(){
-	return _.sample([
-		"> ***Pack Tactics.*** These guys work together. Like super well, you don't even know.",
-		"> ***False Appearance. *** While the armor reamin motionless, it is indistinguishable from a normal suit of armor.",
-	]);
-}
-
-var genAction = function(){
-	var name = _.sample([
-		"Abdominal Drop",
-		"Airplane Hammer",
-		"Atomic Death Throw",
-		"Bulldog Rake",
-		"Corkscrew Strike",
-		"Crossed Splash",
-		"Crossface Suplex",
-		"DDT Powerbomb",
-		"Dual Cobra Wristlock",
-		"Dual Throw",
-		"Elbow Hold",
-		"Gory Body Sweep",
-		"Heel Jawbreaker",
-		"Jumping Driver",
-		"Open Chin Choke",
-		"Scorpion Flurry",
-		"Somersault Stump Fists",
-		"Suffering Wringer",
-		"Super Hip Submission",
-		"Super Spin",
-		"Team Elbow",
-		"Team Foot",
-		"Tilt-a-whirl Chin Sleeper",
-		"Tilt-a-whirl Eye Takedown",
-		"Turnbuckle Roll"
-	])
-
-	return "> ***" + name + ".*** *Melee Weapon Attack:* +4 to hit, reach 5ft., one target. *Hit* 5 (1d6 + 2) ";
-}
-
-
-module.exports = {
-
-	full : function(){
-		return [
-			"___",
-			"___",
-			"> ## " + getMonsterName(),
-			">*" + getType() + ", " + getAlignment() + "*",
-			"> ___",
-			"> - **Armor Class** " + _.random(10,20),
-			"> - **Hit Points** " + _.random(1, 150) + "(1d4 + 5)",
-			"> - **Speed** " + _.random(0,50) + "ft.",
-			">___",
-			">|STR|DEX|CON|INT|WIS|CHA|",
-			">|:---:|:---:|:---:|:---:|:---:|:---:|",
-			getStats(),
-			">___",
-			"> - **Condition Immunities** " + genList(["groggy", "swagged", "weak-kneed", "buzzed", "groovy", "melancholy", "drunk"], 3),
-			"> - **Senses** passive Perception " + _.random(3, 20),
-			"> - **Languages** " + genList(["Common", "Pottymouth", "Gibberish", "Latin", "Jive"], 2),
-			"> - **Challenge** " + _.random(0, 15) + " (" + _.random(10,10000)+ " XP)",
-			"> ___",
-			_.times(_.random(3,6), function(){
-				return genAbilities()
-			}).join('\n>\n'),
-			"> ### Actions",
-			_.times(_.random(4,6), function(){
-				return genAction()
-			}).join('\n>\n'),
-		].join('\n') + '\n\n\n';
-	},
-
-	half : function(){
-		return [
-			"___",
-			"> ## " + getMonsterName(),
-			">*" + getType() + ", " + getAlignment() + "*",
-			"> ___",
-			"> - **Armor Class** " + _.random(10,20),
-			"> - **Hit Points** " + _.random(1, 150) + "(1d4 + 5)",
-			"> - **Speed** " + _.random(0,50) + "ft.",
-			">___",
-			">|STR|DEX|CON|INT|WIS|CHA|",
-			">|:---:|:---:|:---:|:---:|:---:|:---:|",
-			getStats(),
-			">___",
-			"> - **Condition Immunities** " + genList(["groggy", "swagged", "weak-kneed", "buzzed", "groovy", "melancholy", "drunk"], 3),
-			"> - **Senses** passive Perception " + _.random(3, 20),
-			"> - **Languages** " + genList(["Common", "Pottymouth", "Gibberish", "Latin", "Jive"], 2),
-			"> - **Challenge** " + _.random(0, 15) + " (" + _.random(10,10000)+ " XP)",
-			"> ___",
-			_.times(_.random(0,2), function(){
-				return genAbilities()
-			}).join('\n>\n'),
-			"> ### Actions",
-			_.times(_.random(1,2), function(){
-				return genAction()
-			}).join('\n>\n'),
-		].join('\n') + '\n\n\n';
-	}
-}
+const _ = require('lodash');
+
+const genList = function(list, max){
+	return _.sampleSize(list, _.random(0, max)).join(', ') || 'None';
+};
+
+const getMonsterName = function(){
+	return _.sample([
+		'All-devouring Baseball Imp',
+		'All-devouring Gumdrop Wraith',
+		'Chocolate Hydra',
+		'Devouring Peacock',
+		'Economy-sized Colossus of the Lemonade Stand',
+		'Ghost Pigeon',
+		'Gibbering Duck',
+		'Sparklemuffin Peacock Spider',
+		'Gum Elemental',
+		'Illiterate Construct of the Candy Store',
+		'Ineffable Chihuahua',
+		'Irritating Death Hamster',
+		'Irritating Gold Mouse',
+		'Juggernaut Snail',
+		'Juggernaut of the Sock Drawer',
+		'Koala of the Cosmos',
+		'Mad Koala of the West',
+		'Milk Djinni of the Lemonade Stand',
+		'Mind Ferret',
+		'Mystic Salt Spider',
+		'Necrotic Halitosis Angel',
+		'Pinstriped Famine Sheep',
+		'Ritalin Leech',
+		'Shocker Kangaroo',
+		'Stellar Tennis Juggernaut',
+		'Wailing Quail of the Sun',
+		'Angel Pigeon',
+		'Anime Sphinx',
+		'Bored Avalanche Sheep of the Wasteland',
+		'Devouring Nougat Sphinx of the Sock Drawer',
+		'Djinni of the Footlocker',
+		'Ectoplasmic Jazz Devil',
+		'Flatuent Angel',
+		'Gelatinous Duck of the Dream-Lands',
+		'Gelatinous Mouse',
+		'Golem of the Footlocker',
+		'Lich Wombat',
+		'Mechanical Sloth of the Past',
+		'Milkshake Succubus',
+		'Puffy Bone Peacock of the East',
+		'Rainbow Manatee',
+		'Rune Parrot',
+		'Sand Cow',
+		'Sinister Vanilla Dragon',
+		'Snail of the North',
+		'Spider of the Sewer',
+		'Stellar Sawdust Leech',
+		'Storm Anteater of Hell',
+		'Stupid Spirit of the Brewery',
+		'Time Kangaroo',
+		'Tomb Poodle',
+	]);
+};
+
+const getType = function(){
+	return `${_.sample(['Tiny', 'Small', 'Medium', 'Large', 'Gargantuan', 'Stupidly vast'])} ${_.sample(['beast', 'fiend', 'annoyance', 'guy', 'cutie'])}`;
+};
+
+const getAlignment = function(){
+	return _.sample([
+		'annoying evil',
+		'chaotic gossipy',
+		'chaotic sloppy',
+		'depressed neutral',
+		'lawful bogus',
+		'lawful coy',
+		'manic-depressive evil',
+		'narrow-minded neutral',
+		'neutral annoying',
+		'neutral ignorant',
+		'oedpipal neutral',
+		'silly neutral',
+		'unoriginal neutral',
+		'weird neutral',
+		'wordy evil',
+		'unaligned'
+	]);
+};
+
+const getStats = function(){
+	return `>|${_.times(6, function(){
+		const num = _.random(1, 20);
+		const mod = Math.ceil(num/2 - 5);
+		return `${num} (${mod >= 0 ? `+${mod}` : mod})`;
+	}).join('|')}|`;
+};
+
+const genAbilities = function(){
+	return _.sample([
+		'> ***Pack Tactics.*** These guys work together. Like super well, you don\'t even know.',
+		'> ***Fowl Appearance.*** While the creature remains motionless, it is indistinguishable from a normal chicken.',
+		'> ***Onion Stench.*** Any creatures within 5 feet of this thing develops an irrational craving for onion rings.',
+		'> ***Enormous Nose.*** This creature gains advantage on any check involving putting things in its nose.',
+		'> ***Sassiness.*** When questioned, this creature will talk back instead of answering.',
+		'> ***Big Jerk.*** Thinks he is just *waaaay* better than you.',
+	]);
+};
+
+const genAction = function(){
+	const name = _.sample([
+		'Abdominal Drop',
+		'Airplane Hammer',
+		'Atomic Death Throw',
+		'Bulldog Rake',
+		'Corkscrew Strike',
+		'Crossed Splash',
+		'Crossface Suplex',
+		'DDT Powerbomb',
+		'Dual Cobra Wristlock',
+		'Dual Throw',
+		'Elbow Hold',
+		'Gory Body Sweep',
+		'Heel Jawbreaker',
+		'Jumping Driver',
+		'Open Chin Choke',
+		'Scorpion Flurry',
+		'Somersault Stump Fists',
+		'Suffering Wringer',
+		'Super Hip Submission',
+		'Super Spin',
+		'Team Elbow',
+		'Team Foot',
+		'Tilt-a-whirl Chin Sleeper',
+		'Tilt-a-whirl Eye Takedown',
+		'Turnbuckle Roll'
+	]);
+
+	return `> ***${name}.*** *Melee Weapon Attack:* +4 to hit, reach 5ft., one target. *Hit* 5 (1d6 + 2) `;
+};
+
+
+module.exports = {
+
+	full : function(){
+		return `${[
+			'___',
+			'___',
+			`> ## ${getMonsterName()}`,
+			`>*${getType()}, ${getAlignment()}*`,
+			'> ___',
+			`> - **Armor Class** ${_.random(10, 20)}`,
+			`> - **Hit Points** ${_.random(1, 150)}(1d4 + 5)`,
+			`> - **Speed** ${_.random(0, 50)}ft.`,
+			'>___',
+			'>|STR|DEX|CON|INT|WIS|CHA|',
+			'>|:---:|:---:|:---:|:---:|:---:|:---:|',
+			getStats(),
+			'>___',
+			`> - **Condition Immunities** ${genList(['groggy', 'swagged', 'weak-kneed', 'buzzed', 'groovy', 'melancholy', 'drunk'], 3)}`,
+			`> - **Senses** passive Perception ${_.random(3, 20)}`,
+			`> - **Languages** ${genList(['Common', 'Pottymouth', 'Gibberish', 'Latin', 'Jive'], 2)}`,
+			`> - **Challenge** ${_.random(0, 15)} (${_.random(10, 10000)} XP)`,
+			'> ___',
+			_.times(_.random(3, 6), function(){
+				return genAbilities();
+			}).join('\n>\n'),
+			'> ### Actions',
+			_.times(_.random(4, 6), function(){
+				return genAction();
+			}).join('\n>\n'),
+		].join('\n')}\n\n\n`;
+	},
+
+	half : function(){
+		return `${[
+			'___',
+			`> ## ${getMonsterName()}`,
+			`>*${getType()}, ${getAlignment()}*`,
+			'> ___',
+			`> - **Armor Class** ${_.random(10, 20)}`,
+			`> - **Hit Points** ${_.random(1, 150)}(1d4 + 5)`,
+			`> - **Speed** ${_.random(0, 50)}ft.`,
+			'>___',
+			'>|STR|DEX|CON|INT|WIS|CHA|',
+			'>|:---:|:---:|:---:|:---:|:---:|:---:|',
+			getStats(),
+			'>___',
+			`> - **Condition Immunities** ${genList(['groggy', 'swagged', 'weak-kneed', 'buzzed', 'groovy', 'melancholy', 'drunk'], 3)}`,
+			`> - **Senses** passive Perception ${_.random(3, 20)}`,
+			`> - **Languages** ${genList(['Common', 'Pottymouth', 'Gibberish', 'Latin', 'Jive'], 2)}`,
+			`> - **Challenge** ${_.random(0, 15)} (${_.random(10, 10000)} XP)`,
+			'> ___',
+			_.times(_.random(2, 3), function(){
+				return genAbilities();
+			}).join('\n>\n'),
+			'> ### Actions',
+			_.times(_.random(1, 2), function(){
+				return genAction();
+			}).join('\n>\n'),
+		].join('\n')}\n\n\n`;
+	}
+};

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

@@ -1,80 +1,81 @@
-var MagicGen = require('./magic.gen.js');
-var ClassTableGen = require('./classtable.gen.js');
-var MonsterBlockGen = require('./monsterblock.gen.js');
-var ClassFeatureGen = require('./classfeature.gen.js');
-var FullClassGen = require('./fullclass.gen.js');
-var CoverPageGen = require('./coverpage.gen.js');
-var TableOfContentsGen = require('./tableOfContents.gen.js');
+/* eslint-disable max-lines */
+
+const MagicGen = require('./magic.gen.js');
+const ClassTableGen = require('./classtable.gen.js');
+const MonsterBlockGen = require('./monsterblock.gen.js');
+const ClassFeatureGen = require('./classfeature.gen.js');
+const CoverPageGen = require('./coverpage.gen.js');
+const TableOfContentsGen = require('./tableOfContents.gen.js');
 
 
 module.exports = [
 
 	{
 		groupName : 'Editor',
-		icon : 'fa-pencil',
-		snippets : [
+		icon      : 'fa-pencil',
+		snippets  : [
 			{
-				name : "Column Break",
+				name : 'Column Break',
 				icon : 'fa-columns',
-				gen : "```\n```\n\n"
+				gen  : '```\n```\n\n'
 			},
 			{
-				name : "New Page",
+				name : 'New Page',
 				icon : 'fa-file-text',
-				gen : "\\page\n\n"
+				gen  : '\\page\n\n'
 			},
 			{
-				name : "Vertical Spacing",
+				name : 'Vertical Spacing',
 				icon : 'fa-arrows-v',
-				gen : "<div style='margin-top:140px'></div>\n\n"
+				gen  : '<div style=\'margin-top:140px\'></div>\n\n'
 			},
 			{
-				name : "Wide Block",
+				name : 'Wide Block',
 				icon : 'fa-arrows-h',
-				gen : "<div class='wide'>\nEverything in here will be extra wide. Tables, text, everything! Beware though, CSS columns can behave a bit weird sometimes.\n</div>\n"
+				gen  : '<div class=\'wide\'>\nEverything in here will be extra wide. Tables, text, everything! Beware though, CSS columns can behave a bit weird sometimes.\n</div>\n'
 			},
 			{
-				name : "Image",
+				name : 'Image',
 				icon : 'fa-image',
-				gen : [
-					"<img ",
-					"  src='https://s-media-cache-ak0.pinimg.com/736x/4a/81/79/4a8179462cfdf39054a418efd4cb743e.jpg' ",
-					"  style='width:325px' />",
-					"Credit: Kyounghwan Kim"
+				gen  : [
+					'<img ',
+					'  src=\'https://s-media-cache-ak0.pinimg.com/736x/4a/81/79/4a8179462cfdf39054a418efd4cb743e.jpg\' ',
+					'  style=\'width:325px\' />',
+					'Credit: Kyounghwan Kim'
 				].join('\n')
 			},
 			{
-				name : "Background Image",
+				name : 'Background Image',
 				icon : 'fa-tree',
-				gen : [
-					"<img ",
-					"  src='http://i.imgur.com/hMna6G0.png' ",
-					"  style='position:absolute; top:50px; right:30px; width:280px' />"
+				gen  : [
+					'<img ',
+					'  src=\'http://i.imgur.com/hMna6G0.png\' ',
+					'  style=\'position:absolute; top:50px; right:30px; width:280px\' />'
 				].join('\n')
 			},
 
 			{
-				name : "Page Number",
+				name : 'Page Number',
 				icon : 'fa-bookmark',
-				gen : "<div class='pageNumber'>1</div>\n<div class='footnote'>PART 1 | FANCINESS</div>\n\n"
+				gen  : '<div class=\'pageNumber\'>1</div>\n<div class=\'footnote\'>PART 1 | FANCINESS</div>\n\n'
 			},
 
 			{
-				name : "Auto-incrementing Page Number",
+				name : 'Auto-incrementing Page Number',
 				icon : 'fa-sort-numeric-asc',
-				gen : "<div class='pageNumber auto'></div>\n"
+				gen  : '<div class=\'pageNumber auto\'></div>\n'
 			},
 
 			{
-				name : "Link to page",
+				name : 'Link to page',
 				icon : 'fa-link',
-				gen : "[Click here](#p3) to go to page 3\n"
+				gen  : '[Click here](#p3) to go to page 3\n'
 			},
 
 			{
-				name : "Table of Contents",
+				name : 'Table of Contents',
 				icon : 'fa-book',
-				gen : TableOfContentsGen
+				gen  : TableOfContentsGen
 			},
 
 
@@ -86,63 +87,63 @@ module.exports = [
 
 	{
 		groupName : 'PHB',
-		icon : 'fa-book',
-		snippets : [
+		icon      : 'fa-book',
+		snippets  : [
 			{
 				name : 'Spell',
 				icon : 'fa-magic',
-				gen : MagicGen.spell,
+				gen  : MagicGen.spell,
 			},
 			{
 				name : 'Spell List',
 				icon : 'fa-list',
-				gen : MagicGen.spellList,
+				gen  : MagicGen.spellList,
 			},
 			{
 				name : 'Class Feature',
 				icon : 'fa-trophy',
-				gen : ClassFeatureGen,
+				gen  : ClassFeatureGen,
 			},
 			{
 				name : 'Note',
 				icon : 'fa-sticky-note',
-				gen : function(){
+				gen  : function(){
 					return [
-						"> ##### Time to Drop Knowledge",
-						"> Use notes to point out some interesting information. ",
-						"> ",
-						"> **Tables and lists** both work within a note."
+						'> ##### Time to Drop Knowledge',
+						'> Use notes to point out some interesting information. ',
+						'> ',
+						'> **Tables and lists** both work within a note.'
 					].join('\n');
 				},
 			},
 			{
 				name : 'Descriptive Text Box',
 				icon : 'fa-sticky-note-o',
-				gen : function(){
+				gen  : function(){
 					return [
-						"<div class='descriptive'>",
-						"##### Time to Drop Knowledge",
-						"Use notes to point out some interesting information. ",
-						"",
-						"**Tables and lists** both work within a note.",
-						"</div>"
+						'<div class=\'descriptive\'>',
+						'##### Time to Drop Knowledge',
+						'Use notes to point out some interesting information. ',
+						'',
+						'**Tables and lists** both work within a note.',
+						'</div>'
 					].join('\n');
 				},
 			},
 			{
 				name : 'Monster Stat Block',
 				icon : 'fa-bug',
-				gen : MonsterBlockGen.half,
+				gen  : MonsterBlockGen.half,
 			},
 			{
 				name : 'Wide Monster Stat Block',
 				icon : 'fa-paw',
-				gen : MonsterBlockGen.full,
+				gen  : MonsterBlockGen.full,
 			},
 			{
 				name : 'Cover Page',
 				icon : 'fa-file-word-o',
-				gen : CoverPageGen,
+				gen  : CoverPageGen,
 			},
 		]
 	},
@@ -153,77 +154,77 @@ module.exports = [
 
 	{
 		groupName : 'Tables',
-		icon : 'fa-table',
-		snippets : [
+		icon      : 'fa-table',
+		snippets  : [
 			{
-				name : "Class Table",
+				name : 'Class Table',
 				icon : 'fa-table',
-				gen : ClassTableGen.full,
+				gen  : ClassTableGen.full,
 			},
 			{
-				name : "Half Class Table",
+				name : 'Half Class Table',
 				icon : 'fa-list-alt',
-				gen : ClassTableGen.half,
+				gen  : ClassTableGen.half,
 			},
 			{
 				name : 'Table',
 				icon : 'fa-th-list',
-				gen : function(){
+				gen  : function(){
 					return [
-						"##### Cookie Tastiness",
-						"| Tastiness | Cookie Type |",
-						"|:----:|:-------------|",
-						"| -5  | Raisin |",
-						"| 8th  | Chocolate Chip |",
-						"| 11th | 2 or lower |",
-						"| 14th | 3 or lower |",
-						"| 17th | 4 or lower |\n\n",
+						'##### Cookie Tastiness',
+						'| Tastiness | Cookie Type |',
+						'|:----:|:-------------|',
+						'| -5  | Raisin |',
+						'| 8th  | Chocolate Chip |',
+						'| 11th | 2 or lower |',
+						'| 14th | 3 or lower |',
+						'| 17th | 4 or lower |\n\n',
 					].join('\n');
 				},
 			},
 			{
 				name : 'Wide Table',
 				icon : 'fa-list',
-				gen : function(){
+				gen  : function(){
 					return [
-						"<div class='wide'>",
-						"##### Cookie Tastiness",
-						"| Tastiness | Cookie Type |",
-						"|:----:|:-------------|",
-						"| -5  | Raisin |",
-						"| 8th  | Chocolate Chip |",
-						"| 11th | 2 or lower |",
-						"| 14th | 3 or lower |",
-						"| 17th | 4 or lower |",
-						"</div>\n\n"
+						'<div class=\'wide\'>',
+						'##### Cookie Tastiness',
+						'| Tastiness | Cookie Type |',
+						'|:----:|:-------------|',
+						'| -5  | Raisin |',
+						'| 8th  | Chocolate Chip |',
+						'| 11th | 2 or lower |',
+						'| 14th | 3 or lower |',
+						'| 17th | 4 or lower |',
+						'</div>\n\n'
 					].join('\n');
 				},
 			},
 			{
 				name : 'Split Table',
 				icon : 'fa-th-large',
-				gen : function(){
-						return [
-						"<div style='column-count:2'>",
-						"| d10 | Damage Type |",
-						"|:---:|:------------|",
-						"|  1  | Acid        |",
-						"|  2  | Cold        |",
-						"|  3  | Fire        |",
-						"|  4  | Force       |",
-						"|  5  | Lightning   |",
-						"",
-						"```",
-						"```",
-						"",
-						"| d10 | Damage Type |",
-						"|:---:|:------------|",
-						"|  6  | Necrotic    |",
-						"|  7  | Poison      |",
-						"|  8  | Psychic     |",
-						"|  9  | Radiant     |",
-						"|  10 | Thunder     |",
-						"</div>\n\n",
+				gen  : function(){
+					return [
+						'<div style=\'column-count:2\'>',
+						'| d10 | Damage Type |',
+						'|:---:|:------------|',
+						'|  1  | Acid        |',
+						'|  2  | Cold        |',
+						'|  3  | Fire        |',
+						'|  4  | Force       |',
+						'|  5  | Lightning   |',
+						'',
+						'```',
+						'```',
+						'',
+						'| d10 | Damage Type |',
+						'|:---:|:------------|',
+						'|  6  | Necrotic    |',
+						'|  7  | Poison      |',
+						'|  8  | Psychic     |',
+						'|  9  | Radiant     |',
+						'|  10 | Thunder     |',
+						'</div>\n\n',
 					].join('\n');
 				},
 			}
@@ -237,12 +238,12 @@ module.exports = [
 
 	{
 		groupName : 'Print',
-		icon : 'fa-print',
-		snippets : [
+		icon      : 'fa-print',
+		snippets  : [
 			{
-				name : "A4 PageSize",
+				name : 'A4 PageSize',
 				icon : 'fa-file-o',
-				gen : ['<style>',
+				gen  : ['<style>',
 					'  .phb{',
 					'    width : 210mm;',
 					'    height : 296.8mm;',
@@ -251,9 +252,9 @@ module.exports = [
 				].join('\n')
 			},
 			{
-				name : "Ink Friendly",
+				name : 'Ink Friendly',
 				icon : 'fa-tint',
-				gen : ['<style>',
+				gen  : ['<style>',
 					'  .phb{ background : white;}',
 					'  .phb img{ display : none;}',
 					'  .phb hr+blockquote{background : white;}',
@@ -264,4 +265,4 @@ module.exports = [
 		]
 	},
 
-]
+];

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

@@ -1,38 +1,38 @@
 const _ = require('lodash');
 
-const getTOC = (pages) => {
+const getTOC = (pages)=>{
 	const add1 = (title, page)=>{
 		res.push({
-			title : title,
-			page : page + 1,
+			title    : title,
+			page     : page + 1,
 			children : []
 		});
-	}
+	};
 	const add2 = (title, page)=>{
 		if(!_.last(res)) add1('', page);
 		_.last(res).children.push({
-			title : title,
-			page : page + 1,
+			title    : title,
+			page     : page + 1,
 			children : []
 		});
-	}
+	};
 	const add3 = (title, page)=>{
 		if(!_.last(res)) add1('', page);
 		if(!_.last(_.last(res).children)) add2('', page);
 		_.last(_.last(res).children).children.push({
-			title : title,
-			page : page + 1,
+			title    : title,
+			page     : page + 1,
 			children : []
 		});
-	}
+	};
 
-	let res = [];
+	const res = [];
 	_.each(pages, (page, pageNum)=>{
 		const lines = page.split('\n');
-		_.each(lines, (line) => {
+		_.each(lines, (line)=>{
 			if(_.startsWith(line, '# ')){
 				const title = line.replace('# ', '');
-				add1(title, pageNum)
+				add1(title, pageNum);
 			}
 			if(_.startsWith(line, '## ')){
 				const title = line.replace('## ', '');
@@ -42,21 +42,21 @@ const getTOC = (pages) => {
 				const title = line.replace('### ', '');
 				add3(title, pageNum);
 			}
-		})
+		});
 	});
 	return res;
-}
+};
 
 module.exports = function(brew){
 	const pages = brew.split('\\page');
 	const TOC = getTOC(pages);
 	const markdown = _.reduce(TOC, (r, g1, idx1)=>{
-		r.push(`- **[${idx1 + 1} ${g1.title}](#p${g1.page})**`)
+		r.push(`- **[${idx1 + 1} ${g1.title}](#p${g1.page})**`);
 		if(g1.children.length){
-			_.each(g1.children, (g2, idx2) => {
+			_.each(g1.children, (g2, idx2)=>{
 				r.push(`  - [${idx1 + 1}.${idx2 + 1} ${g2.title}](#p${g2.page})`);
 				if(g2.children.length){
-					_.each(g2.children, (g3, idx3) => {
+					_.each(g2.children, (g3, idx3)=>{
 						r.push(`    - [${idx1 + 1}.${idx2 + 1}.${idx3 + 1} ${g3.title}](#p${g3.page})`);
 					});
 				}
@@ -69,4 +69,4 @@ module.exports = function(brew){
 ##### Table Of Contents
 ${markdown}
 </div>\n`;
-}
+};

client/homebrew/homebrew.jsx

@@ -1,89 +1,69 @@
-const React = require('react');
-const _ = require('lodash');
-const cx = require('classnames');
-
-const CreateRouter = require('pico-router').createRouter;
-
-const HomePage = require('./pages/homePage/homePage.jsx');
-const EditPage = require('./pages/editPage/editPage.jsx');
-const UserPage = require('./pages/userPage/userPage.jsx');
-const SharePage = require('./pages/sharePage/sharePage.jsx');
-const NewPage = require('./pages/newPage/newPage.jsx');
-const ErrorPage = require('./pages/errorPage/errorPage.jsx');
-const PrintPage = require('./pages/printPage/printPage.jsx');
-
-let Router;
-const Homebrew = React.createClass({
-	getDefaultProps: function() {
-		return {
-			url : '',
-			welcomeText : '',
-			changelog : '',
-			version : '0.0.0',
-			account : null,
-			brew : {
-				title : '',
-				text : '',
-				shareId : null,
-				editId : null,
-				createdAt : null,
-				updatedAt : null,
-			}
-		};
-	},
-	componentWillMount: function() {
-		global.account = this.props.account;
-		global.version = this.props.version;
-
-
-		Router = CreateRouter({
-			'/edit/:id' : (args) => {
-				if(!this.props.brew.editId){
-					return <ErrorPage errorId={args.id}/>
-				}
-
-				return <EditPage
-					id={args.id}
-					brew={this.props.brew} />
-			},
-
-			'/share/:id' : (args) => {
-				if(!this.props.brew.shareId){
-					return <ErrorPage errorId={args.id}/>
-				}
-
-				return <SharePage
-					id={args.id}
-					brew={this.props.brew} />
-			},
-			'/user/:username' : (args) => {
-				return <UserPage
-					username={args.username}
-					brews={this.props.brews}
-				/>
-			},
-			'/print/:id' : (args, query) => {
-				return <PrintPage brew={this.props.brew} query={query}/>;
-			},
-			'/print' : (args, query) => {
-				return <PrintPage query={query}/>;
-			},
-			'/new' : (args) => {
-				return <NewPage />
-			},
-			'/changelog' : (args) => {
-				return <SharePage
-					brew={{title : 'Changelog', text : this.props.changelog}} />
-			},
-			'*' : <HomePage
-					welcomeText={this.props.welcomeText} />,
-		});
-	},
-	render : function(){
-		return <div className='homebrew'>
-			<Router initialUrl={this.props.url}/>
-		</div>
-	}
-});
-
-module.exports = Homebrew;
+require('./homebrew.less');
+const React = require('react');
+const createClass = require('create-react-class');
+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');
+const UserPage = require('./pages/userPage/userPage.jsx');
+const SharePage = require('./pages/sharePage/sharePage.jsx');
+const NewPage = require('./pages/newPage/newPage.jsx');
+//const ErrorPage = require('./pages/errorPage/errorPage.jsx');
+const PrintPage = require('./pages/printPage/printPage.jsx');
+
+const Homebrew = createClass({
+	getDefaultProps : function() {
+		return {
+			url         : '',
+			welcomeText : '',
+			changelog   : '',
+			version     : '0.0.0',
+			account     : null,
+			brew        : {
+				title     : '',
+				text      : '',
+				shareId   : null,
+				editId    : null,
+				createdAt : null,
+				updatedAt : null,
+			}
+		};
+	},
+	componentWillMount : function() {
+		global.account = this.props.account;
+		global.version = this.props.version;
+
+	},
+	render : function (){
+		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='/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='/new' exact component={NewPage}/>
+						<Route path='/changelog' exact component={()=><SharePage brew={{ title: 'Changelog', text: this.props.changelog }} />}/>
+						<Route path='/' component={()=><HomePage welcomeText={this.props.welcomeText}/>}/>
+					</Switch>
+				</div>
+			</Router>
+		);
+	}
+});
+
+module.exports = Homebrew;
+
+//TODO: Nicer Error page instead of just "cant get that"
+// 	'/share/:id' : (args)=>{
+// 		if(!this.props.brew.shareId){
+// 			return <ErrorPage errorId={args.id}/>;
+// 		}
+//
+// 		return <SharePage
+// 			id={args.id}
+// 			brew={this.props.brew} />;
+// 	},

client/homebrew/homebrew.less

@@ -1,4 +1,3 @@
-
 @import 'naturalcrit/styles/core.less';
 .homebrew{
 	height : 100%;
@@ -8,9 +7,9 @@
 		background-color : @steel;
 		flex-direction   : column;
 		.content{
-			position : relative;
-			height   : calc(~"100% - 29px"); //Navbar height
-			flex     : auto;
+			position   : relative;
+			height     : calc(~"100% - 29px"); //Navbar height
+			flex       : auto;
 		}
 	}
-}
+}

client/homebrew/navbar/account.navitem.jsx

@@ -1,17 +1,34 @@
-const React = require('react');
-const Nav = require('naturalcrit/nav/nav.jsx');
-
-module.exports = function(props){
-	if(global.account){
-		return <Nav.item href={`/user/${global.account.username}`} color='yellow' icon='fa-user'>
-			{global.account.username}
-		</Nav.item>
-	}
-	let url = '';
-	if(typeof window !== 'undefined'){
-		url = window.location.href
-	}
-	return <Nav.item href={`http://naturalcrit.com/login?redirect=${url}`} color='teal' icon='fa-sign-in'>
-		login
-	</Nav.item>
-};
+const React = require('react');
+const createClass = require('create-react-class');
+const Nav = require('naturalcrit/nav/nav.jsx');
+
+const Account = createClass({
+
+	getInitialState : function() {
+		return {
+			url : ''
+		};
+	},
+
+	componentDidMount : function(){
+		if(typeof window !== 'undefined'){
+			this.setState({
+				url : window.location.href
+			});
+		}
+	},
+
+	render : function(){
+		if(global.account){
+			return <Nav.item href={`/user/${global.account.username}`} color='yellow' icon='fa-user'>
+				{global.account.username}
+			</Nav.item>;
+		}
+
+		return <Nav.item href={`http://naturalcrit.com/login?redirect=${this.state.url}`} color='teal' icon='fa-sign-in'>
+			login
+		</Nav.item>;
+	}
+});
+
+module.exports = Account;

client/homebrew/navbar/editTitle.navitem.jsx

@@ -1,33 +1,33 @@
-var React = require('react');
-var _ = require('lodash');
-var cx = require('classnames');
-var Nav = require('naturalcrit/nav/nav.jsx');
-
-const MAX_TITLE_LENGTH = 50;
-
-
-var EditTitle = React.createClass({
-	getDefaultProps: function() {
-		return {
-			title : '',
-			onChange : function(){}
-		};
-	},
-
-	handleChange : function(e){
-		if(e.target.value.length > MAX_TITLE_LENGTH) return;
-		this.props.onChange(e.target.value);
-	},
-	render : function(){
-		return <Nav.item className='editTitle'>
-			<input placeholder='Brew Title' type='text' value={this.props.title} onChange={this.handleChange} />
-
-			<div className={cx('charCount', {'max' : this.props.title.length >= MAX_TITLE_LENGTH})}>
-				{this.props.title.length}/{MAX_TITLE_LENGTH}
-			</div>
-		</Nav.item>
-	},
-
-});
-
-module.exports = EditTitle;
+const React = require('react');
+const createClass = require('create-react-class');
+const cx = require('classnames');
+const Nav = require('naturalcrit/nav/nav.jsx');
+
+const MAX_TITLE_LENGTH = 50;
+
+
+const EditTitle = createClass({
+	getDefaultProps : function() {
+		return {
+			title    : '',
+			onChange : function(){}
+		};
+	},
+
+	handleChange : function(e){
+		if(e.target.value.length > MAX_TITLE_LENGTH) return;
+		this.props.onChange(e.target.value);
+	},
+	render : function(){
+		return <Nav.item className='editTitle'>
+			<input placeholder='Brew Title' type='text' value={this.props.title} onChange={this.handleChange} />
+
+			<div className={cx('charCount', { 'max': this.props.title.length >= MAX_TITLE_LENGTH })}>
+				{this.props.title.length}/{MAX_TITLE_LENGTH}
+			</div>
+		</Nav.item>;
+	},
+
+});
+
+module.exports = EditTitle;

client/homebrew/navbar/issue.navitem.jsx

@@ -1,8 +1,13 @@
-var React = require('react');
-var Nav = require('naturalcrit/nav/nav.jsx');
-
-module.exports = function(props){
-	return <Nav.item newTab={true} href='https://github.com/stolksdorf/homebrewery/issues' color='red' icon='fa-bug'>
-		report issue
-	</Nav.item>
+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='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

@@ -1,49 +1,51 @@
-const React = require('react');
-const _ = require('lodash');
-
-const Nav = require('naturalcrit/nav/nav.jsx');
-
-const Navbar = React.createClass({
-	getInitialState: function() {
-		return {
-			//showNonChromeWarning : false,
-			ver : '0.0.0'
-		};
-	},
-
-	componentDidMount: function() {
-		//const isChrome = /Chrome/.test(navigator.userAgent) && /Google Inc/.test(navigator.vendor);
-		this.setState({
-			//showNonChromeWarning : !isChrome,
-			ver : window.version
-		})
-	},
-
-/*
-	renderChromeWarning : function(){
-		if(!this.state.showNonChromeWarning) return;
-		return <Nav.item className='warning' icon='fa-exclamation-triangle'>
-			Optimized for Chrome
-			<div className='dropdown'>
-				If you are experiencing rendering issues, use Chrome instead
-			</div>
-		</Nav.item>
-	},
-*/
-	render : function(){
-		return <Nav.base>
-			<Nav.section>
-				<Nav.logo />
-				<Nav.item href='/' className='homebrewLogo'>
-					<div>The Homebrewery</div>
-				</Nav.item>
-				<Nav.item>{`v${this.state.ver}`}</Nav.item>
-
-				{/*this.renderChromeWarning()*/}
-			</Nav.section>
-			{this.props.children}
-		</Nav.base>
-	}
-});
-
-module.exports = Navbar;
+require('./navbar.less');
+const React = require('react');
+const createClass = require('create-react-class');
+
+const Nav = require('naturalcrit/nav/nav.jsx');
+const PatreonNavItem = require('./patreon.navitem.jsx');
+
+const Navbar = createClass({
+	getInitialState : function() {
+		return {
+			//showNonChromeWarning : false,
+			ver : '0.0.0'
+		};
+	},
+
+	componentDidMount : function() {
+		//const isChrome = /Chrome/.test(navigator.userAgent) && /Google Inc/.test(navigator.vendor);
+		this.setState({
+			//showNonChromeWarning : !isChrome,
+			ver : window.version
+		});
+	},
+
+	/*
+	renderChromeWarning : function(){
+		if(!this.state.showNonChromeWarning) return;
+		return <Nav.item className='warning' icon='fa-exclamation-triangle'>
+			Optimized for Chrome
+			<div className='dropdown'>
+				If you are experiencing rendering issues, use Chrome instead
+			</div>
+		</Nav.item>
+	},
+*/
+	render : function(){
+		return <Nav.base>
+			<Nav.section>
+				<Nav.logo />
+				<Nav.item href='/' className='homebrewLogo'>
+					<div>The Homebrewery</div>
+				</Nav.item>
+				<Nav.item>{`v${this.state.ver}`}</Nav.item>
+				<PatreonNavItem />
+				{/*this.renderChromeWarning()*/}
+			</Nav.section>
+			{this.props.children}
+		</Nav.base>;
+	}
+});
+
+module.exports = Navbar;

client/homebrew/navbar/navbar.less

@@ -1,4 +1,12 @@
 @navbarHeight : 28px;
+@keyframes coloring {
+	//from {color: white;}
+	//to {color: red;}
+	0%   {color: pink;}
+	50%  {color: pink;}
+	75%  {color: red;}
+	100% {color: pink;}
+}
 .homebrew nav{
 	.homebrewLogo{
 		.animate(color);
@@ -47,11 +55,16 @@
 		text-transform : initial;
 	}
 	.patreon.navItem{
+		border-left  : 1px solid #666;
+		border-right : 1px solid #666;
+		&:hover i {
+			color: red;
+		}
 		i{
 			.animate(color);
-			&:hover{
-				color : @red;
-			}
+			animation-name: coloring;
+			animation-duration: 2s;
+			color: pink;
 		}
 	}
 	.recent.navItem{
@@ -125,4 +138,4 @@
 			text-align       : center;
 		}
 	}
-}
+}

client/homebrew/navbar/patreon.navitem.jsx

@@ -1,13 +1,14 @@
-var React = require('react');
-var Nav = require('naturalcrit/nav/nav.jsx');
-
-module.exports = function(props){
-	return <Nav.item
-		className='patreon'
-		newTab={true}
-		href='https://www.patreon.com/stolksdorf'
-		color='green'
-		icon='fa-heart'>
-		help out
-	</Nav.item>
-};
+const React = require('react');
+const createClass = require('create-react-class');
+const Nav = require('naturalcrit/nav/nav.jsx');
+
+module.exports = function(props){
+	return <Nav.item
+		className='patreon'
+		newTab={true}
+		href='https://www.patreon.com/NaturalCrit'
+		color='green'
+		icon='fa-heart'>
+		help out
+	</Nav.item>;
+};

client/homebrew/navbar/print.navitem.jsx

@@ -1,8 +1,9 @@
-var React = require('react');
-var Nav = require('naturalcrit/nav/nav.jsx');
-
-module.exports = function(props){
-	return <Nav.item newTab={true} href={'/print/' + props.shareId +'?dialog=true'} color='purple' icon='fa-file-pdf-o'>
-		get PDF
-	</Nav.item>
+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} href={`/print/${props.shareId}?dialog=true`} color='purple' icon='fa-file-pdf-o'>
+		get PDF
+	</Nav.item>;
 };

client/homebrew/navbar/recent.navitem.jsx

@@ -1,199 +1,185 @@
-var React = require('react');
-var _ = require('lodash');
-var cx = require('classnames');
-var Moment = require('moment');
-
-var Nav = require('naturalcrit/nav/nav.jsx');
-
-const VIEW_KEY = 'homebrewery-recently-viewed';
-const EDIT_KEY = 'homebrewery-recently-edited';
-
-var BaseItem = React.createClass({
-	getDefaultProps: function() {
-		return {
-			storageKey : '',
-			text : '',
-			currentBrew:{
-				title : '',
-				id : '',
-				url : ''
-			}
-		};
-	},
-	getInitialState: function() {
-		return {
-			showDropdown: false,
-			brews : []
-		};
-	},
-
-	componentDidMount: function() {
-		var brews = JSON.parse(localStorage.getItem(this.props.storageKey) || '[]');
-
-		brews = _.filter(brews, (brew)=>{
-			return brew.id !== this.props.currentBrew.id;
-		});
-		if(this.props.currentBrew.id){
-			brews.unshift({
-				id : this.props.currentBrew.id,
-				url : this.props.currentBrew.url,
-				title : this.props.currentBrew.title,
-				ts : Date.now()
-			});
-		}
-		brews = _.slice(brews, 0, 8);
-		localStorage.setItem(this.props.storageKey, JSON.stringify(brews));
-		this.setState({
-			brews : brews
-		});
-	},
-
-	handleDropdown : function(show){
-		this.setState({
-			showDropdown : show
-		})
-	},
-
-	renderDropdown : function(){
-		if(!this.state.showDropdown) return null;
-
-		var items = _.map(this.state.brews, (brew)=>{
-			return <a href={brew.url} className='item' key={brew.id} target='_blank'>
-				<span className='title'>{brew.title}</span>
-				<span className='time'>{Moment(brew.ts).fromNow()}</span>
-			</a>
-		});
-
-		return <div className='dropdown'>{items}</div>
-	},
-
-	render : function(){
-		return <Nav.item icon='fa-clock-o' color='grey' className='recent'
-					onMouseEnter={this.handleDropdown.bind(null, true)}
-					onMouseLeave={this.handleDropdown.bind(null, false)}>
-			{this.props.text}
-			{this.renderDropdown()}
-		</Nav.item>
-	},
-
-});
-
-
-
-module.exports = {
-	viewed : React.createClass({
-		getDefaultProps: function() {
-			return {
-				brew : {
-					title : '',
-					shareId : ''
-				}
-			};
-		},
-		render : function(){
-			return <BaseItem text='recently viewed' storageKey={VIEW_KEY}
-				currentBrew={{
-					id : this.props.brew.shareId,
-					title : this.props.brew.title,
-					url : `/share/${this.props.brew.shareId}`
-				}}
-			/>
-		},
-	}),
-
-	edited : React.createClass({
-		getDefaultProps: function() {
-			return {
-				brew : {
-					title : '',
-					editId : ''
-				}
-			};
-		},
-		render : function(){
-			return <BaseItem text='recently edited' storageKey={EDIT_KEY}
-				currentBrew={{
-					id : this.props.brew.editId,
-					title : this.props.brew.title,
-					url : `/edit/${this.props.brew.editId}`
-				}}
-			/>
-		},
-	}),
-
-	both : React.createClass({
-		getDefaultProps: function() {
-			return {
-				errorId : null
-			};
-		},
-
-		getInitialState: function() {
-			return {
-				showDropdown: false,
-				edit : [],
-				view : []
-			};
-		},
-
-		componentDidMount: function() {
-
-			var edited = JSON.parse(localStorage.getItem(EDIT_KEY) || '[]');
-			var viewed = JSON.parse(localStorage.getItem(VIEW_KEY) || '[]');
-
-			if(this.props.errorId){
-				edited = _.filter(edited, (edit) => {
-					return edit.id !== this.props.errorId;
-				});
-				viewed = _.filter(viewed, (view) => {
-					return view.id !== this.props.errorId;
-				});
-
-				localStorage.setItem(EDIT_KEY, JSON.stringify(edited));
-				localStorage.setItem(VIEW_KEY, JSON.stringify(viewed));
-			}
-
-
-			this.setState({
-				edit : edited,
-				view : viewed
-			});
-		},
-
-		handleDropdown : function(show){
-			this.setState({
-				showDropdown : show
-			})
-		},
-
-		renderDropdown : function(){
-			if(!this.state.showDropdown) return null;
-
-			var makeItems = (brews) => {
-				return _.map(brews, (brew)=>{
-					return <a href={brew.url} className='item' key={brew.id} target='_blank'>
-						<span className='title'>{brew.title}</span>
-						<span className='time'>{Moment(brew.ts).fromNow()}</span>
-					</a>
-				});
-			};
-
-			return <div className='dropdown'>
-				<h4>edited</h4>
-				{makeItems(this.state.edit)}
-				<h4>viewed</h4>
-				{makeItems(this.state.view)}
-			</div>
-		},
-
-		render : function(){
-			return <Nav.item icon='fa-clock-o' color='grey' className='recent'
-						onMouseEnter={this.handleDropdown.bind(null, true)}
-						onMouseLeave={this.handleDropdown.bind(null, false)}>
-				Recent brews
-				{this.renderDropdown()}
-			</Nav.item>
-		}
-
-	})
-}
+const React = require('react');
+const createClass = require('create-react-class');
+const _ = require('lodash');
+const Moment = require('moment');
+
+const Nav = require('naturalcrit/nav/nav.jsx');
+
+const EDIT_KEY = 'homebrewery-recently-edited';
+const VIEW_KEY = 'homebrewery-recently-viewed';
+
+
+const RecentItems = createClass({
+
+	getDefaultProps : function() {
+		return {
+			storageKey : '',
+			showEdit   : false,
+			showView   : false
+		};
+	},
+
+	getInitialState : function() {
+		return {
+			showDropdown : false,
+			edit         : [],
+			view         : []
+		};
+	},
+
+	componentDidMount : function() {
+
+		//== Load recent items list ==//
+		let edited = JSON.parse(localStorage.getItem(EDIT_KEY) || '[]');
+		let viewed = JSON.parse(localStorage.getItem(VIEW_KEY) || '[]');
+
+		//== Add current brew to appropriate recent items list (depending on storageKey) ==//
+		if(this.props.storageKey == 'edit'){
+			let editId = this.props.brew.editId;
+			if(this.props.brew.googleId){
+				editId = `${this.props.brew.googleId}${this.props.brew.editId}`;
+			}
+			edited = _.filter(edited, (brew)=>{
+				return brew.id !== editId;
+			});
+			edited.unshift({
+				id    : editId,
+				title : this.props.brew.title,
+				url   : `/edit/${editId}`,
+				ts    : Date.now()
+			});
+		}
+		if(this.props.storageKey == 'view'){
+			let shareId = this.props.brew.shareId;
+			if(this.props.brew.googleId){
+				shareId = `${this.props.brew.googleId}${this.props.brew.shareId}`;
+			}
+			viewed = _.filter(viewed, (brew)=>{
+				return brew.id !== shareId;
+			});
+			viewed.unshift({
+				id    : shareId,
+				title : this.props.brew.title,
+				url   : `/share/${shareId}`,
+				ts    : Date.now()
+			});
+		}
+
+		//== Store the updated lists (up to 8 items each) ==//
+		edited = _.slice(edited, 0, 8);
+		viewed = _.slice(viewed, 0, 8);
+
+		localStorage.setItem(EDIT_KEY, JSON.stringify(edited));
+		localStorage.setItem(VIEW_KEY, JSON.stringify(viewed));
+
+		this.setState({
+			edit : edited,
+			view : viewed
+		});
+	},
+
+	componentDidUpdate : function(prevProps) {
+		if(prevProps.brew && this.props.brew.editId !== prevProps.brew.editId) {
+	 		if(this.props.storageKey == 'edit') {
+				let prevEditId = prevProps.brew.editId;
+				if(prevProps.brew.googleId){
+					prevEditId = `${prevProps.brew.googleId}${prevProps.brew.editId}`;
+				}
+
+				edited = _.filter(this.state.edit, (brew)=>{
+					return brew.id !== prevEditId;
+				});
+				let editId = this.props.brew.editId;
+				if(this.props.brew.googleId){
+					editId = `${this.props.brew.googleId}${this.props.brew.editId}`;
+				}
+				edited.unshift({
+					id    : editId,
+					title : this.props.brew.title,
+					url   : `/edit/${editId}`,
+					ts    : Date.now()
+				});
+			}
+
+			//== Store the updated lists (up to 8 items each) ==//
+			edited = _.slice(edited, 0, 8);
+
+			localStorage.setItem(EDIT_KEY, JSON.stringify(edited));
+
+			this.setState({
+				edit : edited
+			});
+		}
+	},
+
+	handleDropdown : function(show){
+		this.setState({
+			showDropdown : show
+		});
+	},
+
+	renderDropdown : function(){
+		if(!this.state.showDropdown) return null;
+
+		const makeItems = (brews)=>{
+			return _.map(brews, (brew)=>{
+				return <a href={brew.url} className='item' key={brew.id} target='_blank' rel='noopener noreferrer'>
+					<span className='title'>{brew.title || '[ no title ]'}</span>
+					<span className='time'>{Moment(brew.ts).fromNow()}</span>
+				</a>;
+			});
+		};
+
+		return <div className='dropdown'>
+			{(this.props.showEdit && this.props.showView) ?
+				<h4>edited</h4> : null }
+			{this.props.showEdit ?
+				makeItems(this.state.edit) : null }
+			{(this.props.showEdit && this.props.showView) ?
+				<h4>viewed</h4>	: null }
+			{this.props.showView ?
+				makeItems(this.state.view) : null }
+		</div>;
+	},
+
+	render : function(){
+		return <Nav.item icon='fa-clock-o' color='grey' className='recent'
+			onMouseEnter={()=>this.handleDropdown(true)}
+			onMouseLeave={()=>this.handleDropdown(false)}>
+			{this.props.text}
+			{this.renderDropdown()}
+		</Nav.item>;
+	}
+
+});
+
+module.exports = {
+
+	edited : (props)=>{
+		return <RecentItems
+			brew={props.brew}
+			storageKey={props.storageKey}
+			text='recently edited'
+			showEdit={true}
+		/>;
+	},
+
+	viewed : (props)=>{
+		return <RecentItems
+			brew={props.brew}
+			storageKey={props.storageKey}
+			text='recently viewed'
+			showView={true}
+		/>;
+	},
+
+	both : (props)=>{
+		return <RecentItems
+			brew={props.brew}
+			storageKey={props.storageKey}
+			text='recent brews'
+			showEdit={true}
+			showView={true}
+		/>;
+	}
+};

client/homebrew/navbar/reddit.navitem.jsx

@@ -1,51 +1,45 @@
-var React = require('react');
-var _ = require('lodash');
-var cx = require('classnames');
-
-//var striptags = require('striptags');
-
-var Nav = require('naturalcrit/nav/nav.jsx');
-
-const MAX_URL_SIZE = 2083;
-const MAIN_URL = "https://www.reddit.com/r/UnearthedArcana/submit?selftext=true"
-
-
-var RedditShare = React.createClass({
-	getDefaultProps: function() {
-		return {
-			brew : {
-				title : '',
-				sharedId : '',
-				text : ''
-			}
-		};
-	},
-
-	getText : function(){
-
-	},
-
-
-	handleClick : function(){
-		var url = [
-			MAIN_URL,
-			'title=' + encodeURIComponent(this.props.brew.title ? this.props.brew.title : 'Check out my brew!'),
-
-			'text=' + encodeURIComponent(this.props.brew.text)
-
-
-		].join('&');
-
-		window.open(url, '_blank');
-	},
-
-
-	render : function(){
-		return <Nav.item icon='fa-reddit-alien' color='red' onClick={this.handleClick}>
-			share on reddit
-		</Nav.item>
-	},
-
-});
-
-module.exports = RedditShare;
+const React = require('react');
+const createClass = require('create-react-class');
+const cx = require('classnames');
+const Nav = require('naturalcrit/nav/nav.jsx');
+
+const MAX_URL_SIZE = 2083;
+const MAIN_URL = 'https://www.reddit.com/r/UnearthedArcana/submit?selftext=true';
+
+
+const RedditShare = createClass({
+	getDefaultProps : function() {
+		return {
+			brew : {
+				title    : '',
+				sharedId : '',
+				text     : ''
+			}
+		};
+	},
+
+	getText : function(){
+
+	},
+
+
+	handleClick : function(){
+		const url = [
+			MAIN_URL,
+			`title=${encodeURIComponent(this.props.brew.title ? this.props.brew.title : 'Check out my brew!')}`,
+			`text=${encodeURIComponent(this.props.brew.text)}`
+		].join('&');
+
+		window.open(url, '_blank');
+	},
+
+
+	render : function(){
+		return <Nav.item icon='fa-reddit-alien' color='red' onClick={this.handleClick}>
+			share on reddit
+		</Nav.item>;
+	},
+
+});
+
+module.exports = RedditShare;

client/homebrew/pages/editPage/editPage.jsx

@@ -1,230 +1,385 @@
-const React = require('react');
-const _ = require('lodash');
-const cx = require('classnames');
-const request = require("superagent");
-
-const Nav = require('naturalcrit/nav/nav.jsx');
-const Navbar = require('../../navbar/navbar.jsx');
-
-const ReportIssue = require('../../navbar/issue.navitem.jsx');
-const PrintLink = require('../../navbar/print.navitem.jsx');
-const Account = require('../../navbar/account.navitem.jsx');
-//const RecentlyEdited = require('../../navbar/recent.navitem.jsx').edited;
-
-const SplitPane = require('naturalcrit/splitPane/splitPane.jsx');
-const Editor = require('../../editor/editor.jsx');
-const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
-
-const Markdown = require('naturalcrit/markdown.js');
-
-const SAVE_TIMEOUT = 3000;
-
-
-const EditPage = React.createClass({
-	getDefaultProps: function() {
-		return {
-			brew : {
-				text : '',
-				shareId : null,
-				editId : null,
-				createdAt : null,
-				updatedAt : null,
-
-				title : '',
-				description : '',
-				tags : '',
-				published : false,
-				authors : [],
-				systems : []
-			}
-		};
-	},
-
-	getInitialState: function() {
-		return {
-			brew : this.props.brew,
-
-			isSaving : false,
-			isPending : false,
-			errors : null,
-			htmlErrors : Markdown.validate(this.props.brew.text),
-			lastUpdated : this.props.brew.updatedAt
-		};
-	},
-	savedBrew : null,
-
-	componentDidMount: function(){
-		this.trySave();
-		window.onbeforeunload = ()=>{
-			if(this.state.isSaving || this.state.isPending){
-				return 'You have unsaved changes!';
-			}
-		};
-
-		this.setState({
-			htmlErrors : Markdown.validate(this.state.brew.text)
-		})
-
-		document.addEventListener('keydown', this.handleControlKeys);
-	},
-	componentWillUnmount: function() {
-		window.onbeforeunload = function(){};
-		document.removeEventListener('keydown', this.handleControlKeys);
-	},
-
-
-	handleControlKeys : function(e){
-		if(!(e.ctrlKey || e.metaKey)) return;
-		const S_KEY = 83;
-		const P_KEY = 80;
-		if(e.keyCode == S_KEY) this.save();
-		if(e.keyCode == P_KEY) window.open(`/print/${this.props.brew.shareId}?dialog=true`, '_blank').focus();
-		if(e.keyCode == P_KEY || e.keyCode == S_KEY){
-			e.stopPropagation();
-			e.preventDefault();
-		}
-	},
-
-	handleSplitMove : function(){
-		this.refs.editor.update();
-	},
-
-	handleMetadataChange : function(metadata){
-		this.setState({
-			brew : _.merge({}, this.state.brew, metadata),
-			isPending : true,
-		}, ()=>{
-			this.trySave();
-		});
-
-	},
-
-	handleTextChange : function(text){
-
-		//If there are errors, run the validator on everychange to give quick feedback
-		var htmlErrors = this.state.htmlErrors;
-		if(htmlErrors.length) htmlErrors = Markdown.validate(text);
-
-		this.setState({
-			brew : _.merge({}, this.state.brew, {text : text}),
-			isPending : true,
-			htmlErrors : htmlErrors
-		});
-
-		this.trySave();
-	},
-
-	hasChanges : function(){
-		if(this.savedBrew){
-			return !_.isEqual(this.state.brew, this.savedBrew)
-		}else{
-			return !_.isEqual(this.state.brew, this.props.brew)
-		}
-		return false;
-	},
-
-	trySave : function(){
-		if(!this.debounceSave) this.debounceSave = _.debounce(this.save, SAVE_TIMEOUT);
-		if(this.hasChanges()){
-			this.debounceSave();
-		}else{
-			this.debounceSave.cancel();
-		}
-	},
-
-	save : function(){
-		if(this.debounceSave && this.debounceSave.cancel) this.debounceSave.cancel();
-
-		this.setState({
-			isSaving : true,
-			errors : null,
-			htmlErrors : Markdown.validate(this.state.brew.text)
-		});
-
-		request
-			.put('/api/update/' + this.props.brew.editId)
-			.send(this.state.brew)
-			.end((err, res) => {
-				if(err){
-					this.setState({
-						errors : err,
-					})
-				}else{
-					this.savedBrew = res.body;
-					this.setState({
-						isPending : false,
-						isSaving : false,
-						lastUpdated : res.body.updatedAt
-					})
-				}
-			})
-	},
-
-	renderSaveButton : function(){
-		if(this.state.errors){
-			var errMsg = '';
-			try{
-				errMsg += this.state.errors.toString() + '\n\n';
-				errMsg += '```\n' + JSON.stringify(this.state.errors.response.error, null, '  ') + '\n```';
-			}catch(e){}
-
-			return <Nav.item className='save error' icon="fa-warning">
-				Oops!
-				<div className='errorContainer'>
-					Looks like there was a problem saving. <br />
-					Report the issue <a target='_blank' href={'https://github.com/stolksdorf/naturalcrit/issues/new?body='+ encodeURIComponent(errMsg)}>
-						here
-					</a>.
-				</div>
-			</Nav.item>
-		}
-
-		if(this.state.isSaving){
-			return <Nav.item className='save' icon="fa-spinner fa-spin">saving...</Nav.item>
-		}
-		if(this.state.isPending && this.hasChanges()){
-			return <Nav.item className='save' onClick={this.save} color='blue' icon='fa-save'>Save Now</Nav.item>
-		}
-		if(!this.state.isPending && !this.state.isSaving){
-			return <Nav.item className='save saved'>saved.</Nav.item>
-		}
-	},
-	renderNavbar : function(){
-		return <Navbar>
-			<Nav.section>
-				<Nav.item className='brewTitle'>{this.state.brew.title}</Nav.item>
-			</Nav.section>
-			<Nav.section>
-				{this.renderSaveButton()}
-				{/*<RecentlyEdited brew={this.props.brew} />*/}
-				<ReportIssue />
-				<Nav.item newTab={true} href={'/share/' + this.props.brew.shareId} color='teal' icon='fa-share-alt'>
-					Share
-				</Nav.item>
-				<PrintLink shareId={this.props.brew.shareId} />
-				<Account />
-			</Nav.section>
-		</Navbar>
-	},
-
-	render : function(){
-		return <div className='editPage page'>
-			{this.renderNavbar()}
-
-			<div className='content'>
-				<SplitPane onDragFinish={this.handleSplitMove} ref='pane'>
-					<Editor
-						ref='editor'
-						value={this.state.brew.text}
-						onChange={this.handleTextChange}
-						metadata={this.state.brew}
-						onMetadataChange={this.handleMetadataChange}
-					/>
-					<BrewRenderer text={this.state.brew.text} errors={this.state.htmlErrors} />
-				</SplitPane>
-			</div>
-		</div>
-	}
-});
-
-module.exports = EditPage;
+/* eslint-disable max-lines */
+require('./editPage.less');
+const React = require('react');
+const createClass = require('create-react-class');
+const _ = require('lodash');
+const request = require('superagent');
+const { Meta } = require('vitreum/headtags');
+
+const Nav = require('naturalcrit/nav/nav.jsx');
+const Navbar = require('../../navbar/navbar.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;
+
+const SplitPane = require('naturalcrit/splitPane/splitPane.jsx');
+const Editor = require('../../editor/editor.jsx');
+const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
+
+const Markdown = require('naturalcrit/markdown.js');
+
+const googleDriveActive = require('../../googleDrive.png');
+const googleDriveInactive = require('../../googleDriveMono.png');
+
+const SAVE_TIMEOUT = 3000;
+
+const EditPage = createClass({
+	getDefaultProps : function() {
+		return {
+			brew : {
+				text      : '',
+				shareId   : null,
+				editId    : null,
+				createdAt : null,
+				updatedAt : null,
+				gDrive    : false,
+
+				title       : '',
+				description : '',
+				tags        : '',
+				published   : false,
+				authors     : [],
+				systems     : []
+			}
+		};
+	},
+
+	getInitialState : function() {
+		return {
+			brew : this.props.brew,
+
+			isSaving              : false,
+			isPending             : false,
+			saveGoogle            : this.props.brew.googleId ? true : false,
+			confirmGoogleTransfer : false,
+			errors                : null,
+			htmlErrors            : Markdown.validate(this.props.brew.text),
+			url                   : ''
+		};
+	},
+	savedBrew : null,
+
+	componentDidMount : function(){
+		this.setState({
+			url : window.location.href
+		});
+
+		this.trySave();
+		window.onbeforeunload = ()=>{
+			if(this.state.isSaving || this.state.isPending){
+				return 'You have unsaved changes!';
+			}
+		};
+
+		this.setState((prevState)=>({
+			htmlErrors : Markdown.validate(prevState.brew.text)
+		}));
+
+		document.addEventListener('keydown', this.handleControlKeys);
+	},
+	componentWillUnmount : function() {
+		window.onbeforeunload = function(){};
+		document.removeEventListener('keydown', this.handleControlKeys);
+	},
+
+	handleControlKeys : function(e){
+		if(!(e.ctrlKey || e.metaKey)) return;
+		const S_KEY = 83;
+		const P_KEY = 80;
+		if(e.keyCode == S_KEY) this.save();
+		if(e.keyCode == P_KEY) window.open(`/print/${this.processShareId()}?dialog=true`, '_blank').focus();
+		if(e.keyCode == P_KEY || e.keyCode == S_KEY){
+			e.stopPropagation();
+			e.preventDefault();
+		}
+	},
+
+	handleSplitMove : function(){
+		this.refs.editor.update();
+	},
+
+	handleMetadataChange : function(metadata){
+		this.setState((prevState)=>({
+			brew      : _.merge({}, prevState.brew, metadata),
+			isPending : true,
+		}), ()=>this.trySave());
+
+	},
+
+	handleTextChange : function(text){
+
+		//If there are errors, run the validator on everychange to give quick feedback
+		let htmlErrors = this.state.htmlErrors;
+		if(htmlErrors.length) htmlErrors = Markdown.validate(text);
+
+		this.setState((prevState)=>({
+			brew       : _.merge({}, prevState.brew, { text: text }),
+			isPending  : true,
+			htmlErrors : htmlErrors
+		}), ()=>this.trySave());
+	},
+
+	hasChanges : function(){
+		const savedBrew = this.savedBrew ? this.savedBrew : this.props.brew;
+		return !_.isEqual(this.state.brew, savedBrew);
+	},
+
+	trySave : function(){
+		if(!this.debounceSave) this.debounceSave = _.debounce(this.save, SAVE_TIMEOUT);
+		if(this.hasChanges()){
+			this.debounceSave();
+		} else {
+			this.debounceSave.cancel();
+		}
+	},
+
+	handleGoogleClick : function(){
+		this.setState((prevState)=>({
+			confirmGoogleTransfer : !prevState.confirmGoogleTransfer
+		}));
+		this.clearErrors();
+	},
+
+	toggleGoogleStorage : function(){
+		this.setState((prevState)=>({
+			saveGoogle : !prevState.saveGoogle,
+			isSaving   : false,
+			errors     : null
+		}), ()=>this.save());
+	},
+
+	clearErrors : function(){
+		this.setState({
+			errors   : null,
+			isSaving : false
+
+		});
+	},
+
+	save : async function(){
+		if(this.debounceSave && this.debounceSave.cancel) this.debounceSave.cancel();
+
+		this.setState((prevState)=>({
+			isSaving   : true,
+			errors     : null,
+			htmlErrors : Markdown.validate(prevState.brew.text)
+		}));
+
+		const transfer = this.state.saveGoogle == _.isNil(this.state.brew.googleId);
+
+		if(this.state.saveGoogle) {
+			if(transfer) {
+				const res = await request
+				.post('/api/newGoogle/')
+				.send(this.state.brew)
+				.catch((err)=>{
+					console.log(err.status === 401
+						? 'Not signed in!'
+						: 'Error Saving to Google!');
+					this.setState({ errors: err, saveGoogle: false });
+				});
+
+				if(!res) { return; }
+
+				console.log('Deleting Local Copy');
+				await request.delete(`/api/${this.state.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/${this.state.brew.editId}`)
+				.send(this.state.brew)
+				.catch((err)=>{
+					console.log(err.status === 401
+						? 'Not signed in!'
+						: 'Error Saving to Google!');
+					this.setState({ errors: err, saveGoogle: false });
+					return;
+				});
+
+				this.savedBrew = res.body;
+			}
+		} else {
+			if(transfer) {
+				const res = await request.post('/api')
+				.send(this.state.brew)
+				.catch((err)=>{
+					console.log('Error creating Local Copy');
+					this.setState({ errors: err });
+					return;
+				});
+
+				await request.get(`/api/removeGoogle/${this.state.brew.googleId}${this.state.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/${this.state.brew.editId}`)
+				.send(this.state.brew)
+				.catch((err)=>{
+					console.log('Error Updating Local Brew');
+					this.setState({ errors: err });
+					return;
+				});
+
+				this.savedBrew = res.body;
+			}
+		}
+
+		this.setState((prevState)=>({
+			brew : _.merge({}, prevState.brew, {
+				googleId : this.savedBrew.googleId ? this.savedBrew.googleId : null,
+				editId 	 : this.savedBrew.editId,
+				shareId  : this.savedBrew.shareId
+			}),
+			isPending : false,
+			isSaving  : false,
+		}));
+	},
+
+	renderGoogleDriveIcon : function(){
+		if(this.state.saveGoogle) {
+			return <Nav.item className='googleDriveStorage' onClick={this.handleGoogleClick}>
+				<img src={googleDriveActive} alt='googleDriveActive' />
+
+				{this.state.confirmGoogleTransfer &&
+					<div className='errorContainer'>
+					Would you like to transfer this brew from your Google Drive storage back to the Homebrewery?<br />
+						<div className='confirm' onClick={this.toggleGoogleStorage}>
+							Yes
+						</div>
+						<div className='deny'>
+							No
+						</div>
+					</div>
+				}
+			</Nav.item>;
+		} else {
+			return <Nav.item className='googleDriveStorage' onClick={this.handleGoogleClick}>
+				<img src={googleDriveInactive} alt='googleDriveInactive' />
+
+				{this.state.confirmGoogleTransfer &&
+					<div className='errorContainer'>
+					Would you like to transfer this brew from the Homebrewery to your personal Google Drive storage?<br />
+						<div className='confirm' onClick={this.toggleGoogleStorage}>
+							Yes
+						</div>
+						<div className='deny'>
+							No
+						</div>
+					</div>
+				}
+			</Nav.item>;
+		}
+	},
+
+	renderSaveButton : function(){
+		if(this.state.errors){
+			let errMsg = '';
+			try {
+				errMsg += `${this.state.errors.toString()}\n\n`;
+				errMsg += `\`\`\`\n${JSON.stringify(this.state.errors.response.error, null, '  ')}\n\`\`\``;
+			} catch (e){}
+
+			if(this.state.errors.status == '401'){
+				return <Nav.item className='save error' icon='fa-warning'>
+					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={`http://naturalcrit.com/login?redirect=${this.state.url}`}>
+							<div className='confirm' onClick={this.toggleGoogleStorage}>
+								Sign In
+							</div>
+						</a>
+						<div className='deny'>
+							Not Now
+						</div>
+					</div>
+				</Nav.item>;
+			}
+
+			return <Nav.item className='save error' icon='fa-warning'>
+				Oops!
+				<div className='errorContainer'>
+					Looks like there was a problem saving. <br />
+					Report the issue <a target='_blank' rel='noopener noreferrer'
+						href={`https://github.com/naturalcrt/naturalcrit/issues/new?body=${encodeURIComponent(errMsg)}`}>
+						here
+					</a>.
+				</div>
+			</Nav.item>;
+		}
+
+		if(this.state.isSaving){
+			return <Nav.item className='save' icon='fa-spinner fa-spin'>saving...</Nav.item>;
+		}
+		if(this.state.isPending && this.hasChanges()){
+			return <Nav.item className='save' onClick={this.save} color='blue' icon='fa-save'>Save Now</Nav.item>;
+		}
+		if(!this.state.isPending && !this.state.isSaving){
+			return <Nav.item className='save saved'>saved.</Nav.item>;
+		}
+	},
+
+	processShareId : function() {
+		return this.state.brew.googleId ?
+					 this.state.brew.googleId + this.state.brew.shareId :
+					 this.state.brew.shareId;
+	},
+
+	renderNavbar : function(){
+		return <Navbar>
+			<Nav.section>
+				<Nav.item className='brewTitle'>{this.state.brew.title}</Nav.item>
+			</Nav.section>
+
+			<Nav.section>
+				{this.renderGoogleDriveIcon()}
+				{this.renderSaveButton()}
+				<ReportIssue />
+				<Nav.item newTab={true} href={`/share/${this.processShareId()}`} color='teal' icon='fa-share-alt'>
+					Share
+				</Nav.item>
+				<PrintLink shareId={this.processShareId()} />
+				<RecentNavItem brew={this.state.brew} storageKey='edit' />
+				<Account />
+			</Nav.section>
+		</Navbar>;
+	},
+
+	render : function(){
+		return <div className='editPage page'>
+			<Meta name='robots' content='noindex, nofollow' />
+			{this.renderNavbar()}
+
+			<div className='content'>
+				<SplitPane onDragFinish={this.handleSplitMove} ref='pane'>
+					<Editor
+						ref='editor'
+						value={this.state.brew.text}
+						onChange={this.handleTextChange}
+						metadata={this.state.brew}
+						onMetadataChange={this.handleMetadataChange}
+					/>
+					<BrewRenderer text={this.state.brew.text} errors={this.state.htmlErrors} />
+				</SplitPane>
+			</div>
+		</div>;
+	}
+});
+
+module.exports = EditPage;

client/homebrew/pages/editPage/editPage.less

@@ -1,7 +1,7 @@
 
 .editPage{
 	.navItem.save{
-		width      : 105px;
+		width      : 106px;
 		text-align : center;
 		&.saved{
 			cursor : initial;
@@ -10,18 +10,78 @@
 		&.error{
 			position         : relative;
 			background-color : @red;
-			.errorContainer{
-				position         : absolute;
-				top              : 29px;
-				left             : -20px;
-				z-index          : 1000;
-				width            : 120px;
-				padding          : 8px;
-				background-color : #333;
-				a{
-					color : @teal;
-				}
+		}
+	}
+	.googleDriveStorage {
+		position : relative;
+	}
+	.googleDriveStorage img{
+		height	: 20px;
+		padding : 0px;
+		margin  : -5px;
+	}
+	.errorContainer{
+		position         : absolute;
+		top              : 100%;
+		left             : 50%;
+		z-index          : 1000;
+		width            : 140px;
+		padding          : 3px;
+		background-color : #333;
+		border           : 3px solid #444;
+		border-radius    : 5px;
+		transform        : translate(-50% + 3px, 10px);
+		text-align       : center;
+		a{
+			color : @teal;
+		}
+		&:before {
+			content: "";
+			width: 0px;
+			height: 0px;
+			position: absolute;
+			border-left: 10px solid transparent;
+			border-right: 10px solid transparent;
+			border-top: 10px solid transparent;
+			border-bottom: 10px solid #444;
+			left: 53px;
+			top: -23px;
+		}
+		&:after {
+			content: "";
+			width: 0px;
+			height: 0px;
+			position: absolute;
+			border-left: 10px solid transparent;
+			border-right: 10px solid transparent;
+			border-top: 10px solid transparent;
+			border-bottom: 10px solid #333;
+			left: 53px;
+			top: -19px;
+		}
+		.deny {
+			width            : 48%;
+		  margin           : 1px;
+			padding          : 5px;
+			background-color : #333;
+			display          : inline-block;
+			border-left      : 1px solid #666;
+			.animate(background-color);
+			&:hover{
+				background-color : red;
+			}
+		}
+		.confirm {
+			width            : 48%;
+			margin           : 1px;
+			padding          : 5px;
+			background-color : #333;
+			display          : inline-block;
+			color            : white;
+			.animate(background-color);
+			&:hover{
+				background-color : teal;
 			}
 		}
 	}
-}
+}

client/homebrew/pages/errorPage/errorPage.jsx

@@ -1,20 +1,22 @@
-var React = require('react');
-var _ = require('lodash');
-var cx = require('classnames');
+require('./errorPage.less');
+const React = require('react');
+const createClass = require('create-react-class');
+const _ = require('lodash');
+const cx = require('classnames');
 
-var Nav = require('naturalcrit/nav/nav.jsx');
-var Navbar = require('../../navbar/navbar.jsx');
-var PatreonNavItem = require('../../navbar/patreon.navitem.jsx');
-var IssueNavItem = require('../../navbar/issue.navitem.jsx');
-var RecentNavItem = require('../../navbar/recent.navitem.jsx');
+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;
 
-var BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
+const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
 
-var ErrorPage = React.createClass({
-	getDefaultProps: function() {
+const ErrorPage = createClass({
+	getDefaultProps : function() {
 		return {
-			ver : '0.0.0',
-			errorId: ''
+			ver     : '0.0.0',
+			errorId : ''
 		};
 	},
 
@@ -32,14 +34,14 @@ var ErrorPage = React.createClass({
 				<Nav.section>
 					<PatreonNavItem />
 					<IssueNavItem />
-					<RecentNavItem.both errorId={this.props.errorId} />
+					<RecentNavItem />
 				</Nav.section>
 			</Navbar>
 
 			<div className='content'>
 				<BrewRenderer text={this.text} />
 			</div>
-		</div>
+		</div>;
 	}
 });
 

client/homebrew/pages/hijackPrint.js

@@ -4,7 +4,7 @@ module.exports = function(shareId){
 	return function(event){
 		event = event || window.event;
 		if((event.ctrlKey || event.metaKey) && event.keyCode == 80){
-			var win = window.open(`/homebrew/print/${shareId}?dialog=true`, '_blank');
+			const win = window.open(`/homebrew/print/${shareId}?dialog=true`, '_blank');
 			win.focus();
 			event.preventDefault();
 		}

client/homebrew/pages/homePage/homePage.jsx

@@ -1,92 +1,90 @@
-const React = require('react');
-const _ = require('lodash');
-const cx = require('classnames');
-const request = require("superagent");
-
-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');
-const AccountNavItem = require('../../navbar/account.navitem.jsx');
-
-
-const SplitPane = require('naturalcrit/splitPane/splitPane.jsx');
-const Editor = require('../../editor/editor.jsx');
-const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
-
-
-
-const HomePage = React.createClass({
-	getDefaultProps: function() {
-		return {
-			welcomeText : '',
-			ver : '0.0.0'
-		};
-	},
-	getInitialState: function() {
-		return {
-			text: this.props.welcomeText
-		};
-	},
-	handleSave : function(){
-		request.post('/api')
-			.send({
-				text : this.state.text
-			})
-			.end((err, res)=>{
-				if(err) return;
-				var brew = res.body;
-				window.location = '/edit/' + brew.editId;
-			});
-	},
-	handleSplitMove : function(){
-		this.refs.editor.update();
-	},
-	handleTextChange : function(text){
-		this.setState({
-			text : text
-		});
-	},
-	renderNavbar : function(){
-		return <Navbar ver={this.props.ver}>
-			<Nav.section>
-				<PatreonNavItem />
-				<IssueNavItem />
-				<Nav.item newTab={true} href='/changelog' color='purple' icon='fa-file-text-o'>
-					Changelog
-				</Nav.item>
-				<RecentNavItem.both />
-				<AccountNavItem />
-				{/*}
-				<Nav.item href='/new' color='green' icon='fa-external-link'>
-					New Brew
-				</Nav.item>
-				*/}
-			</Nav.section>
-		</Navbar>
-	},
-
-	render : function(){
-		return <div className='homePage page'>
-			{this.renderNavbar()}
-
-			<div className='content'>
-				<SplitPane onDragFinish={this.handleSplitMove} ref='pane'>
-					<Editor value={this.state.text} onChange={this.handleTextChange} ref='editor'/>
-					<BrewRenderer text={this.state.text} />
-				</SplitPane>
-			</div>
-
-			<div className={cx('floatingSaveButton', {show : this.props.welcomeText != this.state.text})} onClick={this.handleSave}>
-				Save current <i className='fa fa-save' />
-			</div>
-
-			<a href='/new' className='floatingNewButton'>
-				Create your own <i className='fa fa-magic' />
-			</a>
-		</div>
-	}
-});
-
-module.exports = HomePage;
+require('./homePage.less');
+const React = require('react');
+const createClass = require('create-react-class');
+const cx = require('classnames');
+const request = require('superagent');
+const { Meta } = require('vitreum/headtags');
+
+const Nav = require('naturalcrit/nav/nav.jsx');
+const Navbar = require('../../navbar/navbar.jsx');
+const IssueNavItem = require('../../navbar/issue.navitem.jsx');
+const RecentNavItem = require('../../navbar/recent.navitem.jsx').both;
+const AccountNavItem = require('../../navbar/account.navitem.jsx');
+
+
+const SplitPane = require('naturalcrit/splitPane/splitPane.jsx');
+const Editor = require('../../editor/editor.jsx');
+const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
+
+
+
+const HomePage = createClass({
+	getDefaultProps : function() {
+		return {
+			welcomeText : '',
+			ver         : '0.0.0'
+		};
+
+
+	},
+	getInitialState : function() {
+		return {
+			text : this.props.welcomeText
+		};
+	},
+	handleSave : function(){
+		request.post('/api')
+			.send({
+				text : this.state.text
+			})
+			.end((err, res)=>{
+				if(err) return;
+				const brew = res.body;
+				window.location = `/edit/${brew.editId}`;
+			});
+	},
+	handleSplitMove : function(){
+		this.refs.editor.update();
+	},
+	handleTextChange : function(text){
+		this.setState({
+			text : text
+		});
+	},
+	renderNavbar : function(){
+		return <Navbar ver={this.props.ver}>
+			<Nav.section>
+				<IssueNavItem />
+				<Nav.item newTab={true} href='/changelog' color='purple' icon='fa-file-text-o'>
+					Changelog
+				</Nav.item>
+				<RecentNavItem />
+				<AccountNavItem />
+			</Nav.section>
+		</Navbar>;
+	},
+
+	render : function(){
+		return <div className='homePage page'>
+			<Meta name='google-site-verification' content='NwnAQSSJZzAT7N-p5MY6ydQ7Njm67dtbu73ZSyE5Fy4' />
+			{this.renderNavbar()}
+
+			<div className='content'>
+				<SplitPane onDragFinish={this.handleSplitMove} ref='pane'>
+					<Editor value={this.state.text} onChange={this.handleTextChange} showMetaButton={false} ref='editor'/>
+					<BrewRenderer text={this.state.text} />
+				</SplitPane>
+			</div>
+
+			<div className={cx('floatingSaveButton', { show: this.props.welcomeText != this.state.text })} onClick={this.handleSave}>
+				Save current <i className='fa fa-save' />
+			</div>
+
+			<a href='/new' className='floatingNewButton'>
+				Create your own <i className='fa fa-magic' />
+			</a>
+		</div>;
+	}
+});
+
+module.exports = HomePage;

client/homebrew/pages/homePage/welcome_msg.md

@@ -43,10 +43,10 @@ With the next major release of Homebrewery, v3.0.0, this tool *will no longer su
 What's new in the latest update? Check out the full changelog [here](/changelog)
 
 ### Bugs, Issues, Suggestions?
-Have an idea of how to make The Homebrewery better? Or did you find something that wasn't quite right? Head [here](https://github.com/stolksdorf/homebrewery/issues/new) and let me know!.
+Have an idea of how to make The Homebrewery better? Or did you find something that wasn't quite right? Head [here](https://www.reddit.com/r/homebrewery/submit?selftext=true&title=%5BIssue%5D%20Describe%20Your%20Issue%20Here) and let me know!.
 
 ### Legal Junk
-The Homebrewery is licensed using the [MIT License](https://github.com/stolksdorf/homebrewery/blob/master/license). Which means you are free to use The Homebrewery is any way that you want, except for claiming that you made it yourself.
+The Homebrewery is licensed using the [MIT License](https://github.com/naturalcrit/homebrewery/blob/master/license). Which means you are free to use The Homebrewery is 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.
 
@@ -55,7 +55,7 @@ If you are looking for more 5e Homebrew resources check out [r/UnearthedArcana](
 
 
 
-<img src='http://i.imgur.com/hMna6G0.png' style='position:absolute;bottom:50px;right:30px;width:280px' />
+<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>

client/homebrew/pages/newPage/newPage.jsx

@@ -1,161 +1,187 @@
-const React = require('react');
-const _ = require('lodash');
-const cx = require('classnames');
-const request = require("superagent");
-
-const Markdown = require('naturalcrit/markdown.js');
-
-const Nav = require('naturalcrit/nav/nav.jsx');
-const Navbar = require('../../navbar/navbar.jsx');
-const AccountNavItem = require('../../navbar/account.navitem.jsx');
-const IssueNavItem = require('../../navbar/issue.navitem.jsx');
-
-const SplitPane = require('naturalcrit/splitPane/splitPane.jsx');
-const Editor = require('../../editor/editor.jsx');
-const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
-
-
-const KEY = 'homebrewery-new';
-
-const NewPage = React.createClass({
-	getInitialState: function() {
-		return {
-			metadata : {
-				title : '',
-				description : '',
-				tags : '',
-				published : false,
-				authors : [],
-				systems : []
-			},
-
-			text: '',
-			isSaving : false,
-			errors : []
-		};
-	},
-	componentDidMount: function() {
-		const storage = localStorage.getItem(KEY);
-		if(storage){
-			this.setState({
-				text : storage
-			})
-		}
-		document.addEventListener('keydown', this.handleControlKeys);
-	},
-	componentWillUnmount: function() {
-		document.removeEventListener('keydown', this.handleControlKeys);
-	},
-
-	handleControlKeys : function(e){
-		if(!(e.ctrlKey || e.metaKey)) return;
-		const S_KEY = 83;
-		const P_KEY = 80;
-		if(e.keyCode == S_KEY) this.save();
-		if(e.keyCode == P_KEY) this.print();
-		if(e.keyCode == P_KEY || e.keyCode == S_KEY){
-			e.stopPropagation();
-			e.preventDefault();
-		}
-	},
-
-	handleSplitMove : function(){
-		this.refs.editor.update();
-	},
-
-	handleMetadataChange : function(metadata){
-		this.setState({
-			metadata : _.merge({}, this.state.metadata, metadata)
-		});
-	},
-
-	handleTextChange : function(text){
-		this.setState({
-			text : text,
-			errors : Markdown.validate(text)
-		});
-		localStorage.setItem(KEY, text);
-	},
-
-	save : function(){
-		this.setState({
-			isSaving : true
-		});
-
-		request.post('/api')
-			.send(_.merge({}, this.state.metadata, {
-				text : this.state.text
-			}))
-			.end((err, res)=>{
-				if(err){
-					this.setState({
-						isSaving : false
-					});
-					return;
-				}
-				window.onbeforeunload = function(){};
-				const brew = res.body;
-				localStorage.removeItem(KEY);
-				window.location = '/edit/' + brew.editId;
-			})
-	},
-
-	renderSaveButton : function(){
-		if(this.state.isSaving){
-			return <Nav.item icon='fa-spinner fa-spin' className='saveButton'>
-				save...
-			</Nav.item>
-		}else{
-			return <Nav.item icon='fa-save' className='saveButton' onClick={this.save}>
-				save
-			</Nav.item>
-		}
-	},
-
-	print : function(){
-		localStorage.setItem('print', this.state.text);
-		window.open('/print?dialog=true&local=print','_blank');
-	},
-
-	renderLocalPrintButton : function(){
-		return <Nav.item color='purple' icon='fa-file-pdf-o' onClick={this.print}>
-			get PDF
-		</Nav.item>
-	},
-
-	renderNavbar : function(){
-		return <Navbar>
-
-			<Nav.section>
-				<Nav.item className='brewTitle'>{this.state.metadata.title}</Nav.item>
-			</Nav.section>
-
-			<Nav.section>
-				{this.renderSaveButton()}
-				{this.renderLocalPrintButton()}
-				<IssueNavItem />
-				<AccountNavItem />
-			</Nav.section>
-		</Navbar>
-	},
-
-	render : function(){
-		return <div className='newPage page'>
-			{this.renderNavbar()}
-			<div className='content'>
-				<SplitPane onDragFinish={this.handleSplitMove} ref='pane'>
-					<Editor
-						ref='editor'
-						value={this.state.text}
-						onChange={this.handleTextChange}
-						metadata={this.state.metadata}
-						onMetadataChange={this.handleMetadataChange}
-					/>
-					<BrewRenderer text={this.state.text} errors={this.state.errors} />
-				</SplitPane>
-			</div>
-		</div>
-	}
-});
-
-module.exports = NewPage;
+require('./newPage.less');
+const React = require('react');
+const createClass = require('create-react-class');
+const _ = require('lodash');
+const request = require('superagent');
+
+const Markdown = require('naturalcrit/markdown.js');
+
+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 IssueNavItem = require('../../navbar/issue.navitem.jsx');
+
+const SplitPane = require('naturalcrit/splitPane/splitPane.jsx');
+const Editor = require('../../editor/editor.jsx');
+const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
+
+
+const KEY = 'homebrewery-new';
+
+const NewPage = createClass({
+	getInitialState : function() {
+		return {
+			metadata : {
+				gDrive      : false,
+				title       : '',
+				description : '',
+				tags        : '',
+				published   : false,
+				authors     : [],
+				systems     : []
+			},
+
+			text       : '',
+			isSaving   : false,
+			saveGoogle : (global.account && global.account.googleId ? true : false),
+			errors     : []
+		};
+	},
+
+	componentDidMount : function() {
+		const storage = localStorage.getItem(KEY);
+		if(storage){
+			this.setState({
+				text : storage
+			});
+		}
+		document.addEventListener('keydown', this.handleControlKeys);
+	},
+	componentWillUnmount : function() {
+		document.removeEventListener('keydown', this.handleControlKeys);
+	},
+
+	handleControlKeys : function(e){
+		if(!(e.ctrlKey || e.metaKey)) return;
+		const S_KEY = 83;
+		const P_KEY = 80;
+		if(e.keyCode == S_KEY) this.save();
+		if(e.keyCode == P_KEY) this.print();
+		if(e.keyCode == P_KEY || e.keyCode == S_KEY){
+			e.stopPropagation();
+			e.preventDefault();
+		}
+	},
+
+	handleSplitMove : function(){
+		this.refs.editor.update();
+	},
+
+	handleMetadataChange : function(metadata){
+		this.setState({
+			metadata : _.merge({}, this.state.metadata, metadata)
+		});
+	},
+
+	handleTextChange : function(text){
+		this.setState({
+			text   : text,
+			errors : Markdown.validate(text)
+		});
+		localStorage.setItem(KEY, text);
+	},
+
+	save : async function(){
+		this.setState({
+			isSaving : true
+		});
+
+		console.log('saving new brew');
+
+		if(this.state.saveGoogle) {
+			const res = await request
+			.post('/api/newGoogle/')
+			.send(_.merge({}, this.state.metadata, { text: this.state.text }))
+			.catch((err)=>{
+				console.log(err.status === 401
+					? 'Not signed in!'
+					: 'Error Creating New Google Brew!');
+				this.setState({ isSaving: false });
+				return;
+			});
+
+			const brew = res.body;
+			localStorage.removeItem(KEY);
+			window.location = `/edit/${brew.googleId}${brew.editId}`;
+		} else {
+			request.post('/api')
+			.send(_.merge({}, this.state.metadata, {
+				text : this.state.text
+			}))
+			.end((err, res)=>{
+				if(err){
+					this.setState({
+						isSaving : false
+					});
+					return;
+				}
+				window.onbeforeunload = function(){};
+				const brew = res.body;
+				localStorage.removeItem(KEY);
+				window.location = `/edit/${brew.editId}`;
+			});
+		}
+
+	},
+
+	renderSaveButton : function(){
+		if(this.state.isSaving){
+			return <Nav.item icon='fa-spinner fa-spin' className='saveButton'>
+				save...
+			</Nav.item>;
+		} else {
+			return <Nav.item icon='fa-save' className='saveButton' onClick={this.save}>
+				save
+			</Nav.item>;
+		}
+	},
+
+	print : function(){
+		localStorage.setItem('print', this.state.text);
+		window.open('/print?dialog=true&local=print', '_blank');
+	},
+
+	renderLocalPrintButton : function(){
+		return <Nav.item color='purple' icon='fa-file-pdf-o' onClick={this.print}>
+			get PDF
+		</Nav.item>;
+	},
+
+	renderNavbar : function(){
+		return <Navbar>
+
+			<Nav.section>
+				<Nav.item className='brewTitle'>{this.state.metadata.title}</Nav.item>
+			</Nav.section>
+
+			<Nav.section>
+				{this.renderSaveButton()}
+				{this.renderLocalPrintButton()}
+				<IssueNavItem />
+				<RecentNavItem />
+				<AccountNavItem />
+			</Nav.section>
+		</Navbar>;
+	},
+
+	render : function(){
+		return <div className='newPage page'>
+			{this.renderNavbar()}
+			<div className='content'>
+				<SplitPane onDragFinish={this.handleSplitMove} ref='pane'>
+					<Editor
+						ref='editor'
+						value={this.state.text}
+						onChange={this.handleTextChange}
+						metadata={this.state.metadata}
+						onMetadataChange={this.handleMetadataChange}
+					/>
+					<BrewRenderer text={this.state.text} errors={this.state.errors} />
+				</SplitPane>
+			</div>
+		</div>;
+	}
+});
+
+module.exports = NewPage;

client/homebrew/pages/printPage/printPage.jsx

@@ -1,46 +1,52 @@
+require('./printPage.less');
 const React = require('react');
+const createClass = require('create-react-class');
 const _     = require('lodash');
 const cx    = require('classnames');
+const { Meta } = require('vitreum/headtags');
 const Markdown = require('naturalcrit/markdown.js');
 
-const PrintPage = React.createClass({
-	getDefaultProps: function() {
+const PrintPage = createClass({
+	getDefaultProps : function() {
 		return {
 			query : {},
-			brew : {
+			brew  : {
 				text : '',
 			}
 		};
 	},
 
-	getInitialState: function() {
+	getInitialState : function() {
 		return {
-			brewText: this.props.brew.text
+			brewText : this.props.brew.text
 		};
 	},
 
-	componentDidMount: function() {
+	componentDidMount : function() {
 		if(this.props.query.local){
-			this.setState({ brewText : localStorage.getItem(this.props.query.local)});
+			this.setState((prevState, prevProps)=>({
+				brewText : localStorage.getItem(prevProps.query.local)
+			}));
 		}
 
 		if(this.props.query.dialog) window.print();
 	},
 
 	renderPages : function(){
-		return _.map(this.state.brewText.split('\\page'), (page, index) => {
+		return _.map(this.state.brewText.split('\\page'), (page, index)=>{
 			return <div
 				className='phb'
 				id={`p${index + 1}`}
-				dangerouslySetInnerHTML={{__html:Markdown.render(page)}}
+				dangerouslySetInnerHTML={{ __html: Markdown.render(page) }}
 				key={index} />;
 		});
 	},
 
 	render : function(){
 		return <div>
+			<Meta name='robots' content='noindex, nofollow' />
 			{this.renderPages()}
-		</div>
+		</div>;
 	}
 });
 

client/homebrew/pages/sharePage/sharePage.jsx

@@ -1,71 +1,77 @@
-const React = require('react');
-const _ = require('lodash');
-const cx = require('classnames');
-
-const Nav = require('naturalcrit/nav/nav.jsx');
-const Navbar = require('../../navbar/navbar.jsx');
-const PrintLink = require('../../navbar/print.navitem.jsx');
-const ReportIssue = require('../../navbar/issue.navitem.jsx');
-//const RecentlyViewed = require('../../navbar/recent.navitem.jsx').viewed;
-const Account = require('../../navbar/account.navitem.jsx');
-
-
-const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
-
-
-const SharePage = React.createClass({
-	getDefaultProps: function() {
-		return {
-			brew : {
-				title : '',
-				text : '',
-				shareId : null,
-				createdAt : null,
-				updatedAt : null,
-				views : 0
-			}
-		};
-	},
-
-	componentDidMount: function() {
-		document.addEventListener('keydown', this.handleControlKeys);
-	},
-	componentWillUnmount: function() {
-		document.removeEventListener('keydown', this.handleControlKeys);
-	},
-	handleControlKeys : function(e){
-		if(!(e.ctrlKey || e.metaKey)) return;
-		const P_KEY = 80;
-		if(e.keyCode == P_KEY){
-			window.open(`/print/${this.props.brew.shareId}?dialog=true`, '_blank').focus();
-			e.stopPropagation();
-			e.preventDefault();
-		}
-	},
-
-	render : function(){
-		return <div className='sharePage page'>
-			<Navbar>
-				<Nav.section>
-					<Nav.item className='brewTitle'>{this.props.brew.title}</Nav.item>
-				</Nav.section>
-
-				<Nav.section>
-					<ReportIssue />
-					{/*<RecentlyViewed brew={this.props.brew} />*/}
-					<PrintLink shareId={this.props.brew.shareId} />
-					<Nav.item href={'/source/' + this.props.brew.shareId} color='teal' icon='fa-code'>
-						source
-					</Nav.item>
-					<Account />
-				</Nav.section>
-			</Navbar>
-
-			<div className='content'>
-				<BrewRenderer text={this.props.brew.text} />
-			</div>
-		</div>
-	}
-});
-
-module.exports = SharePage;
+require('./sharePage.less');
+const React = require('react');
+const createClass = require('create-react-class');
+const { Meta } = require('vitreum/headtags');
+
+const Nav = require('naturalcrit/nav/nav.jsx');
+const Navbar = require('../../navbar/navbar.jsx');
+const PrintLink = require('../../navbar/print.navitem.jsx');
+const RecentNavItem = require('../../navbar/recent.navitem.jsx').both;
+const Account = require('../../navbar/account.navitem.jsx');
+
+
+const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
+
+
+const SharePage = createClass({
+	getDefaultProps : function() {
+		return {
+			brew : {
+				title     : '',
+				text      : '',
+				shareId   : null,
+				createdAt : null,
+				updatedAt : null,
+				views     : 0
+			}
+		};
+	},
+
+	componentDidMount : function() {
+		document.addEventListener('keydown', this.handleControlKeys);
+	},
+	componentWillUnmount : function() {
+		document.removeEventListener('keydown', this.handleControlKeys);
+	},
+	handleControlKeys : function(e){
+		if(!(e.ctrlKey || e.metaKey)) return;
+		const P_KEY = 80;
+		if(e.keyCode == P_KEY){
+			window.open(`/print/${this.props.brew.shareId}?dialog=true`, '_blank').focus();
+			e.stopPropagation();
+			e.preventDefault();
+		}
+	},
+
+	processShareId : function() {
+		return this.props.brew.googleId ?
+					 this.props.brew.googleId + this.props.brew.shareId :
+					 this.props.brew.shareId;
+	},
+
+	render : function(){
+		return <div className='sharePage page'>
+			<Meta name='robots' content='noindex, nofollow' />
+			<Navbar>
+				<Nav.section>
+					<Nav.item className='brewTitle'>{this.props.brew.title}</Nav.item>
+				</Nav.section>
+
+				<Nav.section>
+					<PrintLink shareId={this.processShareId()} />
+					<Nav.item href={`/source/${this.processShareId()}`} color='teal' icon='fa-code'>
+						source
+					</Nav.item>
+					<RecentNavItem brew={this.props.brew} storageKey='view' />
+					<Account />
+				</Nav.section>
+			</Navbar>
+
+			<div className='content'>
+				<BrewRenderer text={this.props.brew.text} />
+			</div>
+		</div>;
+	}
+});
+
+module.exports = SharePage;

client/homebrew/pages/sharePage/sharePage.less

@@ -1,3 +1,5 @@
 .sharePage{
-
+	.content{
+		overflow-y : hidden;
+	}
 }

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

@@ -1,14 +1,18 @@
+require('./brewItem.less');
 const React = require('react');
+const createClass = require('create-react-class');
 const _     = require('lodash');
 const cx    = require('classnames');
 const moment = require('moment');
-const request = require("superagent");
+const request = require('superagent');
 
-const BrewItem = React.createClass({
-	getDefaultProps: function() {
+const googleDriveIcon = require('../../../googleDrive.png');
+
+const BrewItem = createClass({
+	getDefaultProps : function() {
 		return {
 			brew : {
-				title : '',
+				title       : '',
 				description : '',
 
 				authors : []
@@ -17,29 +21,69 @@ const BrewItem = React.createClass({
 	},
 
 	deleteBrew : function(){
-		if(!confirm("are you sure you want to delete this brew?")) return;
-		if(!confirm("are you REALLY sure? You will not be able to recover it")) return;
+		if(this.props.brew.authors.length <= 1){
+			if(!confirm('Are you sure you want to delete this brew? Because you are the only owner of this brew, the document will be deleted permanently.')) return;
+			if(!confirm('Are you REALLY sure? You will not be able to recover the document.')) return;
+		} else {
+			if(!confirm('Are you sure you want to remove this brew from your collection? This will remove you as an editor, but other owners will still be able to access the document.')) return;
+			if(!confirm('Are you REALLY sure? You will lose editor access to this document.')) return;
+		}
 
-		request.get('/api/remove/' + 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(){
+	renderDeleteBrewLink : function(){
 		if(!this.props.brew.editId) return;
 
 		return <a onClick={this.deleteBrew}>
 			<i className='fa fa-trash' />
-		</a>
+		</a>;
 	},
-	renderEditLink: function(){
+
+	renderEditLink : function(){
 		if(!this.props.brew.editId) return;
 
-		return <a href={`/edit/${this.props.brew.editId}`} target='_blank'>
+		let editLink = this.props.brew.editId;
+		if(this.props.brew.googleId) {
+			editLink = this.props.brew.googleId + editLink;
+		}
+
+		return <a href={`/edit/${editLink}`} target='_blank' rel='noopener noreferrer'>
 			<i className='fa fa-pencil' />
-		</a>
+		</a>;
+	},
+
+	renderShareLink : function(){
+		if(!this.props.brew.shareId) return;
+
+		let shareLink = this.props.brew.shareId;
+		if(this.props.brew.googleId) {
+			shareLink = this.props.brew.googleId + shareLink;
+		}
+
+		return <a href={`/share/${shareLink}`} target='_blank' rel='noopener noreferrer'>
+			<i className='fa fa-share-alt' />
+		</a>;
+	},
+
+	renderGoogleDriveIcon : function(){
+		if(!this.props.brew.gDrive) return;
+
+		return <span>
+			<img className='googleDriveIcon' src={googleDriveIcon} alt='googleDriveIcon' />
+		</span>;
 	},
 
 	render : function(){
@@ -59,16 +103,15 @@ const BrewItem = React.createClass({
 				<span>
 					<i className='fa fa-refresh' /> {moment(brew.updatedAt).fromNow()}
 				</span>
+				{this.renderGoogleDriveIcon()}
 			</div>
 
 			<div className='links'>
-				<a href={`/share/${brew.shareId}`} target='_blank'>
-					<i className='fa fa-share-alt' />
-				</a>
+				{this.renderShareLink()}
 				{this.renderEditLink()}
 				{this.renderDeleteBrewLink()}
 			</div>
-		</div>
+		</div>;
 	}
 });
 

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

@@ -7,6 +7,7 @@
 	box-sizing                  : border-box;
 	overflow                    : hidden;
 	width                       : 48%;
+	min-height                  : 80px;
 	margin-right                : 15px;
 	margin-bottom               : 15px;
 	padding                     : 5px 15px 5px 8px;
@@ -24,7 +25,7 @@
 		font-family : ScalySans;
 		font-size   : 1.2em;
 		&>span{
-			margin-right : 15px;
+			margin-right : 12px;
 		}
 	}
 	&:hover{
@@ -55,6 +56,14 @@
 			&:hover{
 				opacity : 1;
 			}
+			i{
+				cursor : pointer;
+			}
 		}
 	}
-}
+	.googleDriveIcon {
+		height	: 20px;
+		padding : 0px;
+		margin  : -5px;
+	}
+}

client/homebrew/pages/userPage/userPage.jsx

@@ -1,74 +1,77 @@
+require('./userPage.less');
 const React = require('react');
+const createClass = require('create-react-class');
 const _     = require('lodash');
 const cx    = require('classnames');
 
 const Nav = require('naturalcrit/nav/nav.jsx');
 const Navbar = require('../../navbar/navbar.jsx');
 
-const RecentNavItem = require('../../navbar/recent.navitem.jsx');
+const RecentNavItem = require('../../navbar/recent.navitem.jsx').both;
 const Account = require('../../navbar/account.navitem.jsx');
 const BrewItem = require('./brewItem/brewItem.jsx');
 
-const brew = {
-	title : 'SUPER Long title woah now',
-	authors : []
-}
+// const brew = {
+// 	title   : 'SUPER Long title woah now',
+// 	authors : []
+// };
 
-const BREWS = _.times(25, ()=>{ return brew});
+//const BREWS = _.times(25, ()=>{ return brew;});
 
 
-const UserPage = React.createClass({
-	getDefaultProps: function() {
+const UserPage = createClass({
+	getDefaultProps : function() {
 		return {
 			username : '',
-			brews : []
+			brews    : []
 		};
 	},
+	getUsernameWithS : function() {
+		if(this.props.username.endsWith('s'))
+			return `${this.props.username}'`;
+		return `${this.props.username}'s`;
+	},
 
 	renderBrews : function(brews){
 		if(!brews || !brews.length) return <div className='noBrews'>No Brews.</div>;
 
 		const sortedBrews = _.sortBy(brews, (brew)=>{ return brew.title; });
 
-		return _.map(sortedBrews, (brew, idx) => {
-			return <BrewItem brew={brew} key={idx}/>
+		return _.map(sortedBrews, (brew, idx)=>{
+			return <BrewItem brew={brew} key={idx}/>;
 		});
 	},
 
 	getSortedBrews : function(){
 		return _.groupBy(this.props.brews, (brew)=>{
-			return (brew.published ? 'published' : 'private')
+			return (brew.published ? 'published' : 'private');
 		});
 	},
 
-	renderPrivateBrews : function(privateBrews){
-		if(!privateBrews || !privateBrews.length) return;
-
-		return [
-			<h1>{this.props.username}'s unpublished brews</h1>,
-			this.renderBrews(privateBrews)
-		];
-	},
-
 	render : function(){
 		const brews = this.getSortedBrews();
 
 		return <div className='userPage page'>
 			<Navbar>
 				<Nav.section>
-					<RecentNavItem.both />
+					<RecentNavItem />
 					<Account />
 				</Nav.section>
 			</Navbar>
 
 			<div className='content'>
 				<div className='phb'>
-					<h1>{this.props.username}'s brews</h1>
-					{this.renderBrews(brews.published)}
-					{this.renderPrivateBrews(brews.private)}
+					<div>
+						<h1>{this.getUsernameWithS()} brews</h1>
+						{this.renderBrews(brews.published)}
+					</div>
+					<div>
+						<h1>{this.getUsernameWithS()} unpublished brews</h1>
+						{this.renderBrews(brews.private)}
+					</div>
 				</div>
 			</div>
-		</div>
+		</div>;
 	}
 });
 

client/homebrew/pages/userPage/userPage.less

@@ -17,7 +17,7 @@
 		.phb{
 			.noColumns();
 			height     : auto;
-			min-height            : 279.4mm;
+			min-height : 279.4mm;
 			margin     : 20px auto;
 			&::after{
 				display : none;
@@ -30,4 +30,4 @@
 
 		}
 	}
-}
+}

client/homebrew/phbStyle/phb.style.less

@@ -1,4 +1,3 @@
-
 @import (less) 'shared/naturalcrit/styles/reset.less';
 @import (less) './client/homebrew/phbStyle/phb.fonts.css';
 @import (less) './client/homebrew/phbStyle/phb.assets.less';
@@ -156,6 +155,7 @@ body {
 		margin-bottom : 1em;
 		font-size     : 10pt;
 		thead{
+			display: table-row-group;
 			font-weight : 800;
 			th{
 				vertical-align : bottom;
@@ -189,6 +189,7 @@ body {
 		border-image        : @noteBorderImage 11;
 		border-image-outset : 9px 0px;
 		box-shadow          : 1px 4px 14px #888;
+		-webkit-transform   : translateZ(0); //Prevents shadows from breaking across columns
 		p, ul{
 			font-size   : 0.352cm;
 			line-height : 1.1em;
@@ -337,8 +338,8 @@ body {
 	p,blockquote,table{
 		z-index                     : 15;
 		-webkit-column-break-inside : avoid;
-		column-break-inside         : avoid;
-		overflow: hidden; /* Firefox fix */
+		page-break-inside           : avoid;
+		break-inside                : avoid;
 	}
 	//Better spacing for spell blocks
 	h4+p+hr+ul{
@@ -355,7 +356,8 @@ body {
 	}
 	li{
 		-webkit-column-break-inside : avoid;
-		column-break-inside         : avoid;
+		page-break-inside           : avoid;
+		break-inside                : avoid;
 	}
 }
 //*****************************
@@ -380,20 +382,8 @@ body {
 		text-indent                 : -1em;
 		list-style-type             : none;
 		-webkit-column-break-inside : auto;
-		column-break-inside         : auto;
-	}
-}
-//*****************************
-// *         PRINT
-// *****************************/
-.phb.print{
-	blockquote{
-		box-shadow : none;
-	}
-}
-@media print {
-	.phb .descriptive, .phb blockquote{
-		box-shadow : none;
+		page-break-inside           : auto;
+		break-inside                : auto;
 	}
 }
 //*****************************
@@ -415,7 +405,7 @@ body {
 	border              : initial;
 	border-style        : solid;
 	border-image-outset : 25px 17px;
-	border-image-repeat : round;
+	border-image-repeat : stretch;
 	border-image-slice  : 150 200 150 200;
 	border-image-source : @frameBorderImage;
 	border-image-width  : 47px;
@@ -423,9 +413,9 @@ body {
 		margin-bottom : 10px;
 	}
 }
-//*****************************
-// *       CLASS TABLE
-// *****************************/
+//************************************
+// *       DESCRIPTIVE TEXT BOX
+// ************************************/
 .phb .descriptive{
 	display             : block-inline;
 	margin-bottom       : 1em;
@@ -433,7 +423,7 @@ body {
 	font-family         : ScalySans;
 	border-style        : solid;
 	border-width        : 7px;
-	border-image        : @descriptiveBoxImage 12 round;
+	border-image        : @descriptiveBoxImage 12 stretch;
 	border-image-outset : 4px;
 	box-shadow          : 0px 0px 6px #faf7ea;
 	p{
@@ -462,7 +452,8 @@ body {
 // *****************************/
 .phb .toc{
 	-webkit-column-break-inside : avoid;
-	column-break-inside         : avoid;
+	page-break-inside           : avoid;
+	break-inside                : avoid;
 	a{
 		color           : black;
 		text-decoration : none;
@@ -477,4 +468,4 @@ body {
 	&>ul>li{
 		margin-bottom : 10px;
 	}
-}
+}

client/template.js

@@ -1,21 +1,19 @@
-module.exports = function(vitreum){
-	return `
-<!DOCTYPE html>
-<html>
-	<head>
-		<link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" />
-		<link href="//fonts.googleapis.com/css?family=Open+Sans:400,300,600,700" rel="stylesheet" type="text/css" />
-		<link rel="icon" href="/assets/homebrew/favicon.ico" type="image/x-icon" />
-		<title>The Homebrewery - NaturalCrit</title>
-		${vitreum.head}
-	</head>
-	<body>
-		<main id="reactRoot">${vitreum.body}</main>
-	</body>
-	${vitreum.js}
-</html>
-`;
-}
-
-
-
+module.exports = async(name, title = '', props = {})=>{
+	return `
+<!DOCTYPE html>
+<html>
+	<head>
+		<link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.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>
+		<link rel="icon" href="/assets/homebrew/favicon.ico" type="image/x-icon" />
+		<title>${title.length ? `${title} - The Homebrewery`: 'The Homebrewery - NaturalCrit'}</title>
+	</head>
+	<body>
+		<main id="reactRoot">${require(`../build/${name}/ssr.js`)(props)}</main>
+	</body>
+	<script src=${`/${name}/bundle.js`}></script>
+	<script>start_app(${JSON.stringify(props)})</script>
+</html>
+`;
+};

config/default.json

@@ -1,5 +1,6 @@
 {
 	"host" : "homebrewery.local.naturalcrit.com:8000",
 	"naturalcrit_url" : "local.naturalcrit.com:8010",
-	"secret" : "secret"
-}
+	"secret" : "secret",
+	"web_port" : 8000
+}

contributing.md

@@ -0,0 +1,45 @@
+# Contributing to Homebrewery
+
+## How can I contribute?
+
+### Improve documentation
+
+As a user of Homebrewery you're the perfect candidate to help us improve our documentation. Typo corrections, error fixes, better explanations, more examples, etc. Open issues for things that could be improved. Anything. Even improvements to this document.
+
+
+### Improve issues
+
+Some issues are created with missing information, not reproducible, or plain invalid. Help make them easier to resolve. Handling issues takes a lot of time that we could rather spend on fixing bugs and adding features.
+
+
+### Write code
+
+You can use issue labels to discover issues you could help out with:
+
+* [`blocked` issues](https://github.com/naturalcrit/homebrewery/labels/blocked) need help getting unstuck
+* [`bug` issues](https://github.com/naturalcrit/homebrewery/labels/bug) are known bugs we'd like to fix
+* [`feature` issues](https://github.com/naturalcrit/homebrewery/labels/feature) are features we're open to including
+* [`help wanted`](https://github.com/naturalcrit/homebrewery/labels/help%20wanted) labels are especially useful.
+
+If you're updating dependencies, please make sure you use npm@5.6.0 and commit the updated `package-lock.json` file.
+
+You can also refer to the [Development Roadmap on Trello](https://trello.com/b/q6kE29F8/development-roadmap)
+
+
+## Submitting an issue
+
+- The issue tracker is for issues. Use the [subreddit](https://www.reddit.com/r/homebrewery/) for support.
+- Search the issue tracker before opening an issue.
+- Use a clear and descriptive title.
+- Include as much information as possible: Steps to reproduce the issue, error message, browser type and version, etc.
+
+
+## Submitting a pull request
+
+- Non-trivial changes are often best discussed in an issue first, to prevent you from doing unnecessary work.
+- For ambitious tasks, you should try to get your work in front of the community for feedback as soon as possible. Open a pull request as soon as you have done the minimum needed to demonstrate your idea. At this early stage, don't worry about making things perfect, or 100% complete. Add a [WIP] prefix to the title, and describe what you still need to do. This lets reviewers know not to nit-pick small details or point out improvements you already know you need to make.
+- New features should be accompanied with tests and documentation if applicable.
+- Lint and test before submitting the pull request by running `$ npm run verify`.
+- If your code is not passing Linting checks due to a non-fixable warning, and you feel it's valid (eg. we lint on a file being too long, but sometimes a file just _has_ to be long), add `/* eslint-disable [rule-name] */` to the top of the file. Be sure to justfiy your lint override in your PR description.
+- Use a clear and descriptive title for the pull request and commits.
+- You might be asked to do changes to your pull request. There's never a need to open another pull request. [Just update the existing one.](https://github.com/RichardLitt/knowledge/blob/master/github/amending-a-commit-guide.md)

docker-compose.yml

@@ -0,0 +1,17 @@
+version: '2'
+services:
+  mongodb:
+    image: mongo:latest
+    volumes:
+      - mongodata:/data/db
+  homebrewery:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    image: homebrewery
+    environment:
+      MONGODB_URI: mongodb://mongodb/homebrewery
+    ports:
+      - "8000:8000"
+volumes:
+  mongodata:

freebsd/install.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+pkg install -y git nano node npm mongodb44
+
+sysrc mongod_enable=YES
+service mongod start
+
+cd /usr/local/
+git clone https://github.com/naturalcrit/homebrewery.git
+
+cd homebrewery
+npm install
+npm audit fix
+npm run postinstall
+
+cp freebsd/rc.d/homebrewery /usr/local/etc/rc.d/
+chmod +x /usr/local/etc/rc.d/homebrewery
+
+sysrc homebrewery_enable=YES
+service homebrewery start

freebsd/rc.d/homebrewery

@@ -0,0 +1,65 @@
+#!/bin/sh
+#
+# PROVIDE: homebrewery
+# REQUIRE: NETWORKING
+# KEYWORD: shutdown
+
+# Author: S Robertson
+# Version: 1.0.0
+
+# Description:
+#    This script runs HomeBrewery as a service under the supplied user on boot
+
+# How to use:
+#    Place this file in /usr/local/etc/rc.d/
+#    Add homebrewery_enable="YES" to /etc/rc.config
+#    (Optional) To run as non-root, add homebrewery_runAs="homebrewery" to /etc/rc.config
+#    (Optional) To pass HomeBrewery args, add homebrewery_args="" to /etc/rc.config
+
+# Freebsd rc library
+. /etc/rc.subr
+
+# General Info
+name="homebrewery"            # Safe name of program
+location="/usr/local/"	      # Install location
+program_name="homebrewery"    # Name of exec
+title="HomeBrewery"           # Title to display in top/htop
+
+# RC.config vars
+load_rc_config $name      # Loading rc config vars
+: ${homebrewery_enable="NO"}  # Default: Do not enable HomeBrewery
+: ${homebrewery_runAs="root"} # Default: Run HomeBrewery as root
+: ${homebrewery_port=8000}    # Default: Run HomeBrewery on port 8000
+: ${homebrewery_NODE_ENV="local"}  # Default: Run HomeBrewery in local mode
+
+# Freebsd Setup
+rcvar=homebrewery_enable                   # Enables the rc.conf YES/NO flag
+pidfile="/var/run/${program_name}.pid" 	   # File that allows the system to keep track of HomeBrewery status
+
+# Env Setup
+export HOME=$( getent passwd "homebrewery_runAs" | cut -d: -f6 ) # Gets the home directory of the runAs user
+export NODE_ENV=${homebrewery_NODE_ENV}
+export PORT=${homebrewery_port}
+
+# Command Setup
+exec_cmd="${location}/${program_name}/server.js" 	# Path to the HomeBrewery server.js, /usr/local/bin/ when installed globally
+output_file="/var/log/${program_name}.log" 		# Path to HomeBrewery output file
+
+# Command
+command="/usr/sbin/daemon"
+command_args="-r -t ${title} -u ${homebrewery_runAs} -o ${output_file} -P ${pidfile} /usr/local/bin/node ${exec_cmd} ${homebrewery_args}"
+
+# Extra Commands
+extra_commands="dev_mode"
+
+dev_mode_cmd="homebrewery_dev_mode"
+
+homebrewery_dev_mode() {
+echo "Starting HomeBrewery in live rebuild Developer mode..."
+cd ${location}/${program_name}/
+/usr/local/bin/node ${location}/${program_name}/scripts/buildHomebrew.js --dev
+}
+
+# Loading Config
+load_rc_config ${name}
+run_rc_command "$1"

package.json

@@ -1,39 +1,77 @@
 {
   "name": "homebrewery",
   "description": "Create authentic looking D&D homebrews using only markdown",
-  "version": "2.7.2",
+  "version": "2.10.7",
+  "engines": {
+    "node": "12.16.x"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/naturalcrit/homebrewery.git"
+  },
   "scripts": {
     "dev": "node scripts/dev.js",
     "quick": "node scripts/quick.js",
-    "build": "node scripts/build.js",
+    "build": "node scripts/buildHomebrew.js",
+    "buildall": "node scripts/buildHomebrew.js && node scripts/buildAdmin.js",
+    "lint": "eslint --fix **/*.{js,jsx}",
+    "lint:dry": "eslint **/*.{js,jsx}",
+    "circleci": "npm test && eslint **/*.{js,jsx} --max-warnings=0",
+    "verify": "npm run lint && npm test",
+    "test": "pico-check",
+    "test:dev": "pico-check -v -w",
     "phb": "node scripts/phb.js",
-    "prod": "set NODE_ENV=production&& npm run build",
-    "postinstall": "npm run build",
+    "prod": "set NODE_ENV=production && npm run build",
+    "postinstall": "npm run buildall",
     "start": "node server.js"
   },
   "author": "stolksdorf",
   "license": "MIT",
+  "eslintIgnore": [
+    "build/*"
+  ],
+  "pico-check": {
+    "require": "./tests/test.init.js"
+  },
+  "babel": {
+    "presets": [
+      "env",
+      "react"
+    ]
+  },
   "dependencies": {
-    "babel-preset-env": "^1.1.8",
-    "basic-auth": "^1.0.3",
-    "body-parser": "^1.14.2",
-    "classnames": "^2.2.0",
-    "codemirror": "^5.22.0",
-    "cookie-parser": "^1.4.3",
-    "express": "^4.13.3",
-    "jwt-simple": "^0.5.1",
-    "lodash": "^4.11.2",
-    "marked": "^0.3.5",
-    "moment": "^2.11.0",
-    "mongoose": "^4.3.3",
-    "nconf": "^0.8.4",
-    "pico-flux": "^1.1.0",
-    "pico-router": "^1.1.0",
-    "react": "^15.0.2",
-    "react-dom": "^15.0.2",
-    "shortid": "^2.2.4",
-    "striptags": "^2.1.1",
-    "superagent": "^1.6.1",
-    "vitreum": "^4.0.12"
+    "@babel/core": "^7.12.10",
+    "@babel/preset-env": "^7.12.11",
+    "@babel/preset-react": "^7.12.10",
+    "body-parser": "^1.19.0",
+    "classnames": "^2.2.6",
+    "codemirror": "^5.59.2",
+    "cookie-parser": "^1.4.5",
+    "create-react-class": "^15.7.0",
+    "express": "^4.17.1",
+    "express-static-gzip": "2.1.1",
+    "fs-extra": "9.1.0",
+    "googleapis": "67.0.0",
+    "jwt-simple": "^0.5.6",
+    "less": "^3.13.1",
+    "lodash": "^4.17.20",
+    "marked": "^0.3.19",
+    "moment": "^2.29.1",
+    "mongoose": "^5.11.13",
+    "nanoid": "3.1.20",
+    "nconf": "^0.11.1",
+    "prop-types": "15.7.2",
+    "query-string": "6.13.8",
+    "react": "^16.14.0",
+    "react-dom": "^16.14.0",
+    "react-frame-component": "4.1.3",
+    "react-router-dom": "5.2.0",
+    "superagent": "^6.1.0",
+    "vitreum": "github:calculuschild/vitreum#21a8e1c9421f1d3a3b474c12f480feb2fbd28c5b"
+  },
+  "devDependencies": {
+    "eslint": "^7.18.0",
+    "eslint-plugin-react": "^7.22.0",
+    "pico-check": "^2.0.3"
   }
 }

robots.txt

@@ -0,0 +1,2 @@
+# Notes
+User-agent: *

scripts/build.js

@@ -1,20 +0,0 @@
-const label = 'build';
-console.time(label);
-
-const clean = require('vitreum/steps/clean.js');
-const jsx   = require('vitreum/steps/jsx.js').partial;
-const lib   = require('vitreum/steps/libs.js').partial;
-const less  = require('vitreum/steps/less.js').partial;
-const asset = require('vitreum/steps/assets.js').partial;
-
-const Proj = require('./project.json');
-
-clean()
-	.then(lib(Proj.libs))
-	.then(jsx('homebrew', './client/homebrew/homebrew.jsx', Proj.libs, ['./shared']))
-	.then(less('homebrew', ['./shared']))
-	.then(jsx('admin', './client/admin/admin.jsx', Proj.libs, ['./shared']))
-	.then(less('admin', ['./shared']))
-	.then(asset(Proj.assets, ['./shared', './client']))
-	.then(console.timeEnd.bind(console, label))
-	.catch(console.error);

scripts/buildAdmin.js

@@ -0,0 +1,31 @@
+const fs = require('fs-extra');
+const Proj = require('./project.json');
+
+const { pack } = require('vitreum');
+const isDev = !!process.argv.find((arg)=>arg=='--dev');
+
+const lessTransform  = require('vitreum/transforms/less.js');
+const assetTransform = require('vitreum/transforms/asset.js');
+//const Meta = require('vitreum/headtags');
+
+const transforms = {
+	'.less' : lessTransform,
+	'*'     : assetTransform('./build')
+};
+
+const build = async ({ bundle, render, ssr })=>{
+	await fs.outputFile('./build/admin/bundle.css', await lessTransform.generate({ paths: './shared' }));
+	await fs.outputFile('./build/admin/bundle.js', bundle);
+	await fs.outputFile('./build/admin/ssr.js', ssr);
+	await fs.outputFile('./build/admin/render.js', render);
+};
+
+fs.emptyDirSync('./build/admin');
+pack('./client/admin/admin.jsx', {
+	paths : ['./shared'],
+	libs  : Proj.libs,
+	dev   : isDev && build,
+	transforms
+})
+	.then(build)
+	.catch(console.error);

scripts/buildHomebrew.js

@@ -0,0 +1,47 @@
+const fs = require('fs-extra');
+const zlib = require('zlib');
+const Proj = require('./project.json');
+
+const { pack, watchFile, livereload } = require('vitreum');
+const isDev = !!process.argv.find((arg)=>arg=='--dev');
+
+const lessTransform  = require('vitreum/transforms/less.js');
+const assetTransform = require('vitreum/transforms/asset.js');
+//const Meta = require('vitreum/headtags');
+
+const transforms = {
+	'.less' : lessTransform,
+	'*'     : assetTransform('./build')
+};
+
+const build = async ({ bundle, render, ssr })=>{
+	const css = await lessTransform.generate({ paths: './shared' });
+	await fs.outputFile('./build/homebrew/bundle.css', css);
+	await fs.outputFile('./build/homebrew/bundle.js', bundle);
+	await fs.outputFile('./build/homebrew/ssr.js', ssr);
+	await fs.outputFile('./build/homebrew/render.js', render);
+
+	//compress files
+	await fs.outputFile('./build/homebrew/bundle.css.br', zlib.brotliCompressSync(css));
+	await fs.outputFile('./build/homebrew/bundle.js.br', zlib.brotliCompressSync(bundle));
+	await fs.outputFile('./build/homebrew/ssr.js.br', zlib.brotliCompressSync(ssr));
+};
+
+fs.emptyDirSync('./build/homebrew');
+pack('./client/homebrew/homebrew.jsx', {
+	paths : ['./shared'],
+	libs  : Proj.libs,
+	dev   : isDev && build,
+	transforms
+})
+	.then(build)
+	.catch(console.error);
+
+
+//In development set up a watch server and livereload
+if(isDev){
+	livereload('./build');
+	watchFile('./server.js', {
+		watch : ['./homebrew'] // Watch additional folders if you want
+	});
+}

scripts/dev.js

@@ -1,23 +1,22 @@
 const label = 'dev';
 console.time(label);
 
-const jsx = require('vitreum/steps/jsx.watch.js').partial;
-const less = require('vitreum/steps/less.watch.js').partial;
-const assets = require('vitreum/steps/assets.watch.js').partial;
-const server = require('vitreum/steps/server.watch.js').partial;
-const livereload = require('vitreum/steps/livereload.js').partial;
+const jsx = require('vitreum/steps/jsx.watch.js');
+const less = require('vitreum/steps/less.watch.js');
+const assets = require('vitreum/steps/assets.watch.js');
+const server = require('vitreum/steps/server.watch.js');
+const livereload = require('vitreum/steps/livereload.js');
 
 const Proj = require('./project.json');
 
 Promise.resolve()
-	.then(jsx('homebrew', './client/homebrew/homebrew.jsx', Proj.libs, './shared'))
-	.then(less('homebrew', './shared'))
+	.then(()=>jsx('homebrew', './client/homebrew/homebrew.jsx', { libs: Proj.libs, shared: ['./shared'] }))
+	.then((deps)=>less('homebrew', { shared: ['./shared'] }, deps))
+	.then(()=>jsx('admin', './client/admin/admin.jsx', { libs: Proj.libs, shared: ['./shared'] }))
+	.then((deps)=>less('admin', { shared: ['./shared'] }, deps))
 
-	.then(jsx('admin', './client/admin/admin.jsx', Proj.libs, './shared'))
-	.then(less('admin', './shared'))
-
-	.then(assets(Proj.assets, ['./shared', './client']))
-	.then(livereload())
-	.then(server('./server.js', ['server']))
+	.then(()=>assets(Proj.assets, ['./shared', './client']))
+	.then(()=>livereload())
+	.then(()=>server('./server.js', ['server']))
 	.then(console.timeEnd.bind(console, label))
-	.catch(console.error)
+	.catch(console.error);

scripts/phb.js

@@ -1,10 +1,10 @@
 const less = require('less');
 const fs = require('fs');
 
-less.render(fs.readFileSync('./client/homebrew/phbStyle/phb.style.less', 'utf8'), {compress : true})
-	.then((output) => {
+less.render(fs.readFileSync('./client/homebrew/phbStyle/phb.style.less', 'utf8'), { compress: true })
+	.then((output)=>{
 		fs.writeFileSync('./phb.standalone.css', output.css);
 		console.log('phb.standalone.css created!');
-	}, (err) => {
+	}, (err)=>{
 		console.error(err);
 	});

scripts/project.json

@@ -5,6 +5,7 @@
 	"libs" : [
 		"react",
 		"react-dom",
+		"create-react-class",
 		"lodash",
 		"classnames",
 		"codemirror",
@@ -12,8 +13,6 @@
 		"codemirror/mode/javascript/javascript.js",
 		"moment",
 		"superagent",
-		"marked",
-		"pico-router",
-		"pico-flux"
+		"marked"
 	]
-}
+}

server.js

@@ -1,140 +1,237 @@
-const _ = require('lodash');
-const jwt = require('jwt-simple');
-const express = require("express");
-const app = express();
-
-app.use(express.static(__dirname + '/build'));''
-app.use(require('body-parser').json({limit: '25mb'}));
-app.use(require('cookie-parser')());
-
-const config = require('nconf')
-	.argv()
-	.env({ lowerCase: true })
-	.file('environment', { file: `config/${process.env.NODE_ENV}.json` })
-	.file('defaults', { file: 'config/default.json' });
-
-//DB
-require('mongoose')
-	.connect(process.env.MONGODB_URI || process.env.MONGOLAB_URI || 'mongodb://localhost/naturalcrit')
-	.connection.on('error', () => {
-		console.log('Error : Could not connect to a Mongo Database.');
-		console.log('        If you are running locally, make sure mongodb.exe is running.');
-	});
-
-
-//Account MIddleware
-app.use((req, res, next) => {
-	if(req.cookies && req.cookies.nc_session){
-		try{
-			req.account = jwt.decode(req.cookies.nc_session, config.get('secret'));
-		}catch(e){}
-	}
-	return next();
-});
-
-
-app.use(require('./server/homebrew.api.js'));
-app.use(require('./server/admin.api.js'));
-
-
-const HomebrewModel = require('./server/homebrew.model.js').model;
-const welcomeText = require('fs').readFileSync('./client/homebrew/pages/homePage/welcome_msg.md', 'utf8');
-const changelogText = require('fs').readFileSync('./changelog.md', 'utf8');
-
-
-//Source page
-String.prototype.replaceAll = function(s,r){return this.split(s).join(r)}
-app.get('/source/:id', (req, res)=>{
-	HomebrewModel.get({shareId : req.params.id})
-		.then((brew)=>{
-			const text = brew.text.replaceAll('<', '&lt;').replaceAll('>', '&gt;');
-			return res.send(`<code><pre>${text}</pre></code>`);
-		})
-		.catch((err)=>{
-			console.log(err);
-			return res.status(404).send('Could not find Homebrew with that id');
-		})
-});
-
-
-app.get('/user/:username', (req, res, next) => {
-	const fullAccess = req.account && (req.account.username == req.params.username);
-	HomebrewModel.getByUser(req.params.username, fullAccess)
-		.then((brews) => {
-			req.brews = brews;
-			return next();
-		})
-		.catch((err) => {
-			console.log(err);
-		})
-})
-
-
-app.get('/edit/:id', (req, res, next)=>{
-	HomebrewModel.get({editId : req.params.id})
-		.then((brew)=>{
-			req.brew = brew.sanatize();
-			return next();
-		})
-		.catch((err)=>{
-			console.log(err);
-			return res.status(400).send(`Can't get that`);
-		});
-});
-
-//Share Page
-app.get('/share/:id', (req, res, next)=>{
-	HomebrewModel.get({shareId : req.params.id})
-		.then((brew)=>{
-			return brew.increaseView();
-		})
-		.then((brew)=>{
-			req.brew = brew.sanatize(true);
-			return next();
-		})
-		.catch((err)=>{
-			console.log(err);
-			return res.status(400).send(`Can't get that`);
-		});
-});
-
-//Print Page
-app.get('/print/:id', (req, res, next)=>{
-	HomebrewModel.get({shareId : req.params.id})
-		.then((brew)=>{
-			req.brew = brew.sanatize(true);
-			return next();
-		})
-		.catch((err)=>{
-			console.log(err);
-			return res.status(400).send(`Can't get that`);
-		});
-});
-
-
-//Render Page
-const render = require('vitreum/steps/render');
-const templateFn = require('./client/template.js');
-app.use((req, res) => {
-	render('homebrew', templateFn, {
-			version : require('./package.json').version,
-			url: req.originalUrl,
-			welcomeText : welcomeText,
-			changelog : changelogText,
-			brew : req.brew,
-			brews : req.brews,
-			account : req.account
-		})
-		.then((page) => {
-			return res.send(page)
-		})
-		.catch((err) => {
-			console.log(err);
-			return res.sendStatus(500);
-		});
-});
-
-
-const PORT = process.env.PORT || 8000;
-app.listen(PORT);
-console.log(`server on port:${PORT}`);
+const _ = require('lodash');
+const jwt = require('jwt-simple');
+const expressStaticGzip = require('express-static-gzip');
+const express = require('express');
+const app = express();
+
+const homebrewApi = require('./server/homebrew.api.js');
+const GoogleActions = require('./server/googleActions.js');
+
+// Serve brotli-compressed static files if available
+app.use('/', expressStaticGzip(`${__dirname}/build`, {
+	enableBrotli    : true,
+	orderPreference : ['br'],
+	index           : false
+}));
+
+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('./server/forcessl.mw.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
+const mongoose = require('mongoose');
+mongoose.connect(config.get('mongodb_uri') || config.get('mongolab_uri') || 'mongodb://localhost/naturalcrit',
+	{ retryWrites: false, useNewUrlParser: true });
+mongoose.connection.on('error', ()=>{
+	console.log('Error : Could not connect to a Mongo Database.');
+	console.log('        If you are running locally, make sure mongodb.exe is running.');
+	throw 'Can not connect to Mongo';
+});
+
+//Account Middleware
+app.use((req, res, next)=>{
+	if(req.cookies && req.cookies.nc_session){
+		try {
+			req.account = jwt.decode(req.cookies.nc_session, config.get('secret'));
+			//console.log("Just loaded up JWT from cookie:");
+			//console.log(req.account);
+		} catch (e){}
+	}
+
+	req.config = {
+		google_client_id     : config.get('google_client_id'),
+		google_client_secret : config.get('google_client_secret')
+	};
+	return next();
+});
+
+app.use(homebrewApi);
+app.use(require('./server/admin.api.js'));
+
+const HomebrewModel = require('./server/homebrew.model.js').model;
+const welcomeText = require('fs').readFileSync('./client/homebrew/pages/homePage/welcome_msg.md', 'utf8');
+const changelogText = require('fs').readFileSync('./changelog.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(`${__dirname}/robots.txt`);
+});
+
+//Source page
+app.get('/source/:id', (req, res)=>{
+	if(req.params.id.length > 12) {
+		const googleId = req.params.id.slice(0, -12);
+		const shareId = req.params.id.slice(-12);
+		GoogleActions.readFileMetadata(config.get('google_api_key'), googleId, shareId, 'share')
+		.then((brew)=>{
+			const text = brew.text.replaceAll('<', '&lt;').replaceAll('>', '&gt;');
+			return res.send(`<code><pre style="white-space: pre-wrap;">${text}</pre></code>`);
+		})
+		.catch((err)=>{
+			console.log(err);
+			return res.status(400).send('Can\'t get brew from Google');
+		});
+	} else {
+		HomebrewModel.get({ shareId: req.params.id })
+			.then((brew)=>{
+				const text = brew.text.replaceAll('<', '&lt;').replaceAll('>', '&gt;');
+				return res.send(`<code><pre style="white-space: pre-wrap;">${text}</pre></code>`);
+			})
+			.catch((err)=>{
+				console.log(err);
+				return res.status(404).send('Could not find Homebrew with that id');
+			});
+	}
+});
+
+//User Page
+app.get('/user/:username', async (req, res, next)=>{
+	const fullAccess = req.account && (req.account.username == req.params.username);
+
+	let googleBrews = [];
+
+	if(req.account && req.account.googleId){
+		googleBrews = await GoogleActions.listGoogleBrews(req, res)
+		.catch((err)=>{
+			console.error(err);
+		});
+	}
+
+	const brews = await HomebrewModel.getByUser(req.params.username, fullAccess)
+	.catch((err)=>{
+		console.log(err);
+	});
+
+	if(googleBrews) {
+		req.brews = _.concat(brews, googleBrews);
+	} else {req.brews = brews;}
+
+	return next();
+});
+
+//Edit Page
+app.get('/edit/:id', (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.
+	if(req.params.id.length > 12) {
+		const googleId = req.params.id.slice(0, -12);
+		const editId = req.params.id.slice(-12);
+		GoogleActions.readFileMetadata(config.get('google_api_key'), googleId, editId, 'edit')
+		.then((brew)=>{
+			req.brew = brew; //TODO Need to sanitize later
+			return next();
+		})
+		.catch((err)=>{
+			console.log(err);
+			return res.status(400).send('Can\'t get brew from Google');
+		});
+	} else {
+		HomebrewModel.get({ editId: req.params.id })
+			.then((brew)=>{
+				req.brew = brew.sanatize();
+				return next();
+			})
+			.catch((err)=>{
+				console.log(err);
+				return res.status(400).send(`Can't get that`);
+			});
+	}
+});
+
+//Share Page
+app.get('/share/:id', (req, res, next)=>{
+	if(req.params.id.length > 12) {
+		const googleId = req.params.id.slice(0, -12);
+		const shareId = req.params.id.slice(-12);
+		GoogleActions.readFileMetadata(config.get('google_api_key'), googleId, shareId, 'share')
+		.then((brew)=>{
+			GoogleActions.increaseView(googleId, shareId, 'share', brew);
+			return brew;
+		})
+		.then((brew)=>{
+			req.brew = brew; //TODO Need to sanitize later
+			return next();
+		})
+		.catch((err)=>{
+			console.log(err);
+			return res.status(400).send('Can\'t get brew from Google');
+		});
+	} else {
+		HomebrewModel.get({ shareId: req.params.id })
+			.then((brew)=>{
+				return brew.increaseView();
+			})
+			.then((brew)=>{
+				req.brew = brew.sanatize(true);
+				return next();
+			})
+			.catch((err)=>{
+				console.log(err);
+				return res.status(400).send(`Can't get that`);
+			});
+	}
+});
+
+//Print Page
+app.get('/print/:id', (req, res, next)=>{
+	if(req.params.id.length > 12) {
+		const googleId = req.params.id.slice(0, -12);
+		const shareId = req.params.id.slice(-12);
+		GoogleActions.readFileMetadata(config.get('google_api_key'), googleId, shareId, 'share')
+		.then((brew)=>{
+			req.brew = brew; //TODO Need to sanitize later
+			return next();
+		})
+		.catch((err)=>{
+			console.log(err);
+			return res.status(400).send('Can\'t get brew from Google');
+		});
+	} else {
+		HomebrewModel.get({ shareId: req.params.id })
+			.then((brew)=>{
+				req.brew = brew.sanatize(true);
+				return next();
+			})
+			.catch((err)=>{
+				console.log(err);
+				return res.status(400).send(`Can't get that`);
+			});
+	}
+});
+
+//Render the page
+//const render = require('.build/render');
+const templateFn = require('./client/template.js');
+app.use((req, res)=>{
+	const props = {
+		version     : require('./package.json').version,
+		url         : req.originalUrl,
+		welcomeText : welcomeText,
+		changelog   : changelogText,
+		brew        : req.brew,
+		brews       : req.brews,
+		googleBrews : req.googleBrews,
+		account     : req.account,
+	};
+	templateFn('homebrew', title = req.brew ? req.brew.title : '', props)
+        .then((page)=>{ res.send(page); })
+        .catch((err)=>{
+        	console.log(err);
+        	return res.sendStatus(500);
+        });
+});
+
+
+const PORT = process.env.PORT || config.get('web_port') || 8000;
+app.listen(PORT);
+console.log(`server on port:${PORT}`);

server/admin.api.js

@@ -1,85 +1,110 @@
-const _ = require('lodash');
-const auth = require('basic-auth');
 const HomebrewModel = require('./homebrew.model.js').model;
 const router = require('express').Router();
+const Moment = require('moment');
+//const render = require('vitreum/steps/render');
+const templateFn = require('../client/template.js');
+const zlib = require('zlib');
 
+process.env.ADMIN_USER = process.env.ADMIN_USER || 'admin';
+process.env.ADMIN_PASS = process.env.ADMIN_PASS || 'password3';
 
 const mw = {
 	adminOnly : (req, res, next)=>{
-		if(req.query && req.query.admin_key == process.env.ADMIN_KEY) return next();
+		if(!req.get('authorization')){
+			return res
+				.set('WWW-Authenticate', 'Basic realm="Authorization Required"')
+				.status(401)
+				.send('Authorization Required');
+		}
+		const [username, password] = new Buffer(req.get('authorization').split(' ').pop(), 'base64')
+			.toString('ascii')
+			.split(':');
+		if(process.env.ADMIN_USER === username && process.env.ADMIN_PASS === password){
+			return next();
+		}
 		return res.status(401).send('Access denied');
 	}
 };
 
-process.env.ADMIN_USER = process.env.ADMIN_USER || 'admin';
-process.env.ADMIN_PASS = process.env.ADMIN_PASS || 'password';
-process.env.ADMIN_KEY  = process.env.ADMIN_KEY  || 'admin_key';
 
+/* Search for brews that are older than 3 days and that are shorter than a tweet */
+const junkBrewQuery = HomebrewModel.find({
+	'$where'  : 'this.text.length < 140',
+	createdAt : {
+		$lt : Moment().subtract(30, 'days').toDate()
+	}
+}).limit(100).maxTime(60000);
 
+/* Search for brews that aren't compressed (missing the compressed text field) */
+const uncompressedBrewQuery = HomebrewModel.find({
+	'text' : { '$exists': true }
+}).lean().limit(10000).select('_id');
 
-//Removes all empty brews that are older than 3 days and that are shorter than a tweet
-router.get('/api/invalid', mw.adminOnly, (req, res)=>{
-	const invalidBrewQuery = HomebrewModel.find({
-		'$where' : "this.text.length < 140",
-		createdAt: {
-			$lt: Moment().subtract(3, 'days').toDate()
-		}
+router.get('/admin/cleanup', mw.adminOnly, (req, res)=>{
+	junkBrewQuery.exec((err, objs)=>{
+		if(err) return res.status(500).send(err);
+		return res.json({ count: objs.length });
+	});
+});
+/* Removes all empty brews that are older than 3 days and that are shorter than a tweet */
+router.post('/admin/cleanup', mw.adminOnly, (req, res)=>{
+	junkBrewQuery.remove().exec((err, objs)=>{
+		if(err) return res.status(500).send(err);
+		return res.json({ count: objs.length });
 	});
-
-	if(req.query.do_it){
-		invalidBrewQuery.remove().exec((err, objs)=>{
-			refreshCount();
-			return res.send(200);
-		})
-	}else{
-		invalidBrewQuery.exec((err, objs)=>{
-			if(err) console.log(err);
-			return res.json({
-				count : objs.length
-			})
-		})
-	}
 });
 
-router.get('/admin/lookup/:id', mw.adminOnly, (req, res, next) => {
-	//search for mathcing edit id
-	//search for matching share id
-	// search for partial match
-
-	HomebrewModel.findOne({ $or:[
-			{editId : { "$regex": req.params.id, "$options": "i" }},
-			{shareId : { "$regex": req.params.id, "$options": "i" }},
-		]}).exec((err, brew) => {
-			return res.json(brew);
-		});
+/* Searches for matching edit or share id, also attempts to partial match */
+router.get('/admin/lookup/:id', mw.adminOnly, (req, res, next)=>{
+	HomebrewModel.findOne({ $or : [
+		{ editId: { '$regex': req.params.id, '$options': 'i' } },
+		{ shareId: { '$regex': req.params.id, '$options': 'i' } },
+	] }).exec((err, brew)=>{
+		return res.json(brew);
+	});
 });
 
+/* Find 50 brews that aren't compressed yet */
+router.get('/admin/finduncompressed', mw.adminOnly, (req, res)=>{
+	uncompressedBrewQuery.exec((err, objs)=>{
+		if(err) return res.status(500).send(err);
+		objs = objs.map((obj)=>{return obj._id;});
+		return res.json({ count: objs.length, ids: objs });
+	});
+});
 
+/* Compresses the "text" field of a brew to binary */
+router.put('/admin/compress/:id', (req, res)=>{
+	HomebrewModel.get({ _id: req.params.id })
+		.then((brew)=>{
+			brew.textBin = zlib.deflateRawSync(brew.text);	// Compress brew text to binary before saving
+			brew.text = undefined;							// Delete the non-binary text field since it's not needed anymore
 
-//Admin route
-
-const render = require('vitreum/steps/render');
-const templateFn = require('../client/template.js');
-router.get('/admin', function(req, res){
-	const credentials = auth(req)
-	if (!credentials || credentials.name !== process.env.ADMIN_USER || credentials.pass !== process.env.ADMIN_PASS) {
-		res.setHeader('WWW-Authenticate', 'Basic realm="example"')
-		return res.status(401).send('Access denied')
-	}
-	render('admin', templateFn, {
-			url: req.originalUrl,
-			admin_key : process.env.ADMIN_KEY,
+			brew.save((err, obj)=>{
+				if(err) throw err;
+				return res.status(200).send(obj);
+			});
 		})
-		.then((page) => {
-			return res.send(page)
-		})
-		.catch((err) => {
+		.catch((err)=>{
 			console.log(err);
-			return res.sendStatus(500);
+			return res.status(500).send('Error while saving');
 		});
 });
 
+router.get('/admin/stats', mw.adminOnly, (req, res)=>{
+	HomebrewModel.count({}, (err, count)=>{
+		return res.json({
+			totalBrews : count
+		});
+	});
+});
 
+router.get('/admin', mw.adminOnly, (req, res)=>{
+	templateFn('admin', {
+		url : req.originalUrl
+	})
+		.then((page)=>res.send(page))
+		.catch((err)=>res.sendStatus(500));
+});
 
-
-module.exports = router;
+module.exports = router;

server/forcessl.mw.js

@@ -0,0 +1,7 @@
+module.exports = (req, res, next)=>{
+	if(process.env.NODE_ENV === 'local' || process.env.NODE_ENV === 'docker') return next();
+	if(req.header('x-forwarded-proto') !== 'https') {
+		return res.redirect(302, `https://${req.get('Host')}${req.url}`);
+	}
+	return next();
+};

server/googleActions.js

@@ -0,0 +1,361 @@
+/* eslint-disable max-lines */
+const _ = require('lodash');
+const { google } = require('googleapis');
+const { nanoid } = require('nanoid');
+const token = require('./token.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' });
+
+//let oAuth2Client;
+
+GoogleActions = {
+
+	authCheck : (account, res)=>{
+		if(!account || !account.googleId){ // If not signed into Google
+			const err = new Error('Not Signed In');
+			err.status = 401;
+			throw err;
+		}
+
+		const oAuth2Client = new google.auth.OAuth2(
+			config.get('google_client_id'),
+			config.get('google_client_secret'),
+			'/auth/google/redirect'
+		);
+
+		oAuth2Client.setCredentials({
+			access_token  : account.googleAccessToken, //Comment out to refresh token
+			refresh_token : account.googleRefreshToken
+		});
+
+		oAuth2Client.on('tokens', (tokens)=>{
+			if(tokens.refresh_token) {
+				account.googleRefreshToken = tokens.refresh_token;
+			}
+			account.googleAccessToken = tokens.access_token;
+			const JWTToken = token.generateAccessToken(account);
+
+			//Save updated token to cookie
+			//res.cookie('nc_session', JWTToken, { maxAge: 1000*60*60*24*365, path: '/', sameSite: 'lax' });
+			res.cookie('nc_session', JWTToken, { maxAge: 1000*60*60*24*365, path: '/', sameSite: 'lax', domain: '.naturalcrit.com' });
+		});
+
+		return oAuth2Client;
+	},
+
+	getGoogleFolder : async (auth)=>{
+		const drive = google.drive({ version: 'v3', auth: auth });
+
+		fileMetadata = {
+			'name'     : 'Homebrewery',
+			'mimeType' : 'application/vnd.google-apps.folder'
+		};
+
+		const obj = await drive.files.list({
+			q : 'mimeType = \'application/vnd.google-apps.folder\''
+		})
+		.catch((err)=>{
+			console.log('Error searching Google Drive Folders');
+			console.error(err);
+		});
+
+		let folderId;
+
+		if(obj.data.files.length == 0){
+			const obj = await drive.files.create({
+				resource : fileMetadata
+			})
+			.catch((err)=>{
+				console.log('Error creating google app folder');
+				console.error(err);
+			});
+
+			folderId = obj.data.id;
+		} else {
+			folderId = obj.data.files[0].id;
+		}
+
+		return folderId;
+	},
+
+	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 : 100,
+			fields   : 'nextPageToken, files(id, name, description, modifiedTime, properties)',
+			q        : 'mimeType != \'application/vnd.google-apps.folder\' and trashed = false'
+		})
+		.catch((err)=>{
+	    return console.error(`Error Listing Google Brews: ${err}`);
+	  });
+
+		if(!obj.data.files.length) {
+	    console.log('No files found.');
+	  }
+
+		const brews = obj.data.files.map((file)=>{
+	    return {
+	      text      : '',
+	      shareId   : file.properties.shareId,
+	      editId    : file.properties.editId,
+	      createdAt : file.createdTime,
+	      updatedAt : file.modifiedTime,
+	      gDrive    : true,
+	      googleId  : file.id,
+
+	      title       : file.properties.title,
+	      description : file.description,
+				views       : file.properties.views,
+	      tags        : '',
+	      published   : file.properties.published ? file.properties.published == 'true' : false,
+	      authors     : [req.account.username],	//TODO: properly save and load authors to google drive
+	      systems     : []
+	    };
+	  });
+
+	  return brews;
+	},
+
+	existsGoogleBrew : async (auth, id)=>{
+		const drive = google.drive({ version: 'v3', auth: auth });
+
+		const result = await drive.files.get({ fileId: id })
+		.catch((err)=>{
+			console.log('error checking file exists...');
+			console.log(err);
+			return false;
+		});
+
+		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,
+																	  lastViewed : brew.lastViewed,
+																	  views      : brew.views,
+																	  version    : brew.version,
+																	  tags       : brew.tags,
+																	  systems    : brew.systems.join() }
+									 },
+				media : { mimeType : 'text/plain',
+										 body     : brew.text }
+			})
+			.catch((err)=>{
+				console.log('Error saving to google');
+				console.error(err);
+				//return res.status(500).send('Error while saving');
+			});
+		}
+
+		return (brew);
+	},
+
+	newGoogleBrew : async (auth, brew)=>{
+		const drive = google.drive({ version: 'v3', auth: auth });
+
+		const media = {
+			mimeType : 'text/plain',
+			body     : brew.text
+		};
+
+		const folderId = await GoogleActions.getGoogleFolder(auth);
+
+		const fileMetadata = {
+			'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'
+			}
+		};
+
+		const obj = await drive.files.create({
+			resource : fileMetadata,
+			media    : media
+		})
+		.catch((err)=>{
+			console.error(err);
+			return res.status(500).send('Error while creating google brew');
+		});
+
+		if(!obj) return;
+
+		await drive.permissions.create({
+			resource : { type : 'anyone',
+									 role : 'writer' },
+			fileId : obj.data.id,
+			fields : 'id',
+		})
+		.catch((err)=>{
+			console.log('Error updating permissions');
+			console.error(err);
+		});
+
+		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,
+
+			title       : brew.title,
+			description : brew.description,
+			tags        : '',
+			published   : brew.published,
+			authors     : [],
+			systems     : []
+		};
+
+		return newHomebrew;
+	},
+
+	readFileMetadata : async (auth, id, accessId, accessType)=>{
+		const drive = google.drive({ version: 'v3', auth: auth });
+
+		const obj = await drive.files.get({
+			fileId : id,
+			fields : 'properties, createdTime, modifiedTime, description'
+		})
+		.catch((err)=>{
+			console.log('Error loading from Google');
+			console.error(err);
+			return;
+		});
+
+		if(obj) {
+			if(accessType == 'edit' && obj.data.properties.editId != accessId){
+				throw ('Edit ID does not match');
+			} else if(accessType == 'share' && obj.data.properties.shareId != accessId){
+				throw ('Share ID does not match');
+			}
+
+			//Access actual file with service account. Just api key is causing "automated query" errors.
+			const keys = JSON.parse(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'
+			})
+			.catch((err)=>{
+				console.log('Error getting file contents from Google');
+				console.error(err);
+			});
+
+			const brew = {
+				shareId : obj.data.properties.shareId,
+				editId  : obj.data.properties.editId,
+				title   : obj.data.properties.title,
+				text    : file.data,
+
+				description : obj.data.description,
+				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,
+
+				createdAt  : obj.data.createdTime,
+				updatedAt  : obj.data.modifiedTime,
+				lastViewed : obj.data.properties.lastViewed,
+				views      : parseInt(obj.data.properties.views) || 0, //brews with no view parameter will return undefined
+				version    : parseInt(obj.data.properties.version) || 0,
+
+				gDrive   : true,
+				googleId : id
+			};
+
+			return (brew);
+		}
+	},
+
+	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 : googleId,
+			fields : 'properties'
+		})
+		.catch((err)=>{
+			console.log('Error loading from Google');
+			console.error(err);
+			return;
+		});
+
+		if(obj && obj.data.properties.editId != accessId) {
+			throw ('Not authorized to delete this Google brew');
+		}
+
+		await drive.files.update({
+			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)=>{
+		//service account because this is modifying another user's file properties
+		//so we need extended scope
+		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: auth });
+
+		await drive.files.update({
+			fileId   : brew.googleId,
+			resource : { properties : { views      : brew.views + 1,
+		 															lastViewed : new Date() } }
+		})
+		.catch((err)=>{
+			console.log('Error updating Google views');
+			console.error(err);
+			//return res.status(500).send('Error while saving');
+		});
+
+		return;
+	}
+};
+
+module.exports = GoogleActions;

server/homebrew.api.js

@@ -1,144 +1,151 @@
-const _ = require('lodash');
-const Moment = require('moment');
-const HomebrewModel = require('./homebrew.model.js').model;
-const router = require('express').Router();
-
-
-
-//TODO: Possiblity remove
-let homebrewTotal = 0;
-const refreshCount = ()=>{
-	HomebrewModel.count({}, (err, total)=>{
-		homebrewTotal = total;
-	});
-};
-refreshCount();
-
-
-
-const getTopBrews = (cb)=>{
-	HomebrewModel.find().sort({views: -1}).limit(5).exec(function(err, brews) {
-		cb(brews);
-	});
-}
-
-const getGoodBrewTitle = (text) => {
-	const titlePos = text.indexOf('# ');
-	if(titlePos !== -1){
-		const ending = text.indexOf('\n', titlePos);
-		return text.substring(titlePos + 2, ending);
-	}else{
-		return _.find(text.split('\n'), (line)=>{
-			return line;
-		});
-	}
-};
-
-
-
-router.post('/api', (req, res)=>{
-
-	let authors = [];
-	if(req.account) authors = [req.account.username];
-
-	const newHomebrew = new HomebrewModel(_.merge({},
-		req.body,
-		{authors : authors}
-	));
-	if(!newHomebrew.title){
-		newHomebrew.title = getGoodBrewTitle(newHomebrew.text);
-	}
-	newHomebrew.save((err, obj)=>{
-		if(err){
-			console.error(err, err.toString(), err.stack);
-			return res.status(500).send(`Error while creating new brew, ${err.toString()}`);
-		}
-		return res.json(obj);
-	})
-});
-
-router.put('/api/update/:id', (req, res)=>{
-	HomebrewModel.get({editId : req.params.id})
-		.then((brew)=>{
-			brew = _.merge(brew, req.body);
-			brew.updatedAt = new Date();
-			if(req.account) brew.authors = _.uniq(_.concat(brew.authors, req.account.username));
-
-			brew.markModified('authors');
-			brew.markModified('systems');
-
-			brew.save((err, obj)=>{
-				if(err) throw err;
-				return res.status(200).send(obj);
-			})
-		})
-		.catch((err)=>{
-			console.log(err);
-			return res.status(500).send("Error while saving");
-		});
-});
-
-router.get('/api/remove/:id', (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");
-		var resEntry = objs[0];
-		resEntry.remove((err)=>{
-			if(err) return res.status(500).send("Error while removing");
-			return res.status(200).send();
-		})
-	});
-});
-
-
-module.exports = router;
-
-/*
-
-
-
-module.exports = function(app){
-
-	app;
-
-
-
-
-	app.get('/api/search', mw.adminOnly, function(req, res){
-
-		var page = req.query.page || 0;
-		var count = req.query.count || 20;
-
-		var query = {};
-		if(req.query && req.query.id){
-			query = {
-				"$or" : [{
-					editId : req.query.id
-				},{
-					shareId : req.query.id
-				}]
-			};
-		}
-
-		HomebrewModel.find(query, {
-			text : 0 //omit the text
-		}, {
-			skip: page*count,
-			limit: count*1
-		}, function(err, objs){
-			if(err) console.log(err);
-			return res.json({
-				page : page,
-				count : count,
-				total : homebrewTotal,
-				brews : objs
-			});
-
-		});
-	})
-
-
-
-
-	return app;
-}
-*/
+const _ = require('lodash');
+const HomebrewModel = require('./homebrew.model.js').model;
+const router = require('express').Router();
+const zlib = require('zlib');
+const GoogleActions = require('./googleActions.js');
+const Markdown = require('../shared/naturalcrit/markdown.js');
+
+// const getTopBrews = (cb) => {
+// 	HomebrewModel.find().sort({ views: -1 }).limit(5).exec(function(err, brews) {
+// 		cb(brews);
+// 	});
+// };
+
+const getGoodBrewTitle = (text)=>{
+	const tokens = Markdown.marked.lexer(text);
+ 	return title = (tokens.find((token)=>token.type == 'heading' || token.type == 'paragraph') || { text: 'No Title' }).text;
+};
+
+const newBrew = (req, res)=>{
+	const brew = req.body;
+	brew.authors = (req.account) ? [req.account.username] : [];
+
+	if(!brew.title) {
+		brew.title = getGoodBrewTitle(brew.text);
+	}
+
+	delete brew.editId;
+	delete brew.shareId;
+	delete brew.googleId;
+
+	const newHomebrew = new HomebrewModel(brew);
+	// Compress brew text to binary before saving
+	newHomebrew.textBin = zlib.deflateRawSync(newHomebrew.text);
+	// Delete the non-binary text field since it's not needed anymore
+	newHomebrew.text = undefined;
+
+	newHomebrew.save((err, obj)=>{
+		if(err) {
+			console.error(err, err.toString(), err.stack);
+			return res.status(500).send(`Error while creating new brew, ${err.toString()}`);
+		}
+
+		obj = obj.toObject();
+		obj.gDrive = false;
+		return res.status(200).send(obj);
+	});
+};
+
+const updateBrew = (req, res)=>{
+	HomebrewModel.get({ editId: req.params.id })
+		.then((brew)=>{
+			brew = _.merge(brew, req.body);
+			// Compress brew text to binary before saving
+			brew.textBin = zlib.deflateRawSync(req.body.text);
+			// Delete the non-binary text field since it's not needed anymore
+			brew.text = undefined;
+			brew.updatedAt = new Date();
+
+			if(req.account) {
+				brew.authors = _.uniq(_.concat(brew.authors, req.account.username));
+			}
+
+			brew.markModified('authors');
+			brew.markModified('systems');
+
+			brew.save((err, obj)=>{
+				if(err) throw err;
+				return res.status(200).send(obj);
+			});
+		})
+		.catch((err)=>{
+			console.error(err);
+			return res.status(500).send('Error while saving');
+		});
+};
+
+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 brew = objs[0];
+
+		if(req.account) {
+			// Remove current user as author
+			brew.authors = _.pull(brew.authors, req.account.username);
+			brew.markModified('authors');
+		}
+
+		if(brew.authors.length === 0) {
+			// Delete brew if there are no authors left
+			brew.remove((err)=>{
+				if(err) return res.status(500).send('Error while removing');
+				return res.status(200).send();
+			});
+		} 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;
+	brew.authors = (req.account) ? [req.account.username] : [];
+
+	if(!brew.title) {
+		brew.title = getGoodBrewTitle(brew.text);
+	}
+
+	delete brew.editId;
+	delete brew.shareId;
+	delete brew.googleId;
+
+	req.body = brew;
+
+	console.log(oAuth2Client);
+
+	const newBrew = await GoogleActions.newGoogleBrew(oAuth2Client, brew);
+
+	return res.status(200).send(newBrew);
+};
+
+const updateGoogleBrew = async (req, res, next)=>{
+	let oAuth2Client;
+
+	try {	oAuth2Client = GoogleActions.authCheck(req.account, res); } catch (err) { return res.status(err.status).send(err.message); }
+
+	const updatedBrew = await GoogleActions.updateGoogleBrew(oAuth2Client, req.body);
+
+	return res.status(200).send(updatedBrew);
+};
+
+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

@@ -1,81 +1,83 @@
-var mongoose = require('mongoose');
-var shortid = require('shortid');
-var _ = require('lodash');
-
-var HomebrewSchema = mongoose.Schema({
-	shareId : {type : String, default: shortid.generate, index: { unique: true }},
-	editId : {type : String, default: shortid.generate, index: { unique: true }},
-	title : {type : String, default : ""},
-	text : {type : String, default : ""},
-
-	description : {type : String, default : ""},
-	tags : {type : String, default : ""},
-	systems : [String],
-	authors : [String],
-	published : {type : Boolean, default : false},
-
-	createdAt     : { type: Date, default: Date.now },
-	updatedAt   : { type: Date, default: Date.now},
-	lastViewed  : { type: Date, default: Date.now},
-	views       : {type:Number, default:0},
-	version : {type: Number, default:1}
-}, { versionKey: false });
-
-
-
-HomebrewSchema.methods.sanatize = function(full=false){
-	const brew = this.toJSON();
-	delete brew._id;
-	delete brew.__v;
-	if(full){
-		delete brew.editId;
-	}
-	return brew;
-};
-
-
-HomebrewSchema.methods.increaseView = function(){
-	return new Promise((resolve, reject) => {
-		this.lastViewed = new Date();
-		this.views = this.views + 1;
-		this.save((err) => {
-			if(err) return reject(err);
-			return resolve(this);
-		});
-	});
-};
-
-
-
-HomebrewSchema.statics.get = function(query){
-	return new Promise((resolve, reject) => {
-		Homebrew.find(query, (err, brews)=>{
-			if(err || !brews.length) return reject('Can not find brew');
-			return resolve(brews[0]);
-		});
-	});
-};
-
-HomebrewSchema.statics.getByUser = function(username, allowAccess=false){
-	return new Promise((resolve, reject) => {
-		let query = {authors : username, published : true};
-		if(allowAccess){
-			delete query.published;
-		}
-		Homebrew.find(query, (err, brews)=>{
-			if(err) return reject('Can not find brew');
-			return resolve(_.map(brews, (brew)=>{
-				return brew.sanatize(!allowAccess);
-			}));
-		});
-	});
-};
-
-
-
-var Homebrew = mongoose.model('Homebrew', HomebrewSchema);
-
-module.exports = {
-	schema : HomebrewSchema,
-	model : Homebrew,
-}
+const mongoose = require('mongoose');
+const { nanoid } = require('nanoid');
+const _ = require('lodash');
+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 } },
+	title   : { type: String, default: '' },
+	text    : { type: String, default: '' },
+	textBin : { type: Buffer },
+
+	description : { type: String, default: '' },
+	tags        : { type: String, default: '' },
+	systems     : [String],
+	authors     : [String],
+	published   : { type: Boolean, default: false },
+
+	createdAt  : { type: Date, default: Date.now },
+	updatedAt  : { type: Date, default: Date.now },
+	lastViewed : { type: Date, default: Date.now },
+	views      : { type: Number, default: 0 },
+	version    : { type: Number, default: 1 }
+}, { versionKey: false });
+
+
+HomebrewSchema.methods.sanatize = function(full=false){
+	const brew = this.toJSON();
+	delete brew._id;
+	delete brew.__v;
+	if(full){
+		delete brew.editId;
+	}
+	return brew;
+};
+
+HomebrewSchema.methods.increaseView = async function(){
+	this.lastViewed = new Date();
+	this.views = this.views + 1;
+	const text = this.text;
+	this.text = undefined;
+	await this.save()
+	.catch((err)=>{
+		return err;
+	});
+	this.text = text;
+	return this;
+};
+
+HomebrewSchema.statics.get = function(query){
+	return new Promise((resolve, reject)=>{
+		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);
+				brews[0].text = unzipped.toString();
+			}
+			return resolve(brews[0]);
+		});
+	});
+};
+
+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, (err, brews)=>{
+			if(err) return reject('Can not find brew');
+			return resolve(_.map(brews, (brew)=>{
+				return brew.sanatize(!allowAccess);
+			}));
+		});
+	});
+};
+
+const Homebrew = mongoose.model('Homebrew', HomebrewSchema);
+
+module.exports = {
+	schema : HomebrewSchema,
+	model  : Homebrew,
+};

server/token.js

@@ -0,0 +1,33 @@
+const jwt = require('jwt-simple');
+
+// Load configuration values
+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)=>{
+	const payload = account;
+
+	// When the token was issued
+	payload.issued = (new Date());
+	// Which service issued the Token
+	payload.issuer = config.get('authentication_token_issuer');
+	// Which service is the token intended for
+	payload.audience = config.get('authentication_token_audience');
+	// The signing key for signing the token
+	delete payload.password;
+	delete payload._id;
+
+	const secret = config.get('authentication_token_secret');
+
+	const token = jwt.encode(payload, secret);
+
+	return token;
+};
+
+module.exports = {
+	generateAccessToken : generateAccessToken
+};

shared/homebrewery/renderWarnings/renderWarnings.jsx

@@ -1,19 +1,22 @@
-
+require('./renderWarnings.less');
 const React = require('react');
+const createClass = require('create-react-class');
 const _     = require('lodash');
 const cx    = require('classnames');
 
-const RenderWarnings = React.createClass({
-	getInitialState: function() {
+const DISMISS_KEY = 'dismiss_render_warning';
+
+const RenderWarnings = createClass({
+	getInitialState : function() {
 		return {
-			warnings: {}
+			warnings : {}
 		};
 	},
-	componentDidMount: function() {
+	componentDidMount : function() {
 		this.checkWarnings();
 		window.addEventListener('resize', this.checkWarnings);
 	},
-	componentWillUnmount: function() {
+	componentWillUnmount : function() {
 		window.removeEventListener('resize', this.checkWarnings);
 	},
 	warnings : {
@@ -22,41 +25,40 @@ const RenderWarnings = React.createClass({
 			if(!isChrome){
 				return <li key='chrome'>
 					<em>Built for Chrome </em> <br />
-					Other browsers do not support
-					<a target='_blank' href='https://developer.mozilla.org/en-US/docs/Web/CSS/column-span#Browser_compatibility'>
-						key features
-					</a> this site uses.
+					Other browsers have not been tested for compatiblilty. If you
+					experience issues with your document not rendering or printing
+					properly, please try using the latest version of Chrome before
+					submitting a bug report.
 				</li>;
 			}
 		},
-		zoom : function(){
-			return false;
-			if(window.devicePixelRatio !== 1){
-				return <li key='zoom'>
-					<em>Your browser is zoomed. </em> <br />
-					This can cause content to jump columns.
-				</li>;
-			}
-		}
 	},
 	checkWarnings : function(){
+		const hideDismiss = localStorage.getItem(DISMISS_KEY);
+		if(hideDismiss) return this.setState({ warnings: {} });
+
 		this.setState({
-			warnings : _.reduce(this.warnings, (r, fn, type) => {
+			warnings : _.reduce(this.warnings, (r, fn, type)=>{
 				const element = fn();
 				if(element) r[type] = element;
 				return r;
 			}, {})
-		})
+		});
 	},
-	render: function(){
+	dismiss : function(){
+		localStorage.setItem(DISMISS_KEY, true);
+		this.checkWarnings();
+	},
+	render : function(){
 		if(_.isEmpty(this.state.warnings)) return null;
 
 		return <div className='renderWarnings'>
-			<i className='fa fa-exclamation-triangle' />
+			<i className='fa fa-times dismiss' onClick={this.dismiss}/>
+			<i className='fa fa-exclamation-triangle ohno' />
 			<h3>Render Warnings</h3>
 			<small>If this homebrew is rendering badly if might be because of the following:</small>
 			<ul>{_.values(this.state.warnings)}</ul>
-		</div>
+		</div>;
 	}
 });
 

shared/homebrewery/renderWarnings/renderWarnings.less

@@ -1,22 +1,33 @@
-
 .renderWarnings{
-	position         : fixed;
+	position		 : relative;
+	float			 : right;
 	display          : inline-block;
-	top              : @navbarHeight;
-	right            : 15px;
-	z-index          : 10001;
 	width            : 350px;
 	padding          : 20px;
 	padding-bottom   : 10px;
 	padding-left     : 85px;
+	margin-bottom    : 10px;
 	background-color : @yellow;
 	color            : white;
-	i{
-		position: absolute;
-		left: 24px;
-		opacity: 0.8;
-		font-size: 2.5em;
-		top: 24px;
+	a{
+		font-weight : 800;
+	}
+	i.ohno{
+		position  : absolute;
+		top       : 24px;
+		left      : 24px;
+		opacity   : 0.8;
+		font-size : 2.5em;
+	}
+	i.dismiss{
+		position : absolute;
+		top      : 10px;
+		right    : 10px;
+		cursor   : pointer;
+		opacity  : 0.6;
+		&:hover{
+			opacity : 1;
+		}
 	}
 	small{
 		opacity   : 0.7;
@@ -32,10 +43,10 @@
 		list-style-position : outside;
 		list-style-type     : disc;
 		li{
+			font-size   : 0.8em;
 			line-height : 1.6em;
-			font-size: 0.8em;
 			em{
-				font-weight: 800;
+				font-weight : 800;
 			}
 		}
 	}

shared/naturalcrit/codeEditor/codeEditor.jsx

@@ -1,73 +1,97 @@
-var React = require('react');
-var _ = require('lodash');
-var cx = require('classnames');
-
-
-var CodeMirror;
-if(typeof navigator !== 'undefined'){
-	var CodeMirror = require('codemirror');
-
-	//Language Modes
-	require('codemirror/mode/gfm/gfm.js'); //Github flavoured markdown
-	require('codemirror/mode/javascript/javascript.js');
-}
-
-
-var CodeEditor = React.createClass({
-	getDefaultProps: function() {
-		return {
-			language : '',
-			value : '',
-			wrap : false,
-			onChange : function(){},
-			onCursorActivity : function(){},
-		};
-	},
-
-	componentDidMount: function() {
-		this.codeMirror = CodeMirror(this.refs.editor,{
-			value : this.props.value,
-			lineNumbers: true,
-			lineWrapping : this.props.wrap,
-			mode : this.props.language
-		});
-
-		this.codeMirror.on('change', this.handleChange);
-		this.codeMirror.on('cursorActivity', this.handleCursorActivity);
-		this.updateSize();
-	},
-
-	componentWillReceiveProps: function(nextProps){
-		if(this.codeMirror && nextProps.value !== undefined && this.codeMirror.getValue() != nextProps.value) {
-			this.codeMirror.setValue(nextProps.value);
-		}
-	},
-
-	shouldComponentUpdate: function(nextProps, nextState) {
-		return false;
-	},
-
-	setCursorPosition : function(line, char){
-		setTimeout(()=>{
-			this.codeMirror.focus();
-			this.codeMirror.doc.setCursor(line, char);
-		}, 10);
-	},
-
-	updateSize : function(){
-		this.codeMirror.refresh();
-	},
-
-	handleChange : function(editor){
-		this.props.onChange(editor.getValue());
-	},
-	handleCursorActivity : function(){
-		this.props.onCursorActivity(this.codeMirror.doc.getCursor());
-	},
-
-	render : function(){
-		return <div className='codeEditor' ref='editor' />
-	}
-});
-
-module.exports = CodeEditor;
+require('./codeEditor.less');
+const React = require('react');
+const createClass = require('create-react-class');
+const _ = require('lodash');
+const cx = require('classnames');
+
+
+let CodeMirror;
+if(typeof navigator !== 'undefined'){
+	CodeMirror = require('codemirror');
+
+	//Language Modes
+	require('codemirror/mode/gfm/gfm.js'); //Github flavoured markdown
+	require('codemirror/mode/javascript/javascript.js');
+}
+
+
+const CodeEditor = createClass({
+	getDefaultProps : function() {
+		return {
+			language         : '',
+			value            : '',
+			wrap             : false,
+			onChange         : function(){},
+			onCursorActivity : function(){},
+		};
+	},
+
+	componentDidMount : function() {
+		this.codeMirror = CodeMirror(this.refs.editor, {
+			value        : this.props.value,
+			lineNumbers  : true,
+			lineWrapping : this.props.wrap,
+			mode         : this.props.language,
+			extraKeys    : {
+				'Ctrl-B' : this.makeBold,
+				'Ctrl-I' : this.makeItalic
+			}
+		});
+
+		this.codeMirror.on('change', this.handleChange);
+		this.codeMirror.on('cursorActivity', this.handleCursorActivity);
+		this.updateSize();
+	},
+
+	makeBold : function() {
+		const selection = this.codeMirror.getSelection();
+		this.codeMirror.replaceSelection(`**${selection}**`, 'around');
+		if(selection.length === 0){
+			const cursor = this.codeMirror.getCursor();
+			this.codeMirror.setCursor({ line: cursor.line, ch: cursor.ch - 2 });
+		}
+	},
+
+	makeItalic : function() {
+		const selection = this.codeMirror.getSelection();
+		this.codeMirror.replaceSelection(`*${selection}*`, 'around');
+		if(selection.length === 0){
+			const cursor = this.codeMirror.getCursor();
+			this.codeMirror.setCursor({ line: cursor.line, ch: cursor.ch - 1 });
+		}
+	},
+
+	componentWillReceiveProps : function(nextProps){
+		if(this.codeMirror && nextProps.value !== undefined && this.codeMirror.getValue() != nextProps.value) {
+			this.codeMirror.setValue(nextProps.value);
+		}
+	},
+
+	shouldComponentUpdate : function(nextProps, nextState) {
+		return false;
+	},
+
+	setCursorPosition : function(line, char){
+		setTimeout(()=>{
+			this.codeMirror.focus();
+			this.codeMirror.doc.setCursor(line, char);
+		}, 10);
+	},
+
+	updateSize : function(){
+		this.codeMirror.refresh();
+	},
+
+	handleChange : function(editor){
+		this.props.onChange(editor.getValue());
+	},
+	handleCursorActivity : function(){
+		this.props.onCursorActivity(this.codeMirror.doc.getCursor());
+	},
+
+	render : function(){
+		return <div className='codeEditor' ref='editor' />;
+	}
+});
+
+module.exports = CodeEditor;

shared/naturalcrit/markdown.js

@@ -1,11 +1,11 @@
-var _ = require('lodash');
-var Markdown = require('marked');
-var renderer = new Markdown.Renderer();
+const _ = require('lodash');
+const Markdown = require('marked');
+const renderer = new Markdown.Renderer();
 
 //Processes the markdown within an HTML block if it's just a class-wrapper
 renderer.html = function (html) {
 	if(_.startsWith(_.trim(html), '<div') && _.endsWith(_.trim(html), '</div>')){
-		var openTag = html.substring(0, html.indexOf('>')+1);
+		const openTag = html.substring(0, html.indexOf('>')+1);
 		html = html.substring(html.indexOf('>')+1);
 		html = html.substring(0, html.lastIndexOf('</div>'));
 		return `${openTag} ${Markdown(html)} </div>`;
@@ -13,25 +13,103 @@ renderer.html = function (html) {
 	return html;
 };
 
+renderer.link = function (href, title, text) {
+	let self = false;
+	if(href[0] == '#') {
+		self = true;
+	}
+	href = cleanUrl(this.options.sanitize, this.options.baseUrl, href);
+
+	if(href === null) {
+		return text;
+	}
+	let out = `<a href="${escape(href)}"`;
+	if(title) {
+		out += ` title="${title}"`;
+	}
+	if(self) {
+		out += ' target="_self"';
+	}
+	out += `>${text}</a>`;
+	return out;
+};
+
+const nonWordAndColonTest = /[^\w:]/g;
+const cleanUrl = function (sanitize, base, href) {
+	if(sanitize) {
+		let prot;
+		try {
+			prot = decodeURIComponent(unescape(href))
+        .replace(nonWordAndColonTest, '')
+        .toLowerCase();
+		} catch (e) {
+			return null;
+		}
+		if(prot.indexOf('javascript:') === 0 || prot.indexOf('vbscript:') === 0 || prot.indexOf('data:') === 0) {
+			return null;
+		}
+	}
+	try {
+		href = encodeURI(href).replace(/%25/g, '%');
+	} catch (e) {
+		return null;
+	}
+	return href;
+};
+
+const escapeTest = /[&<>"']/;
+const escapeReplace = /[&<>"']/g;
+const escapeTestNoEncode = /[<>"']|&(?!#?\w+;)/;
+const escapeReplaceNoEncode = /[<>"']|&(?!#?\w+;)/g;
+const escapeReplacements = {
+	'&'  : '&amp;',
+	'<'  : '&lt;',
+	'>'  : '&gt;',
+	'"'  : '&quot;',
+	'\'' : '&#39;'
+};
+const getEscapeReplacement = (ch)=>escapeReplacements[ch];
+const escape = function (html, encode) {
+	if(encode) {
+		if(escapeTest.test(html)) {
+			return html.replace(escapeReplace, getEscapeReplacement);
+		}
+	} else {
+		if(escapeTestNoEncode.test(html)) {
+			return html.replace(escapeReplaceNoEncode, getEscapeReplacement);
+		}
+	}
+
+	return html;
+};
+
+const sanatizeScriptTags = (content)=>{
+	return content
+		.replace(/<script/ig, '&lt;script')
+		.replace(/<\/script>/ig, '&lt;/script&gt;');
+};
 
 const tagTypes = ['div', 'span', 'a'];
-const tagRegex = new RegExp('(' +
+const tagRegex = new RegExp(`(${
 	_.map(tagTypes, (type)=>{
 		return `\\<${type}|\\</${type}>`;
-	}).join('|') + ')', 'g');
+	}).join('|')})`, 'g');
 
 
 module.exports = {
 	marked : Markdown,
 	render : (rawBrewText)=>{
-		return Markdown(rawBrewText, {renderer : renderer})
+		return Markdown(
+			sanatizeScriptTags(rawBrewText),
+			{ renderer: renderer }
+		);
 	},
 
-	validate : (rawBrewText) => {
-		var errors = [];
-		var leftovers = _.reduce(rawBrewText.split('\n'), (acc, line, _lineNumber) => {
-			var lineNumber = _lineNumber + 1;
-			var matches = line.match(tagRegex);
+	validate : (rawBrewText)=>{
+		const errors = [];
+		const leftovers = _.reduce(rawBrewText.split('\n'), (acc, line, _lineNumber)=>{
+			const lineNumber = _lineNumber + 1;
+			const matches = line.match(tagRegex);
 			if(!matches || !matches.length) return acc;
 
 			_.each(matches, (match)=>{
@@ -48,16 +126,16 @@ module.exports = {
 								line : lineNumber,
 								type : type,
 								text : 'Unmatched closing tag',
-								id : 'CLOSE'
+								id   : 'CLOSE'
 							});
-						}else if(_.last(acc).type == type){
+						} else if(_.last(acc).type == type){
 							acc.pop();
-						}else{
+						} else {
 							errors.push({
-								line : _.last(acc).line + ' to ' + lineNumber,
+								line : `${_.last(acc).line} to ${lineNumber}`,
 								type : type,
 								text : 'Type mismatch on closing tag',
-								id : 'MISMATCH'
+								id   : 'MISMATCH'
 							});
 							acc.pop();
 						}
@@ -71,12 +149,11 @@ module.exports = {
 			errors.push({
 				line : unmatched.line,
 				type : unmatched.type,
-				text : "Unmatched opening tag",
-				id : 'OPEN'
-			})
+				text : 'Unmatched opening tag',
+				id   : 'OPEN'
+			});
 		});
 
 		return errors;
 	},
 };
-

shared/naturalcrit/nav/nav.jsx

@@ -1,72 +1,74 @@
-var React = require('react');
-var _ = require('lodash');
-var cx = require('classnames');
-
-var NaturalCritIcon = require('naturalcrit/svg/naturalcrit.svg.jsx');
-
-var Nav = {
-	base : React.createClass({
-		render : function(){
-			return <nav>
-				<div className='navContent'>
-					{this.props.children}
-				</div>
-			</nav>
-		}
-	}),
-	logo : function(){
-		return <a className='navLogo' href="http://naturalcrit.com">
-			<NaturalCritIcon />
-			<span className='name'>
-				Natural<span className='crit'>Crit</span>
-			</span>
-		</a>;
-	},
-
-	section : React.createClass({
-		render : function(){
-			return <div className='navSection'>
-				{this.props.children}
-			</div>
-		}
-	}),
-
-	item : React.createClass({
-		getDefaultProps: function() {
-			return {
-				icon : null,
-				href : null,
-				newTab : false,
-				onClick : function(){},
-				color : null
-			};
-		},
-		handleClick : function(){
-			this.props.onClick();
-		},
-		render : function(){
-			var classes = cx('navItem', this.props.color, this.props.className);
-
-			var icon;
-			if(this.props.icon) icon = <i className={'fa ' + this.props.icon} />;
-
-			const props = _.omit(this.props, ['newTab']);
-
-			if(this.props.href){
-				return <a {...props} className={classes} target={this.props.newTab ? '_blank' : '_self'} >
-					{this.props.children}
-					{icon}
-				</a>
-			}else{
-				return <div {...props} className={classes} onClick={this.handleClick} >
-					{this.props.children}
-					{icon}
-				</div>
-			}
-		}
-	}),
-
-};
-
-
-module.exports = Nav;
+require('./nav.less');
+const React = require('react');
+const createClass = require('create-react-class');
+const _ = require('lodash');
+const cx = require('classnames');
+
+const NaturalCritIcon = require('naturalcrit/svg/naturalcrit.svg.jsx');
+
+const Nav = {
+	base : createClass({
+		render : function(){
+			return <nav>
+				<div className='navContent'>
+					{this.props.children}
+				</div>
+			</nav>;
+		}
+	}),
+	logo : function(){
+		return <a className='navLogo' href='http://naturalcrit.com'>
+			<NaturalCritIcon />
+			<span className='name'>
+				Natural<span className='crit'>Crit</span>
+			</span>
+		</a>;
+	},
+
+	section : createClass({
+		render : function(){
+			return <div className='navSection'>
+				{this.props.children}
+			</div>;
+		}
+	}),
+
+	item : createClass({
+		getDefaultProps : function() {
+			return {
+				icon    : null,
+				href    : null,
+				newTab  : false,
+				onClick : function(){},
+				color   : null
+			};
+		},
+		handleClick : function(){
+			this.props.onClick();
+		},
+		render : function(){
+			const classes = cx('navItem', this.props.color, this.props.className);
+
+			let icon;
+			if(this.props.icon) icon = <i className={`fa ${this.props.icon}`} />;
+
+			const props = _.omit(this.props, ['newTab']);
+
+			if(this.props.href){
+				return <a {...props} className={classes} target={this.props.newTab ? '_blank' : '_self'} >
+					{this.props.children}
+					{icon}
+				</a>;
+			} else {
+				return <div {...props} className={classes} onClick={this.handleClick} >
+					{this.props.children}
+					{icon}
+				</div>;
+			}
+		}
+	}),
+
+};
+
+
+module.exports = Nav;