@nakedcreativity/cee-ms-node 0.3.35 → 0.3.37

package/index.js

@@ -343,79 +343,72 @@ function ceems(config) {
 	})
 
 	this.engine.registerTag('blog', {
-		parse: function(tagToken, remainTokens) {
-			this.match = tagToken.args.split(' ')
-		},
-		render: function(scope, hash){
-
-			if(this.match[2]){
-				var articlesPerPage = this.match[2]
-			}else{
-				var articlesPerPage = 10
-			}
-
-			if(!site.blogs[this.match[0]]){
-				return
-			}
-
-			// loop over articles, push articles that match tag or pagination, into array
-
-			var blog = site.blogs[this.match[0]]
-			var pagination = 1
-
-			if(scope.scopes[0].page && scope.scopes[0].page.pagination){
-				pagination = scope.scopes[0].page.pagination
-			}
-
-			articlesPerPage = parseInt(articlesPerPage)
-			var start = articlesPerPage * (pagination - 1)
-			var end = start + articlesPerPage
-
-			var lastPage = Math.ceil(blog.articles.length / articlesPerPage)
-
-			// is page greater than the number of articles?
-			// throw a 404
-			if(start >= blog.articles.length){
-				throw new Error('This page does not exist')
-			}
-
-			var articles = []
-			
-			
-			// if tag set, create filtered array of articles
-			if(this.match[3]){
-				var tag = Liquid.lexical.parseLiteral(this.match[3])
-				
-				blog.articles.forEach((article) => {
-					if (article.tags && article.tags.indexOf(tag) > -1){
-						articles.push(article)
-					}
-				})
-			}else {
-				articles = blog.articles
-			}
-
-			// slice original blog array to send just current page of articles to liquid
-			blog.articles = articles.slice(start,end)
-			blog.pagination = pagination
-			blog.lastPage = lastPage
-			scope.push(blog)
-
-
-			return engine.handleCache(this.match[1]+'.liquid')
+        parse: function (tagToken, remainTokens) {
+            this.match = tagToken.args.split(' ')
+        },
+        render: function (scope, hash) {
+            // get the blog set
+            var siteblog = Liquid.evalValue(this.match[0], scope);
+            if (!siteblog) {
+                siteblog = this.match[0]
+            }
+            if (!site.blogs[siteblog]) {
+                return
+            }
+            // loop over articles, push articles that match tag or pagination, into array
+            var blog = site.blogs[siteblog]
+            var articles = []
+            // if tag set, create filtered array of articles
+            if (this.match[3]) {
+                var tag = Liquid.evalValue(this.match[3], scope);
+                if (!tag) {
+                    tag = Liquid.lexical.parseLiteral(this.match[3])
+                }
+                blog.articles.forEach((article) => {
+                    if (article.tags && article.tags.indexOf(tag) > -1) {
+                        articles.push(article)
+                    }
+                })
+            } else {
+                articles = blog.articles
+            }
+            //check if articles per page is set
+            if (this.match[2]) {
+                var articlesPerPage = this.match[2]
+            } else {
+                var articlesPerPage = 10
+            }
+            var pagination = 1
+            if (scope.scopes[0].page && scope.scopes[0].page.pagination) {
+                pagination = scope.scopes[0].page.pagination
+            }
+            articlesPerPage = parseInt(articlesPerPage)
+            var start = articlesPerPage * (pagination - 1)
+            var end = start + articlesPerPage
+            var lastPage = Math.ceil(articles.length / articlesPerPage)
+            // is page greater than the number of articles?
+            // throw a 404
+            if (start >= articles.length) {
+                throw new Error('This page does not exist')
+            }
+            // slice original blog array to send just current page of articles to liquid
+            blog.articles = articles.slice(start, end)
+            blog.pagination = pagination
+            blog.lastPage = lastPage
+            scope.push(blog)
+            return engine.handleCache(this.match[1] + '.liquid')
                 .then((templates) => {
                     return engine.renderer.renderTemplates(templates, scope);
                 })
                 .then((html) => {
                     scope.pop();
                     return html;
-				})
-				.catch((error) => {
-					throw error
-				})
-		}
-
-	})
+                })
+                .catch((error) => {
+                    throw error
+                })
+        }
+    })
 
 
 	this.app.listen(config.port, function () {});
@@ -541,12 +534,69 @@ ceems.prototype.render = function(req, res, page=null) {
 	console.log('pagination, ', page.pagination)
 
 	var renderedRegions = {}
+	var renderedColumns = {}
+	var renderedModules = {}
+
 	var jobs = []
 
 	// load page data
 	_.each(page.regions, function(region, key){
 		
 		renderedRegions[key] = []
+		console.log(key)
+
+		if(region.containers){
+
+			region.containers.forEach((container, index)=>{
+
+				console.log(container)
+				if(container.module){
+					
+					var html = `{% ${container.module} %}`
+
+				}else {
+
+				
+					if(!container.class) {
+						container.class = 'container'
+					}
+
+					var html = ''
+					if(container.wrapper){
+						html += `<div class="${container.wrapper}">`
+					}
+
+					html += `<div class="${container.class}">`
+
+					container.rows.forEach(row=>{
+
+						html += `<div class="row  ${row.class}">`
+						row.columns.forEach(column=>{
+
+							var modules = _.reduce(column.modules, (modules, id)=>{
+								return modules + '{% '+id+' %}'
+							}, '')
+							html += `<div class="col ${column.class}">${modules}</div>` // inserts placeholder in format {% id %}
+
+						})
+
+						html += `</div>`
+
+					})
+					if(container.wrapper){
+						html += `</div>`
+					}
+					html += `</div>`
+			
+				}
+				
+				renderedRegions[key][index] = html
+				
+			})
+		}
+
+		console.log(renderedRegions)
+
 		_.each(region.modules, function(module, index){
 
 			var moduleTemplate = fs.readFileSync('./views/'+module.type+'.liquid');
@@ -562,7 +612,7 @@ ceems.prototype.render = function(req, res, page=null) {
 					scope.navigation = this.site.navigation
 				}
 				this.engine.parseAndRender(moduleTemplate, scope)
-			    .then(function(html){
+			    .then(html => {
 			       
 			        if(req.query.edit != null){
 						var $ = cheerio.load(html);
@@ -572,10 +622,15 @@ ceems.prototype.render = function(req, res, page=null) {
 							$.root().children().attr('data-module-id', module._id);
 						}
 						html = $.html()
-			        }
-
-			        renderedRegions[key][index] = html
-			        return resolve();
+					}
+					
+					if(region.containers){
+						renderedModules[module._id] = html
+					}else {
+						renderedRegions[key][index] = html
+					}
+					return resolve();
+					
 				})
 				.catch(error=>{
 					reject(error)
@@ -583,6 +638,8 @@ ceems.prototype.render = function(req, res, page=null) {
 			}))
 
 		}, this)
+
+
 	}, this)
 
 	// loop through each module not in a region and generate HTML
@@ -628,10 +685,20 @@ ceems.prototype.render = function(req, res, page=null) {
 		_.each(renderedRegions, function(region, key){
 			page.regions[key] = ''
 			_.each(region, function(html){
+
+				// items in rendered columns to place
+				if(Object.keys(renderedModules).length > 0){
+					_.each(renderedModules, (moduleHtml, key)=>{
+						html = html.replace(new RegExp('{%\\s'+key+'\\s%}','g'), moduleHtml)
+					})
+
+				}
+
 				page.regions[key] += html
 			})
 		})
 
+		
 		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.35",
+  "version": "0.3.37",
   "description": "Cee.ms for Node.js",
   "main": "index.js",
   "scripts": {