Merge pull request tangly1024#1195 from tangly1024/fix/url-page

fix-url-when-switch-theme
liuxin303 · Jun 23, 2023 · aaa3c4c · aaa3c4c
2 parents c5ddc8c + 5508439
commit aaa3c4c
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/themes/example/components/BlogListPage.js b/themes/example/components/BlogListPage.js
@@ -15,7 +15,7 @@ export const BlogListPage = props => {
 
   const showPrev = currentPage > 1
   const showNext = page < totalPage
-  const pagePrefix = router.asPath.replace(/\/page\/[1-9]\d*/, '').replace(/\/$/, '')
+  const pagePrefix = router.asPath.split('?')[0].replace(/\/page\/[1-9]\d*/, '').replace(/\/$/, '')
 
   const showPageCover = CONFIG_EXAMPLE.POST_LIST_COVER
 

diff --git a/themes/fukasawa/components/PaginationSimple.js b/themes/fukasawa/components/PaginationSimple.js
@@ -13,7 +13,7 @@ const PaginationSimple = ({ page, showNext }) => {
   const { locale } = useGlobal()
   const router = useRouter()
   const currentPage = +page
-  const pagePrefix = router.asPath.replace(/\/page\/[1-9]\d*/, '').replace(/\/$/, '')
+  const pagePrefix =  router.asPath.split('?')[0].replace(/\/page\/[1-9]\d*/, '').replace(/\/$/, '')
 
   return (
     <div className="my-10 flex justify-between font-medium text-black dark:text-gray-100 space-x-2">

diff --git a/themes/hexo/components/PaginationNumber.js b/themes/hexo/components/PaginationNumber.js
@@ -12,7 +12,7 @@ const PaginationNumber = ({ page, totalPage }) => {
   const router = useRouter()
   const currentPage = +page
   const showNext = page < totalPage
-  const pagePrefix = router.asPath.replace(/\/page\/[1-9]\d*/, '').replace(/\/$/, '')
+  const pagePrefix = router.asPath.split('?')[0].replace(/\/page\/[1-9]\d*/, '').replace(/\/$/, '')
   const pages = generatePages(pagePrefix, page, currentPage, totalPage)
 
   return (

diff --git a/themes/matery/components/PaginationNumber.js b/themes/matery/components/PaginationNumber.js
@@ -12,7 +12,7 @@ const PaginationNumber = ({ page, totalPage }) => {
   const router = useRouter()
   const currentPage = +page
   const showNext = page < totalPage
-  const pagePrefix = router.asPath.replace(/\/page\/[1-9]\d*/, '').replace(/\/$/, '')
+  const pagePrefix = router.asPath.split('?')[0].replace(/\/page\/[1-9]\d*/, '').replace(/\/$/, '')
   const pages = generatePages(pagePrefix, page, currentPage, totalPage)
 
   return (

diff --git a/themes/matery/components/PaginationSimple.js b/themes/matery/components/PaginationSimple.js
@@ -12,7 +12,7 @@ const PaginationSimple = ({ page, totalPage }) => {
   const router = useRouter()
   const currentPage = +page
   const showNext = currentPage < totalPage
-  const pagePrefix = router.asPath.replace(/\/page\/[1-9]\d*/, '').replace(/\/$/, '')
+  const pagePrefix = router.asPath.split('?')[0].replace(/\/page\/[1-9]\d*/, '').replace(/\/$/, '')
 
   return (
     <div className="my-10 mx-6 flex justify-between font-medium text-black dark:text-gray-100 space-x-2">

diff --git a/themes/medium/components/PaginationSimple.js b/themes/medium/components/PaginationSimple.js
@@ -14,7 +14,7 @@ const PaginationSimple = ({ page, totalPage }) => {
   const router = useRouter()
   const currentPage = +page
   const showNext = currentPage < totalPage
-  const pagePrefix = router.asPath.replace(/\/page\/[1-9]\d*/, '').replace(/\/$/, '')
+  const pagePrefix = router.asPath.split('?')[0].replace(/\/page\/[1-9]\d*/, '').replace(/\/$/, '')
 
   return (
     <div className="my-10 flex justify-between font-medium text-black dark:text-gray-100 space-x-2">

diff --git a/themes/next/components/PaginationNumber.js b/themes/next/components/PaginationNumber.js
@@ -12,7 +12,7 @@ const PaginationNumber = ({ page, totalPage }) => {
   const router = useRouter()
   const currentPage = +page
   const showNext = page !== totalPage
-  const pagePrefix = router.asPath.replace(/\/page\/[1-9]\d*/, '').replace(/\/$/, '')
+  const pagePrefix = router.asPath.split('?')[0].replace(/\/page\/[1-9]\d*/, '').replace(/\/$/, '')
   const pages = generatePages(pagePrefix, page, currentPage, totalPage)
 
   return (

diff --git a/themes/next/components/PaginationSimple.js b/themes/next/components/PaginationSimple.js
@@ -13,7 +13,7 @@ const PaginationSimple = ({ page, showNext }) => {
   const { locale } = useGlobal()
   const router = useRouter()
   const currentPage = +page
-  const pagePrefix = router.asPath.replace(/\/page\/[1-9]\d*/, '').replace(/\/$/, '')
+  const pagePrefix = router.asPath.split('?')[0].replace(/\/page\/[1-9]\d*/, '').replace(/\/$/, '')
 
   return (
     <div

diff --git a/themes/nobelium/components/BlogListPage.js b/themes/nobelium/components/BlogListPage.js
@@ -14,7 +14,7 @@ export const BlogListPage = props => {
 
   const showPrev = currentPage > 1
   const showNext = page < totalPage
-  const pagePrefix = router.asPath.replace(/\/page\/[1-9]\d*/, '').replace(/\/$/, '')
+  const pagePrefix = router.asPath.split('?')[0].replace(/\/page\/[1-9]\d*/, '').replace(/\/$/, '')
 
   return (
       <div className="w-full md:pr-12 mb-12">
@@ -46,5 +46,5 @@ export const BlogListPage = props => {
                 </Link>
             </div>
         </div>
-  );
+  )
 }
diff --git a/themes/simple/components/BlogListPage.js b/themes/simple/components/BlogListPage.js
@@ -13,7 +13,7 @@ export const BlogListPage = props => {
 
   const showPrev = currentPage > 1
   const showNext = page < totalPage
-  const pagePrefix = router.asPath.replace(/\/page\/[1-9]\d*/, '').replace(/\/$/, '')
+  const pagePrefix = router.asPath.split('?')[0].replace(/\/page\/[1-9]\d*/, '').replace(/\/$/, '')
 
   return (
         <div className="w-full md:pr-8 mb-12">