d0zingcat/NotionNext
1
0
Fork 0
mirror of https://github.com/d0zingcat/NotionNext.git synced 2026-05-31 15:10:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
fix-url-when-switch-theme
This commit is contained in:
tangly1024
2023-06-23 20:52:56 +08:00
committed by GitHub
parent c5ddc8cee3 5508439ee8
commit aaa3c4cf69
10 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
themes/example/components/BlogListPage.js
View File

@@ -15,7 +15,7 @@ export const BlogListPage = props => {
const showPrev = currentPage > 1 const showPrev = currentPage > 1
const showNext = page < totalPage 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 const showPageCover = CONFIG_EXAMPLE.POST_LIST_COVER

2
themes/fukasawa/components/PaginationSimple.js
View File

@@ -13,7 +13,7 @@ const PaginationSimple = ({ page, showNext }) => {
const { locale } = useGlobal() const { locale } = useGlobal()
const router = useRouter() const router = useRouter()
const currentPage = +page 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 ( return (
<div className="my-10 flex justify-between font-medium text-black dark:text-gray-100 space-x-2"> <div className="my-10 flex justify-between font-medium text-black dark:text-gray-100 space-x-2">

2
themes/hexo/components/PaginationNumber.js
View File

@@ -12,7 +12,7 @@ const PaginationNumber = ({ page, totalPage }) => {
const router = useRouter() const router = useRouter()
const currentPage = +page const currentPage = +page
const showNext = page < totalPage 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) const pages = generatePages(pagePrefix, page, currentPage, totalPage)
return ( return (

2
themes/matery/components/PaginationNumber.js
View File

@@ -12,7 +12,7 @@ const PaginationNumber = ({ page, totalPage }) => {
const router = useRouter() const router = useRouter()
const currentPage = +page const currentPage = +page
const showNext = page < totalPage 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) const pages = generatePages(pagePrefix, page, currentPage, totalPage)
return ( return (

2
themes/matery/components/PaginationSimple.js
View File

@@ -12,7 +12,7 @@ const PaginationSimple = ({ page, totalPage }) => {
const router = useRouter() const router = useRouter()
const currentPage = +page const currentPage = +page
const showNext = currentPage < totalPage 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 ( return (
<div className="my-10 mx-6 flex justify-between font-medium text-black dark:text-gray-100 space-x-2"> <div className="my-10 mx-6 flex justify-between font-medium text-black dark:text-gray-100 space-x-2">

2
themes/medium/components/PaginationSimple.js
View File

@@ -14,7 +14,7 @@ const PaginationSimple = ({ page, totalPage }) => {
const router = useRouter() const router = useRouter()
const currentPage = +page const currentPage = +page
const showNext = currentPage < totalPage 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 ( return (
<div className="my-10 flex justify-between font-medium text-black dark:text-gray-100 space-x-2"> <div className="my-10 flex justify-between font-medium text-black dark:text-gray-100 space-x-2">

2
themes/next/components/PaginationNumber.js
View File

@@ -12,7 +12,7 @@ const PaginationNumber = ({ page, totalPage }) => {
const router = useRouter() const router = useRouter()
const currentPage = +page const currentPage = +page
const showNext = page !== totalPage 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) const pages = generatePages(pagePrefix, page, currentPage, totalPage)
return ( return (

2
themes/next/components/PaginationSimple.js
View File

@@ -13,7 +13,7 @@ const PaginationSimple = ({ page, showNext }) => {
const { locale } = useGlobal() const { locale } = useGlobal()
const router = useRouter() const router = useRouter()
const currentPage = +page 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 ( return (
<div <div

4
themes/nobelium/components/BlogListPage.js
View File

@@ -14,7 +14,7 @@ export const BlogListPage = props => {
const showPrev = currentPage > 1 const showPrev = currentPage > 1
const showNext = page < totalPage 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 ( return (
<div className="w-full md:pr-12 mb-12"> <div className="w-full md:pr-12 mb-12">
@@ -46,5 +46,5 @@ export const BlogListPage = props => {
</Link> </Link>
</div> </div>
</div> </div>
); )
} }

2
themes/simple/components/BlogListPage.js
View File

@@ -13,7 +13,7 @@ export const BlogListPage = props => {
const showPrev = currentPage > 1 const showPrev = currentPage > 1
const showNext = page < totalPage 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 ( return (
<div className="w-full md:pr-8 mb-12"> <div className="w-full md:pr-8 mb-12">