Merge branch 'master' into update-Marked-renderer

client/homebrew/editor/metadataEditor/metadataEditor.jsx

@@ -50,7 +50,7 @@ const MetadataEditor = createClass({
 			if(!confirm('Are you REALLY sure? You will lose editor access to this document.')) return;
 		}
 
-		request.get(`/api/remove/${this.props.metadata.editId}`)
+		request.delete(`/api/${this.props.metadata.editId}`)
 			.send()
 			.end(function(err, res){
 				window.location.href = '/';

client/homebrew/pages/editPage/editPage.jsx

@@ -3,6 +3,7 @@ const createClass = require('create-react-class');
 const _ = require('lodash');
 const cx = require('classnames');
 const request = require('superagent');
+const Meta = require('vitreum/meta');
 
 const Nav = require('naturalcrit/nav/nav.jsx');
 const Navbar = require('../../navbar/navbar.jsx');
@@ -134,7 +135,7 @@ const EditPage = createClass({
 		}));
 
 		request
-			.put(`/api/update/${this.props.brew.editId}`)
+			.put(`/api/${this.props.brew.editId}`)
 			.send(this.state.brew)
 			.end((err, res)=>{
 				if(err){
@@ -202,6 +203,7 @@ const EditPage = createClass({
 
 	render : function(){
 		return <div className='editPage page'>
+			<Meta name='robots' content='noindex, nofollow' />
 			{this.renderNavbar()}
 
 			<div className='content'>

client/homebrew/pages/homePage/homePage.jsx

@@ -3,6 +3,7 @@ const createClass = require('create-react-class');
 const _ = require('lodash');
 const cx = require('classnames');
 const request = require('superagent');
+const Meta = require('vitreum/meta');
 
 const Nav = require('naturalcrit/nav/nav.jsx');
 const Navbar = require('../../navbar/navbar.jsx');
@@ -72,6 +73,7 @@ const HomePage = createClass({
 
 	render : function(){
 		return <div className='homePage page'>
+			<Meta name='google-site-verification' content='NwnAQSSJZzAT7N-p5MY6ydQ7Njm67dtbu73ZSyE5Fy4' />
 			{this.renderNavbar()}
 
 			<div className='content'>

client/homebrew/pages/printPage/printPage.jsx

@@ -2,6 +2,7 @@ const React = require('react');
 const createClass = require('create-react-class');
 const _     = require('lodash');
 const cx    = require('classnames');
+const Meta = require('vitreum/meta');
 const Markdown = require('naturalcrit/markdown.js');
 
 const PrintPage = createClass({
@@ -42,6 +43,7 @@ const PrintPage = createClass({
 
 	render : function(){
 		return <div>
+			<Meta name='robots' content='noindex, nofollow' />
 			{this.renderPages()}
 		</div>;
 	}

client/homebrew/pages/sharePage/sharePage.jsx

@@ -2,6 +2,7 @@ const React = require('react');
 const createClass = require('create-react-class');
 const _ = require('lodash');
 const cx = require('classnames');
+const Meta = require('vitreum/meta');
 
 const Nav = require('naturalcrit/nav/nav.jsx');
 const Navbar = require('../../navbar/navbar.jsx');
@@ -45,6 +46,7 @@ const SharePage = createClass({
 
 	render : function(){
 		return <div className='sharePage page'>
+			<Meta name='robots' content='noindex, nofollow' />
 			<Navbar>
 				<Nav.section>
 					<Nav.item className='brewTitle'>{this.props.brew.title}</Nav.item>

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

@@ -26,7 +26,7 @@ const BrewItem = createClass({
 			if(!confirm('Are you REALLY sure? You will lose editor access to this document.')) return;
 		}
 
-		request.get(`/api/remove/${this.props.brew.editId}`)
+		request.delete(`/api/${this.props.brew.editId}`)
 			.send()
 			.end(function(err, res){
 				location.reload();

client/homebrew/pages/userPage/userPage.jsx

@@ -42,15 +42,6 @@ const UserPage = createClass({
 		});
 	},
 
-	renderPrivateBrews : function(privateBrews){
-		if(!privateBrews || !privateBrews.length) return;
-
-		return [
-			<h1>{this.props.username}'s unpublished brews</h1>,
-			this.renderBrews(privateBrews)
-		];
-	},
-
 	render : function(){
 		const brews = this.getSortedBrews();
 
@@ -64,9 +55,14 @@ const UserPage = createClass({
 
 			<div className='content'>
 				<div className='phb'>
-					<h1>{this.props.username}'s brews</h1>
-					{this.renderBrews(brews.published)}
-					{this.renderPrivateBrews(brews.private)}
+					<div>
+						<h1>{this.props.username}'s brews</h1>
+						{this.renderBrews(brews.published)}
+					</div>
+					<div>
+						<h1>{this.props.username}'s unpublished brews</h1>
+						{this.renderBrews(brews.private)}
+					</div>
 				</div>
 			</div>
 		</div>;

client/homebrew/pages/userPage/userPage.less

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