@nakedcreativity/cee-ms-node 0.3.8 → 0.3.10

package/index.js

@@ -70,20 +70,17 @@ function ceems(config) {
 			var page = scope.scopes[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(page.path && this.match[0] == 'page.path[1]' && site.navigation[page.path[1]]){
+				scope.push(site.navigation[page.path[1]]);
 			}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?
-
-			console.log('render ',this.match[1]+'.liquid')
 
             return engine.handleCache(this.match[1]+'.liquid')
                 .then((templates) => {
-                    
                     return engine.renderer.renderTemplates(templates, scope);
                 })
                 .then((html) => {
@@ -93,6 +90,50 @@ function ceems(config) {
 	    }
 	});	
 
+	this.engine.registerTag('page', {
+		parse: function(tagToken, remainTokens) {
+			this.match = tagToken.args.split(' '); // name // path[0] == navigation name
+		},
+		render: function(scope, hash){
+			// var filepath = Liquid.evalValue(this.match[1]+'.liquid', scope);
+			var page = scope.scopes[0]
+
+			console.log('look for page with handle', this.match[0])
+			var site = JSON.parse(fs.readFileSync('./pages/site.json', 'utf8'));
+			console.log(site)
+			
+			if(site.pages[this.match[0]]){
+				var page = site.pages[this.match[0]]
+				console.log(page)
+				if(page.redirect){
+					res.redirect(parseInt(page.redirect.type), page.redirect.to)
+				}
+
+				var page = JSON.parse(fs.readFileSync('./pages/'+page._id+'.json', 'utf8'));
+				page.fullpath = site.pages[this.match[0]].url
+				page.path = page.fullpath.split('/')
+
+				scope.push(page)
+
+				return engine.handleCache(this.match[1]+'.liquid')
+					.then((templates) => {
+						return engine.renderer.renderTemplates(templates, scope);
+					})
+					.then((html) => {
+						scope.pop();
+						return html;
+					});
+
+			}else {
+				return
+			}
+
+
+			
+	    }
+	})
+
+
 	this.app.listen(config.port, function () {});
 
 	this.app.use((req, res, next)=>{
@@ -151,8 +192,6 @@ 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
 
@@ -171,7 +210,6 @@ 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)
 	}
@@ -223,7 +261,6 @@ ceems.prototype.render = function(req, res, page=null) {
 				this.engine.parseAndRender(moduleTemplate, scope)
 			    .then(function(html){
 			       
-			        
 			        if(req.query.edit != null){
 						var $ = cheerio.load(html);
 						
@@ -231,8 +268,6 @@ ceems.prototype.render = function(req, res, page=null) {
 						if(module._id){
 							$.root().children().attr('data-module-id', module._id);
 						}
-						
-
 						html = $.html()
 			        }
 
@@ -288,7 +323,6 @@ ceems.prototype.render = function(req, res, page=null) {
 			})
 		})
 
-		console.log('render finished page')
 		var scope = page
 		if(this.site && this.site.navigation)
 			scope.navigation = this.site.navigation

package/package.json

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