Adding quick fix for PPR getting out of sync

changelog.md

@@ -1,5 +1,8 @@
 # changelog
 
+### Friday, 03/03/2017 - v2.7.3
+- Increasing the range on the Partial Page Rendering for a quick-fix for it getting out of sync on long brews.
+
 ### Saturday, 18/02/2017 - v2.7.2
 - Adding ability to delete a brew from the user page, incase the user creates a brew that makes the edit page unrender-able. (re:309)
 

client/homebrew/brewRenderer/brewRenderer.jsx

@@ -77,9 +77,13 @@ const BrewRenderer = React.createClass({
 		if(!this.state.isMounted) return false;
 
 		var viewIndex = this.state.viewablePageNumber;
+		if(index == viewIndex - 3) return true;
+		if(index == viewIndex - 2) return true;
 		if(index == viewIndex - 1) return true;
 		if(index == viewIndex)     return true;
 		if(index == viewIndex + 1) return true;
+		if(index == viewIndex + 2) return true;
+		if(index == viewIndex + 3) return true;
 
 		//Check for style tages
 		if(pageText.indexOf('<style>') !== -1) return true;

package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebrewery",
   "description": "Create authentic looking D&D homebrews using only markdown",
-  "version": "2.7.2",
+  "version": "2.7.3",
   "scripts": {
     "dev": "node scripts/dev.js",
     "quick": "node scripts/quick.js",

server.js

@@ -1,140 +1,140 @@
-const _ = require('lodash');
+const _ = require('lodash');
-const jwt = require('jwt-simple');
+const jwt = require('jwt-simple');
-const express = require("express");
+const express = require("express");
-const app = express();
+const app = express();
-
+
-app.use(express.static(__dirname + '/build'));''
+app.use(express.static(__dirname + '/build'));''
-app.use(require('body-parser').json({limit: '25mb'}));
+app.use(require('body-parser').json({limit: '25mb'}));
-app.use(require('cookie-parser')());
+app.use(require('cookie-parser')());
-
+
-const config = require('nconf')
+const config = require('nconf')
-	.argv()
+	.argv()
-	.env({ lowerCase: true })
+	.env({ lowerCase: true })
-	.file('environment', { file: `config/${process.env.NODE_ENV}.json` })
+	.file('environment', { file: `config/${process.env.NODE_ENV}.json` })
-	.file('defaults', { file: 'config/default.json' });
+	.file('defaults', { file: 'config/default.json' });
-
+
-//DB
+//DB
-require('mongoose')
+require('mongoose')
-	.connect(process.env.MONGODB_URI || process.env.MONGOLAB_URI || 'mongodb://localhost/naturalcrit')
+	.connect(process.env.MONGODB_URI || process.env.MONGOLAB_URI || 'mongodb://localhost/naturalcrit')
-	.connection.on('error', () => {
+	.connection.on('error', () => {
-		console.log('Error : Could not connect to a Mongo Database.');
+		console.log('Error : Could not connect to a Mongo Database.');
-		console.log('        If you are running locally, make sure mongodb.exe is running.');
+		console.log('        If you are running locally, make sure mongodb.exe is running.');
-	});
+	});
-
+
-
+
-//Account MIddleware
+//Account MIddleware
-app.use((req, res, next) => {
+app.use((req, res, next) => {
-	if(req.cookies && req.cookies.nc_session){
+	if(req.cookies && req.cookies.nc_session){
-		try{
+		try{
-			req.account = jwt.decode(req.cookies.nc_session, config.get('secret'));
+			req.account = jwt.decode(req.cookies.nc_session, config.get('secret'));
-		}catch(e){}
+		}catch(e){}
-	}
+	}
-	return next();
+	return next();
-});
+});
-
+
-
+
-app.use(require('./server/homebrew.api.js'));
+app.use(require('./server/homebrew.api.js'));
-app.use(require('./server/admin.api.js'));
+app.use(require('./server/admin.api.js'));
-
+
-
+
-const HomebrewModel = require('./server/homebrew.model.js').model;
+const HomebrewModel = require('./server/homebrew.model.js').model;
-const welcomeText = require('fs').readFileSync('./client/homebrew/pages/homePage/welcome_msg.md', 'utf8');
+const welcomeText = require('fs').readFileSync('./client/homebrew/pages/homePage/welcome_msg.md', 'utf8');
-const changelogText = require('fs').readFileSync('./changelog.md', 'utf8');
+const changelogText = require('fs').readFileSync('./changelog.md', 'utf8');
-
+
-
+
-//Source page
+//Source page
-String.prototype.replaceAll = function(s,r){return this.split(s).join(r)}
+String.prototype.replaceAll = function(s,r){return this.split(s).join(r)}
-app.get('/source/:id', (req, res)=>{
+app.get('/source/:id', (req, res)=>{
-	HomebrewModel.get({shareId : req.params.id})
+	HomebrewModel.get({shareId : req.params.id})
-		.then((brew)=>{
+		.then((brew)=>{
-			const text = brew.text.replaceAll('<', '&lt;').replaceAll('>', '&gt;');
+			const text = brew.text.replaceAll('<', '&lt;').replaceAll('>', '&gt;');
-			return res.send(`<code><pre>${text}</pre></code>`);
+			return res.send(`<code><pre>${text}</pre></code>`);
-		})
+		})
-		.catch((err)=>{
+		.catch((err)=>{
-			console.log(err);
+			console.log(err);
-			return res.status(404).send('Could not find Homebrew with that id');
+			return res.status(404).send('Could not find Homebrew with that id');
-		})
+		})
-});
+});
-
+
-
+
-app.get('/user/:username', (req, res, next) => {
+app.get('/user/:username', (req, res, next) => {
-	const fullAccess = req.account && (req.account.username == req.params.username);
+	const fullAccess = req.account && (req.account.username == req.params.username);
-	HomebrewModel.getByUser(req.params.username, fullAccess)
+	HomebrewModel.getByUser(req.params.username, fullAccess)
-		.then((brews) => {
+		.then((brews) => {
-			req.brews = brews;
+			req.brews = brews;
-			return next();
+			return next();
-		})
+		})
-		.catch((err) => {
+		.catch((err) => {
-			console.log(err);
+			console.log(err);
-		})
+		})
-})
+})
-
+
-
+
-app.get('/edit/:id', (req, res, next)=>{
+app.get('/edit/:id', (req, res, next)=>{
-	HomebrewModel.get({editId : req.params.id})
+	HomebrewModel.get({editId : req.params.id})
-		.then((brew)=>{
+		.then((brew)=>{
-			req.brew = brew.sanatize();
+			req.brew = brew.sanatize();
-			return next();
+			return next();
-		})
+		})
-		.catch((err)=>{
+		.catch((err)=>{
-			console.log(err);
+			console.log(err);
-			return res.status(400).send(`Can't get that`);
+			return res.status(400).send(`Can't get that`);
-		});
+		});
-});
+});
-
+
-//Share Page
+//Share Page
-app.get('/share/:id', (req, res, next)=>{
+app.get('/share/:id', (req, res, next)=>{
-	HomebrewModel.get({shareId : req.params.id})
+	HomebrewModel.get({shareId : req.params.id})
-		.then((brew)=>{
+		.then((brew)=>{
-			return brew.increaseView();
+			return brew.increaseView();
-		})
+		})
-		.then((brew)=>{
+		.then((brew)=>{
-			req.brew = brew.sanatize(true);
+			req.brew = brew.sanatize(true);
-			return next();
+			return next();
-		})
+		})
-		.catch((err)=>{
+		.catch((err)=>{
-			console.log(err);
+			console.log(err);
-			return res.status(400).send(`Can't get that`);
+			return res.status(400).send(`Can't get that`);
-		});
+		});
-});
+});
-
+
-//Print Page
+//Print Page
-app.get('/print/:id', (req, res, next)=>{
+app.get('/print/:id', (req, res, next)=>{
-	HomebrewModel.get({shareId : req.params.id})
+	HomebrewModel.get({shareId : req.params.id})
-		.then((brew)=>{
+		.then((brew)=>{
-			req.brew = brew.sanatize(true);
+			req.brew = brew.sanatize(true);
-			return next();
+			return next();
-		})
+		})
-		.catch((err)=>{
+		.catch((err)=>{
-			console.log(err);
+			console.log(err);
-			return res.status(400).send(`Can't get that`);
+			return res.status(400).send(`Can't get that`);
-		});
+		});
-});
+});
-
+
-
+
-//Render Page
+//Render Page
-const render = require('vitreum/steps/render');
+const render = require('vitreum/steps/render');
-const templateFn = require('./client/template.js');
+const templateFn = require('./client/template.js');
-app.use((req, res) => {
+app.use((req, res) => {
-	render('homebrew', templateFn, {
+	render('homebrew', templateFn, {
-			version : require('./package.json').version,
+			version : require('./package.json').version,
-			url: req.originalUrl,
+			url: req.originalUrl,
-			welcomeText : welcomeText,
+			welcomeText : welcomeText,
-			changelog : changelogText,
+			changelog : changelogText,
-			brew : req.brew,
+			brew : req.brew,
-			brews : req.brews,
+			brews : req.brews,
-			account : req.account
+			account : req.account
-		})
+		})
-		.then((page) => {
+		.then((page) => {
-			return res.send(page)
+			return res.send(page)
-		})
+		})
-		.catch((err) => {
+		.catch((err) => {
-			console.log(err);
+			console.log(err);
-			return res.sendStatus(500);
+			return res.sendStatus(500);
-		});
+		});
-});
+});
-
+
-
+
-const PORT = process.env.PORT || 8000;
+const PORT = process.env.PORT || 8000;
-app.listen(PORT);
+app.listen(PORT);
 console.log(`server on port:${PORT}`);