From 4c58bfc4cce06f8732de80910722d4bbab615598 Mon Sep 17 00:00:00 2001
From: cupcakearmy <hi@nicco.io>
Date: Mon, 28 Sep 2020 16:02:16 +0200
Subject: [PATCH] date stuff

---
 src/components/PostAttributes.svelte |  2 ++
 src/components/Project.svelte        |  4 +++-
 src/components/Work.svelte           |  3 ++-
 src/lib/wp.js                        | 10 ++--------
 src/routes/api/[...slug].json.js     |  4 ++--
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/components/PostAttributes.svelte b/src/components/PostAttributes.svelte
index 920a012..4b4a265 100644
--- a/src/components/PostAttributes.svelte
+++ b/src/components/PostAttributes.svelte
@@ -9,6 +9,8 @@
     return dj(date).format('MMM D, YYYY')
   }
 
+  $: console.log(post)
+
   $: created = format(post.date)
   $: modified = format(post.modified)
 </script>
diff --git a/src/components/Project.svelte b/src/components/Project.svelte
index 05c98f0..7de1d92 100644
--- a/src/components/Project.svelte
+++ b/src/components/Project.svelte
@@ -1,4 +1,6 @@
 <script>
+  import dj from 'dayjs'
+
   export let project
 </script>
 
@@ -37,7 +39,7 @@
   <a href={project.link} target="_blank" rel="noopener">
     <h2>{project.title}</h2>
   </a>
-  <div><b>{project.description}</b> <b class="date">{project.date}</b></div>
+  <div><b>{project.description}</b> <b class="date">{dj(project.date * 1000).format('MMM YY')}</b></div>
 
   <p>
     {@html project.content}
diff --git a/src/components/Work.svelte b/src/components/Work.svelte
index b4f0e0d..e4c763a 100644
--- a/src/components/Work.svelte
+++ b/src/components/Work.svelte
@@ -1,4 +1,5 @@
 <script>
+  import dj from 'dayjs'
   import ImageFrame from '../components/ImageFrame.svelte'
 
   export let work
@@ -49,7 +50,7 @@
 </a>
 <div class="horizontal regular">
   <div>{work.role}</div>
-  <div>{work.date}</div>
+  <div>{dj(work.date * 1000).format('MMM YY')}</div>
 </div>
 <p>
   {@html work.content}
diff --git a/src/lib/wp.js b/src/lib/wp.js
index f668b5f..702bfc2 100644
--- a/src/lib/wp.js
+++ b/src/lib/wp.js
@@ -1,5 +1,4 @@
 import axios from 'axios'
-import dj from 'dayjs'
 
 const isDev = process.env.NODE_ENV !== 'production' && false
 axios.defaults.baseURL = `${isDev ? 'http://localhost' : 'https://api.nicco.io'}/wp-json/wp/v2`
@@ -41,13 +40,8 @@ export async function getAll(url, params = {}) {
   return results.map(normalize)
 }
 
-export function sortByAndMapDate(data, format = 'MMM YY') {
-  return data
-    .sort((a, b) => parseInt(b.date) - parseInt(a.date))
-    .map((work) => ({
-      ...work,
-      date: dj(work.date * 1000).format(format),
-    }))
+export function sortByDate(data) {
+  return data.sort((a, b) => parseInt(b.date) - parseInt(a.date))
 }
 
 export function respond(res, body) {
diff --git a/src/routes/api/[...slug].json.js b/src/routes/api/[...slug].json.js
index 71d96e8..814b2c2 100644
--- a/src/routes/api/[...slug].json.js
+++ b/src/routes/api/[...slug].json.js
@@ -1,4 +1,4 @@
-import { respond, getAll, getOne, sortByAndMapDate } from '../../lib/wp'
+import { respond, getAll, getOne, sortByDate } from '../../lib/wp'
 
 export async function get(req, res) {
   const [type, slug] = req.params.slug
@@ -8,6 +8,6 @@ export async function get(req, res) {
     respond(res, { data })
   } else {
     const data = await getAll(type)
-    respond(res, { data: sortByAndMapDate(data) })
+    respond(res, { data: sortByDate(data) })
   }
 }