Added in a function to sanatize script tags specifically

Newer browsers warn and/or do not display content that gets loaded via HTTP if site is visited via HTTPS.

.bithoundrc

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

.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
   build:
     docker:
       - image: circleci/node:8.9
-      - image: circleci/mongo:3.4.4
+      - image: circleci/mongo:3.4-jessie
 
     working_directory: ~/repo
 

.dockerignore

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

.eslintrc.js

@@ -44,7 +44,6 @@ module.exports = {
 		'arrow-parens'    : ['warn', 'always'],
 		'brace-style'     : ['warn', '1tbs', { allowSingleLine: true }],
 		'jsx-quotes'      : ['warn', 'prefer-single'],
-		'linebreak-style' : ['warn', 'unix'],
 		'no-var'          : 'warn',
 		'prefer-const'    : 'warn',
 		'prefer-template' : 'warn',

Dockerfile

@@ -0,0 +1,14 @@
+FROM node:8
+
+# Create app directory
+WORKDIR /usr/src/app
+
+# Bundle app source
+COPY . .
+
+ENV NODE_ENV=docker
+
+RUN yarn
+
+EXPOSE 8000
+CMD [ "yarn", "start" ]

README.md

@@ -1,13 +1,13 @@
 # The Homebrewery
-The Homebrewery is a tool for making authnetic looking [D&D content](http://dnd.wizards.com/products/tabletop-games/rpg-products/rpg_playershandbook) using only [Markdown](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet). Check it out [here](http://homebrewery.naturalcrit.com).
+The Homebrewery is a tool for making authentic looking [D&D content](http://dnd.wizards.com/products/tabletop-games/rpg-products/rpg_playershandbook) using only [Markdown](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet). Check it out [here](http://homebrewery.naturalcrit.com).
 
 
 ### issues, suggestions, bugs
-If you run into any issues using The Homebrewery, please submit an issues [here](/issues)
+If you run into any issues using The Homebrewery, please submit an issue [here](/issues).
 
 
 ### local dev
-Homebrewery is open source, so feel free to clone it, tinker with it, or run your own local version.
+The Homebrewery is open source, so feel free to clone it, tinker with it, or run your own local version.
 
 #### pre-reqs
 1. install [node](https://nodejs.org/en/)
@@ -20,14 +20,16 @@ Homebrewery is open source, so feel free to clone it, tinker with it, or run you
 1. `npm start`
 
 #### standalone PHB stylesheet
-If you just want the stylesheet that is generated to make pages look like they are from the PLayer's Handbook, you have find it [here](https://github.com/stolksdorf/homebrewery/blob/master/phb.standalone.css)
+If you just want the stylesheet that is generated to make pages look like they are from the Player's Handbook, you will find it [here](https://github.com/stolksdorf/homebrewery/blob/master/phb.standalone.css).
 
 If you are developing locally and would like to generate your own, follow the above steps and then run `npm run phb`.
 
 ### changelog
 
-You can check out the changelog [here](https://github.com/stolksdorf/homebrewery/blob/master/changelog.md)
+You can check out the changelog [here](https://github.com/stolksdorf/homebrewery/blob/master/changelog.md).
 
 ### license
 
-This project is licensed under [MIT](./license)
+This project is licensed under [MIT](./license). Which means you are free to use The Homebrewery in any way that you want, except for claiming that you made it yourself.
+
+If you wish to sell or in some way gain profit for what's created on this site, it's your responsibility to ensure you have the proper licenses/rights for any images or resources used.

client/admin/homebrewAdmin/brewLookup/brewLookup.jsx

@@ -47,8 +47,8 @@ const BrewLookup = createClass({
 		return <div className='brewRow'>
 			<div>{brew.title}</div>
 			<div>{brew.authors.join(', ')}</div>
-			<div><a href={`/edit/${brew.editId}`} target='_blank'>/edit/{brew.editId}</a></div>
-			<div><a href={`/share/${brew.shareId}`} target='_blank'>/share/{brew.shareId}</a></div>
+			<div><a href={`/edit/${brew.editId}`} target='_blank' rel='noopener noreferrer'>/edit/{brew.editId}</a></div>
+			<div><a href={`/share/${brew.shareId}`} target='_blank' rel='noopener noreferrer'>/share/{brew.shareId}</a></div>
 			<div>{Moment(brew.updatedAt).fromNow()}</div>
 			<div>{brew.views}</div>
 		</div>;

client/admin/homebrewAdmin/brewSearch.jsx

@@ -17,16 +17,11 @@ const BrewSearch = createClass({
 		return {
 			searchTerm : '',
 			brew       : null,
-			searching  : false
 		};
 	},
 
 
 	search : function(){
-		this.setState({
-			searching : true
-		});
-
 		request.get(`/homebrew/api/search?id=${this.state.searchTerm}`)
 			.query({
 				admin_key : this.props.admin_key,
@@ -35,8 +30,6 @@ const BrewSearch = createClass({
 				console.log(err, res, res.body.brews[0]);
 				this.setState({
 					brew : res.body.brews[0],
-
-					searching : false
 				});
 			});
 	},

client/admin/homebrewAdmin/homebrewAdmin.jsx

@@ -23,8 +23,6 @@ const HomebrewAdmin = createClass({
 			count     : 20,
 			brewCache : {},
 			total     : 0,
-
-			processingOldBrews : false
 		};
 	},
 
@@ -38,9 +36,10 @@ const HomebrewAdmin = createClass({
 			})
 			.end((err, res)=>{
 				if(err || !res.body || !res.body.brews) return;
-				this.state.brewCache[page] = res.body.brews;
+				const newCache = _.extend({}, this.state.brewCache);
+				newCache[page] = res.body.brews;
 				this.setState({
-					brewCache : this.state.brewCache,
+					brewCache : newCache,
 					total     : res.body.total,
 					count     : res.body.count
 				});
@@ -106,8 +105,8 @@ const HomebrewAdmin = createClass({
 		const brews = this.state.brewCache[this.state.page] || _.times(this.state.count);
 		return _.map(brews, (brew)=>{
 			return <tr className={cx('brewRow', { 'isEmpty': brew.text == 'false' })} key={brew.shareId || brew}>
-				<td><a href={`/edit/${brew.editId}`} target='_blank'>{brew.editId}</a></td>
-				<td><a href={`/share/${brew.shareId}`} target='_blank'>{brew.shareId}</a></td>
+				<td><a href={`/edit/${brew.editId}`} target='_blank' rel='noopener noreferrer'>{brew.editId}</a></td>
+				<td><a href={`/share/${brew.shareId}`} target='_blank' rel='noopener noreferrer'>{brew.shareId}</a></td>
 				<td>{Moment(brew.createdAt).fromNow()}</td>
 				<td>{Moment(brew.updatedAt).fromNow()}</td>
 				<td>{Moment(brew.lastViewed).fromNow()}</td>

client/homebrew/brewRenderer/brewRenderer.jsx

@@ -27,16 +27,11 @@ const BrewRenderer = createClass({
 			height             : 0,
 			isMounted          : false,
 
-			usePPR : true,
-
 			pages  : pages,
 			usePPR : pages.length >= PPR_THRESHOLD,
-
-			errors : []
 		};
 	},
 	height     : 0,
-	pageHeight : PAGE_HEIGHT,
 	lastRender : <div></div>,
 
 	componentDidMount : function() {
@@ -48,8 +43,6 @@ const BrewRenderer = createClass({
 	},
 
 	componentWillReceiveProps : function(nextProps) {
-		if(this.refs.pages && this.refs.pages.firstChild) this.pageHeight = this.refs.pages.firstChild.clientHeight;
-
 		const pages = nextProps.text.split('\\page');
 		this.setState({
 			pages  : pages,
@@ -58,10 +51,6 @@ const BrewRenderer = createClass({
 	},
 
 	updateSize : function() {
-		setTimeout(()=>{
-			if(this.refs.pages && this.refs.pages.firstChild) this.pageHeight = this.refs.pages.firstChild.clientHeight;
-		}, 1);
-
 		this.setState({
 			height    : this.refs.main.parentNode.clientHeight,
 			isMounted : true
@@ -69,9 +58,10 @@ const BrewRenderer = createClass({
 	},
 
 	handleScroll : function(e){
-		this.setState({
-			viewablePageNumber : Math.floor(e.target.scrollTop / this.pageHeight)
-		});
+		const target = e.target;
+		this.setState((prevState)=>({
+			viewablePageNumber : Math.floor(target.scrollTop / target.scrollHeight * prevState.pages.length)
+		}));
 	},
 
 	shouldRender : function(pageText, index){
@@ -134,20 +124,24 @@ const BrewRenderer = createClass({
 	},
 
 	render : function(){
-		return <div className='brewRenderer'
-			onScroll={this.handleScroll}
-			ref='main'
-			style={{ height: this.state.height }}>
+		return (
+			<React.Fragment>
+				<div className='brewRenderer'
+					onScroll={this.handleScroll}
+					ref='main'
+					style={{ height: this.state.height }}>
 
-			<ErrorBar errors={this.props.errors} />
-			<RenderWarnings />
+					<ErrorBar errors={this.props.errors} />
+					<RenderWarnings />
 
-			<div className='pages' ref='pages'>
-				{this.renderPages()}
-			</div>
-			{this.renderPageInfo()}
-			{this.renderPPRmsg()}
-		</div>;
+					<div className='pages' ref='pages'>
+						{this.renderPages()}
+					</div>
+				</div>;
+				{this.renderPageInfo()}
+				{this.renderPPRmsg()}
+			</React.Fragment>
+		);
 	}
 });
 

client/homebrew/brewRenderer/brewRenderer.less

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

client/homebrew/editor/metadataEditor/metadataEditor.jsx

@@ -68,7 +68,7 @@ const MetadataEditor = createClass({
 				<input
 					type='checkbox'
 					checked={_.includes(this.props.metadata.systems, val)}
-					onChange={()=>this.handleSystem(val)} />
+					onChange={(e)=>this.handleSystem(val, e)} />
 				{val}
 			</label>;
 		});
@@ -118,7 +118,7 @@ const MetadataEditor = createClass({
 		return <div className='field reddit'>
 			<label>reddit</label>
 			<div className='value'>
-				<a href={this.getRedditLink()} target='_blank'>
+				<a href={this.getRedditLink()} target='_blank' rel='noopener noreferrer'>
 					<button className='publish'>
 						<i className='fa fa-reddit-alien' /> share to reddit
 					</button>
@@ -133,18 +133,18 @@ const MetadataEditor = createClass({
 				<label>title</label>
 				<input type='text' className='value'
 					value={this.props.metadata.title}
-					onChange={()=>this.handleFieldChange('title')} />
+					onChange={(e)=>this.handleFieldChange('title', e)} />
 			</div>
 			<div className='field description'>
 				<label>description</label>
 				<textarea value={this.props.metadata.description} className='value'
-					onChange={()=>this.handleFieldChange('description')} />
+					onChange={(e)=>this.handleFieldChange('description', e)} />
 			</div>
 			{/*}
 			<div className='field tags'>
 				<label>tags</label>
 				<textarea value={this.props.metadata.tags}
-					onChange={()=>this.handleFieldChange('tags')} />
+					onChange={(e)=>this.handleFieldChange('tags', e)} />
 			</div>
 			*/}
 

client/homebrew/homebrew.jsx

@@ -82,7 +82,7 @@ const Homebrew = createClass({
 	},
 	render : function(){
 		return <div className='homebrew'>
-			<Router initialUrl={this.props.url}/>
+			<Router defaultUrl={this.props.url}/>
 		</div>;
 	}
 });

client/homebrew/navbar/issue.navitem.jsx

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

client/homebrew/navbar/recent.navitem.jsx

@@ -59,7 +59,7 @@ const BaseItem = createClass({
 		if(!this.state.showDropdown) return null;
 
 		const items = _.map(this.state.brews, (brew)=>{
-			return <a href={brew.url} className='item' key={brew.id} target='_blank'>
+			return <a href={brew.url} className='item' key={brew.id} target='_blank' rel='noopener noreferrer'>
 				<span className='title'>{brew.title}</span>
 				<span className='time'>{Moment(brew.ts).fromNow()}</span>
 			</a>;
@@ -172,7 +172,7 @@ module.exports = {
 
 			const makeItems = (brews)=>{
 				return _.map(brews, (brew)=>{
-					return <a href={brew.url} className='item' key={brew.id} target='_blank'>
+					return <a href={brew.url} className='item' key={brew.id} target='_blank' rel='noopener noreferrer'>
 						<span className='title'>{brew.title}</span>
 						<span className='time'>{Moment(brew.ts).fromNow()}</span>
 					</a>;

client/homebrew/pages/editPage/editPage.jsx

@@ -45,11 +45,10 @@ const EditPage = createClass({
 		return {
 			brew : this.props.brew,
 
-			isSaving    : false,
-			isPending   : false,
-			errors      : null,
-			htmlErrors  : Markdown.validate(this.props.brew.text),
-			lastUpdated : this.props.brew.updatedAt
+			isSaving   : false,
+			isPending  : false,
+			errors     : null,
+			htmlErrors : Markdown.validate(this.props.brew.text),
 		};
 	},
 	savedBrew : null,
@@ -62,9 +61,9 @@ const EditPage = createClass({
 			}
 		};
 
-		this.setState({
-			htmlErrors : Markdown.validate(this.state.brew.text)
-		});
+		this.setState((prevState)=>({
+			htmlErrors : Markdown.validate(prevState.brew.text)
+		}));
 
 		document.addEventListener('keydown', this.handleControlKeys);
 	},
@@ -91,12 +90,10 @@ const EditPage = createClass({
 	},
 
 	handleMetadataChange : function(metadata){
-		this.setState({
-			brew      : _.merge({}, this.state.brew, metadata),
+		this.setState((prevState)=>({
+			brew      : _.merge({}, prevState.brew, metadata),
 			isPending : true,
-		}, ()=>{
-			this.trySave();
-		});
+		}), ()=>this.trySave());
 
 	},
 
@@ -106,22 +103,16 @@ const EditPage = createClass({
 		let htmlErrors = this.state.htmlErrors;
 		if(htmlErrors.length) htmlErrors = Markdown.validate(text);
 
-		this.setState({
-			brew       : _.merge({}, this.state.brew, { text: text }),
+		this.setState((prevState)=>({
+			brew       : _.merge({}, prevState.brew, { text: text }),
 			isPending  : true,
 			htmlErrors : htmlErrors
-		});
-
-		this.trySave();
+		}), ()=>this.trySave());
 	},
 
 	hasChanges : function(){
-		if(this.savedBrew){
-			return !_.isEqual(this.state.brew, this.savedBrew);
-		} else {
-			return !_.isEqual(this.state.brew, this.props.brew);
-		}
-		return false;
+		const savedBrew = this.savedBrew ? this.savedBrew : this.props.brew;
+		return !_.isEqual(this.state.brew, savedBrew);
 	},
 
 	trySave : function(){
@@ -136,11 +127,11 @@ const EditPage = createClass({
 	save : function(){
 		if(this.debounceSave && this.debounceSave.cancel) this.debounceSave.cancel();
 
-		this.setState({
+		this.setState((prevState)=>({
 			isSaving   : true,
 			errors     : null,
-			htmlErrors : Markdown.validate(this.state.brew.text)
-		});
+			htmlErrors : Markdown.validate(prevState.brew.text)
+		}));
 
 		request
 			.put(`/api/update/${this.props.brew.editId}`)
@@ -153,9 +144,8 @@ const EditPage = createClass({
 				} else {
 					this.savedBrew = res.body;
 					this.setState({
-						isPending   : false,
-						isSaving    : false,
-						lastUpdated : res.body.updatedAt
+						isPending : false,
+						isSaving  : false,
 					});
 				}
 			});
@@ -173,7 +163,8 @@ const EditPage = createClass({
 				Oops!
 				<div className='errorContainer'>
 					Looks like there was a problem saving. <br />
-					Report the issue <a target='_blank' href={`https://github.com/stolksdorf/naturalcrit/issues/new?body=${encodeURIComponent(errMsg)}`}>
+					Report the issue <a target='_blank' rel='noopener noreferrer'
+						href={`https://github.com/stolksdorf/naturalcrit/issues/new?body=${encodeURIComponent(errMsg)}`}>
 						here
 					</a>.
 				</div>

client/homebrew/pages/homePage/welcome_msg.md

@@ -55,7 +55,7 @@ If you are looking for more 5e Homebrew resources check out [r/UnearthedArcana](
 
 
 
-<img src='http://i.imgur.com/hMna6G0.png' style='position:absolute;bottom:50px;right:30px;width:280px' />
+<img src='https://i.imgur.com/hMna6G0.png' style='position:absolute;bottom:50px;right:30px;width:280px' />
 
 <div class='pageNumber'>1</div>
 <div class='footnote'>PART 1 | FANCINESS</div>

client/homebrew/pages/printPage/printPage.jsx

@@ -22,7 +22,9 @@ const PrintPage = createClass({
 
 	componentDidMount : function() {
 		if(this.props.query.local){
-			this.setState({ brewText: localStorage.getItem(this.props.query.local) });
+			this.setState((prevState, prevProps)=>({
+				brewText : localStorage.getItem(prevProps.query.local)
+			}));
 		}
 
 		if(this.props.query.dialog) window.print();

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

@@ -38,7 +38,7 @@ const BrewItem = createClass({
 	renderEditLink : function(){
 		if(!this.props.brew.editId) return;
 
-		return <a href={`/edit/${this.props.brew.editId}`} target='_blank'>
+		return <a href={`/edit/${this.props.brew.editId}`} target='_blank' rel='noopener noreferrer'>
 			<i className='fa fa-pencil' />
 		</a>;
 	},
@@ -63,7 +63,7 @@ const BrewItem = createClass({
 			</div>
 
 			<div className='links'>
-				<a href={`/share/${brew.shareId}`} target='_blank'>
+				<a href={`/share/${brew.shareId}`} target='_blank' rel='noopener noreferrer'>
 					<i className='fa fa-share-alt' />
 				</a>
 				{this.renderEditLink()}

client/homebrew/phbStyle/phb.style.less

@@ -156,6 +156,7 @@ body {
 		margin-bottom : 1em;
 		font-size     : 10pt;
 		thead{
+			display: table-row-group;
 			font-weight : 800;
 			th{
 				vertical-align : bottom;
@@ -337,7 +338,8 @@ body {
 	p,blockquote,table{
 		z-index                     : 15;
 		-webkit-column-break-inside : avoid;
-		column-break-inside         : avoid;
+		page-break-inside           : avoid;
+		break-inside                : avoid;
 		overflow: hidden; /* Firefox fix */
 	}
 	//Better spacing for spell blocks
@@ -355,7 +357,8 @@ body {
 	}
 	li{
 		-webkit-column-break-inside : avoid;
-		column-break-inside         : avoid;
+		page-break-inside           : avoid;
+		break-inside                : avoid;
 	}
 }
 //*****************************
@@ -380,7 +383,8 @@ body {
 		text-indent                 : -1em;
 		list-style-type             : none;
 		-webkit-column-break-inside : auto;
-		column-break-inside         : auto;
+		page-break-inside           : auto;
+		break-inside                : auto;
 	}
 }
 //*****************************
@@ -449,7 +453,8 @@ body {
 // *****************************/
 .phb .toc{
 	-webkit-column-break-inside : avoid;
-	column-break-inside         : avoid;
+	page-break-inside           : avoid;
+	break-inside                : avoid;
 	a{
 		color           : black;
 		text-decoration : none;

docker-compose.yml

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

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "homebrewery",
-  "version": "2.7.5",
+  "version": "2.8.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1067,9 +1067,12 @@
       "integrity": "sha512-MsAhsUW1GxCdgYSO6tAfZrNapmUKk7mWx/k5mFY/A1gBtkaCaNapTg+FExCw1r9yeaZhqx/xPg43xgTFH6KL5w=="
     },
     "basic-auth": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-1.1.0.tgz",
-      "integrity": "sha1-RSIe5Cn37h5QNb4/UVM/HN/SmIQ="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.0.tgz",
+      "integrity": "sha1-AV2z81PgLlY3d1X5YnQuiYHnu7o=",
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
     },
     "bcrypt-pbkdf": {
       "version": "1.0.1",
@@ -2231,11 +2234,6 @@
         "is-symbol": "1.0.1"
       }
     },
-    "es6-promise": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.2.1.tgz",
-      "integrity": "sha1-7FYjOGgDKQkgcXDDlEjiREndH8Q="
-    },
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@@ -3863,11 +3861,6 @@
         "os-tmpdir": "1.0.2"
       }
     },
-    "hooks-fixed": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hooks-fixed/-/hooks-fixed-2.0.2.tgz",
-      "integrity": "sha512-YurCM4gQSetcrhwEtpQHhQ4M7Zo7poNGqY4kQGeBS6eZtOcT3tnNs01ThFa0jYBByAiYt1MjMjP/YApG0EnAvQ=="
-    },
     "htmlescape": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz",
@@ -4514,9 +4507,9 @@
       "integrity": "sha1-eeoBiRth3mto4T5nwLS1vak3spQ="
     },
     "kareem": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/kareem/-/kareem-1.5.0.tgz",
-      "integrity": "sha1-4+QQHZ3P3imXadr0tNtk2JXRdEg="
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.0.6.tgz",
+      "integrity": "sha512-/C+l8gABdHsAIfNpykJNWmYodpTnDRyn+JhORkP2VgEf1GgdAc+oTHjVADwISwCJKta031EOIwY6+Hki5z8SpQ=="
     },
     "kind-of": {
       "version": "3.2.2",
@@ -4877,58 +4870,54 @@
       "integrity": "sha512-1muXCh8jb1N/gHRbn9VDUBr0GYb8A/aVcHlII9QSB68a50spqEVLIGN6KVmCOnSvJrUhC0edGgKU5ofnGXdYdg=="
     },
     "mongodb": {
-      "version": "2.2.34",
-      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.2.34.tgz",
-      "integrity": "sha1-o09Zu+thdUrsQy3nLD/iFSakTBo=",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.0.4.tgz",
+      "integrity": "sha512-90YIIs7A4ko4kCGafxxXj3foexCAlJBC0YLwwIKgSLoE7Vni2IqUMz6HSsZ3zbXOfR1KWtxfnc0RyAMAY/ViLg==",
       "requires": {
-        "es6-promise": "3.2.1",
-        "mongodb-core": "2.1.18",
-        "readable-stream": "2.2.7"
+        "mongodb-core": "3.0.4"
       }
     },
     "mongodb-core": {
-      "version": "2.1.18",
-      "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.18.tgz",
-      "integrity": "sha1-TEYTm986HwMt7ZHbSfOO7AFlkFA=",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-3.0.4.tgz",
+      "integrity": "sha512-OTH267FjfwBdEufSnrgd+u8HuLWRuQ6p8DR0XirPl2BdlLEMh4XwjJf1RTlruILp5p2m1w8dDC8rCxibC3W8qQ==",
       "requires": {
         "bson": "1.0.6",
         "require_optional": "1.0.1"
       }
     },
     "mongoose": {
-      "version": "4.13.12",
-      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-4.13.12.tgz",
-      "integrity": "sha512-pH8NK5AYGbnPeEFFGs5ACk18vzzcy4DFT48U9kKvkfg6SI3nJZkzGfN7o1NDWjy+kP26hWyU/AMhYTfe5hSVnA==",
+      "version": "5.0.13",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.0.13.tgz",
+      "integrity": "sha512-VCiutgdxwhTuNHIuUgMRWVYvv0GFw6FUi4j14B7um/Wcy1uhuwF552a6XVKUCth/AY8C+PjVU9fVGJ5K0JmrmQ==",
       "requires": {
         "async": "2.1.4",
         "bson": "1.0.6",
-        "hooks-fixed": "2.0.2",
-        "kareem": "1.5.0",
+        "kareem": "2.0.6",
         "lodash.get": "4.4.2",
-        "mongodb": "2.2.34",
+        "mongodb": "3.0.4",
+        "mongoose-legacy-pluralize": "1.0.2",
         "mpath": "0.3.0",
-        "mpromise": "0.5.5",
-        "mquery": "2.3.3",
+        "mquery": "3.0.0",
         "ms": "2.0.0",
-        "muri": "1.3.0",
         "regexp-clone": "0.0.1",
         "sliced": "1.0.1"
       }
     },
+    "mongoose-legacy-pluralize": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz",
+      "integrity": "sha512-Yo/7qQU4/EyIS8YDFSeenIvXxZN+ld7YdV9LqFVQJzTLye8unujAWPZ4NWKfFA+RNjh+wvTWKY9Z3E5XM6ZZiQ=="
+    },
     "mpath": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.3.0.tgz",
       "integrity": "sha1-elj3iem1/TyUUgY0FXlg8mvV70Q="
     },
-    "mpromise": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mpromise/-/mpromise-0.5.5.tgz",
-      "integrity": "sha1-9bJCWddjrMIlewoMjG2Gb9UXMuY="
-    },
     "mquery": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/mquery/-/mquery-2.3.3.tgz",
-      "integrity": "sha512-NC8L14kn+qxJbbJ1gbcEMDxF0sC3sv+1cbRReXXwVvowcwY1y9KoVZFq0ebwARibsadu8lx8nWGvm3V0Pf0ZWQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/mquery/-/mquery-3.0.0.tgz",
+      "integrity": "sha512-WL1Lk8v4l8VFSSwN3yCzY9TXw+fKVYKn6f+w86TRzOLSE8k1yTgGaLBPUByJQi8VcLbOdnUneFV/y3Kv874pnQ==",
       "requires": {
         "bluebird": "3.5.0",
         "debug": "2.6.9",
@@ -4948,11 +4937,6 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
-    "muri": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/muri/-/muri-1.3.0.tgz",
-      "integrity": "sha512-FiaFwKl864onHFFUV/a2szAl7X0fxVlSKNdhTf+BM8i8goEgYut8u5P9MqQqIYwvaMxjzVESsoEm/2kfkFH1rg=="
-    },
     "mute-stream": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
@@ -5008,9 +4992,9 @@
       "dev": true
     },
     "nconf": {
-      "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/nconf/-/nconf-0.8.5.tgz",
-      "integrity": "sha1-8pQeFWGVL6kGu7MjKM+I1MY155Q=",
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/nconf/-/nconf-0.10.0.tgz",
+      "integrity": "sha512-fKiXMQrpP7CYWJQzKkPPx9hPgmq+YLDyxcG9N8RpiE9FoCkCbzD0NyW0YhE3xn3Aupe7nnDeIx4PFzYehpHT9Q==",
       "requires": {
         "async": "1.5.2",
         "ini": "1.3.5",
@@ -6088,35 +6072,16 @@
         }
       }
     },
-    "pico-flux": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/pico-flux/-/pico-flux-1.1.0.tgz",
-      "integrity": "sha1-GgRFbQQValgtKo6Rhyxxk2WMC/s="
-    },
     "pico-router": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/pico-router/-/pico-router-1.3.0.tgz",
-      "integrity": "sha512-VYvL+ycNF+xxqd/vZdBxEUw4KzYNF0EjpFto0lLllEoN0fRzPLoM76Wkx1iOFbNFKfmUbciV4ec+tdPOOxN3Dw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/pico-router/-/pico-router-2.1.0.tgz",
+      "integrity": "sha512-aUTyqGvqbRifVn3StnP7V8QBVcSfsbfpHt+neMgXKPLdxlfgD7kwHv6WzGZxwZ4u6/S6io89hftDy2k1kJHJLQ==",
       "requires": {
         "create-react-class": "15.6.3",
         "lodash": "4.17.5",
-        "react": "15.6.2",
+        "react": "16.3.1",
         "url": "0.11.0",
         "url-pattern": "1.0.3"
-      },
-      "dependencies": {
-        "react": {
-          "version": "15.6.2",
-          "resolved": "https://registry.npmjs.org/react/-/react-15.6.2.tgz",
-          "integrity": "sha1-26BDSrQ5z+gvEI8PURZjkIF5qnI=",
-          "requires": {
-            "create-react-class": "15.6.3",
-            "fbjs": "0.8.16",
-            "loose-envify": "1.3.1",
-            "object-assign": "4.1.1",
-            "prop-types": "15.6.1"
-          }
-        }
       }
     },
     "pify": {
@@ -7219,11 +7184,6 @@
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
       "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
     },
-    "striptags": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/striptags/-/striptags-2.2.1.tgz",
-      "integrity": "sha1-TEULcI1BuL85zyTEn/I0/Gqr/TI="
-    },
     "subarg": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebrewery",
   "description": "Create authentic looking D&D homebrews using only markdown",
-  "version": "2.8.0",
+  "version": "2.8.1",
   "repository": {
     "type": "git",
     "url": "git://github.com/stolksdorf/homebrewery.git"
@@ -38,7 +38,7 @@
   "dependencies": {
     "babel-preset-env": "^1.1.8",
     "babel-preset-react": "^6.24.1",
-    "basic-auth": "^1.0.3",
+    "basic-auth": "^2.0.0",
     "body-parser": "^1.14.2",
     "classnames": "^2.2.0",
     "codemirror": "^5.22.0",
@@ -49,14 +49,12 @@
     "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",
+    "mongoose": "^5.0.13",
+    "nconf": "^0.10.0",
+    "pico-router": "^2.1.0",
     "react": "^16.3.1",
     "react-dom": "^16.3.1",
     "shortid": "^2.2.4",
-    "striptags": "^2.1.1",
     "superagent": "^3.8.2",
     "vitreum": "^4.10.1"
   },

scripts/project.json

@@ -14,7 +14,6 @@
 		"moment",
 		"superagent",
 		"marked",
-		"pico-router",
-		"pico-flux"
+		"pico-router"
 	]
 }

server.js

@@ -3,7 +3,7 @@ const jwt = require('jwt-simple');
 const express = require('express');
 const app = express();
 
-app.use(express.static(`${__dirname}/build`));'';
+app.use(express.static(`${__dirname}/build`));
 app.use(require('body-parser').json({ limit: '25mb' }));
 app.use(require('cookie-parser')());
 
@@ -14,12 +14,13 @@ const config = require('nconf')
 	.file('defaults', { file: 'config/default.json' });
 
 //DB
-require('mongoose')
-	.connect(process.env.MONGODB_URI || process.env.MONGOLAB_URI || 'mongodb://localhost/naturalcrit')
-	.connection.on('error', ()=>{
-		console.log('Error : Could not connect to a Mongo Database.');
-		console.log('        If you are running locally, make sure mongodb.exe is running.');
-	});
+const mongoose = require('mongoose');
+mongoose.connect(config.get('mongodb_uri') || config.get('mongolab_uri') || 'mongodb://localhost/naturalcrit');
+mongoose.connection.on('error', ()=>{
+	console.log('Error : Could not connect to a Mongo Database.');
+	console.log('        If you are running locally, make sure mongodb.exe is running.');
+	throw 'Can not connect to Mongo';
+});
 
 
 //Account MIddleware
@@ -48,7 +49,7 @@ app.get('/source/:id', (req, res)=>{
 	HomebrewModel.get({ shareId: req.params.id })
 		.then((brew)=>{
 			const text = brew.text.replaceAll('<', '&lt;').replaceAll('>', '&gt;');
-			return res.send(`<code><pre>${text}</pre></code>`);
+			return res.send(`<code><pre style="white-space: pre-wrap;">${text}</pre></code>`);
 		})
 		.catch((err)=>{
 			console.log(err);
@@ -137,4 +138,4 @@ app.use((req, res)=>{
 
 const PORT = process.env.PORT || 8000;
 app.listen(PORT);
-console.log(`server on port:${PORT}`);
+console.log(`server on port:${PORT}`);

shared/homebrewery/renderWarnings/renderWarnings.jsx

@@ -32,15 +32,6 @@ const RenderWarnings = createClass({
 				</li>;
 			}
 		},
-		zoom : function(){
-			return false;
-			if(window.devicePixelRatio !== 1){
-				return <li key='zoom'>
-					<em>Your browser is zoomed. </em> <br />
-					This can cause content to jump columns.
-				</li>;
-			}
-		}
 	},
 	checkWarnings : function(){
 		const hideDismiss = localStorage.getItem(DISMISS_KEY);

shared/naturalcrit/codeEditor/codeEditor.jsx

@@ -30,7 +30,11 @@ const CodeEditor = createClass({
 			value        : this.props.value,
 			lineNumbers  : true,
 			lineWrapping : this.props.wrap,
-			mode         : this.props.language
+			mode         : this.props.language,
+			extraKeys    : {
+				'Ctrl-B' : this.makeBold,
+				'Ctrl-I' : this.makeItalic
+			}
 		});
 
 		this.codeMirror.on('change', this.handleChange);
@@ -38,6 +42,16 @@ const CodeEditor = createClass({
 		this.updateSize();
 	},
 
+	makeBold : function() {
+		const selection = this.codeMirror.getSelection();
+		this.codeMirror.replaceSelection(`**${selection}**`, 'around');
+	},
+
+	makeItalic : function() {
+		const selection = this.codeMirror.getSelection();
+		this.codeMirror.replaceSelection(`*${selection}*`, 'around');
+	},
+
 	componentWillReceiveProps : function(nextProps){
 		if(this.codeMirror && nextProps.value !== undefined && this.codeMirror.getValue() != nextProps.value) {
 			this.codeMirror.setValue(nextProps.value);

shared/naturalcrit/markdown.js

@@ -13,6 +13,11 @@ renderer.html = function (html) {
 	return html;
 };
 
+const sanatizeScriptTags = (content)=>{
+	return content
+		.replace(/<script/g, '&lt;script')
+		.replace(/<\/script>/g, '&lt;/script&gt;');
+};
 
 const tagTypes = ['div', 'span', 'a'];
 const tagRegex = new RegExp(`(${
@@ -24,7 +29,10 @@ const tagRegex = new RegExp(`(${
 module.exports = {
 	marked : Markdown,
 	render : (rawBrewText)=>{
-		return Markdown(rawBrewText, { renderer: renderer });
+		return Markdown(
+			sanatizeScriptTags(rawBrewText),
+			{ renderer: renderer }
+		);
 	},
 
 	validate : (rawBrewText)=>{

shared/naturalcrit/splitPane/splitPane.less

@@ -7,6 +7,7 @@
 	flex-direction : row;
 	.pane{
 		overflow-x : hidden;
+		overflow-y : hidden;
 		flex       : 1;
 	}
 	.divider{
@@ -28,4 +29,4 @@
 			}
 		}
 	}
-}
+}