From d0dece5539e4862f3cbca1cfcecf5ac09ebfa78a Mon Sep 17 00:00:00 2001
From: tangly1024 <tlyong1992@hotmail.com>
Date: Mon, 28 Feb 2022 15:31:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?Hexo=20=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/Hexo/LayoutSlug.js                  | 2 +-
 themes/Hexo/components/Card.js             | 2 +-
 themes/Hexo/components/Catalog.js          | 2 +-
 themes/Hexo/components/LatestPostsGroup.js | 6 +++---
 themes/Hexo/components/MenuButtonGroup.js  | 4 ++--
 themes/Hexo/components/Progress.js         | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/themes/Hexo/LayoutSlug.js b/themes/Hexo/LayoutSlug.js
index 87c69bee..ceb7322b 100644
--- a/themes/Hexo/LayoutSlug.js
+++ b/themes/Hexo/LayoutSlug.js
@@ -53,7 +53,7 @@ export const LayoutSlug = props => {
       showTag={false}
       floatSlot={floatSlot}
     >
-      <div className="w-full lg:shadow-xl lg:hover:shadow-2xl lg:border lg:border-gray-100 lg:rounded-xl lg:px-2 lg:py-4 lg:bg-white lg:dark:bg-gray-800 lg:duration-300">
+      <div className="w-full lg:shadow-md lg:hover:shadow-2xl lg:border lg:border-gray-100 lg:rounded-xl lg:px-2 lg:py-4 lg:bg-white lg:dark:bg-gray-800 lg:duration-300">
         <ArticleDetail {...props} />
       </div>
 
diff --git a/themes/Hexo/components/Card.js b/themes/Hexo/components/Card.js
index 61feccfd..8cb8123c 100644
--- a/themes/Hexo/components/Card.js
+++ b/themes/Hexo/components/Card.js
@@ -1,7 +1,7 @@
 const Card = ({ children, headerSlot, className }) => {
   return <div className={className}>
     <>{headerSlot}</>
-    <section className="shadow-xl hover:shadow-2xl border border-gray-100 rounded-xl px-2 py-4 bg-white dark:bg-gray-800 duration-300">
+    <section className="shadow-md hover:shadow-2xl border border-gray-100 rounded-xl px-2 py-4 bg-white dark:bg-gray-800 duration-300">
         {children}
     </section>
   </div>
diff --git a/themes/Hexo/components/Catalog.js b/themes/Hexo/components/Catalog.js
index 540c0d75..59942526 100644
--- a/themes/Hexo/components/Catalog.js
+++ b/themes/Hexo/components/Catalog.js
@@ -53,7 +53,7 @@ const Catalog = ({ toc }) => {
 
   return <div className='px-3'>
     <div className='w-full'><i className='mr-1 fas fa-stream' /> 目录</div>
-    <div className='w-full py-1'>
+    <div className='w-full py-3'>
       <Progress/>
     </div>
     <nav className='font-sans overflow-y-auto scroll-hidden text-black'>
diff --git a/themes/Hexo/components/LatestPostsGroup.js b/themes/Hexo/components/LatestPostsGroup.js
index c7e4ebd9..2ba9e2bb 100644
--- a/themes/Hexo/components/LatestPostsGroup.js
+++ b/themes/Hexo/components/LatestPostsGroup.js
@@ -25,9 +25,9 @@ const LatestPostsGroup = ({ posts }) => {
         const selected = currentPath === `${BLOG.PATH}/article/${post.slug}`
         return (
           <Link key={post.id} title={post.title} href={`${BLOG.PATH}/article/${post.slug}`} passHref>
-            <a className={ 'my-1  flex font-light'}>
-              <div className={ (selected ? 'text-white  bg-blue-600 ' : 'text-gray-500 dark:text-gray-400 ') + ' text-xs py-1.5 flex overflow-x-hidden whitespace-nowrap hover:bg-blue-600 px-2 duration-200 w-full ' +
-                'hover:text-white dark:hover:text-white cursor-pointer' }>
+            <a className={ 'my-1 mx-5 flex font-light'}>
+              <div className={ (selected ? 'text-white  bg-blue-400 ' : 'text-gray-500 dark:text-gray-400 ') + ' text-xs py-1.5 flex overflow-x-hidden whitespace-nowrap hover:bg-blue-400 px-2 duration-200 w-full rounded ' +
+                'hover:text-white dark:hover:text-white cursor-pointer items-center'}>
                 <i className='mr-2 fas fa-file-alt'/>
                 <div className='truncate'>{post.title}</div>
               </div>
diff --git a/themes/Hexo/components/MenuButtonGroup.js b/themes/Hexo/components/MenuButtonGroup.js
index a761d498..ee93f4a7 100644
--- a/themes/Hexo/components/MenuButtonGroup.js
+++ b/themes/Hexo/components/MenuButtonGroup.js
@@ -25,8 +25,8 @@ const MenuButtonGroup = (props) => {
         if (link.show) {
           const selected = (router.pathname === link.to) || (router.asPath === link.to)
           return <Link key={`${link.id}-${link.to}`} title={link.to} href={link.to} >
-          <a className={'py-1.5 my-1 px-5 duration-300 text-base justify-between hover:bg-blue-600 hover:text-white hover:shadow-lg cursor-pointer flex flex-nowrap items-center ' +
-              (selected ? 'bg-blue-600 text-white' : ' ')} >
+          <a className={'py-1.5 my-1 px-5 duration-300 text-base justify-between hover:bg-blue-400 rounded-md hover:text-white hover:shadow-lg cursor-pointer flex flex-nowrap items-center ' +
+              (selected ? 'bg-blue-400 rounded-md text-white' : ' ')} >
               <div className='my-auto items-center justify-center flex '>
                 <i className={link.icon} />
                 <div className={'ml-4'}>{link.name}</div>
diff --git a/themes/Hexo/components/Progress.js b/themes/Hexo/components/Progress.js
index 8dcde403..9c893459 100644
--- a/themes/Hexo/components/Progress.js
+++ b/themes/Hexo/components/Progress.js
@@ -29,7 +29,7 @@ const Progress = ({ targetRef, showPercent = true }) => {
   return (
     <div className="h-4 w-full shadow-2xl bg-gray-400 font-sans">
       <div
-        className="h-4 bg-blue-600 duration-200"
+        className="h-4 bg-blue-400 duration-200"
         style={{ width: `${percent}%` }}
       >
         {showPercent && (

From cd8954d02a2c3f8b0d3a1b733a100749ac75d837 Mon Sep 17 00:00:00 2001
From: tangly1024 <tlyong1992@hotmail.com>
Date: Mon, 28 Feb 2022 15:31:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B0=81=E8=A3=85getLatestPosts=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/notion/getNotionData.js | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/lib/notion/getNotionData.js b/lib/notion/getNotionData.js
index 4873cf9c..7b4aebbe 100644
--- a/lib/notion/getNotionData.js
+++ b/lib/notion/getNotionData.js
@@ -37,7 +37,17 @@ export async function getGlobalNotionData ({
   const customNav = await getCustomNav({ notionPageData })
   const categories = await getAllCategories(allPosts)
   const tags = await getAllTags({ allPosts, tagOptions, sliceCount: tagsCount })
-  // 深拷贝
+  const latestPosts = await getLatestPosts({ notionPageData, from, latestPostCount })
+  return { allPosts, latestPosts, categories, postCount, customNav, tags }
+}
+
+/**
+ * 获取最新文章
+ * @param {*}} param0
+ * @returns
+ */
+async function getLatestPosts ({ notionPageData, from, latestPostCount }) {
+  const allPosts = await getAllPosts({ notionPageData, from, pageType: ['Post'] })
   let latestPosts = Object.create(allPosts)
   // 时间排序
   latestPosts.sort((a, b) => {
@@ -48,14 +58,7 @@ export async function getGlobalNotionData ({
 
   // 只取前五
   latestPosts = latestPosts.slice(0, latestPostCount)
-  return {
-    allPosts,
-    latestPosts,
-    categories,
-    postCount,
-    customNav,
-    tags
-  }
+  return latestPosts
 }
 
 /**