Merge branch 'master' of https://github.com/naturalcrit/homebrewery into refactor-splitpane

client/homebrew/navbar/navbar.less

@@ -25,12 +25,11 @@
 
 .homebrew nav {
 	background-color : #333333;
-	.navContent {
 	position        : relative;
 	z-index         : 2;
 	display         : flex;
 	justify-content : space-between;
-	}
+	
 	.navSection {
 		display     : flex;
 		align-items : center;

client/homebrew/pages/editPage/editPage.jsx

@@ -429,7 +429,6 @@ const EditPage = createClass({
 			<Meta name='robots' content='noindex, nofollow' />
 			{this.renderNavbar()}
 
-			<div className='content'>
 			{this.props.brew.lock && <LockNotification shareId={this.props.brew.shareId} message={this.props.brew.lock.editMessage} />}
 			<SplitPane onDragFinish={this.handleSplitMove}>
 				<Editor
@@ -464,7 +463,6 @@ const EditPage = createClass({
 					allowPrint={true}
 				/>
 			</SplitPane>
-			</div>
 		</div>;
 	}
 });

client/homebrew/pages/homePage/homePage.jsx

@@ -100,8 +100,6 @@ const HomePage = createClass({
 		return <div className='homePage sitePage'>
 			<Meta name='google-site-verification' content='NwnAQSSJZzAT7N-p5MY6ydQ7Njm67dtbu73ZSyE5Fy4' />
 			{this.renderNavbar()}
-
-			<div className='content'>
 			<SplitPane onDragFinish={this.handleSplitMove}>
 				<Editor
 					ref={this.editor}
@@ -127,8 +125,6 @@ const HomePage = createClass({
 					themeBundle={this.state.themeBundle}
 				/>
 			</SplitPane>
-			</div>
-
 			<div className={cx('floatingSaveButton', { show: this.state.welcomeText != this.state.brew.text })} onClick={this.handleSave}>
 				Save current <i className='fas fa-save' />
 			</div>

client/homebrew/pages/homePage/welcome_msg.md

@@ -91,13 +91,6 @@ If you are looking for more 5e Homebrew resources check out [r/UnearthedArcana](
 
 \page
 
-
-
-
-
-
-
-
 ## Markdown+
 The Homebrewery aims to make homebrewing as simple as possible, providing a live editor with Markdown syntax that is more human-readable and faster to write with than raw HTML.
 

client/homebrew/pages/newPage/newPage.jsx

@@ -223,7 +223,6 @@ const NewPage = createClass({
 	render : function(){
 		return <div className='newPage sitePage'>
 			{this.renderNavbar()}
-			<div className='content'>
 			<SplitPane onDragFinish={this.handleSplitMove}>
 				<Editor
 					ref={this.editor}
@@ -255,7 +254,6 @@ const NewPage = createClass({
 					allowPrint={true}
 				/>
 			</SplitPane>
-			</div>
 		</div>;
 	}
 });

client/homebrew/pages/sharePage/sharePage.less

@@ -1,5 +1,5 @@
 .sharePage{
-	.navContent .navSection.titleSection {
+	nav .navSection.titleSection {
 		flex-grow: 1;
 		justify-content: center;
 	}

client/homebrew/pages/userPage/userPage.jsx

@@ -1,12 +1,11 @@
 const React = require('react');
-const createClass = require('create-react-class');
+const { useState } = React;
 const _ = require('lodash');
 
 const ListPage = require('../basePages/listPage/listPage.jsx');
 
 const Nav = require('naturalcrit/nav/nav.jsx');
 const Navbar = require('../../navbar/navbar.jsx');
-
 const RecentNavItem = require('../../navbar/recent.navitem.jsx').both;
 const Account = require('../../navbar/account.navitem.jsx');
 const NewBrew = require('../../navbar/newbrew.navitem.jsx');
@@ -14,69 +13,48 @@ const HelpNavItem = require('../../navbar/help.navitem.jsx');
 const ErrorNavItem = require('../../navbar/error-navitem.jsx');
 const VaultNavitem = require('../../navbar/vault.navitem.jsx');
 
-const UserPage = createClass({
+const UserPage = (props)=>{
-	displayName     : 'UserPage',
+	props = {
-	getDefaultProps : function() {
-		return {
 		username : '',
 		brews    : [],
 		query    : '',
-			error    : null
+		...props
 	};
-	},
-	getInitialState : function() {
-		const usernameWithS = this.props.username + (this.props.username.endsWith('s') ? `’` : `’s`);
 
-		const brews = _.groupBy(this.props.brews, (brew)=>{
+	const [error, setError] = useState(null);
-			return (brew.published ? 'published' : 'private');
+
-		});
+	const usernameWithS = props.username + (props.username.endsWith('s') ? `’` : `’s`);
+	const groupedBrews = _.groupBy(props.brews, (brew)=>brew.published ? 'published' : 'private');
 
 	const brewCollection = [
 		{
 			title : `${usernameWithS} published brews`,
 			class : 'published',
-				brews : brews.published
+			brews : groupedBrews.published || []
-			}
+		},
-		];
+		...(props.username === global.account?.username ? [{
-		if(this.props.username == global.account?.username){
-			brewCollection.push(
-				{
 			title : `${usernameWithS} unpublished brews`,
 			class : 'unpublished',
-					brews : brews.private
+			brews : groupedBrews.private || []
-				}
+		}] : [])
-			);
+	];
-		}
 
-		return {
+	const navItems = (
-			brewCollection : brewCollection
+		<Navbar>
-		};
-	},
-	errorReported : function(error) {
-		this.setState({
-			error
-		});
-	},
-
-	navItems : function() {
-		return <Navbar>
 			<Nav.section>
-				{this.state.error ?
+				{error && (<ErrorNavItem error={error} parent={null}></ErrorNavItem>)}
-					<ErrorNavItem error={this.state.error} parent={this}></ErrorNavItem> :
-					null
-				}
 				<NewBrew />
 				<HelpNavItem />
 				<VaultNavitem />
 				<RecentNavItem />
 				<Account />
 			</Nav.section>
-		</Navbar>;
+		</Navbar>
-	},
+	);
 
-	render : function(){
+	return (
-		return <ListPage brewCollection={this.state.brewCollection} navItems={this.navItems()} query={this.props.query} reportError={this.errorReported}></ListPage>;
+		<ListPage brewCollection={brewCollection}  navItems={navItems} query={props.query} reportError={(err)=>setError(err)} />
-	}
+	);
-});
+};
 
 module.exports = UserPage;

client/homebrew/pages/vaultPage/vaultPage.jsx

@@ -415,17 +415,14 @@ const VaultPage = (props)=>{
 			<link href='/themes/V3/Blank/style.css' rel='stylesheet' />
 			<link href='/themes/V3/5ePHB/style.css' rel='stylesheet' />
 			{renderNavItems()}
-			<div className='content'>
 			<SplitPane showDividerButtons={false}>
 				<div className='form dataGroup'>{renderForm()}</div>
-
 				<div className='resultsContainer dataGroup'>
 					{renderSortBar()}
 					{renderFoundBrews()}
 				</div>
 			</SplitPane>
 		</div>
-		</div>
 	);
 };
 

shared/naturalcrit/nav/nav.jsx

@@ -12,9 +12,7 @@ const Nav = {
 		displayName : 'Nav.base',
 		render      : function(){
 			return <nav>
-				<div className='navContent'>
 					{this.props.children}
-				</div>
 					</nav>;
 		}
 	}),