From b4003858c258d99d87ae6f5ad3c4c6fe068fb94d Mon Sep 17 00:00:00 2001
From: mrjvs <jellevs@gmail.com>
Date: Sun, 18 Nov 2018 14:57:32 +0100
Subject: [PATCH] fixed and updated blog posts backend

---
 models/blog-post.js       | 4 ++--
 routes/admin.js           | 2 +-
 routes/blog.js            | 3 ++-
 views/post-collection.hbs | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/models/blog-post.js b/models/blog-post.js
index fbf3804..c12677d 100644
--- a/models/blog-post.js
+++ b/models/blog-post.js
@@ -45,7 +45,7 @@ const blogPostSchema = new mongoose.Schema({
 		date: {
 			type: Date,
 			default: () => {
-				return new Date(moment(new Date(), 'YYYY-MM-DD'));
+				return moment(moment().format('YYYY-MM-DD'));
 			}
 		},
 		category: {
@@ -72,7 +72,7 @@ blogPostSchema.methods.postShortTemplate = function() {
 	return {
 		content: this.short,
 		title: this.name,
-		url: moment(this.meta.date, 'YYYY-MM-DD') + '/' + this.meta.slug
+		url: moment(this.meta.date).format('YYYY-MM-DD') + '/' + this.meta.slug
 	};
 };
 
diff --git a/routes/admin.js b/routes/admin.js
index 0db4da8..d42bb85 100644
--- a/routes/admin.js
+++ b/routes/admin.js
@@ -233,7 +233,7 @@ router.post('/admin/api/v1/newpost', adminUserMiddleware.adminAuthNeeded, functi
 	// saving post to database
 	newBlogPost.save().then((post) => {
 		apiHelper.sendReturn(res, {
-			url: moment(post.meta.date, 'YYYY-MM-DD') + '/' + post.meta.slug
+			url: moment(post.meta.date).format('YYYY-MM-DD') + '/' + post.meta.slug
 		});
 	}).catch((rejection) => {
 		// TODO format exception so it doesnt have a huge list of errors
diff --git a/routes/blog.js b/routes/blog.js
index 7284e92..2e43048 100644
--- a/routes/blog.js
+++ b/routes/blog.js
@@ -7,6 +7,7 @@ file for handling routes regarding blog posts.
 
 // imports
 const router = require('express').Router();
+const moment = require('moment');
 const apiHelper = require('../helpers/api');
 const utilHelper = require('../helpers/util');
 const blogPostModel = require('../models/blog-post').blogPostModel;
@@ -17,7 +18,7 @@ router.get('/news/:date/:title', (req, res) => {
 	// date format YYYY-MM-DD
 	if (/[0-9]{4}-[0-9]{2}-[0-9]{2}/.test(req.params.date) && /([a-z]|[0-9]|-)+/.test(req.params.title.toLowerCase())) {
 		// params are correct format
-		blogPostModel.getPost(new Date(req.params.date), req.params.title.toLowerCase(), (err, post) => {
+		blogPostModel.getPost(moment(req.params.date), req.params.title.toLowerCase(), (err, post) => {
 			// error exists or no post exists with the date and name
 			if (err || !post) {
 				console.log('error: ' + err + ' and post: ' + post);
diff --git a/views/post-collection.hbs b/views/post-collection.hbs
index 411a663..46b5a9a 100644
--- a/views/post-collection.hbs
+++ b/views/post-collection.hbs
@@ -17,7 +17,7 @@
                     --><article class="smallCard">
                         <h3 class="txt-smallHeading">{{ this.title }}</h3>
                         <p>{{ this.content }}</p>
-                        <a class="btn-alt" href="{{ this.url }}">Read more</a>
+                        <a class="btn-alt" href="/news/{{ this.url }}">Read more</a>
                     </article><!--
                     {{/each}}
                     -->