From 41809311778ce7f3ea3bcbee88a6047047b3ee1c Mon Sep 17 00:00:00 2001
From: Helen Chong <119173961+helenclx@users.noreply.github.com>
Date: Sat, 15 Jun 2024 18:21:47 +0800
Subject: [PATCH] Merge blog post template into content template

---
 src/_includes/global/content.njk   | 50 ++++++++++++++++++++++++++
 src/_includes/main/blogpost.njk    | 56 ------------------------------
 src/blog/posts/posts.11tydata.json |  3 +-
 3 files changed, 52 insertions(+), 57 deletions(-)
 delete mode 100644 src/_includes/main/blogpost.njk

diff --git a/src/_includes/global/content.njk b/src/_includes/global/content.njk
index 1a492acb..cdf3d0ce 100644
--- a/src/_includes/global/content.njk
+++ b/src/_includes/global/content.njk
@@ -46,6 +46,32 @@
 
     <{{contentEl}} class="content{{' content--divided' if isContentDivided }}">
         {{ content | safe }}
+
+    {% if tags and tags.includes("posts") %}
+        <nav class="blog__post--pagination" aria-labelledby="blog-pagination">
+            <h2 class="visually-hidden">Next and Previous Blog Posts</h2>
+            {%- if collections.posts %}
+                {%- set previousPost = collections.posts | getPreviousCollectionItem %}
+                {%- set nextPost = collections.posts | getNextCollectionItem %}
+                {%- if nextPost or previousPost %}
+                    <ul class="blog__post--nextprev">
+                    {%- if previousPost %}
+                        <li class="blog__post--prev">
+                            <p>Previous Post:</p>
+                            <a href="{{ previousPost.url }}">{{ previousPost.data.articleTitle }}</a>
+                        </li>
+                    {% endif %}
+                    {%- if nextPost %}
+                        <li class="blog__post--next">
+                            <p>Next Post:</p>
+                            <a href="{{ nextPost.url }}">{{ nextPost.data.articleTitle }}</a>
+                        </li>
+                    {% endif %}
+                    </ul>
+                {%- endif %}
+            {%- endif %}
+        </nav>
+    {% endif %}
     </{{contentEl}}>
 
     {% if
@@ -75,4 +101,28 @@
         content: '➔';
         padding-left: 0.3em;
     }
+
+        .blog__post--pagination {
+        padding-top: 1em;
+        margin-top: 2.5em;
+        border-top: 0.1em solid var(--clr-title-border);
+    }
+
+    .blog__post--nextprev {
+        list-style: none;
+        padding: 0;
+        margin: 0;
+        display: grid;
+        gap: 0.7em;
+        grid-template-columns: repeat(2, 1fr);
+        grid-template-areas: 'prev next';
+    }
+
+    .blog__post--prev {
+        grid-area: prev;
+    }
+
+    .blog__post--next {
+        grid-area: next;
+    }
 </style>
\ No newline at end of file
diff --git a/src/_includes/main/blogpost.njk b/src/_includes/main/blogpost.njk
deleted file mode 100644
index f12cd926..00000000
--- a/src/_includes/main/blogpost.njk
+++ /dev/null
@@ -1,56 +0,0 @@
----
-layout: main/content
-isArticle: true
----
-
-{{ content | safe }}
-
-<nav class="blog__post--pagination" aria-labelledby="blog-pagination">
-    <h2 class="visually-hidden">Next and Previous Blog Posts</h2>
-    {%- if collections.posts %}
-        {%- set previousPost = collections.posts | getPreviousCollectionItem %}
-        {%- set nextPost = collections.posts | getNextCollectionItem %}
-        {%- if nextPost or previousPost %}
-            <ul class="blog__post--nextprev">
-            {%- if previousPost %}
-                <li class="blog__post--prev">
-                    <p>Previous Post:</p>
-                    <a href="{{ previousPost.url }}">{{ previousPost.data.articleTitle }}</a>
-                </li>
-            {% endif %}
-            {%- if nextPost %}
-                <li class="blog__post--next">
-                    <p>Next Post:</p>
-                    <a href="{{ nextPost.url }}">{{ nextPost.data.articleTitle }}</a>
-                </li>
-            {% endif %}
-            </ul>
-        {%- endif %}
-    {%- endif %}
-</nav>
-
-<style>
-    .blog__post--pagination {
-        padding-top: 1em;
-        margin-top: 2.5em;
-        border-top: 0.1em solid var(--clr-title-border);
-    }
-
-    .blog__post--nextprev {
-        list-style: none;
-        padding: 0;
-        margin: 0;
-        display: grid;
-        gap: 0.7em;
-        grid-template-columns: repeat(2, 1fr);
-        grid-template-areas: 'prev next';
-    }
-
-    .blog__post--prev {
-        grid-area: prev;
-    }
-
-    .blog__post--next {
-        grid-area: next;
-    }
-</style>
\ No newline at end of file
diff --git a/src/blog/posts/posts.11tydata.json b/src/blog/posts/posts.11tydata.json
index 6eb6d548..ee872c34 100644
--- a/src/blog/posts/posts.11tydata.json
+++ b/src/blog/posts/posts.11tydata.json
@@ -1,6 +1,7 @@
 {
-    "layout": "main/blogpost",
+    "layout": "main/content",
     "tags": ["posts", "contents", "feed items"],
+    "isArticle": true,
     "eleventyComputed": {
         "title": "{{ articleTitle }} | Blog",
         "eleventyNavigation": {