Status bar nearly done, first pass on the split pane workign for edit page

client/homebrew/architecture (T440s-002's conflicted copy 2016-01-03).json

@@ -0,0 +1,51 @@
+{
+	"C:\\Dropbox\\root\\Programming\\Javascript\\NaturalCrit\\client\\homebrew\\editPage\\editPage.jsx": [
+		"react",
+		"lodash",
+		"classnames",
+		"superagent",
+		"../phb/phb.jsx",
+		"../editor/editor.jsx"
+	],
+	"C:\\Dropbox\\root\\Programming\\Javascript\\NaturalCrit\\client\\homebrew\\sharePage\\sharePage.jsx": [
+		"react",
+		"lodash",
+		"classnames",
+		"../phb/phb.jsx"
+	],
+	"C:\\Dropbox\\root\\Programming\\Javascript\\NaturalCrit\\client\\homebrew\\statusbar\\statusbar.jsx": [
+		"react",
+		"lodash",
+		"classnames"
+	],
+	"C:\\Dropbox\\root\\Programming\\Javascript\\NaturalCrit\\client\\homebrew\\phb\\phb.jsx": [
+		"react",
+		"lodash",
+		"classnames",
+		"marked"
+	],
+	"C:\\Dropbox\\root\\Programming\\Javascript\\NaturalCrit\\client\\homebrew\\editor\\snippets.js": [],
+	"C:\\Dropbox\\root\\Programming\\Javascript\\NaturalCrit\\client\\homebrew\\editor\\editor.jsx": [
+		"react",
+		"lodash",
+		"classnames",
+		"./snippets.js"
+	],
+	"C:\\Dropbox\\root\\Programming\\Javascript\\NaturalCrit\\client\\homebrew\\homePage\\homePage.jsx": [
+		"react",
+		"lodash",
+		"classnames",
+		"../statusbar/statusbar.jsx",
+		"../phb/phb.jsx",
+		"../editor/editor.jsx"
+	],
+	"C:\\Dropbox\\root\\Programming\\Javascript\\NaturalCrit\\client\\homebrew\\homebrew.jsx": [
+		"react",
+		"lodash",
+		"classnames",
+		"pico-router",
+		"./editPage/editPage.jsx",
+		"./sharePage/sharePage.jsx",
+		"./homePage/homePage.jsx"
+	]
+}

client/homebrew/editPage/editPage.jsx

@@ -33,48 +33,42 @@ var EditPage = React.createClass({
 
 	handleTextChange : function(text){
 		this.setState({
-			text : text
+			text : text,
+			pending : true
 		});
-
+		this.save();
-		//Ajax time
 	},
 
-	handleSave : function(){
+	save : _.debounce(function(){
-		this.setState({
-			pending : true
-		})
 		request
 			.put('/homebrew/update/' + this.props.id)
 			.send({text : this.state.text})
 			.end((err, res) => {
-
-				console.log('err', err);
 				this.setState({
 					pending : false
 				})
 			})
-	},
+	}, 1500),
 
 	render : function(){
 
-		console.log(this.props.entry);
-
-		var temp;
-		if(this.state.pending){
-			temp = <div>processing</div>
-		}
-
-
 		return <div className='editPage'>
-			<button onClick={this.handleSave}>save</button> {temp}
-
 			<Statusbar
 				editId={this.props.entry.editId}
 				shareId={this.props.entry.shareId}
 				isPending={this.state.pending} />
 
-			<Editor text={this.state.text} onChange={this.handleTextChange} />
+			<div className='paneSplit'>
-			<PHB text={this.state.text} />
+				<div className='leftPane'>
+					<Editor text={this.state.text} onChange={this.handleTextChange} />
+				</div>
+				<div className='rightPane'>
+					<PHB text={this.state.text} />
+				</div>
+			</div>
+
+
+
 		</div>
 	}
 });

client/homebrew/editPage/editPage.less

@@ -1,3 +1,24 @@
 .editPage{
 
+	.paneSplit{
+		width : 100%;
+		max-height: 100%;
+		.leftPane, .rightPane{
+			display: inline-block;
+			vertical-align: top;
+			position: relative;
+			min-height: 100%;
+		}
+
+		.leftPane{
+			width : 40%;
+		}
+		.rightPane{
+			width : 60%;
+
+			overflow-y: scroll;
+		}
+
+	}
+
 }

client/homebrew/editor/editor.less

@@ -1,17 +1,20 @@
-.editor{
-	position : fixed;
-	height : 100%;
-	.textIcons{
-		display: inline-block;
-		vertical-align: top;
-		.icon{
-			cursor: pointer;
-			width : 30px;
-			height : 30px;
-			text-align: center;
-			line-height: 30px;
-			font-size: 1.5em;
 
+.editor{
+	position   : relative;
+	height     : 100%;
+	min-height : 100%;
+	width      : 100%;
+	.textIcons{
+		position       : absolute;
+		display        : inline-block;
+		vertical-align : top;
+		.icon{
+			height      : 30px;
+			width       : 30px;
+			cursor      : pointer;
+			font-size   : 1.5em;
+			line-height : 30px;
+			text-align  : center;
 			&:nth-child(8n + 1){ background-color: @blue; }
 			&:nth-child(8n + 2){ background-color: @orange; }
 			&:nth-child(8n + 3){ background-color: @teal; }
@@ -20,13 +23,13 @@
 			&:nth-child(8n + 6){ background-color: @silver; }
 			&:nth-child(8n + 7){ background-color: @yellow; }
 			&:nth-child(8n + 8){ background-color: @green; }
-
 		}
 	}
 	textarea{
-		display: inline-block;
+		display    : inline-block;
-		height : 100%;
+		resize     : none;
-		overflow-y: scroll;
+		overflow-y : scroll;
-		width : 300px;
+		height     : 100%;
+		width      : 100%;
 	}
 }

client/homebrew/homebrew.less

@@ -6,6 +6,7 @@
 
 html,body, #reactContainer{
 	min-height: 100%;
+	font-family      : 'Open Sans', sans-serif;
 }
 
 .homebrew{

client/homebrew/phb/phb.less

@@ -1,11 +1,11 @@
 
 .pbhPages{
+	background-color: @steel;
+	padding : 40px 0px;
 	&>.phb{
-		margin-bottom : 40px;
-		margin-top : 40px;
-		margin-left   : 400px;
 		box-shadow       : 1px 4px 14px #000;
-
+		margin-left: auto;
+		margin-right: auto;
 	}
 }
 @font-face {

client/homebrew/sharePage/sharePage.jsx

@@ -2,6 +2,8 @@ var React = require('react');
 var _ = require('lodash');
 var cx = require('classnames');
 
+var Statusbar = require('../statusbar/statusbar.jsx');
+
 var PHB = require('../phb/phb.jsx');
 
 var SharePage = React.createClass({
@@ -19,9 +21,13 @@ var SharePage = React.createClass({
 	},
 
 	render : function(){
-		console.log(this.props.entry);
 		return(
 			<div className='sharePage'>
+				<Statusbar
+					shareId={this.props.entry.shareId}
+					/>
+
+
 				<PHB text={this.props.entry.text} />
 			</div>
 		);

client/homebrew/statusbar/statusbar.jsx

@@ -4,6 +4,8 @@ var cx = require('classnames');
 
 var Logo = require('naturalCrit/logo/logo.jsx');
 
+
+
 var Statusbar = React.createClass({
 
 	getDefaultProps: function() {
@@ -16,33 +18,39 @@ var Statusbar = React.createClass({
 		};
 	},
 
+	selectInputText : function(refName){
+		this.refs[refName].select();
+	},
+
 	renderInfo : function(){
 		//render last update?
 		//number of times viewed?
 	},
 
 	renderNewButton  : function(){
-		if(this.props.editId) return null;
+		if(this.props.editId || this.props.shareId) return null;
 
 		return <a className='newButton' target='_blank' href='/homebrew/new'>
-			<i className='fa fa-new' />
+			New <i className='fa fa-plus' />
-			New
 		</a>
 	},
 
-	renderLinks : function(){
+	renderEdit : function(){
 		if(!this.props.editId) return null;
 
-		return [
+		return <div className='editField' key='edit' onClick={this.selectInputText.bind(this, 'edit')}>
-			<div className='' key='edit'>
+			<span>Edit Link</span>
-				<span>Edit Link</span>
+			<input type='text' readOnly value={'/homebrew/edit/' + this.props.editId} ref='edit' />
-				<input type='text' readOnly value={this.props.editId} />
+		</div>
-			</div>,
+	},
-			<div className='' key='share'>
+
-				<a herf={'/share/' + this.props.shareId}>Share Link</a>
+	renderShare : function(){
-				<input type='text' readOnly value={this.props.shareId} />
+		if(!this.props.shareId) return null;
-			</div>
+
-		]
+		return <div className='shareField' key='share' onClick={this.selectInputText.bind(this, 'share')}>
+			<span>Share Link</span>
+			<input type='text' readOnly value={'/homebrew/share/' + this.props.shareId} ref='share'/>
+		</div>
 	},
 
 	renderStatus : function(){
@@ -58,14 +66,22 @@ var Statusbar = React.createClass({
 	},
 
 	render : function(){
-		console.log(this.props);
 		return <div className='statusbar'>
-			<Logo />
-			Statusbar Ready!
 
-			<div className='controls'>
+			<Logo />
-				{this.renderLinks()}
+
+			<div className='left'>
+				<div className='toolName'>
+					Home<i className='fa fa-beer' /><small>rewery</small>
+				</div>
+
+			</div>
+
+			<div className='controls right'>
 				{this.renderStatus()}
+				{this.renderEdit()}
+				{this.renderShare()}
+
 				{this.renderNewButton()}
 			</div>
 		</div>

client/homebrew/statusbar/statusbar.less

@@ -1,12 +1,60 @@
-.statusbar{
-	font-size        : 1.8em;
-			color            : white;
-	svg{
-		vertical-align : middle;
-		height         : 1em;
-		margin-right   : 0.2em;
-		cursor         : pointer;
-		fill           : white;
-	}
 
+.statusbar{
+	height           : 1.0em;
+	background-color : black;
+	font-size        : 24px;
+	color            : white;
+	line-height      : 1.0em;
+	border-bottom    : 1px solid @grey;
+	.logo{
+		display        : inline-block;
+		vertical-align : middle;
+		margin-right   : 40px;
+	}
+	.left{
+		display : inline-block;
+	}
+	.right{
+		float : right;
+	}
+	.toolName{
+		vertical-align : middle;
+		font-family    : CodeBold;
+		font-size      : 16px;
+		line-height    : 100%;
+		small{
+			font-family : CodeBold;
+		}
+	}
+	.controls{
+		font-size : 12px;
+		>*{
+			display     : inline-block;
+			height      : 100%;
+			padding     : 0px 10px;
+			border-left : 1px solid @grey;
+		}
+		.savingStatus{
+			width      : 56px;
+			color      : @grey;
+			text-align : center;
+		}
+		.newButton{
+			.animate(background-color);
+			color           : white;
+			text-decoration : none;
+			&:hover{
+				background-color : rgba(255,0,0,0.4);
+			}
+		}
+		.editField, .shareField{
+			span{
+				margin-right : 10px;
+			}
+			input{
+				width : 100px;
+				font-size: 12px;
+			}
+		}
+	}
 }

shared/naturalCrit/logo/logo.jsx

@@ -5,6 +5,10 @@ var Logo = React.createClass({
 		return <div className='logo' {... this.props}>
 			<svg version="1.1" x="0px" y="0px" viewBox="0 0 100 100" enable-background="new 0 0 100 100"><path d="M80.644,87.982l16.592-41.483c0.054-0.128,0.088-0.26,0.108-0.394c0.006-0.039,0.007-0.077,0.011-0.116  c0.007-0.087,0.008-0.174,0.002-0.26c-0.003-0.046-0.007-0.091-0.014-0.137c-0.014-0.089-0.036-0.176-0.063-0.262  c-0.012-0.034-0.019-0.069-0.031-0.103c-0.047-0.118-0.106-0.229-0.178-0.335c-0.004-0.006-0.006-0.012-0.01-0.018L67.999,3.358  c-0.01-0.013-0.003-0.026-0.013-0.04L68,3.315V4c0,0-0.033,0-0.037,0c-0.403-1-1.094-1.124-1.752-0.976  c0,0.004-0.004-0.012-0.007-0.012C66.201,3.016,66.194,3,66.194,3H66.19h-0.003h-0.003h-0.004h-0.003c0,0-0.004,0-0.007,0  s-0.003-0.151-0.007-0.151L20.495,15.227c-0.025,0.007-0.046-0.019-0.071-0.011c-0.087,0.028-0.172,0.041-0.253,0.083  c-0.054,0.027-0.102,0.053-0.152,0.085c-0.051,0.033-0.101,0.061-0.147,0.099c-0.044,0.036-0.084,0.073-0.124,0.113  c-0.048,0.048-0.093,0.098-0.136,0.152c-0.03,0.039-0.059,0.076-0.085,0.117c-0.046,0.07-0.084,0.145-0.12,0.223  c-0.011,0.023-0.027,0.042-0.036,0.066L2.911,57.664C2.891,57.715,3,57.768,3,57.82v0.002c0,0.186,0,0.375,0,0.562  c0,0.004,0,0.004,0,0.008c0,0,0,0,0,0.002c0,0,0,0,0,0.004v0.004v0.002c0,0.074-0.002,0.15,0.012,0.223  C3.015,58.631,3,58.631,3,58.633c0,0.004,0,0.004,0,0.008c0,0,0,0,0,0.002c0,0,0,0,0,0.004v0.004c0,0,0,0,0,0.002v0.004  c0,0.191-0.046,0.377,0.06,0.545c0-0.002-0.03,0.004-0.03,0.004c0,0.004-0.03,0.004-0.03,0.004c0,0.002,0,0.002,0,0.002  l-0.045,0.004c0.03,0.047,0.036,0.09,0.068,0.133l29.049,37.359c0.002,0.004,0,0.006,0.002,0.01c0.002,0.002,0,0.004,0.002,0.008  c0.006,0.008,0.014,0.014,0.021,0.021c0.024,0.029,0.052,0.051,0.078,0.078c0.027,0.029,0.053,0.057,0.082,0.082  c0.03,0.027,0.055,0.062,0.086,0.088c0.026,0.02,0.057,0.033,0.084,0.053c0.04,0.027,0.081,0.053,0.123,0.076  c0.005,0.004,0.01,0.008,0.016,0.01c0.087,0.051,0.176,0.09,0.269,0.123c0.042,0.014,0.082,0.031,0.125,0.043  c0.021,0.006,0.041,0.018,0.062,0.021c0.123,0.027,0.249,0.043,0.375,0.043c0.099,0,0.202-0.012,0.304-0.027l45.669-8.303  c0.057-0.01,0.108-0.021,0.163-0.037C79.547,88.992,79.562,89,79.575,89c0.004,0,0.004,0,0.004,0c0.021,0,0.039-0.027,0.06-0.035  c0.041-0.014,0.08-0.034,0.12-0.052c0.021-0.01,0.044-0.019,0.064-0.03c0.017-0.01,0.026-0.015,0.033-0.017  c0.014-0.008,0.023-0.021,0.037-0.028c0.14-0.078,0.269-0.174,0.38-0.285c0.014-0.016,0.024-0.034,0.038-0.048  c0.109-0.119,0.201-0.252,0.271-0.398c0.006-0.01,0.016-0.018,0.021-0.029c0.004-0.008,0.008-0.017,0.011-0.026  c0.002-0.004,0.003-0.006,0.005-0.01C80.627,88.021,80.635,88.002,80.644,87.982z M77.611,84.461L48.805,66.453l32.407-25.202  L77.611,84.461z M46.817,63.709L35.863,23.542l43.818,14.608L46.817,63.709z M84.668,40.542l8.926,5.952l-11.902,29.75  L84.668,40.542z M89.128,39.446L84.53,36.38l-6.129-12.257L89.128,39.446z M79.876,34.645L37.807,20.622L65.854,6.599L79.876,34.645  z M33.268,19.107l-6.485-2.162l23.781-6.487L33.268,19.107z M21.92,18.895l8.67,2.891L10.357,47.798L21.92,18.895z M32.652,24.649  l10.845,39.757L7.351,57.178L32.652,24.649z M43.472,67.857L32.969,92.363L8.462,60.855L43.472,67.857z M46.631,69.09l27.826,17.393  l-38.263,6.959L46.631,69.09z"></path></svg>
 
+			<span className='name'>
+				Natural<span className='crit'>Crit</span>
+			</span>
+
 		</div>
 	}
 });

shared/naturalCrit/logo/logo.less

@@ -0,0 +1,35 @@
+@font-face {
+	font-family : CodeLight;
+	src         : url('/assets/naturalCrit/logo/CODE Light.otf');
+}
+@font-face {
+	font-family : CodeBold;
+	src         : url('/assets/naturalCrit/logo/CODE Bold.otf');
+}
+
+
+.logo{
+
+	svg{
+		vertical-align : middle;
+		height         : 1em;
+		margin-right   : 0.2em;
+		cursor         : pointer;
+		fill           : white;
+	}
+
+	span.name{
+		font-size: 0.9em;
+		line-height: 0.5em;
+		font-family : 'CodeLight';
+		span.crit{
+			font-family : 'CodeBold';
+		}
+		small{
+			font-size: 0.3em;
+			font-family : 'Open Sans';
+			font-weight: 800;
+			text-transform: uppercase;
+		}
+	}
+}

todo.txt

@@ -0,0 +1,2 @@
+- Merge homebrew back into natural crit (maybe?)
+-