From 9a4f57d756a5c44fd72553dbaa40bf28ffb67986 Mon Sep 17 00:00:00 2001
From: tangly1024 <tlyong1992@hotmail.com>
Date: Tue, 1 Mar 2022 12:59:47 +0800
Subject: [PATCH] =?UTF-8?q?FUKASAWA=E4=B8=BB=E9=A2=98=EF=BC=8C=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E6=A0=87=E7=AD=BE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/Fukasawa/LayoutCategoryIndex.js      | 6 +++---
 themes/Fukasawa/components/BlogListPage.js  | 2 +-
 themes/Fukasawa/components/GroupCategory.js | 8 ++++----
 themes/index.js                             | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/themes/Fukasawa/LayoutCategoryIndex.js b/themes/Fukasawa/LayoutCategoryIndex.js
index 0941d901..f7c8196e 100644
--- a/themes/Fukasawa/LayoutCategoryIndex.js
+++ b/themes/Fukasawa/LayoutCategoryIndex.js
@@ -17,11 +17,11 @@ export const LayoutCategoryIndex = (props) => {
         <i className='mr-4 fas fa-th' />{locale.COMMON.CATEGORY}:
       </div>
       <div id='category-list' className='duration-200 flex flex-wrap'>
-        {Object.keys(categories).map(category => {
-          return <Link key={category} href={`/category/${category}`} passHref>
+        {categories && categories.map(category => {
+          return <Link key={category.name} href={`/category/${category.name}`} passHref>
             <div
               className={'hover:text-black dark:hover:text-white dark:text-gray-300 dark:hover:bg-gray-600 px-5 cursor-pointer py-2 hover:bg-gray-100'}>
-              <i className='mr-4 fas fa-folder' />{category}({categories[category]})
+              <i className='mr-4 fas fa-folder' />{category.name}({category.count})
             </div>
           </Link>
         })}
diff --git a/themes/Fukasawa/components/BlogListPage.js b/themes/Fukasawa/components/BlogListPage.js
index 4c6fc823..afc7f6f7 100644
--- a/themes/Fukasawa/components/BlogListPage.js
+++ b/themes/Fukasawa/components/BlogListPage.js
@@ -14,7 +14,7 @@ import PaginationSimple from './PaginationSimple'
  */
 const BlogListPage = ({ page = 1, posts = [], postCount }) => {
   const totalPage = Math.ceil(postCount / BLOG.POSTS_PER_PAGE)
-  const showNext = page < totalPage && posts.length < postCount
+  const showNext = page < totalPage && posts.length <= BLOG.POSTS_PER_PAGE && posts.length < postCount
   const [colCount, changeCol] = useState(3)
 
   function updateCol () {
diff --git a/themes/Fukasawa/components/GroupCategory.js b/themes/Fukasawa/components/GroupCategory.js
index 3dd437d8..fabc2e57 100644
--- a/themes/Fukasawa/components/GroupCategory.js
+++ b/themes/Fukasawa/components/GroupCategory.js
@@ -8,14 +8,14 @@ function GroupCategory ({ currentCategory, categories }) {
 
   return <>
     <div id='category-list' className='dark:border-gray-600 flex flex-wrap'>
-      {Object.keys(categories).map(category => {
-        const selected = currentCategory === category
-        return <Link key={category} href={`/category/${category}`} passHref>
+      {categories.map(category => {
+        const selected = currentCategory === category.name
+        return <Link key={category.name} href={`/category/${category.name}`} passHref>
           <a className={(selected
             ? 'hover:text-white dark:hover:text-white bg-gray-600 text-white '
             : 'dark:text-gray-400 text-gray-500 hover:text-white hover:bg-gray-500 dark:hover:text-white') +
             '  text-sm w-full items-center duration-300 px-2  cursor-pointer py-1 font-light'}>
-            <i className={`${selected ? 'text-white fa-folder-open' : 'fa-folder text-gray-400'} fas mr-2`} />{category}({categories[category]})
+            <i className={`${selected ? 'text-white fa-folder-open' : 'fa-folder text-gray-400'} fas mr-2`} />{category.name}({category.count})
             </a>
         </Link>
       })}
diff --git a/themes/index.js b/themes/index.js
index e9b63872..13b192e4 100644
--- a/themes/index.js
+++ b/themes/index.js
@@ -3,7 +3,7 @@
  */
 
 // export * from './Empty' //  空主题
-export * from './NEXT'
-// export * from './Fukasawa'
+// export * from './NEXT'
+export * from './Fukasawa'
 // export * from './Hexo'
 // export * from './Medium'