@nakedcreativity/cee-ms-node 0.3.2 → 0.3.4

package/index.js

@@ -6,6 +6,10 @@ var Liquid = require('nakedcreativity-liquid');
 var cheerio = require('cheerio');
 var bodyParser = require("body-parser");
 
+
+var site;
+var engine;
+
 function ceems(config) {
 
 	this.app = express()
@@ -21,6 +25,7 @@ function ceems(config) {
 	    extname: '.liquid',
 	    cache: true
 	});
+	engine = this.engine
 
 	this.config = config;
 
@@ -32,6 +37,7 @@ function ceems(config) {
 	this.app.set('views', this.viewsPath());
 	this.app.set('view engine', 'liquid');
 
+	
 
 	// register region and module tags
 	this.engine.registerTag('region', {
@@ -39,7 +45,7 @@ function ceems(config) {
 	        this.name = tagToken.args; // name
 	    },
 	    render: function(scope, hash) {
-	    	console.log(this.name)
+	    	console.log('render region',this.name)
 	        var str = Liquid.evalValue('regions.'+this.name, scope);
 	        return Promise.resolve(str);
 	    }
@@ -56,24 +62,29 @@ function ceems(config) {
 	});
 
 	this.engine.registerTag('navigation', {
-	    parse: (tagToken, remainTokens)=> {
-	        this.match = tagToken.args; // name // path[0] == navigation name
+	    parse: function(tagToken, remainTokens) {
+			this.match = tagToken.args.split(' '); // name // path[0] == navigation name
 	    },
-	    render: (scope, hash)=> {
-			var filepath = Liquid.evalValue('submenu.liquid', scope);
+	    render: function(scope, hash){
+			var filepath = Liquid.evalValue(this.match[1]+'.liquid', scope);
 			var page = scope.scopes[0]
 
-			if(page.path && this.site.navigation[page.path[0]]){
-				console.log('navigation exists for ', page.path[0])
+			if(page.path && this.match[0] == 'page.path[0]' && site.navigation[page.path[0]]){
+				console.log('navigation exists for ', this.match[0])
+				scope.push(site.navigation[page.path[0]]);
+			}else if(site.navigation[this.match[0]]){
+				scope.push(site.navigation[this.match[0]]);
 			}else {
 				return
 			}
 			// look for navigation that match the name of any part of the path?
 
-            return this.engine.handleCache('submenu.liquid')
+			console.log('render ',this.match[1]+'.liquid')
+
+            return engine.handleCache(this.match[1]+'.liquid')
                 .then((templates) => {
-                    scope.push(this.site.navigation[page.path[0]]);
-                    return this.engine.renderer.renderTemplates(templates, scope);
+                    
+                    return engine.renderer.renderTemplates(templates, scope);
                 })
                 .then((html) => {
                     scope.pop();
@@ -105,8 +116,7 @@ function ceems(config) {
 	this.app.post(/draft\/(.*)/, (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;
 
@@ -127,6 +137,7 @@ ceems.prototype.load = function(req, res){
 	this.site = JSON.parse(fs.readFileSync('./pages/site.json', 'utf8'));
 	//this.pages_map = _.indexBy(this.site.pages, 'url');
 	
+	site = this.site //????
 	
 	if(this.site.pages[path]){
 		var page = this.site.pages[path]
@@ -136,6 +147,10 @@ ceems.prototype.load = function(req, res){
 		}
 
 		var page = JSON.parse(fs.readFileSync('./pages/'+page._id+'.json', 'utf8'));
+		page.fullpath = this.site.pages[path].url
+		console.log(this.site.pages[path])
+		console.log('full path is', this.site.pages[path].url)
+		page.path = page.fullpath.split('/')
 		return page
 
 	}
@@ -150,6 +165,7 @@ ceems.prototype.load = function(req, res){
 
 ceems.prototype.render = function(req, res, page=null) {
 
+	console.log('render fn')
 	if(!page){
 		page = this.load(req, res)
 	}
@@ -193,9 +209,11 @@ ceems.prototype.render = function(req, res, page=null) {
 				// to-do: we need to give module access to entire page object, and therefore the 'sitemap' and other site information
 				var scope = module.content
 				scope.page = page
-				scope.site = this.site.site
-				scope.pages = this.site.pages
-
+				if (this.site){
+					scope.site = this.site.site
+					scope.pages = this.site.pages
+					scope.navigation = this.site.navigation
+				}
 				this.engine.parseAndRender(moduleTemplate, scope)
 			    .then(function(html){
 			       
@@ -264,7 +282,12 @@ ceems.prototype.render = function(req, res, page=null) {
 			})
 		})
 
-		res.render(page.template, page, function(err, html){
+		console.log('render finished page')
+		var scope = page
+		scope.navigation = this.site.navigation
+
+		//console.log(scope)
+		res.render(page.template, scope, function(err, html){
 			if(err){
 				console.log(err)
 			}

package/package.json

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