diff --git a/assets/css/pretendo-home.css b/assets/css/pretendo-home.css index 64ba7fd..9485eb5 100644 --- a/assets/css/pretendo-home.css +++ b/assets/css/pretendo-home.css @@ -37,11 +37,18 @@ header h3 { box-shadow: 0 5px 20px rgba(0, 0, 0, 0.07); position: relative; margin-left: 3em; + height: 100%; + display: flex; + flex-direction: column; + align-items: flex-start; } .smallCard h3 { font-size: 1.5em; margin: 0; } +.smallCard p { + flex: 1; +} /* specific */ .smallCardWidth { diff --git a/models/blog-post.js b/models/blog-post.js index 2e328d4..2c2aaeb 100644 --- a/models/blog-post.js +++ b/models/blog-post.js @@ -89,9 +89,9 @@ blogPostSchema.statics.getPost = function(date, slug, callback) { blogPostSchema.statics.latestPostsShortTemlate = function(amount, callback) { blogPostModel.find({}).sort({'meta.date': 'desc'}).exec(function(err, posts) { if (err) return callback(err); - let out = []; - for (let i = 0, l = posts.length; i < ( amount+1 < l ? amount+1 : l); i++) - out += posts[i].postShortTemplate(); + const out = []; + for (let i = 0, l = posts.length; i < ( amount+1 < l ? amount : l); i++) + out.push(posts[i].postShortTemplate()); callback(err, out); }); }; diff --git a/routes/home.js b/routes/home.js index 7d0de31..a7fdcc4 100644 --- a/routes/home.js +++ b/routes/home.js @@ -9,13 +9,19 @@ for routes on the root path // imports const router = require('express').Router(); const utilHelper = require('../helpers/util'); +const blogPostModel = require('../models/blog-post').blogPostModel; // display home page router.get('/', (req, res) => { - res.render('home', { - user: utilHelper.templateReadyUser(req), - locales: utilHelper.getLocales(), - page: 'home' + // needs callback because mongoose is inconsistent + blogPostModel.latestPostsShortTemlate(2, (err, result) => { + console.log(typeof result); + res.render('home', { + user: utilHelper.templateReadyUser(req), + locales: utilHelper.getLocales(), + posts: result, + page: 'home' + }); }); }); diff --git a/views/home.hbs b/views/home.hbs index f1bb004..2ebba25 100644 --- a/views/home.hbs +++ b/views/home.hbs @@ -85,20 +85,15 @@
Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea
- -Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea
- +{{ this.content }}
+ ERROR