Adding some notes

.bithoundrc

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

.circleci/config.yml

@@ -1,80 +0,0 @@
-# Javascript Node CircleCI 2.0 configuration file
-#
-# Check https://circleci.com/docs/2.0/language-javascript/ for more details
-#
-version: 2.1
-
-orbs:
-  node: circleci/node@5.1.0
-
-jobs:
-  build:
-    docker:
-      - image: cimg/node:20.8.0
-      - image: mongo:4.4
-
-    working_directory: ~/homebrewery
-    executor: node/default
-
-    steps:
-      - checkout:
-          path: ~/homebrewery
-
-      # 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: sudo npm install -g npm@10.2.0
-      - node/install-packages:
-          app-dir: ~/homebrewery
-          cache-path: node_modules
-          override-ci-command: npm i
-
-      - save_cache:
-          paths:
-            - node_modules
-          key: v1-dependencies-{{ checksum "package.json" }}
-
-      - persist_to_workspace:
-          root: .
-          paths:
-            - .
-
-  test:
-    docker:
-      - image: cimg/node:20.8.0
-
-    working_directory: ~/homebrewery
-    parallelism: 1
-
-    steps:
-      - attach_workspace:
-          at: .
-
-      # run tests!
-      - run:
-          name: Test - API Unit Tests
-          command: npm run test:api-unit
-      - run:
-          name: Test - Basic
-          command: npm run test:basic
-      - run:
-          name: Test - Mustache Spans
-          command: npm run test:mustache-syntax
-      - run:
-          name: Test - Routes
-          command: npm run test:route
-      - run:
-          name: Test - Coverage
-          command: npm run test:coverage
-
-workflows:
-  build_and_test:
-    jobs:
-      - build
-      - test:
-          requires:
-            - build

.dockerignore

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

.eslintrc.js

@@ -1,79 +0,0 @@
-module.exports = {
-	root          : true,
-	parserOptions : {
-		ecmaVersion  : 2021,
-		sourceType   : 'module',
-		ecmaFeatures : {
-			jsx : true
-		}
-	},
-	env : {
-		browser : true,
-		node    : true
-	},
-	plugins : ['react', 'jest'],
-	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'],
-		'jest/valid-expect'      : ['error', { maxArgs: 3	}],
-
-		/** Warnings **/
-		'max-lines' : ['warn', {
-			max            : 200,
-			skipComments   : true,
-			skipBlankLines : true,
-		}],
-		'max-depth'            : ['warn', { max: 4 }],
-		'max-params'           : ['warn', { max: 5 }],
-		'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

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

.github/ISSUE_TEMPLATE/config.yml

@@ -1,7 +0,0 @@
-contact_links:
-  - name: /r/Homebrewery Subreddit
-    url: https://www.reddit.com/r/homebrewery
-    about: The Homebrewery community on Reddit!
-  - name: Discord of Many Things
-    url: https://discord.gg/domt
-    about: "Join the conversation in the #formatting channel on DoMT!"

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,17 +0,0 @@
-name: Feature Request
-description: Have an idea to improve the Homebrewery? Let us know!
-labels: ["feature request"]
-body:
-  - type: markdown
-    attributes:
-      value: "We'd love to hear your idea!  Please be sure to [search the current Issues](https://github.com/naturalcrit/homebrewery/issues) for any duplicate requests."
-  - type: textarea
-    id: user-request
-    attributes:
-      label: "Your idea:"
-      description: The best feature requests provide an explanation of the current issue and then an explanation of how it could be improved.  Screenshots/images can be pasted right in as well!
-    validations:
-      required: true
-  - type: markdown
-    attributes:
-      value: "Please be sure to search for any close matches to your request in the GitHub Issues tracker before opening a new request, thanks!"

.github/ISSUE_TEMPLATE/general_issue.yml

@@ -1,55 +0,0 @@
-name: General Issue
-description: Report an issue unrelated to Saving
-body:
-  - type: markdown
-    attributes:
-      value: Please include as much information as possible.
-  - type: dropdown
-    id: renderer
-    attributes:
-      label: Renderer
-      description: Which renderer does this issue occur on?  If you are unsure, you can check the renderer in the Properties Editor (click the "i" in the Snippet Menu bar above the editor).
-      options:
-        - v3
-        - Legacy
-        - Both
-    validations:
-      required: true
-  - type: dropdown
-    id: browser
-    attributes:
-      label: Browser
-      description: Which browser were you using when the issue occurred?
-      options:
-        - Chrome
-        - Firefox
-        - Edge
-        - Safari
-        - other
-    validations:
-      required: true
-  - type: dropdown
-    id: operating-system
-    attributes:
-      label: Operating System
-      description: Which OS were you using when the issue occurred?
-      options:
-        - Windows
-        - MacOS
-        - Linux
-        - other
-    validations:
-      required: true
-  - type: textarea
-    id: user-description
-    attributes:
-      label: "What happened?"
-      description: Please include any steps you took leading up to the issue and if you can reproduce it.  Let us know what you expected to happen, and what did happen.
-    validations:
-      required: true
-  - type: textarea
-    id: code
-    attributes:
-      label: Code
-      description: Paste in any relevant code snippet below.
-      render: gfm

.github/ISSUE_TEMPLATE/save_issue.yml

@@ -1,26 +0,0 @@
-name: Saving Issue
-description: Report an issue Saving
-labels: ["Saving"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Woops, sorry there was an issue Saving.  Please add any detail you can to this report and check back soon!
-  - type: textarea
-    id: error-code
-    attributes:
-      label: Error Code
-      render: shell
-  - type: textarea
-    id: user-description
-    attributes:
-      label: "Your description of what happened:"
-    validations:
-      required: true
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for the report.  Here are some steps that may help in the meantime:
-        1. Refreshing your Google credentials in Homebrewery by signing out, and back in (they expire after one year).
-        2. Waiting a few minutes and trying again - sometimes there is just a momentary blip in the server.
-        3. Check the Issues in Github or the /r/homebrewery subreddit to see if others are experiencing the same issue.

.github/dependabot.yml

@@ -1,69 +0,0 @@
-version: 2
-updates:
-- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 99
-  ignore:
-  - dependency-name: eslint
-    versions:
-    - 7.19.0
-    - 7.22.0
-    - 7.23.0
-    - 7.24.0
-  - dependency-name: "@babel/core"
-    versions:
-    - 7.12.13
-    - 7.12.16
-    - 7.12.17
-    - 7.13.13
-    - 7.13.14
-    - 7.13.15
-  - dependency-name: googleapis
-    versions:
-    - 68.0.0
-    - 70.0.0
-    - 71.0.0
-  - dependency-name: "@babel/preset-env"
-    versions:
-    - 7.12.13
-    - 7.12.16
-    - 7.12.17
-    - 7.13.0
-    - 7.13.12
-    - 7.13.8
-  - dependency-name: mongoose
-    versions:
-    - 5.11.14
-    - 5.11.15
-    - 5.11.16
-    - 5.11.17
-    - 5.11.18
-    - 5.11.19
-    - 5.12.1
-    - 5.12.2
-    - 5.12.3
-  - dependency-name: eslint-plugin-react
-    versions:
-    - 7.23.0
-    - 7.23.1
-  - dependency-name: query-string
-    versions:
-    - 7.0.0
-  - dependency-name: nanoid
-    versions:
-    - 3.1.22
-  - dependency-name: "@babel/preset-react"
-    versions:
-    - 7.13.13
-  - dependency-name: codemirror
-    versions:
-    - 5.59.3
-    - 5.60.0
-  - dependency-name: classnames
-    versions:
-    - 2.3.0
-  - dependency-name: marked
-    versions:
-    - 1.2.8

.github/issue_template.md

@@ -1,28 +1,5 @@
-<!-- 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.
+Share link to issue brew: http://homebrewery.naturalcrit.com/share/XXXXXXX
 
 
-*Delete the above section and the instructions in the sections below before submitting*
 
 
-## Description
-
-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** :
-
-or
-
-**Brew code to reproduce** : <details><summary>Click to expand</summary><code><pre>
-
-PASTE BREW CODE HERE
-
-</pre></code></details>

.gitignore

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

.stylelintrc.json

@@ -1,48 +0,0 @@
-{
-    "extends": [
-			"stylelint-config-recess-order",
-			"stylelint-config-recommended"],
-    "plugins": [
-      "stylelint-stylistic",
-      "./stylelint_plugins/declaration-colon-align.js",
-			"./stylelint_plugins/declaration-colon-min-space-before",
-      "./stylelint_plugins/declaration-block-multi-line-min-declarations"
-    ],
-    "customSyntax": "postcss-less",
-    "rules": {
-			"no-descending-specificity"                                : null,
-			"at-rule-no-unknown"                                       : null,
-			"function-no-unknown"                                      : null,
-			"font-family-no-missing-generic-family-keyword"            : null,
-			"font-weight-notation"                                     : "named-where-possible",
-			"font-family-name-quotes"                                  : "always-unless-keyword",
-			"stylistic/indentation"                                    : "tab",
-			"no-duplicate-selectors"                                   : true,
-			"stylistic/color-hex-case"                                 : "upper",
-			"color-hex-length"                                         : "long",
-			"stylistic/selector-combinator-space-after"                : "always",
-			"stylistic/selector-combinator-space-before"               : "always",
-			"stylistic/selector-attribute-operator-space-before"       : "never",
-			"stylistic/selector-attribute-operator-space-after"        : "never",
-			"stylistic/selector-attribute-brackets-space-inside"       : "never",
-			"selector-attribute-quotes"                                : "always",
-			"selector-pseudo-element-colon-notation"                   : "double",
-			"stylistic/selector-pseudo-class-parentheses-space-inside" : "never",
-			"stylistic/block-opening-brace-space-before"               : "always",
-			"naturalcrit/declaration-colon-min-space-before"           : 1,
-			"stylistic/declaration-block-trailing-semicolon"           : "always",
-			"stylistic/declaration-colon-space-after"                  : "always",
-			"stylistic/number-leading-zero"                            : "always",
-			"function-url-quotes"                                      : ["always", { "except": ["empty"] }],
-			"function-url-scheme-disallowed-list"                      : ["data","http"],
-			"comment-whitespace-inside"                                : "always",
-			"stylistic/string-quotes"                                  : "single",
-			"stylistic/media-feature-range-operator-space-before"      : "always",
-			"stylistic/media-feature-range-operator-space-after"       : "always",
-			"stylistic/media-feature-parentheses-space-inside"         : "never",
-			"stylistic/media-feature-colon-space-before"               : "always",
-			"stylistic/media-feature-colon-space-after"                : "always",
-			"naturalcrit/declaration-colon-align"                      : true,
-			"naturalcrit/declaration-block-multi-line-min-declarations": 1
-    }
-}

Dockerfile

@@ -1,20 +0,0 @@
-FROM node:18-alpine
-RUN apk --no-cache add git
-
-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 npm install --ignore-scripts
-
-# Bundle app source and build application
-COPY . .
-RUN npm run build
-
-EXPOSE 8000
-CMD [ "npm", "start" ]

README.DOCKER.md

@@ -1,12 +0,0 @@
-# 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.md

@@ -1,146 +1,33 @@
 # 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)
 
-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).
+### issues, suggestions, bugs
+If you run into any issues using The Homebrewery, please submit an issues [here](/issues)
 
-[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
 
-## 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 and 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.
+### local dev
+Homebrewery is open source, so feel free to clone it, tinker with it, or run your own local version.
 
-[homebrewery-url]: https://homebrewery.naturalcrit.com
-
-### Installation
-First, install three programs that The Homebrewery requires to run and retrieve
-updates:
-
-1. install [node](https://nodejs.org/en/), version v16 or higher.
-1. install [mongodb](https://www.mongodb.com/try/download/community) (Community version)
-
-    For the easiest installation, follow these steps:
-    1. In the installer, uncheck the option to run as a service.
-    1. You can install MongoDB Compass if you want a GUI to view your database documents.
-    1. If you install any version over 6.0, you will have to install [MongoDB Shell](https://www.mongodb.com/try/download/shell).
-    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\6.0\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. Search in Windows for "Advanced system settings" and open it.
-    1. Click "Environment variables", find the "path" variable, and double-click to open it.
-    1. Click "New" and paste in the path to the MongoDB "bin" folder.
-    1. Click "OK" three times to close all the windows.
-    1. 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.insertOne({"title":"test"})` to create a blank document. You should see `{
-acknowledged: true,
-insertedId: ObjectId("63c2fce9e5ac5a94fe2410cf")
-}`
-   
-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** (until you close the terminal) in your shell of choice with admin privileges:
-* Windows Powershell: `$env:NODE_ENV="local"`
-* Windows CMD: `set NODE_ENV=local`
-* Linux / macOS: `export NODE_ENV=local`
-
-If you want to add this variable **permanently** the steps are as follows:
-    1. Search in Windows for "Advanced system settings" and open it.
-    1. Click "Environment variables".
-    1. In System Variables, click "New"
-    1. Click "New" and write `NODE_ENV` as a name and `local` as the value.
-    1. Click "OK" three times to close all the windows.
-  This can be undone at any time if needed.
-
-Third, you will need to install the Node dependencies, compile the app, and run
-it using the two commands:
+#### pre-reqs
+1. install [node](https://nodejs.org/en/)
+1. install [mongodb](https://www.mongodb.com/)
 
+#### getting started
+1. clone it
 1. `npm install`
+1. `npm build`
 1. `npm start`
 
-You should now be able to go to [http://localhost:8000](http://localhost:8000)
-in your browser and use The Homebrewery offline.
+#### 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)
 
-If you had any issue at all, here are some links that may be useful:
-- [Course](https://learn.mongodb.com/courses/m103-basic-cluster-administration) on cluster administration, useful for beginners
-- [Mongo community forums](https://www.mongodb.com/community/forums/)
-- Useful Stack Overflow links for your most probable errors: [1](https://stackoverflow.com/questions/44962540/mongod-and-mongo-commands-not-working-on-windows-10), [2](https://stackoverflow.com/questions/15053893/mongo-command-not-recognized-when-trying-to-connect-to-a-mongodb-server/41507803#41507803), [3](https://stackoverflow.com/questions/51224959/mongo-is-not-recognized-as-an-internal-or-external-command-operable-program-o)
+If you are developing locally and would like to generate your own, follow the above steps and then run `npm run phb`.
 
-If you still have problems, post in [Our Subreddit](https://www.reddit.com/r/homebrewery/) and we will help you.
+### changelog
 
-### Running the application via Docker
+You can check out the changelog [here](https://github.com/stolksdorf/homebrewery/blob/master/changelog.md)
 
-Please see the docs here: [README.DOCKER.md](./README.DOCKER.md)
+### license
 
-### Running the application on FreeBSD or FreeNAS
-
-Please see the docs here: [README.FreeBSD.md](./README.FREEBSD.md)
-
-### 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 don't contain any useful info. To help, you can [mark duplicates][github-mark-duplicate-url], try to
-  reproduce some complex or weird issues, try finding a workaround for a
-  reported bug, or just mention our issue managers team to let them know about
-  outdated issues via `@naturalcrit/issue-managers`.
-- 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
+This project is licensed under [MIT](./license)

client/admin/admin.jsx

@@ -1,38 +1,42 @@
-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='fas fa-rocket' />
-					homebrewery admin
-				</div>
-			</header>
-			<div className='container'>
-				<Stats />
-				<hr />
-				<BrewLookup />
-				<hr />
-				<BrewCleanup />
-				<hr />
-				<BrewCompress />
-			</div>
-		</div>;
-	}
-});
-
-module.exports = Admin;
+const React = require('react');
+const _ = require('lodash');
+
+const Nav = require('naturalcrit/nav/nav.jsx');
+
+const BrewLookup = require('./brewLookup/brewLookup.jsx');
+const AdminSearch = require('./adminSearch/adminSearch.jsx');
+const InvalidBrew = require('./invalidBrew/invalidBrew.jsx');
+
+const Admin = React.createClass({
+	getDefaultProps: function() {
+		return {
+			admin_key : '',
+		};
+	},
+
+	renderNavbar : function(){
+		return <Nav.base>
+			<Nav.section>
+				<Nav.item icon='fa-magic' className='homebreweryLogo'>
+					Homebrewery Admin
+				</Nav.item>
+			</Nav.section>
+		</Nav.base>
+	},
+
+	render : function(){
+		return <div className='admin'>
+			{this.renderNavbar()}
+			<main className='content'>
+				<BrewLookup adminKey={this.props.admin_key} />
+				<AdminSearch adminKey={this.props.admin_key} />
+
+				<div className='dangerZone'>Danger Zone</div>
+
+				<InvalidBrew adminKey={this.props.admin_key} />
+			</main>
+		</div>
+	}
+});
+
+module.exports = Admin;

client/admin/admin.less

@@ -1,44 +1,53 @@
-@import 'naturalcrit/styles/reset.less';
-@import 'naturalcrit/styles/elements.less';
-@import 'naturalcrit/styles/animations.less';
-@import 'naturalcrit/styles/colors.less';
-@import 'naturalcrit/styles/tooltip.less';
 
-@import 'font-awesome/css/font-awesome.css';
-
-html,body, #reactContainer, .naturalCrit{
+@import 'naturalcrit/styles/core.less';
+html,body, #reactRoot{
 	min-height : 100%;
 }
-
-@sidebarWidth : 250px;
-
 body{
-	background-color : #eee;
-	font-family      : 'Open Sans', sans-serif;
-	color            : #4b5055;
-	font-weight      : 100;
-	text-rendering   : optimizeLegibility;
+	height           : 100%;
 	margin           : 0;
 	padding          : 0;
-	height : 100%;
+	background-color : #ddd;
+	font-family      : 'Open Sans', sans-serif;
+	font-weight      : 100;
+	color            : #4b5055;
+	text-rendering   : optimizeLegibility;
 }
-
-.admin{
-
-	header{
+.admin {
+	nav {
 		background-color : @red;
-		font-size: 2em;
-		padding : 20px 0px;
-		color : white;
-		margin-bottom: 30px;
-		i{
-			margin-right: 30px;
+		.navItem{
+			background-color : @red;
+		}
+		.homebreweryLogo{
+			font-family : CodeBold;
+			font-size   : 12px;
+			color       : white;
+			div{
+				margin-top    : 2px;
+				margin-bottom : -2px;
+			}
 		}
 	}
-
-	hr{
-		margin : 30px 0px;
+	h1{
+		margin-bottom : 10px;
+		font-size     : 2em;
+		font-weight   : 800;
+		border-bottom : 1px solid #ddd;
 	}
-
-
-}
+	main.content{
+		width            : 1000px;
+		margin           : 0 auto;
+		padding          : 50px 20px;
+		background-color : white;
+		.dangerZone{
+			margin         : 30px 0px;
+			padding        : 10px 20px;
+			background     : repeating-linear-gradient(45deg, @yellow, @yellow 10px, darken(#333, 10%) 10px, darken(#333, 10%) 20px);
+			font-size      : 1em;
+			font-weight    : 800;
+			color          : white;
+			text-transform : uppercase;
+		}
+	}
+}

client/admin/adminSearch/adminSearch.jsx

@@ -0,0 +1,86 @@
+
+const React = require('react');
+const _     = require('lodash');
+const cx    = require('classnames');
+const request = require('superagent');
+
+const BrewTable = require('../brewTable/brewTable.jsx');
+
+const LIMIT = 10;
+
+const AdminSearch = React.createClass({
+	getDefaultProps: function() {
+		return {
+			adminKey : '',
+		};
+	},
+	getInitialState: function() {
+		return {
+			totalBrews : 1,
+			brews: [],
+
+			searching : false,
+			error : null,
+
+			page : 1,
+			searchTerms : ''
+		};
+	},
+
+	handleSearch : function(e){
+		this.setState({
+			searchTerms : e.target.value
+		});
+	},
+	handlePage : function(e){
+		this.setState({
+			page : e.target.value
+		});
+	},
+
+	search : function(){
+		this.setState({ searching : true, error : null });
+
+		request.get(`/api/brew`)
+			.query({
+				terms : this.state.searchTerms,
+				limit : LIMIT,
+				page  : this.state.page - 1
+			})
+			.set('x-homebrew-admin', this.props.adminKey)
+			.end((err, res) => {
+				if(err){
+					this.setState({
+						searching : false,
+						error : err && err.toString()
+					});
+				}else{
+					this.setState({
+						brews : res.body.brews,
+						totalBrews : res.body.total
+					});
+				}
+			});
+	},
+
+	render: function(){
+		return <div className='adminSearch'>
+			<h1>Admin Search</h1>
+			<div className='controls'>
+				<input className='search' type='text' value={this.state.searchTerms} onChange={this.handleSearch} />
+
+				<button onClick={this.search}> <i className='fa fa-search' /> search </button>
+
+
+				<div className='page'>
+					page:
+					<input type='text' value={this.state.page} onChange={this.handlePage} />
+					/ {Math.ceil(this.state.totalBrews / LIMIT)}
+				</div>
+			</div>
+			<BrewTable brews={this.state.brews} />
+		</div>
+	}
+});
+
+module.exports = AdminSearch;

client/admin/adminSearch/adminSearch.less

@@ -0,0 +1,17 @@
+
+.adminSearch{
+	.controls{
+		margin-bottom : 20px;
+		input.search{
+			height  : 33px;
+			padding : 10px;
+		}
+		.page {
+			float       : right;
+			font-weight : 800;
+			input{
+				width : 20px;
+			}
+		}
+	}
+}

client/admin/brewCleanup/brewCleanup.jsx

@@ -1,75 +0,0 @@
-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='fas fa-spin fa-spinner' />
-					: <span><i className='fas 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='fas 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

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

client/admin/brewCompress/brewCompress.jsx

@@ -1,92 +0,0 @@
-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='fas fa-spin fa-spinner' />
-					: <span><i className='fas 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='fas 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

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

client/admin/brewLookup/brewLookup.jsx

@@ -1,81 +1,85 @@
-require('./brewLookup.less');
 const React = require('react');
-const createClass = require('create-react-class');
+const _     = require('lodash');
 const cx    = require('classnames');
 
 const request = require('superagent');
-const Moment = require('moment');
+const BrewTable = require('../brewTable/brewTable.jsx');
 
-
-const BrewLookup = createClass({
-	getDefaultProps() {
-		return {};
-	},
-	getInitialState() {
+const BrewLookup = React.createClass({
+	getDefaultProps: function() {
 		return {
-			query     : '',
-			foundBrew : null,
-			searching : false,
-			error     : null
+			adminKey : '',
 		};
 	},
-	handleChange(e){
-		this.setState({ query: e.target.value });
+	getInitialState: function() {
+		return {
+			query:'',
+			resultBrew : null,
+			searching : false,
+			error : null
+		};
 	},
-	lookup(){
-		this.setState({ searching: true, error: null });
+
+	handleChange : function(e){
+		this.setState({
+			query : e.target.value
+		})
+	},
+	lookup : function(){
+		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 }));
+			.set('x-homebrew-admin', this.props.adminKey)
+			.end((err, res) => {
+				this.setState({
+					searching : false,
+					error : err && err.toString(),
+					resultBrew : (err ? null : res.body)
+				});
+			})
 	},
 
-	renderFoundBrew(){
-		const brew = this.state.foundBrew;
-		return <div className='foundBrew'>
-			<dl>
-				<dt>Title</dt>
-				<dd>{brew.title}</dd>
+	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>;
 
-				<dt>Authors</dt>
-				<dd>{brew.authors.join(', ')}</dd>
+		return <BrewTable brews={[this.state.resultBrew ]} />
 
-				<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>;
+		/*
+		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'>{brew.editId}</a></div>
+			<div><a href={'/share/' + brew.shareId} target='_blank'>{brew.shareId}</a></div>
+			<div>{Moment(brew.updatedAt).fromNow()}</div>
+			<div>{brew.views}</div>
+			<div>
+				<div className='deleteButton'>
+					<i className='fa fa-trash' />
+				</div>
+			</div>
+		</div>
+		*/
 	},
 
-	render(){
+	renderError : function(){
+		if(!this.state.error) return;
+
+		return <div className='error'>
+			{this.state.error}
+		</div>
+	},
+
+	render: function(){
 		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('fas', {
-					'fa-search'          : !this.state.searching,
-					'fa-spin fa-spinner' : this.state.searching,
-				})} />
-			</button>
+			<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.state.error
-				&& <div className='error'>{this.state.error.toString()}</div>
-			}
-
-			{this.state.foundBrew
-				? this.renderFoundBrew()
-				: <div className='noBrew'>No brew found.</div>
-			}
-		</div>;
+			{this.renderFoundBrew()}
+			{this.renderError()}
+		</div>
 	}
 });
 

client/admin/brewLookup/brewLookup.less

@@ -1,30 +1,13 @@
 
 .brewLookup{
+	height : 200px;
 	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;
-		}
+	.error{
+		font-weight : 800;
+		color       : @red;
 	}
 }

client/admin/brewTable/brewTable.jsx

@@ -0,0 +1,54 @@
+const React = require('react');
+const _     = require('lodash');
+const cx    = require('classnames');
+
+const Moment = require('moment');
+
+//TODO: Add in delete
+
+const BrewTable = React.createClass({
+	getDefaultProps: function() {
+		return {
+			brews : []
+		};
+	},
+	renderRows : function(){
+		return _.map(this.props.brews, (brew) => {
+			let authors = 'None.';
+			if(brew.authors && brew.authors.length) authors = brew.authors.join(', ');
+
+			return <tr className={cx('brewRow', {'isEmpty' : brew.text == "false"})} key={brew.shareId || brew}>
+				<td>{brew.title}</td>
+				<td>{authors}</td>
+				<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.updatedAt).fromNow()}</td>
+				<td>{brew.views}</td>
+				<td className='deleteButton'>
+					<i className='fa fa-trash' />
+				</td>
+			</tr>
+
+		});
+	},
+	render: function(){
+		return <table className='brewTable'>
+				<thead>
+					<tr>
+						<th>Title</th>
+						<th>Authors</th>
+						<th>Edit Link</th>
+						<th>Share Link</th>
+						<th>Last Updated</th>
+						<th>Views</th>
+						<th>Remove</th>
+					</tr>
+				</thead>
+				<tbody>
+					{this.renderRows()}
+				</tbody>
+			</table>
+	}
+});
+
+module.exports = BrewTable;

client/admin/brewTable/brewTable.less

@@ -0,0 +1,44 @@
+
+table.brewTable{
+	th{
+		padding          : 10px;
+		background-color : fade(@blue, 20%);
+		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;
+			}
+		}
+		*/
+	}
+}

client/admin/invalidBrew/invalidBrew.jsx

@@ -0,0 +1,54 @@
+const React = require('react');
+const _     = require('lodash');
+const cx    = require('classnames');
+
+const request = require('superagent');
+const BrewTable = require('../brewTable/brewTable.jsx');
+
+
+const InvalidBrew = React.createClass({
+	getDefaultProps: function() {
+		return {
+			adminKey : '',
+		};
+	},
+	getInitialState: function() {
+		return {
+			brews: []
+		};
+	},
+	getInvalid : function(){
+		request.get(`/admin/invalid`)
+			.set('x-homebrew-admin', this.props.adminKey)
+			.end((err, res) => {
+				this.setState({
+					brews : res.body
+				});
+			})
+	},
+	removeInvalid : function(){
+		if(!this.state.brews.length) return;
+		if(!confirm(`Are you sure you want to remove ${this.state.brews.length} brews`)) return;
+		if(!confirm('Sure you are sure?')) return;
+
+		request.delete(`/admin/invalid`)
+			.set('x-homebrew-admin', this.props.adminKey)
+			.end((err, res) => {
+				console.log(err, res.body);
+				alert('Invalid brews removed!');
+				this.getInvalid();
+			})
+	},
+	render: function(){
+		return <div className='invalidBrew'>
+			<h1>Remove Invalid Brews</h1>
+			<div>This will removes all brews older than 3 days and shorter than a tweet.</div>
+			<button className='get' onClick={this.getInvalid}> Get Invalid Brews</button>
+			<button className='remove' disabled={this.state.brews.length == 0} onClick={this.removeInvalid}> Remove invalid Brews</button>
+
+			<BrewTable brews={this.state.brews} />
+		</div>
+	}
+});
+
+module.exports = InvalidBrew;

client/admin/invalidBrew/invalidBrew.less

@@ -0,0 +1,5 @@
+.invalidBrew{
+	button{
+		margin: 10px 4px;
+	}
+}

client/admin/stats/stats.jsx

@@ -1,46 +0,0 @@
-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='fas fa-spin fa-spinner' /></div>
-			}
-		</div>;
-	}
-});
-
-module.exports = Stats;

client/admin/stats/stats.less

@@ -1,28 +0,0 @@
-
-.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/components/combobox.jsx

@@ -1,129 +0,0 @@
-const React = require('react');
-const createClass = require('create-react-class');
-const _ = require('lodash');
-const cx = require('classnames');
-require('./combobox.less');
-
-const Combobox = createClass({
-	displayName     : 'Combobox',
-	getDefaultProps : function() {
-		return {
-			className   : '',
-			trigger     : 'hover',
-			default     : '',
-			placeholder : '',
-			autoSuggest : {
-				clearAutoSuggestOnClick : true,
-				suggestMethod           : 'includes',
-				filterOn                : []  // should allow as array to filter on multiple attributes, or even custom filter
-			},
-		};
-	},
-	getInitialState : function() {
-		return {
-			showDropdown : false,
-			value        : '',
-			options      : [...this.props.options],
-			inputFocused : false
-		};
-	},
-	componentDidMount : function() {
-		if(this.props.trigger == 'click')
-			document.addEventListener('click', this.handleClickOutside);
-		this.setState({
-			value : this.props.default
-		});
-	},
-	componentWillUnmount : function() {
-		if(this.props.trigger == 'click')
-			document.removeEventListener('click', this.handleClickOutside);
-	},
-	handleClickOutside : function(e){
-		// Close dropdown when clicked outside
-		if(this.refs.dropdown && !this.refs.dropdown.contains(e.target)) {
-			this.handleDropdown(false);
-		}
-	},
-	handleDropdown : function(show){
-		this.setState({
-			showDropdown : show,
-			inputFocused : this.props.autoSuggest.clearAutoSuggestOnClick ? show : false
-		});
-	},
-	handleInput : function(e){
-		e.persist();
-		this.setState({
-			value        : e.target.value,
-			inputFocused : false
-		}, ()=>{
-			this.props.onEntry(e);
-		});
-	},
-	handleSelect : function(e){
-		this.setState({
-			value : e.currentTarget.getAttribute('data-value')
-		}, ()=>{this.props.onSelect(this.state.value);});
-		;
-	},
-	renderTextInput : function(){
-		return (
-			<div className='dropdown-input item'
-				onMouseEnter={this.props.trigger == 'hover' ? ()=>{this.handleDropdown(true);} : undefined}
-				onClick=     {this.props.trigger == 'click' ? ()=>{this.handleDropdown(true);} : undefined}>
-				<input
-					type='text'
-					onChange={(e)=>this.handleInput(e)}
-					value={this.state.value || ''}
-					placeholder={this.props.placeholder}
-					onBlur={(e)=>{
-						if(!e.target.checkValidity()){
-							this.setState({
-								value : this.props.default
-							}, ()=>this.props.onEntry(e));
-						}
-					}}
-				/>
-			</div>
-		);
-	},
-	renderDropdown : function(dropdownChildren){
-		if(!this.state.showDropdown) return null;
-		if(this.props.autoSuggest && !this.state.inputFocused){
-			const suggestMethod = this.props.autoSuggest.suggestMethod;
-			const filterOn = _.isString(this.props.autoSuggest.filterOn) ? [this.props.autoSuggest.filterOn] : this.props.autoSuggest.filterOn;
-			const filteredArrays = filterOn.map((attr)=>{
-				const children = dropdownChildren.filter((item)=>{
-					if(suggestMethod === 'includes'){
-						return item.props[attr]?.toLowerCase().includes(this.state.value.toLowerCase());
-					} else if(suggestMethod === 'startsWith'){
-						return item.props[attr]?.toLowerCase().startsWith(this.state.value.toLowerCase());
-					}
-				});
-				return children;
-			});
-			dropdownChildren = _.uniq(filteredArrays.flat(1));
-		}
-
-		return (
-			<div className='dropdown-options'>
-				{dropdownChildren}
-			</div>
-		);
-	},
-	render : function () {
-		const dropdownChildren = this.state.options.map((child, i)=>{
-			const clone = React.cloneElement(child, { onClick: (e)=>this.handleSelect(e) });
-			return clone;
-		});
-		return (
-			<div className={`dropdown-container ${this.props.className}`}
-				ref='dropdown'
-				onMouseLeave={this.props.trigger == 'hover' ? ()=>{this.handleDropdown(false);} : undefined}>
-				{this.renderTextInput()}
-				{this.renderDropdown(dropdownChildren)}
-			</div>
-		);
-	}
-});
-
-module.exports = Combobox;

client/components/combobox.less

@@ -1,50 +0,0 @@
-.dropdown-container {
-    position:relative;
-    input {
-        width: 100%;
-    }
-    .dropdown-options {
-        position:absolute;
-        background-color: white;
-        z-index: 100;
-        width: 100%;
-        border: 1px solid gray;
-        overflow-y: auto;
-        max-height: 200px;
-
-        &::-webkit-scrollbar {
-          width: 14px;
-        }
-        &::-webkit-scrollbar-track {
-          background: #ffffff;
-        }
-        &::-webkit-scrollbar-thumb {
-          background-color: #949494;
-          border-radius: 10px;
-          border: 3px solid #ffffff;
-        }
-
-        .item {
-            position:relative;
-            font-size: 11px;
-            font-family: Open Sans;
-            padding: 5px;
-            cursor: default;
-            margin: 0 3px;
-            //border-bottom: 1px solid darkgray;
-            &:hover {
-                filter: brightness(120%);
-                background-color: rgb(163, 163, 163);
-            }
-            .detail {
-                width:100%;
-                text-align: left;
-                color: rgb(124, 124, 124);
-                font-style:italic;
-                font-size: 9px;
-            }
-        }
-
-    }
-
-}

client/homebrew/brewRenderer/brewRenderer.jsx

@@ -1,237 +0,0 @@
-/*eslint max-lines: ["warn", {"max": 300, "skipBlankLines": true, "skipComments": true}]*/
-require('./brewRenderer.less');
-const React = require('react');
-const { useState, useRef, useEffect } = React;
-const _ = require('lodash');
-
-const MarkdownLegacy = require('naturalcrit/markdownLegacy.js');
-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 NotificationPopup = require('./notificationPopup/notificationPopup.jsx');
-const Frame = require('react-frame-component').default;
-const dedent = require('dedent-tabs').default;
-
-const Themes = require('themes/themes.json');
-
-const PAGE_HEIGHT = 1056;
-
-const INITIAL_CONTENT = dedent`
-	<!DOCTYPE html><html><head>
-	<link href="//use.fontawesome.com/releases/v6.5.1/css/all.css" rel="stylesheet" type="text/css" />
-	<link href="//fonts.googleapis.com/css?family=Open+Sans:400,300,600,700" rel="stylesheet" type="text/css" />
-	<link href='/homebrew/bundle.css' type="text/css" rel='stylesheet' />
-	<base target=_blank>
-	</head><body style='overflow: hidden'><div></div></body></html>`;
-
-//v=====----------------------< Brew Page Component >---------------------=====v//
-const BrewPage = (props)=>{
-	props = {
-		contents : '',
-		index    : 0,
-		...props
-	};
-	return <div className={props.className} id={`p${props.index + 1}`} >
-	         <div className='columnWrapper' dangerouslySetInnerHTML={{ __html: props.contents }} />
-	       </div>;
-};
-
-
-//v=====--------------------< Brew Renderer Component >-------------------=====v//
-const renderedPages = [];
-let rawPages      = [];
-
-const BrewRenderer = (props)=>{
-	props = {
-		text              : '',
-		style             : '',
-		renderer          : 'legacy',
-		theme             : '5ePHB',
-		lang              : '',
-		errors            : [],
-		currentEditorPage : 0,
-		...props
-	};
-
-	const [state, setState] = useState({
-		viewablePageNumber : 0,
-		height             : PAGE_HEIGHT,
-		isMounted          : false,
-		visibility         : 'hidden',
-	});
-
-	const mainRef  = useRef(null);
-
-	if(props.renderer == 'legacy') {
-		rawPages = props.text.split('\\page');
-	} else {
-		rawPages = props.text.split(/^\\page$/gm);
-	}
-
-	useEffect(()=>{ // Unmounting steps
-		return ()=>{window.removeEventListener('resize', updateSize);};
-	}, []);
-
-	const updateSize = ()=>{
-		setState((prevState)=>({
-			...prevState,
-			height : mainRef.current.parentNode.clientHeight,
-		}));
-	};
-
-	const handleScroll = (e)=>{
-		const target = e.target;
-		setState((prevState)=>({
-			...prevState,
-			viewablePageNumber : Math.floor(target.scrollTop / target.scrollHeight * rawPages.length)
-		}));
-	};
-
-	const isInView = (index)=>{
-		if(!state.isMounted)
-			return false;
-
-		if(index == props.currentEditorPage)	//Already rendered before this step
-			return false;
-
-		if(Math.abs(index - state.viewablePageNumber) <= 3)
-			return true;
-
-		return false;
-	};
-
-	const sanitizeScriptTags = (content)=>{
-		return content
-			?.replace(/<script/ig, '&lt;script')
-			.replace(/<\/script>/ig, '&lt;/script&gt;')
-			|| '';
-	};
-
-	const renderPageInfo = ()=>{
-		return <div className='pageInfo' ref={mainRef}>
-			<div>
-				{props.renderer}
-			</div>
-			<div>
-				{state.viewablePageNumber + 1} / {rawPages.length}
-			</div>
-		</div>;
-	};
-
-	const renderDummyPage = (index)=>{
-		return <div className='phb page' id={`p${index + 1}`} key={index}>
-			<i className='fas fa-spinner fa-spin' />
-		</div>;
-	};
-
-	const renderStyle = ()=>{
-		if(!props.style) return;
-		const cleanStyle = sanitizeScriptTags(props.style);
-		//return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style>@layer styleTab {\n${sanitizeScriptTags(props.style)}\n} </style>` }} />;
-		return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style> ${cleanStyle} </style>` }} />;
-	};
-
-	const renderPage = (pageText, index)=>{
-		let cleanPageText = sanitizeScriptTags(pageText);
-		if(props.renderer == 'legacy') {
-			const html = MarkdownLegacy.render(cleanPageText);
-			return <BrewPage className='page phb' index={index} key={index} contents={html} />;
-		} else {
-			cleanPageText += `\n\n&nbsp;\n\\column\n&nbsp;`; //Artificial column break at page end to emulate column-fill:auto (until `wide` is used, when column-fill:balance will reappear)
-			const html = Markdown.render(cleanPageText, index);
-			return <BrewPage className='page' index={index} key={index} contents={html} />;
-		}
-	};
-
-	const renderPages = ()=>{
-		if(props.errors && props.errors.length)
-			return renderedPages;
-
-		if(rawPages.length != renderedPages.length) // Re-render all pages when page count changes
-			renderedPages.length = 0;
-
-		// Render currently-edited page first so cross-page effects (variables, links) can propagate out first
-		renderedPages[props.currentEditorPage] = renderPage(rawPages[props.currentEditorPage], props.currentEditorPage);
-
-		_.forEach(rawPages, (page, index)=>{
-			if((isInView(index) || !renderedPages[index]) && typeof window !== 'undefined'){
-				renderedPages[index] = renderPage(page, index); // Render any page not yet rendered, but only re-render those in PPR range
-			}
-		});
-		return renderedPages;
-	};
-
-	const frameDidMount = ()=>{	//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
-			updateSize();
-			window.addEventListener('resize', updateSize);
-			renderPages(); //Make sure page is renderable before showing
-			setState((prevState)=>({
-				...prevState,
-				isMounted  : true,
-				visibility : 'visible'
-			}));
-		}, 100);
-	};
-
-	const emitClick = ()=>{ // Allow clicks inside iFrame to interact with dropdowns, etc. from outside
-		if(!window || !document) return;
-		document.dispatchEvent(new MouseEvent('click'));
-	};
-
-	const rendererPath  = props.renderer == 'V3' ? 'V3' : 'Legacy';
-	const themePath     = props.theme ?? '5ePHB';
-	const baseThemePath = Themes[rendererPath][themePath].baseTheme;
-
-	return (
-		<>
-			{/*render dummy page while iFrame is mounting.*/}
-			{!state.isMounted
-				? <div className='brewRenderer' onScroll={handleScroll}>
-					<div className='pages'>
-						{renderDummyPage(1)}
-					</div>
-				</div>
-				: null}
-
-			{/*render in iFrame so broken code doesn't crash the site.*/}
-			<Frame id='BrewRenderer' initialContent={INITIAL_CONTENT}
-				style={{ width: '100%', height: '100%', visibility: state.visibility }}
-				contentDidMount={frameDidMount}
-				onClick={()=>{emitClick();}}
-			>
-				<div className={'brewRenderer'}
-					onScroll={handleScroll}
-					style={{ height: state.height }}>
-
-					<ErrorBar errors={props.errors} />
-					<div className='popups'>
-						<RenderWarnings />
-						<NotificationPopup />
-					</div>
-					<link href={`/themes/${rendererPath}/Blank/style.css`} type="text/css" rel='stylesheet'/>
-					{baseThemePath &&
-						<link href={`/themes/${rendererPath}/${baseThemePath}/style.css`} type="text/css" rel='stylesheet'/>
-					}
-					<link href={`/themes/${rendererPath}/${themePath}/style.css`} type="text/css" rel='stylesheet'/>
-
-					{/* Apply CSS from Style tab and render pages from Markdown tab */}
-					{state.isMounted
-						&&
-						<>
-							{renderStyle()}
-							<div className='pages' lang={`${props.lang || 'en'}`}>
-								{renderPages()}
-							</div>
-						</>
-					}
-				</div>
-			</Frame>
-			{renderPageInfo()}
-		</>
-	);
-};
-
-module.exports = BrewRenderer;

client/homebrew/brewRenderer/brewRenderer.less

@@ -1,44 +0,0 @@
-@import (multiple, less) 'shared/naturalcrit/styles/reset.less';
-
-.brewRenderer {
-	will-change : transform;
-	overflow-y  : scroll;
-	:where(.pages) {
-		margin : 30px 0px;
-		& > :where(.page) {
-			width         : 215.9mm;
-			height        : 279.4mm;
-			margin-right  : auto;
-			margin-bottom : 30px;
-			margin-left   : auto;
-			box-shadow    : 1px 4px 14px #000000;
-		}
-	}
-}
-.pane { position : relative; }
-.pageInfo {
-	position         : absolute;
-	right            : 17px;
-	bottom           : 0;
-	z-index          : 1000;
-	font-size        : 10px;
-	font-weight      : 800;
-	color            : white;
-	background-color : #333333;
-	div {
-		display          : inline-block;
-		padding          : 8px 10px;
-		&:not(:last-child) { border-right : 1px solid #666666; }
-	}
-}
-.ppr_msg {
-	position         : absolute;
-	bottom           : 0;
-	left             : 0px;
-	z-index          : 1000;
-	padding          : 8px 10px;
-	font-size        : 10px;
-	font-weight      : 800;
-	color            : white;
-	background-color : #333333;
-}

client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx

@@ -1,81 +0,0 @@
-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_notification12-04-23';
-
-const NotificationPopup = createClass({
-	displayName     : 'NotificationPopup',
-	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>Don't store IMAGES in Google Drive</em><br />
-						Google Drive is not an image service, and will block images from being used 
-						in brews if they get more views than expected. Google has confirmed they won't fix 
-						this, so we recommend you look for another image hosting service such as imgur, ImgBB or Google Photos.
-					</li>
-
-					<li key='googleDriveFolder'>
-						<em>Don't delete your Homebrewery folder on Google Drive!</em> <br />
-						We have had several reports of users losing their brews, not realizing
-						that they had deleted the files on their Google Drive. If you have a Homebrewery folder
-						on your Google Drive with *.txt files inside, <em>do not delete it</em>!
-						We cannot help you recover files that you have deleted from your own
-						Google Drive.
-					</li>
-
-					<li key='faq'>
-						<em>Protect your work! </em> <br />
-						If you opt not to use your Google Drive, keep in mind that we do not save a history of your projects. Please make frequent backups of your brews!&nbsp;
-						<a target='_blank' href='https://www.reddit.com/r/homebrewery/comments/adh6lh/faqs_psas_announcements/'>
-							See the FAQ
-						</a> to learn how to avoid losing your work!
-					</li>
-				</>
-			);
-		}
-	},
-	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='fas fa-times dismiss' onClick={this.dismiss}/>
-			<i className='fas fa-info-circle info' />
-			<div className='header'>
-				<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>
-			</div>
-			<ul>{_.values(this.state.notifications)}</ul>
-		</div>;
-	}
-});
-
-module.exports = NotificationPopup;

client/homebrew/brewRenderer/notificationPopup/notificationPopup.less

@@ -1,64 +0,0 @@
-.popups{
-	position         : fixed;
-	top              : @navbarHeight;
-	right            : 15px;
-	z-index          : 10001;
-	width            : 450px;
-}
-
-.notificationPopup{
-	position         : relative;
-	display          : inline-block;
-	width            : 100%;
-	padding          : 15px;
-	padding-bottom   : 10px;
-	padding-left     : 25px;
-	background-color : @blue;
-	color            : white;
-	a{
-		color       : #e0e5c1;
-		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;
-		}
-	}
-	.header {
-		padding-left : 50px;
-	}
-	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,403 +0,0 @@
-/*eslint max-lines: ["warn", {"max": 300, "skipBlankLines": true, "skipComments": true}]*/
-require('./editor.less');
-const React = require('react');
-const createClass = require('create-react-class');
-const _ = require('lodash');
-const cx = require('classnames');
-const dedent = require('dedent-tabs').default;
-
-const CodeEditor = require('naturalcrit/codeEditor/codeEditor.jsx');
-const SnippetBar = require('./snippetbar/snippetbar.jsx');
-const MetadataEditor = require('./metadataEditor/metadataEditor.jsx');
-
-const EDITOR_THEME_KEY = 'HOMEBREWERY-EDITOR-THEME';
-
-const SNIPPETBAR_HEIGHT = 25;
-const DEFAULT_STYLE_TEXT = dedent`
-				/*=======---  Example CSS styling  ---=======*/
-				/* Any CSS here will apply to your document! */
-
-				.myExampleClass {
-					color: black;
-				}`;
-
-
-const Editor = createClass({
-	displayName     : 'Editor',
-	getDefaultProps : function() {
-		return {
-			brew : {
-				text  : '',
-				style : ''
-			},
-
-			onTextChange  : ()=>{},
-			onStyleChange : ()=>{},
-			onMetaChange  : ()=>{},
-			reportError   : ()=>{},
-
-			editorTheme : 'default',
-			renderer    : 'legacy'
-		};
-	},
-	getInitialState : function() {
-		return {
-			editorTheme : this.props.editorTheme,
-			view        : 'text' //'text', 'style', 'meta'
-		};
-	},
-
-	isText  : function() {return this.state.view == 'text';},
-	isStyle : function() {return this.state.view == 'style';},
-	isMeta  : function() {return this.state.view == 'meta';},
-
-	componentDidMount : function() {
-		this.updateEditorSize();
-		this.highlightCustomMarkdown();
-		window.addEventListener('resize', this.updateEditorSize);
-
-		const editorTheme = window.localStorage.getItem(EDITOR_THEME_KEY);
-		if(editorTheme) {
-			this.setState({
-				editorTheme : editorTheme
-			});
-		}
-	},
-
-	componentWillUnmount : function() {
-		window.removeEventListener('resize', this.updateEditorSize);
-	},
-
-	componentDidUpdate : function(prevProps, prevState, snapshot) {
-		this.highlightCustomMarkdown();
-		if(prevProps.moveBrew !== this.props.moveBrew) {
-			this.brewJump();
-		};
-		if(prevProps.moveSource !== this.props.moveSource) {
-			this.sourceJump();
-		};
-	},
-
-	updateEditorSize : function() {
-		if(this.refs.codeEditor) {
-			let paneHeight = this.refs.main.parentNode.clientHeight;
-			paneHeight -= SNIPPETBAR_HEIGHT + 1;
-			this.refs.codeEditor.codeMirror.setSize(null, paneHeight);
-		}
-	},
-
-	handleInject : function(injectText){
-		this.refs.codeEditor?.injectText(injectText, false);
-	},
-
-	handleViewChange : function(newView){
-		this.props.setMoveArrows(newView === 'text');
-		this.setState({
-			view : newView
-		}, this.updateEditorSize);	//TODO: not sure if updateeditorsize needed
-	},
-
-	getCurrentPage : function(){
-		const lines = this.props.brew.text.split('\n').slice(0, this.refs.codeEditor.getCursorPosition().line + 1);
-		return _.reduce(lines, (r, line)=>{
-			if(
-				(this.props.renderer == 'legacy' && line.indexOf('\\page') !== -1)
-				||
-				(this.props.renderer == 'V3' && line.match(/^\\page$/))
-			) r++;
-			return r;
-		}, 1);
-	},
-
-	highlightCustomMarkdown : function(){
-		if(!this.refs.codeEditor) return;
-		if(this.state.view === 'text')  {
-			const codeMirror = this.refs.codeEditor.codeMirror;
-
-			codeMirror.operation(()=>{ // Batch CodeMirror styling
-				//reset custom text styles
-				const customHighlights = codeMirror.getAllMarks().filter((mark)=>!mark.__isFold); //Don't undo code folding
-				for (let i=customHighlights.length - 1;i>=0;i--) customHighlights[i].clear();
-
-				let editorPageCount = 2; // start page count from page 2
-
-				_.forEach(this.props.brew.text.split('\n'), (line, lineNumber)=>{
-
-					//reset custom line styles
-					codeMirror.removeLineClass(lineNumber, 'background', 'pageLine');
-					codeMirror.removeLineClass(lineNumber, 'text');
-					codeMirror.removeLineClass(lineNumber, 'wrap', 'sourceMoveFlash');
-
-					// Styling for \page breaks
-					if((this.props.renderer == 'legacy' && line.includes('\\page')) ||
-				     (this.props.renderer == 'V3'     && line.match(/^\\page$/))) {
-
-						// add back the original class 'background' but also add the new class '.pageline'
-						codeMirror.addLineClass(lineNumber, 'background', 'pageLine');
-						const pageCountElement = Object.assign(document.createElement('span'), {
-							className   : 'editor-page-count',
-							textContent : editorPageCount
-						});
-						codeMirror.setBookmark({ line: lineNumber, ch: line.length }, pageCountElement);
-
-						editorPageCount += 1;
-					};
-
-					// New Codemirror styling for V3 renderer
-					if(this.props.renderer == 'V3') {
-						if(line.match(/^\\column$/)){
-							codeMirror.addLineClass(lineNumber, 'text', 'columnSplit');
-						}
-
-						// definition lists
-						if(line.includes('::')){
-							if(/^:*$/.test(line) == true){ return };
-							const regex = /^([^\n]*?:?\s?)(::[^\n]*)(?:\n|$)/ymd;  // the `d` flag, for match indices, throws an ESLint error.
-							let match;
-							while ((match = regex.exec(line)) != null){
-								codeMirror.markText({ line: lineNumber, ch: match.indices[0][0] }, { line: lineNumber, ch: match.indices[0][1] }, { className: 'dl-highlight' });
-								codeMirror.markText({ line: lineNumber, ch: match.indices[1][0] }, { line: lineNumber, ch: match.indices[1][1] }, { className: 'dt-highlight' });
-								codeMirror.markText({ line: lineNumber, ch: match.indices[2][0] }, { line: lineNumber, ch: match.indices[2][1] }, { className: 'dd-highlight' });
-								const ddIndex = match.indices[2][0];
-								let colons = /::/g;
-								let colonMatches = colons.exec(match[2]);
-								if(colonMatches !== null){
-									codeMirror.markText({ line: lineNumber, ch: colonMatches.index + ddIndex }, { line: lineNumber, ch: colonMatches.index + colonMatches[0].length + ddIndex }, { className: 'dl-colon-highlight'} )
-								}
-							}
-						}
-
-						// Subscript & Superscript
-						if(line.includes('^')) {
-							let startIndex = line.indexOf('^');
-							const superRegex = /\^(?!\s)(?=([^\n\^]*[^\s\^]))\1\^/gy;
-							const subRegex   = /\^\^(?!\s)(?=([^\n\^]*[^\s\^]))\1\^\^/gy;
-							
-							while (startIndex >= 0) {
-								superRegex.lastIndex = subRegex.lastIndex = startIndex;
-								let isSuper = false;
-								let match = subRegex.exec(line) || superRegex.exec(line);
-								if (match) {
-									isSuper = !subRegex.lastIndex;
-									codeMirror.markText({ line: lineNumber, ch: match.index }, { line: lineNumber, ch: match.index + match[0].length }, { className: isSuper ? 'superscript' : 'subscript' });
-								}
-								startIndex = line.indexOf('^', Math.max(startIndex + 1, subRegex.lastIndex, superRegex.lastIndex));
-							}
-						}
-
-						// Highlight injectors {style}
-						if(line.includes('{') && line.includes('}')){
-							const regex = /(?:^|[^{\n])({(?=((?:[:=](?:"[\w,\-()#%. ]*"|[\w\-()#%.]*)|[^"':={}\s]*)*))\2})/gm;
-							let match;
-							while ((match = regex.exec(line)) != null) {
-								codeMirror.markText({ line: lineNumber, ch: line.indexOf(match[1]) }, { line: lineNumber, ch: line.indexOf(match[1]) + match[1].length }, { className: 'injection' });
-							}
-						}
-						// Highlight inline spans {{content}}
-						if(line.includes('{{') && line.includes('}}')){
-							const regex = /{{(?=((?:[:=](?:"[\w,\-()#%. ]*"|[\w\-()#%.]*)|[^"':={}\s]*)*))\1 *|}}/g;
-							let match;
-							let blockCount = 0;
-							while ((match = regex.exec(line)) != null) {
-								if(match[0].startsWith('{')) {
-									blockCount += 1;
-								} else {
-									blockCount -= 1;
-								}
-								if(blockCount < 0) {
-									blockCount = 0;
-									continue;
-								}
-								codeMirror.markText({ line: lineNumber, ch: match.index }, { line: lineNumber, ch: match.index + match[0].length }, { className: 'inline-block' });
-							}
-						} else if(line.trimLeft().startsWith('{{') || line.trimLeft().startsWith('}}')){
-							// Highlight block divs {{\n Content \n}}
-							let endCh = line.length+1;
-
-							const match = line.match(/^ *{{(?=((?:[:=](?:"[\w,\-()#%. ]*"|[\w\-()#%.]*)|[^"':={}\s]*)*))\1 *$|^ *}}$/);
-							if(match)
-								endCh = match.index+match[0].length;
-							codeMirror.markText({ line: lineNumber, ch: 0 }, { line: lineNumber, ch: endCh }, { className: 'block' });
-						}
-					}
-				});
-			});
-		}
-	},
-
-	brewJump : function(targetPage=this.getCurrentPage()){
-		if(!window) return;
-		// console.log(`Scroll to: p${targetPage}`);
-		const brewRenderer = window.frames['BrewRenderer'].contentDocument.getElementsByClassName('brewRenderer')[0];
-		const currentPos = brewRenderer.scrollTop;
-		const targetPos = window.frames['BrewRenderer'].contentDocument.getElementById(`p${targetPage}`).getBoundingClientRect().top;
-		const interimPos = targetPos >= 0 ? -30 : 30;
-
-		const bounceDelay = 100;
-		const scrollDelay = 500;
-
-		if(!this.throttleBrewMove) {
-			this.throttleBrewMove = _.throttle((currentPos, interimPos, targetPos)=>{
-				brewRenderer.scrollTo({ top: currentPos + interimPos, behavior: 'smooth' });
-				setTimeout(()=>{
-					brewRenderer.scrollTo({ top: currentPos + targetPos, behavior: 'smooth', block: 'start' });
-				}, bounceDelay);
-			}, scrollDelay, { leading: true, trailing: false });
-		};
-		this.throttleBrewMove(currentPos, interimPos, targetPos);
-
-		// const hashPage = (page != 1) ? `p${page}` : '';
-		// window.location.hash = hashPage;
-	},
-
-	sourceJump : function(targetLine=null){
-		if(this.isText()) {
-			if(targetLine == null) {
-				targetLine = 0;
-
-				const pageCollection = window.frames['BrewRenderer'].contentDocument.getElementsByClassName('page');
-				const brewRendererHeight = window.frames['BrewRenderer'].contentDocument.getElementsByClassName('brewRenderer').item(0).getBoundingClientRect().height;
-
-				let currentPage = 1;
-				for (const page of pageCollection) {
-					if(page.getBoundingClientRect().bottom > (brewRendererHeight / 2)) {
-						currentPage = parseInt(page.id.slice(1)) || 1;
-						break;
-					}
-				}
-
-				const textSplit = this.props.renderer == 'V3' ? /^\\page$/gm : /\\page/;
-				const textString = this.props.brew.text.split(textSplit).slice(0, currentPage-1).join(textSplit);
-				const textPosition = textString.length;
-				const lineCount = textString.match('\n') ? textString.slice(0, textPosition).split('\n').length : 0;
-
-				targetLine = lineCount - 1; //Scroll to `\page`, which is one line back.
-
-				let currentY = this.refs.codeEditor.codeMirror.getScrollInfo().top;
-				let targetY  = this.refs.codeEditor.codeMirror.heightAtLine(targetLine, 'local', true);
-
-				//Scroll 1/10 of the way every 10ms until 1px off.
-				const incrementalScroll = setInterval(()=>{
-					currentY += (targetY - currentY) / 10;
-					this.refs.codeEditor.codeMirror.scrollTo(null, currentY);
-
-					// Update target: target height is not accurate until within +-10 lines of the visible window
-					if(Math.abs(targetY - currentY > 100))
-						targetY = this.refs.codeEditor.codeMirror.heightAtLine(targetLine, 'local', true);
-
-					// End when close enough
-					if(Math.abs(targetY - currentY) < 1) {
-						this.refs.codeEditor.codeMirror.scrollTo(null, targetY);  // Scroll any remaining difference
-						this.refs.codeEditor.setCursorPosition({ line: targetLine + 1, ch: 0 });
-						this.refs.codeEditor.codeMirror.addLineClass(targetLine + 1, 'wrap', 'sourceMoveFlash');
-						clearInterval(incrementalScroll);
-					}
-				}, 10);
-			}
-		}
-	},
-
-	//Called when there are changes to the editor's dimensions
-	update : function(){
-		this.refs.codeEditor?.updateSize();
-	},
-
-	updateEditorTheme : function(newTheme){
-		window.localStorage.setItem(EDITOR_THEME_KEY, newTheme);
-		this.setState({
-			editorTheme : newTheme
-		});
-	},
-
-	//Called by CodeEditor after document switch, so Snippetbar can refresh UndoHistory
-	rerenderParent : function (){
-		this.forceUpdate();
-	},
-
-	renderEditor : function(){
-		if(this.isText()){
-			return <>
-				<CodeEditor key='codeEditor'
-					ref='codeEditor'
-					language='gfm'
-					view={this.state.view}
-					value={this.props.brew.text}
-					onChange={this.props.onTextChange}
-					editorTheme={this.state.editorTheme}
-					rerenderParent={this.rerenderParent} />
-			</>;
-		}
-		if(this.isStyle()){
-			return <>
-				<CodeEditor key='codeEditor'
-					ref='codeEditor'
-					language='css'
-					view={this.state.view}
-					value={this.props.brew.style ?? DEFAULT_STYLE_TEXT}
-					onChange={this.props.onStyleChange}
-					enableFolding={false}
-					editorTheme={this.state.editorTheme}
-					rerenderParent={this.rerenderParent} />
-			</>;
-		}
-		if(this.isMeta()){
-			return <>
-				<CodeEditor key='codeEditor'
-					view={this.state.view}
-					style={{ display: 'none' }}
-					rerenderParent={this.rerenderParent} />
-				<MetadataEditor
-					metadata={this.props.brew}
-					onChange={this.props.onMetaChange}
-					reportError={this.props.reportError}/>
-			</>;
-		}
-	},
-
-	redo : function(){
-		return this.refs.codeEditor?.redo();
-	},
-
-	historySize : function(){
-		return this.refs.codeEditor?.historySize();
-	},
-
-	undo : function(){
-		return this.refs.codeEditor?.undo();
-	},
-
-	foldCode : function(){
-		return this.refs.codeEditor?.foldAllCode();
-	},
-
-	unfoldCode : function(){
-		return this.refs.codeEditor?.unfoldAllCode();
-	},
-
-	render : function(){
-		return (
-			<div className='editor' ref='main'>
-				<SnippetBar
-					brew={this.props.brew}
-					view={this.state.view}
-					onViewChange={this.handleViewChange}
-					onInject={this.handleInject}
-					showEditButtons={this.props.showEditButtons}
-					renderer={this.props.renderer}
-					theme={this.props.brew.theme}
-					undo={this.undo}
-					redo={this.redo}
-					foldCode={this.foldCode}
-					unfoldCode={this.unfoldCode}
-					historySize={this.historySize()}
-					currentEditorTheme={this.state.editorTheme}
-					updateEditorTheme={this.updateEditorTheme}
-					cursorPos={this.refs.codeEditor?.getCursorPosition() || {}} />
-
-				{this.renderEditor()}
-			</div>
-		);
-	}
-});
-
-module.exports = Editor;

client/homebrew/editor/editor.less

@@ -1,95 +0,0 @@
-@import 'themes/codeMirror/customEditorStyles.less';
-.editor {
-	position : relative;
-	width    : 100%;
-
-	.codeEditor {
-		height            : 100%;
-		.pageLine {
-			background : #33333328;
-			border-top : #333399 solid 1px;
-		}
-		.editor-page-count {
-			float : right;
-			color : grey;
-		}
-		.columnSplit {
-			font-style        : italic;
-			color             : grey;
-			background-color  : fade(#229999, 15%);
-			border-bottom     : #229999 solid 1px;
-		}
-		.define {
-			&:not(.term):not(.definition) {
-				font-weight   : bold;
-				color         : #949494;
-				background    : #E5E5E5;
-				border-radius : 3px;
-			}
-			&.term { color : rgb(96, 117, 143); }
-			&.definition { color : rgb(97, 57, 178); }
-		}
-		.block:not(.cm-comment) {
-			font-weight : bold;
-			color       : purple;
-			//font-style: italic;
-		}
-		.inline-block:not(.cm-comment) {
-			font-weight : bold;
-			color       : red;
-			//font-style: italic;
-		}
-		.injection:not(.cm-comment) {
-			font-weight : bold;
-			color       : green;
-		}
-		.superscript:not(.cm-comment) {
-			font-weight    : bold;
-			color          : goldenrod;
-			vertical-align : super;
-			font-size      : 0.9em;
-		}
-		.subscript:not(.cm-comment) {
-			font-weight    : bold;
-			color          : rgb(123, 123, 15);
-			vertical-align : sub;
-			font-size      : 0.9em;
-		}
-		.dl-highlight {
-			&.dl-colon-highlight {
-				font-weight   : bold;
-				color         : #949494;
-				background    : #E5E5E5;
-				border-radius : 3px;
-			}
-			&.dt-highlight { color : rgb(96, 117, 143); }
-			&.dd-highlight { color : rgb(97, 57, 178); }
-		}		
-	}
-
-	.brewJump {
-		position         : absolute;
-		right            : 20px;
-		bottom           : 20px;
-		z-index          : 1000000;
-		display          : flex;
-		align-items      : center;
-		justify-content  : center;
-		width            : 30px;
-		height           : 30px;
-		cursor           : pointer;
-		background-color : @teal;
-		.tooltipLeft('Jump to brew page');
-	}
-
-	.editorToolbar {
-		position  : absolute;
-		top       : 5px;
-		left      : 50%;
-		z-index   : 9;
-		font-size : 13px;
-		color     : black;
-		span { padding : 2px 5px; }
-	}
-
-}

client/homebrew/editor/metadataEditor/metadataEditor.jsx

@@ -1,390 +0,0 @@
-/* eslint-disable max-lines */
-require('./metadataEditor.less');
-const React = require('react');
-const createClass = require('create-react-class');
-const _     = require('lodash');
-const cx    = require('classnames');
-const request = require('../../utils/request-middleware.js');
-const Nav = require('naturalcrit/nav/nav.jsx');
-const Combobox = require('client/components/combobox.jsx');
-const StringArrayEditor = require('../stringArrayEditor/stringArrayEditor.jsx');
-
-const Themes = require('themes/themes.json');
-const validations = require('./validations.js');
-
-const SYSTEMS = ['5e', '4e', '3.5e', 'Pathfinder'];
-
-const homebreweryThumbnail = require('../../thumbnail.png');
-
-const callIfExists = (val, fn, ...args)=>{
-	if(val[fn]) {
-		val[fn](...args);
-	}
-};
-
-const MetadataEditor = createClass({
-	displayName     : 'MetadataEditor',
-	getDefaultProps : function() {
-		return {
-			metadata : {
-				editId      : null,
-				title       : '',
-				description : '',
-				thumbnail   : '',
-				tags        : [],
-				published   : false,
-				authors     : [],
-				systems     : [],
-				renderer    : 'legacy',
-				theme       : '5ePHB',
-				lang        : 'en'
-			},
-			onChange    : ()=>{},
-			reportError : ()=>{}
-		};
-	},
-
-	getInitialState : function(){
-		return {
-			showThumbnail : true
-		};
-	},
-
-	toggleThumbnailDisplay : function(){
-		this.setState({
-			showThumbnail : !this.state.showThumbnail
-		});
-	},
-
-	renderThumbnail : function(){
-		if(!this.state.showThumbnail) return;
-		return <img className='thumbnail-preview' src={this.props.metadata.thumbnail || homebreweryThumbnail}></img>;
-	},
-
-	handleFieldChange : function(name, e){
-		// load validation rules, and check input value against them
-		const inputRules = validations[name] ?? [];
-		const validationErr = inputRules.map((rule)=>rule(e.target.value)).filter(Boolean);
-
-		// if no validation rules, save to props
-		if(validationErr.length === 0){
-			callIfExists(e.target, 'setCustomValidity', '');
-			this.props.onChange({
-				...this.props.metadata,
-				[name] : e.target.value
-			});
-		} else {
-			// if validation issues, display built-in browser error popup with each error.
-			const errMessage = validationErr.map((err)=>{
-				return `- ${err}`;
-			}).join('\n');
-
-			callIfExists(e.target, 'setCustomValidity', errMessage);
-			callIfExists(e.target, 'reportValidity');
-		}
-	},
-
-	handleSystem : function(system, e){
-		if(e.target.checked){
-			this.props.metadata.systems.push(system);
-		} else {
-			this.props.metadata.systems = _.without(this.props.metadata.systems, system);
-		}
-		this.props.onChange(this.props.metadata);
-	},
-
-	handleRenderer : function(renderer, e){
-		if(e.target.checked){
-			this.props.metadata.renderer = renderer;
-			if(renderer == 'legacy')
-				this.props.metadata.theme = '5ePHB';
-		}
-		this.props.onChange(this.props.metadata);
-	},
-	handlePublish : function(val){
-		this.props.onChange({
-			...this.props.metadata,
-			published : val
-		});
-	},
-
-	handleTheme : function(theme){
-		this.props.metadata.renderer = theme.renderer;
-		this.props.metadata.theme    = theme.path;
-		this.props.onChange(this.props.metadata);
-	},
-
-	handleLanguage : function(languageCode){
-		this.props.metadata.lang = languageCode;
-		this.props.onChange(this.props.metadata);
-	},
-
-	handleDelete : function(){
-		if(this.props.metadata.authors && 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.delete(`/api/${this.props.metadata.googleId ?? ''}${this.props.metadata.editId}`)
-			.send()
-			.end((err, res)=>{
-				if(err) {
-					this.props.reportError(err);
-				} else {
-					window.location.href = '/';
-				}
-			});
-	},
-
-	renderSystems : function(){
-		return _.map(SYSTEMS, (val)=>{
-			return <label key={val}>
-				<input
-					type='checkbox'
-					checked={_.includes(this.props.metadata.systems, val)}
-					onChange={(e)=>this.handleSystem(val, e)} />
-				{val}
-			</label>;
-		});
-	},
-
-	renderPublish : function(){
-		if(this.props.metadata.published){
-			return <button className='unpublish' onClick={()=>this.handlePublish(false)}>
-				<i className='fas fa-ban' /> unpublish
-			</button>;
-		} else {
-			return <button className='publish' onClick={()=>this.handlePublish(true)}>
-				<i className='fas fa-globe' /> publish
-			</button>;
-		}
-	},
-
-	renderDelete : function(){
-		if(!this.props.metadata.editId) return;
-
-		return <div className='field delete'>
-			<label>delete</label>
-			<div className='value'>
-				<button className='publish' onClick={this.handleDelete}>
-					<i className='fas fa-trash-alt' /> delete brew
-				</button>
-			</div>
-		</div>;
-	},
-
-	renderAuthors : function(){
-		let text = 'None.';
-		if(this.props.metadata.authors && this.props.metadata.authors.length){
-			text = this.props.metadata.authors.join(', ');
-		}
-		return <div className='field authors'>
-			<label>authors</label>
-			<div className='value'>
-				{text}
-			</div>
-		</div>;
-	},
-
-	renderThemeDropdown : function(){
-		if(!global.enable_themes) return;
-
-		const listThemes = (renderer)=>{
-			return _.map(_.values(Themes[renderer]), (theme)=>{
-				return <div className='item' key={''} onClick={()=>this.handleTheme(theme)} title={''}>
-					{`${theme.renderer} : ${theme.name}`}
-					<img src={`/themes/${theme.renderer}/${theme.path}/dropdownTexture.png`}/>
-					<div className='preview'>
-						<h6>{`${theme.name}`} preview</h6>
-						<img src={`/themes/${theme.renderer}/${theme.path}/dropdownPreview.png`}/>
-					</div>
-				</div>;
-			});
-		};
-
-		const currentTheme = Themes[`${_.upperFirst(this.props.metadata.renderer)}`][this.props.metadata.theme];
-		let dropdown;
-
-		if(this.props.metadata.renderer == 'legacy') {
-			dropdown =
-				<Nav.dropdown className='disabled value' trigger='disabled'>
-					<div>
-						{`Themes are not supported in the Legacy Renderer`} <i className='fas fa-caret-down'></i>
-					</div>
-				</Nav.dropdown>;
-		} else {
-			dropdown =
-				<Nav.dropdown className='value' trigger='click'>
-					<div>
-						{`${_.upperFirst(currentTheme.renderer)} : ${currentTheme.name}`} <i className='fas fa-caret-down'></i>
-					</div>
-					{/*listThemes('Legacy')*/}
-					{listThemes('V3')}
-				</Nav.dropdown>;
-		}
-
-		return <div className='field themes'>
-			<label>theme</label>
-			{dropdown}
-		</div>;
-	},
-
-	renderLanguageDropdown : function(){
-		const langCodes = ['en', 'de', 'de-ch', 'fr', 'ja', 'es', 'it', 'sv', 'ru', 'zh-Hans', 'zh-Hant'];
-		const listLanguages = ()=>{
-			return _.map(langCodes.sort(), (code, index)=>{
-				const localName = new Intl.DisplayNames([code], { type: 'language' });
-				const englishName = new Intl.DisplayNames('en', { type: 'language' });
-				return <div className='item' title={`${englishName.of(code)}`} key={`${index}`} data-value={`${code}`} data-detail={`${localName.of(code)}`}>
-					{`${code}`}
-					<div className='detail'>{`${localName.of(code)}`}</div>
-				</div>;
-			});
-		};
-
-		const debouncedHandleFieldChange =  _.debounce(this.handleFieldChange, 500);
-
-		return <div className='field language'>
-			<label>language</label>
-			<div className='value'>
-				<Combobox trigger='click'
-					className='language-dropdown'
-					default={this.props.metadata.lang || ''}
-					placeholder='en'
-					onSelect={(value)=>this.handleLanguage(value)}
-					onEntry={(e)=>{
-						e.target.setCustomValidity('');	//Clear the validation popup while typing
-						debouncedHandleFieldChange('lang', e);
-					}}
-					options={listLanguages()}
-					autoSuggest={{
-						suggestMethod           : 'startsWith',
-						clearAutoSuggestOnClick : true,
-						filterOn                : ['data-value', 'data-detail', 'title']
-					}}
-				>
-				</Combobox>
-				<small>Sets the HTML Lang property for your brew. May affect hyphenation or spellcheck.</small>
-			</div>
-
-		</div>;
-	},
-
-	renderRenderOptions : function(){
-		if(!global.enable_v3) return;
-
-		return <div className='field systems'>
-			<label>Renderer</label>
-			<div className='value'>
-				<label key='legacy'>
-					<input
-						type='radio'
-						value = 'legacy'
-						name = 'renderer'
-						checked={this.props.metadata.renderer === 'legacy'}
-						onChange={(e)=>this.handleRenderer('legacy', e)} />
-					Legacy
-				</label>
-
-				<label key='V3'>
-					<input
-						type='radio'
-						value = 'V3'
-						name = 'renderer'
-						checked={this.props.metadata.renderer === 'V3'}
-						onChange={(e)=>this.handleRenderer('V3', e)} />
-					V3
-				</label>
-
-				<a href='/legacy' target='_blank' rel='noopener noreferrer'>
-					Click here to see the demo page for the old Legacy renderer!
-				</a>
-			</div>
-		</div>;
-	},
-
-	render : function(){
-		return <div className='metadataEditor'>
-			<h1 className='sectionHead'>Brew</h1>
-
-			<div className='field title'>
-				<label>title</label>
-				<input type='text' className='value'
-					defaultValue={this.props.metadata.title}
-					onChange={(e)=>this.handleFieldChange('title', e)} />
-			</div>
-			<div className='field-group'>
-				<div className='field-column'>
-					<div className='field description'>
-						<label>description</label>
-						<textarea defaultValue={this.props.metadata.description} className='value'
-							onChange={(e)=>this.handleFieldChange('description', e)} />
-					</div>
-					<div className='field thumbnail'>
-						<label>thumbnail</label>
-						<input type='text'
-							defaultValue={this.props.metadata.thumbnail}
-							placeholder='https://my.thumbnail.url'
-							className='value'
-							onChange={(e)=>this.handleFieldChange('thumbnail', e)} />
-						<button className='display' onClick={this.toggleThumbnailDisplay}>
-							<i className={`fas fa-caret-${this.state.showThumbnail ? 'right' : 'left'}`} />
-						</button>
-					</div>
-				</div>
-				{this.renderThumbnail()}
-			</div>
-
-			<StringArrayEditor label='tags' valuePatterns={[/^(?:(?:group|meta|system|type):)?[A-Za-z0-9][A-Za-z0-9 \/.\-]{0,40}$/]}
-				placeholder='add tag' unique={true}
-				values={this.props.metadata.tags}
-				onChange={(e)=>this.handleFieldChange('tags', e)}/>
-
-			<div className='field systems'>
-				<label>systems</label>
-				<div className='value'>
-					{this.renderSystems()}
-				</div>
-			</div>
-
-			{this.renderLanguageDropdown()}
-
-			{this.renderThemeDropdown()}
-
-			{this.renderRenderOptions()}
-
-			<hr/>
-
-			<h1 className='sectionHead'>Authors</h1>
-
-			{this.renderAuthors()}
-
-			<StringArrayEditor label='invited authors' valuePatterns={[/.+/]}
-				validators={[(v)=>!this.props.metadata.authors?.includes(v)]}
-				placeholder='invite author' unique={true}
-				values={this.props.metadata.invitedAuthors}
-				notes={['Invited author usernames are case sensitive.', 'After adding an invited author, send them the edit link. There, they can choose to accept or decline the invitation.']}
-				onChange={(e)=>this.handleFieldChange('invitedAuthors', e)}/>
-
-			<hr/>
-
-			<h1 className='sectionHead'>Privacy</h1>
-
-			<div className='field publish'>
-				<label>publish</label>
-				<div className='value'>
-					{this.renderPublish()}
-					<small>Published homebrews will be publicly viewable and searchable (eventually...)</small>
-				</div>
-			</div>
-
-			{this.renderDelete()}
-
-		</div>;
-	}
-});
-
-module.exports = MetadataEditor;

client/homebrew/editor/metadataEditor/metadataEditor.less

@@ -1,328 +0,0 @@
-@import 'naturalcrit/styles/colors.less';
-
-.metadataEditor{
-	position         : absolute;
-	z-index          : 5;
-	box-sizing       : border-box;
-	width            : 100%;
-	padding          : 25px;
-	background-color : #999;
-	height           : calc(100vh - 54px); // 54px is the height of the navbar + snippet bar.  probably a better way to dynamic get this.
-	overflow-y       : auto;
-
-	.sectionHead {
-		font-weight: 1000;
-		margin: 20px 0;
-
-		&:first-of-type {
-			margin-top: 0;
-		}
-	}
-
-	& > div {
-		margin-bottom: 10px;
-	}
-
-	.field-group {
-		display: flex;
-		width: 100%;
-		flex-wrap: wrap;
-		gap: 10px;
-	}
-
-	.field-column {
-		display: flex;
-		flex-direction: column;
-		flex: 5 0 200px;
-		gap: 10px;
-	}
-
-
-
-	.field{
-		display       : flex;
-		flex-wrap     : wrap;
-		width         : 100%;
-		min-width     : 200px;
-		position      : relative;
-		&>label{
-			width          : 80px;
-			font-size      : 11px;
-			font-weight    : 800;
-			line-height    : 1.8em;
-			text-transform : uppercase;
-		}
-		&>.value{
-			flex           : 1 1 auto;
-			width          : 50px;
-			&:invalid {
-				background : #ffb9b9;
-			}
-		}
-		input[type='text'], textarea {
-			border : 1px solid gray;
-			&:focus {
-				outline: 1px solid #444;
-			}
-		}
-		&.thumbnail{
-			height      : 1.4em;
-			label{
-				line-height: 2.0em;
-			}
-			.value{
-  				overflow: hidden;
-  				text-overflow: ellipsis;
-			}
-			button{
-				border: 1px solid #999;
-				color: white;
-				padding: 0px 5px;
-				background-color: black;
-				&:hover{
-					background-color: #777;
-				}
-			}
-		}
-
-		&.description {
-			flex: 1;
-			textarea.value {
-				resize      : none;
-				height      : auto;
-				font-family : 'Open Sans', sans-serif;
-				font-size   : 0.8em;
-			}
-		}
-
-		&.language .language-dropdown {
-			max-width : 150px;
-			z-index   : 200;
-		}
-		small {
-			font-size   : 0.6em;
-			font-style  : italic;
-			line-height : 1.4em;
-			display     : inline-block;
-		}
-	}
-
-
-	.thumbnail-preview {
-		position: relative;
-		justify-self: center;
-		width: 80px;
-		height: min-content;
-		flex: 1 1;
-		max-height: 115px;
-		aspect-ratio: 1 / 1;
-		object-fit: contain;
-		background-color: #AAA;
-	}
-
-	.systems.field .value{
-		label{
-			vertical-align : middle;
-			margin-right   : 15px;
-			cursor         : pointer;
-			font-size      : 0.7em;
-			font-weight    : 800;
-			user-select    : none;
-			white-space    : nowrap;
-			display        : inline-flex;
-			align-items    : center;
-		}
-		a {
-			font-size   : 0.7em;
-			font-weight : 800;
-			display     : inline-flex;
-		}
-		input{
-			vertical-align : middle;
-			cursor         : pointer;
-			margin         : 3px;
-		}
-	}
-	.publish.field .value{
-		position : relative;
-		margin-bottom: 15px;
-		button{
-			width:100%;
-		}
-		button.publish{
-			.button(@blueLight);
-		}
-		button.unpublish{
-			.button(@silver);
-		}
-	}
-
-	.delete.field .value{
-		button{
-			.button(@red);
-		}
-	}
-	.authors.field .value{
-		font-size: 0.8em;
-		line-height    : 1.5em;
-	}
-
-	.themes.field{
-		font-size : 13.33px;
-		.navDropdownContainer {
-			background-color	: white;
-			position			: relative;
-			z-index				: 100;
-			&.disabled {
-				font-style			:italic;
-				font-style			: italic;
-				background-color	: darkgray;
-				color				: dimgray;
-			}
-			&>div:first-child {
-				border 				: 2px solid rgb(118,118,118);
-				padding 			: 6px 3px;
-				background-color 	: inherit;
-				i {
-					float	: right;
-				}
-				&:hover {
-					background-color	: @blue;
-					color				: white;
-				}
-			}
-			.navDropdown {
-				box-shadow	: 0px 5px 10px rgba(0, 0, 0, 0.3);
-				position	  : absolute;
-				width		    : 100%;
-				.item {
-					padding           : 3px 3px;
-					border-top        : 1px solid rgb(118, 118, 118);
-					position          : relative;
-					overflow          : visible;
-					background-color	: white;
-					.preview {
-						display       : flex;
-  					flex-direction: column;
-						background    : #ccc;
-						border-radius : 5px;
-  					box-shadow    : 0 0 5px black;
-						width         : 200px;
-						color         :black;
-						position      : absolute;
-						top           : 0;
-						right         : 0;
-						opacity       : 0;
-						transition    : opacity 250ms ease;
-						z-index       : 1;
-						overflow      :hidden;
-						h6 {
-							font-weight   : 900;
-							padding-inline:1em;
-							padding-block :.5em;
-							border-bottom :2px solid hsl(0,0%,40%);
-						}
-					}
-					&:hover {
-						background-color	: @blue;
-						color				      : white;
-					}
-					&:hover > .preview {
-						opacity: 1;
-					}
-					>img {
-						mask-image			    : linear-gradient(90deg, transparent, black 20%);
-						-webkit-mask-image	: linear-gradient(90deg, transparent, black 20%);
-				    	position			    : absolute;
-				    	right				      : 0;
-				    	top					      : 0px;
-						width				        : 50%;
-						height				      : 100%;
-					}
-				}
-			}
-		}
-	}
-	.field .list {
-		display: flex;
-		flex: 1 0;
-		flex-wrap: wrap;
-
-		> * {
-			flex: 0 0 auto;
-		}
-
-		#groupedIcon {
-			#backgroundColors;
-			display: inline-block;
-			height: ~"calc(100% + 0.6em)";
-			position: relative;
-			top: -0.3em;
-			right: -0.3em;
-			cursor: pointer;
-			min-width: 20px;
-			text-align: center;
-			color: white;
-
-			i {
-				position: relative;
-				top: 50%;
-				transform: translateY(-50%);
-			}
-
-			&:not(:last-child) {
-				border-right: 1px solid black;
-			}
-
-			&:last-child {
-				border-radius: 0 0.5em 0.5em 0;
-			}
-		}
-
-		.badge {
-			background-color: #dddddd;
-			border-radius: .5em;
-			font-size: .9em;
-			margin: 2px;
-			padding: .3em;
-
-			.icon {
-				#groupedIcon
-			}
-		}
-
-		.input-group {
-			height: ~"calc(.9em + 4px + .6em)";
-
-			input {
-				border-radius: .5em 0 0 .5em;
-			}
-
-			input:last-child {
-				border-radius: .5em;
-			}
-
-			.value {
-				width: 7.5vw;
-				min-width: 75px;
-				height: 100%;
-			}
-
-			.invalid:focus {
-				background-color: pink;
-			}
-
-			.icon {
-				#groupedIcon;
-				height: 97%;
-				font-size: .8em;
-				right: 1px;
-				top: -.54em;
-
-				i {
-					font-size: 1.125em;
-				}
-			}
-		}
-	}
-}

client/homebrew/editor/metadataEditor/validations.js

@@ -1,34 +0,0 @@
-module.exports = {
-	title : [
-		(value)=>{
-			return value?.length > 100 ? 'Max title length of 100 characters' : null;
-		}
-	],
-	description : [
-		(value)=>{
-			return value?.length > 500 ? 'Max description length of 500 characters.' : null;
-		}
-	],
-	thumbnail : [
-		(value)=>{
-			return value?.length > 256 ? 'Max URL length of 256 characters.' : null;
-		},
-		(value)=>{
-			if(value?.length == 0){return null;}
-			try {
-				Boolean(new URL(value));
-				return null;
-			} catch (e) {
-				return 'Must be a valid URL';
-			}
-		}
-	],
-	lang : [
-		(value)=>{
-			return new RegExp(/^([a-zA-Z]{2,3})(-[a-zA-Z]{4})?(-(?:[0-9]{3}|[a-zA-Z]{2}))?$/).test(value) === false && (value.length > 0) ? 'Invalid language code.' : null;
-		}
-	]
-};
-
-
-

client/homebrew/editor/snippetbar/snippetbar.jsx

@@ -1,258 +0,0 @@
-/*eslint max-lines: ["warn", {"max": 250, "skipBlankLines": true, "skipComments": true}]*/
-require('./snippetbar.less');
-const React = require('react');
-const createClass = require('create-react-class');
-const _     = require('lodash');
-const cx    = require('classnames');
-
-//Import all themes
-
-const Themes = require('themes/themes.json');
-
-const ThemeSnippets = {};
-ThemeSnippets['Legacy_5ePHB'] = require('themes/Legacy/5ePHB/snippets.js');
-ThemeSnippets['V3_5ePHB']     = require('themes/V3/5ePHB/snippets.js');
-ThemeSnippets['V3_5eDMG']     = require('themes/V3/5eDMG/snippets.js');
-ThemeSnippets['V3_Journal']   = require('themes/V3/Journal/snippets.js');
-ThemeSnippets['V3_Blank']     = require('themes/V3/Blank/snippets.js');
-
-const EditorThemes = require('build/homebrew/codeMirror/editorThemes.json');
-
-const execute = function(val, props){
-	if(_.isFunction(val)) return val(props);
-	return val;
-};
-
-const Snippetbar = createClass({
-	displayName     : 'SnippetBar',
-	getDefaultProps : function() {
-		return {
-			brew              : {},
-			view              : 'text',
-			onViewChange      : ()=>{},
-			onInject          : ()=>{},
-			onToggle          : ()=>{},
-			showEditButtons   : true,
-			renderer          : 'legacy',
-			undo              : ()=>{},
-			redo              : ()=>{},
-			historySize       : ()=>{},
-			foldCode          : ()=>{},
-			unfoldCode        : ()=>{},
-			updateEditorTheme : ()=>{},
-			cursorPos         : {}
-		};
-	},
-
-	getInitialState : function() {
-		return {
-			renderer      : this.props.renderer,
-			themeSelector : false,
-			snippets      : []
-		};
-	},
-
-	componentDidMount : async function() {
-		const rendererPath = this.props.renderer == 'V3' ? 'V3' : 'Legacy';
-		const themePath    = this.props.theme ?? '5ePHB';
-		let snippets = _.cloneDeep(ThemeSnippets[`${rendererPath}_${themePath}`]);
-		snippets = this.compileSnippets(rendererPath, themePath, snippets);
-		this.setState({
-			snippets : snippets
-		});
-	},
-
-	componentDidUpdate : async function(prevProps) {
-		if(prevProps.renderer != this.props.renderer || prevProps.theme != this.props.theme) {
-			const rendererPath = this.props.renderer == 'V3' ? 'V3' : 'Legacy';
-			const themePath    = this.props.theme ?? '5ePHB';
-			let snippets = _.cloneDeep(ThemeSnippets[`${rendererPath}_${themePath}`]);
-			snippets = this.compileSnippets(rendererPath, themePath, snippets);
-			this.setState({
-				snippets : snippets
-			});
-		}
-	},
-
-
-	mergeCustomizer : function(valueA, valueB, key) {
-		if(key == 'snippets') {
-			const result = _.reverse(_.unionBy(_.reverse(valueB), _.reverse(valueA), 'name')); // Join snippets together, with preference for the current theme over the base theme
-			return _.filter(result, 'gen'); //Only keep snippets with a 'gen' property.
-		}
-	},
-
-	compileSnippets : function(rendererPath, themePath, snippets) {
-		let compiledSnippets = snippets;
-		const baseSnippetsPath = Themes[rendererPath][themePath].baseSnippets;
-
-		const objB = _.keyBy(compiledSnippets, 'groupName');
-
-		if(baseSnippetsPath) {
-			const objA = _.keyBy(_.cloneDeep(ThemeSnippets[`${rendererPath}_${baseSnippetsPath}`]), 'groupName');
-			compiledSnippets = _.values(_.mergeWith(objA, objB, this.mergeCustomizer));
-			compiledSnippets = this.compileSnippets(rendererPath, baseSnippetsPath, _.cloneDeep(compiledSnippets));
-		} else {
-			const objA = _.keyBy(_.cloneDeep(ThemeSnippets[`${rendererPath}_Blank`]), 'groupName');
-			compiledSnippets = _.values(_.mergeWith(objA, objB, this.mergeCustomizer));
-		}
-		return compiledSnippets;
-	},
-
-	handleSnippetClick : function(injectedText){
-		this.props.onInject(injectedText);
-	},
-
-	toggleThemeSelector : function(e){
-		if(e.target.tagName != 'SELECT'){
-			this.setState({
-				themeSelector : !this.state.themeSelector
-			});
-		}
-	},
-
-	changeTheme : function(e){
-		if(e.target.value == this.props.currentEditorTheme) return;
-		this.props.updateEditorTheme(e.target.value);
-
-		this.setState({
-			showThemeSelector : false,
-		});
-	},
-
-	renderThemeSelector : function(){
-		return <div className='themeSelector'>
-			<select value={this.props.currentEditorTheme} onChange={this.changeTheme} >
-				{EditorThemes.map((theme, key)=>{
-					return <option key={key} value={theme}>{theme}</option>;
-				})}
-			</select>
-		</div>;
-	},
-
-	renderSnippetGroups : function(){
-		const snippets = this.state.snippets.filter((snippetGroup)=>snippetGroup.view === this.props.view);
-
-		return _.map(snippets, (snippetGroup)=>{
-			return <SnippetGroup
-				brew={this.props.brew}
-				groupName={snippetGroup.groupName}
-				icon={snippetGroup.icon}
-				snippets={snippetGroup.snippets}
-				key={snippetGroup.groupName}
-				onSnippetClick={this.handleSnippetClick}
-				cursorPos={this.props.cursorPos}
-			/>;
-		});
-	},
-
-	renderEditorButtons : function(){
-		if(!this.props.showEditButtons) return;
-
-		let foldButtons;
-		if(this.props.view == 'text'){
-			foldButtons =
-				<>
-					<div className={`editorTool foldAll ${this.props.foldCode ? 'active' : ''}`}
-						onClick={this.props.foldCode} >
-						<i className='fas fa-compress-alt' />
-					</div>
-					<div className={`editorTool unfoldAll ${this.props.unfoldCode ? 'active' : ''}`}
-						onClick={this.props.unfoldCode} >
-						<i className='fas fa-expand-alt' />
-					</div>
-				</>
-
-		}
-
-		return <div className='editors'>
-			<div className={`editorTool undo ${this.props.historySize.undo ? 'active' : ''}`}
-				onClick={this.props.undo} >
-				<i className='fas fa-undo' />
-			</div>
-			<div className={`editorTool redo ${this.props.historySize.redo ? 'active' : ''}`}
-				onClick={this.props.redo} >
-				<i className='fas fa-redo' />
-			</div>
-			<div className='divider'></div>
-			{foldButtons}
-			<div className={`editorTool editorTheme ${this.state.themeSelector ? 'active' : ''}`}
-				onClick={this.toggleThemeSelector} >
-				<i className='fas fa-palette' />
-				{this.state.themeSelector && this.renderThemeSelector()}
-			</div>
-			
-			<div className='divider'></div>
-			<div className={cx('text', { selected: this.props.view === 'text' })}
-				 onClick={()=>this.props.onViewChange('text')}>
-				<i className='fa fa-beer' />
-			</div>
-			<div className={cx('style', { selected: this.props.view === 'style' })}
-				 onClick={()=>this.props.onViewChange('style')}>
-				<i className='fa fa-paint-brush' />
-			</div>
-			<div className={cx('meta', { selected: this.props.view === 'meta' })}
-				onClick={()=>this.props.onViewChange('meta')}>
-				<i className='fas fa-info-circle' />
-			</div>
-		</div>;
-	},
-
-	render : function(){
-		return <div className='snippetBar'>
-			{this.renderSnippetGroups()}
-			{this.renderEditorButtons()}
-		</div>;
-	}
-});
-
-module.exports = Snippetbar;
-
-
-
-
-
-
-const SnippetGroup = createClass({
-	displayName     : 'SnippetGroup',
-	getDefaultProps : function() {
-		return {
-			brew           : {},
-			groupName      : '',
-			icon           : 'fas fa-rocket',
-			snippets       : [],
-			onSnippetClick : function(){},
-		};
-	},
-	handleSnippetClick : function(e, snippet){
-		e.stopPropagation();
-		this.props.onSnippetClick(execute(snippet.gen, this.props));
-	},
-	renderSnippets : function(snippets){
-		return _.map(snippets, (snippet)=>{
-			return <div className='snippet' key={snippet.name} onClick={(e)=>this.handleSnippetClick(e, snippet)}>
-				<i className={snippet.icon} />
-				<span className='name'title={snippet.name}>{snippet.name}</span>
-				{snippet.experimental && <span className='beta'>beta</span>}
-				{snippet.subsnippets && <>
-					<i className='fas fa-caret-right'></i>
-					<div className='dropdown side'>
-						{this.renderSnippets(snippet.subsnippets)}
-					</div></>}
-			</div>;
-
-		});
-	},
-
-	render : function(){
-		return <div className='snippetGroup snippetBarButton'>
-			<div className='text'>
-				<i className={this.props.icon} />
-				<span className='groupName'>{this.props.groupName}</span>
-			</div>
-			<div className='dropdown'>
-				{this.renderSnippets(this.props.snippets)}
-			</div>
-		</div>;
-	},
-});

client/homebrew/editor/snippetbar/snippetbar.less

@@ -1,190 +0,0 @@
-@import (less) './client/icons/customIcons.less';
-@import (less) '././././themes/fonts/5e/fonts.less';
-
-.snippetBar {
-	@menuHeight      : 25px;
-	position         : relative;
-	height           : @menuHeight;
-	color            : black;
-	background-color : #DDDDDD;
-
-	.editors {
-		position        : absolute;
-		top             : 0px;
-		right           : 0px;
-		display         : flex;
-		justify-content : space-between;
-		height          : @menuHeight;
-		& > div {
-			width       : @menuHeight;
-			height      : @menuHeight;
-			line-height : @menuHeight;
-			text-align  : center;
-			cursor      : pointer;
-			&:hover,&.selected { background-color : #999999; }
-			&.text {
-				.tooltipLeft('Brew Editor');
-			}
-			&.style {
-				.tooltipLeft('Style Editor');
-			}
-			&.meta {
-				.tooltipLeft('Properties');
-			}
-			&.undo {
-				.tooltipLeft('Undo');
-				font-size : 0.75em;
-				color     : grey;
-				&.active { color : inherit; }
-			}
-			&.redo {
-				.tooltipLeft('Redo');
-				font-size : 0.75em;
-				color     : grey;
-				&.active { color : inherit; }
-			}
-			&.foldAll {
-				.tooltipLeft('Fold All');
-				font-size : 0.75em;
-				color     : inherit;
-			}
-			&.unfoldAll {
-				.tooltipLeft('Unfold All');
-				font-size : 0.75em;
-				color     : inherit;
-			}
-			&.editorTheme {
-				.tooltipLeft('Editor Themes');
-				font-size : 0.75em;
-				color     : black;
-				&.active {
-					position         : relative;
-					background-color : #999999;
-				}
-			}
-			&.divider {
-				width      : 5px;
-				background : linear-gradient(currentColor, currentColor) no-repeat center/1px 100%;
-				&:hover { background-color : inherit; }
-			}
-		}
-		.themeSelector {
-			position         : absolute;
-			top              : 25px;
-			right            : 0;
-			z-index          : 10;
-			display          : flex;
-			align-items      : center;
-			justify-content  : center;
-			width            : 170px;
-			height           : inherit;
-			background-color : inherit;
-		}
-	}
-	.snippetBarButton {
-		display        : inline-block;
-		height         : @menuHeight;
-		padding        : 0px 5px;
-		font-size      : 0.625em;
-		font-weight    : 800;
-		line-height    : @menuHeight;
-		text-transform : uppercase;
-		cursor         : pointer;
-		&:hover, &.selected { background-color : #999999; }
-		i {
-			margin-right   : 3px;
-			font-size      : 1.4em;
-			vertical-align : middle;
-		}
-	}
-	.toggleMeta {
-		position    : absolute;
-		top         : 0px;
-		right       : 0px;
-		border-left : 1px solid black;
-		.tooltipLeft('Edit Brew Properties');
-	}
-	.snippetGroup {
-		border-right   : 1px solid currentColor;
-		&:hover {
-			& > .dropdown { visibility : visible; }
-		}
-		.dropdown {
-			position         : absolute;
-			top              : 100%;
-			z-index          : 1000;
-			padding          : 0px;
-			margin-left      : -5px;
-			visibility       : hidden;
-			background-color : #DDDDDD;
-			.snippet {
-				position    : relative;
-				display     : flex;
-				align-items : center;
-				min-width   : max-content;
-				padding     : 5px;
-				font-size   : 10px;
-				cursor      : pointer;
-				.animate(background-color);
-				i {
-					height       : 1.2em;
-					margin-right : 8px;
-					font-size    : 1.2em;
-					& ~ i {
-						margin-right : 0;
-						margin-left  : 5px;
-					}
-					/* Fonts */
-					&.font {
-						height : auto;
-						&::before {
-							font-size : 1.4em;
-							content   : 'ABC';
-						}
-
-						&.OpenSans {font-family : 'OpenSans';}
-						&.CodeBold {font-family : 'CodeBold';}
-						&.CodeLight {font-family : 'CodeLight';}
-						&.ScalySansRemake {font-family : 'ScalySansRemake';}
-						&.BookInsanityRemake {font-family : 'BookInsanityRemake';}
-						&.MrEavesRemake {font-family : 'MrEavesRemake';}
-						&.SolberaImitationRemake {font-family : 'SolberaImitationRemake';}
-						&.ScalySansSmallCapsRemake {font-family : 'ScalySansSmallCapsRemake';}
-						&.WalterTurncoat {font-family : 'WalterTurncoat';}
-						&.Lato {font-family : 'Lato';}
-						&.Courier {font-family : 'Courier';}
-						&.NodestoCapsCondensed {font-family : 'NodestoCapsCondensed';}
-						&.Overpass {font-family : 'Overpass';}
-						&.Davek {font-family : 'Davek';}
-						&.Iokharic {font-family : 'Iokharic';}
-						&.Rellanic {font-family : 'Rellanic';}
-						&.TimesNewRoman {font-family : 'Times New Roman';}
-					}
-				}
-				.name { margin-right : auto; }
-				.beta {
-					align-self    : center;
-					padding       : 4px 6px;
-					margin-left   : 5px;
-					font-family   : monospace;
-					line-height   : 1em;
-					color         : white;
-					background    : grey;
-					border-radius : 12px;
-				}
-				&:hover {
-					background-color : #999999;
-					& > .dropdown {
-						visibility : visible;
-						&.side {
-							top         : 0%;
-							left        : 100%;
-							margin-left : 0;
-							box-shadow  : -1px 1px 2px 0px #999999;
-						}
-					}
-				}
-			}
-		}
-	}
-}

client/homebrew/editor/stringArrayEditor/stringArrayEditor.jsx

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

client/homebrew/googleDrive.svg

@@ -1,8 +0,0 @@
-<svg viewBox="0 0 87.3 78" xmlns="http://www.w3.org/2000/svg">
-	<path d="m6.6 66.85 3.85 6.65c.8 1.4 1.95 2.5 3.3 3.3l13.75-23.8h-27.5c0 1.55.4 3.1 1.2 4.5z" fill="#0066da"/>
-	<path d="m43.65 25-13.75-23.8c-1.35.8-2.5 1.9-3.3 3.3l-25.4 44a9.06 9.06 0 0 0 -1.2 4.5h27.5z" fill="#00ac47"/>
-	<path d="m73.55 76.8c1.35-.8 2.5-1.9 3.3-3.3l1.6-2.75 7.65-13.25c.8-1.4 1.2-2.95 1.2-4.5h-27.502l5.852 11.5z" fill="#ea4335"/>
-	<path d="m43.65 25 13.75-23.8c-1.35-.8-2.9-1.2-4.5-1.2h-18.5c-1.6 0-3.15.45-4.5 1.2z" fill="#00832d"/>
-	<path d="m59.8 53h-32.3l-13.75 23.8c1.35.8 2.9 1.2 4.5 1.2h50.8c1.6 0 3.15-.45 4.5-1.2z" fill="#2684fc"/>
-	<path d="m73.4 26.5-12.7-22c-.8-1.4-1.95-2.5-3.3-3.3l-13.75 23.8 16.15 28h27.45c0-1.55-.4-3.1-1.2-4.5z" fill="#ffba00"/>
-</svg>

client/homebrew/homebrew.jsx

@@ -1,102 +1,73 @@
-require('./homebrew.less');
-const React = require('react');
-const createClass = require('create-react-class');
-const { StaticRouter:Router } = require('react-router-dom/server');
-const { Route, Routes, useParams, useSearchParams } = require('react-router-dom');
-
-const 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 AccountPage = require('./pages/accountPage/accountPage.jsx');
-
-const WithRoute = (props)=>{
-	const params = useParams();
-	const [searchParams] = useSearchParams();
-	const queryParams = {};
-	for (const [key, value] of searchParams?.entries() || []) {
-		queryParams[key] = value;
-	}
-	const Element = props.el;
-	const allProps = {
-		...props,
-		...params,
-		query : queryParams,
-		el    : undefined
-	};
-	return <Element {...allProps} />;
-};
-
-const Homebrew = createClass({
-	displayName     : 'Homebrewery',
-	getDefaultProps : function() {
-		return {
-			url         : '',
-			welcomeText : '',
-			changelog   : '',
-			version     : '0.0.0',
-			account     : null,
-			enable_v3   : false,
-			brew        : {
-				title     : '',
-				text      : '',
-				shareId   : null,
-				editId    : null,
-				createdAt : null,
-				updatedAt : null,
-				lang      : ''
-			}
-		};
-	},
-
-	getInitialState : function() {
-		global.account = this.props.account;
-		global.version = this.props.version;
-		global.enable_v3 = this.props.enable_v3;
-		global.enable_themes = this.props.enable_themes;
-		global.config = this.props.config;
-
-		return {};
-	},
-
-	render : function (){
-		return (
-			<Router location={this.props.url}>
-				<div className='homebrew'>
-					<Routes>
-						<Route path='/edit/:id' element={<WithRoute el={EditPage} brew={this.props.brew} />} />
-						<Route path='/share/:id' element={<WithRoute el={SharePage} brew={this.props.brew} />} />
-						<Route path='/new/:id' element={<WithRoute el={NewPage} brew={this.props.brew} />} />
-						<Route path='/new' element={<WithRoute el={NewPage}/>} />
-						<Route path='/user/:username' element={<WithRoute el={UserPage} brews={this.props.brews} />} />
-						<Route path='/print/:id' element={<WithRoute el={PrintPage} brew={this.props.brew} />} />
-						<Route path='/print' element={<WithRoute el={PrintPage} />} />
-						<Route path='/changelog' element={<WithRoute el={SharePage} brew={this.props.brew} />} />
-						<Route path='/faq' element={<WithRoute el={SharePage} brew={this.props.brew} />} />
-						<Route path='/account' element={<WithRoute el={AccountPage} brew={this.props.brew} uiItems={this.props.brew.uiItems} />} />
-						<Route path='/legacy' element={<WithRoute el={HomePage} brew={this.props.brew} />} />
-						<Route path='/error' element={<WithRoute el={ErrorPage} brew={this.props.brew} />} />
-					  	<Route path='/' element={<WithRoute el={HomePage} brew={this.props.brew} />} />
-					  	<Route path='/*' element={<WithRoute el={HomePage} brew={this.props.brew} />} />
-					</Routes>
-				</div>
-			</Router>
-		);
-	}
-});
-
-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} />;
-// 	},
+const React = require('react');
+const _ = require('lodash');
+const cx = require('classnames');
+
+const CreateRouter = require('pico-router').createRouter;
+const BrewActions = require('homebrewery/brew.actions.js');
+const AccountActions = require('homebrewery/account.actions.js');
+
+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 : '',
+			version : '0.0.0',
+			loginPath : '',
+
+			user : undefined,
+			brew : undefined,
+			brews : []
+		};
+	},
+	componentWillMount: function() {
+		BrewActions.init({
+			version : this.props.version,
+			brew    : this.props.brew
+		});
+		AccountActions.init({
+			user      : this.props.user,
+			loginPath : this.props.loginPath
+		});
+
+		Router = CreateRouter({
+			'/edit/:id' : <EditPage />,
+			'/share/:id' : <SharePage />,
+			'/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' : <NewPage />,
+
+
+			'/changelog' : <SharePage />,
+			'/test' : <SharePage />,
+			'/test_old' : <SharePage />,
+
+
+			'*' : <HomePage brews={this.props.brews}/>,
+		});
+	},
+	render : function(){
+		return <div className='homebrew'>
+			<Router initialUrl={this.props.url}/>
+		</div>
+	}
+});
+
+module.exports = Homebrew;

client/homebrew/homebrew.less

@@ -1,20 +1,16 @@
+
 @import 'naturalcrit/styles/core.less';
 .homebrew{
 	height : 100%;
-	.sitePage{
+	.page{
 		display          : flex;
 		height           : 100%;
 		background-color : @steel;
 		flex-direction   : column;
-		overflow-y       : hidden;
 		.content{
-			position   : relative;
-			height     : calc(~"100% - 29px"); //Navbar height
-			flex       : auto;
-			overflow-y : hidden;
-		}
-		&.listPage .content {
-			overflow-y : scroll;
+			position : relative;
+			height   : calc(~"100% - 29px"); //Navbar height
+			flex     : auto;
 		}
 	}
 }

client/homebrew/navbar/account.navitem.jsx

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

client/homebrew/navbar/brewTitle.navitem.jsx

@@ -0,0 +1,9 @@
+const React = require('react');
+const Nav = require('naturalcrit/nav/nav.jsx');
+const Store = require('homebrewery/brew.store.js');
+
+module.exports = Store.createSmartComponent((props) => {
+	return <Nav.item className='brewTitle'>{props.title}</Nav.item>
+}, (props) => {
+	return {title : Store.getMetaData().title};
+})

client/homebrew/navbar/continousSave.navitem (DESKTOP-HB50B8V's conflicted copy 2017-01-22).jsx

@@ -0,0 +1,76 @@
+const flux = require('pico-flux')
+const React = require('react');
+const _ = require('lodash');
+const cx = require('classnames');
+
+const Nav = require('naturalcrit/nav/nav.jsx');
+
+const Store = require('homebrewery/brew.store.js');
+const Actions = require('homebrewery/brew.actions.js');
+
+const onStoreChange = () => {
+	return {
+		status : Store.getStatus(),
+		errors : Store.getErrors()
+	}
+};
+
+const ContinousSave = React.createClass({
+	getDefaultProps: function() {
+		return {
+			status : 'ready',
+			errors : undefined
+		};
+	},
+	componentDidMount: function() {
+		flux.actionEmitter.on('dispatch', this.actionHandler);
+		window.onbeforeunload = ()=>{
+			if(this.props.status !== 'ready') return 'You have unsaved changes!';
+		};
+	},
+	componentWillUnmount: function() {
+		flux.actionEmitter.removeListener('dispatch', this.actionHandler);
+		window.onbeforeunload = function(){};
+	},
+	actionHandler : function(actionType){
+		if(actionType == 'UPDATE_BREW_TEXT' || actionType == 'UPDATE_META'){
+			Actions.pendingSave();
+		}
+	},
+	handleClick : function(){
+		Actions.save();
+	},
+	renderError : function(){
+		let 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='continousSave 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>
+	},
+	render : function(){
+		if(this.props.status == 'error') return this.renderError();
+
+		if(this.props.status == 'saving'){
+			return <Nav.item className='continousSave' icon="fa-spinner fa-spin">saving...</Nav.item>
+		}
+		if(this.props.status == 'pending'){
+			return <Nav.item className='continousSave' onClick={this.handleClick} color='blue' icon='fa-save'>Save Now</Nav.item>
+		}
+		if(this.props.status == 'ready'){
+			return <Nav.item className='continousSave saved'>saved.</Nav.item>
+		}
+	},
+
+});
+
+module.exports = Store.createSmartComponent(ContinousSave, onStoreChange);

client/homebrew/navbar/continousSave.navitem.jsx

@@ -0,0 +1,79 @@
+const flux = require('pico-flux')
+const React = require('react');
+const _ = require('lodash');
+const cx = require('classnames');
+
+const Nav = require('naturalcrit/nav/nav.jsx');
+
+const Store = require('homebrewery/brew.store.js');
+const Actions = require('homebrewery/brew.actions.js');
+
+const onStoreChange = () => {
+	return {
+		status : Store.getStatus(),
+		errors : Store.getErrors()
+	}
+};
+
+const ContinousSave = React.createClass({
+	getDefaultProps: function() {
+		return {
+			status : 'ready',
+			errors : undefined
+		};
+	},
+	componentDidMount: function() {
+		flux.actionEmitter.on('dispatch', this.actionHandler);
+		window.onbeforeunload = ()=>{
+			if(this.props.status !== 'ready') return 'You have unsaved changes!';
+		};
+	},
+	componentWillUnmount: function() {
+		flux.actionEmitter.removeListener('dispatch', this.actionHandler);
+		window.onbeforeunload = function(){};
+	},
+	actionHandler : function(actionType){
+		if(actionType == 'UPDATE_BREW_CODE' || actionType == 'UPDATE_META' || actionType == 'UPDATE_BREW_STYLE'){
+			Actions.pendingSave();
+		}
+	},
+	handleClick : function(){
+		Actions.save();
+	},
+	renderError : function(){
+		let 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='continousSave error' icon="fa-warning">
+			Oops!
+			<div className='errorContainer'>
+				Looks like there was a problem saving. <br />
+				Back up your brew in a text file, just in case.
+				<br /><br />
+
+				Report the issue <a target='_blank' href={'https://github.com/stolksdorf/naturalcrit/issues/new?body='+ encodeURIComponent(errMsg)}>
+					here
+				</a>.
+			</div>
+		</Nav.item>
+	},
+	render : function(){
+		if(this.props.status == 'error') return this.renderError();
+
+		if(this.props.status == 'saving'){
+			return <Nav.item className='continousSave' icon="fa-spinner fa-spin">saving...</Nav.item>
+		}
+		if(this.props.status == 'pending'){
+			return <Nav.item className='continousSave' onClick={this.handleClick} color='blue' icon='fa-save'>Save Now</Nav.item>
+		}
+		if(this.props.status == 'ready'){
+			return <Nav.item className='continousSave saved'>saved.</Nav.item>
+		}
+	},
+
+});
+
+module.exports = Store.createSmartComponent(ContinousSave, onStoreChange);

client/homebrew/navbar/editTitle.navitem.jsx

@@ -1,34 +1,33 @@
-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({
-	displayName     : 'EditTitleNavItem',
-	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;
+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;

client/homebrew/navbar/error-navitem.jsx

@@ -1,119 +0,0 @@
-require('./error-navitem.less');
-const React = require('react');
-const Nav = require('naturalcrit/nav/nav.jsx');
-const createClass = require('create-react-class');
-
-const ErrorNavItem = createClass({
-	getDefaultProps : function() {
-		return {
-			error  : '',
-			parent : null
-		};
-	},
-	render : function() {
-		const clearError = ()=>{
-			const state = {
-				error : null
-			};
-			if(this.props.parent.state.isSaving) {
-				state.isSaving = false;
-			}
-			this.props.parent.setState(state);
-		};
-
-		const error       = this.props.error;
-		const response    = error.response;
-		const status      = response.status;
-		const HBErrorCode = response.body?.HBErrorCode;
-		const message     = response.body?.message;
-		let errMsg = '';
-		try {
-			errMsg += `${error.toString()}\n\n`;
-			errMsg += `\`\`\`\n${error.stack}\n`;
-			errMsg += `${JSON.stringify(response.error, null, '  ')}\n\`\`\``;
-			console.log(errMsg);
-		} catch (e){}
-
-		if(status === 409) {
-			return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
-				Oops!
-				<div className='errorContainer' onClick={clearError}>
-					{message ?? 'Conflict: please refresh to get latest changes'}
-				</div>
-			</Nav.item>;
-		}
-		
-		if(status === 412) {
-			return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
-				Oops!
-				<div className='errorContainer' onClick={clearError}>
-					{message ?? 'Your client is out of date. Please save your changes elsewhere and refresh.'}
-				</div>
-			</Nav.item>;
-		}
-		
-		if(HBErrorCode === '04') {
-			return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
-				Oops!
-				<div className='errorContainer' onClick={clearError}>
-					You are no longer signed in as an author of
-					this brew! Were you signed out from a different
-					window? Visit our log in page, then try again!
-					<br></br>
-					<a target='_blank' rel='noopener noreferrer'
-						href={`https://www.naturalcrit.com/login?redirect=${window.location.href}`}>
-						<div className='confirm'>
-							Sign In
-						</div>
-					</a>
-					<div className='deny'>
-						Not Now
-					</div>
-				</div>
-			</Nav.item>;
-		}
-
-		if(response.body?.errors?.[0].reason == 'storageQuotaExceeded') {
-			return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
-			Oops!
-			<div className='errorContainer' onClick={clearError}>
-				Can't save because your Google Drive seems to be full!
-			</div>
-		</Nav.item>;
-		}
-
-		if(response.req.url.match(/^\/api.*Google.*$/m)){
-			return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
-				Oops!
-				<div className='errorContainer' onClick={clearError}>
-					Looks like your Google credentials have
-					expired! Visit our log in page to sign out
-					and sign back in with Google,
-					then try saving again!
-					<br></br>
-					<a target='_blank' rel='noopener noreferrer'
-						href={`https://www.naturalcrit.com/login?redirect=${window.location.href}`}>
-						<div className='confirm'>
-							Sign In
-						</div>
-					</a>
-					<div className='deny'>
-						Not Now
-					</div>
-				</div>
-			</Nav.item>;
-		}
-
-		return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
-			Oops!
-			<div className='errorContainer'>
-				Looks like there was a problem saving. <br />
-				Report the issue <a target='_blank' rel='noopener noreferrer' href={`https://github.com/naturalcrit/homebrewery/issues/new?template=save_issue.yml&error-code=${encodeURIComponent(errMsg)}`}>
-				here
-				</a>.
-			</div>
-		</Nav.item>;
-	}
-});
-
-module.exports = ErrorNavItem;

client/homebrew/navbar/error-navitem.less

@@ -1,75 +0,0 @@
-.navItem.error {
-  position         : relative;
-  background-color : @red;
-}
-
-.errorContainer{
-  animation-name: glideDown;
-  animation-duration: 0.4s;
-  position         : absolute;
-  top              : 100%;
-  left             : 50%;
-  z-index          : 1000;
-  width            : 140px;
-  padding          : 3px;
-  color            : white;
-  background-color : #333;
-  border           : 3px solid #444;
-  border-radius    : 5px;
-  transform        : translate(-50% + 3px, 10px);
-  text-align       : center;
-  font-size        : 10px;
-  font-weight      : 800;
-  text-transform   : uppercase;
-  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/navbar/help.navitem.jsx

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

client/homebrew/navbar/issue.navitem.jsx

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

client/homebrew/navbar/metadata.navitem.jsx

@@ -1,90 +0,0 @@
-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 MetadataNav = createClass({
-	displayName     : 'MetadataNav',
-	getDefaultProps : function() {
-		return {
-		};
-	},
-
-	getInitialState : function() {
-		return {
-			showMetaWindow : false
-		};
-	},
-
-	componentDidMount : function() {
-	},
-
-	toggleMetaWindow : function(){
-		this.setState((prevProps)=>({
-			showMetaWindow : !prevProps.showMetaWindow
-		}));
-	},
-
-	getAuthors : function(){
-		if(!this.props.brew.authors || this.props.brew.authors.length == 0) return 'No authors';
-		return <>
-			{this.props.brew.authors.map((author, idx, arr)=>{
-				const spacer = arr.length - 1 == idx ? <></> : <span>, </span>;
-				return <span key={idx}><a className='userPageLink' href={`/user/${author}`}>{author}</a>{spacer}</span>;
-			})}
-		</>;
-	},
-
-	getTags : function(){
-		if(!this.props.brew.tags || this.props.brew.tags.length == 0) return 'No tags';
-		return <>
-			{this.props.brew.tags.map((tag, idx)=>{
-				return <span className='tag' key={idx}>{tag}</span>;
-			})}
-		</>;
-	},
-
-	getSystems : function(){
-		if(!this.props.brew.systems || this.props.brew.systems.length == 0) return 'No systems';
-		return this.props.brew.systems.join(', ');
-	},
-
-	renderMetaWindow : function(){
-		return <div className={`window ${this.state.showMetaWindow ? 'active' : 'inactive'}`}>
-			<div className='row'>
-				<h4>Description</h4>
-				<p>{this.props.brew.description || 'No description.'}</p>
-			</div>
-			<div className='row'>
-				<h4>Authors</h4>
-				<p>{this.getAuthors()}</p>
-			</div>
-			<div className='row'>
-				<h4>Tags</h4>
-				<p>{this.getTags()}</p>
-			</div>
-			<div className='row'>
-				<h4>Systems</h4>
-				<p>{this.getSystems()}</p>
-			</div>
-			<div className='row'>
-				<h4>Updated</h4>
-				<p>{Moment(this.props.brew.updatedAt).fromNow()}</p>
-			</div>
-		</div>;
-	},
-
-	render : function(){
-		return <Nav.item icon='fas fa-info-circle' color='grey' className='metadata'
-			onClick={()=>this.toggleMetaWindow()}>
-			{this.props.children}
-			{this.renderMetaWindow()}
-		</Nav.item>;
-	}
-
-});
-
-module.exports = MetadataNav;

client/homebrew/navbar/navbar.jsx

@@ -1,52 +1,22 @@
-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({
-	displayName     : 'Navbar',
-	getInitialState : function() {
-		return {
-			//showNonChromeWarning : false,
-			ver : '0.0.0'
-		};
-	},
-
-	getInitialState : function() {
-		return {
-			ver : global.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 newTab={true} href='/changelog' color='purple' icon='far fa-file-alt'>
-					{`v${this.state.ver}`}
-				</Nav.item>
-				<PatreonNavItem />
-				{/*this.renderChromeWarning()*/}
-			</Nav.section>
-			{this.props.children}
-		</Nav.base>;
-	}
-});
-
-module.exports = Navbar;
+const React = require('react');
+const _ = require('lodash');
+
+const Nav = require('naturalcrit/nav/nav.jsx');
+const Store = require('homebrewery/brew.store.js');
+
+const Navbar = React.createClass({
+	render : function(){
+		return <Nav.base>
+			<Nav.section>
+				<Nav.logo />
+				<Nav.item href='/' className='homebrewLogo'>
+					<div>The Homebrewery</div>
+				</Nav.item>
+				<Nav.item>{`v${Store.getVersion()}`}</Nav.item>
+			</Nav.section>
+			{this.props.children}
+		</Nav.base>
+	}
+});
+
+module.exports = Navbar;

client/homebrew/navbar/navbar.less

@@ -1,351 +1,132 @@
-@import 'naturalcrit/styles/colors.less';
-
-@navbarHeight : 28px;
-
-@keyframes pinkColoring {
-	0% { color : pink; }
-	50% { color : pink; }
-	75% { color : red; }
-	100% { color : pink; }
-}
-
-@keyframes glideDropDown {
-	0% {
-		background-color : #333333;
-		opacity          : 0;
-		transform        : translate(0px, -100%);
-	}
-	100% {
-		background-color : #333333;
-		opacity          : 1;
-		transform        : translate(0px, 0px);
-	}
-}
-
-.homebrew nav {
-	background-color : #333333;
-	.navContent {
-		position        : relative;
-		z-index         : 2;
-		display         : flex;
-		justify-content : space-between;
-	}
-	.navSection {
-		display     : flex;
-		align-items : center;
-		&:last-child .navItem { border-left : 1px solid #666666; }
-	}
-	// "NaturalCrit" logo
-	.navLogo {
-		display         : block;
-		margin-top      : 0px;
-		margin-right    : 8px;
-		margin-left     : 8px;
-		color           : white;
-		text-decoration : none;
-		&:hover {
-			.name { color : @orange; }
-			svg { fill : @orange; }
-		}
-		svg {
-			height       : 13px;
-			margin-right : 0.2em;
-			cursor       : pointer;
-			fill         : white;
-		}
-		span.name {
-			font-family : 'CodeLight';
-			font-size   : 15px;
-			span.crit { font-family : 'CodeBold'; }
-			small {
-				font-family    : 'Open Sans';
-				font-size      : 0.3em;
-				font-weight    : 800;
-				text-transform : uppercase;
-			}
-		}
-	}
-	.navItem {
-		#backgroundColorsHover;
-		.animate(background-color);
-		padding          : 8px 12px;
-		font-size        : 10px;
-		font-weight      : 800;
-		line-height      : 13px;
-		color            : white;
-		text-decoration  : none;
-		text-transform   : uppercase;
-		cursor           : pointer;
-		background-color : #333333;
-		i {
-			float       : right;
-			margin-left : 5px;
-			font-size   : 13px;
-		}
-		&.patreon {
-			border-right : 1px solid #666666;
-			border-left  : 1px solid #666666;
-			&:hover i { color : red; }
-			i {
-				color              : pink;
-				.animate(color);
-				animation-name     : pinkColoring;
-				animation-duration : 2s;
-			}
-		}
-		&.editTitle {  // this is not needed at all currently - you used to be able to edit the title via the navbar.
-			padding : 2px 12px;
-			input {
-				width            : 250px;
-				padding          : 2px;
-				margin           : 0;
-				font-family      : 'Open Sans', sans-serif;
-				font-size        : 12px;
-				font-weight      : 800;
-				color            : white;
-				text-align       : center;
-				background-color : transparent;
-				border           : 1px solid @blue;
-				outline          : none;
-			}
-			.charCount {
-				display        : inline-block;
-				margin-left    : 8px;
-				color          : #666666;
-				text-align     : right;
-				vertical-align : bottom;
-				&.max { color : @red; }
-			}
-		}
-		&.brewTitle {
-			flex-grow        : 1;
-			font-size        : 12px;
-			font-weight      : 800;
-			color            : white;
-			text-align       : center;
-			text-transform   : initial;
-			background-color : transparent;
-		}
-		// "The Homebrewery" logo
-		&.homebrewLogo {
-			.animate(color);
-			font-family : 'CodeBold';
-			font-size   : 12px;
-			color       : white;
-			div {
-				margin-top    : 2px;
-				margin-bottom : -2px;
-			}
-			&:hover { color : @blue; }
-		}
-		&.metadata {
-			position    : relative;
-			display     : flex;
-			flex-grow   : 1;
-			align-items : center;
-			height      : 100%;
-			padding     : 0;
-			i { margin-right : 10px;}
-			.window {
-				position         : absolute;
-				bottom           : 0;
-				left             : 50%;
-				z-index          : -1;
-				display          : flex;
-				flex-flow        : row wrap;
-				align-content    : baseline;
-				justify-content  : flex-start;
-				width            : 440px;
-				max-height       : ~'calc(100vh - 28px)';
-				padding          : 0 10px 5px;
-				margin           : 0 auto;
-				background-color : #333333;
-				border           : 3px solid #444444;
-				border-top       : unset;
-				border-radius    : 0 0 5px 5px;
-				box-shadow       : inset 0 7px 9px -7px #111111;
-				transition       : transform 0.4s, opacity 0.4s;
-				&.active {
-					opacity   : 1;
-					transform : translateX(-50%) translateY(100%);
-				}
-				&.inactive {
-					opacity   : 0;
-					transform : translateX(-50%) translateY(0%);
-				}
-				.row {
-					display   : flex;
-					flex-flow : row wrap;
-					width     : 100%;
-					h4 {
-						box-sizing : border-box;
-						display    : block;
-						flex-basis : 20%;
-						flex-grow  : 1;
-						min-width  : 76px;
-						padding    : 5px 0;
-						color      : #BBBBBB;
-						text-align : center;
-					}
-					p {
-						flex-basis     : 80%;
-						flex-grow      : 1;
-						padding        : 5px 0;
-						font-family    : 'Open Sans', sans-serif;
-						font-size      : 10px;
-						font-weight    : normal;
-						text-transform : initial;
-						.tag {
-							display          : inline-block;
-							padding          : 2px;
-							margin           : 2px 2px;
-							background-color : #444444;
-							border           : 2px solid grey;
-							border-radius    : 5px;
-						}
-						a.userPageLink {
-							color           : white;
-							text-decoration : none;
-							&:hover { text-decoration : underline; }
-						}
-					}
-					&:nth-of-type(even) { background-color : #555555; }
-				}
-			}
-		}
-		&.warning {
-			position         : relative;
-			color            : white;
-			background-color : @orange;
-			&:hover > .dropdown { visibility : visible; }
-			.dropdown {
-				position         : absolute;
-				top              : 28px;
-				left             : 0;
-				z-index          : 10000;
-				box-sizing       : border-box;
-				display          : block;
-				width            : 100%;
-				padding          : 13px 5px;
-				text-align       : center;
-				visibility       : hidden;
-				background-color : #333333;
-			}
-		}
-		&.account {
-			min-width : 100px;
-			&.username { text-transform : none;}
-		}
-	}
-	.navDropdownContainer {
-		position : relative;
-		.navDropdown {
-			position: absolute;
-			top: 28px;
-			right: 0px;
-			z-index: 10000;
-			width: max-content;
-			min-width:100%;
-			max-height: calc(100vh - 28px);
-			overflow: hidden auto;
-			display: flex;
-			flex-direction: column;
-			align-items: flex-end;
-			.navItem {
-				position           : relative;
-				display            : flex;
-				justify-content    : space-between;
-				align-items        : center;
-				width              : 100%;
-				border             : 1px solid #888888;
-				border-bottom      : 0;
-				animation-name     : glideDropDown;
-				animation-duration : 0.4s;
-			}
-		}
-		&.recent {
-			position : relative;
-			.navDropdown .navItem {
-				#backgroundColorsHover;
-				.animate(background-color);
-				position         : relative;
-				box-sizing       : border-box;
-				display          : block;
-				max-width        : 15em;
-				max-height       : ~'calc(100vh - 28px)';			
-				padding          : 8px 5px 13px;
-				overflow         : hidden auto;
-				color            : white;
-				text-decoration  : none;
-				background-color : #333333;
-				border-top       : 1px solid #888888;
-				scrollbar-color  : #666666 #333333;
-				scrollbar-width  : thin;
-				.clear {
-					position         : absolute;
-					top              : 50%;
-					right            : 0;
-					display          : none;
-					width            : 20px;
-					height           : 100%;
-					background-color : #333333;
-					border-radius    : 3px;
-					opacity          : 70%;
-					transform        : translateY(-50%);
-					&:hover { opacity : 100%; }
-					i {
-						width      : 100%;
-						height     : 100%;
-						margin     : 0;
-						font-size  : 10px;
-						text-align : center;
-					}
-				}
-				&:hover {
-					background-color : @blue;
-					.clear {
-						display       : grid;
-						place-content : center;
-					}
-				}
-				.title {
-					display       : inline-block;
-					width         : 100%;
-					overflow      : hidden auto;
-					text-overflow : ellipsis;
-					white-space   : nowrap;
-				}
-				.time {
-					position  : absolute;
-					right     : 2px;
-					bottom    : 2px;
-					font-size : 0.7em;
-					color     : #888888;
-				}
-				&.header {
-					box-sizing       : border-box;
-					display          : block;
-					padding          : 5px 0;
-					color            : #BBBBBB;
-					text-align       : center;
-					background-color : #333333;
-					border-top       : 1px solid #888888;
-					&:nth-of-type(1) { background-color : darken(@teal, 20%); }
-					&:nth-of-type(2) { background-color : darken(@purple, 30%); }
-				}
-			}
-		}
-	}
-}
-
-// this should likely be refactored into .navDropdownContainer
-.save-menu {
-	.dropdown { z-index : 1000; }
-	.navItem i.fa-power-off {
-		color : red;
-		&.active {
-			color  : rgb(0, 182, 52);
-			filter : drop-shadow(0 0 2px rgba(0, 182, 52, 0.765));
-		}
-	}
-}
+@navbarHeight : 28px;
+.homebrew nav{
+	.homebrewLogo{
+		.animate(color);
+		font-family : CodeBold;
+		font-size   : 12px;
+		color       : white;
+		div{
+			margin-top    : 2px;
+			margin-bottom : -2px;
+		}
+		&:hover{
+			color : @blue;
+		}
+	}
+	.brewTitle.navItem{
+		font-size      : 12px;
+		font-weight    : 800;
+		color          : white;
+		text-align     : center;
+		text-transform : initial;
+	}
+	.patreon.navItem{
+		i{
+			.animate(color);
+			&:hover{
+				color : @red;
+			}
+		}
+	}
+	.recent.navItem{
+		position : relative;
+		.dropdown{
+			position : absolute;
+			top      : 28px;
+			left     : 0px;
+			z-index  : 10000;
+			width    : 100%;
+			h4{
+				display          : block;
+				box-sizing       : border-box;
+				padding          : 5px 0px;
+				background-color : #333;
+				font-size        : 0.8em;
+				color            : #bbb;
+				text-align       : center;
+				border-top       : 1px solid #888;
+				&:nth-of-type(1){ background-color: darken(@teal, 20%); }
+				&:nth-of-type(2){ background-color: darken(@purple, 30%); }
+			}
+			.item{
+				.animate(background-color);
+				position         : relative;
+				display          : block;
+				box-sizing       : border-box;
+				padding          : 13px 5px;
+				background-color : #333;
+				color            : white;
+				text-decoration  : none;
+				border-top       : 1px solid #888;
+				&:hover{
+					background-color : @blue;
+				}
+				.title{
+					display       : inline-block;
+					overflow      : hidden;
+					width         : 100%;
+					text-overflow : ellipsis;
+					white-space   : nowrap;
+				}
+				.time{
+					position  : absolute;
+					right     : 2px;
+					bottom    : 2px;
+					font-size : 0.7em;
+					color     : #888;
+				}
+			}
+		}
+	}
+	.warning.navItem{
+		position         : relative;
+		background-color : @orange;
+		color            : white;
+		&:hover>.dropdown{
+			visibility : visible;
+		}
+		.dropdown{
+			position         : absolute;
+			display          : block;
+			top              : 28px;
+			left             : 0px;
+			visibility       : hidden;
+			z-index          : 10000;
+			box-sizing       : border-box;
+			width            : 100%;
+			padding          : 13px 5px;
+			background-color : #333;
+			text-align       : center;
+		}
+	}
+	.staticSave.navItem{
+		background-color : @orange;
+		&:hover{
+			background-color : @green;
+		}
+	}
+	.continousSave.navItem{
+		width      : 105px;
+		text-align : center;
+		&.saved{
+			cursor : initial;
+			color  : #666;
+		}
+		&.error{
+			position         : relative;
+			background-color : @red;
+			.errorContainer{
+				position         : absolute;
+				top              : 29px;
+				left             : -20px;
+				z-index          : 1000;
+				width            : 170px;
+				padding          : 8px;
+				background-color : #333;
+				a{
+					color : @teal;
+				}
+			}
+		}
+	}
+}

client/homebrew/navbar/navitems.js

@@ -0,0 +1,10 @@
+module.exports = {
+	Account       : require('./account.navitem.jsx'),
+	BrewTitle     : require('./brewTitle.navitem.jsx'),
+	ContinousSave : require('./continousSave.navitem.jsx'),
+	Issue         : require('./issue.navitem.jsx'),
+	Patreon       : require('./patreon.navitem.jsx'),
+	Print         : require('./print.navitem.jsx'),
+	Recent        : require('./recent.navitem.jsx'),
+	StaticSave    : require('./staticSave.navitem.jsx'),
+};

client/homebrew/navbar/newbrew.navitem.jsx

@@ -1,64 +0,0 @@
-const React = require('react');
-const _ = require('lodash');
-const Nav = require('naturalcrit/nav/nav.jsx');
-const { splitTextStyleAndMetadata } = require('../../../shared/helpers.js'); // Importing the function from helpers.js
-
-const BREWKEY  = 'homebrewery-new';
-const STYLEKEY = 'homebrewery-new-style';
-const METAKEY  = 'homebrewery-new-meta';
-
-const NewBrew = () => {   
-    const handleFileChange = (e) => {
-        const file = e.target.files[0];
-        if (file) {
-            const reader = new FileReader();
-            reader.onload = (e) => {
-                const fileContent = e.target.result;
-                const newBrew = {
-                    text: fileContent,
-                    style: ''
-                };
-                if(fileContent.startsWith('```metadata')) {
-                    splitTextStyleAndMetadata(newBrew); // Modify newBrew directly
-                    localStorage.setItem(BREWKEY, newBrew.text);
-                    localStorage.setItem(STYLEKEY, newBrew.style);
-                    localStorage.setItem(METAKEY, JSON.stringify(_.pick(newBrew, ['title', 'description', 'tags', 'systems', 'renderer', 'theme', 'lang'])));
-                    window.location.href = '/new';
-                } else {
-                    alert('This file is invalid, please, enter a valid file');
-                }
-            };
-            reader.readAsText(file);
-        }
-    };
-
-    return (
-        <Nav.dropdown>
-            <Nav.item
-                className='new'
-                color='purple'
-                icon='fa-solid fa-plus-square'>
-                new
-            </Nav.item>
-            <Nav.item
-                className='fromBlank'
-                href='/new'
-                newTab={true}
-                color='purple'
-                icon='fa-solid fa-file'>
-                from blank
-            </Nav.item>
-
-            <Nav.item
-                className='fromFile'
-                color='purple'
-                icon='fa-solid fa-upload'
-                onClick={() => { document.getElementById('uploadTxt').click(); }}>
-                <input id="uploadTxt" className='newFromLocal' type="file" onChange={handleFileChange} style={{ display: 'none' }} />
-                from file
-            </Nav.item>
-        </Nav.dropdown>
-    );
-};
-
-module.exports = NewBrew;

client/homebrew/navbar/patreon.navitem.jsx

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

client/homebrew/navbar/print.navitem.jsx

@@ -1,9 +1,8 @@
-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='far fa-file-pdf'>
-		get PDF
-	</Nav.item>;
-};
+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>
+};

client/homebrew/navbar/recent.navitem.jsx

@@ -1,207 +1,204 @@
-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({
-	DisplayName     : 'RecentItems',
-	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) {
-	 		let edited = JSON.parse(localStorage.getItem(EDIT_KEY) || '[]');
-			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
-		});
-	},
-
-	removeItem : function(url, evt){
-		evt.preventDefault();
-		evt.stopPropagation();
-
-		let edited = JSON.parse(localStorage.getItem(EDIT_KEY) || '[]');
-		let viewed = JSON.parse(localStorage.getItem(VIEW_KEY) || '[]');
-
-		edited = edited.filter((item)=>{ return (item.url !== url);});
-		viewed = viewed.filter((item)=>{ return (item.url !== url);});
-
-		localStorage.setItem(EDIT_KEY, JSON.stringify(edited));
-		localStorage.setItem(VIEW_KEY, JSON.stringify(viewed));
-
-		this.setState({
-			edit : edited,
-			view : viewed
-		});
-
-	},
-
-	renderDropdown : function(){
-		// if(!this.state.showDropdown) return null;
-
-		const makeItems = (brews)=>{
-			return _.map(brews, (brew, i)=>{
-				return <a className='navItem' href={brew.url} key={`${brew.id}-${i}`} target='_blank' rel='noopener noreferrer' title={brew.title || '[ no title ]'}>
-					<span className='title'>{brew.title || '[ no title ]'}</span>
-					<span className='time'>{Moment(brew.ts).fromNow()}</span>
-					<div className='clear' title='Remove from Recents' onClick={(e)=>{this.removeItem(`${brew.url}`, e);}}><i className='fas fa-times'></i></div>
-				</a>;
-			});
-		};
-
-		return <>
-			{(this.props.showEdit && this.props.showView) ?
-				<Nav.item className='header'>edited</Nav.item> : null }
-			{this.props.showEdit ?
-				makeItems(this.state.edit) : null }
-			{(this.props.showEdit && this.props.showView) ?
-				<Nav.item className='header'>viewed</Nav.item>	: null }
-			{this.props.showView ?
-				makeItems(this.state.view) : null }
-		</>;
-	},
-
-	render : function(){
-		return <Nav.dropdown className='recent'>
-			<Nav.item icon='fas fa-history' color='grey' >
-				{this.props.text}
-			</Nav.item>
-			{this.renderDropdown()}
-		</Nav.dropdown>;
-	}
-
-});
-
-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}
-		/>;
-	}
-};
+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';
+
+//DEPRICATED
+
+
+var BaseItem = React.createClass({
+	getDefaultProps: function() {
+		return {
+			storageKey : '',
+			text : '',
+			currentBrew:{
+				title : '',
+				id : '',
+				url : ''
+			}
+		};
+	},
+	getInitialState: function() {
+		return {
+			showDropdown: false,
+			brews : []
+		};
+	},
+
+	componentDidMount: function() {
+		console.log('Recent nav item is depricated');
+
+		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>
+		}
+
+	})
+}

client/homebrew/navbar/reddit.navitem.jsx

@@ -1,46 +0,0 @@
-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({
-	displayName     : 'RedditShareNavItem',
-	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/navbar/staticSave.navitem.jsx

@@ -0,0 +1,37 @@
+const React = require('react');
+const _ = require('lodash');
+const cx = require('classnames');
+
+const Nav = require('naturalcrit/nav/nav.jsx');
+const Store = require('homebrewery/brew.store.js');
+const Actions = require('homebrewery/brew.actions.js');
+
+const StaticSave = React.createClass({
+	getDefaultProps: function() {
+		return {
+			status : 'ready'
+		};
+	},
+	handleClick : function(){
+		Actions.create();
+	},
+	render : function(){
+		if(this.props.status === 'saving'){
+			return <Nav.item icon='fa-spinner fa-spin' className='staticSave'>
+				save...
+			</Nav.item>
+		}
+		if(this.props.status === 'ready'){
+			return <Nav.item icon='fa-save' className='staticSave' onClick={this.handleClick}>
+				save
+			</Nav.item>
+		}
+	}
+});
+
+
+module.exports = Store.createSmartComponent(StaticSave, ()=>{
+	return {
+		status : Store.getStatus()
+	}
+});

client/homebrew/pages/accountPage/accountPage.jsx

@@ -1,102 +0,0 @@
-const React = require('react');
-const createClass = require('create-react-class');
-const _     = require('lodash');
-const cx    = require('classnames');
-const moment = require('moment');
-
-const UIPage = require('../basePages/uiPage/uiPage.jsx');
-
-const Nav = require('naturalcrit/nav/nav.jsx');
-const Navbar = require('../../navbar/navbar.jsx');
-
-const RecentNavItem = require('../../navbar/recent.navitem.jsx').both;
-const Account = require('../../navbar/account.navitem.jsx');
-const NewBrew = require('../../navbar/newbrew.navitem.jsx');
-const HelpNavItem = require('../../navbar/help.navitem.jsx');
-
-const NaturalCritIcon = require('naturalcrit/svg/naturalcrit.svg.jsx');
-
-let SAVEKEY = '';
-
-const AccountPage = createClass({
-	displayName     : 'AccountPage',
-	getDefaultProps : function() {
-		return {
-			brew    : {},
-			uiItems : {}
-		};
-	},
-	getInitialState : function() {
-		return {
-			uiItems : this.props.uiItems
-		};
-	},
-	componentDidMount : function(){
-		if(!this.state.saveLocation && this.props.uiItems.username) {
-			SAVEKEY = `HOMEBREWERY-DEFAULT-SAVE-LOCATION-${this.props.uiItems.username}`;
-			let saveLocation =  window.localStorage.getItem(SAVEKEY);
-			saveLocation = saveLocation ?? (this.state.uiItems.googleId ? 'GOOGLE-DRIVE' : 'HOMEBREWERY');
-			this.makeActive(saveLocation);
-		}
-	},
-
-	makeActive : function(newSelection){
-		if(this.state.saveLocation == newSelection) return;
-		window.localStorage.setItem(SAVEKEY, newSelection);
-		this.setState({
-			saveLocation : newSelection
-		});
-	},
-
-	renderButton : function(name, key, shouldRender=true){
-		if(!shouldRender) return;
-		return <button className={this.state.saveLocation==key ? 'active' :	''}	onClick={()=>{this.makeActive(key);}}>{name}</button>;
-	},
-
-	renderNavItems : function() {
-		return <Navbar>
-			<Nav.section>
-				<NewBrew />
-				<HelpNavItem />
-				<RecentNavItem />
-				<Account />
-			</Nav.section>
-		</Navbar>;
-	},
-
-	renderUiItems : function() {
-		return 	<>
-			<div className='dataGroup'>
-				<h1>Account Information  <i className='fas fa-user'></i></h1>
-				<p><strong>Username: </strong> {this.props.uiItems.username || 'No user currently logged in'}</p>
-				<p><strong>Last Login: </strong> {moment(this.props.uiItems.issued).format('dddd, MMMM Do YYYY, h:mm:ss a ZZ') || '-'}</p>
-			</div>
-			<div className='dataGroup'>
-				<h3>Homebrewery Information <NaturalCritIcon /></h3>
-				<p><strong>Brews on Homebrewery: </strong> {this.props.uiItems.mongoCount}</p>
-			</div>
-			<div className='dataGroup'>
-				<h3>Google Information <i className='fab fa-google-drive'></i></h3>
-				<p><strong>Linked to Google: </strong> {this.props.uiItems.googleId ? 'YES' : 'NO'}</p>
-				{this.props.uiItems.googleId &&
-					<p>
-						<strong>Brews on Google Drive: </strong> {this.props.uiItems.googleCount ?? <>Unable to retrieve files - <a href='https://github.com/naturalcrit/homebrewery/discussions/1580'>follow these steps to renew your Google credentials.</a></>}
-					</p>
-				}
-			</div>
-			<div className='dataGroup'>
-				<h4>Default Save Location</h4>
-				{this.renderButton('Homebrewery', 'HOMEBREWERY')}
-				{this.renderButton('Google Drive', 'GOOGLE-DRIVE', this.state.uiItems.googleId)}
-			</div>
-		</>;
-	},
-
-	render : function(){
-		return <UIPage brew={this.props.brew}>
-			{this.renderUiItems()}
-		</UIPage>;
-	}
-});
-
-module.exports = AccountPage;

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

@@ -1,179 +0,0 @@
-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('../../../../utils/request-middleware.js');
-
-const googleDriveIcon = require('../../../../googleDrive.svg');
-const homebreweryIcon = require('../../../../thumbnail.png');
-const dedent = require('dedent-tabs').default;
-
-const BrewItem = createClass({
-	displayName     : 'BrewItem',
-	getDefaultProps : function() {
-		return {
-			brew : {
-				title       : '',
-				description : '',
-				authors     : [],
-				stubbed     : true
-			},
-			updateListFilter : ()=>{},
-			reportError      : ()=>{}
-		};
-	},
-
-	deleteBrew : function(){
-		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.delete(`/api/${this.props.brew.googleId ?? ''}${this.props.brew.editId}`)
-			.send()
-			.end((err, res)=>{
-				if(err) {
-					this.props.reportError(err);
-				} else {
-					location.reload();
-				}
-			});
-	},
-
-	updateFilter : function(type, term){
-		this.props.updateListFilter(type, term);
-	},
-
-	renderDeleteBrewLink : function(){
-		if(!this.props.brew.editId) return;
-
-		return <a className='deleteLink' onClick={this.deleteBrew}>
-			<i className='fas fa-trash-alt' title='Delete' />
-		</a>;
-	},
-
-	renderEditLink : function(){
-		if(!this.props.brew.editId) return;
-
-		let editLink = this.props.brew.editId;
-		if(this.props.brew.googleId && !this.props.brew.stubbed) {
-			editLink = this.props.brew.googleId + editLink;
-		}
-
-		return <a className='editLink' href={`/edit/${editLink}`} target='_blank' rel='noopener noreferrer'>
-			<i className='fas fa-pencil-alt' title='Edit' />
-		</a>;
-	},
-
-	renderShareLink : function(){
-		if(!this.props.brew.shareId) return;
-
-		let shareLink = this.props.brew.shareId;
-		if(this.props.brew.googleId && !this.props.brew.stubbed) {
-			shareLink = this.props.brew.googleId + shareLink;
-		}
-
-		return <a className='shareLink' href={`/share/${shareLink}`} target='_blank' rel='noopener noreferrer'>
-			<i className='fas fa-share-alt' title='Share' />
-		</a>;
-	},
-
-	renderDownloadLink : function(){
-		if(!this.props.brew.shareId) return;
-
-		let shareLink = this.props.brew.shareId;
-		if(this.props.brew.googleId && !this.props.brew.stubbed) {
-			shareLink = this.props.brew.googleId + shareLink;
-		}
-
-		return <a className='downloadLink' href={`/download/${shareLink}`}>
-			<i className='fas fa-download' title='Download' />
-		</a>;
-	},
-
-	renderStorageIcon : function(){
-		if(this.props.brew.googleId) {
-			return <span title={this.props.brew.webViewLink ? 'Your Google Drive Storage': 'Another User\'s Google Drive Storage'}>
-				<a href={this.props.brew.webViewLink} target='_blank'>
-					<img className='googleDriveIcon' src={googleDriveIcon} alt='googleDriveIcon' />
-				</a>
-			</span>;
-		}
-
-		return <span title='Homebrewery Storage'>
-			<img className='homebreweryIcon' src={homebreweryIcon} alt='homebreweryIcon' />
-		</span>;
-	},
-
-	render : function(){
-		const brew = this.props.brew;
-		if(Array.isArray(brew.tags)) {               // temporary fix until dud tags are cleaned
-			brew.tags = brew.tags?.filter((tag)=>tag); //remove tags that are empty strings
-			brew.tags.sort((a, b)=>{
-				return a.indexOf(':') - b.indexOf(':') != 0 ? a.indexOf(':') - b.indexOf(':') : a.toLowerCase().localeCompare(b.toLowerCase());
-			});
-		}
-		const dateFormatString = 'YYYY-MM-DD HH:mm:ss';
-
-		return <div className='brewItem'>
-			{brew.thumbnail &&
-				<div className='thumbnail' style={{ backgroundImage: `url(${brew.thumbnail})` }} >
-				</div>
-			}
-			<div className='text'>
-				<h2>{brew.title}</h2>
-				<p className='description'>{brew.description}</p>
-			</div>
-			<hr />
-			<div className='info'>
-
-				{brew.tags?.length ? <>
-					<div className='brewTags' title={`${brew.tags.length} tags:\n${brew.tags.join('\n')}`}>
-						<i className='fas fa-tags'/>
-						{brew.tags.map((tag, idx)=>{
-							const matches = tag.match(/^(?:([^:]+):)?([^:]+)$/);
-							return <span key={idx} className={matches[1]} onClick={()=>{this.updateFilter(tag);}}>{matches[2]}</span>;
-						})}
-					</div>
-				</> : <></>
-				}
-				<span title={`Authors:\n${brew.authors?.join('\n')}`}>
-					<i className='fas fa-user'/> {brew.authors?.map((author, index)=>(
-  					<>
-    					<a key={index} href={`/user/${author}`}>{author}</a>
-    					{index < brew.authors.length - 1 && ', '}
-  					</>))}
-				</span>
-				<br />
-				<span title={`Last viewed: ${moment(brew.lastViewed).local().format(dateFormatString)}`}>
-					<i className='fas fa-eye'/> {brew.views}
-				</span>
-				{brew.pageCount &&
-					<span title={`Page count: ${brew.pageCount}`}>
-						<i className='far fa-file' /> {brew.pageCount}
-					</span>
-				}
-				<span title={dedent`
-					Created: ${moment(brew.createdAt).local().format(dateFormatString)}
-					Last updated: ${moment(brew.updatedAt).local().format(dateFormatString)}`}>
-					<i className='fas fa-sync-alt' /> {moment(brew.updatedAt).fromNow()}
-				</span>
-				{this.renderStorageIcon()}
-			</div>
-
-			<div className='links'>
-				{this.renderShareLink()}
-				{this.renderEditLink()}
-				{this.renderDownloadLink()}
-				{this.renderDeleteBrewLink()}
-			</div>
-		</div>;
-	}
-});
-
-module.exports = BrewItem;

client/homebrew/pages/basePages/listPage/brewItem/brewItem.less

@@ -1,147 +0,0 @@
-
-.brewItem{
-	position                    : relative;
-	display                     : inline-block;
-	vertical-align              : top;
-	box-sizing                  : border-box;
-	box-sizing                  : border-box;
-	overflow                    : hidden;
-	width                       : 48%;
-	min-height                  : 105px;
-	margin-right                : 15px;
-	margin-bottom               : 15px;
-	padding                     : 5px 15px 2px 6px;
-	padding-right               : 15px;
-	border                      : 1px solid #c9ad6a;
-	border-radius               : 5px;
-	-webkit-column-break-inside : avoid;
-	page-break-inside           : avoid;
-	break-inside                : avoid;
-	box-shadow                  : 0px 4px 5px 0px #333;
-	background-color            : #cab2802e;
-	.thumbnail  {
-		position: absolute;
-		width: 150px;
-		height: 100%;
-		top: 0;
-		right: 0;
-		z-index: -1;
-		background-size: contain;
-		background-repeat: no-repeat;
-		background-position: right top;
-		mask-image: linear-gradient(80deg, #0000 20%, #050 40%);
-		-webkit-mask-image: linear-gradient(80deg, #0000 20%, #050 40%);
-		opacity: 50%;
-	}
-	.text {
-		min-height : 54px;
-		h4{
-			margin-bottom : 5px;
-			font-size     : 2.2em;
-		}
-	}
-	.info{
-		position: initial;
-		bottom: 2px;
-		font-family : ScalySansRemake;
-		font-size   : 1.2em;
-		&>span{
-			margin-right : 12px;
-			line-height  : 1.5em;
-
-			a {
-				color:inherit;
-			}
-		}
-	}
-	.brewTags span {
-		background-color: #c8ac6e3b;
-		margin: 2px;
-		padding: 2px;
-		border: 1px solid #c8ac6e;
-		border-radius: 4px;
-		white-space: nowrap;
-		display: inline-block;
-		font-weight: bold;
-		border-color: currentColor;
-		cursor : pointer;
-		&:before {
-			font-family: 'Font Awesome 5 Free';
-			font-size: 12px;
-			margin-right: 3px;
-		}
-		&.type {
-			background-color: #0080003b;
-			color: #008000;
-			&:before{
-				content: '\f0ad';
-			}
-		}
-		&.group {
-			background-color: #5050503b;
-			color: #000000;
-			&:before{
-				content: '\f500';
-			}
-		}
-		&.meta {
-			background-color: #0000803b;
-			color: #000080;
-			&:before{
-				content: '\f05a';
-			}
-		}
-		&.system {
-			background-color: #8000003b;
-			color: #800000;
-			&:before{
-				content: '\f518';
-			}
-		}
-	}
-	&:hover{
-		.links{
-			opacity : 1;
-		}
-	}
-	&:nth-child(2n + 1){
-		margin-right : 0px;
-	}
-	.links{
-		.animate(opacity);
-		position         : absolute;
-		top              : 0px;
-		right            : 0px;
-		height           : 100%;
-		width            : 2em;
-		opacity          : 0;
-		background-color : fade(black, 60%);
-		text-align       : center;
-		a{
-			.animate(opacity);
-			display   : block;
-			margin    : 8px 0px;
-			opacity   : 0.6;
-			font-size : 1.3em;
-			color     : white;
-			&:hover{
-				opacity : 1;
-			}
-			i{
-				cursor : pointer;
-			}
-		}
-	}
-	.googleDriveIcon {
-		height	: 18px;
-		padding : 0px;
-		margin  : -5px;
-	}
-	.homebreweryIcon {
-		mix-blend-mode : darken;
-		height         : 24px;
-		position       : relative;
-		top            : 5px;
-		left           : -5px;
-	}
-}

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

@@ -1,280 +0,0 @@
-/*eslint max-lines: ["warn", {"max": 300, "skipBlankLines": true, "skipComments": true}]*/
-require('./listPage.less');
-const React       = require('react');
-const createClass = require('create-react-class');
-const _           = require('lodash');
-const moment      = require('moment');
-
-const BrewItem    = require('./brewItem/brewItem.jsx');
-
-const USERPAGE_KEY_PREFIX = 'HOMEBREWERY-LISTPAGE';
-
-const DEFAULT_SORT_TYPE = 'alpha';
-const DEFAULT_SORT_DIR = 'asc';
-
-const ListPage = createClass({
-	displayName     : 'ListPage',
-	getDefaultProps : function() {
-		return {
-			brewCollection : [
-				{
-					title : '',
-					class : '',
-					brews : []
-				}
-			],
-			navItems    : <></>,
-			reportError : null
-		};
-	},
-	getInitialState : function() {
-		// HIDE ALL GROUPS UNTIL LOADED
-		const brewCollection = this.props.brewCollection.map((brewGroup)=>{
-			brewGroup.visible = false;
-			return brewGroup;
-		});
-
-		return {
-			filterString   : this.props.query?.filter || '',
-			filterTags     : [],
-			sortType       : this.props.query?.sort || null,
-			sortDir        : this.props.query?.dir || null,
-			query          : this.props.query,
-			brewCollection : brewCollection
-		};
-	},
-
-	componentDidMount : function() {
-		// SAVE TO LOCAL STORAGE WHEN LEAVING PAGE
-		window.onbeforeunload = this.saveToLocalStorage;
-
-		// LOAD FROM LOCAL STORAGE
-		if(typeof window !== 'undefined') {
-			const newSortType = (this.state.sortType ?? (localStorage.getItem(`${USERPAGE_KEY_PREFIX}-SORTTYPE`) || DEFAULT_SORT_TYPE));
-			const newSortDir = (this.state.sortDir ?? (localStorage.getItem(`${USERPAGE_KEY_PREFIX}-SORTDIR`) || DEFAULT_SORT_DIR));
-			this.updateUrl(this.state.filterString, newSortType, newSortDir);
-
-			const brewCollection = this.props.brewCollection.map((brewGroup)=>{
-				brewGroup.visible = (localStorage.getItem(`${USERPAGE_KEY_PREFIX}-VISIBILITY-${brewGroup.class}`) ?? 'true')=='true';
-				return brewGroup;
-			});
-
-			this.setState({
-				brewCollection : brewCollection,
-				sortType       : newSortType,
-				sortDir        : newSortDir
-			});
-		};
-	},
-
-	componentWillUnmount : function() {
-		window.onbeforeunload = function(){};
-	},
-
-	saveToLocalStorage : function() {
-		this.state.brewCollection.map((brewGroup)=>{
-			localStorage.setItem(`${USERPAGE_KEY_PREFIX}-VISIBILITY-${brewGroup.class}`, `${brewGroup.visible}`);
-		});
-		localStorage.setItem(`${USERPAGE_KEY_PREFIX}-SORTTYPE`, this.state.sortType);
-		localStorage.setItem(`${USERPAGE_KEY_PREFIX}-SORTDIR`, this.state.sortDir);
-	},
-
-	renderBrews : function(brews){
-		if(!brews || !brews.length) return <div className='noBrews'>No Brews.</div>;
-
-		return _.map(brews, (brew, idx)=>{
-			return <BrewItem brew={brew} key={idx} reportError={this.props.reportError} updateListFilter={ (tag)=>{ this.updateUrl(this.state.filterString, this.state.sortType, this.state.sortDir, tag); }}/>;
-		});
-	},
-
-	sortBrewOrder : function(brew){
-		if(!brew.title){brew.title = 'No Title';}
-		const mapping = {
-			'alpha'   : _.deburr(brew.title.trim().toLowerCase()),
-			'created' : moment(brew.createdAt).format(),
-			'updated' : moment(brew.updatedAt).format(),
-			'views'   : brew.views,
-			'latest'  : moment(brew.lastViewed).format()
-		};
-		return mapping[this.state.sortType];
-	},
-
-	handleSortOptionChange : function(event){
-		this.updateUrl(this.state.filterString, event.target.value, this.state.sortDir);
-		this.setState({
-			sortType : event.target.value
-		});
-	},
-
-	handleSortDirChange : function(event){
-		const newDir = this.state.sortDir == 'asc' ? 'desc' : 'asc';
-
-		this.updateUrl(this.state.filterString, this.state.sortType, newDir);
-		this.setState({
-			sortDir : newDir
-		});
-	},
-
-	renderSortOption : function(sortTitle, sortValue){
-		return <div className={`sort-option ${(this.state.sortType == sortValue ? 'active' : '')}`}>
-			<button
-				value={`${sortValue}`}
-				onClick={this.state.sortType == sortValue ? this.handleSortDirChange : this.handleSortOptionChange}
-			>
-				{`${sortTitle}`}
-			</button>
-			{this.state.sortType == sortValue &&
-				<i className={`sortDir fas ${this.state.sortDir == 'asc' ? 'fa-sort-up' : 'fa-sort-down'}`}></i>
-			}
-		  </div>;
-	},
-
-	handleFilterTextChange : function(e){
-		this.setState({
-			filterString : e.target.value,
-		});
-		this.updateUrl(e.target.value, this.state.sortType, this.state.sortDir);
-		return;
-	},
-
-	updateUrl : function(filterTerm, sortType, sortDir, filterTag=''){
-		const url = new URL(window.location.href);
-		const urlParams = new URLSearchParams(url.search);
-
-		urlParams.set('sort', sortType);
-		urlParams.set('dir', sortDir);
-
-		let filterTags = urlParams.getAll('tag');
-		if(filterTag != '') {
-			if(filterTags.findIndex((tag)=>{return tag.toLowerCase()==filterTag.toLowerCase();}) == -1){
-				filterTags.push(filterTag);
-			} else {
-				filterTags = filterTags.filter((tag)=>{ return tag.toLowerCase() != filterTag.toLowerCase(); });
-			}
-		}
-		urlParams.delete('tag');
-		// Add tags to URL in the order they were clicked
-		filterTags.forEach((tag)=>{ urlParams.append('tag', tag); });
-		// Sort tags before updating state
-		filterTags.sort((a, b)=>{
-			return a.indexOf(':') - b.indexOf(':') != 0 ? a.indexOf(':') - b.indexOf(':') : a.toLowerCase().localeCompare(b.toLowerCase());
-		});
-
-		this.setState({
-			filterTags
-		});
-
-		if(!filterTerm)
-			urlParams.delete('filter');
-		else
-			urlParams.set('filter', filterTerm);
-
-		url.search = urlParams;
-		window.history.replaceState(null, null, url);
-	},
-
-	renderFilterOption : function(){
-		return <div className='filter-option'>
-			<label>
-				<i className='fas fa-search'></i>
-				<input
-					type='search'
-					placeholder='filter title/description'
-					onChange={this.handleFilterTextChange}
-					value={this.state.filterString}
-				/>
-			</label>
-		</div>;
-	},
-
-	renderTagsOptions : function(){
-		if(this.state.filterTags?.length == 0) return;
-		return <div className='tags-container'>
-			{_.map(this.state.filterTags, (tag, idx)=>{
-				const matches = tag.match(/^(?:([^:]+):)?([^:]+)$/);
-				return <span key={idx} className={matches[1]} onClick={()=>{ this.updateUrl(this.state.filterString, this.state.sortType, this.state.sortDir, tag); }}>{matches[2]}</span>;
-			})}
-		</div>;
-	},
-
-	renderSortOptions : function(){
-		return <div className='sort-container'>
-			<h6>Sort by :</h6>
-			{this.renderSortOption('Title', 'alpha')}
-			{this.renderSortOption('Created Date', 'created')}
-			{this.renderSortOption('Updated Date', 'updated')}
-			{this.renderSortOption('Views', 'views')}
-			{/* {this.renderSortOption('Latest', 'latest')} */}
-
-			{this.renderFilterOption()}
-		</div>;
-	},
-
-	getSortedBrews : function(brews){
-		const testString = _.deburr(this.state.filterString).toLowerCase();
-
-		brews = _.filter(brews, (brew)=>{
-			// Filter by user entered text
-			const brewStrings = _.deburr([
-				brew.title,
-				brew.description,
-				brew.tags].join('\n')
-				.toLowerCase());
-
-			const filterTextTest = brewStrings.includes(testString);
-
-			// Filter by user selected tags
-			let filterTagTest = true;
-			if(this.state.filterTags.length > 0){
-				filterTagTest = Array.isArray(brew.tags) && this.state.filterTags?.every((tag)=>{
-					return brew.tags.findIndex((brewTag)=>{
-						return brewTag.toLowerCase() == tag.toLowerCase();
-					}) >= 0;
-				});
-			}
-
-			return filterTextTest && filterTagTest;
-		});
-
-		return _.orderBy(brews, (brew)=>{ return this.sortBrewOrder(brew); }, this.state.sortDir);
-	},
-
-	toggleBrewCollectionState : function(brewGroupClass) {
-		this.setState((prevState)=>({
-			brewCollection : prevState.brewCollection.map(
-				(brewGroup)=>brewGroup.class === brewGroupClass ? { ...brewGroup, visible: !brewGroup.visible } : brewGroup
-			)
-		}));
-	},
-
-	renderBrewCollection : function(brewCollection){
-		if(brewCollection == []) return <div className='brewCollection'>
-			<h1>No Brews</h1>
-		</div>;
-		return _.map(brewCollection, (brewGroup, idx)=>{
-			return <div key={idx} className={`brewCollection ${brewGroup.class ?? ''}`}>
-				<h1 className={brewGroup.visible ? 'active' : 'inactive'} onClick={()=>{this.toggleBrewCollectionState(brewGroup.class);}}>{brewGroup.title || 'No Title'}</h1>
-				{brewGroup.visible ? this.renderBrews(this.getSortedBrews(brewGroup.brews)) : <></>}
-			</div>;
-		});
-	},
-
-	render : function(){
-		return <div className='listPage sitePage'>
-			{/*<style>@layer V3_5ePHB, bundle;</style>*/}
-			<link href='/themes/V3/Blank/style.css' type="text/css" rel='stylesheet'/>
-			<link href='/themes/V3/5ePHB/style.css' type="text/css" rel='stylesheet'/>
-			{this.props.navItems}
-			{this.renderSortOptions()}
-			{this.renderTagsOptions()}
-
-			<div className='content V3'>
-				<div className='page'>
-					{this.renderBrewCollection(this.state.brewCollection)}
-				</div>
-			</div>
-		</div>;
-	}
-});
-
-module.exports = ListPage;

client/homebrew/pages/basePages/listPage/listPage.less

@@ -1,190 +0,0 @@
-
-.noColumns(){
-	column-count         : auto;
-	column-fill          : auto;
-	column-gap           : normal;
-	column-width         : auto;
-	-webkit-column-count : auto;
-	-moz-column-count    : auto;
-	-webkit-column-width : auto;
-	-moz-column-width    : auto;
-	-webkit-column-gap   : normal;
-	-moz-column-gap      : normal;
-	height               : auto;
-	min-height           : 279.4mm;
-	margin               : 20px auto;
-	contain				 : unset;
-}
-.listPage{
-	.content{
-		z-index : 1;
-		.page{
-			.noColumns() !important; //Needed to override PHB Theme since this is on a lower @layer
-			&::after{
-				display : none;
-			}
-			.noBrews{
-				margin     : 10px 0px;
-				font-size  : 1.3em;
-				font-style : italic;
-			}
-			.brewCollection {
-				h1:hover{
-					cursor: pointer;
-				}
-				.active::before, .inactive::before {
-					font-family: 'Font Awesome 5 Free';
-					font-weight: 900;
-					font-size: 0.6cm;
-					padding-right: 0.5em;
-				}
-				.active {
-					color: var(--HB_Color_HeaderText);
-				}
-				.active::before {
-					content: '\f107';
-				}
-				.inactive {
-					color: #707070;
-				}
-				.inactive::before {
-					content: '\f105';
-				}
-			}
-		}
-	}
-	.sort-container {
-		font-family        : 'Open Sans', sans-serif;
-		position           : sticky;
-		top                : 0;
-		left               : 0;
-		width              : 100%;
-		height             : 30px;
-		background-color   : #555;
-		border-top         : 1px solid #666;
-		border-bottom         : 1px solid #666;
-		color              : white;
-		text-align         : center;
-		z-index            : 1;
-		display            : flex;
-		justify-content    : center;
-		align-items        : baseline;
-		column-gap         : 15px;
-		row-gap            : 5px;
-		flex-wrap          : wrap;
-		h6{
-			text-transform : uppercase;
-			font-family    : 'Open Sans', sans-serif;
-			font-size      : 11px;
-			font-weight    : bold;
-		}
-		.sort-option {
-			display: flex;
-			align-items: center;
-			padding: 0 8px;
-			color: #ccc;
-			height: 100%;
-
-			&:hover{
-				background-color : #444;
-			}
-
-			&.active {
-			font-weight: bold;
-			color: #ddd;
-			background-color: #333;
-
-			button {
-				color: white;
-				font-weight: 800;
-				height: 100%;
-				& + .sortDir {
-					padding-left: 5px;
-				}
-			}
-		}
-
-		}
-		.filter-option {
-			margin-left: 20px;
-			background-color : transparent !important;
-			font-size        : 11px;
-			i{
-				padding-right : 5px;
-			}
-		}
-		button{
-				background-color : transparent;
-				font-family      : 'Open Sans', sans-serif;
-				text-transform   : uppercase;
-				font-weight      : normal;
-				font-size        : 11px;
-				color            : #ccc;
-				padding          : 0;
-			}
-
-
-	}
-	.tags-container {
-		height             : 30px;
-		background-color   : #555;
-		border-top         : 1px solid #666;
-		border-bottom      : 1px solid #666;
-		color              : white;
-		display            : flex;
-		justify-content    : center;
-		align-items        : center;
-		column-gap         : 15px;
-		row-gap            : 5px;
-		flex-wrap          : wrap;
-		span {
-			font-family    : 'Open Sans', sans-serif;
-			font-size      : 11px;
-			font-weight    : bold;
-			border         : 1px solid;
-			border-radius  : 3px;
-			padding        : 3px;
-			cursor         : pointer;
-			color: #dfdfdf;
-			&:before {
-				font-family: 'Font Awesome 5 Free';
-				font-size: 12px;
-				margin-right: 3px;
-			}
-			&:after {
-				content: '\f00d';
-				font-family: 'Font Awesome 5 Free';
-				font-size: 12px;
-				margin-left: 3px;
-			}
-			&.type {
-				background-color: #008000;
-				border-color: #00a000;
-				&:before{
-					content: '\f0ad';
-				}
-			}
-			&.group {
-				background-color: #505050;
-				border-color: #000000;
-				&:before{
-					content: '\f500';
-				}
-			}
-			&.meta {
-				background-color: #000080;
-				border-color: #0000a0;
-				&:before{
-					content: '\f05a';
-				}
-			}
-			&.system {
-				background-color: #800000;
-				border-color: #a00000;
-				&:before{
-					content: '\f518';
-				}
-			}
-		}
-	}
-}

client/homebrew/pages/basePages/uiPage/uiPage.jsx

@@ -1,38 +0,0 @@
-require('./uiPage.less');
-const React = require('react');
-const createClass = require('create-react-class');
-
-const Nav = require('naturalcrit/nav/nav.jsx');
-const Navbar = require('../../../navbar/navbar.jsx');
-const NewBrewItem = require('../../../navbar/newbrew.navitem.jsx');
-const HelpNavItem = require('../../../navbar/help.navitem.jsx');
-const RecentNavItem = require('../../../navbar/recent.navitem.jsx').both;
-const Account = require('../../../navbar/account.navitem.jsx');
-
-
-const UIPage = createClass({
-	displayName : 'UIPage',
-
-	render : function(){
-		return <div className='uiPage sitePage'>
-			<Navbar>
-				<Nav.section>
-					<Nav.item className='brewTitle'>{this.props.brew.title}</Nav.item>
-				</Nav.section>
-
-				<Nav.section>
-					<NewBrewItem />
-					<HelpNavItem />
-					<RecentNavItem />
-					<Account />
-				</Nav.section>
-			</Navbar>
-
-			<div className='content'>
-				{this.props.children}
-			</div>
-		</div>;
-	}
-});
-
-module.exports = UIPage;

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

@@ -1,69 +0,0 @@
-.homebrew {
-	.uiPage.sitePage {
-		.content {
-			width            : ~"min(90vw, 1000px)";
-			padding          : 2% 4%;
-			margin-top       : 25px;
-			margin-right     : auto;
-			margin-left      : auto;
-			overflow-y       : scroll;
-			font-family      : 'Open Sans';
-			font-size        : 0.8em;
-			line-height      : 1.8em;
-			background-color : #F0F0F0;
-			.dataGroup {
-				padding       : 6px 20px 15px;
-				margin        : 5px 0px;
-				border        : 2px solid black;
-				border-radius : 5px;
-				button {
-					background-color : transparent;
-					border           : 1px solid black;
-					border-radius    : 5px;
-					width            : 125px;
-					color            : black;
-					margin-right     : 5px;
-					&.active {
-						background-color: #0007;
-						color: white;
-						&:before {
-							content: '\f00c';
-    						font-family: 'FONT AWESOME 5 FREE';
-    						margin-right: 5px;
-						}
-					}
-				}
-			}
-			h1, h2, h3, h4 {
-				width          : 100%;
-				margin         : 0.5em 30% 0.25em 0;
-				font-weight    : 900;
-				text-transform : uppercase;
-				border-bottom  : 2px solid slategrey;
-			}
-			h1 {
-				margin-right  : 0;
-				margin-bottom : 0.5em;
-				font-size     : 2em;
-				border-bottom : 2px solid darkslategrey;
-			}
-			h2 { font-size : 1.75em; }
-			h3 {
-				font-size : 1.5em;
-				svg { width : 19px; }
-			}
-			h4 { font-size : 1.25em; }
-			strong { font-weight : bold; }
-			em { font-style : italic; }
-			ul {
-				padding-left : 1.25em;
-				list-style   : square;
-			}
-			.blank {
-				height     : 1em;
-				margin-top : 0;
-				& + * { margin-top : 0; }
-			}
-		}
-	}
-}

client/homebrew/pages/editPage/editPage.jsx

@@ -1,418 +1,63 @@
-/* eslint-disable max-lines */
-require('./editPage.less');
-const React = require('react');
-const createClass = require('create-react-class');
-const _ = require('lodash');
-const request = require('../../utils/request-middleware.js');
-const { Meta } = require('vitreum/headtags');
-
-const Nav = require('naturalcrit/nav/nav.jsx');
-const Navbar = require('../../navbar/navbar.jsx');
-
-const NewBrew = require('../../navbar/newbrew.navitem.jsx');
-const HelpNavItem = require('../../navbar/help.navitem.jsx');
-const PrintLink = require('../../navbar/print.navitem.jsx');
-const ErrorNavItem = require('../../navbar/error-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 { DEFAULT_BREW_LOAD } = require('../../../../server/brewDefaults.js');
-
-const googleDriveIcon = require('../../googleDrive.svg');
-
-const SAVE_TIMEOUT = 3000;
-
-const EditPage = createClass({
-	displayName     : 'EditPage',
-	getDefaultProps : function() {
-		return {
-			brew : DEFAULT_BREW_LOAD
-		};
-	},
-
-	getInitialState : function() {
-		return {
-			brew                   : this.props.brew,
-			isSaving               : false,
-			isPending              : false,
-			alertTrashedGoogleBrew : this.props.brew.trashed,
-			alertLoginToTransfer   : false,
-			saveGoogle             : this.props.brew.googleId ? true : false,
-			confirmGoogleTransfer  : false,
-			error                  : null,
-			htmlErrors             : Markdown.validate(this.props.brew.text),
-			url                    : '',
-			autoSave               : true,
-			autoSaveWarning        : false,
-			unsavedTime            : new Date(),
-			currentEditorPage      : 0
-		};
-	},
-	savedBrew : null,
-
-	componentDidMount : function(){
-		this.setState({
-			url : window.location.href
-		});
-
-		this.savedBrew = JSON.parse(JSON.stringify(this.props.brew)); //Deep copy
-
-		this.setState({ autoSave: JSON.parse(localStorage.getItem('AUTOSAVE_ON')) ?? true }, ()=>{
-			if(this.state.autoSave){
-				this.trySave();
-			} else {
-				this.setState({ autoSaveWarning: true });
-			}
-		});
-
-		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.trySave(true);
-		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();
-	},
-
-	handleTextChange : function(text){
-		//If there are errors, run the validator on every change to give quick feedback
-		let htmlErrors = this.state.htmlErrors;
-		if(htmlErrors.length) htmlErrors = Markdown.validate(text);
-
-		this.setState((prevState)=>({
-			brew              : { ...prevState.brew, text: text },
-			isPending         : true,
-			htmlErrors        : htmlErrors,
-			currentEditorPage : this.refs.editor.getCurrentPage() - 1 //Offset index since Marked starts pages at 0
-		}), ()=>{if(this.state.autoSave) this.trySave();});
-	},
-
-	handleStyleChange : function(style){
-		this.setState((prevState)=>({
-			brew      : { ...prevState.brew, style: style },
-			isPending : true
-		}), ()=>{if(this.state.autoSave) this.trySave();});
-	},
-
-	handleMetaChange : function(metadata){
-		this.setState((prevState)=>({
-			brew : {
-				...prevState.brew,
-				...metadata
-			},
-			isPending : true,
-		}), ()=>{if(this.state.autoSave) this.trySave();});
-
-	},
-
-	hasChanges : function(){
-		return !_.isEqual(this.state.brew, this.savedBrew);
-	},
-
-	trySave : function(immediate=false){
-		if(!this.debounceSave) this.debounceSave = _.debounce(this.save, SAVE_TIMEOUT);
-		if(this.hasChanges()){
-			this.debounceSave();
-		} else {
-			this.debounceSave.cancel();
-		}
-		if(immediate) this.debounceSave.flush();
-	},
-
-	handleGoogleClick : function(){
-		if(!global.account?.googleId) {
-			this.setState({
-				alertLoginToTransfer : true
-			});
-			return;
-		}
-		this.setState((prevState)=>({
-			confirmGoogleTransfer : !prevState.confirmGoogleTransfer
-		}));
-		this.setState({
-			error    : null,
-			isSaving : false
-		});
-	},
-
-	closeAlerts : function(event){
-		event.stopPropagation();	//Only handle click once so alert doesn't reopen
-		this.setState({
-			alertTrashedGoogleBrew : false,
-			alertLoginToTransfer   : false,
-			confirmGoogleTransfer  : false
-		});
-	},
-
-	toggleGoogleStorage : function(){
-		this.setState((prevState)=>({
-			saveGoogle : !prevState.saveGoogle,
-			isSaving   : false,
-			error      : null
-		}), ()=>this.save());
-	},
-
-	save : async function(){
-		if(this.debounceSave && this.debounceSave.cancel) this.debounceSave.cancel();
-
-		this.setState((prevState)=>({
-			isSaving   : true,
-			error      : null,
-			htmlErrors : Markdown.validate(prevState.brew.text)
-		}));
-
-		const transfer = this.state.saveGoogle == _.isNil(this.state.brew.googleId);
-
-		const brew = this.state.brew;
-		brew.pageCount = ((brew.renderer=='legacy' ? brew.text.match(/\\page/g) : brew.text.match(/^\\page$/gm)) || []).length + 1;
-
-		const params = `${transfer ? `?${this.state.saveGoogle ? 'saveToGoogle' : 'removeFromGoogle'}=true` : ''}`;
-		const res = await request
-			.put(`/api/update/${brew.editId}${params}`)
-			.send(brew)
-			.catch((err)=>{
-				console.log('Error Updating Local Brew');
-				this.setState({ error: err });
-			});
-		if(!res) return;
-
-		this.savedBrew = res.body;
-		history.replaceState(null, null, `/edit/${this.savedBrew.editId}`);
-
-		this.setState((prevState)=>({
-			brew : { ...prevState.brew,
-				googleId : this.savedBrew.googleId ? this.savedBrew.googleId : null,
-				editId 	 : this.savedBrew.editId,
-				shareId  : this.savedBrew.shareId,
-				version  : this.savedBrew.version
-			},
-			isPending   : false,
-			isSaving    : false,
-			unsavedTime : new Date()
-		}));
-	},
-
-	renderGoogleDriveIcon : function(){
-		return <Nav.item className='googleDriveStorage' onClick={this.handleGoogleClick}>
-			<img src={googleDriveIcon} className={this.state.saveGoogle ? '' : 'inactive'} alt='Google Drive icon'/>
-
-			{this.state.confirmGoogleTransfer &&
-				<div className='errorContainer' onClick={this.closeAlerts}>
-					{ this.state.saveGoogle
-						?	`Would you like to transfer this brew from your Google Drive storage back to the Homebrewery?`
-						: `Would you like to transfer this brew from the Homebrewery to your personal Google Drive storage?`
-					}
-					<br />
-					<div className='confirm' onClick={this.toggleGoogleStorage}>
-						Yes
-					</div>
-					<div className='deny'>
-						No
-					</div>
-				</div>
-			}
-
-			{this.state.alertLoginToTransfer &&
-				<div className='errorContainer' onClick={this.closeAlerts}>
-					You must be signed in to a Google account to transfer
-					between the homebrewery and Google Drive!
-					<a target='_blank' rel='noopener noreferrer'
-						href={`https://www.naturalcrit.com/login?redirect=${this.state.url}`}>
-						<div className='confirm'>
-							Sign In
-						</div>
-					</a>
-					<div className='deny'>
-						Not Now
-					</div>
-				</div>
-			}
-
-			{this.state.alertTrashedGoogleBrew &&
-				<div className='errorContainer' onClick={this.closeAlerts}>
-				This brew is currently in your Trash folder on Google Drive!<br />If you want to keep it, make sure to move it before it is deleted permanently!<br />
-					<div className='confirm'>
-						OK
-					</div>
-				</div>
-			}
-		</Nav.item>;
-	},
-
-	renderSaveButton : function(){
-		if(this.state.autoSaveWarning && this.hasChanges()){
-			this.setAutosaveWarning();
-			const elapsedTime = Math.round((new Date() - this.state.unsavedTime) / 1000 / 60);
-			const text = elapsedTime == 0 ? 'Autosave is OFF.' : `Autosave is OFF, and you haven't saved for ${elapsedTime} minutes.`;
-
-			return <Nav.item className='save error' icon='fas fa-exclamation-circle'>
-			Reminder...
-				<div className='errorContainer'>
-					{text}
-				</div>
-			</Nav.item>;
-		}
-
-		if(this.state.isSaving){
-			return <Nav.item className='save' icon='fas fa-spinner fa-spin'>saving...</Nav.item>;
-		}
-		if(this.state.isPending && this.hasChanges()){
-			return <Nav.item className='save' onClick={this.save} color='blue' icon='fas fa-save'>Save Now</Nav.item>;
-		}
-		if(!this.state.isPending && !this.state.isSaving && this.state.autoSave){
-			return <Nav.item className='save saved'>auto-saved.</Nav.item>;
-		}
-		if(!this.state.isPending && !this.state.isSaving){
-			return <Nav.item className='save saved'>saved.</Nav.item>;
-		}
-	},
-
-	handleAutoSave : function(){
-		if(this.warningTimer) clearTimeout(this.warningTimer);
-		this.setState((prevState)=>({
-			autoSave        : !prevState.autoSave,
-			autoSaveWarning : prevState.autoSave
-		}), ()=>{
-			localStorage.setItem('AUTOSAVE_ON', JSON.stringify(this.state.autoSave));
-		});
-	},
-
-	setAutosaveWarning : function(){
-		setTimeout(()=>this.setState({ autoSaveWarning: false }), 4000);                           // 4 seconds to display
-		this.warningTimer = setTimeout(()=>{this.setState({ autoSaveWarning: true });}, 900000);   // 15 minutes between warnings
-		this.warningTimer;
-	},
-
-	errorReported : function(error) {
-		this.setState({
-			error
-		});
-	},
-
-	renderAutoSaveButton : function(){
-		return <Nav.item onClick={this.handleAutoSave}>
-			Autosave <i className={this.state.autoSave ? 'fas fa-power-off active' : 'fas fa-power-off'}></i>
-		</Nav.item>;
-	},
-
-	processShareId : function() {
-		return this.state.brew.googleId && !this.state.brew.stubbed ?
-					 this.state.brew.googleId + this.state.brew.shareId :
-					 this.state.brew.shareId;
-	},
-
-	getRedditLink : function(){
-
-		const shareLink = this.processShareId();
-		const systems = this.props.brew.systems.length > 0 ? ` [${this.props.brew.systems.join(' - ')}]` : '';
-		const title = `${this.props.brew.title} ${systems}`;
-		const text = `Hey guys! I've been working on this homebrew. I'd love your feedback. Check it out.
-
-**[Homebrewery Link](${global.config.publicUrl}/share/${shareLink})**`;
-
-		return `https://www.reddit.com/r/UnearthedArcana/submit?title=${encodeURIComponent(title)}&text=${encodeURIComponent(text)}`;
-	},
-
-	renderNavbar : function(){
-		const shareLink = this.processShareId();
-
-		return <Navbar>
-			<Nav.section>
-				<Nav.item className='brewTitle'>{this.state.brew.title}</Nav.item>
-			</Nav.section>
-
-			<Nav.section>
-				{this.renderGoogleDriveIcon()}
-				{this.state.error ?
-					<ErrorNavItem error={this.state.error} parent={this}></ErrorNavItem> :
-					<Nav.dropdown className='save-menu'>
-						{this.renderSaveButton()}
-						{this.renderAutoSaveButton()}
-					</Nav.dropdown>
-				}
-				<NewBrew />
-				<HelpNavItem/>
-				<Nav.dropdown>
-					<Nav.item color='teal' icon='fas fa-share-alt'>
-						share
-					</Nav.item>
-					<Nav.item color='blue' href={`/share/${shareLink}`}>
-						view
-					</Nav.item>
-					<Nav.item color='blue' onClick={()=>{navigator.clipboard.writeText(`${global.config.publicUrl}/share/${shareLink}`);}}>
-						copy url
-					</Nav.item>
-					<Nav.item color='blue' href={this.getRedditLink()} newTab={true} rel='noopener noreferrer'>
-						post to reddit
-					</Nav.item>
-				</Nav.dropdown>
-				<PrintLink shareId={this.processShareId()} />
-				<RecentNavItem brew={this.state.brew} storageKey='edit' />
-				<Account />
-			</Nav.section>
-
-		</Navbar>;
-	},
-
-	render : function(){
-		return <div className='editPage sitePage'>
-			<Meta name='robots' content='noindex, nofollow' />
-			{this.renderNavbar()}
-
-			<div className='content'>
-				<SplitPane onDragFinish={this.handleSplitMove} ref='pane'>
-					<Editor
-						ref='editor'
-						brew={this.state.brew}
-						onTextChange={this.handleTextChange}
-						onStyleChange={this.handleStyleChange}
-						onMetaChange={this.handleMetaChange}
-						reportError={this.errorReported}
-						renderer={this.state.brew.renderer}
-					/>
-					<BrewRenderer
-						text={this.state.brew.text}
-						style={this.state.brew.style}
-						renderer={this.state.brew.renderer}
-						theme={this.state.brew.theme}
-						errors={this.state.htmlErrors}
-						lang={this.state.brew.lang}
-						currentEditorPage={this.state.currentEditorPage}
-					/>
-				</SplitPane>
-			</div>
-		</div>;
-	}
-});
-
-module.exports = EditPage;
+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 Items = require('../../navbar/navitems.js');
+
+const BrewInterface = require('homebrewery/brewInterface/brewInterface.jsx');
+const Utils = require('homebrewery/utils.js');
+
+const Store = require('homebrewery/brew.store.js');
+const Actions = require('homebrewery/brew.actions.js');
+
+
+const EditPage = React.createClass({
+	componentDidMount: function(){
+		document.addEventListener('keydown', this.handleControlKeys);
+	},
+	componentWillUnmount: function() {
+		document.removeEventListener('keydown', this.handleControlKeys);
+	},
+	handleControlKeys : Utils.controlKeys({
+		s : Actions.save,
+		p : Actions.print
+	}),
+	render : function(){
+		return <div className='editPage page'>
+			<SmartNav />
+			<div className='content'>
+				<BrewInterface />
+			</div>
+		</div>
+	}
+});
+
+const SmartNav = Store.createSmartComponent(React.createClass({
+	getDefaultProps: function() {
+		return {
+			brew : {}
+		};
+	},
+	render : function(){
+		return <Navbar>
+			<Nav.section>
+				<Items.BrewTitle />
+			</Nav.section>
+			<Nav.section>
+				<Items.ContinousSave />
+				<Items.Issue />
+				<Nav.item newTab={true} href={'/share/' + this.props.brew.shareId} color='teal' icon='fa-share-alt'>
+					Share
+				</Nav.item>
+				<Items.Print shareId={this.props.brew.shareId} />
+				<Items.Account />
+			</Nav.section>
+		</Navbar>
+	}
+}), ()=>{
+	return {brew : Store.getBrew()}
+});
+
+module.exports = EditPage;

client/homebrew/pages/editPage/editPage.less

@@ -1,29 +1,4 @@
-@keyframes glideDown {
-	0%   {transform : translate(-50% + 3px, 0px);
-				opacity   : 0;}
-	100% {transform : translate(-50% + 3px, 10px);
-				opacity   : 1;}
-}
-.editPage{
-	.navItem.save{
-		width      : 106px;
-		text-align : center;
-		position   : relative;
-		&.saved{
-			cursor : initial;
-			color  : #666;
-		}
-	}
-	.googleDriveStorage {
-		position : relative;
-	}
-	.googleDriveStorage img{
-		height	: 18px;
-		padding : 0px;
-		margin  : -5px;
 
-		&.inactive {
-			filter: grayscale(1);
-		}
-	}
-}
+.editPage{
+
+}

client/homebrew/pages/errorPage/errorPage.jsx

@@ -1,40 +1,45 @@
-require('./errorPage.less');
-const React = require('react');
-const createClass = require('create-react-class');
-const _ = require('lodash');
-const cx = require('classnames');
+var React = require('react');
+var _ = require('lodash');
+var cx = require('classnames');
 
-const UIPage = require('../basePages/uiPage/uiPage.jsx');
+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 Markdown = require('../../../../shared/naturalcrit/markdown.js');
+var BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
 
-const ErrorIndex = require('./errors/errorIndex.js');
-
-const ErrorPage = createClass({
-	displayName : 'ErrorPage',
-
-	getDefaultProps : function() {
+var ErrorPage = React.createClass({
+	getDefaultProps: function() {
 		return {
-			ver     : '0.0.0',
-			errorId : '',
-			text    : '# Oops \n We could not find a brew with that id. **Sorry!**',
-			error   : {}
+			ver : '0.0.0',
+			errorId: ''
 		};
 	},
 
-	render : function(){
-		const errorText = ErrorIndex(this.props)[this.props.brew.HBErrorCode.toString()] || '';
+	text : '# Oops \n We could not find a brew with that id. **Sorry!**',
 
-		return <UIPage brew={{ title: 'Crit Fail!' }}>
-			<div className='dataGroup'>
-				<div className='errorTitle'>
-					<h1>{`Error ${this.props.brew.status || '000'}`}</h1>
-					<h4>{this.props.brew.text || 'No error text'}</h4>
-				</div>
-				<hr />
-				<div dangerouslySetInnerHTML={{ __html: Markdown.render(errorText) }} />
+	render : function(){
+		return <div className='errorPage page'>
+			<Navbar ver={this.props.ver}>
+				<Nav.section>
+					<Nav.item className='errorTitle'>
+						Crit Fail!
+					</Nav.item>
+				</Nav.section>
+
+				<Nav.section>
+					<PatreonNavItem />
+					<IssueNavItem />
+					<RecentNavItem.both errorId={this.props.errorId} />
+				</Nav.section>
+			</Navbar>
+
+			<div className='content'>
+				<BrewRenderer text={this.text} />
 			</div>
-		</UIPage>;
+		</div>
 	}
 });
 

client/homebrew/pages/errorPage/errorPage.less

@@ -1,13 +1,5 @@
-.homebrew {
-	.uiPage.sitePage {
-		.errorTitle {
-			//background-color: @orange;
-			color      : #D02727;
-			text-align : center;
-		}
-		.content {
-			h1, h2, h3, h4 { border-bottom : none; }
-			hr { border-bottom : 2px solid slategrey; }
-		}
+.errorPage{
+	.errorTitle{
+		background-color: @orange;
 	}
 }

client/homebrew/pages/errorPage/errors/errorIndex.js

@@ -1,128 +0,0 @@
-const dedent = require('dedent-tabs').default;
-
-const loginUrl = 'https://www.naturalcrit.com/login';
-
-const errorIndex = (props)=>{
-	return {
-		// Default catch all
-		'00' : dedent`
-			## An unknown error occurred!
-			
-			We aren't sure what happened, but our server wasn't able to find what you
-			were looking for.`,
-
-		// General Google load error
-		'01' : dedent`
-			## An error occurred while retrieving this brew from Google Drive!
-			
-			Google reported an error while attempting to retrieve a brew from this link.`,
-
-		// Google Drive - 404 : brew deleted or access denied
-		'02' : dedent`
-			## We can't find this brew in Google Drive!
-			
-			This file was saved on Google Drive, but this link doesn't work anymore.
-			${props.brew.authors?.length > 0
-		? `Note that this brew belongs to the Homebrewery account **${props.brew.authors[0]}**,
-				${props.brew.account
-		? `which is
-						${props.brew.authors[0] == props.brew.account
-		? `your account.`
-		: `not your account (you are currently signed in as **${props.brew.account}**).`
-}`
-		: 'and you are not currently signed in to any account.'
-}`
-		: ''
-}
-			The Homebrewery cannot delete files from Google Drive on its own, so there
-			are three most likely possibilities:
-			:
-			- **The Google Drive files may have been accidentally deleted.** Look in
-			the Google Drive account that owns this brew (or ask the owner to do so),
-			and make sure the Homebrewery folder is still there, and that it holds your brews
-			as text files.
-			- **You may have changed the sharing settings for your files.** If the files
-			are still on Google Drive, change all of them to be shared *with everyone who has
-			the link* so the Homebrewery can access them.
-			- **The Google Account may be closed.** Google may have removed the account
-			due to inactivity or violating a Google policy. Make sure the owner can
-			still access Google Drive normally and upload/download files to it.
-			:
-			If the file isn't found, Google Drive usually puts your file in your Trash folder for
-			30 days. Assuming the trash hasn't been emptied yet, it might be worth checking.
-			You can also find the Activity tab on the right side of the Google Drive page, which
-			shows the recent activity on Google Drive. This can help you pin down the exact date
-			the brew was deleted or moved, and by whom.
-			:
-			If the brew still isn't found, some people have had success asking Google to recover
-			accidentally deleted files at this link: 
-			https://support.google.com/drive/answer/1716222?hl=en&ref_topic=7000946.
-			At the bottom of the page there is a button that says *Send yourself an Email*
-			and you will receive instructions on how to request the files be restored.
-			:
-			Also note, if you prefer not to use your Google Drive for storage, you can always
-			change the storage location of a brew by clicking the Google drive icon by the
-			brew title and choosing *transfer my brew to/from Google Drive*.`,
-
-		// User is not Authors list
-		'03' : dedent`
-		## Current signed-in user does not have editor access to this brew.
-
-		If you believe you should have access to this brew, ask one of its authors to invite you
-		as an author by opening the Edit page for the brew, viewing the {{fa,fa-info-circle}}
-		**Properties** tab, and adding your username to the "invited authors" list. You can
-		then try to access this document again.
-		
-		**Brew Title:** ${props.brew.brewTitle || 'Unable to show title'}
-
-		**Current Authors:** ${props.brew.authors?.map((author)=>{return `${author}`;}).join(', ') || 'Unable to list authors'}
-		
-		[Click here to be redirected to the brew's share page.](/share/${props.brew.shareId})`,
-
-		// User is not signed in; must be a user on the Authors List
-		'04' : dedent`
-		## Sign-in required to edit this brew.
-		
-		You must be logged in to one of the accounts listed as an author of this brew.
-		User is not logged in. Please log in [here](${loginUrl}).
-		
-		**Brew Title:** ${props.brew.brewTitle || 'Unable to show title'}
-
-		**Current Authors:** ${props.brew.authors?.map((author)=>{return `${author}`;}).join(', ') || 'Unable to list authors'}`,
-
-		// Brew load error
-		'05' : dedent`
-		## No Homebrewery document could be found.
-		
-		The server could not locate the Homebrewery document. It was likely deleted by
-		its owner.
-		
-		**Requested access:** ${props.brew.accessType}
-
-		**Brew ID:**  ${props.brew.brewId}`,
-
-		// Brew save error
-		'06' : dedent`
-		## Unable to save Homebrewery document.
-		
-		An error occurred wil attempting to save the Homebrewery document.`,
-
-		// Brew delete error
-		'07' : dedent`
-		## Unable to delete Homebrewery document.
-		
-		An error occurred while attempting to remove the Homebrewery document.
-		
-		**Brew ID:**  ${props.brew.brewId}`,
-
-		// Author delete error
-		'08' : dedent`
-		## Unable to remove user from Homebrewery document.
-		
-		An error occurred while attempting to remove the user from the Homebrewery document author list!
-		
-		**Brew ID:**  ${props.brew.brewId}`,
-	};
-};
-
-module.exports = errorIndex;

client/homebrew/pages/hijackPrint.js

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

client/homebrew/pages/homePage/homePage.jsx

@@ -1,110 +1,97 @@
-require('./homePage.less');
-const React = require('react');
-const createClass = require('create-react-class');
-const _ = require('lodash');
-const cx = require('classnames');
-const request = require('../../utils/request-middleware.js');
-const { Meta } = require('vitreum/headtags');
-
-const Nav = require('naturalcrit/nav/nav.jsx');
-const Navbar = require('../../navbar/navbar.jsx');
-const NewBrewItem = require('../../navbar/newbrew.navitem.jsx');
-const HelpNavItem = require('../../navbar/help.navitem.jsx');
-const RecentNavItem = require('../../navbar/recent.navitem.jsx').both;
-const AccountNavItem = require('../../navbar/account.navitem.jsx');
-const ErrorNavItem = require('../../navbar/error-navitem.jsx');
-
-
-const SplitPane = require('naturalcrit/splitPane/splitPane.jsx');
-const Editor = require('../../editor/editor.jsx');
-const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
-
-const { DEFAULT_BREW } = require('../../../../server/brewDefaults.js');
-
-const HomePage = createClass({
-	displayName     : 'HomePage',
-	getDefaultProps : function() {
-		return {
-			brew : DEFAULT_BREW,
-			ver  : '0.0.0'
-		};
-	},
-	getInitialState : function() {
-		return {
-			brew              : this.props.brew,
-			welcomeText       : this.props.brew.text,
-			error             : undefined,
-			currentEditorPage : 0
-		};
-	},
-	handleSave : function(){
-		request.post('/api')
-			.send(this.state.brew)
-			.end((err, res)=>{
-				if(err) {
-					this.setState({ error: err });
-					return;
-				}
-				const brew = res.body;
-				window.location = `/edit/${brew.editId}`;
-			});
-	},
-	handleSplitMove : function(){
-		this.refs.editor.update();
-	},
-	handleTextChange : function(text){
-		this.setState((prevState)=>({
-			brew              : { ...prevState.brew, text: text },
-			currentEditorPage : this.refs.editor.getCurrentPage() - 1 //Offset index since Marked starts pages at 0
-		}));
-	},
-	renderNavbar : function(){
-		return <Navbar ver={this.props.ver}>
-			<Nav.section>
-				{this.state.error ?
-					<ErrorNavItem error={this.state.error} parent={this}></ErrorNavItem> :
-					null
-				}
-				<NewBrewItem />
-				<HelpNavItem />
-				<RecentNavItem />
-				<AccountNavItem />
-			</Nav.section>
-		</Navbar>;
-	},
-
-	render : function(){
-		return <div className='homePage sitePage'>
-			<Meta name='google-site-verification' content='NwnAQSSJZzAT7N-p5MY6ydQ7Njm67dtbu73ZSyE5Fy4' />
-			{this.renderNavbar()}
-
-			<div className='content'>
-				<SplitPane onDragFinish={this.handleSplitMove} ref='pane'>
-					<Editor
-						ref='editor'
-						brew={this.state.brew}
-						onTextChange={this.handleTextChange}
-						renderer={this.state.brew.renderer}
-						showEditButtons={false}
-					/>
-					<BrewRenderer
-						text={this.state.brew.text}
-						style={this.state.brew.style}
-						renderer={this.state.brew.renderer}
-						currentEditorPage={this.state.currentEditorPage}
-					/>
-				</SplitPane>
-			</div>
-
-			<div className={cx('floatingSaveButton', { show: this.state.welcomeText != this.state.brew.text })} onClick={this.handleSave}>
-				Save current <i className='fas fa-save' />
-			</div>
-
-			<a href='/new' className='floatingNewButton'>
-				Create your own <i className='fas fa-magic' />
-			</a>
-		</div>;
-	}
-});
-
-module.exports = HomePage;
+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 NavItem = require('../../navbar/navitems.js');
+
+
+//const BrewInterface = require('homebrewery/brewInterface/brewInterface.jsx');
+const BrewCard = require('homebrewery/brewCard/brewCard.jsx');
+
+//const Actions = require('homebrewery/brew.actions.js');
+
+const HomePage = React.createClass({
+	getDefaultProps: function() {
+		return {
+			topBrews : []
+		};
+	},
+
+	renderNavbar : function(){
+		return <Navbar>
+			<Nav.section>
+				<NavItem.Patreon collaspe={true} />
+				<NavItem.Issue collaspe={true} />
+				<Nav.item newTab={true} href='/changelog' color='purple' icon='fa-star' collaspe={true}>
+					What's new
+				</Nav.item>
+				<NavItem.Recent.both />
+				<NavItem.Account />
+				{/*}
+				<Nav.item href='/new' color='green' icon='fa-external-link'>
+					New Brew
+				</Nav.item>
+				*/}
+			</Nav.section>
+		</Navbar>
+	},
+
+	renderNavigation : function(){
+		return <div className='navigation'>
+			<p>
+				Effortlessly create Authnetic looking D&D homebrews with just text
+			</p>
+			<div>
+				<a className='button new' target='_blank' href='/new'>
+					<i className='fa fa-magic' />
+					<h3>New</h3>
+					<p>This is some sample text</p>
+				</a>
+
+				<a className='button search' target='_blank' href='/search'>
+					<i className='fa fa-search' />
+					<h3>Search</h3>
+					<p>This is some sample text</p>
+				</a>
+			</div>
+			<div>
+				<a className='button docs' target='_blank' href='/docs'>
+					<i className='fa fa-book' />
+					<h3>Docs</h3>
+					<p>This is some sample text</p>
+				</a>
+				<a className='button account' target='_blank' href='/account'>
+					<i className='fa fa-user' />
+					<h3>Account</h3>
+					<p>This is some sample text</p>
+				</a>
+			</div>
+		</div>
+
+	},
+
+	renderTopBrews : function(){
+		return <div className='topBrews'>
+			{_.map(this.props.brews, (brew)=><BrewCard brew={brew} key={brew._id}/>)}
+		</div>
+	},
+
+	render : function(){
+		return <div className='homePage page'>
+			{this.renderNavbar()}
+			<div className='content'>
+				<div className='hero'>
+					hero
+					<h1>The Homebrewery</h1>
+
+				</div>
+				{this.renderNavigation()}
+				{this.renderTopBrews()}
+			</div>
+		</div>
+	}
+});
+
+module.exports = HomePage;

client/homebrew/pages/homePage/homePage.less

@@ -1,50 +1,109 @@
+
+@import 'homebrewery/phb_style/phb.fonts.less';
 .homePage{
 	position : relative;
-	a.floatingNewButton{
-		.animate(background-color);
-		position         : absolute;
-		display          : block;
-		right            : 70px;
-		bottom           : 50px;
-		z-index          : 100;
-		z-index          : 5001;
-		padding          : 1em;
-		background-color : @orange;
-		font-size        : 1.5em;
-		color            : white;
-		text-decoration  : none;
-		box-shadow       : 3px 3px 15px black;
-		&:hover{
-			background-color : darken(@orange, 20%);
+	.hero{
+	//	.backgroundScrollAnimation();
+		height              : 400px;
+		background-image    : url('/assets/homebrew/pages/homePage/fantasy_background.jpg');
+		background-position : 1% 15%;
+		h1{
+			margin-top     : 15%;
+			font-family    : BookInsanity;
+			font-size      : 3em;
+			font-weight    : 800;
+			letter-spacing : 0.3em;
+			text-align     : center;
 		}
 	}
-	.floatingSaveButton{
-		.animateAll();
-		position         : absolute;
-		display          : block;
-		right            : 200px;
-		bottom           : 70px;
-		z-index          : 100;
-		z-index          : 5000;
-		padding          : 0.8em;
-		cursor           : pointer;
-		background-color : @blue;
-		font-size        : 0.8em;
-		color            : white;
-		text-decoration  : none;
-		box-shadow       : 3px 3px 15px black;
-		&:hover{
-			background-color : darken(@blue, 20%);
+	.navigation{
+		padding          : 30px;
+		background-image : url('/assets/homebrew/pages/homePage/dmg_bg.jpg');
+		text-align       : center;
+		&>div{
+			//display         : flex;
+			margin          : 0 auto;
+		//	justify-content : center;
 		}
-		&.show{
-			right : 350px;
+		p{
+			margin-bottom : 20px;
+			font-size     : 0.8em;
+		}
+		a.button{
+			.animate(background-color);
+			position         : relative;
+			display          : block;
+			height           : 60px;
+			max-width            : 280px;
+			width : 100%;
+			margin           : 15px;
+			padding          : 20px 30px;
+			padding-left     : 80px;
+			cursor           : pointer;
+			background-color : fade(@red, 30%);
+			color            : black;
+			text-align       : left;
+			text-decoration  : none;
+			//flex-grow : 0;
+			display: inline-block;
+			i{
+				position  : absolute;
+				top       : 15px;
+				left      : 25px;
+				font-size : 2em;
+				//transform-style: preserve-3d;
+				transform: rotateY(0deg);
+			}
+			h3{
+				display        : block;
+				margin-bottom  : 3px;
+				font-size      : 1.2em;
+				font-weight    : 600;
+				letter-spacing : 0.2em;
+			}
+			p{
+				.fadeOutLeft();
+				.keep();
+				opacity   : 0;
+				font-size : 0.8em;
+			}
+			&:hover{
+				background-color : fade(@red, 50%);
+				p{
+					.fadeInRight();
+				}
+				i{
+					transform: rotateY(360deg);
+					.animateAll(0.5s);
+				}
+			}
 		}
 	}
 
-	.navItem.save{
-		background-color: @orange;
-		&:hover{
-			background-color: @green;
-		}
+	.topBrews{
+		background-image    : url('/assets/homebrew/pages/homePage/phb_bg.jpg');
+
+
 	}
+
 }
+// .vendor(@property, @value) {
+// 	-webkit-@{property}: @value;
+// 	 -khtml-@{property}: @value;
+// 	   -moz-@{property}: @value;
+// 			@{property}: @value;
+// }
+// .backgroundScrollAnimation(){
+// 	@top : -100px;
+// 	.vendor(animation-iteration-count, infinite);
+// 	.createAnimation(backgroundScroll, 60s, linear);
+// 	.backgroundScrollKeyFrames(){
+// 		0%   { background-position: 0 @top}
+// 		100% { background-position: -1200px @top}
+// 	}
+// 	@-webkit-keyframes backgroundScroll {.backgroundScrollKeyFrames();}
+// 	@-moz-keyframes backgroundScroll {.backgroundScrollKeyFrames();}
+// 	@-ms-keyframes backgroundScroll {.backgroundScrollKeyFrames();}
+// 	@-o-keyframes backgroundScroll {.backgroundScrollKeyFrames();}
+// 	@keyframes backgroundScroll {.backgroundScrollKeyFrames();}
+// }

client/homebrew/pages/homePage/migrate.md

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

client/homebrew/pages/homePage/welcome_msg.md

@@ -1,183 +0,0 @@
-```css
-.page #example + table td {
-	border:1px dashed #00000030;
-}
-.page {
-	padding-bottom : 1.1cm;
-}
-```
-
-# The Homebrewery *V3*
-Welcome traveler from an antique land. Please sit and tell us of what you have seen. The unheard of monsters, who slither and bite. Tell us of the wondrous items and and artifacts you have found, their mysteries yet to be unlocked. Of the vexing vocations and surprising skills you have seen.
-
-### Homebrew D&D made easy
-The Homebrewery makes the creation and sharing of authentic looking Fifth-Edition homebrews easy. It uses [Markdown](https://help.github.com/articles/markdown-basics/) with a little CSS magic to make your brews come to life.
-
-**Try it!** Simply edit the text on the left and watch it *update live* on the right. Note that not every button is visible on this demo page. Click New {{fas,fa-plus-square}} in the navbar above to start brewing with all the features!
-
-### Editing and Sharing
-When you create a new homebrew document ("brew"), your document will be given a *edit link* and a *share link*.
-
-The *edit link* is where you write your brew. If you edit a brew while logged in, you are added as one of the brew's authors, and no one else can edit that brew until you add them as a new author via the {{fa,fa-info-circle}} **Properties** tab. Brews without any author can still be edited by anyone with the *edit link*, so be careful about who you share it with if you prefer to work without an account.
-
-Anyone with the *share url* will be able to access a read-only version of your homebrew.
-
-{{note
-##### PDF Creation
-PDF Printing works best in Google Chrome. If you are having quality/consistency issues, try using Chrome to print instead.
-
-After clicking the "Print" item in the navbar a new page will open and a print dialog will pop-up.
-* Set the **Destination** to "Save as PDF"
-* Set **Paper Size** to "Letter"
-* If you are printing on A4 paper, make sure to have the **PRINT → {{far,fa-file}} A4 Pagesize** snippet in your brew
-* In **Options** make sure "Background Images" is selected.
-* Hit print and enjoy! You're done!
-
-If you want to save ink or have a monochrome printer, add the **PRINT → {{fas,fa-tint}} Ink Friendly** snippet to your brew!
-}}
-
-![homebrew mug](https://i.imgur.com/hMna6G0.png) {position:absolute,bottom:20px,left:130px,width:220px}
-
-{{artist,bottom:160px,left:100px
-##### Homebrew Mug
-[naturalcrit](https://homebrew.naturalcrit.com)
-}}
-
-{{pageNumber 1}}
-{{footnote PART 1 | FANCINESS}}
-
-\column
-
-## V3 vs Legacy
-The Homebrewery has two renderers: Legacy and V3. The V3 renderer is recommended for all users because it is more powerful, more customizable, and continues to receive new feature updates while Legacy does not. However Legacy mode will remain available for older brews and veteran users.
-	
-At any time, any individual brew can be changed to your renderer of choice via the {{fa,fa-info-circle}} **Properties** tab on your brew. However, converting between Legacy and V3 may require heavily tweaking the document; while both renderers can use raw HTML, V3 prefers a streamlined curly bracket syntax that avoids the complex HTML structures required by Legacy.
-
-
-Scroll down to the next page for a brief summary of the changes and features available in V3!
-#### New Things All The Time!
-Check out the latest updates in the full changelog [here](/changelog).
-
-### Helping out
-Like this tool? Head over to our [Patreon](https://www.patreon.com/Naturalcrit) to help us keep the servers running.
-
-
-This tool will **always** be free, never have ads, and we will never offer any "premium" features or whatever.
-
-### Bugs, Issues, Suggestions?
-- Check the [Frequently Asked Questions](/faq) page first for quick answers.
-- Get help or the right look for your brew by posting on [r/Homebrewery](https://www.reddit.com/r/homebrewery/submit?selftext=true&title=%5BIssue%5D%20Describe%20Your%20Issue%20Here) or joining the [Discord Of Many Things](https://discord.gg/by3deKx).
-- Report technical issues or provide feedback on the [GitHub Repo](https://github.com/naturalcrit/homebrewery/).
-
-### Legal Junk
-The Homebrewery is licensed using the [MIT License](https://github.com/naturalcrit/homebrewery/blob/master/license). Which means you are free to use The Homebrewery codebase any way that you want, except for claiming that you made it yourself.
-
-If you wish to sell or in some way gain profit for what's created on this site, it's your responsibility to ensure you have the proper licenses/rights for any images or resources used.
-#### Crediting Us
-If you'd like to credit us in your brew, we'd be flattered! Just reference that you made it with The Homebrewery.
-
-### More Homebrew Resources
-[![Discord](/assets/discordOfManyThings.svg){width:50px,float:right,padding-left:10px}](https://discord.gg/by3deKx)
-
-If you are looking for more 5e Homebrew resources check out [r/UnearthedArcana](https://www.reddit.com/r/UnearthedArcana/) and their list of useful resources [here](https://www.reddit.com/r/UnearthedArcana/wiki/resources). The [Discord Of Many Things](https://discord.gg/by3deKx) is another great resource to connect with fellow homebrewers for help and feedback.
-
-
-{{position:absolute;top:20px;right:20px;width:auto
-[![Discord](/assets/discord.png){height:30px}](https://discord.gg/by3deKx)
-[![Github](/assets/github.png){height:30px}](https://github.com/naturalcrit/homebrewery)
-[![Patreon](/assets/patreon.png){height:30px}](https://patreon.com/NaturalCrit)
-[![Reddit](/assets/reddit.png){height:30px}](https://www.reddit.com/r/homebrewery/)
-}}
-
-\page
-
-
-
-
-
-
-
-
-## Markdown+
-The Homebrewery aims to make homebrewing as simple as possible, providing a live editor with Markdown syntax that is more human-readable and faster to write with than raw HTML.
-
-From version 3.0.0, with a goal of adding maximum flexibility without users resorting to complex HTML to accomplish simple tasks, Homebrewery provides an extended verision of Markdown with additional syntax.
-
-### Curly Brackets
-Standard Markdown lacks several equivalences to HTML. Hence, we have introduced `{{ }}` as a replacement for `<span></span>` and `<div></div>` for a cleaner custom formatting. Inline spans and block elements can be created and given ID's and Classes, as well as CSS properties, each of which are comma separated with no spaces. Use double quotes if a value requires spaces. Spans and Blocks start the same:
-
-#### Span
-My favorite author is {{pen,#author,color:orange,font-family:"trebuchet ms" Brandon Sanderson}}.  The orange text has a class of `pen`, an id of `author`, is colored orange, and given a new font. The first space outside of quotes marks the beginning of the content.
-
-
-#### Block
-{{purple,#book,text-align:center,background:#aa88aa55
-My favorite book is Wheel of Time. This block has a class of `purple`, an id of `book`, and centered text with a colored background. The opening and closing brackets are on lines separate from the block contents.
-}}
-
-#### Injection
-For any element not inside a span or block, you can *inject* attributes using the same syntax but with single brackets in a single line immediately after the element.
-
-Inline elements like *italics* {color:#D35400} or images require the injection on the same line.
-
-Block elements like headers require the injection to start on the line immediately following.
-
-##### A Purple Header
-{color:purple,text-align:center}
-
-\* *this does not currently work for tables yet*
-
-### Vertical Spacing
-A blank line can be achieved with a run of one or more `:` alone on a line. More `:`'s will create more space.
-
-::
-
-
-Much nicer than `<br><br><br><br><br>`
-
-### Definition Lists
-**Example** :: V3 uses HTML *definition lists* to create "lists" with hanging indents.
-
-
-
-### Column Breaks
-Column and page breaks with `\column` and `\page`.
-
-\column
-### Tables
-Tables now allow column & row spanning between cells. This is included in some updated snippets, but a simplified example is given below.
-
-A cell can be spanned across columns by grouping multiple pipe `|` characters at the end of a cell.
-
-Row spanning is achieved by adding a `^` at the end of a cell just before the `|`.  
-
-These can be combined to span a cell across both columns and rows. Cells must have the same colspan if they are to be rowspan'd.
-
-##### Example
-| Head A | Spanned Header ||
-| Head B | Head C | Head D |
-|:-------|:------:|:------:|
-| 1A     |    1B  |    1C  |
-| 2A    ^|    2B  |    2C  |
-| 3A    ^|    3B       3C ||
-| 4A     |    4B       4C^||
-| 5A    ^|    5B  |    5C  |
-| 6A     |    6B ^|    6C  |
-
-## Images
-Images must be hosted online somewhere, like [Imgur](https://www.imgur.com). You use the address to that image to reference it in your brew\*.
-
-Using *Curly Injection* you can assign an id, classes, or inline CSS properties to the Markdown image syntax.
-
-![alt-text](https://s-media-cache-ak0.pinimg.com/736x/4a/81/79/4a8179462cfdf39054a418efd4cb743e.jpg) {width:100px,border:"2px solid",border-radius:10px}
-
-\* *When using Imgur-hosted images, use the "direct link", which can be found when you click into your image in the Imgur interface.*
-
-## Snippets
-Homebrewery comes with a series of *code snippets* found at the top of the editor pane that make it easy to create brews as quickly as possible.  Just set your cursor where you want the code to appear in the editor pane, choose a snippet, and make the adjustments you need.
-
-## Style Editor Panel
-{{fa,fa-paint-brush}} Usually overlooked or unused by some users, the **Style Editor** tab is located on the right side of the Snippet bar. This editor accepts CSS for styling without requiring `<style>` tags-- anything that would have gone inside style tags before can now be placed here, and snippets that insert CSS styles are now located on that tab.
-
-{{pageNumber 2}}
-{{footnote PART 2 | BORING STUFF}}

client/homebrew/pages/newPage/newPage.jsx

@@ -1,240 +1,62 @@
-/*eslint max-lines: ["warn", {"max": 300, "skipBlankLines": true, "skipComments": true}]*/
-require('./newPage.less');
-const React = require('react');
-const createClass = require('create-react-class');
-const _ = require('lodash');
-const request = require('../../utils/request-middleware.js');
-
-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 ErrorNavItem = require('../../navbar/error-navitem.jsx');
-const RecentNavItem = require('../../navbar/recent.navitem.jsx').both;
-const HelpNavItem = require('../../navbar/help.navitem.jsx');
-
-const SplitPane = require('naturalcrit/splitPane/splitPane.jsx');
-const Editor = require('../../editor/editor.jsx');
-const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
-
-const { DEFAULT_BREW } = require('../../../../server/brewDefaults.js');
-
-const BREWKEY  = 'homebrewery-new';
-const STYLEKEY = 'homebrewery-new-style';
-const METAKEY  = 'homebrewery-new-meta';
-let SAVEKEY;
-
-
-const NewPage = createClass({
-	displayName     : 'NewPage',
-	getDefaultProps : function() {
-		return {
-			brew : DEFAULT_BREW
-		};
-	},
-
-	getInitialState : function() {
-		const brew = this.props.brew;
-
-		return {
-			brew              : brew,
-			isSaving          : false,
-			saveGoogle        : (global.account && global.account.googleId ? true : false),
-			error             : null,
-			htmlErrors        : Markdown.validate(brew.text),
-			currentEditorPage : 0
-		};
-	},
-
-	componentDidMount : function() {
-		document.addEventListener('keydown', this.handleControlKeys);
-
-		const brew = this.state.brew;
-
-		if(!this.props.brew.shareId && typeof window !== 'undefined') { //Load from localStorage if in client browser
-			const brewStorage  = localStorage.getItem(BREWKEY);
-			const styleStorage = localStorage.getItem(STYLEKEY);
-			const metaStorage = JSON.parse(localStorage.getItem(METAKEY));
-
-			brew.text  = brewStorage  ?? brew.text;
-			brew.style = styleStorage ?? brew.style;
-			// brew.title = metaStorage?.title || this.state.brew.title;
-			// brew.description = metaStorage?.description || this.state.brew.description;
-			brew.renderer = metaStorage?.renderer ?? brew.renderer;
-			brew.theme    = metaStorage?.theme    ?? brew.theme;
-			brew.lang     = metaStorage?.lang     ?? brew.lang;
-		}
-
-		SAVEKEY = `HOMEBREWERY-DEFAULT-SAVE-LOCATION-${global.account?.username || ''}`;
-		const saveStorage = localStorage.getItem(SAVEKEY) || 'HOMEBREWERY';
-
-		this.setState({
-			brew       : brew,
-			saveGoogle : (saveStorage == 'GOOGLE-DRIVE' && this.state.saveGoogle)
-		});
-
-		localStorage.setItem(BREWKEY, brew.text);
-		if(brew.style)
-			localStorage.setItem(STYLEKEY, brew.style);
-		localStorage.setItem(METAKEY, JSON.stringify({ 'renderer': brew.renderer, 'theme': brew.theme, 'lang': brew.lang }));
-	},
-	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();
-	},
-
-	handleTextChange : function(text){
-		//If there are errors, run the validator on every change to give quick feedback
-		let htmlErrors = this.state.htmlErrors;
-		if(htmlErrors.length) htmlErrors = Markdown.validate(text);
-
-		this.setState((prevState)=>({
-			brew              : { ...prevState.brew, text: text },
-			htmlErrors        : htmlErrors,
-			currentEditorPage : this.refs.editor.getCurrentPage() - 1 //Offset index since Marked starts pages at 0
-		}));
-		localStorage.setItem(BREWKEY, text);
-	},
-
-	handleStyleChange : function(style){
-		this.setState((prevState)=>({
-			brew : { ...prevState.brew, style: style },
-		}));
-		localStorage.setItem(STYLEKEY, style);
-	},
-
-	handleMetaChange : function(metadata){
-		this.setState((prevState)=>({
-			brew : { ...prevState.brew, ...metadata },
-		}), ()=>{
-			localStorage.setItem(METAKEY, JSON.stringify({
-				// 'title'       : this.state.brew.title,
-				// 'description' : this.state.brew.description,
-				'renderer' : this.state.brew.renderer,
-				'theme'    : this.state.brew.theme,
-				'lang'     : this.state.brew.lang
-			}));
-		});
-		;
-	},
-
-	save : async function(){
-		this.setState({
-			isSaving : true
-		});
-
-		console.log('saving new brew');
-
-		let brew = this.state.brew;
-		// Split out CSS to Style if CSS codefence exists
-		if(brew.text.startsWith('```css') && brew.text.indexOf('```\n\n') > 0) {
-			const index = brew.text.indexOf('```\n\n');
-			brew.style = `${brew.style ? `${brew.style}\n` : ''}${brew.text.slice(7, index - 1)}`;
-			brew.text = brew.text.slice(index + 5);
-		}
-
-		brew.pageCount=((brew.renderer=='legacy' ? brew.text.match(/\\page/g) : brew.text.match(/^\\page$/gm)) || []).length + 1;
-
-		const res = await request
-			.post(`/api${this.state.saveGoogle ? '?saveToGoogle=true' : ''}`)
-			.send(brew)
-			.catch((err)=>{
-				console.log(err);
-				this.setState({ isSaving: false, error: err });
-			});
-		if(!res) return;
-
-		brew = res.body;
-		localStorage.removeItem(BREWKEY);
-		localStorage.removeItem(STYLEKEY);
-		localStorage.removeItem(METAKEY);
-		window.location = `/edit/${brew.editId}`;
-	},
-
-	renderSaveButton : function(){
-		if(this.state.isSaving){
-			return <Nav.item icon='fas fa-spinner fa-spin' className='save'>
-				save...
-			</Nav.item>;
-		} else {
-			return <Nav.item icon='fas fa-save' className='save' onClick={this.save}>
-				save
-			</Nav.item>;
-		}
-	},
-
-	print : function(){
-		window.open('/print?dialog=true&local=print', '_blank');
-	},
-
-	renderLocalPrintButton : function(){
-		return <Nav.item color='purple' icon='far fa-file-pdf' onClick={this.print}>
-			get PDF
-		</Nav.item>;
-	},
-
-	renderNavbar : function(){
-		return <Navbar>
-
-			<Nav.section>
-				<Nav.item className='brewTitle'>{this.state.brew.title}</Nav.item>
-			</Nav.section>
-
-			<Nav.section>
-				{this.state.error ?
-					<ErrorNavItem error={this.state.error} parent={this}></ErrorNavItem> :
-					this.renderSaveButton()
-				}
-				{this.renderLocalPrintButton()}
-				<HelpNavItem />
-				<RecentNavItem />
-				<AccountNavItem />
-			</Nav.section>
-		</Navbar>;
-	},
-
-	render : function(){
-		return <div className='newPage sitePage'>
-			{this.renderNavbar()}
-			<div className='content'>
-				<SplitPane onDragFinish={this.handleSplitMove} ref='pane'>
-					<Editor
-						ref='editor'
-						brew={this.state.brew}
-						onTextChange={this.handleTextChange}
-						onStyleChange={this.handleStyleChange}
-						onMetaChange={this.handleMetaChange}
-						renderer={this.state.brew.renderer}
-					/>
-					<BrewRenderer
-						text={this.state.brew.text}
-						style={this.state.brew.style}
-						renderer={this.state.brew.renderer}
-						theme={this.state.brew.theme}
-						errors={this.state.htmlErrors}
-						lang={this.state.brew.lang}
-						currentEditorPage={this.state.currentEditorPage}
-					/>
-				</SplitPane>
-			</div>
-		</div>;
-	}
-});
-
-module.exports = NewPage;
+const React = require('react');
+const _ = require('lodash');
+
+const Nav = require('naturalcrit/nav/nav.jsx');
+const Navbar = require('../../navbar/navbar.jsx');
+const Items = require('../../navbar/navitems.js');
+
+const Store = require('homebrewery/brew.store.js');
+const Actions = require('homebrewery/brew.actions.js');
+
+const BrewInterface = require('homebrewery/brewInterface/brewInterface.jsx');
+const Utils = require('homebrewery/utils.js');
+
+const KEY = 'homebrewery-new';
+
+const NewPage = React.createClass({
+	componentDidMount: function() {
+		try{
+			const storedBrew = JSON.parse(localStorage.getItem(KEY));
+			if(storedBrew && storedBrew.text) Actions.setBrew(storedBrew);
+		}catch(e){}
+		Store.updateEmitter.on('change', this.saveToLocal);
+		document.addEventListener('keydown', this.handleControlKeys);
+	},
+	componentWillUnmount: function() {
+		Store.updateEmitter.removeListener('change', this.saveToLocal);
+		document.removeEventListener('keydown', this.handleControlKeys);
+	},
+
+	saveToLocal : function(){
+		localStorage.setItem(KEY, JSON.stringify(Store.getBrew()));
+	},
+	handleControlKeys : Utils.controlKeys({
+		s : Actions.saveNew,
+		p : Actions.localPrint
+	}),
+
+	render : function(){
+		return <div className='newPage page'>
+			<Navbar>
+				<Nav.section>
+					<Items.BrewTitle />
+				</Nav.section>
+
+				<Nav.section>
+					<Items.StaticSave />
+					<Nav.item color='purple' icon='fa-file-pdf-o' onClick={Actions.localPrint}>
+						get PDF
+					</Nav.item>
+					<Items.Issue collaspe={true} />
+					<Items.Account />
+				</Nav.section>
+			</Navbar>
+
+			<div className='content'>
+				<BrewInterface />
+			</div>
+		</div>
+	}
+});
+
+module.exports = NewPage;

client/homebrew/pages/newPage/newPage.less

@@ -1,8 +1,4 @@
 .newPage{
-	.navItem.save{
-		background-color: @orange;
-		&:hover{
-			background-color: @green;
-		}
-	}
-}
+
+
+}

client/homebrew/pages/printPage/printPage.jsx

@@ -1,112 +1,71 @@
-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 MarkdownLegacy = require('naturalcrit/markdownLegacy.js');
-const Markdown = require('naturalcrit/markdown.js');
 
-const Themes = require('themes/themes.json');
 
-const BREWKEY = 'homebrewery-new';
-const STYLEKEY = 'homebrewery-new-style';
-const METAKEY = 'homebrewery-new-meta';
+const BrewRenderer = require('homebrewery/brewRenderer/brewRenderer.jsx');
 
-const PrintPage = createClass({
-	displayName     : 'PrintPage',
-	getDefaultProps : function() {
+const Markdown = require('homebrewery/markdown.js');
+
+const Headtags = require('vitreum/headtags');
+
+const PrintPage = React.createClass({
+	getDefaultProps: function() {
 		return {
 			query : {},
-			brew  : {
-				text     : '',
-				style    : '',
-				renderer : 'legacy',
-				lang     : ''
-			}
-		};
-	},
-
-	getInitialState : function() {
-		return {
 			brew : {
-				text     : this.props.brew.text     || '',
-				style    : this.props.brew.style    || undefined,
-				renderer : this.props.brew.renderer || 'legacy',
-				theme    : this.props.brew.theme    || '5ePHB',
-				lang	 : this.props.brew.lang     || 'en'
+				text : '',
+				style : ''
 			}
 		};
 	},
-
-	componentDidMount : function() {
-		if(this.props.query.local == 'print'){
-			const brewStorage  = localStorage.getItem(BREWKEY);
-			const styleStorage = localStorage.getItem(STYLEKEY);
-			const metaStorage = JSON.parse(localStorage.getItem(METAKEY));
-
-			this.setState((prevState, prevProps)=>{
-				return {
-					brew : {
-						text     : brewStorage,
-						style    : styleStorage,
-						renderer : metaStorage?.renderer || 'legacy',
-						theme    : metaStorage?.theme    || '5ePHB',
-						lang	 : metaStorage?.lang	 || 'en'
-					}
-				};
-			});
-		}
-
-		if(this.props.query.dialog) window.print();
+	getInitialState: function() {
+		return {
+			brew: this.props.brew
+		};
 	},
-
-	renderStyle : function() {
+	componentDidMount: function() {
+		if(this.props.query.local){
+			try{
+				this.setState({
+					brew : JSON.parse(
+						localStorage.getItem(this.props.query.local)
+					)
+				});
+			}catch(e){}
+		}
+		//if(this.props.query.dialog) window.print();
+	},
+	//TODO: Print page shouldn't replicate functionality in brew renderer
+	renderStyle : function(){
 		if(!this.state.brew.style) return;
-		//return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style>@layer styleTab {\n${this.state.brew.style}\n} </style>` }} />;
-		return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style>\n${this.state.brew.style}\n</style>` }} />;
+		return <style>{this.state.brew.style.replace(/;/g, ' !important;')}</style>
+	},
+	renderPages : function(){
+		return _.map(this.state.brew.text.split('\\page'), (page, index) => {
+			return <div
+				className='phb v2'
+				id={`p${index + 1}`}
+				dangerouslySetInnerHTML={{__html:Markdown.render(page)}}
+				key={index} />;
+		});
 	},
 
-	renderPages : function(){
-		if(this.state.brew.renderer == 'legacy') {
-			return _.map(this.state.brew.text.split('\\page'), (pageText, index)=>{
-				return <div
-					className='phb page'
-					id={`p${index + 1}`}
-					dangerouslySetInnerHTML={{ __html: MarkdownLegacy.render(pageText) }}
-					key={index} />;
-			});
-		} else {
-			return _.map(this.state.brew.text.split(/^\\page$/gm), (pageText, index)=>{
-				pageText += `\n\n&nbsp;\n\\column\n&nbsp;`; //Artificial column break at page end to emulate column-fill:auto (until `wide` is used, when column-fill:balance will reappear)
-				return (
-					<div className='page' id={`p${index + 1}`} key={index} >
-						<div className='columnWrapper' dangerouslySetInnerHTML={{ __html: Markdown.render(pageText) }} />
-					</div>
-				);
-			});
-		}
+	renderPrintInstructions : function(){
+		return <div className='printInstructions'>
+			Hey, I'm really cool instructions!!!!!
 
+		</div>
 	},
 
 	render : function(){
-		const rendererPath = this.state.brew.renderer == 'V3' ? 'V3' : 'Legacy';
-		const themePath    = this.state.brew.theme ?? '5ePHB';
-		const baseThemePath = Themes[rendererPath][themePath].baseTheme;
+		return <div className='printPage'>
+			<Headtags.title>{this.state.brew.title}</Headtags.title>
+			{this.renderPrintInstructions()}
 
-		return <div>
-			<Meta name='robots' content='noindex, nofollow' />
-			<link href={`/themes/${rendererPath}/Blank/style.css`} type="text/css" rel='stylesheet'/>
-			{baseThemePath &&
-				<link href={`/themes/${rendererPath}/${baseThemePath}/style.css`} type="text/css" rel='stylesheet'/>
-			}
-			<link href={`/themes/${rendererPath}/${themePath}/style.css`} type="text/css" rel='stylesheet'/>
-			{/* Apply CSS from Style tab */}
-			{this.renderStyle()}
-			<div className='pages' ref='pages' lang={this.state.brew.lang}>
-				{this.renderPages()}
-			</div>
-		</div>;
+			<BrewRenderer text={this.state.brew.text} style={this.state.brew.style} />
+
+		</div>
 	}
 });
 

client/homebrew/pages/printPage/printPage.less

@@ -1,3 +1,17 @@
-.printPage{
 
+.printPage{
+	position : relative;
+	@media print{
+		.printInstructions{
+			display : none;
+		}
+	}
+	.printInstructions{
+		position         : absolute;
+		top              : 0px;
+		right            : 0px;
+		z-index          : 100000;
+		padding          : 30px;
+		background-color : @blue;
+	}
 }

client/homebrew/pages/sharePage/sharePage.jsx

@@ -1,90 +1,74 @@
-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 MetadataNav = require('../../navbar/metadata.navitem.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 { DEFAULT_BREW_LOAD } = require('../../../../server/brewDefaults.js');
-
-const SharePage = createClass({
-	displayName     : 'SharePage',
-	getDefaultProps : function() {
-		return {
-			brew : DEFAULT_BREW_LOAD
-		};
-	},
-
-	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.processShareId()}?dialog=true`, '_blank').focus();
-			e.stopPropagation();
-			e.preventDefault();
-		}
-	},
-
-	processShareId : function() {
-		return this.props.brew.googleId && !this.props.brew.stubbed ?
-					 this.props.brew.googleId + this.props.brew.shareId :
-					 this.props.brew.shareId;
-	},
-
-	render : function(){
-		return <div className='sharePage sitePage'>
-			<Meta name='robots' content='noindex, nofollow' />
-			<Navbar>
-				<Nav.section className='titleSection'>
-					<MetadataNav brew={this.props.brew}>
-						<Nav.item className='brewTitle'>{this.props.brew.title}</Nav.item>
-					</MetadataNav>
-				</Nav.section>
-
-				<Nav.section>
-					{this.props.brew.shareId && <>
-						<PrintLink shareId={this.processShareId()} />
-						<Nav.dropdown>
-							<Nav.item color='red' icon='fas fa-code'>
-								source
-							</Nav.item>
-							<Nav.item color='blue' href={`/source/${this.processShareId()}`}>
-								view
-							</Nav.item>
-							<Nav.item color='blue' href={`/download/${this.processShareId()}`}>
-								download
-							</Nav.item>
-							<Nav.item color='blue' href={`/new/${this.processShareId()}`}>
-								clone to new
-							</Nav.item>
-						</Nav.dropdown>
-					</>}
-					<RecentNavItem brew={this.props.brew} storageKey='view' />
-					<Account />
-				</Nav.section>
-			</Navbar>
-
-			<div className='content'>
-				<BrewRenderer text={this.props.brew.text} style={this.props.brew.style} renderer={this.props.brew.renderer} theme={this.props.brew.theme} />
-			</div>
-		</div>;
-	}
-});
-
-module.exports = SharePage;
+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 BrewView = require('homebrewery/BrewView/BrewView.jsx');
+const Utils = require('homebrewery/utils.js');
+
+const Actions = require('homebrewery/brew.actions.js');
+const Store = require('homebrewery/brew.store.js');
+
+const Headtags = require('vitreum/headtags');
+
+const SharePage = React.createClass({
+	componentDidMount: function() {
+		document.addEventListener('keydown', this.handleControlKeys);
+	},
+	componentWillUnmount: function() {
+		document.removeEventListener('keydown', this.handleControlKeys);
+	},
+	handleControlKeys : Utils.controlKeys({
+		p : Actions.print
+	}),
+
+	renderMetatags : function(brew){
+		let metatags = [
+			<Headtags.meta key='site_name' property='og:site_name' content='Homebrewery'/>,
+			<Headtags.meta key='type' property='og:type' content='article' />
+		];
+		if(brew.title){
+			metatags.push(<Headtags.meta key='title' property='og:title' content={brew.title} />);
+		}
+		if(brew.description){
+			metatags.push(<Headtags.meta key='description' name='description' content={brew.description} />);
+		}
+		if(brew.thumbnail){
+			metatags.push(<Headtags.meta key='image' property='og:image' content={brew.thumbnail} />);
+		}
+		return metatags;
+	},
+
+	render : function(){
+		const brew = Store.getBrew();
+		return <div className='sharePage page'>
+			{this.renderMetatags(brew)}
+
+			<Navbar>
+				<Nav.section>
+					<Nav.item className='brewTitle'>{brew.title}</Nav.item>
+				</Nav.section>
+
+				<Nav.section>
+					<ReportIssue collaspe={true} />
+					<PrintLink shareId={brew.shareId} />
+					<Nav.item href={'/source/' + brew.shareId} color='teal' icon='fa-code'>
+						source
+					</Nav.item>
+					<Account />
+				</Nav.section>
+			</Navbar>
+			<div className='content'>
+				<BrewView brew={brew}/>
+			</div>
+		</div>
+	}
+});
+
+module.exports = SharePage;

client/homebrew/pages/sharePage/sharePage.less

@@ -1,9 +1,3 @@
 .sharePage{
-	.navContent .navSection.titleSection {
-		flex-grow: 1;
-		justify-content: center;
-	}
-	.content{
-		overflow-y : hidden;
-	}
-}
+
+}

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

@@ -0,0 +1,58 @@
+const React = require('react');
+const _     = require('lodash');
+const cx    = require('classnames');
+const moment = require('moment');
+
+//TODO: Depriacte
+
+const BrewItem = React.createClass({
+	getDefaultProps: function() {
+		return {
+			brew : {
+				title : '',
+				description : '',
+
+				authors : []
+			}
+		};
+	},
+
+	renderEditLink: function(){
+		if(!this.props.brew.editId) return;
+
+		return <a href={`/edit/${this.props.brew.editId}`} target='_blank'>
+			<i className='fa fa-pencil' />
+		</a>
+	},
+
+	render : function(){
+		console.log('Brew Item should be depricated');
+		const brew = this.props.brew;
+		return <div className='brewItem'>
+			<h2>{brew.title}</h2>
+			<p className='description' >{brew.description}</p>
+			<hr />
+
+			<div className='info'>
+				<span>
+					<i className='fa fa-user' /> {brew.authors.join(', ')}
+				</span>
+				<span>
+					<i className='fa fa-eye' /> {brew.views}
+				</span>
+				<span>
+					<i className='fa fa-refresh' /> {moment(brew.updatedAt).fromNow()}
+				</span>
+			</div>
+
+			<div className='links'>
+				<a href={`/share/${brew.shareId}`} target='_blank'>
+					<i className='fa fa-share-alt' />
+				</a>
+				{this.renderEditLink()}
+			</div>
+		</div>
+	}
+});
+
+module.exports = BrewItem;

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

@@ -0,0 +1,60 @@
+
+.brewItem{
+	position                    : relative;
+	display                     : inline-block;
+	vertical-align              : top;
+	box-sizing                  : border-box;
+	box-sizing                  : border-box;
+	overflow                    : hidden;
+	width                       : 48%;
+	margin-right                : 15px;
+	margin-bottom               : 15px;
+	padding                     : 5px 15px 5px 8px;
+	padding-right               : 15px;
+	border                      : 1px solid #c9ad6a;
+	border-radius               : 5px;
+	-webkit-column-break-inside : avoid;
+	page-break-inside           : avoid;
+	break-inside                : avoid;
+	h4{
+		margin-bottom : 5px;
+		font-size     : 2.2em;
+	}
+	.info{
+		font-family : ScalySans;
+		font-size   : 1.2em;
+		&>span{
+			margin-right : 15px;
+		}
+	}
+	&:hover{
+		.links{
+			opacity : 1;
+		}
+	}
+	&:nth-child(2n + 1){
+		margin-right : 0px;
+	}
+	.links{
+		.animate(opacity);
+		position         : absolute;
+		top              : 0px;
+		right            : 0px;
+		height           : 100%;
+		width            : 2em;
+		opacity          : 0;
+		background-color : fade(black, 60%);
+		text-align       : center;
+		a{
+			.animate(opacity);
+			display   : block;
+			margin    : 8px 0px;
+			opacity   : 0.6;
+			font-size : 1.3em;
+			color     : white;
+			&:hover{
+				opacity : 1;
+			}
+		}
+	}
+}

client/homebrew/pages/userPage/userPage.jsx

@@ -1,80 +1,72 @@
 const React = require('react');
-const createClass = require('create-react-class');
 const _     = require('lodash');
 const cx    = require('classnames');
 
-const ListPage = require('../basePages/listPage/listPage.jsx');
-
 const Nav = require('naturalcrit/nav/nav.jsx');
 const Navbar = require('../../navbar/navbar.jsx');
 
-const RecentNavItem = require('../../navbar/recent.navitem.jsx').both;
+const RecentNavItem = require('../../navbar/recent.navitem.jsx');
 const Account = require('../../navbar/account.navitem.jsx');
-const NewBrew = require('../../navbar/newbrew.navitem.jsx');
-const HelpNavItem = require('../../navbar/help.navitem.jsx');
-const ErrorNavItem = require('../../navbar/error-navitem.jsx');
+const BrewItem = require('./brewItem/brewItem.jsx');
 
-const UserPage = createClass({
-	displayName     : 'UserPage',
-	getDefaultProps : function() {
+// const brew = {
+// 	title : 'SUPER Long title woah now',
+// 	authors : []
+// }
+
+// const BREWS = _.times(25, ()=>{ return brew});
+
+
+const UserPage = React.createClass({
+	getDefaultProps: function() {
 		return {
 			username : '',
-			brews    : [],
-			query    : '',
-			error    : null
+			brews : []
 		};
 	},
-	getInitialState : function() {
-		const usernameWithS = this.props.username + (this.props.username.endsWith('s') ? `’` : `’s`);
 
-		const brews = _.groupBy(this.props.brews, (brew)=>{
-			return (brew.published ? 'published' : 'private');
+	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}/>
 		});
+	},
 
-		const brewCollection = [
-			{
-				title : `${usernameWithS} published brews`,
-				class : 'published',
-				brews : brews.published
-			}
+	getSortedBrews : function(){
+		return _.groupBy(this.props.brews, (brew)=>{
+			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)
 		];
-		if(this.props.username == global.account?.username){
-			brewCollection.push(
-				{
-					title : `${usernameWithS} unpublished brews`,
-					class : 'unpublished',
-					brews : brews.private
-				}
-			);
-		}
-
-		return {
-			brewCollection : brewCollection
-		};
-	},
-	errorReported : function(error) {
-		this.setState({
-			error
-		});
-	},
-
-	navItems : function() {
-		return <Navbar>
-			<Nav.section>
-				{this.state.error ?
-					<ErrorNavItem error={this.state.error} parent={this}></ErrorNavItem> :
-					null
-				}
-				<NewBrew />
-				<HelpNavItem />
-				<RecentNavItem />
-				<Account />
-			</Nav.section>
-		</Navbar>;
 	},
 
 	render : function(){
-		return <ListPage brewCollection={this.state.brewCollection} navItems={this.navItems()} query={this.props.query} reportError={this.errorReported}></ListPage>;
+		const brews = this.getSortedBrews();
+		return <div className='userPage page'>
+			<Navbar>
+				<Nav.section>
+					<RecentNavItem.both />
+					<Account userPage={this.props.username} />
+				</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>
+			</div>
+		</div>
 	}
 });
 

client/homebrew/pages/userPage/userPage.less

@@ -0,0 +1,33 @@
+
+.noColumns(){
+	column-count         : auto;
+	column-fill          : auto;
+	column-gap           : auto;
+	column-width         : auto;
+	-webkit-column-count : auto;
+	-moz-column-count    : auto;
+	-webkit-column-width : auto;
+	-moz-column-width    : auto;
+	-webkit-column-gap   : auto;
+	-moz-column-gap      : auto;
+}
+.userPage{
+	.content{
+		overflow-y : scroll;
+		.phb{
+			.noColumns();
+			height     : auto;
+			min-height            : 279.4mm;
+			margin     : 20px auto;
+			&::after{
+				display : none;
+			}
+			.noBrews{
+				margin     : 10px 0px;
+				font-size  : 1.3em;
+				font-style : italic;
+			}
+
+		}
+	}
+}