diff --git a/src/_data/_postData.js b/src/_data/_postData.js
new file mode 100644
index 0000000..cd157ba
--- /dev/null
+++ b/src/_data/_postData.js
@@ -0,0 +1,110 @@
+const fs = require('fs');
+const merge = require('lodash/merge')
+
+const wordpressPassword = process.env.WORDPRESS_PASSWORD;
+const auth = Buffer.from(`lewis:${wordpressPassword}`).toString('base64');
+
+class PostCache {
+ constructor() {
+ this.readCache();
+ }
+
+ readCache() {
+ if (!fs.existsSync(".cache")) {
+ fs.mkdirSync(".cache");
+ }
+
+ if (!fs.existsSync(".cache/wordpress_post_fetch.json")) {
+ this.last_read_date = null;
+ this.posts = {};
+ } else {
+ const data = JSON.parse(fs.readFileSync(".cache/wordpress_post_fetch.json"));
+ this.last_read_date = new Date(data.last_read_date);
+ this.posts = data.posts;
+ }
+ }
+
+ writeCache() {
+ fs.writeFileSync(".cache/wordpress_post_fetch.json", JSON.stringify(this, null, 2));
+ }
+
+ async fetchCommentsByType(type = "comment") {
+ const params = new URLSearchParams();
+ params.set("per_page", 100);
+ params.set("type", type);
+
+ if (this.last_read_date) {
+ params.set("modified_after", this.last_read_date.toISOString());
+ }
+
+ const response = await fetch(`https://cms.lewisdale.dev/wp-json/wp/v2/comments?${params.toString()}`, {
+ headers: {
+ "Authorization": `Basic ${auth}`
+ }
+ });
+ return await response.json()
+ }
+
+ async fetchComments() {
+ const likes = await this.fetchCommentsByType("like");
+ const mentions = await this.fetchCommentsByType();
+ const reposts = await this.fetchCommentsByType("repost");
+
+ const comments = [...likes, ...mentions, ...reposts];
+
+ comments.forEach(comment => {
+ if (this.posts[comment.post]) {
+ this.posts[comment.post].comments[comment.id] = comment;
+ }
+ });
+ }
+
+ async fetchPosts() {
+ const params = new URLSearchParams();
+ params.set("per_page", 100);
+
+ if (this.last_read_date) {
+ params.set("modified_after", this.last_read_date.toISOString());
+ }
+
+ const response = await fetch(`https://cms.lewisdale.dev/wp-json/wp/v2/posts?${params.toString()}`, {
+ headers: {
+ "Authorization": `Basic ${auth}`
+ }
+ });
+ const posts = await response.json();
+
+ posts.forEach(post => {
+ this.posts[post.id] = merge({ comments: {} }, this.posts[post.id], post);
+ });
+ }
+
+ async fetchLatest() {
+ await this.fetchPosts();
+ await this.fetchComments();
+ await this.fetchTags();
+
+ this.last_read_date = new Date();
+ this.writeCache();
+ }
+
+ async fetchTags() {
+ const params = new URLSearchParams();
+ params.set("per_page", 100);
+
+ const response = await fetch(`https://cms.lewisdale.dev/wp-json/wp/v2/tags?${params.toString()}`, {
+ headers: {
+ "Authorization": `Basic ${auth}`
+ }
+ });
+ const tags = await response.json();
+ this.tags = tags.reduce((tagMap, tag) => ({...tagMap, [tag.id]: tag }), {});
+ }
+}
+
+const cache = new PostCache();
+
+module.exports = async function() {
+ await cache.fetchLatest();
+ return cache;
+}
\ No newline at end of file
diff --git a/src/_data/posts.js b/src/_data/posts.js
index 0c8c797..bfb1e85 100644
--- a/src/_data/posts.js
+++ b/src/_data/posts.js
@@ -1,97 +1,8 @@
-const EleventyFetch = require('@11ty/eleventy-fetch');
-const fs = require('fs');
-const merge = require('lodash/merge')
-
-const wordpressPassword = process.env.WORDPRESS_PASSWORD;
-const auth = Buffer.from(`lewis:${wordpressPassword}`).toString('base64');
+const postCache = require('./_postData');
const dateSort = (a, b) => new Date(b.date) - new Date(a.date);
-class PostCache {
- constructor() {
- this.readCache();
- }
-
- readCache() {
- if (!fs.existsSync(".cache")) {
- fs.mkdirSync(".cache");
- }
-
- if (!fs.existsSync(".cache/wordpress_post_fetch.json")) {
- this.last_read_date = null;
- this.posts = {};
- } else {
- const data = JSON.parse(fs.readFileSync(".cache/wordpress_post_fetch.json"));
- this.last_read_date = new Date(data.last_read_date);
- this.posts = data.posts;
- }
- }
-
- writeCache() {
- fs.writeFileSync(".cache/wordpress_post_fetch.json", JSON.stringify(this, null, 2));
- }
-
- async fetchCommentsByType(type = "comment") {
- const params = new URLSearchParams();
- params.set("per_page", 100);
- params.set("type", type);
-
- if (this.last_read_date) {
- params.set("modified_after", this.last_read_date.toISOString());
- }
-
- const response = await fetch(`https://cms.lewisdale.dev/wp-json/wp/v2/comments?${params.toString()}`, {
- headers: {
- "Authorization": `Basic ${auth}`
- }
- });
- return await response.json()
- }
-
- async fetchComments() {
- const likes = await this.fetchCommentsByType("like");
- const mentions = await this.fetchCommentsByType();
- const reposts = await this.fetchCommentsByType("repost");
-
- const comments = [...likes, ...mentions, ...reposts];
-
- comments.forEach(comment => {
- if (this.posts[comment.post]) {
- this.posts[comment.post].comments[comment.id] = comment;
- }
- });
- }
-
- async fetchPosts() {
- const params = new URLSearchParams();
- params.set("per_page", 100);
-
- if (this.last_read_date) {
- params.set("modified_after", this.last_read_date.toISOString());
- }
-
- const response = await fetch(`https://cms.lewisdale.dev/wp-json/wp/v2/posts?${params.toString()}`, {
- headers: {
- "Authorization": `Basic ${auth}`
- }
- });
- const posts = await response.json();
-
- posts.forEach(post => {
- this.posts[post.id] = merge({ comments: {} }, this.posts[post.id], post);
- });
- }
-
- async fetchLatest() {
- await this.fetchPosts();
- await this.fetchComments();
-
- this.last_read_date = new Date();
- this.writeCache();
- }
-}
-
-const mapComment = comment => ({
+const mapComment = comment => ({
author: {
name: comment.author_name,
avatars: comment.author_avatar_urls,
@@ -104,8 +15,7 @@ const mapComment = comment => ({
module.exports = async () => {
- const cache = new PostCache();
- await cache.fetchLatest();
+ const cache = await postCache();
const posts = Object.values(cache.posts)
.sort(dateSort)
@@ -120,7 +30,12 @@ module.exports = async () => {
comments[comment.type].push(mapComment(comment));
return comments;
- }, { like: [], reply: [], repost: [] })
+ }, { like: [], reply: [], repost: [] }),
+ tags: post.tags.map(tag => ({
+ name: cache.tags[tag].name,
+ slug: cache.tags[tag].slug,
+ link: cache.tags[tag].link
+ }))
}));
return posts;
diff --git a/src/_data/tags.js b/src/_data/tags.js
new file mode 100644
index 0000000..a0a90c3
--- /dev/null
+++ b/src/_data/tags.js
@@ -0,0 +1,15 @@
+const postCache = require('./_postData');
+
+
+module.exports = async () => {
+ const cache = await postCache();
+
+ return Object.values(cache.tags).map(tag => {
+ const posts = Object.values(cache.posts).filter(post => post.tags.includes(tag.id));
+
+ return {
+ ...tag,
+ posts,
+ }
+ });
+};
diff --git a/src/_includes/post.njk b/src/_includes/post.njk
index cbb0de5..3cb4f33 100644
--- a/src/_includes/post.njk
+++ b/src/_includes/post.njk
@@ -12,6 +12,14 @@ eleventyComputed:
{{ content | safe }}
+ {% if post.tags | length %}
+
+ {% endif %}
diff --git a/src/blog/tag.html b/src/blog/tag.html
new file mode 100644
index 0000000..98e9df3
--- /dev/null
+++ b/src/blog/tag.html
@@ -0,0 +1,25 @@
+---
+title: Blog
+layout: base.njk
+pagination:
+ data: tags
+ size: 1
+ alias: tag
+eleventyComputed:
+ permalink: "/post/tag/{{ tag.slug }}/"
+---
+
+
+Posts tagged “{{ tag.name }}”
+
+
+ {% for item in tag.posts %}
+ -
+
+
+ {{ item.excerpt.rendered | safe }}
+ Read more
+
+ {% endfor %}
+
+
\ No newline at end of file
diff --git a/src/css/exceptions/tags.css b/src/css/exceptions/tags.css
new file mode 100644
index 0000000..a9c6dd7
--- /dev/null
+++ b/src/css/exceptions/tags.css
@@ -0,0 +1,8 @@
+li:has(a[rel="tag"]) {
+ display: inline-block;
+ margin-inline-end: 1ch;
+
+ &:not(:last-child):after {
+ content: ",";
+ }
+}
\ No newline at end of file