newPage is now working, working on editpage

client/homebrew/pages/editPage/editPage.jsx

@@ -10,35 +10,31 @@ const Navbar = require('../../navbar/navbar.jsx');
 const ReportIssue = require('../../navbar/issue.navitem.jsx');
 const PrintLink = require('../../navbar/print.navitem.jsx');
 const Account = require('../../navbar/account.navitem.jsx');
+const Save = require('../../navbar/continousSave.navitem.jsx');
 //const RecentlyEdited = require('../../navbar/recent.navitem.jsx').edited;
 
-const SplitPane = require('naturalcrit/splitPane/splitPane.jsx');
-const Editor = require('../../editor/editor.jsx');
-const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
+
 
 const Markdown = require('homebrewery/markdown.js');
 
-
 const SAVE_TIMEOUT = 3000;
 
 
+const BrewInterface = require('homebrewery/brewInterface/brewInterface.jsx');
+const Utils = require('homebrewery/utils.js');
+
+
+const Store = require('homebrewery/brew.store.js');
+const Actions = require('homebrewery/brew.actions.js');
+
+
+
+
+
 const EditPage = React.createClass({
 	getDefaultProps: function() {
 		return {
-			brew : {
-				text : '',
-				shareId : null,
-				editId : null,
-				createdAt : null,
-				updatedAt : null,
-
-				title : '',
-				description : '',
-				tags : '',
-				published : false,
-				authors : [],
-				systems : []
-			}
+			brew : {}
 		};
 	},
 
@@ -56,17 +52,11 @@ const EditPage = React.createClass({
 	savedBrew : null,
 
 	componentDidMount: function(){
-		this.trySave();
+		//this.trySave();
 		window.onbeforeunload = ()=>{
-			if(this.state.isSaving || this.state.isPending){
-				return 'You have unsaved changes!';
-			}
+			if(Store.getStatus() !== 'ready') return 'You have unsaved changes!';
 		};
 
-		this.setState({
-			htmlErrors : Markdown.validate(this.state.brew.text)
-		})
-
 		document.addEventListener('keydown', this.handleControlKeys);
 	},
 	componentWillUnmount: function() {
@@ -75,12 +65,20 @@ const EditPage = React.createClass({
 	},
 
 
+	handleControlKeys : Utils.controlKeys({
+		s : Actions.pendingSave,
+		p : ()=>{
+			window.open(`/print/${this.props.brew.shareId}?dialog=true`, '_blank').focus();
+		}
+	}),
+
+/*
 	handleControlKeys : function(e){
 		if(!(e.ctrlKey || e.metaKey)) return;
 		const S_KEY = 83;
 		const P_KEY = 80;
 		if(e.keyCode == S_KEY) this.save();
-		if(e.keyCode == P_KEY) window.open(`/print/${this.props.brew.shareId}?dialog=true`, '_blank').focus();
+		if(e.keyCode == P_KEY)
 		if(e.keyCode == P_KEY || e.keyCode == S_KEY){
 			e.stopPropagation();
 			e.preventDefault();
@@ -115,7 +113,7 @@ const EditPage = React.createClass({
 
 		this.trySave();
 	},
-
+*/
 	hasChanges : function(){
 		if(this.savedBrew){
 			return !_.isEqual(this.state.brew, this.savedBrew)
@@ -214,16 +212,7 @@ const EditPage = React.createClass({
 			{this.renderNavbar()}
 
 			<div className='content'>
-				<SplitPane onDragFinish={this.handleSplitMove} ref='pane'>
-					<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>
+				<BrewInterface />
 			</div>
 		</div>
 	}

client/homebrew/pages/homePage/homePage.jsx

@@ -10,10 +10,6 @@ const RecentNavItem = require('../../navbar/recent.navitem.jsx');
 const AccountNavItem = require('../../navbar/account.navitem.jsx');
 
 
-const SplitPane = require('naturalcrit/splitPane/splitPane.jsx');
-const Editor = require('../../editor/editor.smart.jsx');
-const BrewRenderer = require('../../brewRenderer/brewRenderer.smart.jsx');
-
 const BrewInterface = require('homebrewery/brewInterface/brewInterface.jsx');
 
 
@@ -40,7 +36,7 @@ const HomePage = React.createClass({
 	},
 
 	renderNavbar : function(){
-		return <Navbar ver={this.props.ver}>
+		return <Navbar>
 			<Nav.section>
 				<PatreonNavItem />
 				<IssueNavItem />

client/homebrew/pages/newPage/newPage.jsx

@@ -1,23 +1,26 @@
 const React = require('react');
 const _ = require('lodash');
-const cx = require('classnames');
-const request = require("superagent");
 
-const Markdown = require('homebrewery/markdown.js');
 
 const Nav = require('naturalcrit/nav/nav.jsx');
 const Navbar = require('../../navbar/navbar.jsx');
-const AccountNavItem = require('../../navbar/account.navitem.jsx');
-const IssueNavItem = require('../../navbar/issue.navitem.jsx');
+const Account = require('../../navbar/account.navitem.jsx');
+const Issue = require('../../navbar/issue.navitem.jsx');
+const Save = require('../../navbar/staticSave.navitem.jsx');
 
-const SplitPane = require('naturalcrit/splitPane/splitPane.jsx');
-const Editor = require('../../editor/editor.jsx');
-const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
+
+const Store = require('homebrewery/brew.store.js');
+const Actions = require('homebrewery/brew.actions.js');
+
+const BrewInterface = require('homebrewery/brewInterface/brewInterface.jsx');
+
+const Utils = require('homebrewery/utils.js');
 
 
 const KEY = 'homebrewery-new';
 
 const NewPage = React.createClass({
+	/*
 	getInitialState: function() {
 		return {
 			metadata : {
@@ -34,8 +37,13 @@ const NewPage = React.createClass({
 			errors : []
 		};
 	},
+	*/
 	componentDidMount: function() {
 		const storage = localStorage.getItem(KEY);
+
+		//TODO: Add aciton to load from local?
+
+
 		if(storage){
 			this.setState({
 				text : storage
@@ -46,8 +54,15 @@ const NewPage = React.createClass({
 	componentWillUnmount: function() {
 		document.removeEventListener('keydown', this.handleControlKeys);
 	},
+	handleControlKeys : Utils.controlKeys({
+		s : Actions.saveNew,
+		p : Actions.localPrint
+	}),
+
+/*
 
 	handleControlKeys : function(e){
+		console.log(e);
 		if(!(e.ctrlKey || e.metaKey)) return;
 		const S_KEY = 83;
 		const P_KEY = 80;
@@ -59,24 +74,7 @@ const NewPage = React.createClass({
 		}
 	},
 
-	handleSplitMove : function(){
-		this.refs.editor.update();
-	},
-
-	handleMetadataChange : function(metadata){
-		this.setState({
-			metadata : _.merge({}, this.state.metadata, metadata)
-		});
-	},
-
-	handleTextChange : function(text){
-		this.setState({
-			text : text,
-			errors : Markdown.validate(text)
-		});
-		localStorage.setItem(KEY, text);
-	},
-
+/*
 	save : function(){
 		this.setState({
 			isSaving : true
@@ -99,7 +97,8 @@ const NewPage = React.createClass({
 				window.location = '/edit/' + brew.editId;
 			})
 	},
-
+*/
+	/*
 	renderSaveButton : function(){
 		if(this.state.isSaving){
 			return <Nav.item icon='fa-spinner fa-spin' className='saveButton'>
@@ -111,48 +110,45 @@ const NewPage = React.createClass({
 			</Nav.item>
 		}
 	},
-
+	*/
+/*
 	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.print}>
+		return <Nav.item color='purple' icon='fa-file-pdf-o' onClick={Actions.localPrint}>
 			get PDF
 		</Nav.item>
 	},
 
 	renderNavbar : function(){
-		return <Navbar>
-
-			<Nav.section>
-				<Nav.item className='brewTitle'>{this.state.metadata.title}</Nav.item>
-			</Nav.section>
-
-			<Nav.section>
-				{this.renderSaveButton()}
-				{this.renderLocalPrintButton()}
-				<IssueNavItem />
-				<AccountNavItem />
-			</Nav.section>
-		</Navbar>
+		return
 	},
 
+*/
 	render : function(){
 		return <div className='newPage page'>
-			{this.renderNavbar()}
+			<Navbar>
+				<Nav.section>
+					<Nav.item className='brewTitle'>{Store.getMetaData().title}</Nav.item>
+				</Nav.section>
+
+				<Nav.section>
+					<Save />
+					<Nav.item color='purple' icon='fa-file-pdf-o' onClick={Actions.localPrint}>
+						get PDF
+					</Nav.item>
+					<Issue />
+					<Account />
+				</Nav.section>
+			</Navbar>
+
 			<div className='content'>
-				<SplitPane onDragFinish={this.handleSplitMove} ref='pane'>
-					<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>
+				<BrewInterface />
 			</div>
 		</div>
 	}

client/homebrew/pages/newPage/newPage.less

@@ -1,10 +1,4 @@
 .newPage{
 
-	.saveButton{
-		background-color: @orange;
-		&:hover{
-			background-color: @green;
-		}
-	}
 
 }

client/homebrew/pages/printPage/printPage.jsx

@@ -12,21 +12,17 @@ const PrintPage = React.createClass({
 			}
 		};
 	},
-
 	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