From 1927790d06d0073eefdc05305f4eb8c2e5c9f566 Mon Sep 17 00:00:00 2001
From: Cory Dransfeldt <hi@coryd.dev>
Date: Wed, 8 Nov 2023 11:48:38 -0800
Subject: [PATCH] chore: resolve conflict

---
 .eleventy.js              |  5 +--
 .env                      |  1 -
 src/_data/json/links.json | 67 +++++++++++++++++++++++++++++++++++++++
 src/_data/links.js        | 19 ++---------
 src/_data/nav.js          |  1 -
 5 files changed, 72 insertions(+), 21 deletions(-)
 create mode 100644 src/_data/json/links.json

diff --git a/.eleventy.js b/.eleventy.js
index 8b66b736..07888987 100644
--- a/.eleventy.js
+++ b/.eleventy.js
@@ -160,8 +160,9 @@ module.exports = function (eleventyConfig) {
       }
       if (item.data.links) {
         item.data.links.forEach((link) => {
-          const tagString = link['tags']
-            .map((tag) => tagAliases[tag.toLowerCase()])
+          const tagString = [
+            ...new Set(link.tags.split(',').map((tag) => tagAliases[tag.toLowerCase()])),
+          ]
             .join(' ')
             .trim()
           if (tagString) tags[link.url] = tagString
diff --git a/.env b/.env
index 3541d8d0..e50b0ed4 100644
--- a/.env
+++ b/.env
@@ -1,7 +1,6 @@
 API_KEY_TRAKT=
 API_KEY_MOVIEDB=
 API_KEY_WEBMENTIONS_CORYD_DEV=
-API_TOKEN_PINBOARD=
 API_APPLE_MUSIC_DEVELOPER_TOKEN=
 API_APPLE_MUSIC_USER_TOKEN=
 APPLE_RENEW_TOKEN_URL=
diff --git a/src/_data/json/links.json b/src/_data/json/links.json
new file mode 100644
index 00000000..239aa560
--- /dev/null
+++ b/src/_data/json/links.json
@@ -0,0 +1,67 @@
+{
+  "links": [
+    {
+      "tags": "development",
+      "title": "What Happened to Separation of Concerns in Frontend Development",
+      "id": "https://meiert.com/en/blog/what-happened-to-separation-of-concerns/",
+      "url": "https://meiert.com/en/blog/what-happened-to-separation-of-concerns/",
+      "date": "Tue, 31 Oct 2023 10:25:06 -0700"
+    },
+    {
+      "tags": "development",
+      "title": "It&#39;s 2023, here is why your web design sucks.",
+      "id": "https://heather-buchel.com/blog/2023/10/why-your-web-design-sucks/",
+      "url": "https://heather-buchel.com/blog/2023/10/why-your-web-design-sucks/",
+      "date": "Tue, 31 Oct 2023 10:27:36 -0700"
+    },
+    {
+      "tags": "music",
+      "title": "You should look at this chart about music genres",
+      "id": "https://pudding.cool/2023/10/genre/",
+      "url": "https://pudding.cool/2023/10/genre/",
+      "date": "Tue, 31 Oct 2023 11:02:55 -0700"
+    },
+    {
+      "tags": "development",
+      "title": "The Fight For The Main Thread",
+      "id": "https://www.smashingmagazine.com/2023/10/speedcurve-fight-main-thread/",
+      "url": "https://www.smashingmagazine.com/2023/10/speedcurve-fight-main-thread/",
+      "date": "Tue, 31 Oct 2023 11:04:41 -0700"
+    },
+    {
+      "tags": "development",
+      "title": "Why I Won&#x27;t Use Next.js",
+      "id": "https://www.epicweb.dev/why-i-wont-use-nextjs",
+      "url": "https://www.epicweb.dev/why-i-wont-use-nextjs",
+      "date": "Tue, 31 Oct 2023 11:18:47 -0700"
+    },
+    {
+      "tags": "development",
+      "title": "The ideal viewport doesn’t exist",
+      "id": "https://viewports.fyi/",
+      "url": "https://viewports.fyi/",
+      "date": "Tue, 31 Oct 2023 12:40:05 -0700"
+    },
+    {
+      "tags": "development",
+      "title": "Software disenchantment",
+      "id": "https://tonsky.me/blog/disenchantment/",
+      "url": "https://tonsky.me/blog/disenchantment/",
+      "date": "Tue, 31 Oct 2023 18:53:38 -0700"
+    },
+    {
+      "tags": "development",
+      "title": "Second-guessing the modern web",
+      "id": "https://macwright.com/2020/05/10/spa-fatigue.html",
+      "url": "https://macwright.com/2020/05/10/spa-fatigue.html",
+      "date": "Thu, 02 Nov 2023 08:55:58 -0700"
+    },
+    {
+      "tags": "development",
+      "title": "Presentational shadow DOM",
+      "id": "https://www.mayank.co/blog/presentational-shadow-dom/",
+      "url": "https://www.mayank.co/blog/presentational-shadow-dom/",
+      "date": "Fri, 03 Nov 2023 12:40:07 -0700"
+    }
+  ]
+}
diff --git a/src/_data/links.js b/src/_data/links.js
index 47859d20..3a83eaf5 100644
--- a/src/_data/links.js
+++ b/src/_data/links.js
@@ -1,20 +1,5 @@
-const EleventyFetch = require('@11ty/eleventy-fetch')
+const links = require('../_data/json/links.json')
 
 module.exports = async function () {
-  const API_TOKEN_PINBOARD = process.env.API_TOKEN_PINBOARD
-  const url = `https://api.pinboard.in/v1/posts/recent?auth_token=${API_TOKEN_PINBOARD}&format=json&tag=share`
-  const res = EleventyFetch(url, {
-    duration: '1h',
-    type: 'json',
-  }).catch()
-  const links = await res
-  return links['posts'].map((link) => {
-    return {
-      title: link['description'],
-      url: link['href'],
-      tags: [...new Set(link['tags'].split(' ').filter((tag) => tag.toLowerCase() !== 'share'))],
-      date: link['time'],
-      description: link['extended'],
-    }
-  })
+  return links.links.reverse()
 }
diff --git a/src/_data/nav.js b/src/_data/nav.js
index 1702bab9..c2fd5aef 100644
--- a/src/_data/nav.js
+++ b/src/_data/nav.js
@@ -21,7 +21,6 @@ module.exports = async function () {
       },
       { name: 'Trakt', url: 'https://trakt.tv/users/cdransf', icon: 'device-tv' },
       { name: 'The StoryGraph', url: 'https://app.thestorygraph.com/profile/coryd', icon: 'books' },
-      { name: 'Pinboard', url: 'http://pinboard.in/u:cdme', icon: 'pin' },
       { name: 'Buy Me a Coffee', url: 'https://www.buymeacoffee.com/cory', icon: 'cup' },
     ],
     resume: [