From 62d70022e7a1560d4f0b3cb51513d9c20af06c90 Mon Sep 17 00:00:00 2001
From: Scott Tolksdorf <scott.tolksdorf@gmail.com>
Date: Sat, 20 Aug 2016 12:02:48 -0400
Subject: [PATCH] Package version is now loaded into the navbar

---
 changelog.md                                  |  4 +++
 client/homebrew/homebrew.jsx                  | 35 ++++++++++++-------
 client/homebrew/navbar/navbar.jsx             |  5 +--
 client/homebrew/pages/editPage/editPage.jsx   |  3 +-
 client/homebrew/pages/homePage/homePage.jsx   |  5 +--
 client/homebrew/pages/newPage/newPage.jsx     |  3 +-
 client/homebrew/pages/sharePage/sharePage.jsx |  3 +-
 package.json                                  |  2 +-
 server.js                                     | 16 ++++++---
 9 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/changelog.md b/changelog.md
index f071e4e..df7e68e 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,9 @@
 # changelog
 
+### Saturday, 20/08/2016 - v2.3.0
+- Added in a license file
+- Updated the welcome text
+
 ### Friday, 29/07/2016 - v2.2.7
 - Adding in descriptive note blocks. (Thanks calculuschild!)
 
diff --git a/client/homebrew/homebrew.jsx b/client/homebrew/homebrew.jsx
index 8e51720..f5e92ee 100644
--- a/client/homebrew/homebrew.jsx
+++ b/client/homebrew/homebrew.jsx
@@ -13,9 +13,10 @@ var Router;
 var Homebrew = React.createClass({
 	getDefaultProps: function() {
 		return {
-			url : "",
-			welcomeText : "",
-			changelog : "",
+			url : '',
+			welcomeText : '',
+			changelog : '',
+			version : '0.0.0',
 			brew : {
 				title : '',
 				text : '',
@@ -29,27 +30,35 @@ var Homebrew = React.createClass({
 	componentWillMount: function() {
 		Router = CreateRouter({
 			'/edit/:id' : (args) => {
-				return <EditPage id={args.id} brew={this.props.brew} />
+				return <EditPage
+					ver={this.props.version}
+					id={args.id}
+					brew={this.props.brew} />
 			},
 
 			'/share/:id' : (args) => {
-				return <SharePage id={args.id} brew={this.props.brew} />
+				return <SharePage
+					ver={this.props.version}
+					id={args.id}
+					brew={this.props.brew} />
 			},
 			'/changelog' : (args) => {
-				return <SharePage brew={{title : 'Changelog', text : this.props.changelog}} />
+				return <SharePage
+					ver={this.props.version}
+					brew={{title : 'Changelog', text : this.props.changelog}} />
 			},
 			'/new' : (args) => {
-				return <NewPage />
+				return <NewPage ver={this.props.version} />
 			},
-			'*' : <HomePage welcomeText={this.props.welcomeText} />,
+			'*' : <HomePage
+					ver={this.props.version}
+					welcomeText={this.props.welcomeText} />,
 		});
 	},
 	render : function(){
-		return(
-			<div className='homebrew'>
-				<Router initialUrl={this.props.url}/>
-			</div>
-		);
+		return <div className='homebrew'>
+			<Router initialUrl={this.props.url}/>
+		</div>
 	}
 });
 
diff --git a/client/homebrew/navbar/navbar.jsx b/client/homebrew/navbar/navbar.jsx
index 7c82206..7ba89a0 100644
--- a/client/homebrew/navbar/navbar.jsx
+++ b/client/homebrew/navbar/navbar.jsx
@@ -6,7 +6,8 @@ var Nav = require('naturalcrit/nav/nav.jsx');
 var Navbar = React.createClass({
 	getInitialState: function() {
 		return {
-			showNonChromeWarning : false
+			showNonChromeWarning : false,
+			ver : '0.0.0'
 		};
 	},
 
@@ -34,7 +35,7 @@ var Navbar = React.createClass({
 				<Nav.item href='/' className='homebrewLogo'>
 					<div>The Homebrewery</div>
 				</Nav.item>
-				<Nav.item>v2.2.8</Nav.item>
+				<Nav.item>{`v${this.props.ver}`}</Nav.item>
 
 				{this.renderChromeWarning()}
 			</Nav.section>
diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx
index 5c6bda6..4b923b5 100644
--- a/client/homebrew/pages/editPage/editPage.jsx
+++ b/client/homebrew/pages/editPage/editPage.jsx
@@ -27,6 +27,7 @@ const SAVE_TIMEOUT = 3000;
 var EditPage = React.createClass({
 	getDefaultProps: function() {
 		return {
+			ver : '0.0.0',
 			id : null,
 			brew : {
 				title : '',
@@ -170,7 +171,7 @@ var EditPage = React.createClass({
 		}
 	},
 	renderNavbar : function(){
-		return <Navbar>
+		return <Navbar ver={this.props.ver}>
 			<Nav.section>
 				<EditTitle title={this.state.title} onChange={this.handleTitleChange} />
 			</Nav.section>
diff --git a/client/homebrew/pages/homePage/homePage.jsx b/client/homebrew/pages/homePage/homePage.jsx
index 6023d43..7e3a703 100644
--- a/client/homebrew/pages/homePage/homePage.jsx
+++ b/client/homebrew/pages/homePage/homePage.jsx
@@ -19,7 +19,8 @@ var BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
 var HomePage = React.createClass({
 	getDefaultProps: function() {
 		return {
-			welcomeText : ""
+			welcomeText : '',
+			ver : '0.0.0'
 		};
 	},
 	getInitialState: function() {
@@ -48,7 +49,7 @@ var HomePage = React.createClass({
 		});
 	},
 	renderNavbar : function(){
-		return <Navbar>
+		return <Navbar ver={this.props.ver}>
 			<Nav.section>
 				<PatreonNavItem />
 				<IssueNavItem />
diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx
index 448c70c..eeb74ff 100644
--- a/client/homebrew/pages/newPage/newPage.jsx
+++ b/client/homebrew/pages/newPage/newPage.jsx
@@ -19,6 +19,7 @@ const KEY = 'homebrewery-new';
 var NewPage = React.createClass({
 	getInitialState: function() {
 		return {
+			ver : '0.0.0',
 			title : 'My Awesome Brew v99',
 			text: '',
 			isSaving : false
@@ -98,7 +99,7 @@ var NewPage = React.createClass({
 	},
 
 	renderNavbar : function(){
-		return <Navbar>
+		return <Navbar ver={this.props.ver}>
 			<Nav.section>
 				<EditTitle title={this.state.title} onChange={this.handleTitleChange} />
 			</Nav.section>
diff --git a/client/homebrew/pages/sharePage/sharePage.jsx b/client/homebrew/pages/sharePage/sharePage.jsx
index aa9c860..ebe2f54 100644
--- a/client/homebrew/pages/sharePage/sharePage.jsx
+++ b/client/homebrew/pages/sharePage/sharePage.jsx
@@ -14,6 +14,7 @@ var HijackPrint = require('../hijackPrint.js');
 var SharePage = React.createClass({
 	getDefaultProps: function() {
 		return {
+			ver : '0.0.0',
 			brew : {
 				title : '',
 				text : '',
@@ -34,7 +35,7 @@ var SharePage = React.createClass({
 
 	render : function(){
 		return <div className='sharePage page'>
-			<Navbar>
+			<Navbar ver={this.props.ver}>
 				<Nav.section>
 					<Nav.item className='brewTitle'>{this.props.brew.title}</Nav.item>
 				</Nav.section>
diff --git a/package.json b/package.json
index 55a06fd..98be049 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebrewery",
   "description": "Create authentic looking D&D homebrews using only markdown",
-  "version": "2.2.8",
+  "version": "2.3.0",
   "scripts": {
     "postinstall": "gulp prod",
     "start": "node server.js"
diff --git a/server.js b/server.js
index a8b9c88..47dd148 100644
--- a/server.js
+++ b/server.js
@@ -43,7 +43,7 @@ app.get('/admin', function(req, res){
 
 //Populate homebrew routes
 app = require('./server/homebrew.api.js')(app);
-//app = require('./server/homebrew.server.js')(app);
+
 
 var HomebrewModel = require('./server/homebrew.model.js').model;
 
@@ -53,6 +53,11 @@ var sanitizeBrew = function(brew){
 	return cleanBrew;
 };
 
+//Load project version
+var projectVersion = require('./package.json').version;
+
+console.log(projectVersion);
+
 
 //Edit Page
 app.get('/edit/:id', function(req, res){
@@ -71,7 +76,8 @@ app.get('/edit/:id', function(req, res){
 			prerenderWith : './client/homebrew/homebrew.jsx',
 			initialProps: {
 				url: req.originalUrl,
-				brew : resObj || errObj
+				brew : resObj || errObj,
+				version : projectVersion
 			},
 			clearRequireCache : !process.env.PRODUCTION,
 		}, function (err, page) {
@@ -102,7 +108,8 @@ app.get('/share/:id', function(req, res){
 			prerenderWith : './client/homebrew/homebrew.jsx',
 			initialProps: {
 				url: req.originalUrl,
-				brew : sanitizeBrew(resObj.toJSON() || errObj)
+				brew : sanitizeBrew(resObj.toJSON() || errObj),
+				version : projectVersion
 			},
 			clearRequireCache : !process.env.PRODUCTION,
 		}, function (err, page) {
@@ -160,7 +167,8 @@ app.get('*', function (req, res) {
 		initialProps: {
 			url: req.originalUrl,
 			welcomeText : welcomeText,
-			changelog : changelogText
+			changelog : changelogText,
+			version : projectVersion
 		},
 		clearRequireCache : !process.env.PRODUCTION,
 	}, function (err, page) {