From 4dce90ab411ba2f132d6873636aa052e286a7be8 Mon Sep 17 00:00:00 2001
From: Scott Tolksdorf <scott.tolksdorf@gmail.com>
Date: Mon, 14 Nov 2016 20:14:08 -0500
Subject: [PATCH 01/17] Cleaning up the server file

---
 server.js              | 147 +++++++++++++++++------------------------
 server/admin.api.js    |  72 ++++++++++++++++++++
 server/homebrew.api.js | 140 ++++++++++++++++++---------------------
 3 files changed, 197 insertions(+), 162 deletions(-)
 create mode 100644 server/admin.api.js

diff --git a/server.js b/server.js
index 763f98aa9..d3adab5a0 100644
--- a/server.js
+++ b/server.js
@@ -1,114 +1,66 @@
-'use strict';
-var _ = require('lodash');
 require('app-module-path').addPath('./shared');
-var vitreumRender = require('vitreum/render');
-var bodyParser = require('body-parser')
-var express = require("express");
-var app = express();
+
+const _ = require('lodash');
+
+const vitreumRender = require('vitreum/render');
+const bodyParser = require('body-parser')
+const express = require("express");
+const app = express();
 app.use(express.static(__dirname + '/build'));
 app.use(bodyParser.json({limit: '25mb'}));
 
+
+
 //Mongoose
-var mongoose = require('mongoose');
-var mongoUri = process.env.MONGODB_URI || process.env.MONGOLAB_URI || 'mongodb://localhost/naturalcrit';
-mongoose.connect(mongoUri);
+//TODO: Celean up
+const mongoose = require('mongoose');
+const mongoUri = process.env.MONGODB_URI || process.env.MONGOLAB_URI || 'mongodb://localhost/naturalcrit';
+require('mongoose').connect(mongoUri);
 mongoose.connection.on('error', function(){
 	console.log(">>>ERROR: Run Mongodb.exe ya goof!");
 });
 
-//Admin route
-process.env.ADMIN_USER = process.env.ADMIN_USER || 'admin';
-process.env.ADMIN_PASS = process.env.ADMIN_PASS || 'password';
-process.env.ADMIN_KEY  = process.env.ADMIN_KEY  || 'admin_key';
-var auth = require('basic-auth');
-app.get('/admin', function(req, res){
-	var credentials = auth(req)
-	if (!credentials || credentials.name !== process.env.ADMIN_USER || credentials.pass !== process.env.ADMIN_PASS) {
-		res.setHeader('WWW-Authenticate', 'Basic realm="example"')
-		return res.status(401).send('Access denied')
-	}
-	vitreumRender({
-		page: './build/admin/bundle.dot',
-		prerenderWith : './client/admin/admin.jsx',
-		clearRequireCache : !process.env.PRODUCTION,
-		initialProps: {
-			url: req.originalUrl,
-			admin_key : process.env.ADMIN_KEY,
-		},
-	}, function (err, page) {
-		return res.send(page)
-	});
-});
+
+app.use(require('./server/homebrew.api.js'));
+app.use(require('./server/admin.api.js'));
 
 
-//Populate homebrew routes
-app = require('./server/homebrew.api.js')(app);
+const HomebrewModel = require('./server/homebrew.model.js').model;
+const welcomeText = require('fs').readFileSync('./client/homebrew/pages/homePage/welcome_msg.md', 'utf8');
+const changelogText = require('fs').readFileSync('./changelog.md', 'utf8');
 
 
-var HomebrewModel = require('./server/homebrew.model.js').model;
-
 var sanitizeBrew = function(brew){
 	var cleanBrew = _.assign({}, brew);
 	delete cleanBrew.editId;
 	return cleanBrew;
 };
 
-//Load project version
-var projectVersion = require('./package.json').version;
 
-
-//Edit Page
-app.get('/edit/:id', function(req, res){
-	HomebrewModel.find({editId : req.params.id}, function(err, objs){
-		var resObj = null;
-		if(objs.length){
-			resObj = objs[0].toJSON();
+app.get('/edit/:id', (req, res, next)=>{
+	HomebrewModel.find({editId : req.params.id}, (err, brews)=>{
+		if(err || !brews.length){
+			return res.status(400).send(`Can't get that`);
 		}
-
-		vitreumRender({
-			page: './build/homebrew/bundle.dot',
-			globals:{},
-			prerenderWith : './client/homebrew/homebrew.jsx',
-			initialProps: {
-				url: req.originalUrl,
-				brew : resObj || {},
-				version : projectVersion
-			},
-			clearRequireCache : !process.env.PRODUCTION,
-		}, function (err, page) {
-			return res.send(page)
-		});
+		req.brew = brews[0].toJSON();
+		return next();
 	})
 });
 
 
 //Share Page
-app.get('/share/:id', function(req, res){
-	HomebrewModel.find({shareId : req.params.id}, function(err, objs){
-		var brew = {};
-
-		if(objs.length){
-			var resObj = objs[0];
-			resObj.lastViewed = new Date();
-			resObj.views = resObj.views + 1;
-			resObj.save();
-
-			brew = resObj.toJSON();
+app.get('/share/:id', (req, res, next)=>{
+	HomebrewModel.find({shareId : req.params.id}, (err, brews)=>{
+		if(err || !brews.length){
+			return res.status(400).send(`Can't get that`);
 		}
+		const brew = brews[0];
+		brew.lastViewed = new Date();
+		brew.views = brew.views + 1;
+		brew.save();
 
-		vitreumRender({
-			page: './build/homebrew/bundle.dot',
-			globals:{},
-			prerenderWith : './client/homebrew/homebrew.jsx',
-			initialProps: {
-				url: req.originalUrl,
-				brew : sanitizeBrew(brew || {}),
-				version : projectVersion
-			},
-			clearRequireCache : !process.env.PRODUCTION,
-		}, function (err, page) {
-			return res.send(page)
-		});
+		req.brew = sanitizeBrew(brew);
+		return next();
 	})
 });
 
@@ -152,9 +104,10 @@ app.get('/source/:id', function(req, res){
 	});
 });
 
+
+/*
 //Home and 404, etc.
-var welcomeText = require('fs').readFileSync('./client/homebrew/pages/homePage/welcome_msg.md', 'utf8');
-var changelogText = require('fs').readFileSync('./changelog.md', 'utf8');
+
 app.get('*', function (req, res) {
 	vitreumRender({
 		page: './build/homebrew/bundle.dot',
@@ -171,6 +124,30 @@ app.get('*', function (req, res) {
 		return res.send(page)
 	});
 });
+*/
+
+
+//Render Page
+app.use((req, res) => {
+	vitreumRender({
+		page: './build/homebrew/bundle.dot',
+		globals:{
+			version : require('./package.json').version
+		},
+		prerenderWith : './client/homebrew/homebrew.jsx',
+		initialProps: {
+			url: req.originalUrl,
+
+			welcomeText : welcomeText,
+			changelog : changelogText,
+			brew : req.brew
+		},
+		clearRequireCache : !process.env.PRODUCTION,
+	}, (err, page) => {
+		return res.send(page)
+	});
+});
+
 
 
 
diff --git a/server/admin.api.js b/server/admin.api.js
new file mode 100644
index 000000000..8739ce6d0
--- /dev/null
+++ b/server/admin.api.js
@@ -0,0 +1,72 @@
+const _ = require('lodash');
+const auth = require('basic-auth');
+const HomebrewModel = require('./homebrew.model.js').model;
+const router = require('express').Router();
+const vitreumRender = require('vitreum/render');
+
+
+const mw = {
+	adminOnly : (req, res, next)=>{
+		if(req.query && req.query.admin_key == process.env.ADMIN_KEY) return next();
+		return res.status(401).send('Access denied');
+	}
+};
+
+process.env.ADMIN_USER = process.env.ADMIN_USER || 'admin';
+process.env.ADMIN_PASS = process.env.ADMIN_PASS || 'password';
+process.env.ADMIN_KEY  = process.env.ADMIN_KEY  || 'admin_key';
+
+
+
+//Removes all empty brews that are older than 3 days and that are shorter than a tweet
+router.get('/api/invalid', mw.adminOnly, (req, res)=>{
+	const invalidBrewQuery = HomebrewModel.find({
+		'$where' : "this.text.length < 140",
+		createdAt: {
+			$lt: Moment().subtract(3, 'days').toDate()
+		}
+	});
+
+	if(req.query.do_it){
+		invalidBrewQuery.remove().exec((err, objs)=>{
+			refreshCount();
+			return res.send(200);
+		})
+	}else{
+		invalidBrewQuery.exec((err, objs)=>{
+			if(err) console.log(err);
+			return res.json({
+				count : objs.length
+			})
+		})
+	}
+});
+
+
+
+//Admin route
+
+
+router.get('/admin', function(req, res){
+	const credentials = auth(req)
+	if (!credentials || credentials.name !== process.env.ADMIN_USER || credentials.pass !== process.env.ADMIN_PASS) {
+		res.setHeader('WWW-Authenticate', 'Basic realm="example"')
+		return res.status(401).send('Access denied')
+	}
+	vitreumRender({
+		page: './build/admin/bundle.dot',
+		prerenderWith : './client/admin/admin.jsx',
+		clearRequireCache : !process.env.PRODUCTION,
+		initialProps: {
+			url: req.originalUrl,
+			admin_key : process.env.ADMIN_KEY,
+		},
+	}, function (err, page) {
+		return res.send(page)
+	});
+});
+
+
+
+
+module.exports = router;
\ No newline at end of file
diff --git a/server/homebrew.api.js b/server/homebrew.api.js
index 2e031b6c8..84cf06c66 100644
--- a/server/homebrew.api.js
+++ b/server/homebrew.api.js
@@ -1,36 +1,33 @@
-var _ = require('lodash');
-var Moment = require('moment');
-var HomebrewModel = require('./homebrew.model.js').model;
+const _ = require('lodash');
+const Moment = require('moment');
+const HomebrewModel = require('./homebrew.model.js').model;
+const router = require('express').Router();
 
-var homebrewTotal = 0;
-var refreshCount = function(){
-	HomebrewModel.count({}, function(err, total){
+
+
+//TODO: Possiblity remove
+let homebrewTotal = 0;
+const refreshCount = ()=>{
+	HomebrewModel.count({}, (err, total)=>{
 		homebrewTotal = total;
 	});
 };
-refreshCount()
-
-var mw = {
-	adminOnly : function(req, res, next){
-		if(req.query && req.query.admin_key == process.env.ADMIN_KEY){
-			next();
-		}else{
-			return res.status(401).send('Access denied');
-		}
-	}
-};
+refreshCount();
 
 
-var getTopBrews = function(cb){
+
+
+
+const getTopBrews = (cb)=>{
 	HomebrewModel.find().sort({views: -1}).limit(5).exec(function(err, brews) {
 		cb(brews);
 	});
 }
 
-var getGoodBrewTitle = (text) => {
-	var titlePos = text.indexOf('# ');
+const getGoodBrewTitle = (text) => {
+	const titlePos = text.indexOf('# ');
 	if(titlePos !== -1){
-		var ending = text.indexOf('\n', titlePos);
+		const ending = text.indexOf('\n', titlePos);
 		return text.substring(titlePos + 2, ending);
 	}else{
 		return _.find(text.split('\n'), (line)=>{
@@ -40,70 +37,58 @@ var getGoodBrewTitle = (text) => {
 };
 
 
-module.exports = function(app){
 
-	app.post('/api', function(req, res){
-		var newHomebrew = new HomebrewModel(req.body);
-		if(!newHomebrew.title){
-			newHomebrew.title = getGoodBrewTitle(newHomebrew.text);
+router.post('/api', (req, res)=>{
+	const newHomebrew = new HomebrewModel(req.body);
+	if(!newHomebrew.title){
+		newHomebrew.title = getGoodBrewTitle(newHomebrew.text);
+	}
+	newHomebrew.save((err, obj)=>{
+		if(err){
+			console.error(err, err.toString(), err.stack);
+			return res.status(500).send(`Error while creating new brew, ${err.toString()}`);
 		}
-		newHomebrew.save(function(err, obj){
-			if(err){
-				console.error(err, err.toString(), err.stack);
-				return res.status(500).send(`Error while creating new brew, ${err.toString()}`);
-			}
-			return res.json(obj);
+		return res.json(obj);
+	})
+});
+
+router.put('/api/update/:id', (req, res)=>{
+	HomebrewModel.find({editId : req.params.id}, (err, objs)=>{
+		if(!objs.length || err) return res.status(404).send("Can not find homebrew with that id");
+		var resEntry = objs[0];
+		resEntry.text = req.body.text;
+		resEntry.title = req.body.title;
+		resEntry.updatedAt = new Date();
+		resEntry.save((err, obj)=>{
+			if(err) return res.status(500).send("Error while saving");
+			return res.status(200).send(obj);
 		})
 	});
+});
 
-	app.put('/api/update/:id', function(req, res){
-		HomebrewModel.find({editId : req.params.id}, function(err, objs){
-			if(!objs.length || err) return res.status(404).send("Can not find homebrew with that id");
-			var resEntry = objs[0];
-			resEntry.text = req.body.text;
-			resEntry.title = req.body.title;
-			resEntry.updatedAt = new Date();
-			resEntry.save(function(err, obj){
-				if(err) return res.status(500).send("Error while saving");
-				return res.status(200).send(obj);
-			})
-		});
+router.get('/api/remove/:id', (req, res)=>{
+	HomebrewModel.find({editId : req.params.id}, (err, objs)=>{
+		if(!objs.length || err) return res.status(404).send("Can not find homebrew with that id");
+		var resEntry = objs[0];
+		resEntry.remove((err)=>{
+			if(err) return res.status(500).send("Error while removing");
+			return res.status(200).send();
+		})
 	});
+});
 
-	app.get('/api/remove/:id', function(req, res){
-		HomebrewModel.find({editId : req.params.id}, function(err, objs){
-			if(!objs.length || err) return res.status(404).send("Can not find homebrew with that id");
-			var resEntry = objs[0];
-			resEntry.remove(function(err){
-				if(err) return res.status(500).send("Error while removing");
-				return res.status(200).send();
-			})
-		});
-	});
 
-	//Removes all empty brews that are older than 3 days and that are shorter than a tweet
-	app.get('/api/invalid', mw.adminOnly, function(req, res){
-		var invalidBrewQuery = HomebrewModel.find({
-			'$where' : "this.text.length < 140",
-			createdAt: {
-				$lt: Moment().subtract(3, 'days').toDate()
-			}
-		});
+module.exports = router;
+
+/*
+
+
+
+module.exports = function(app){
+
+	app;
+
 
-		if(req.query.do_it){
-			invalidBrewQuery.remove().exec((err, objs)=>{
-				refreshCount();
-				return res.send(200);
-			})
-		}else{
-			invalidBrewQuery.exec((err, objs)=>{
-				if(err) console.log(err);
-				return res.json({
-					count : objs.length
-				})
-			})
-		}
-	});
 
 
 	app.get('/api/search', mw.adminOnly, function(req, res){
@@ -143,4 +128,5 @@ module.exports = function(app){
 
 
 	return app;
-}
\ No newline at end of file
+}
+*/
\ No newline at end of file

From d7463ec28e1fc5a2ff795ddb330133e7001f857b Mon Sep 17 00:00:00 2001
From: Scott Tolksdorf <scott.tolksdorf@gmail.com>
Date: Mon, 14 Nov 2016 20:15:29 -0500
Subject: [PATCH 02/17] Navbar now using global scope

---
 client/homebrew/navbar/navbar.jsx | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/client/homebrew/navbar/navbar.jsx b/client/homebrew/navbar/navbar.jsx
index 0aeac86c5..ae4604598 100644
--- a/client/homebrew/navbar/navbar.jsx
+++ b/client/homebrew/navbar/navbar.jsx
@@ -1,25 +1,21 @@
-var React = require('react');
-var _ = require('lodash');
+const React = require('react');
+const _ = require('lodash');
 
-var Nav = require('naturalcrit/nav/nav.jsx');
+const Nav = require('naturalcrit/nav/nav.jsx');
 
-var Navbar = React.createClass({
-	getDefaultProps: function() {
+const Navbar = React.createClass({
+	getInitialState: function() {
 		return {
+			showNonChromeWarning : false,
 			ver : '0.0.0'
 		};
 	},
 
-	getInitialState: function() {
-		return {
-			showNonChromeWarning : false
-		};
-	},
-
 	componentDidMount: function() {
-		var isChrome = /Chrome/.test(navigator.userAgent) && /Google Inc/.test(navigator.vendor);
+		const isChrome = /Chrome/.test(navigator.userAgent) && /Google Inc/.test(navigator.vendor);
 		this.setState({
-			showNonChromeWarning : !isChrome
+			showNonChromeWarning : !isChrome,
+			ver : window.version
 		})
 	},
 
@@ -40,7 +36,7 @@ var Navbar = React.createClass({
 				<Nav.item href='/' className='homebrewLogo'>
 					<div>The Homebrewery</div>
 				</Nav.item>
-				<Nav.item>{`v${this.props.ver}`}</Nav.item>
+				<Nav.item>{`v${this.state.ver}`}</Nav.item>
 
 				{this.renderChromeWarning()}
 			</Nav.section>

From 6672dff93811b28cfede3f533c98f843ad09d07c Mon Sep 17 00:00:00 2001
From: Scott Tolksdorf <scott.tolksdorf@gmail.com>
Date: Mon, 14 Nov 2016 21:31:01 -0500
Subject: [PATCH 03/17] Print page can now load from local storage

---
 client/homebrew/homebrew.jsx                  | 17 ++++---
 client/homebrew/homebrew.less                 |  3 +-
 client/homebrew/pages/newPage/newPage.jsx     | 12 +++++
 client/homebrew/pages/printPage/printPage.jsx | 50 +++++++++++++++++++
 .../homebrew/pages/printPage/printPage.less   |  3 ++
 server.js                                     | 50 +++++++------------
 server/homebrew.model.js                      |  2 +-
 7 files changed, 95 insertions(+), 42 deletions(-)
 create mode 100644 client/homebrew/pages/printPage/printPage.jsx
 create mode 100644 client/homebrew/pages/printPage/printPage.less

diff --git a/client/homebrew/homebrew.jsx b/client/homebrew/homebrew.jsx
index ae711cda9..05a31c65e 100644
--- a/client/homebrew/homebrew.jsx
+++ b/client/homebrew/homebrew.jsx
@@ -9,6 +9,7 @@ var EditPage = require('./pages/editPage/editPage.jsx');
 var SharePage = require('./pages/sharePage/sharePage.jsx');
 var NewPage = require('./pages/newPage/newPage.jsx');
 var ErrorPage = require('./pages/errorPage/errorPage.jsx');
+var PrintPage = require('./pages/printPage/printPage.jsx');
 
 var Router;
 var Homebrew = React.createClass({
@@ -32,35 +33,37 @@ var Homebrew = React.createClass({
 		Router = CreateRouter({
 			'/edit/:id' : (args) => {
 				if(!this.props.brew.editId){
-					return <ErrorPage ver={this.props.version} errorId={args.id}/>
+					return <ErrorPage errorId={args.id}/>
 				}
 
 				return <EditPage
-					ver={this.props.version}
 					id={args.id}
 					brew={this.props.brew} />
 			},
 
 			'/share/:id' : (args) => {
 				if(!this.props.brew.shareId){
-					return <ErrorPage ver={this.props.version} errorId={args.id}/>
+					return <ErrorPage errorId={args.id}/>
 				}
 
 				return <SharePage
-					ver={this.props.version}
 					id={args.id}
 					brew={this.props.brew} />
 			},
 			'/changelog' : (args) => {
 				return <SharePage
-					ver={this.props.version}
 					brew={{title : 'Changelog', text : this.props.changelog}} />
 			},
+			'/print/:id' : (args, query) => {
+				return <PrintPage brew={this.props.brew} query={query}/>;
+			},
+			'/print' : (args, query) => {
+				return <PrintPage query={query}/>;
+			},
 			'/new' : (args) => {
-				return <NewPage ver={this.props.version} />
+				return <NewPage />
 			},
 			'*' : <HomePage
-					ver={this.props.version}
 					welcomeText={this.props.welcomeText} />,
 		});
 	},
diff --git a/client/homebrew/homebrew.less b/client/homebrew/homebrew.less
index 00deebe5b..6b9423d55 100644
--- a/client/homebrew/homebrew.less
+++ b/client/homebrew/homebrew.less
@@ -2,11 +2,10 @@
 .homebrew{
 	height           : 100%;
 
-	//TODO: Consider making backgroudn color lighter
-	background-color : @steel;
 	.page{
 		display        : flex;
 		height         : 100%;
+		background-color : @steel;
 		flex-direction : column;
 		.content{
 			position : relative;
diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx
index 6e4763222..b2a9f634e 100644
--- a/client/homebrew/pages/newPage/newPage.jsx
+++ b/client/homebrew/pages/newPage/newPage.jsx
@@ -91,6 +91,17 @@ const NewPage = React.createClass({
 		}
 	},
 
+	handlePrintClick : function(){
+		localStorage.setItem('print', this.state.text);
+		window.open('/print?dialog=true&local=print','_blank');
+	},
+
+	renderLocalPrintButton : function(){
+		return <Nav.item color='purple' icon='fa-file-pdf-o' onClick={this.handlePrintClick}>
+			get PDF
+		</Nav.item>
+	},
+
 	renderNavbar : function(){
 		return <Navbar ver={this.props.ver}>
 			<Nav.section>
@@ -99,6 +110,7 @@ const NewPage = React.createClass({
 
 			<Nav.section>
 				{this.renderSaveButton()}
+				{this.renderLocalPrintButton()}
 				<IssueNavItem />
 			</Nav.section>
 		</Navbar>
diff --git a/client/homebrew/pages/printPage/printPage.jsx b/client/homebrew/pages/printPage/printPage.jsx
new file mode 100644
index 000000000..6aa292223
--- /dev/null
+++ b/client/homebrew/pages/printPage/printPage.jsx
@@ -0,0 +1,50 @@
+const React = require('react');
+const _     = require('lodash');
+const cx    = require('classnames');
+
+//const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
+
+var Markdown = require('naturalcrit/markdown.js');
+
+const PrintPage = React.createClass({
+	getDefaultProps: function() {
+		return {
+			query : {},
+			brew : {
+				text : '',
+			}
+		};
+	},
+
+	getInitialState: function() {
+		return {
+			brewText: this.props.brew.text
+		};
+	},
+
+	componentDidMount: function() {
+		if(this.props.query.local){
+			this.setState({ brewText : localStorage.getItem(this.props.query.local)});
+		}
+
+		if(this.props.query.dialog) window.print();
+	},
+
+	renderPages : function(){
+		return _.map(this.state.brewText.split('\\page'), (page, index) => {
+			return <div
+				className='phb'
+				id={`p${index + 1}`}
+				dangerouslySetInnerHTML={{__html:Markdown.render(page)}}
+				key={index} />;
+		});
+	},
+
+	render : function(){
+		return <div>
+			{this.renderPages()}
+		</div>
+	}
+});
+
+module.exports = PrintPage;
diff --git a/client/homebrew/pages/printPage/printPage.less b/client/homebrew/pages/printPage/printPage.less
new file mode 100644
index 000000000..0d9e7b68b
--- /dev/null
+++ b/client/homebrew/pages/printPage/printPage.less
@@ -0,0 +1,3 @@
+.printPage{
+
+}
\ No newline at end of file
diff --git a/server.js b/server.js
index d3adab5a0..514a83612 100644
--- a/server.js
+++ b/server.js
@@ -1,7 +1,6 @@
 require('app-module-path').addPath('./shared');
 
 const _ = require('lodash');
-
 const vitreumRender = require('vitreum/render');
 const bodyParser = require('body-parser')
 const express = require("express");
@@ -10,7 +9,6 @@ app.use(express.static(__dirname + '/build'));
 app.use(bodyParser.json({limit: '25mb'}));
 
 
-
 //Mongoose
 //TODO: Celean up
 const mongoose = require('mongoose');
@@ -59,11 +57,23 @@ app.get('/share/:id', (req, res, next)=>{
 		brew.views = brew.views + 1;
 		brew.save();
 
-		req.brew = sanitizeBrew(brew);
+		req.brew = sanitizeBrew(brew.toJSON());
 		return next();
 	})
 });
 
+//Share Page
+app.get('/print/:id', (req, res, next)=>{
+	HomebrewModel.find({shareId : req.params.id}, (err, brews)=>{
+		if(err || !brews.length){
+			return res.status(400).send(`Can't get that`);
+		}
+		req.brew = sanitizeBrew(brews[0].toJSON());
+		return next();
+	})
+});
+
+/*
 //Print Page
 var Markdown = require('naturalcrit/markdown.js');
 var PHBStyle = '<style>' + require('fs').readFileSync('./phb.standalone.css', 'utf8') + '</style>'
@@ -91,42 +101,19 @@ app.get('/print/:id', function(req, res){
 		return res.send(page)
 	});
 });
+*/
 
 //Source page
 String.prototype.replaceAll = function(s,r){return this.split(s).join(r)}
-app.get('/source/:id', function(req, res){
-	HomebrewModel.find({shareId : req.params.id}, function(err, objs){
-		if(err || !objs.length) return res.status(404).send('Could not find Homebrew with that id');
-		var brew = null;
-		if(objs.length) brew = objs[0];
-		var text = brew.text.replaceAll('<', '&lt;').replaceAll('>', '&gt;');
+app.get('/source/:id', (req, res)=>{
+	HomebrewModel.find({shareId : req.params.id}, (err, brews)=>{
+		if(err || !brews.length) return res.status(404).send('Could not find Homebrew with that id');
+		const text = brews[0].text.replaceAll('<', '&lt;').replaceAll('>', '&gt;');
 		return res.send(`<code><pre>${text}</pre></code>`);
 	});
 });
 
 
-/*
-//Home and 404, etc.
-
-app.get('*', function (req, res) {
-	vitreumRender({
-		page: './build/homebrew/bundle.dot',
-		globals:{},
-		prerenderWith : './client/homebrew/homebrew.jsx',
-		initialProps: {
-			url: req.originalUrl,
-			welcomeText : welcomeText,
-			changelog : changelogText,
-			version : projectVersion
-		},
-		clearRequireCache : !process.env.PRODUCTION,
-	}, function (err, page) {
-		return res.send(page)
-	});
-});
-*/
-
-
 //Render Page
 app.use((req, res) => {
 	vitreumRender({
@@ -137,7 +124,6 @@ app.use((req, res) => {
 		prerenderWith : './client/homebrew/homebrew.jsx',
 		initialProps: {
 			url: req.originalUrl,
-
 			welcomeText : welcomeText,
 			changelog : changelogText,
 			brew : req.brew
diff --git a/server/homebrew.model.js b/server/homebrew.model.js
index e7d89b9cb..7dcd58270 100644
--- a/server/homebrew.model.js
+++ b/server/homebrew.model.js
@@ -12,7 +12,7 @@ var HomebrewSchema = mongoose.Schema({
 	updatedAt   : { type: Date, default: Date.now},
 	lastViewed  : { type: Date, default: Date.now},
 	views : {type:Number, default:0}
-});
+}, { versionKey: false });
 
 
 

From 8b3f9ac76ae5c26f8b81913529351103c2b35780 Mon Sep 17 00:00:00 2001
From: Scott Tolksdorf <scott.tolksdorf@gmail.com>
Date: Mon, 14 Nov 2016 22:30:28 -0500
Subject: [PATCH 04/17] Cleaned up the server file and added methodfs and
 statics to the model

---
 client/homebrew/homebrew.jsx                  |  24 ++--
 client/homebrew/pages/printPage/printPage.jsx |   5 +-
 server.js                                     | 125 ++++++++----------
 server/homebrew.api.js                        |  22 +--
 server/homebrew.model.js                      |  35 +++++
 5 files changed, 113 insertions(+), 98 deletions(-)

diff --git a/client/homebrew/homebrew.jsx b/client/homebrew/homebrew.jsx
index 05a31c65e..6d45aac68 100644
--- a/client/homebrew/homebrew.jsx
+++ b/client/homebrew/homebrew.jsx
@@ -1,18 +1,18 @@
-var React = require('react');
-var _ = require('lodash');
-var cx = require('classnames');
+const React = require('react');
+const _ = require('lodash');
+const cx = require('classnames');
 
-var CreateRouter = require('pico-router').createRouter;
+const CreateRouter = require('pico-router').createRouter;
 
-var HomePage = require('./pages/homePage/homePage.jsx');
-var EditPage = require('./pages/editPage/editPage.jsx');
-var SharePage = require('./pages/sharePage/sharePage.jsx');
-var NewPage = require('./pages/newPage/newPage.jsx');
-var ErrorPage = require('./pages/errorPage/errorPage.jsx');
-var PrintPage = require('./pages/printPage/printPage.jsx');
+const HomePage = require('./pages/homePage/homePage.jsx');
+const EditPage = require('./pages/editPage/editPage.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');
 
-var Router;
-var Homebrew = React.createClass({
+let Router;
+const Homebrew = React.createClass({
 	getDefaultProps: function() {
 		return {
 			url : '',
diff --git a/client/homebrew/pages/printPage/printPage.jsx b/client/homebrew/pages/printPage/printPage.jsx
index 6aa292223..b6ecfd89d 100644
--- a/client/homebrew/pages/printPage/printPage.jsx
+++ b/client/homebrew/pages/printPage/printPage.jsx
@@ -1,10 +1,7 @@
 const React = require('react');
 const _     = require('lodash');
 const cx    = require('classnames');
-
-//const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
-
-var Markdown = require('naturalcrit/markdown.js');
+const Markdown = require('naturalcrit/markdown.js');
 
 const PrintPage = React.createClass({
 	getDefaultProps: function() {
diff --git a/server.js b/server.js
index 514a83612..fb11c0cd5 100644
--- a/server.js
+++ b/server.js
@@ -35,85 +35,66 @@ var sanitizeBrew = function(brew){
 };
 
 
-app.get('/edit/:id', (req, res, next)=>{
-	HomebrewModel.find({editId : req.params.id}, (err, brews)=>{
-		if(err || !brews.length){
-			return res.status(400).send(`Can't get that`);
-		}
-		req.brew = brews[0].toJSON();
-		return next();
-	})
-});
-
-
-//Share Page
-app.get('/share/:id', (req, res, next)=>{
-	HomebrewModel.find({shareId : req.params.id}, (err, brews)=>{
-		if(err || !brews.length){
-			return res.status(400).send(`Can't get that`);
-		}
-		const brew = brews[0];
-		brew.lastViewed = new Date();
-		brew.views = brew.views + 1;
-		brew.save();
-
-		req.brew = sanitizeBrew(brew.toJSON());
-		return next();
-	})
-});
-
-//Share Page
-app.get('/print/:id', (req, res, next)=>{
-	HomebrewModel.find({shareId : req.params.id}, (err, brews)=>{
-		if(err || !brews.length){
-			return res.status(400).send(`Can't get that`);
-		}
-		req.brew = sanitizeBrew(brews[0].toJSON());
-		return next();
-	})
-});
-
-/*
-//Print Page
-var Markdown = require('naturalcrit/markdown.js');
-var PHBStyle = '<style>' + require('fs').readFileSync('./phb.standalone.css', 'utf8') + '</style>'
-app.get('/print/:id', function(req, res){
-	HomebrewModel.find({shareId : req.params.id}, function(err, objs){
-		var brew = {};
-		if(objs.length){
-			brew = objs[0];
-		}
-
-		if(err || !objs.length){
-			brew.text = '# Oops \n We could not find a brew with that id. **Sorry!**';
-		}
-
-		var content = _.map(brew.text.split('\\page'), function(pageText, index){
-			return `<div class="phb print" id="p${index+1}">` + Markdown.render(pageText) + '</div>';
-		}).join('\n');
-
-		var dialog = '';
-		if(req.query && req.query.dialog) dialog = 'onload="window.print()"';
-
-		var title = '<title>' + brew.title + '</title>';
-		var page = `<html><head>${title} ${PHBStyle}</head><body ${dialog}>${content}</body></html>`
-
-		return res.send(page)
-	});
-});
-*/
 
 //Source page
 String.prototype.replaceAll = function(s,r){return this.split(s).join(r)}
 app.get('/source/:id', (req, res)=>{
-	HomebrewModel.find({shareId : req.params.id}, (err, brews)=>{
-		if(err || !brews.length) return res.status(404).send('Could not find Homebrew with that id');
-		const text = brews[0].text.replaceAll('<', '&lt;').replaceAll('>', '&gt;');
-		return res.send(`<code><pre>${text}</pre></code>`);
-	});
+	HomebrewModel.get({shareId : req.params.id})
+		.then((brew)=>{
+			const text = brew.text.replaceAll('<', '&lt;').replaceAll('>', '&gt;');
+			return res.send(`<code><pre>${text}</pre></code>`);
+		})
+		.catch((err)=>{
+			console.log(err);
+			return res.status(404).send('Could not find Homebrew with that id');
+		})
 });
 
 
+app.get('/edit/:id', (req, res, next)=>{
+	HomebrewModel.get({editId : req.params.id})
+		.then((brew)=>{
+			req.brew = brew.sanatize();
+			return next();
+		})
+		.catch((err)=>{
+			console.log(err);
+			return res.status(400).send(`Can't get that`);
+		});
+});
+
+//Share Page
+app.get('/share/:id', (req, res, next)=>{
+	HomebrewModel.get({shareId : req.params.id})
+		.then((brew)=>{
+			return brew.increaseView();
+		})
+		.then((brew)=>{
+			req.brew = brew.sanatize(true);
+			return next();
+		})
+		.catch((err)=>{
+			console.log(err);
+			return res.status(400).send(`Can't get that`);
+		});
+});
+
+//Print Page
+app.get('/print/:id', (req, res, next)=>{
+	HomebrewModel.get({shareId : req.params.id})
+		.then((brew)=>{
+			req.brew = brew.sanatize(true);
+			return next();
+		})
+		.catch((err)=>{
+			console.log(err);
+			return res.status(400).send(`Can't get that`);
+		});
+});
+
+
+
+
 //Render Page
 app.use((req, res) => {
 	vitreumRender({
diff --git a/server/homebrew.api.js b/server/homebrew.api.js
index 84cf06c66..9322327fe 100644
--- a/server/homebrew.api.js
+++ b/server/homebrew.api.js
@@ -53,17 +53,19 @@ router.post('/api', (req, res)=>{
 });
 
 router.put('/api/update/:id', (req, res)=>{
-	HomebrewModel.find({editId : req.params.id}, (err, objs)=>{
-		if(!objs.length || err) return res.status(404).send("Can not find homebrew with that id");
-		var resEntry = objs[0];
-		resEntry.text = req.body.text;
-		resEntry.title = req.body.title;
-		resEntry.updatedAt = new Date();
-		resEntry.save((err, obj)=>{
-			if(err) return res.status(500).send("Error while saving");
-			return res.status(200).send(obj);
+	HomebrewModel.get({editId : req.params.id})
+		.then((brew)=>{
+			brew = _.merge(brew, req.body);
+			brew.updatedAt = new Date();
+			brew.save((err, obj)=>{
+				if(err) throw err;
+				return res.status(200).send(obj);
+			})
 		})
-	});
+		.catch((err)=>{
+			console.log(err);
+			return res.status(500).send("Error while saving");
+		});
 });
 
 router.get('/api/remove/:id', (req, res)=>{
diff --git a/server/homebrew.model.js b/server/homebrew.model.js
index 7dcd58270..abb9bf14e 100644
--- a/server/homebrew.model.js
+++ b/server/homebrew.model.js
@@ -7,6 +7,7 @@ var HomebrewSchema = mongoose.Schema({
 	editId : {type : String, default: shortid.generate, index: { unique: true }},
 	title : {type : String, default : ""},
 	text : {type : String, default : ""},
+	authors : [String],
 
 	createdAt     : { type: Date, default: Date.now },
 	updatedAt   : { type: Date, default: Date.now},
@@ -16,6 +17,40 @@ var HomebrewSchema = mongoose.Schema({
 
 
 
+HomebrewSchema.methods.sanatize = function(full=false){
+	const brew = this.toJSON();
+	delete brew._id;
+	delete brew.__v;
+	if(full){
+		delete brew.editId;
+	}
+	return brew;
+};
+
+
+HomebrewSchema.methods.increaseView = function(){
+	return new Promise((resolve, reject) => {
+		this.lastViewed = new Date();
+		this.views = this.views + 1;
+		this.save((err) => {
+			if(err) return reject(err);
+			return resolve(this);
+		});
+	});
+};
+
+
+
+HomebrewSchema.statics.get = function(query){
+	return new Promise((resolve, reject) => {
+		Homebrew.find(query, (err, brews)=>{
+			if(err || !brews.length) return reject('Can not find brew');
+			return resolve(brews[0]);
+		});
+	});
+};
+
+
 var Homebrew = mongoose.model('Homebrew', HomebrewSchema);
 
 module.exports = {

From 2f2a1c51465aea283b812e75eaef5e28e4be701d Mon Sep 17 00:00:00 2001
From: Scott Tolksdorf <scott.tolksdorf@gmail.com>
Date: Mon, 14 Nov 2016 22:40:37 -0500
Subject: [PATCH 05/17] Control s and p now save and print on editor pages

---
 client/homebrew/pages/editPage/editPage.jsx | 16 +++++++++++---
 client/homebrew/pages/hijackPrint.js        |  2 ++
 client/homebrew/pages/newPage/newPage.jsx   | 23 +++++++++++++++++----
 3 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx
index de1278dba..27cacddf8 100644
--- a/client/homebrew/pages/editPage/editPage.jsx
+++ b/client/homebrew/pages/editPage/editPage.jsx
@@ -16,7 +16,6 @@ var SplitPane = require('naturalcrit/splitPane/splitPane.jsx');
 var Editor = require('../../editor/editor.jsx');
 var BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
 
-var HijackPrint = require('../hijackPrint.js');
 var Markdown = require('naturalcrit/markdown.js');
 
 
@@ -65,11 +64,22 @@ var EditPage = React.createClass({
 			htmlErrors : Markdown.validate(this.state.text)
 		})
 
-		document.onkeydown = HijackPrint(this.props.brew.shareId);
+		document.addEventListener('keydown', this.handleControlKeys);
 	},
 	componentWillUnmount: function() {
 		window.onbeforeunload = function(){};
-		document.onkeydown = function(){};
+		document.removeEventListener('keydown', this.handleControlKeys);
+	},
+
+
+	handleControlKeys : function(e){
+		if(!(e.ctrlKey || e.metaKey)) return;
+		e.stopPropagation();
+		e.preventDefault();
+		const S_KEY = 83;
+		const P_KEY = 80;
+		if(e.keyCode == S_KEY) this.save();
+		if(e.keyCode == P_KEY) window.open(`/print/${this.props.brew.shareId}?dialog=true`, '_blank').focus();
 	},
 
 	handleSplitMove : function(){
diff --git a/client/homebrew/pages/hijackPrint.js b/client/homebrew/pages/hijackPrint.js
index 144a1fc47..e19f5fb94 100644
--- a/client/homebrew/pages/hijackPrint.js
+++ b/client/homebrew/pages/hijackPrint.js
@@ -1,3 +1,5 @@
+//TODO: Depricate
+
 module.exports = function(shareId){
 	return function(event){
 		event = event || window.event;
diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx
index b2a9f634e..d8a2bd470 100644
--- a/client/homebrew/pages/newPage/newPage.jsx
+++ b/client/homebrew/pages/newPage/newPage.jsx
@@ -35,7 +35,22 @@ const NewPage = React.createClass({
 				text : storage
 			})
 		}
+		document.addEventListener('keydown', this.handleControlKeys);
 	},
+	componentWillUnmount: function() {
+		document.removeEventListener('keydown', this.handleControlKeys);
+	},
+
+	handleControlKeys : function(e){
+		if(!(e.ctrlKey || e.metaKey)) return;
+		e.stopPropagation();
+		e.preventDefault();
+		const S_KEY = 83;
+		const P_KEY = 80;
+		if(e.keyCode == S_KEY) this.save();
+		if(e.keyCode == P_KEY) this.print();
+	},
+
 	handleSplitMove : function(){
 		this.refs.editor.update();
 	},
@@ -54,7 +69,7 @@ const NewPage = React.createClass({
 		localStorage.setItem(KEY, text);
 	},
 
-	handleSave : function(){
+	save : function(){
 		this.setState({
 			isSaving : true
 		});
@@ -85,19 +100,19 @@ const NewPage = React.createClass({
 				save...
 			</Nav.item>
 		}else{
-			return <Nav.item icon='fa-save' className='saveButton' onClick={this.handleSave}>
+			return <Nav.item icon='fa-save' className='saveButton' onClick={this.save}>
 				save
 			</Nav.item>
 		}
 	},
 
-	handlePrintClick : function(){
+	print : function(){
 		localStorage.setItem('print', this.state.text);
 		window.open('/print?dialog=true&local=print','_blank');
 	},
 
 	renderLocalPrintButton : function(){
-		return <Nav.item color='purple' icon='fa-file-pdf-o' onClick={this.handlePrintClick}>
+		return <Nav.item color='purple' icon='fa-file-pdf-o' onClick={this.print}>
 			get PDF
 		</Nav.item>
 	},

From d400c37b6d6a6017f7f937498617190398bfeee1 Mon Sep 17 00:00:00 2001
From: Scott Tolksdorf <scott.tolksdorf@gmail.com>
Date: Mon, 14 Nov 2016 23:03:58 -0500
Subject: [PATCH 06/17] Updated style to navbar

---
 client/homebrew/editor/editor.less            | 31 ++++++++++++++++---
 client/homebrew/pages/newPage/newPage.jsx     |  3 --
 client/homebrew/pages/sharePage/sharePage.jsx | 30 +++++++++++-------
 3 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/client/homebrew/editor/editor.less b/client/homebrew/editor/editor.less
index 377c71607..611f44d76 100644
--- a/client/homebrew/editor/editor.less
+++ b/client/homebrew/editor/editor.less
@@ -3,11 +3,12 @@
 	position : relative;
 	width    : 100%;
 	.snippetBar{
-		display          : flex;
-		padding          : 5px;
+		@height          : 25px;
+		position         : relative;
+		height           : @height;
 		background-color : #ddd;
-		align-items      : center;
 		.snippetGroup{
+			/*
 			.animate(background-color);
 			margin        : 0px 8px;
 			padding       : 3px;
@@ -16,8 +17,26 @@
 			&:hover, &.selected{
 				background-color : #999;
 			}
+			*/
+			display        : inline-block;
+			height         : @height;
+			padding        : 0px 5px;
+			cursor         : pointer;
+			font-size      : 0.6em;
+			font-weight    : 800;
+			line-height    : @height;
+			text-transform : uppercase;
+			border-right   : 1px solid black;
+			i{
+				vertical-align : middle;
+				margin-right   : 3px;
+				font-size      : 1.2em;
+			}
+			&:hover, &.selected{
+				background-color : #999;
+			}
 			.text{
-				line-height : 20px;
+				line-height : @height;
 				.groupName{
 					margin-left : 6px;
 					font-size   : 10px;
@@ -31,8 +50,10 @@
 			.dropdown{
 				position         : absolute;
 				visibility       : hidden;
+				top : 100%;
 				z-index          : 1000;
-				padding          : 5px;
+				padding          : 0px;
+				margin-left: -5px;
 				background-color : #ddd;
 				.snippet{
 					.animate(background-color);
diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx
index d8a2bd470..14ab83b30 100644
--- a/client/homebrew/pages/newPage/newPage.jsx
+++ b/client/homebrew/pages/newPage/newPage.jsx
@@ -26,8 +26,6 @@ const NewPage = React.createClass({
 			errors : []
 		};
 	},
-
-
 	componentDidMount: function() {
 		const storage = localStorage.getItem(KEY);
 		if(storage){
@@ -80,7 +78,6 @@ const NewPage = React.createClass({
 				text : this.state.text
 			})
 			.end((err, res)=>{
-
 				if(err){
 					this.setState({
 						isSaving : false
diff --git a/client/homebrew/pages/sharePage/sharePage.jsx b/client/homebrew/pages/sharePage/sharePage.jsx
index ebe2f54d0..3add2b35c 100644
--- a/client/homebrew/pages/sharePage/sharePage.jsx
+++ b/client/homebrew/pages/sharePage/sharePage.jsx
@@ -1,17 +1,16 @@
-var React = require('react');
-var _ = require('lodash');
-var cx = require('classnames');
+const React = require('react');
+const _ = require('lodash');
+const cx = require('classnames');
 
-var Nav = require('naturalcrit/nav/nav.jsx');
-var Navbar = require('../../navbar/navbar.jsx');
-var PrintLink = require('../../navbar/print.navitem.jsx');
-var RecentlyViewed = require('../../navbar/recent.navitem.jsx').viewed;
+const Nav = require('naturalcrit/nav/nav.jsx');
+const Navbar = require('../../navbar/navbar.jsx');
+const PrintLink = require('../../navbar/print.navitem.jsx');
+const RecentlyViewed = require('../../navbar/recent.navitem.jsx').viewed;
 
-var BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
+const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
 
-var HijackPrint = require('../hijackPrint.js');
 
-var SharePage = React.createClass({
+const SharePage = React.createClass({
 	getDefaultProps: function() {
 		return {
 			ver : '0.0.0',
@@ -27,10 +26,17 @@ var SharePage = React.createClass({
 	},
 
 	componentDidMount: function() {
-		document.onkeydown = HijackPrint(this.props.brew.shareId);
+		document.addEventListener('keydown', this.handleControlKeys);
 	},
 	componentWillUnmount: function() {
-		document.onkeydown = function(){};
+		document.removeEventListener('keydown', this.handleControlKeys);
+	},
+	handleControlKeys : function(e){
+		if(!(e.ctrlKey || e.metaKey)) return;
+		e.stopPropagation();
+		e.preventDefault();
+		const P_KEY = 80;
+		if(e.keyCode == P_KEY) window.open(`/print/${this.props.brew.shareId}?dialog=true`, '_blank').focus();
 	},
 
 	render : function(){

From ccdb6a3cbdff173833ece3f3693194ebee674e6c Mon Sep 17 00:00:00 2001
From: Scott Tolksdorf <scott.tolksdorf@gmail.com>
Date: Mon, 14 Nov 2016 23:09:26 -0500
Subject: [PATCH 07/17] Removing refernces to ver from pages

---
 changelog.md                                  | 5 +++++
 client/homebrew/pages/editPage/editPage.jsx   | 3 +--
 client/homebrew/pages/newPage/newPage.jsx     | 2 +-
 client/homebrew/pages/sharePage/sharePage.jsx | 3 +--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/changelog.md b/changelog.md
index fd5400322..25e52f39f 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,10 @@
 # changelog
 
+### Monday, 14/11/2016
+- Updated snippet bar style
+- You can now print from a new page without saving
+- Added the ability to use ctrl+p and ctrl+s to print and save respectively.
+
 ### Monday, 07/11/2016
 - Added final touches to the html validator and updating the rest of the branch
 - If anyone finds issues with the new HTML validator, please let me know. I hope this will bring a more consistent feel to Homebrewery rendering.
diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx
index 27cacddf8..a321cd83a 100644
--- a/client/homebrew/pages/editPage/editPage.jsx
+++ b/client/homebrew/pages/editPage/editPage.jsx
@@ -26,7 +26,6 @@ const SAVE_TIMEOUT = 3000;
 var EditPage = React.createClass({
 	getDefaultProps: function() {
 		return {
-			ver : '0.0.0',
 			id : null,
 			brew : {
 				title : '',
@@ -193,7 +192,7 @@ var EditPage = React.createClass({
 		}
 	},
 	renderNavbar : function(){
-		return <Navbar ver={this.props.ver}>
+		return <Navbar>
 			<Nav.section>
 				<EditTitle title={this.state.title} onChange={this.handleTitleChange} />
 			</Nav.section>
diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx
index 14ab83b30..47e5f9562 100644
--- a/client/homebrew/pages/newPage/newPage.jsx
+++ b/client/homebrew/pages/newPage/newPage.jsx
@@ -115,7 +115,7 @@ const NewPage = React.createClass({
 	},
 
 	renderNavbar : function(){
-		return <Navbar ver={this.props.ver}>
+		return <Navbar>
 			<Nav.section>
 				<EditTitle title={this.state.title} onChange={this.handleTitleChange} />
 			</Nav.section>
diff --git a/client/homebrew/pages/sharePage/sharePage.jsx b/client/homebrew/pages/sharePage/sharePage.jsx
index 3add2b35c..e849de1b4 100644
--- a/client/homebrew/pages/sharePage/sharePage.jsx
+++ b/client/homebrew/pages/sharePage/sharePage.jsx
@@ -13,7 +13,6 @@ const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
 const SharePage = React.createClass({
 	getDefaultProps: function() {
 		return {
-			ver : '0.0.0',
 			brew : {
 				title : '',
 				text : '',
@@ -41,7 +40,7 @@ const SharePage = React.createClass({
 
 	render : function(){
 		return <div className='sharePage page'>
-			<Navbar ver={this.props.ver}>
+			<Navbar>
 				<Nav.section>
 					<Nav.item className='brewTitle'>{this.props.brew.title}</Nav.item>
 				</Nav.section>

From e61bf22788e7001e926369d1ff8c7c906373f525 Mon Sep 17 00:00:00 2001
From: Scott Tolksdorf <scott.tolksdorf@gmail.com>
Date: Wed, 23 Nov 2016 14:47:28 -0500
Subject: [PATCH 08/17] Added in metadata editor

---
 client/homebrew/editor/editor.jsx             | 105 ++++++-----------
 client/homebrew/editor/editor.less            |  72 +-----------
 .../editor/metadataEditor/metadataEditor.jsx  | 106 ++++++++++++++++++
 .../editor/metadataEditor/metadataEditor.less |  63 +++++++++++
 .../homebrew/editor/snippetbar/snippetbar.jsx |  91 +++++++++++++++
 .../editor/snippetbar/snippetbar.less         |  72 ++++++++++++
 .../snippets/classfeature.gen.js              |   0
 .../snippets/classtable.gen.js                |   0
 .../snippets/coverpage.gen.js                 |   0
 .../snippets/fullclass.gen.js                 |   0
 .../{ => snippetbar}/snippets/magic.gen.js    |   0
 .../snippets/monsterblock.gen.js              |   0
 .../{ => snippetbar}/snippets/snippets.js     |   0
 client/homebrew/homebrew.less                 |   3 +
 client/homebrew/pages/editPage/editPage.jsx   |  88 ++++++++-------
 client/homebrew/pages/editPage/editPage.less  |   2 +-
 client/homebrew/pages/newPage/newPage.jsx     |  29 +++--
 server/homebrew.model.js                      |   5 +
 shared/naturalcrit/styles/core.less           |  38 ++++++-
 19 files changed, 483 insertions(+), 191 deletions(-)
 create mode 100644 client/homebrew/editor/metadataEditor/metadataEditor.jsx
 create mode 100644 client/homebrew/editor/metadataEditor/metadataEditor.less
 create mode 100644 client/homebrew/editor/snippetbar/snippetbar.jsx
 create mode 100644 client/homebrew/editor/snippetbar/snippetbar.less
 rename client/homebrew/editor/{ => snippetbar}/snippets/classfeature.gen.js (100%)
 rename client/homebrew/editor/{ => snippetbar}/snippets/classtable.gen.js (100%)
 rename client/homebrew/editor/{ => snippetbar}/snippets/coverpage.gen.js (100%)
 rename client/homebrew/editor/{ => snippetbar}/snippets/fullclass.gen.js (100%)
 rename client/homebrew/editor/{ => snippetbar}/snippets/magic.gen.js (100%)
 rename client/homebrew/editor/{ => snippetbar}/snippets/monsterblock.gen.js (100%)
 rename client/homebrew/editor/{ => snippetbar}/snippets/snippets.js (100%)

diff --git a/client/homebrew/editor/editor.jsx b/client/homebrew/editor/editor.jsx
index d79ef4a98..6b15eaec1 100644
--- a/client/homebrew/editor/editor.jsx
+++ b/client/homebrew/editor/editor.jsx
@@ -1,25 +1,31 @@
-var React = require('react');
-var _ = require('lodash');
-var cx = require('classnames');
+const React = require('react');
+const _ = require('lodash');
+const cx = require('classnames');
 
-var CodeEditor = require('naturalcrit/codeEditor/codeEditor.jsx');
-var Snippets = require('./snippets/snippets.js');
+const CodeEditor = require('naturalcrit/codeEditor/codeEditor.jsx');
+const SnippetBar = require('./snippetbar/snippetbar.jsx');
+const MetadataEditor = require('./MetadataEditor/MetadataEditor.jsx');
 
 
-var splice = function(str, index, inject){
+const splice = function(str, index, inject){
 	return str.slice(0, index) + inject + str.slice(index);
 };
-var execute = function(val){
-	if(_.isFunction(val)) return val();
-	return val;
-}
 
+const SNIPPETBAR_HEIGHT = 25;
 
-var Editor = React.createClass({
+const Editor = React.createClass({
 	getDefaultProps: function() {
 		return {
-			value : "",
-			onChange : function(){}
+			value : '',
+			onChange : ()=>{},
+
+			metadata : {},
+			onMetadataChange : ()=>{}
+		};
+	},
+	getInitialState: function() {
+		return {
+			showMetadataEditor: false
 		};
 	},
 	cursorPosition : {
@@ -27,7 +33,6 @@ var Editor = React.createClass({
 		ch : 0
 	},
 
-
 	componentDidMount: function() {
 		this.updateEditorSize();
 		window.addEventListener("resize", this.updateEditorSize);
@@ -37,8 +42,8 @@ var Editor = React.createClass({
 	},
 
 	updateEditorSize : function() {
-		var paneHeight = this.refs.main.parentNode.clientHeight;
-		paneHeight -= this.refs.snippetBar.clientHeight + 1;
+		let paneHeight = this.refs.main.parentNode.clientHeight;
+		paneHeight -= SNIPPETBAR_HEIGHT + 1;
 		this.refs.codeEditor.codeMirror.setSize(null, paneHeight);
 	},
 
@@ -48,38 +53,37 @@ var Editor = React.createClass({
 	handleCursorActivty : function(curpos){
 		this.cursorPosition = curpos;
 	},
-
-	handleSnippetClick : function(injectText){
-		var lines = this.props.value.split('\n');
+	handleInject : function(injectText){
+		const lines = this.props.value.split('\n');
 		lines[this.cursorPosition.line] = splice(lines[this.cursorPosition.line], this.cursorPosition.ch, injectText);
 
 		this.handleTextChange(lines.join('\n'));
 		this.refs.codeEditor.setCursorPosition(this.cursorPosition.line, this.cursorPosition.ch  + injectText.length);
 	},
+	handgleToggle : function(){
+		this.setState({
+			showMetadataEditor : !this.state.showMetadataEditor
+		})
+	},
 
 	//Called when there are changes to the editor's dimensions
 	update : function(){
 		this.refs.codeEditor.updateSize();
 	},
 
-	renderSnippetGroups : function(){
-		return _.map(Snippets, (snippetGroup)=>{
-			return <SnippetGroup
-				groupName={snippetGroup.groupName}
-				icon={snippetGroup.icon}
-				snippets={snippetGroup.snippets}
-				key={snippetGroup.groupName}
-				onSnippetClick={this.handleSnippetClick}
-			/>
-		})
+	renderMetadataEditor : function(){
+		if(!this.state.showMetadataEditor) return;
+		return <MetadataEditor
+			metadata={this.props.metadata}
+			onChange={this.props.onMetadataChange}
+		/>
 	},
 
 	render : function(){
 		return(
 			<div className='editor' ref='main'>
-				<div className='snippetBar' ref='snippetBar'>
-					{this.renderSnippetGroups()}
-				</div>
+				<SnippetBar onInject={this.handleInject} onToggle={this.handgleToggle} showmeta={this.state.showMetadataEditor} />
+				{this.renderMetadataEditor()}
 				<CodeEditor
 					ref='codeEditor'
 					wrap={true}
@@ -99,40 +103,3 @@ module.exports = Editor;
 
 
 
-
-
-
-var SnippetGroup = React.createClass({
-	getDefaultProps: function() {
-		return {
-			groupName : '',
-			icon : 'fa-rocket',
-			snippets : [],
-			onSnippetClick : function(){},
-		};
-	},
-	handleSnippetClick : function(snippet){
-		this.props.onSnippetClick(execute(snippet.gen));
-	},
-	renderSnippets : function(){
-		return _.map(this.props.snippets, (snippet)=>{
-			return <div className='snippet' key={snippet.name} onClick={this.handleSnippetClick.bind(this, snippet)}>
-				<i className={'fa fa-fw ' + snippet.icon} />
-				{snippet.name}
-			</div>
-		})
-	},
-
-	render : function(){
-		return <div className='snippetGroup'>
-			<div className='text'>
-				<i className={'fa fa-fw ' + this.props.icon} />
-				<span className='groupName'>{this.props.groupName}</span>
-			</div>
-			<div className='dropdown'>
-				{this.renderSnippets()}
-			</div>
-		</div>
-	},
-
-});
\ No newline at end of file
diff --git a/client/homebrew/editor/editor.less b/client/homebrew/editor/editor.less
index 611f44d76..8678fd189 100644
--- a/client/homebrew/editor/editor.less
+++ b/client/homebrew/editor/editor.less
@@ -2,76 +2,10 @@
 .editor{
 	position : relative;
 	width    : 100%;
-	.snippetBar{
-		@height          : 25px;
-		position         : relative;
-		height           : @height;
-		background-color : #ddd;
-		.snippetGroup{
-			/*
-			.animate(background-color);
-			margin        : 0px 8px;
-			padding       : 3px;
-			font-size     : 13px;
-			border-radius : 5px;
-			&:hover, &.selected{
-				background-color : #999;
-			}
-			*/
-			display        : inline-block;
-			height         : @height;
-			padding        : 0px 5px;
-			cursor         : pointer;
-			font-size      : 0.6em;
-			font-weight    : 800;
-			line-height    : @height;
-			text-transform : uppercase;
-			border-right   : 1px solid black;
-			i{
-				vertical-align : middle;
-				margin-right   : 3px;
-				font-size      : 1.2em;
-			}
-			&:hover, &.selected{
-				background-color : #999;
-			}
-			.text{
-				line-height : @height;
-				.groupName{
-					margin-left : 6px;
-					font-size   : 10px;
-				}
-			}
-			&:hover{
-				.dropdown{
-					visibility : visible;
-				}
-			}
-			.dropdown{
-				position         : absolute;
-				visibility       : hidden;
-				top : 100%;
-				z-index          : 1000;
-				padding          : 0px;
-				margin-left: -5px;
-				background-color : #ddd;
-				.snippet{
-					.animate(background-color);
-					padding   : 10px;
-					cursor    : pointer;
-					font-size : 10px;
-					i{
-						margin-right: 8px;
-						font-size : 13px;
-					}
-					&:hover{
-						background-color : #999;
-					}
-				}
-			}
-		}
-	}
+
 	.codeEditor{
 		height : 100%;
 	}
+
+
 }
\ No newline at end of file
diff --git a/client/homebrew/editor/metadataEditor/metadataEditor.jsx b/client/homebrew/editor/metadataEditor/metadataEditor.jsx
new file mode 100644
index 000000000..4fd395f6b
--- /dev/null
+++ b/client/homebrew/editor/metadataEditor/metadataEditor.jsx
@@ -0,0 +1,106 @@
+const React = require('react');
+const _     = require('lodash');
+const cx    = require('classnames');
+
+const SYSTEMS = ['5e', '4e', '3.5e', 'Pathfinder']
+
+const MetadataEditor = React.createClass({
+	getDefaultProps: function() {
+		return {
+			metadata: {
+				title : '',
+				description : '',
+				tags : '',
+				published : false,
+				authors : [],
+				systems : []
+			},
+			onChange : ()=>{}
+		};
+	},
+
+	handleFieldChange : function(name, e){
+		this.props.onChange(_.merge({}, this.props.metadata, {
+			[name] : e.target.value
+		}))
+	},
+	handleSystem : function(system, e){
+		if(e.target.checked){
+			this.props.metadata.systems.push(system);
+		}else{
+			this.props.metadata.systems = _.without(this.props.metadata.systems, system);
+		}
+		this.props.onChange(this.props.metadata);
+	},
+	handlePublish : function(val){
+		this.props.onChange(_.merge({}, this.props.metadata, {
+			published : val
+		}));
+	},
+
+	renderSystems : function(){
+		return _.map(SYSTEMS, (val)=>{
+			return <label key={val}>
+				<input
+					type='checkbox'
+					checked={_.includes(this.props.metadata.systems, val)}
+					onChange={this.handleSystem.bind(null, val)} />
+				{val}
+			</label>
+		});
+	},
+
+	renderPublish : function(){
+		if(this.props.metadata.published){
+			return <button className='unpublish' onClick={this.handlePublish.bind(null, false)}>
+				<i className='fa fa-ban' /> unpublish
+			</button>
+		}else{
+			return <button className='publish' onClick={this.handlePublish.bind(null, true)}>
+				<i className='fa fa-globe' /> publish
+			</button>
+		}
+	},
+
+	render : function(){
+		return <div className='metadataEditor'>
+
+			<div className='field title'>
+				<label>title</label>
+				<input type='text' className='value'
+					value={this.props.metadata.title}
+					onChange={this.handleFieldChange.bind(null, 'title')} />
+			</div>
+			<div className='field description'>
+				<label>description</label>
+				<textarea value={this.props.metadata.description} className='value'
+					onChange={this.handleFieldChange.bind(null, 'description')} />
+			</div>
+			{/*}
+			<div className='field tags'>
+				<label>tags</label>
+				<textarea value={this.props.metadata.tags}
+					onChange={this.handleFieldChange.bind(null, 'tags')} />
+			</div>
+			*/}
+
+			<div className='field systems'>
+				<label>systems</label>
+				<div className='value'>
+					{this.renderSystems()}
+				</div>
+			</div>
+
+			<div className='field publish'>
+				<label>publish</label>
+				<div className='value'>
+					{this.renderPublish()}
+					<small>Published homebrews will be publicly searchable (eventually...)</small>
+				</div>
+			</div>
+
+		</div>
+	}
+});
+
+module.exports = MetadataEditor;
diff --git a/client/homebrew/editor/metadataEditor/metadataEditor.less b/client/homebrew/editor/metadataEditor/metadataEditor.less
new file mode 100644
index 000000000..57728d564
--- /dev/null
+++ b/client/homebrew/editor/metadataEditor/metadataEditor.less
@@ -0,0 +1,63 @@
+
+.metadataEditor{
+	position         : absolute;
+	z-index          : 10000;
+	box-sizing       : border-box;
+	width            : 100%;
+	padding          : 25px;
+	background-color : #999;
+	.field{
+		display       : flex;
+		width         : 100%;
+		margin-bottom : 10px;
+		&>label{
+			display        : inline-block;
+			vertical-align : top;
+			width          : 80px;
+			font-size      : 0.7em;
+			font-weight    : 800;
+			line-height    : 1.8em;
+			text-transform : uppercase;
+			flex-grow      : 0;
+		}
+		&>.value{
+			flex-grow : 1;
+		}
+	}
+	.description.field textarea.value{
+		resize      : none;
+		height      : 5em;
+		font-family : 'Open Sans', sans-serif;
+		font-size   : 0.8em;
+	}
+	.systems.field .value{
+		label{
+			vertical-align : middle;
+			margin-right   : 15px;
+			cursor         : pointer;
+			font-size      : 0.7em;
+			font-weight    : 800;
+			user-select    : none;
+		}
+		input{
+			vertical-align : middle;
+			cursor         : pointer;
+		}
+	}
+	.publish.field .value{
+		position : relative;
+		button.publish{
+			.button(@blueLight);
+		}
+		button.unpublish{
+			.button(@silver);
+		}
+		small{
+			position   : absolute;
+			bottom     : -15px;
+			left       : 0px;
+			font-size  : 0.6em;
+			font-style : italic;
+		}
+	}
+}
\ No newline at end of file
diff --git a/client/homebrew/editor/snippetbar/snippetbar.jsx b/client/homebrew/editor/snippetbar/snippetbar.jsx
new file mode 100644
index 000000000..2f93fbe1b
--- /dev/null
+++ b/client/homebrew/editor/snippetbar/snippetbar.jsx
@@ -0,0 +1,91 @@
+const React = require('react');
+const _     = require('lodash');
+const cx    = require('classnames');
+
+
+const Snippets = require('./snippets/snippets.js');
+
+const execute = function(val){
+	if(_.isFunction(val)) return val();
+	return val;
+}
+
+
+
+const Snippetbar = React.createClass({
+	getDefaultProps: function() {
+		return {
+			onInject : ()=>{},
+			onToggle : ()=>{},
+			showmeta : false
+		};
+	},
+
+	handleSnippetClick : function(injectedText){
+		this.props.onInject(injectedText)
+	},
+
+	renderSnippetGroups : function(){
+		return _.map(Snippets, (snippetGroup)=>{
+			return <SnippetGroup
+				groupName={snippetGroup.groupName}
+				icon={snippetGroup.icon}
+				snippets={snippetGroup.snippets}
+				key={snippetGroup.groupName}
+				onSnippetClick={this.handleSnippetClick}
+			/>
+		})
+	},
+
+	render : function(){
+		return <div className='snippetBar'>
+			{this.renderSnippetGroups()}
+			<div className={cx('toggleMeta', {selected: this.props.showmeta})}
+				onClick={this.props.onToggle}>
+				<i className='fa fa-database' />
+			</div>
+		</div>
+	}
+});
+
+module.exports = Snippetbar;
+
+
+
+
+
+
+const SnippetGroup = React.createClass({
+	getDefaultProps: function() {
+		return {
+			groupName : '',
+			icon : 'fa-rocket',
+			snippets : [],
+			onSnippetClick : function(){},
+		};
+	},
+	handleSnippetClick : function(snippet){
+		this.props.onSnippetClick(execute(snippet.gen));
+	},
+	renderSnippets : function(){
+		return _.map(this.props.snippets, (snippet)=>{
+			return <div className='snippet' key={snippet.name} onClick={this.handleSnippetClick.bind(this, snippet)}>
+				<i className={'fa fa-fw ' + snippet.icon} />
+				{snippet.name}
+			</div>
+		})
+	},
+
+	render : function(){
+		return <div className='snippetGroup'>
+			<div className='text'>
+				<i className={'fa fa-fw ' + this.props.icon} />
+				<span className='groupName'>{this.props.groupName}</span>
+			</div>
+			<div className='dropdown'>
+				{this.renderSnippets()}
+			</div>
+		</div>
+	},
+
+});
\ No newline at end of file
diff --git a/client/homebrew/editor/snippetbar/snippetbar.less b/client/homebrew/editor/snippetbar/snippetbar.less
new file mode 100644
index 000000000..a939fa5d6
--- /dev/null
+++ b/client/homebrew/editor/snippetbar/snippetbar.less
@@ -0,0 +1,72 @@
+
+.snippetBar{
+	@height          : 25px;
+	position         : relative;
+	height           : @height;
+	background-color : #ddd;
+	.toggleMeta{
+		position    : absolute;
+		top         : 0px;
+		right       : 0px;
+		height      : @height;
+		width       : @height;
+		cursor      : pointer;
+		line-height : @height;
+		text-align  : center;
+		&:hover, &.selected{
+			background-color : #999;
+		}
+	}
+	.snippetGroup{
+		display        : inline-block;
+		height         : @height;
+		padding        : 0px 5px;
+		cursor         : pointer;
+		font-size      : 0.6em;
+		font-weight    : 800;
+		line-height    : @height;
+		text-transform : uppercase;
+		border-right   : 1px solid black;
+		i{
+			vertical-align : middle;
+			margin-right   : 3px;
+			font-size      : 1.2em;
+		}
+		&:hover, &.selected{
+			background-color : #999;
+		}
+		.text{
+			line-height : @height;
+			.groupName{
+				font-size : 10px;
+			}
+		}
+		&:hover{
+			.dropdown{
+				visibility : visible;
+			}
+		}
+		.dropdown{
+			position         : absolute;
+			top              : 100%;
+			visibility       : hidden;
+			z-index          : 1000;
+			margin-left      : -5px;
+			padding          : 0px;
+			background-color : #ddd;
+			.snippet{
+				.animate(background-color);
+				padding   : 10px;
+				cursor    : pointer;
+				font-size : 10px;
+				i{
+					margin-right : 8px;
+					font-size    : 13px;
+				}
+				&:hover{
+					background-color : #999;
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/client/homebrew/editor/snippets/classfeature.gen.js b/client/homebrew/editor/snippetbar/snippets/classfeature.gen.js
similarity index 100%
rename from client/homebrew/editor/snippets/classfeature.gen.js
rename to client/homebrew/editor/snippetbar/snippets/classfeature.gen.js
diff --git a/client/homebrew/editor/snippets/classtable.gen.js b/client/homebrew/editor/snippetbar/snippets/classtable.gen.js
similarity index 100%
rename from client/homebrew/editor/snippets/classtable.gen.js
rename to client/homebrew/editor/snippetbar/snippets/classtable.gen.js
diff --git a/client/homebrew/editor/snippets/coverpage.gen.js b/client/homebrew/editor/snippetbar/snippets/coverpage.gen.js
similarity index 100%
rename from client/homebrew/editor/snippets/coverpage.gen.js
rename to client/homebrew/editor/snippetbar/snippets/coverpage.gen.js
diff --git a/client/homebrew/editor/snippets/fullclass.gen.js b/client/homebrew/editor/snippetbar/snippets/fullclass.gen.js
similarity index 100%
rename from client/homebrew/editor/snippets/fullclass.gen.js
rename to client/homebrew/editor/snippetbar/snippets/fullclass.gen.js
diff --git a/client/homebrew/editor/snippets/magic.gen.js b/client/homebrew/editor/snippetbar/snippets/magic.gen.js
similarity index 100%
rename from client/homebrew/editor/snippets/magic.gen.js
rename to client/homebrew/editor/snippetbar/snippets/magic.gen.js
diff --git a/client/homebrew/editor/snippets/monsterblock.gen.js b/client/homebrew/editor/snippetbar/snippets/monsterblock.gen.js
similarity index 100%
rename from client/homebrew/editor/snippets/monsterblock.gen.js
rename to client/homebrew/editor/snippetbar/snippets/monsterblock.gen.js
diff --git a/client/homebrew/editor/snippets/snippets.js b/client/homebrew/editor/snippetbar/snippets/snippets.js
similarity index 100%
rename from client/homebrew/editor/snippets/snippets.js
rename to client/homebrew/editor/snippetbar/snippets/snippets.js
diff --git a/client/homebrew/homebrew.less b/client/homebrew/homebrew.less
index 6b9423d55..b5995e329 100644
--- a/client/homebrew/homebrew.less
+++ b/client/homebrew/homebrew.less
@@ -13,4 +13,7 @@
 			flex     : auto;
 		}
 	}
+
+
+
 }
\ No newline at end of file
diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx
index a321cd83a..790ee08a9 100644
--- a/client/homebrew/pages/editPage/editPage.jsx
+++ b/client/homebrew/pages/editPage/editPage.jsx
@@ -1,47 +1,52 @@
-var React = require('react');
-var _ = require('lodash');
-var cx = require('classnames');
-var request = require("superagent");
+const React = require('react');
+const _ = require('lodash');
+const cx = require('classnames');
+const request = require("superagent");
 
-var Nav = require('naturalcrit/nav/nav.jsx');
-var Navbar = require('../../navbar/navbar.jsx');
+const Nav = require('naturalcrit/nav/nav.jsx');
+const Navbar = require('../../navbar/navbar.jsx');
 
-var EditTitle = require('../../navbar/editTitle.navitem.jsx');
-var ReportIssue = require('../../navbar/issue.navitem.jsx');
-var PrintLink = require('../../navbar/print.navitem.jsx');
-var RecentlyEdited = require('../../navbar/recent.navitem.jsx').edited;
+const ReportIssue = require('../../navbar/issue.navitem.jsx');
+const PrintLink = require('../../navbar/print.navitem.jsx');
+const RecentlyEdited = require('../../navbar/recent.navitem.jsx').edited;
 
 
-var SplitPane = require('naturalcrit/splitPane/splitPane.jsx');
-var Editor = require('../../editor/editor.jsx');
-var BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
+const SplitPane = require('naturalcrit/splitPane/splitPane.jsx');
+const Editor = require('../../editor/editor.jsx');
+const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
 
-var Markdown = require('naturalcrit/markdown.js');
+const Markdown = require('naturalcrit/markdown.js');
 
 
 const SAVE_TIMEOUT = 3000;
 
 
 
-var EditPage = React.createClass({
+const EditPage = React.createClass({
 	getDefaultProps: function() {
 		return {
-			id : null,
 			brew : {
-				title : '',
 				text : '',
 				shareId : null,
 				editId : null,
 				createdAt : null,
 				updatedAt : null,
+
+				title : '',
+				description : '',
+				tags : '',
+				published : false,
+				authors : [],
+				systems : []
 			}
 		};
 	},
 
 	getInitialState: function() {
 		return {
-			title : this.props.brew.title,
-			text: this.props.brew.text,
+			brew : this.props.brew,
+
+
 			isSaving : false,
 			isPending : false,
 			errors : null,
@@ -60,7 +65,7 @@ var EditPage = React.createClass({
 		};
 
 		this.setState({
-			htmlErrors : Markdown.validate(this.state.text)
+			htmlErrors : Markdown.validate(this.state.brew.text)
 		})
 
 		document.addEventListener('keydown', this.handleControlKeys);
@@ -85,13 +90,15 @@ var EditPage = React.createClass({
 		this.refs.editor.update();
 	},
 
-	handleTitleChange : function(title){
+	handleMetadataChange : function(metadata){
 		this.setState({
-			title : title,
-			isPending : true
+			brew : _.merge({}, this.state.brew, metadata),
+			isPending : true,
+		}, ()=>{
+			console.log(this.hasChanges());
+			(this.hasChanges() ? this.debounceSave() : this.debounceSave.cancel());
 		});
 
-		(this.hasChanges() ? this.debounceSave() : this.debounceSave.cancel());
 	},
 
 	handleTextChange : function(text){
@@ -101,7 +108,7 @@ var EditPage = React.createClass({
 		if(htmlErrors.length) htmlErrors = Markdown.validate(text);
 
 		this.setState({
-			text : text,
+			brew : _.merge({}, this.state.brew, {text : text}),
 			isPending : true,
 			htmlErrors : htmlErrors
 		});
@@ -122,11 +129,9 @@ var EditPage = React.createClass({
 
 	hasChanges : function(){
 		if(this.savedBrew){
-			if(this.state.text !== this.savedBrew.text) return true;
-			if(this.state.title !== this.savedBrew.title) return true;
+			return !_.isEqual(this.state.brew, this.savedBrew)
 		}else{
-			if(this.state.text !== this.props.brew.text) return true;
-			if(this.state.title !== this.props.brew.title) return true;
+			return !_.isEqual(this.state.brew, this.props.brew)
 		}
 		return false;
 	},
@@ -136,15 +141,12 @@ var EditPage = React.createClass({
 		this.setState({
 			isSaving : true,
 			errors : null,
-			htmlErrors : Markdown.validate(this.state.text)
+			htmlErrors : Markdown.validate(this.state.brew.text)
 		});
 
 		request
 			.put('/api/update/' + this.props.brew.editId)
-			.send({
-				text : this.state.text,
-				title : this.state.title
-			})
+			.send(this.state.brew)
 			.end((err, res) => {
 				if(err){
 					this.setState({
@@ -184,17 +186,17 @@ var EditPage = React.createClass({
 		if(this.state.isSaving){
 			return <Nav.item className='save' icon="fa-spinner fa-spin">saving...</Nav.item>
 		}
-		if(!this.state.isPending && !this.state.isSaving){
-			return <Nav.item className='save saved'>saved.</Nav.item>
-		}
 		if(this.state.isPending && this.hasChanges()){
 			return <Nav.item className='save' onClick={this.save} color='blue' icon='fa-save'>Save Now</Nav.item>
 		}
+		if(!this.state.isPending && !this.state.isSaving){
+			return <Nav.item className='save saved'>saved.</Nav.item>
+		}
 	},
 	renderNavbar : function(){
 		return <Navbar>
 			<Nav.section>
-				<EditTitle title={this.state.title} onChange={this.handleTitleChange} />
+				<Nav.item className='brewTitle'>{this.state.brew.title}</Nav.item>
 			</Nav.section>
 			<Nav.section>
 				{this.renderSaveButton()}
@@ -216,8 +218,14 @@ var EditPage = React.createClass({
 
 			<div className='content'>
 				<SplitPane onDragFinish={this.handleSplitMove} ref='pane'>
-					<Editor value={this.state.text} onChange={this.handleTextChange} ref='editor'/>
-					<BrewRenderer text={this.state.text} errors={this.state.htmlErrors} />
+					<Editor
+						ref='editor'
+						value={this.state.brew.text}
+						onChange={this.handleTextChange}
+						metadata={this.state.brew}
+						onMetadataChange={this.handleMetadataChange}
+					/>
+					<BrewRenderer text={this.state.brew.text} errors={this.state.htmlErrors} />
 				</SplitPane>
 			</div>
 		</div>
diff --git a/client/homebrew/pages/editPage/editPage.less b/client/homebrew/pages/editPage/editPage.less
index 775013c07..85890df44 100644
--- a/client/homebrew/pages/editPage/editPage.less
+++ b/client/homebrew/pages/editPage/editPage.less
@@ -1,7 +1,7 @@
 
 .editPage{
 	.navItem.save{
-		width      : 75px;
+		width      : 105px;
 		text-align : center;
 		&.saved{
 			cursor : initial;
diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx
index 47e5f9562..d107b5d01 100644
--- a/client/homebrew/pages/newPage/newPage.jsx
+++ b/client/homebrew/pages/newPage/newPage.jsx
@@ -20,7 +20,15 @@ const KEY = 'homebrewery-new';
 const NewPage = React.createClass({
 	getInitialState: function() {
 		return {
-			title : '',
+			metadata : {
+				title : '',
+				description : '',
+				tags : '',
+				published : false,
+				authors : [],
+				systems : []
+			},
+
 			text: '',
 			isSaving : false,
 			errors : []
@@ -53,9 +61,9 @@ const NewPage = React.createClass({
 		this.refs.editor.update();
 	},
 
-	handleTitleChange : function(title){
+	handleMetadataChange : function(metadata){
 		this.setState({
-			title : title
+			metadata : _.merge({}, this.state.metadata, metadata)
 		});
 	},
 
@@ -73,10 +81,9 @@ const NewPage = React.createClass({
 		});
 
 		request.post('/api')
-			.send({
-				title : this.state.title,
+			.send(_.merge({}, this.state.metadata, {
 				text : this.state.text
-			})
+			}))
 			.end((err, res)=>{
 				if(err){
 					this.setState({
@@ -117,7 +124,7 @@ const NewPage = React.createClass({
 	renderNavbar : function(){
 		return <Navbar>
 			<Nav.section>
-				<EditTitle title={this.state.title} onChange={this.handleTitleChange} />
+				<Nav.item className='brewTitle'>{this.state.metadata.title}</Nav.item>
 			</Nav.section>
 
 			<Nav.section>
@@ -133,7 +140,13 @@ const NewPage = React.createClass({
 			{this.renderNavbar()}
 			<div className='content'>
 				<SplitPane onDragFinish={this.handleSplitMove} ref='pane'>
-					<Editor value={this.state.text} onChange={this.handleTextChange} ref='editor'/>
+					<Editor
+						ref='editor'
+						value={this.state.text}
+						onChange={this.handleTextChange}
+						metadata={this.state.metadata}
+						onMetadataChange={this.handleMetadataChange}
+					/>
 					<BrewRenderer text={this.state.text} errors={this.state.errors} />
 				</SplitPane>
 			</div>
diff --git a/server/homebrew.model.js b/server/homebrew.model.js
index abb9bf14e..8b9ec79a0 100644
--- a/server/homebrew.model.js
+++ b/server/homebrew.model.js
@@ -7,7 +7,12 @@ var HomebrewSchema = mongoose.Schema({
 	editId : {type : String, default: shortid.generate, index: { unique: true }},
 	title : {type : String, default : ""},
 	text : {type : String, default : ""},
+
+	description : {type : String, default : ""},
+	tags : {type : String, default : ""},
+	systems : [String],
 	authors : [String],
+	published : {type : Boolean, default : false},
 
 	createdAt     : { type: Date, default: Date.now },
 	updatedAt   : { type: Date, default: Date.now},
diff --git a/shared/naturalcrit/styles/core.less b/shared/naturalcrit/styles/core.less
index 7b131f23a..1f21dc679 100644
--- a/shared/naturalcrit/styles/core.less
+++ b/shared/naturalcrit/styles/core.less
@@ -1,9 +1,9 @@
+
 @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';
-
 @font-face {
 	font-family : CodeLight;
 	src         : url('/assets/naturalcrit/styles/CODE Light.otf');
@@ -13,8 +13,38 @@
 	src         : url('/assets/naturalcrit/styles/CODE Bold.otf');
 }
 html,body, #reactContainer{
-	min-height: 100vh;
-	height: 100vh;
-	margin: 0;
+	height      : 100vh;
+	min-height  : 100vh;
+	margin      : 0;
+	font-family : 'Open Sans', sans-serif;
+}
+*{
+	box-sizing : border-box;
+}
+button{
+	.button();
+}
+.button(@backgroundColor : @green){
+	.animate(background-color);
+	display          : inline-block;
+	padding          : 0.6em 1.2em;
+	cursor           : pointer;
+	background-color : @backgroundColor;
 	font-family      : 'Open Sans', sans-serif;
+	font-size        : 0.8em;
+	font-weight      : 800;
+	color            : white;
+	text-decoration  : none;
+	text-transform   : uppercase;
+	border           : none;
+	outline          : none;
+	&:hover{
+		background-color : darken(@backgroundColor, 5%);
+	}
+	&:active{
+		background-color : darken(@backgroundColor, 10%);
+	}
+	&:disabled{
+		background-color : @silver !important;
+	}
 }
\ No newline at end of file

From 97cf2d2ce7ca03bc9976d20f322c449e3f177777 Mon Sep 17 00:00:00 2001
From: Scott Tolksdorf <scott.tolksdorf@gmail.com>
Date: Wed, 23 Nov 2016 14:48:54 -0500
Subject: [PATCH 09/17] Updating changelog and version

---
 changelog.md | 5 +++++
 package.json | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index 25e52f39f..6cd893dee 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,10 @@
 # changelog
 
+### Wednesday, 23/11/2016 - v2.5.0
+- Metadata can now be added to brews
+- Added a metadata editor onto the edit and new pages
+
+
 ### Monday, 14/11/2016
 - Updated snippet bar style
 - You can now print from a new page without saving
diff --git a/package.json b/package.json
index 5640c79ca..ed466d41c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebrewery",
   "description": "Create authentic looking D&D homebrews using only markdown",
-  "version": "2.4.1",
+  "version": "2.5.0",
   "scripts": {
     "build": "node_modules/.bin/gulp prod",
     "watch": "node_modules/.bin/gulp",

From f4f96253c20a5e37d4ee70bc4e2b9b2154885e60 Mon Sep 17 00:00:00 2001
From: Scott Tolksdorf <scott.tolksdorf@gmail.com>
Date: Wed, 23 Nov 2016 15:01:46 -0500
Subject: [PATCH 10/17] Moved deleting a brew into the emtadata editor

---
 changelog.md                                  |  1 +
 .../editor/metadataEditor/metadataEditor.jsx  | 31 +++++++++++++++++++
 .../editor/metadataEditor/metadataEditor.less |  7 +++++
 client/homebrew/pages/editPage/editPage.jsx   | 20 +++---------
 4 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/changelog.md b/changelog.md
index 6cd893dee..801f647f7 100644
--- a/changelog.md
+++ b/changelog.md
@@ -3,6 +3,7 @@
 ### Wednesday, 23/11/2016 - v2.5.0
 - Metadata can now be added to brews
 - Added a metadata editor onto the edit and new pages
+- Moved deleting a brew into the metadata editor
 
 
 ### Monday, 14/11/2016
diff --git a/client/homebrew/editor/metadataEditor/metadataEditor.jsx b/client/homebrew/editor/metadataEditor/metadataEditor.jsx
index 4fd395f6b..15a9554b1 100644
--- a/client/homebrew/editor/metadataEditor/metadataEditor.jsx
+++ b/client/homebrew/editor/metadataEditor/metadataEditor.jsx
@@ -1,6 +1,7 @@
 const React = require('react');
 const _     = require('lodash');
 const cx    = require('classnames');
+const request = require("superagent");
 
 const SYSTEMS = ['5e', '4e', '3.5e', 'Pathfinder']
 
@@ -8,6 +9,7 @@ const MetadataEditor = React.createClass({
 	getDefaultProps: function() {
 		return {
 			metadata: {
+				editId : null,
 				title : '',
 				description : '',
 				tags : '',
@@ -38,6 +40,17 @@ const MetadataEditor = React.createClass({
 		}));
 	},
 
+	handleDelete : function(){
+		if(!confirm("are you sure you want to delete this brew?")) return;
+		if(!confirm("are you REALLY sure? You will not be able to recover it")) return;
+
+		request.get('/api/remove/' + this.props.metadata.editId)
+			.send()
+			.end(function(err, res){
+				window.location.href = '/';
+			});
+	},
+
 	renderSystems : function(){
 		return _.map(SYSTEMS, (val)=>{
 			return <label key={val}>
@@ -62,7 +75,23 @@ const MetadataEditor = React.createClass({
 		}
 	},
 
+	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='fa fa-trash' /> delete brew
+				</button>
+			</div>
+		</div>
+	},
+
 	render : function(){
+		console.log(this.props.metadata);
+
+
 		return <div className='metadataEditor'>
 
 			<div className='field title'>
@@ -99,6 +128,8 @@ const MetadataEditor = React.createClass({
 				</div>
 			</div>
 
+			{this.renderDelete()}
+
 		</div>
 	}
 });
diff --git a/client/homebrew/editor/metadataEditor/metadataEditor.less b/client/homebrew/editor/metadataEditor/metadataEditor.less
index 57728d564..5768c9a74 100644
--- a/client/homebrew/editor/metadataEditor/metadataEditor.less
+++ b/client/homebrew/editor/metadataEditor/metadataEditor.less
@@ -46,6 +46,7 @@
 	}
 	.publish.field .value{
 		position : relative;
+		margin-bottom: 15px;
 		button.publish{
 			.button(@blueLight);
 		}
@@ -60,4 +61,10 @@
 			font-style : italic;
 		}
 	}
+
+	.delete.field .value{
+		button{
+			.button(@red);
+		}
+	}
 }
\ No newline at end of file
diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx
index 790ee08a9..e5e041c53 100644
--- a/client/homebrew/pages/editPage/editPage.jsx
+++ b/client/homebrew/pages/editPage/editPage.jsx
@@ -78,12 +78,14 @@ const EditPage = React.createClass({
 
 	handleControlKeys : function(e){
 		if(!(e.ctrlKey || e.metaKey)) return;
-		e.stopPropagation();
-		e.preventDefault();
 		const S_KEY = 83;
 		const P_KEY = 80;
 		if(e.keyCode == S_KEY) this.save();
 		if(e.keyCode == P_KEY) window.open(`/print/${this.props.brew.shareId}?dialog=true`, '_blank').focus();
+		if(e.keyCode == P_KEY || e.keyCode == S_KEY){
+			e.stopPropagation();
+			e.preventDefault();
+		}
 	},
 
 	handleSplitMove : function(){
@@ -116,17 +118,6 @@ const EditPage = React.createClass({
 		(this.hasChanges() ? this.debounceSave() : this.debounceSave.cancel());
 	},
 
-	handleDelete : function(){
-		if(!confirm("are you sure you want to delete this brew?")) return;
-		if(!confirm("are you REALLY sure? You will not be able to recover it")) return;
-
-		request.get('/api/remove/' + this.props.brew.editId)
-			.send()
-			.end(function(err, res){
-				window.location.href = '/';
-			});
-	},
-
 	hasChanges : function(){
 		if(this.savedBrew){
 			return !_.isEqual(this.state.brew, this.savedBrew)
@@ -205,9 +196,6 @@ const EditPage = React.createClass({
 					Share
 				</Nav.item>
 				<PrintLink shareId={this.props.brew.shareId} />
-				<Nav.item color='red' icon='fa-trash' onClick={this.handleDelete}>
-					Delete
-				</Nav.item>
 			</Nav.section>
 		</Navbar>
 	},

From 1db24d07bd2b51df8dd497b4edc20f2496891158 Mon Sep 17 00:00:00 2001
From: Scott Tolksdorf <scott.tolksdorf@gmail.com>
Date: Wed, 23 Nov 2016 23:00:28 -0500
Subject: [PATCH 11/17] Adding in the needed libs

---
 config/default.json |  5 +++++
 package.json        |  5 ++++-
 server.js           | 30 +++++++++++++++++++++---------
 3 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 config/default.json

diff --git a/config/default.json b/config/default.json
new file mode 100644
index 000000000..1dc3dcb86
--- /dev/null
+++ b/config/default.json
@@ -0,0 +1,5 @@
+{
+	"host" : "homebrewery.local.naturalcrit.com:8000",
+	"naturalcrit_url" : "local.naturalcrit.com:8010",
+	"secret" : "secret"
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index ed466d41c..0e66d4b8b 100644
--- a/package.json
+++ b/package.json
@@ -16,14 +16,17 @@
     "basic-auth": "^1.0.3",
     "body-parser": "^1.14.2",
     "classnames": "^2.2.0",
+    "cookie-parser": "^1.4.3",
     "express": "^4.13.3",
     "gulp": "^3.9.0",
     "gulp-less": "^3.1.0",
     "gulp-rename": "^1.2.2",
+    "jwt-simple": "^0.5.1",
     "lodash": "^4.11.2",
     "marked": "^0.3.5",
     "moment": "^2.11.0",
     "mongoose": "^4.3.3",
+    "nconf": "^0.8.4",
     "pico-flux": "^1.1.0",
     "pico-router": "^1.1.0",
     "react": "^15.0.2",
@@ -33,4 +36,4 @@
     "superagent": "^1.6.1",
     "vitreum": "^3.2.1"
   }
-}
\ No newline at end of file
+}
diff --git a/server.js b/server.js
index fb11c0cd5..0b447dd28 100644
--- a/server.js
+++ b/server.js
@@ -1,24 +1,36 @@
 require('app-module-path').addPath('./shared');
 
 const _ = require('lodash');
+const jwt = require('jwt-simple');
 const vitreumRender = require('vitreum/render');
-const bodyParser = require('body-parser')
 const express = require("express");
 const app = express();
 app.use(express.static(__dirname + '/build'));
-app.use(bodyParser.json({limit: '25mb'}));
+app.use(require('body-parser').json({limit: '25mb'}));
+app.use(require('cookie-parser')());
+
+const config = require('nconf')
+	.argv()
+	.env({ lowerCase: true })
+	.file('environment', { file: `config/${process.env.NODE_ENV}.json` })
+	.file('defaults', { file: 'config/default.json' });
+
+//DB
+require('mongoose')
+	.connect(process.env.MONGODB_URI || process.env.MONGOLAB_URI || 'mongodb://localhost/naturalcrit')
+	.connection.on('error', () => { console.log(">>>ERROR: Run Mongodb.exe ya goof!") });
 
 
-//Mongoose
-//TODO: Celean up
-const mongoose = require('mongoose');
-const mongoUri = process.env.MONGODB_URI || process.env.MONGOLAB_URI || 'mongodb://localhost/naturalcrit';
-require('mongoose').connect(mongoUri);
-mongoose.connection.on('error', function(){
-	console.log(">>>ERROR: Run Mongodb.exe ya goof!");
+//Account MIddleware
+router.use((req, res, next) => {
+	if(req.cookies && req.cookies.nc_session){
+		req.user = jwt.decode(req.cookies.nc_session, config.get('secret'));
+	}
+	return next();
 });
 
 
+
 app.use(require('./server/homebrew.api.js'));
 app.use(require('./server/admin.api.js'));
 

From 750f5c1330faabb16d041bd6b6a6c30065cbd492 Mon Sep 17 00:00:00 2001
From: Scott Tolksdorf <scott.tolksdorf@gmail.com>
Date: Wed, 23 Nov 2016 23:41:39 -0500
Subject: [PATCH 12/17] Added in middleware for retriving brews by a user

---
 .../editor/metadataEditor/metadataEditor.jsx  | 19 ++++++++---
 .../editor/metadataEditor/metadataEditor.less |  4 +++
 server.js                                     | 33 ++++++++++++-------
 server/homebrew.api.js                        |  8 +++--
 server/homebrew.model.js                      | 16 +++++++++
 5 files changed, 62 insertions(+), 18 deletions(-)

diff --git a/client/homebrew/editor/metadataEditor/metadataEditor.jsx b/client/homebrew/editor/metadataEditor/metadataEditor.jsx
index 15a9554b1..1a9fd4222 100644
--- a/client/homebrew/editor/metadataEditor/metadataEditor.jsx
+++ b/client/homebrew/editor/metadataEditor/metadataEditor.jsx
@@ -88,12 +88,21 @@ const MetadataEditor = React.createClass({
 		</div>
 	},
 
+	renderAuthors : function(){
+		let text = 'None.';
+		if(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>
+	},
+
 	render : function(){
-		console.log(this.props.metadata);
-
-
 		return <div className='metadataEditor'>
-
 			<div className='field title'>
 				<label>title</label>
 				<input type='text' className='value'
@@ -120,6 +129,8 @@ const MetadataEditor = React.createClass({
 				</div>
 			</div>
 
+			{this.renderAuthors()}
+
 			<div className='field publish'>
 				<label>publish</label>
 				<div className='value'>
diff --git a/client/homebrew/editor/metadataEditor/metadataEditor.less b/client/homebrew/editor/metadataEditor/metadataEditor.less
index 5768c9a74..89683e0e0 100644
--- a/client/homebrew/editor/metadataEditor/metadataEditor.less
+++ b/client/homebrew/editor/metadataEditor/metadataEditor.less
@@ -67,4 +67,8 @@
 			.button(@red);
 		}
 	}
+	.authors.field .value{
+		font-size: 0.8em;
+		line-height    : 1.5em;
+	}
 }
\ No newline at end of file
diff --git a/server.js b/server.js
index 0b447dd28..f34df0476 100644
--- a/server.js
+++ b/server.js
@@ -22,15 +22,16 @@ require('mongoose')
 
 
 //Account MIddleware
-router.use((req, res, next) => {
+app.use((req, res, next) => {
 	if(req.cookies && req.cookies.nc_session){
-		req.user = jwt.decode(req.cookies.nc_session, config.get('secret'));
+		try{
+			req.account = jwt.decode(req.cookies.nc_session, config.get('secret'));
+		}catch(e){}
 	}
 	return next();
 });
 
 
-
 app.use(require('./server/homebrew.api.js'));
 app.use(require('./server/admin.api.js'));
 
@@ -40,13 +41,6 @@ const welcomeText = require('fs').readFileSync('./client/homebrew/pages/homePage
 const changelogText = require('fs').readFileSync('./changelog.md', 'utf8');
 
 
-var sanitizeBrew = function(brew){
-	var cleanBrew = _.assign({}, brew);
-	delete cleanBrew.editId;
-	return cleanBrew;
-};
-
-
 
 //Source page
 String.prototype.replaceAll = function(s,r){return this.split(s).join(r)}
@@ -63,6 +57,20 @@ app.get('/source/:id', (req, res)=>{
 });
 
 
+app.get('/user/:username', (req, res, next) => {
+	const fullAccess = req.account && (req.account.username == req.params.username);
+	HomebrewModel.getByUser(req.params.username, fullAccess)
+		.then((brews) => {
+			req.brews = brews;
+			return next();
+			//return res.json(brews)
+		})
+		.catch((err) => {
+			console.log(err);
+		})
+})
+
+
 app.get('/edit/:id', (req, res, next)=>{
 	HomebrewModel.get({editId : req.params.id})
 		.then((brew)=>{
@@ -109,6 +117,8 @@ app.get('/print/:id', (req, res, next)=>{
 
 //Render Page
 app.use((req, res) => {
+
+	console.log('user', req.account);
 	vitreumRender({
 		page: './build/homebrew/bundle.dot',
 		globals:{
@@ -119,7 +129,8 @@ app.use((req, res) => {
 			url: req.originalUrl,
 			welcomeText : welcomeText,
 			changelog : changelogText,
-			brew : req.brew
+			brew : req.brew,
+			brews : req.brews
 		},
 		clearRequireCache : !process.env.PRODUCTION,
 	}, (err, page) => {
diff --git a/server/homebrew.api.js b/server/homebrew.api.js
index 9322327fe..934cb2297 100644
--- a/server/homebrew.api.js
+++ b/server/homebrew.api.js
@@ -16,8 +16,6 @@ refreshCount();
 
 
 
-
-
 const getTopBrews = (cb)=>{
 	HomebrewModel.find().sort({views: -1}).limit(5).exec(function(err, brews) {
 		cb(brews);
@@ -39,7 +37,10 @@ const getGoodBrewTitle = (text) => {
 
 
 router.post('/api', (req, res)=>{
-	const newHomebrew = new HomebrewModel(req.body);
+	const newHomebrew = new HomebrewModel(_.merge({},
+		req.body,
+		{authors : [req.account.username]}
+	));
 	if(!newHomebrew.title){
 		newHomebrew.title = getGoodBrewTitle(newHomebrew.text);
 	}
@@ -57,6 +58,7 @@ router.put('/api/update/:id', (req, res)=>{
 		.then((brew)=>{
 			brew = _.merge(brew, req.body);
 			brew.updatedAt = new Date();
+			brew.authors = _.uniq(_.concat(brew.authors, req.account.username));
 			brew.save((err, obj)=>{
 				if(err) throw err;
 				return res.status(200).send(obj);
diff --git a/server/homebrew.model.js b/server/homebrew.model.js
index 8b9ec79a0..b730738a8 100644
--- a/server/homebrew.model.js
+++ b/server/homebrew.model.js
@@ -55,6 +55,22 @@ HomebrewSchema.statics.get = function(query){
 	});
 };
 
+HomebrewSchema.statics.getByUser = function(username, allowAccess=false){
+	return new Promise((resolve, reject) => {
+		let query = {authors : username, published : true};
+		if(allowAccess){
+			delete query.published;
+		}
+		Homebrew.find(query, (err, brews)=>{
+			if(err) return reject('Can not find brew');
+			return resolve(_.map(brews, (brew)=>{
+				return brew.sanatize(!allowAccess);
+			}));
+		});
+	});
+};
+
+
 
 var Homebrew = mongoose.model('Homebrew', HomebrewSchema);
 

From 9e14872f060b9415a8e0f4afd163e26b10b85cc5 Mon Sep 17 00:00:00 2001
From: Scott Tolksdorf <scott.tolksdorf@gmail.com>
Date: Wed, 23 Nov 2016 23:59:57 -0500
Subject: [PATCH 13/17] Stubbed out a userpage

---
 .../editor/metadataEditor/metadataEditor.jsx  |  2 +-
 client/homebrew/homebrew.jsx                  | 13 +++++--
 client/homebrew/pages/newPage/newPage.jsx     |  6 ++--
 client/homebrew/pages/userPage/userPage.jsx   | 35 +++++++++++++++++++
 client/homebrew/pages/userPage/userPage.less  |  5 +++
 server.js                                     |  2 --
 6 files changed, 55 insertions(+), 8 deletions(-)
 create mode 100644 client/homebrew/pages/userPage/userPage.jsx
 create mode 100644 client/homebrew/pages/userPage/userPage.less

diff --git a/client/homebrew/editor/metadataEditor/metadataEditor.jsx b/client/homebrew/editor/metadataEditor/metadataEditor.jsx
index 1a9fd4222..baf74f40d 100644
--- a/client/homebrew/editor/metadataEditor/metadataEditor.jsx
+++ b/client/homebrew/editor/metadataEditor/metadataEditor.jsx
@@ -135,7 +135,7 @@ const MetadataEditor = React.createClass({
 				<label>publish</label>
 				<div className='value'>
 					{this.renderPublish()}
-					<small>Published homebrews will be publicly searchable (eventually...)</small>
+					<small>Published homebrews will be publicly viewable and searchable (eventually...)</small>
 				</div>
 			</div>
 
diff --git a/client/homebrew/homebrew.jsx b/client/homebrew/homebrew.jsx
index 6d45aac68..895346f85 100644
--- a/client/homebrew/homebrew.jsx
+++ b/client/homebrew/homebrew.jsx
@@ -6,6 +6,7 @@ const CreateRouter = require('pico-router').createRouter;
 
 const HomePage = require('./pages/homePage/homePage.jsx');
 const EditPage = require('./pages/editPage/editPage.jsx');
+const UserPage = require('./pages/userPage/userPage.jsx');
 const SharePage = require('./pages/sharePage/sharePage.jsx');
 const NewPage = require('./pages/newPage/newPage.jsx');
 const ErrorPage = require('./pages/errorPage/errorPage.jsx');
@@ -50,9 +51,11 @@ const Homebrew = React.createClass({
 					id={args.id}
 					brew={this.props.brew} />
 			},
-			'/changelog' : (args) => {
-				return <SharePage
-					brew={{title : 'Changelog', text : this.props.changelog}} />
+			'/user/:username' : (args) => {
+				return <UserPage
+					username={args.username}
+					brews={this.props.brews}
+				/>
 			},
 			'/print/:id' : (args, query) => {
 				return <PrintPage brew={this.props.brew} query={query}/>;
@@ -63,6 +66,10 @@ const Homebrew = React.createClass({
 			'/new' : (args) => {
 				return <NewPage />
 			},
+			'/changelog' : (args) => {
+				return <SharePage
+					brew={{title : 'Changelog', text : this.props.changelog}} />
+			},
 			'*' : <HomePage
 					welcomeText={this.props.welcomeText} />,
 		});
diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx
index d107b5d01..edd0a0b6b 100644
--- a/client/homebrew/pages/newPage/newPage.jsx
+++ b/client/homebrew/pages/newPage/newPage.jsx
@@ -49,12 +49,14 @@ const NewPage = React.createClass({
 
 	handleControlKeys : function(e){
 		if(!(e.ctrlKey || e.metaKey)) return;
-		e.stopPropagation();
-		e.preventDefault();
 		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(){
diff --git a/client/homebrew/pages/userPage/userPage.jsx b/client/homebrew/pages/userPage/userPage.jsx
new file mode 100644
index 000000000..9f39ee376
--- /dev/null
+++ b/client/homebrew/pages/userPage/userPage.jsx
@@ -0,0 +1,35 @@
+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 UserPage = React.createClass({
+	getDefaultProps: function() {
+		return {
+			username : '',
+			brews : []
+		};
+	},
+
+	render : function(){
+		console.log(this.props.brews);
+
+		return <div className='userPage page'>
+			<Navbar>
+				<Nav.section>
+					holla
+				</Nav.section>
+			</Navbar>
+
+			<div className='content'>
+				<div className='phb'>
+					<h1>{this.props.username}</h1>
+				</div>
+			</div>
+		</div>
+	}
+});
+
+module.exports = UserPage;
diff --git a/client/homebrew/pages/userPage/userPage.less b/client/homebrew/pages/userPage/userPage.less
new file mode 100644
index 000000000..52d691e7c
--- /dev/null
+++ b/client/homebrew/pages/userPage/userPage.less
@@ -0,0 +1,5 @@
+.userPage{
+	.content .phb{
+		margin: 20px auto;
+	}
+}
\ No newline at end of file
diff --git a/server.js b/server.js
index f34df0476..1430e2187 100644
--- a/server.js
+++ b/server.js
@@ -117,8 +117,6 @@ app.get('/print/:id', (req, res, next)=>{
 
 //Render Page
 app.use((req, res) => {
-
-	console.log('user', req.account);
 	vitreumRender({
 		page: './build/homebrew/bundle.dot',
 		globals:{

From 6af9dd9325d2484b696db881f7952bb469acdd1d Mon Sep 17 00:00:00 2001
From: Scott Tolksdorf <scott.tolksdorf@gmail.com>
Date: Thu, 24 Nov 2016 00:07:04 -0500
Subject: [PATCH 14/17] Added in a brew item component

---
 client/homebrew/editor/editor.jsx             |  2 +-
 client/homebrew/pages/homePage/homePage.less  |  4 ++++
 .../pages/userPage/brewItem/brewItem.jsx      | 21 +++++++++++++++++++
 .../pages/userPage/brewItem/brewItem.less     |  3 +++
 client/homebrew/pages/userPage/userPage.jsx   |  9 ++++++++
 server.js                                     |  2 --
 6 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 client/homebrew/pages/userPage/brewItem/brewItem.jsx
 create mode 100644 client/homebrew/pages/userPage/brewItem/brewItem.less

diff --git a/client/homebrew/editor/editor.jsx b/client/homebrew/editor/editor.jsx
index 6b15eaec1..e02f2451b 100644
--- a/client/homebrew/editor/editor.jsx
+++ b/client/homebrew/editor/editor.jsx
@@ -20,7 +20,7 @@ const Editor = React.createClass({
 			onChange : ()=>{},
 
 			metadata : {},
-			onMetadataChange : ()=>{}
+			onMetadataChange : ()=>{},
 		};
 	},
 	getInitialState: function() {
diff --git a/client/homebrew/pages/homePage/homePage.less b/client/homebrew/pages/homePage/homePage.less
index 37b412282..056521d61 100644
--- a/client/homebrew/pages/homePage/homePage.less
+++ b/client/homebrew/pages/homePage/homePage.less
@@ -40,4 +40,8 @@
 			right : 350px;
 		}
 	}
+
+	.toggleMeta{
+		display: none;
+	}
 }
\ No newline at end of file
diff --git a/client/homebrew/pages/userPage/brewItem/brewItem.jsx b/client/homebrew/pages/userPage/brewItem/brewItem.jsx
new file mode 100644
index 000000000..94158cb57
--- /dev/null
+++ b/client/homebrew/pages/userPage/brewItem/brewItem.jsx
@@ -0,0 +1,21 @@
+const React = require('react');
+const _     = require('lodash');
+const cx    = require('classnames');
+
+const BrewItem = React.createClass({
+	getDefaultProps: function() {
+		return {
+			brew : {
+
+			}
+		};
+	},
+
+	render : function(){
+		return <div className='brewItem'>
+			BrewItem Component Ready.
+		</div>
+	}
+});
+
+module.exports = BrewItem;
diff --git a/client/homebrew/pages/userPage/brewItem/brewItem.less b/client/homebrew/pages/userPage/brewItem/brewItem.less
new file mode 100644
index 000000000..6cfd7b408
--- /dev/null
+++ b/client/homebrew/pages/userPage/brewItem/brewItem.less
@@ -0,0 +1,3 @@
+.brewItem{
+
+}
\ No newline at end of file
diff --git a/client/homebrew/pages/userPage/userPage.jsx b/client/homebrew/pages/userPage/userPage.jsx
index 9f39ee376..120bd883c 100644
--- a/client/homebrew/pages/userPage/userPage.jsx
+++ b/client/homebrew/pages/userPage/userPage.jsx
@@ -5,6 +5,8 @@ const cx    = require('classnames');
 const Nav = require('naturalcrit/nav/nav.jsx');
 const Navbar = require('../../navbar/navbar.jsx');
 
+const BrewItem = require('./brewItem/brewItem.jsx');
+
 const UserPage = React.createClass({
 	getDefaultProps: function() {
 		return {
@@ -13,6 +15,12 @@ const UserPage = React.createClass({
 		};
 	},
 
+	renderBrews : function(){
+		return _.map(this.props.brews, (brew) => {
+			return <BrewItem brew={brew} />
+		});
+	},
+
 	render : function(){
 		console.log(this.props.brews);
 
@@ -26,6 +34,7 @@ const UserPage = React.createClass({
 			<div className='content'>
 				<div className='phb'>
 					<h1>{this.props.username}</h1>
+					{this.renderBrews()}
 				</div>
 			</div>
 		</div>
diff --git a/server.js b/server.js
index 1430e2187..661821ef3 100644
--- a/server.js
+++ b/server.js
@@ -113,8 +113,6 @@ app.get('/print/:id', (req, res, next)=>{
 });
 
 
-
-
 //Render Page
 app.use((req, res) => {
 	vitreumRender({

From 2d6b89c769436545527973394f22623ed04398d7 Mon Sep 17 00:00:00 2001
From: Scott Tolksdorf <scott.tolksdorf@gmail.com>
Date: Thu, 24 Nov 2016 22:37:34 -0500
Subject: [PATCH 15/17] Updating changelog

---
 changelog.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index 801f647f7..3bb7bfba8 100644
--- a/changelog.md
+++ b/changelog.md
@@ -4,7 +4,10 @@
 - Metadata can now be added to brews
 - Added a metadata editor onto the edit and new pages
 - Moved deleting a brew into the metadata editor
-
+- Added in account middleware
+- Can now search for brews by a specific author
+- Editing a brew in anyway while logged in will now add you to the list of authors
+- Added a new user page to see others published brews, as well as all of your own brews.
 
 ### Monday, 14/11/2016
 - Updated snippet bar style

From 4e5cd914f7581733584295131dac99b004010893 Mon Sep 17 00:00:00 2001
From: Scott Tolksdorf <scott.tolksdorf@gmail.com>
Date: Thu, 24 Nov 2016 23:35:10 -0500
Subject: [PATCH 16/17] User page now running properly

---
 .../editor/snippetbar/snippetbar.less         |  2 +-
 .../pages/userPage/brewItem/brewItem.jsx      | 20 +++++++++++++++++-
 .../pages/userPage/brewItem/brewItem.less     | 18 +++++++++++++++-
 client/homebrew/pages/userPage/userPage.jsx   | 21 ++++++++++++-------
 client/homebrew/pages/userPage/userPage.less  |  6 ++++++
 5 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/client/homebrew/editor/snippetbar/snippetbar.less b/client/homebrew/editor/snippetbar/snippetbar.less
index a939fa5d6..45a6efe2f 100644
--- a/client/homebrew/editor/snippetbar/snippetbar.less
+++ b/client/homebrew/editor/snippetbar/snippetbar.less
@@ -56,7 +56,7 @@
 			background-color : #ddd;
 			.snippet{
 				.animate(background-color);
-				padding   : 10px;
+				padding   : 5px;
 				cursor    : pointer;
 				font-size : 10px;
 				i{
diff --git a/client/homebrew/pages/userPage/brewItem/brewItem.jsx b/client/homebrew/pages/userPage/brewItem/brewItem.jsx
index 94158cb57..6a15903ed 100644
--- a/client/homebrew/pages/userPage/brewItem/brewItem.jsx
+++ b/client/homebrew/pages/userPage/brewItem/brewItem.jsx
@@ -1,19 +1,37 @@
 const React = require('react');
 const _     = require('lodash');
 const cx    = require('classnames');
+const moment = require('moment');
 
 const BrewItem = React.createClass({
 	getDefaultProps: function() {
 		return {
 			brew : {
+				title : '',
+				description : '',
 
+				authors : []
 			}
 		};
 	},
 
 	render : function(){
+		const brew = this.props.brew;
 		return <div className='brewItem'>
-			BrewItem Component Ready.
+			<h4>{brew.title}</h4>
+			<p className='description'><em>{brew.description}</em></p>
+			<hr />
+			<ul>
+				<li><strong>Authors: </strong> {brew.authors.join(', ')}</li>
+				<li>
+					<strong>Last updated: </strong>
+					{moment(brew.updatedAt).fromNow()}
+				</li>
+				<li><strong>Views: </strong> {brew.views} </li>
+			</ul>
+
+			<a href={`/share/${brew.shareId}`} target='_blank'>Share link</a>
+			{(!!brew.editId ? <a href={`/edit/${brew.editId}`} target='_blank'>Edit link</a> : null)}
 		</div>
 	}
 });
diff --git a/client/homebrew/pages/userPage/brewItem/brewItem.less b/client/homebrew/pages/userPage/brewItem/brewItem.less
index 6cfd7b408..f8145cb66 100644
--- a/client/homebrew/pages/userPage/brewItem/brewItem.less
+++ b/client/homebrew/pages/userPage/brewItem/brewItem.less
@@ -1,3 +1,19 @@
-.brewItem{
 
+.brewItem{
+	display                     : inline-block;
+	vertical-align              : top;
+	width                       : 33%;
+	margin-bottom               : 15px;
+	-webkit-column-break-inside : avoid;
+	page-break-inside           : avoid;
+	break-inside                : avoid;
+	p.description{
+		overflow      : hidden;
+		width         : 90%;
+		text-overflow : ellipsis;
+		white-space   : nowrap;
+	}
+	a{
+		margin-right : 10px;
+	}
 }
\ No newline at end of file
diff --git a/client/homebrew/pages/userPage/userPage.jsx b/client/homebrew/pages/userPage/userPage.jsx
index 120bd883c..db4173c20 100644
--- a/client/homebrew/pages/userPage/userPage.jsx
+++ b/client/homebrew/pages/userPage/userPage.jsx
@@ -15,15 +15,20 @@ const UserPage = React.createClass({
 		};
 	},
 
-	renderBrews : function(){
-		return _.map(this.props.brews, (brew) => {
-			return <BrewItem brew={brew} />
+	renderBrews : function(brews){
+		return _.map(brews, (brew, idx) => {
+			return <BrewItem brew={brew} key={idx}/>
+		});
+	},
+
+	getSortedBrews : function(){
+		return _.groupBy(this.props.brews, (brew)=>{
+			return (brew.published ? 'published' : 'private')
 		});
 	},
 
 	render : function(){
-		console.log(this.props.brews);
-
+		const brews = this.getSortedBrews();
 		return <div className='userPage page'>
 			<Navbar>
 				<Nav.section>
@@ -33,8 +38,10 @@ const UserPage = React.createClass({
 
 			<div className='content'>
 				<div className='phb'>
-					<h1>{this.props.username}</h1>
-					{this.renderBrews()}
+					<h1>{this.props.username}'s brews</h1>
+					{this.renderBrews(brews.published)}
+					{brews.private ? <h1>{this.props.username}'s unpublished brews</h1> : null}
+					{this.renderBrews(brews.private)}
 				</div>
 			</div>
 		</div>
diff --git a/client/homebrew/pages/userPage/userPage.less b/client/homebrew/pages/userPage/userPage.less
index 52d691e7c..56bad4037 100644
--- a/client/homebrew/pages/userPage/userPage.less
+++ b/client/homebrew/pages/userPage/userPage.less
@@ -1,5 +1,11 @@
 .userPage{
 	.content .phb{
 		margin: 20px auto;
+		min-height : 350px;
+		height : 80%;
+		column-count : 1;
+		&::after{
+			display : none;
+		}
 	}
 }
\ No newline at end of file

From a0ca45ce1c49c5a7d749b86175e6db7e2a9aab27 Mon Sep 17 00:00:00 2001
From: Scott Tolksdorf <scott.tolksdorf@gmail.com>
Date: Fri, 25 Nov 2016 00:28:48 -0500
Subject: [PATCH 17/17] Added new account nav item

---
 changelog.md                                  |  2 ++
 client/homebrew/homebrew.jsx                  |  3 ++
 client/homebrew/navbar/account.navitem.jsx    | 17 +++++++++++
 client/homebrew/pages/editPage/editPage.jsx   |  6 ++--
 client/homebrew/pages/homePage/homePage.jsx   | 30 +++++++++++--------
 client/homebrew/pages/sharePage/sharePage.jsx |  7 +++--
 client/homebrew/pages/userPage/userPage.jsx   |  7 ++++-
 client/homebrew/pages/userPage/userPage.less  |  7 +++--
 server.js                                     |  3 +-
 9 files changed, 60 insertions(+), 22 deletions(-)
 create mode 100644 client/homebrew/navbar/account.navitem.jsx

diff --git a/changelog.md b/changelog.md
index 3bb7bfba8..386f1a340 100644
--- a/changelog.md
+++ b/changelog.md
@@ -8,6 +8,8 @@
 - Can now search for brews by a specific author
 - Editing a brew in anyway while logged in will now add you to the list of authors
 - Added a new user page to see others published brews, as well as all of your own brews.
+- Added a new nav item for accessing your profile and logging in
+
 
 ### Monday, 14/11/2016
 - Updated snippet bar style
diff --git a/client/homebrew/homebrew.jsx b/client/homebrew/homebrew.jsx
index 895346f85..9a64e238a 100644
--- a/client/homebrew/homebrew.jsx
+++ b/client/homebrew/homebrew.jsx
@@ -31,6 +31,9 @@ const Homebrew = React.createClass({
 		};
 	},
 	componentWillMount: function() {
+		global.account = this.props.account;
+
+
 		Router = CreateRouter({
 			'/edit/:id' : (args) => {
 				if(!this.props.brew.editId){
diff --git a/client/homebrew/navbar/account.navitem.jsx b/client/homebrew/navbar/account.navitem.jsx
new file mode 100644
index 000000000..ee518a7af
--- /dev/null
+++ b/client/homebrew/navbar/account.navitem.jsx
@@ -0,0 +1,17 @@
+const React = require('react');
+const Nav = require('naturalcrit/nav/nav.jsx');
+
+module.exports = function(props){
+	if(global.account){
+		return <Nav.item href={`/user/${global.account.username}`} color='yellow' icon='fa-user'>
+			profile
+		</Nav.item>
+	}
+	let url = '';
+	if(typeof window !== 'undefined'){
+		url = window.location.href
+	}
+	return <Nav.item href={`http://naturalcrit.com/login?redirect=${url}`} color='teal' icon='fa-sign-in'>
+		login
+	</Nav.item>
+};
\ No newline at end of file
diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx
index e5e041c53..db5adb2fa 100644
--- a/client/homebrew/pages/editPage/editPage.jsx
+++ b/client/homebrew/pages/editPage/editPage.jsx
@@ -8,7 +8,8 @@ const Navbar = require('../../navbar/navbar.jsx');
 
 const ReportIssue = require('../../navbar/issue.navitem.jsx');
 const PrintLink = require('../../navbar/print.navitem.jsx');
-const RecentlyEdited = require('../../navbar/recent.navitem.jsx').edited;
+const Account = require('../../navbar/account.navitem.jsx');
+//const RecentlyEdited = require('../../navbar/recent.navitem.jsx').edited;
 
 
 const SplitPane = require('naturalcrit/splitPane/splitPane.jsx');
@@ -191,11 +192,12 @@ const EditPage = React.createClass({
 			</Nav.section>
 			<Nav.section>
 				{this.renderSaveButton()}
-				<RecentlyEdited brew={this.props.brew} />
+				{/*<RecentlyEdited brew={this.props.brew} />*/}
 				<Nav.item newTab={true} href={'/share/' + this.props.brew.shareId} color='teal' icon='fa-share-alt'>
 					Share
 				</Nav.item>
 				<PrintLink shareId={this.props.brew.shareId} />
+				<Account />
 			</Nav.section>
 		</Navbar>
 	},
diff --git a/client/homebrew/pages/homePage/homePage.jsx b/client/homebrew/pages/homePage/homePage.jsx
index e75dfc751..a1ffecc59 100644
--- a/client/homebrew/pages/homePage/homePage.jsx
+++ b/client/homebrew/pages/homePage/homePage.jsx
@@ -1,22 +1,23 @@
-var React = require('react');
-var _ = require('lodash');
-var cx = require('classnames');
-var request = require("superagent");
+const React = require('react');
+const _ = require('lodash');
+const cx = require('classnames');
+const request = require("superagent");
 
-var Nav = require('naturalcrit/nav/nav.jsx');
-var Navbar = require('../../navbar/navbar.jsx');
-var PatreonNavItem = require('../../navbar/patreon.navitem.jsx');
-var IssueNavItem = require('../../navbar/issue.navitem.jsx');
-var RecentNavItem = require('../../navbar/recent.navitem.jsx');
+const Nav = require('naturalcrit/nav/nav.jsx');
+const Navbar = require('../../navbar/navbar.jsx');
+const PatreonNavItem = require('../../navbar/patreon.navitem.jsx');
+const IssueNavItem = require('../../navbar/issue.navitem.jsx');
+const RecentNavItem = require('../../navbar/recent.navitem.jsx');
+const AccountNavItem = require('../../navbar/account.navitem.jsx');
 
 
-var SplitPane = require('naturalcrit/splitPane/splitPane.jsx');
-var Editor = require('../../editor/editor.jsx');
-var BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
+const SplitPane = require('naturalcrit/splitPane/splitPane.jsx');
+const Editor = require('../../editor/editor.jsx');
+const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
 
 
 
-var HomePage = React.createClass({
+const HomePage = React.createClass({
 	getDefaultProps: function() {
 		return {
 			welcomeText : '',
@@ -56,9 +57,12 @@ var HomePage = React.createClass({
 					Changelog
 				</Nav.item>
 				<RecentNavItem.both />
+				<AccountNavItem />
+				{/*}
 				<Nav.item href='/new' color='green' icon='fa-external-link'>
 					New Brew
 				</Nav.item>
+				*/}
 			</Nav.section>
 		</Navbar>
 	},
diff --git a/client/homebrew/pages/sharePage/sharePage.jsx b/client/homebrew/pages/sharePage/sharePage.jsx
index e849de1b4..6bf1e58e1 100644
--- a/client/homebrew/pages/sharePage/sharePage.jsx
+++ b/client/homebrew/pages/sharePage/sharePage.jsx
@@ -5,7 +5,9 @@ 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 RecentlyViewed = require('../../navbar/recent.navitem.jsx').viewed;
+//const RecentlyViewed = require('../../navbar/recent.navitem.jsx').viewed;
+const Account = require('../../navbar/account.navitem.jsx');
+
 
 const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
 
@@ -46,11 +48,12 @@ const SharePage = React.createClass({
 				</Nav.section>
 
 				<Nav.section>
-					<RecentlyViewed brew={this.props.brew} />
+					{/*<RecentlyViewed brew={this.props.brew} />*/}
 					<PrintLink shareId={this.props.brew.shareId} />
 					<Nav.item href={'/source/' + this.props.brew.shareId} color='teal' icon='fa-code'>
 						source
 					</Nav.item>
+					<Account />
 				</Nav.section>
 			</Navbar>
 
diff --git a/client/homebrew/pages/userPage/userPage.jsx b/client/homebrew/pages/userPage/userPage.jsx
index db4173c20..b16fac1a0 100644
--- a/client/homebrew/pages/userPage/userPage.jsx
+++ b/client/homebrew/pages/userPage/userPage.jsx
@@ -5,6 +5,8 @@ const cx    = require('classnames');
 const Nav = require('naturalcrit/nav/nav.jsx');
 const Navbar = require('../../navbar/navbar.jsx');
 
+const RecentNavItem = require('../../navbar/recent.navitem.jsx');
+const Account = require('../../navbar/account.navitem.jsx');
 const BrewItem = require('./brewItem/brewItem.jsx');
 
 const UserPage = React.createClass({
@@ -29,10 +31,13 @@ const UserPage = React.createClass({
 
 	render : function(){
 		const brews = this.getSortedBrews();
+
+
 		return <div className='userPage page'>
 			<Navbar>
 				<Nav.section>
-					holla
+					<RecentNavItem.both />
+					<Account />
 				</Nav.section>
 			</Navbar>
 
diff --git a/client/homebrew/pages/userPage/userPage.less b/client/homebrew/pages/userPage/userPage.less
index 56bad4037..90414703f 100644
--- a/client/homebrew/pages/userPage/userPage.less
+++ b/client/homebrew/pages/userPage/userPage.less
@@ -1,8 +1,9 @@
+
 .userPage{
 	.content .phb{
-		margin: 20px auto;
-		min-height : 350px;
-		height : 80%;
+		height       : 80%;
+		min-height   : 350px;
+		margin       : 20px auto;
 		column-count : 1;
 		&::after{
 			display : none;
diff --git a/server.js b/server.js
index 661821ef3..5bfd55994 100644
--- a/server.js
+++ b/server.js
@@ -126,7 +126,8 @@ app.use((req, res) => {
 			welcomeText : welcomeText,
 			changelog : changelogText,
 			brew : req.brew,
-			brews : req.brews
+			brews : req.brews,
+			account : req.account
 		},
 		clearRequireCache : !process.env.PRODUCTION,
 	}, (err, page) => {