From 15f2a4def21efbebe4914ee9a54ab38e810bc14e Mon Sep 17 00:00:00 2001
From: Helen Chong <119173961+helenclx@users.noreply.github.com>
Date: Sun, 15 Sep 2024 10:43:10 +0800
Subject: [PATCH] Fix missing RSS feed link

---
 src/_includes/global/macros.njk   | 5 -----
 src/_includes/main/changelogs.njk | 3 +--
 src/_includes/main/footer.njk     | 5 +++--
 src/index.njk                     | 3 +--
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/_includes/global/macros.njk b/src/_includes/global/macros.njk
index a37f146c..e18b7ec6 100644
--- a/src/_includes/global/macros.njk
+++ b/src/_includes/global/macros.njk
@@ -10,9 +10,4 @@
         {%- endfor -%}
     </div>
 </div>
-{%- endmacro -%}
-
-{%- macro siteFeedLink(linkText) -%}
-<a href="{{ sitemeta.feedPath }}">
-    <svg  class="inline-icon" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--!Font Awesome Free 6.6.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M0 64C0 46.3 14.3 32 32 32c229.8 0 416 186.2 416 416c0 17.7-14.3 32-32 32s-32-14.3-32-32C384 253.6 226.4 96 32 96C14.3 96 0 81.7 0 64zM0 416a64 64 0 1 1 128 0A64 64 0 1 1 0 416zM32 160c159.1 0 288 128.9 288 288c0 17.7-14.3 32-32 32s-32-14.3-32-32c0-123.7-100.3-224-224-224c-17.7 0-32-14.3-32-32s14.3-32 32-32z"/></svg>{{ linkText }}</a>
 {%- endmacro -%}
\ No newline at end of file
diff --git a/src/_includes/main/changelogs.njk b/src/_includes/main/changelogs.njk
index 6508777a..a0072eb9 100644
--- a/src/_includes/main/changelogs.njk
+++ b/src/_includes/main/changelogs.njk
@@ -22,8 +22,7 @@ articleElement: true
     </ul>
 </nav>
 
-{% from "global/macros.njk" import siteFeedLink %}
-<p>To get notified of the updates on this website, you can subscribe to its {{ siteFeedLink("RSS feed") }}, which contains new articles, blog posts and website changelogs.</p>
+<p>To get notified of the updates on this website, you can subscribe to its <a href="{{ sitemeta.feedPath }}"><svg class="inline-icon" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--!Font Awesome Free 6.6.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M0 64C0 46.3 14.3 32 32 32c229.8 0 416 186.2 416 416c0 17.7-14.3 32-32 32s-32-14.3-32-32C384 253.6 226.4 96 32 96C14.3 96 0 81.7 0 64zM0 416a64 64 0 1 1 128 0A64 64 0 1 1 0 416zM32 160c159.1 0 288 128.9 288 288c0 17.7-14.3 32-32 32s-32-14.3-32-32c0-123.7-100.3-224-224-224c-17.7 0-32-14.3-32-32s14.3-32 32-32z"/></svg>RSS feed</a>, which contains new articles, blog posts and website changelogs.</p>
 
 {{ content | safe }}
 
diff --git a/src/_includes/main/footer.njk b/src/_includes/main/footer.njk
index 1a710d64..623f518d 100644
--- a/src/_includes/main/footer.njk
+++ b/src/_includes/main/footer.njk
@@ -3,9 +3,10 @@
 {% block footerContent %}
     <h2 class="visually-hidden">Footer Navigation:</h2>
     {% set currentUrl %}{{ page.url }}{% endset %}
-    {% from "global/macros.njk" import siteFeedLink %}
     <ul class="inline-nav footer__links">
-        <li>{{ siteFeedLink("RSS Feed") }}</li>
+        <li>
+            <a href="{{ sitemeta.feedPath }}"><svg class="inline-icon" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--!Font Awesome Free 6.6.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M0 64C0 46.3 14.3 32 32 32c229.8 0 416 186.2 416 416c0 17.7-14.3 32-32 32s-32-14.3-32-32C384 253.6 226.4 96 32 96C14.3 96 0 81.7 0 64zM0 416a64 64 0 1 1 128 0A64 64 0 1 1 0 416zM32 160c159.1 0 288 128.9 288 288c0 17.7-14.3 32-32 32s-32-14.3-32-32c0-123.7-100.3-224-224-224c-17.7 0-32-14.3-32-32s14.3-32 32-32z"/></svg>RSS Feed</a>
+        </li>
         <li><a
             {% if currentUrl === "/sitemap/" %}aria-current="page"{% endif %}
             href="/sitemap/
diff --git a/src/index.njk b/src/index.njk
index ee637557..583bc1ff 100644
--- a/src/index.njk
+++ b/src/index.njk
@@ -57,8 +57,7 @@ eleventyComputed:
         {%- endfor %}
         <p><a href="/changelogs">View all site changelogs</a></p>
     </div>
-    {% from "global/macros.njk" import siteFeedLink %}
-    <p>You can subscribe to the {{ siteFeedLink(sitemeta.siteName + " RSS feed") }} to get notified of the updates on this website, including new articles, blog posts and website changelogs.</p>
+    <p>You can subscribe to the <a href="{{ sitemeta.feedPath }}"><svg class="inline-icon" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--!Font Awesome Free 6.6.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M0 64C0 46.3 14.3 32 32 32c229.8 0 416 186.2 416 416c0 17.7-14.3 32-32 32s-32-14.3-32-32C384 253.6 226.4 96 32 96C14.3 96 0 81.7 0 64zM0 416a64 64 0 1 1 128 0A64 64 0 1 1 0 416zM32 160c159.1 0 288 128.9 288 288c0 17.7-14.3 32-32 32s-32-14.3-32-32c0-123.7-100.3-224-224-224c-17.7 0-32-14.3-32-32s14.3-32 32-32z"/></svg>{{ sitemeta.siteName }} RSS feed</a> to get notified of the updates on this website, including new articles, blog posts and website changelogs.</p>
 
     {% include "main/statuscafe.njk" %}
 </section>