From df1d63905557cb859ae531c3543150cd028e9200 Mon Sep 17 00:00:00 2001
From: Leilukin <contact@leilukin.com>
Date: Thu, 8 May 2025 18:15:06 +0800
Subject: [PATCH] Reorganise pages

---
 src/_includes/layouts/main.vto                             | 3 ++-
 src/pages/{navbarlinks => }/explore.vto                    | 3 ++-
 src/pages/{navbarlinks => explorelinks}/adoptables.vto     | 0
 src/pages/{ => explorelinks}/archive/archive.11tydata.js   | 4 ++--
 src/pages/{ => explorelinks}/archive/archive.vto           | 0
 src/pages/{ => explorelinks}/archive/topic.vto             | 0
 src/pages/{ => explorelinks}/archive/topics.vto            | 0
 src/pages/explorelinks/explorelinks.11tydata.js            | 3 +++
 src/pages/{navbarlinks => explorelinks}/featured.md        | 0
 src/pages/{navbarlinks => explorelinks}/guestbook.vto      | 0
 src/pages/{navbarlinks => explorelinks}/links.vto          | 0
 src/pages/{ => explorelinks}/navbarlinks/about.md          | 0
 src/pages/{ => explorelinks}/navbarlinks/articles.md       | 0
 src/pages/{ => explorelinks}/navbarlinks/blog.vto          | 0
 src/pages/explorelinks/navbarlinks/navbarlinks.11tydata.js | 3 +++
 src/pages/{ => explorelinks}/navbarlinks/projects.md       | 0
 src/pages/{ => explorelinks}/navbarlinks/shrines.vto       | 0
 src/pages/{navbarlinks => explorelinks}/now.md             | 0
 src/pages/footerlinks/changelogs.vto                       | 2 +-
 src/pages/footerlinks/uses.md                              | 2 +-
 src/pages/navbarlinks/navbarlinks.11tydata.js              | 3 ---
 src/pages/{footerlinks => }/sitemap.vto                    | 0
 22 files changed, 14 insertions(+), 9 deletions(-)
 rename src/pages/{navbarlinks => }/explore.vto (72%)
 rename src/pages/{navbarlinks => explorelinks}/adoptables.vto (100%)
 rename src/pages/{ => explorelinks}/archive/archive.11tydata.js (83%)
 rename src/pages/{ => explorelinks}/archive/archive.vto (100%)
 rename src/pages/{ => explorelinks}/archive/topic.vto (100%)
 rename src/pages/{ => explorelinks}/archive/topics.vto (100%)
 create mode 100644 src/pages/explorelinks/explorelinks.11tydata.js
 rename src/pages/{navbarlinks => explorelinks}/featured.md (100%)
 rename src/pages/{navbarlinks => explorelinks}/guestbook.vto (100%)
 rename src/pages/{navbarlinks => explorelinks}/links.vto (100%)
 rename src/pages/{ => explorelinks}/navbarlinks/about.md (100%)
 rename src/pages/{ => explorelinks}/navbarlinks/articles.md (100%)
 rename src/pages/{ => explorelinks}/navbarlinks/blog.vto (100%)
 create mode 100644 src/pages/explorelinks/navbarlinks/navbarlinks.11tydata.js
 rename src/pages/{ => explorelinks}/navbarlinks/projects.md (100%)
 rename src/pages/{ => explorelinks}/navbarlinks/shrines.vto (100%)
 rename src/pages/{navbarlinks => explorelinks}/now.md (100%)
 delete mode 100644 src/pages/navbarlinks/navbarlinks.11tydata.js
 rename src/pages/{footerlinks => }/sitemap.vto (100%)

diff --git a/src/_includes/layouts/main.vto b/src/_includes/layouts/main.vto
index ec9bd5d6..c12c32fa 100644
--- a/src/_includes/layouts/main.vto
+++ b/src/_includes/layouts/main.vto
@@ -142,9 +142,10 @@ function getTodayEvent() {
 {{ set navPages = collections["navbar links"] |> eleventyNavigation }}
 {{ for entry of navPages }}
 <li>
-    <a {{ if entry.url == page.url }} aria-current="page"{{ /if }} href="{{ entry.url }}">{{ entry.title }}</a>
+    <a {{ if entry.url == currentUrl }} aria-current="page"{{ /if }} href="{{ entry.url }}">{{ entry.title }}</a>
 </li>
 {{ /for }}
+<li><a {{ if currentUrl.includes("/explore") }} aria-current="page"{{ /if }} href="/explore/">Explore</a></li>
 {{ /set }}
 
 {{ content }}
diff --git a/src/pages/navbarlinks/explore.vto b/src/pages/explore.vto
similarity index 72%
rename from src/pages/navbarlinks/explore.vto
rename to src/pages/explore.vto
index fd55a0f8..3991e954 100644
--- a/src/pages/navbarlinks/explore.vto
+++ b/src/pages/explore.vto
@@ -1,9 +1,10 @@
 ---
 title: Explore
+eleventyExcludeFromCollections: true
 eleventyComputed:
     desc: Explore {{ sitemeta.siteName }}.
 ---
-{{ set explorePages = collections.pages |> eleventyNavigation }}
+{{ set explorePages = collections["explore links"] |> eleventyNavigation }}
 
 <ul>
 {{ for entry of explorePages }}
diff --git a/src/pages/navbarlinks/adoptables.vto b/src/pages/explorelinks/adoptables.vto
similarity index 100%
rename from src/pages/navbarlinks/adoptables.vto
rename to src/pages/explorelinks/adoptables.vto
diff --git a/src/pages/archive/archive.11tydata.js b/src/pages/explorelinks/archive/archive.11tydata.js
similarity index 83%
rename from src/pages/archive/archive.11tydata.js
rename to src/pages/explorelinks/archive/archive.11tydata.js
index b01b5dc1..7d80fa80 100644
--- a/src/pages/archive/archive.11tydata.js
+++ b/src/pages/explorelinks/archive/archive.11tydata.js
@@ -1,8 +1,8 @@
 export default {
-    tags: "archive",
+    tags: ["archive"],
     eleventyComputed:{
         eleventyNavigation: {
             key: (data) => data.title
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/pages/archive/archive.vto b/src/pages/explorelinks/archive/archive.vto
similarity index 100%
rename from src/pages/archive/archive.vto
rename to src/pages/explorelinks/archive/archive.vto
diff --git a/src/pages/archive/topic.vto b/src/pages/explorelinks/archive/topic.vto
similarity index 100%
rename from src/pages/archive/topic.vto
rename to src/pages/explorelinks/archive/topic.vto
diff --git a/src/pages/archive/topics.vto b/src/pages/explorelinks/archive/topics.vto
similarity index 100%
rename from src/pages/archive/topics.vto
rename to src/pages/explorelinks/archive/topics.vto
diff --git a/src/pages/explorelinks/explorelinks.11tydata.js b/src/pages/explorelinks/explorelinks.11tydata.js
new file mode 100644
index 00000000..e92848a5
--- /dev/null
+++ b/src/pages/explorelinks/explorelinks.11tydata.js
@@ -0,0 +1,3 @@
+export default {
+    tags: ["explore links"],
+}
diff --git a/src/pages/navbarlinks/featured.md b/src/pages/explorelinks/featured.md
similarity index 100%
rename from src/pages/navbarlinks/featured.md
rename to src/pages/explorelinks/featured.md
diff --git a/src/pages/navbarlinks/guestbook.vto b/src/pages/explorelinks/guestbook.vto
similarity index 100%
rename from src/pages/navbarlinks/guestbook.vto
rename to src/pages/explorelinks/guestbook.vto
diff --git a/src/pages/navbarlinks/links.vto b/src/pages/explorelinks/links.vto
similarity index 100%
rename from src/pages/navbarlinks/links.vto
rename to src/pages/explorelinks/links.vto
diff --git a/src/pages/navbarlinks/about.md b/src/pages/explorelinks/navbarlinks/about.md
similarity index 100%
rename from src/pages/navbarlinks/about.md
rename to src/pages/explorelinks/navbarlinks/about.md
diff --git a/src/pages/navbarlinks/articles.md b/src/pages/explorelinks/navbarlinks/articles.md
similarity index 100%
rename from src/pages/navbarlinks/articles.md
rename to src/pages/explorelinks/navbarlinks/articles.md
diff --git a/src/pages/navbarlinks/blog.vto b/src/pages/explorelinks/navbarlinks/blog.vto
similarity index 100%
rename from src/pages/navbarlinks/blog.vto
rename to src/pages/explorelinks/navbarlinks/blog.vto
diff --git a/src/pages/explorelinks/navbarlinks/navbarlinks.11tydata.js b/src/pages/explorelinks/navbarlinks/navbarlinks.11tydata.js
new file mode 100644
index 00000000..5006290a
--- /dev/null
+++ b/src/pages/explorelinks/navbarlinks/navbarlinks.11tydata.js
@@ -0,0 +1,3 @@
+export default {
+    tags: ["navbar links"],
+}
diff --git a/src/pages/navbarlinks/projects.md b/src/pages/explorelinks/navbarlinks/projects.md
similarity index 100%
rename from src/pages/navbarlinks/projects.md
rename to src/pages/explorelinks/navbarlinks/projects.md
diff --git a/src/pages/navbarlinks/shrines.vto b/src/pages/explorelinks/navbarlinks/shrines.vto
similarity index 100%
rename from src/pages/navbarlinks/shrines.vto
rename to src/pages/explorelinks/navbarlinks/shrines.vto
diff --git a/src/pages/navbarlinks/now.md b/src/pages/explorelinks/now.md
similarity index 100%
rename from src/pages/navbarlinks/now.md
rename to src/pages/explorelinks/now.md
diff --git a/src/pages/footerlinks/changelogs.vto b/src/pages/footerlinks/changelogs.vto
index 58d6e30e..d0d62102 100644
--- a/src/pages/footerlinks/changelogs.vto
+++ b/src/pages/footerlinks/changelogs.vto
@@ -11,7 +11,7 @@ pagination:
 permalink: "/{{ page.fileSlug }}{{ if pagination.pageNumber > 0 }}/page/{{ pagination.pageNumber + 1 }}{{ /if }}/"
 eleventyNavigation:
     key: Changelogs
-    order: 9
+    order: 13
 ---
 
 <h2>Latest Changelogs</h2>
diff --git a/src/pages/footerlinks/uses.md b/src/pages/footerlinks/uses.md
index 5db52355..66dd7380 100644
--- a/src/pages/footerlinks/uses.md
+++ b/src/pages/footerlinks/uses.md
@@ -4,7 +4,7 @@ desc: A non-exhaustive list of hardware and software that I use.
 updated: 2025-04-30T01:28:11+0800
 toc: true
 eleventyNavigation:
-     order: 13  
+     order: 10
 ---
 
 Below is a non-exhaustive list of the hardware and software that I use.
diff --git a/src/pages/navbarlinks/navbarlinks.11tydata.js b/src/pages/navbarlinks/navbarlinks.11tydata.js
deleted file mode 100644
index 3ea663c5..00000000
--- a/src/pages/navbarlinks/navbarlinks.11tydata.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export default {
-    tags: "navbar links"
-}
\ No newline at end of file
diff --git a/src/pages/footerlinks/sitemap.vto b/src/pages/sitemap.vto
similarity index 100%
rename from src/pages/footerlinks/sitemap.vto
rename to src/pages/sitemap.vto