@nakedcreativity/cee-ms-node 0.1.3 → 0.2.0

package/index.js

@@ -4,8 +4,7 @@ const fs = require('fs');
 const _ = require('underscore');
 var Liquid = require('nakedcreativity-liquid');
 var cheerio = require('cheerio');
-
-
+var bodyParser = require("body-parser");
 
 function ceems(config) {
 
@@ -14,6 +13,7 @@ function ceems(config) {
 	// process config and set defaults
 	// // set up static file hosting
 	this.app.use(express.static(config.assets))
+	this.app.use(bodyParser.json());
 
 	this.engine = Liquid({
 		root: path.resolve('./views/'),  // for layouts and partials
@@ -67,36 +67,43 @@ function ceems(config) {
 
 
 	this.app.get(/(.*)/, (req, res)=>{
-		this.auto(req,res);
+		
+		this.render(req,res, page);
+
 	})
 
-}
+	this.app.post(/draft\/(.*)/, (req, res)=>{
 
-ceems.prototype.auto = function(req, res) {
+		// validate authorisation JWT here
+		this.site = JSON.parse(fs.readFileSync('./pages/site.json', 'utf8'));
+		console.log(req.body.page)
+		req.query.edit = true;
+		this.render(req,res, req.body.page);
 
-	this.site = JSON.parse(fs.readFileSync('./pages/site.json', 'utf8'));
-  	this.pages_map = _.indexBy(this.site.pages, 'url');
+	})
 
-	var start = Date.now()
+}
 
-	if(this.pages_map[req._parsedUrl.pathname]){
-		var page = this.pages_map[req._parsedUrl.pathname]
+ceems.prototype.render = function(req, res, page=null) {
 
-		if(page.redirect){
-			res.redirect(parseInt(page.redirect.type), page.redirect.to)
-		}
+	if(!page){
+		this.site = JSON.parse(fs.readFileSync('./pages/site.json', 'utf8'));
+		this.pages_map = _.indexBy(this.site.pages, 'url');
 
-		var page = JSON.parse(fs.readFileSync('./pages/'+page.handle+'.json', 'utf8'));
+		if(this.pages_map[req._parsedUrl.pathname]){
+			var page = this.pages_map[req._parsedUrl.pathname]
 
-	}else{
-		try {
-			var page = JSON.parse(fs.readFileSync('./drafts/'+req._parsedUrl.pathname.replace('/drafts/','')+'.json', 'utf8'));
-		}catch (error){
+			if(page.redirect){
+				res.redirect(parseInt(page.redirect.type), page.redirect.to)
+			}
+
+			var page = JSON.parse(fs.readFileSync('./pages/'+page.handle+'.json', 'utf8'));
+
+		}else{
 			res.status(404).send('Sorry, this page does not exist');
 		}
 	}
 
-	
 	// get any external data, and save this into the page	
 	_.each(page.external, function(ext, key){
 
@@ -135,7 +142,10 @@ ceems.prototype.auto = function(req, res) {
 						var $ = cheerio.load(html);
 						
 						$.root().children().attr('data-module-type', module.type);
-						$.root().children().attr('data-module-id', module.id);
+						if(module._id){
+							$.root().children().attr('data-module-id', module._id);
+						}
+						
 
 						html = $.html()
 			        }
@@ -168,7 +178,7 @@ ceems.prototype.auto = function(req, res) {
 		        if(req.query.edit != null){
 			        var $ = cheerio.load(html);
 					$.root().children().attr('data-module-type', module.type);
-					$.root().children().attr('data-module-id', module.id);
+					$.root().children().attr('data-module-id', module._id);
 					//console.log($.root().children())
 
 					html = $.html()
@@ -196,10 +206,8 @@ ceems.prototype.auto = function(req, res) {
 			if(err){
 				console.log(err)
 			}
-			var finish = Date.now()
-			console.log(finish - start, 'render time')
-			console.log('..................')
-			res.header('X-FRAME-OPTIONS', 'ALLOW-FROM localhost:3006');
+			//res.header('X-FRAME-OPTIONS', 'allow-from http://localhost:3002');
+			//console.log(res)
 			res.send(html)
 		})
 		
@@ -214,13 +222,11 @@ ceems.prototype.auto = function(req, res) {
 ceems.prototype.init = function(){
 
 	// needs to be dealt with on each request, or results cache in someway
-	
-
 
 }
 
 ceems.prototype.viewsPath = function(){
 	return './views/'
-}	
+}
 
 module.exports = ceems;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nakedcreativity/cee-ms-node",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "description": "Cee.ms for Node.js",
   "main": "index.js",
   "scripts": {