chore(luxon): remove moment and use luxon

Signed-off-by: Jayne Doe <[email protected]>

Author: J4Numbers

package-lock.json

@@ -34,12 +34,11 @@
     "debug": "^4.3.3",
     "jquery": "^3.6.0",
     "jsonwebtoken": "^8.5.1",
+    "luxon": "^2.3.0",
     "markdown-it": "^12.3.0",
-    "moment": "^2.29.1",
     "mongoose": "^6.1.4",
     "multer": "^1.4.4",
     "nunjucks": "^3.2.3",
-    "nunjucks-date": "^1.5.0",
     "popper.js": "^1.16.1",
     "request": "^2.88.2",
     "request-promise-native": "^1.0.9",

package.json

@@ -22,15 +22,20 @@
 
 const path = require('path');
 const nunjucks = require('nunjucks');
-const nunjucksDate = require('nunjucks-date');
 const markdown = require('markdown-it')();
 const config = require('config');
 const metadata = require('../../../package');
+const { DateTime } = require('luxon');
 
 let renderer;
 
 const renderMarkdown = (input) => markdown.render(input || '');
 
+const formatDate = (date) => DateTime.fromJSDate(date).toLocaleString({
+  locale: 'en_gb',
+  ...DateTime.DATETIME_MED_WITH_SECONDS,
+});
+
 const createRenderer = () => {
   const nunjucksEnv = new nunjucks.Environment([
     new nunjucks.FileSystemLoader(
@@ -41,7 +46,7 @@ const createRenderer = () => {
   nunjucksEnv.addGlobal('functionality', config.get('functionality'));
   nunjucksEnv.addGlobal('metadata', metadata);
 
-  nunjucksEnv.addFilter('date', nunjucksDate);
+  nunjucksEnv.addFilter('date', formatDate);
   nunjucksEnv.addFilter('markdown', renderMarkdown);
 
   return nunjucksEnv;

src/lib/renderer/nunjucks_renderer.js

@@ -79,6 +79,8 @@ const viewOneBlog = async (req, res, next) => {
 
       content: {
         blog_text: res.locals.blog.full_text,
+        time_updated: res.locals.blog.time_updated,
+        time_posted: res.locals.blog.time_posted,
       },
 
       head: {

src/routes/blog.js

@@ -70,6 +70,8 @@ const viewAllExtendedBlogs = async (req, res, next) => {
 
 const viewSingleBlogPost = async (req, res, next) => {
   if (res.locals.blog !== null) {
+    console.log(res.locals.blog);
+
     res.contentType = 'text/html';
     res.header('content-type', 'text/html');
     res.send(200, renderer.render('pages/me/me_blog_single.njk', {
@@ -82,6 +84,8 @@ const viewSingleBlogPost = async (req, res, next) => {
 
       content: {
         blog_text: markdown.render(res.locals.blog.full_text),
+        time_updated: res.locals.blog.time_updated,
+        time_posted: res.locals.blog.time_posted,
       },
 
       head: {

src/routes/hobbies/me/me_blog.js

@@ -77,6 +77,8 @@ const viewOneProject = async (req, res, next) => {
 
       content: {
         project_text: res.locals.project.description,
+        time_updated: res.locals.project.time_updated,
+        time_posted: res.locals.project.time_posted,
       },
 
       head: {

src/routes/projects.js

@@ -21,7 +21,7 @@
 // SOFTWARE.
 
 const envs = process.env;
-const moment = require('moment');
+const luxon = require('luxon');
 const errors = require('restify-errors');
 
 const staticHandler = require('../js/handlers').fetchStaticHandler();
@@ -146,7 +146,7 @@ const getStatistics = async (req, res, next) => {
     },
 
     content: {
-      time:    moment(),
+      time:    luxon.DateTime.now(),
       version: envs.NPM_PACKAGE_VERSION,
     },
 

src/routes/statics.js

@@ -11,10 +11,14 @@
             <span class="btn btn-light">{{ tag }}</span>
         {% endfor %}
     </p>
+    <p>Posted: {{ content.time_posted | date }}</p>
+    {% if content.time_posted != content.time_updated %}
+        <p>Last edited: {{ content.time_updated | date }}</p>
+    {% endif %}
 {% endblock %}
 
 {% block content %}
     <div class="container">
         {{ content.blog_text | markdown | safe }}
     </div>
-{% endblock %}
+{% endblock %}

src/views/pages/blog_single.njk

@@ -11,8 +11,12 @@
             <span class="btn btn-light">{{ tag }}</span>
         {% endfor %}
     </p>
+    <p>Posted: {{ content.time_posted | date }}</p>
+    {% if content.time_posted != content.time_updated %}
+        <p>Last edited: {{ content.time_updated | date }}</p>
+    {% endif %}
 {% endblock %}
 
 {% block me_content %}
     {{ content.blog_text | safe }}
-{% endblock %}
+{% endblock %}

src/views/pages/me/me_blog_single.njk

@@ -11,10 +11,14 @@
             <span class="btn btn-light">{{ tag }}</span>
         {% endfor %}
     </p>
+    <p>Posted: {{ content.time_posted | date }}</p>
+    {% if content.time_posted != content.time_updated %}
+        <p>Last edited: {{ content.time_updated | date }}</p>
+    {% endif %}
 {% endblock %}
 
 {% block content %}
     <div class="container">
         {{ content.project_text | markdown | safe }}
     </div>
-{% endblock %}
+{% endblock %}