refactor(date): move over to luxon

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

Author: J4Numbers

src/lib/renderer/nunjucks_renderer.js

@@ -31,10 +31,16 @@ let renderer;
 
 const renderMarkdown = (input) => markdown.render(input || '');
 
-const formatDate = (date) => DateTime.fromJSDate(date).toLocaleString({
-  locale: 'en_gb',
-  ...DateTime.DATETIME_MED_WITH_SECONDS,
-});
+const formatDate = (date, fmtString = 'dd/MM/yyyy') => {
+  let inputDate;
+  if (typeof date === 'number') {
+    inputDate = DateTime.fromMillis(date);
+  } else {
+    inputDate = DateTime.fromJSDate(date);
+  }
+  return inputDate
+    .toFormat(fmtString);
+};
 
 const createRenderer = () => {
   const nunjucksEnv = new nunjucks.Environment([

src/routes/statics.js

@@ -146,7 +146,7 @@ const getStatistics = async (req, res, next) => {
     },
 
     content: {
-      time:    luxon.DateTime.now(),
+      time:    Date.now(),
       version: envs.NPM_PACKAGE_VERSION,
     },
 

src/views/pages/art/art_one.njk

@@ -13,7 +13,7 @@
         {% endfor %}
     </p>
     <p>
-        Created <span class="btn btn-light">{{ content.picture.date_completed | date("D MMMM YYYY") }}</span>
+        Created <span class="btn btn-light">{{ content.picture.date_completed | date("d MMMM yyyy") }}</span>
     </p>
 {% endblock %}
 

src/views/pages/blog_all.njk

@@ -13,8 +13,8 @@
                     <h2 class="blog-title"><a href="/blog/{{ blog._id }}" >{{ blog.long_title }}</a></h2>
                 </div>
                 <div class="col-lg-6">
-                    <p>Posted: {{ blog.time_posted | date("Do MMMM YYYY") }}</p>
-                    <p>Updated: {{ blog.time_updated | date("Do MMMM YYYY") }}</p>
+                    <p>Posted: {{ blog.time_posted | date("d MMMM yyyy") }}</p>
+                    <p>Updated: {{ blog.time_updated | date("d MMMM yyyy") }}</p>
                 </div>
                 <div class="col-lg-6">
                     <p class="text-right">
@@ -40,4 +40,4 @@
             </div>
         </div>
     </div>
-{% endblock %}
+{% endblock %}

src/views/pages/me/me_blog_all.njk

@@ -12,8 +12,8 @@
                 <h2 class="blog-title"><a href="/hobbies/me/extended-blog/{{ blog._id }}" >{{ blog.long_title }}</a></h2>
             </div>
             <div class="col-lg-6">
-                <p>Posted: {{ blog.time_posted | date("Do MMMM YYYY") }}</p>
-                <p>Updated: {{ blog.time_updated | date("Do MMMM YYYY") }}</p>
+                <p>Posted: {{ blog.time_posted | date("d MMMM yyyy") }}</p>
+                <p>Updated: {{ blog.time_updated | date("d MMMM yyyy") }}</p>
             </div>
             <div class="col-lg-6">
                 <p class="text-right">
@@ -38,4 +38,4 @@
             {% include "partials/pagination.njk" %}
         </div>
     </div>
-{% endblock %}
+{% endblock %}

src/views/pages/stats.njk

@@ -12,7 +12,7 @@
             <div class="col-lg-6">
                 <div class="p-5 mb-4 bg-light-darker">
                     <h2>Current time</h2>
-                    <p>{{ content.time | date("Do MMMM YYYY, h:mm:ss a") }}</p>
+                    <p>{{ content.time | date("d MMMM yyyy, ttt") }}</p>
                 </div>
             </div>
             <div class="col-lg-6">

src/views/pages/stories/stories_one.njk

@@ -51,7 +51,7 @@
                         <tr>
                             <td>{{ chapter.chapter_number }}</td>
                             <td><a href="/hobbies/writing/{{ content.story._id }}/chapter/{{ chapter.chapter_number }}">{{ chapter.chapter_title }}</a></td>
-                            <td>{{ chapter.last_updated | date("Do MMMM YYYY") }}</td>
+                            <td>{{ chapter.time_updated | date("d MMMM yyyy") }}</td>
                         </tr>
                     {% endfor %}
                 </tbody>