From 516dc1ecdb443d93f70b4d590810b133ebac742e Mon Sep 17 00:00:00 2001
From: Helen Chong <119173961+helenclx@users.noreply.github.com>
Date: Fri, 19 Apr 2024 07:50:20 +0800
Subject: [PATCH] Set up global content layout

---
 src/_includes/global/content.njk | 65 +++++++++++++++++++++++++++++++
 src/_includes/main/content.njk   | 66 +-------------------------------
 2 files changed, 66 insertions(+), 65 deletions(-)
 create mode 100644 src/_includes/global/content.njk

diff --git a/src/_includes/global/content.njk b/src/_includes/global/content.njk
new file mode 100644
index 00000000..63f45e2e
--- /dev/null
+++ b/src/_includes/global/content.njk
@@ -0,0 +1,65 @@
+<header class="main__header">
+    {% if isArticle %}
+        <ul class="breadcrumbs">
+            {% set breadcrumbNavPages = collections.all | eleventyNavigationBreadcrumb(articleTitle) %}
+            {%- for entry in breadcrumbNavPages %}
+            <li>
+                <a href="{{ entry.url }}" {% if entry.url == page.url %} class="breadcrumbs--active"{% endif %}>{{ entry.title }}</a>
+            </li>
+            ➔
+            {%- endfor %}
+        </ul>
+
+        <h1>{{ articleTitle }}</h1>
+        <div class="article__info">
+            <p>Posted on {{ date | niceDate }} by {{ sitemeta.siteAuthor.name }}
+            {% if updated %}
+                • Last updated on {{ updated | niceDate }}</p>
+            {% endif %}
+            {% if categories %}
+                <p>Categories:
+                    {% for cat in categories %}
+                        <a href="/categories/{{ cat | slugify }}">{{ cat }}</a>{% if not loop.last %}, {% endif %}
+                    {% endfor %}
+                </p>
+            {% endif %}
+            <p>{{ content | emojiReadTime }}</p>
+        </div>
+    {% else %}
+        <h1>{{ pageTitle or title }}</h1>
+        {% if desc %}
+            <p>{{ desc }}</p>
+        {% endif %}
+    {% endif %}
+</header>
+
+<div class="content__wrapper">
+    {% if toc %}
+        {% include "global/toc.njk" %}
+    {% endif %}
+
+    {% if isArticle %}
+        <article class="article">
+            {{ content | safe }}
+        </article>
+    {% else %}
+		<div class="content {{'content--divided' if isContentDivided }}">
+			{{ content | safe }}
+		</div>
+    {% endif %}
+
+    {% if tags and tags.includes("contents") or title === "Articles" or tags and tags.includes("blog pages") %}
+        {% include "main/content-nav.njk" %}
+    {% endif %}
+</div>
+
+<style>
+    .breadcrumbs {
+        justify-self: center;
+        list-style: none;
+        padding: 0;
+        margin: 0 0 0.7em 0;
+        display: flex;
+        gap: 0.5em;
+    }
+</style>
\ No newline at end of file
diff --git a/src/_includes/main/content.njk b/src/_includes/main/content.njk
index 91c9d0a2..79e86d45 100644
--- a/src/_includes/main/content.njk
+++ b/src/_includes/main/content.njk
@@ -2,68 +2,4 @@
 layout: main/base
 ---
 
-<header class="main__header">
-    {% if isArticle %}
-        <ul class="breadcrumbs">
-            {% set breadcrumbNavPages = collections.all | eleventyNavigationBreadcrumb(articleTitle) %}
-            {%- for entry in breadcrumbNavPages %}
-            <li>
-                <a href="{{ entry.url }}" {% if entry.url == page.url %} class="breadcrumbs--active"{% endif %}>{{ entry.title }}</a>
-            </li>
-            ➔
-            {%- endfor %}
-        </ul>
-
-        <h1>{{ articleTitle }}</h1>
-        <div class="article__info">
-            <p>Posted on {{ date | niceDate }} by {{ sitemeta.siteAuthor.name }}
-            {% if updated %}
-                • Last updated on {{ updated | niceDate }}</p>
-            {% endif %}
-            {% if categories %}
-                <p>Categories:
-                    {% for cat in categories %}
-                        <a href="/categories/{{ cat | slugify }}">{{ cat }}</a>{% if not loop.last %}, {% endif %}
-                    {% endfor %}
-                </p>
-            {% endif %}
-            <p>{{ content | emojiReadTime }}</p>
-        </div>
-    {% else %}
-        <h1>{{ pageTitle or title }}</h1>
-        {% if desc %}
-            <p>{{ desc }}</p>
-        {% endif %}
-    {% endif %}
-</header>
-
-<div class="content__wrapper">
-    {% if toc %}
-        {% include "global/toc.njk" %}
-    {% endif %}
-
-    {% if isArticle %}
-        <article class="article">
-            {{ content | safe }}
-        </article>
-    {% else %}
-		<div class="content {{'content--divided' if isContentDivided }}">
-			{{ content | safe }}
-		</div>
-    {% endif %}
-
-    {% if tags and tags.includes("articles") or title === "Articles" or tags and tags.includes("blog pages") %}
-        {% include "main/content-nav.njk" %}
-    {% endif %}
-</div>
-
-<style>
-    .breadcrumbs {
-        justify-self: center;
-        list-style: none;
-        padding: 0;
-        margin: 0 0 0.7em 0;
-        display: flex;
-        gap: 0.5em;
-    }
-</style>
\ No newline at end of file
+{% extends "global/content.njk" %}
\ No newline at end of file