From 76d2f595bd1fe9027a516925bf13937b8ef6e50b Mon Sep 17 00:00:00 2001
From: JoblersTune <sarah@interledger.org>
Date: Fri, 15 May 2026 13:15:56 +0200
Subject: [PATCH 1/2] fix: pagination should preserve tag filters

---
 src/components/blog/BlogIndex.astro      | 2 ++
 src/components/blog/Pagination.astro     | 4 ++--
 src/pages/blog/[...page].astro           | 1 +
 src/pages/blog/tag/[tag]/[...page].astro | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/blog/BlogIndex.astro b/src/components/blog/BlogIndex.astro
index 3d8aa5e4..97f66077 100644
--- a/src/components/blog/BlogIndex.astro
+++ b/src/components/blog/BlogIndex.astro
@@ -21,6 +21,7 @@ interface Props {
   paginationProps?: {
     length: number
     currentPage: number
+    baseUrl: string
     firstUrl: string | undefined
     prevUrl: string | undefined
     nextUrl: string | undefined
@@ -127,6 +128,7 @@ const {
         <Pagination
           length={paginationProps.length}
           currentPage={paginationProps.currentPage}
+          baseUrl={paginationProps.baseUrl}
           firstUrl={paginationProps.firstUrl}
           prevUrl={paginationProps.prevUrl}
           nextUrl={paginationProps.nextUrl}
diff --git a/src/components/blog/Pagination.astro b/src/components/blog/Pagination.astro
index 7682204c..99e7cb9e 100644
--- a/src/components/blog/Pagination.astro
+++ b/src/components/blog/Pagination.astro
@@ -1,5 +1,5 @@
 ---
-const { length, currentPage, firstUrl, prevUrl, nextUrl, lastUrl } = Astro.props
+const { length, currentPage, baseUrl, firstUrl, prevUrl, nextUrl, lastUrl } = Astro.props
 
 const paginationList = Array.from({ length }, (_, i) => i + 1)
 ---
@@ -28,7 +28,7 @@ const paginationList = Array.from({ length }, (_, i) => i + 1)
   {
     paginationList.map((num) => (
       <a
-        href={`/developers/blog${num == 1 ? '' : '/' + num}`}
+        href={`${baseUrl}${num == 1 ? '' : '/' + num}`}
         class={`pagination__link ${currentPage == num ? 'disabled active' : ''}`}
       >
         {num}
diff --git a/src/pages/blog/[...page].astro b/src/pages/blog/[...page].astro
index d4c3ebe0..876bd097 100644
--- a/src/pages/blog/[...page].astro
+++ b/src/pages/blog/[...page].astro
@@ -49,6 +49,7 @@ const { page, allTags } = Astro.props
     paginationProps={{
       length: page.lastPage,
       currentPage: page.currentPage,
+      baseUrl: '/developers/blog',
       firstUrl: page.url.first,
       prevUrl: page.url.prev,
       nextUrl: page.url.next,
diff --git a/src/pages/blog/tag/[tag]/[...page].astro b/src/pages/blog/tag/[tag]/[...page].astro
index 27498151..0bbc2778 100644
--- a/src/pages/blog/tag/[tag]/[...page].astro
+++ b/src/pages/blog/tag/[tag]/[...page].astro
@@ -67,6 +67,7 @@ const { page, allTags, selectedTag } = Astro.props
     paginationProps={{
       length: page.lastPage,
       currentPage: page.currentPage,
+      baseUrl: `/developers/blog/tag/${getTagSlug(selectedTag)}`,
       firstUrl: page.url.first,
       prevUrl: page.url.prev,
       nextUrl: page.url.next,

From c1992ee99b8d89b3724db4401de0f6c38b979b16 Mon Sep 17 00:00:00 2001
From: JoblersTune <sarah@interledger.org>
Date: Fri, 15 May 2026 13:17:53 +0200
Subject: [PATCH 2/2] chore: formatting

---
 src/components/blog/Pagination.astro | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/blog/Pagination.astro b/src/components/blog/Pagination.astro
index 99e7cb9e..08e2a7c7 100644
--- a/src/components/blog/Pagination.astro
+++ b/src/components/blog/Pagination.astro
@@ -1,5 +1,6 @@
 ---
-const { length, currentPage, baseUrl, firstUrl, prevUrl, nextUrl, lastUrl } = Astro.props
+const { length, currentPage, baseUrl, firstUrl, prevUrl, nextUrl, lastUrl } =
+  Astro.props
 
 const paginationList = Array.from({ length }, (_, i) => i + 1)
 ---