From 46495f9fe6f410f9bbdc1bf8e3571876cc68eae4 Mon Sep 17 00:00:00 2001
From: tangly <tlyong1992@hotmail.com>
Date: Sat, 6 Nov 2021 11:37:20 +0800
Subject: [PATCH] =?UTF-8?q?bugFix:=20=E6=9C=80=E6=96=B0=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=EF=BC=9B=20=E8=BE=93=E5=85=A5=E6=A1=86?=
 =?UTF-8?q?=E5=BA=95=E8=BE=B9=E6=A0=B7=E5=BC=8F=EF=BC=9B=20=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E8=83=8C=E6=99=AF=E8=89=B2=E9=AB=98=E5=BA=A6=EF=BC=9B?=
 =?UTF-8?q?=20=E5=A4=9C=E9=97=B4=E6=A8=A1=E5=BC=8F=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2=EF=BC=9B=20=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=82=AC=E6=B5=AEDarkmode=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/LatestPosts.js  | 22 ++++++++++++++--------
 components/SearchInput.js  |  2 +-
 components/SideBar.js      |  8 --------
 components/Toc.js          |  4 ++--
 components/TopNav.js       |  2 +-
 layouts/BaseLayout.js      |  2 +-
 lib/cache/cache_manager.js |  6 +++++-
 7 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/components/LatestPosts.js b/components/LatestPosts.js
index 603e6bbd..b5caaf1f 100644
--- a/components/LatestPosts.js
+++ b/components/LatestPosts.js
@@ -9,15 +9,21 @@ import { useRouter } from 'next/router'
  * @constructor
  */
 const LatestPosts = ({ posts }) => {
-  // 按时间排序
-  if (posts) {
-    posts = posts.sort((a, b) => {
+  // 深拷贝
+  let postsSortByDate = Object.create(posts)
+
+  // 时间排序
+  postsSortByDate.sort((a, b) => {
       const dateA = new Date(a?.lastEditedTime || a.createdTime)
       const dateB = new Date(b?.lastEditedTime || b.createdTime)
       return dateB - dateA
-    }).slice(0, 5)
-  }
-  const router = useRouter()
+  })
+
+  // 只取前五
+  postsSortByDate = postsSortByDate.slice(0, 5)
+  
+  // 获取当前路径
+  const currentPath = useRouter().asPath
 
   return <>
     <section
@@ -25,10 +31,10 @@ const LatestPosts = ({ posts }) => {
       <div className='w-32'>最近更新</div>
     </section>
     <div>
-      {posts.map(post => {
+      {postsSortByDate.map(post => {
         return (
           <Link key={post.id} title={post.title} href={`${BLOG.path}/article/${post.slug}`} >
-            <div className={(router.asPath === `${BLOG.path}/article/${post.slug}` ? 'bg-gray-200 dark:bg-black' : '') + ' text-xs leading-5 py-1.5 px-5 flex'}>
+            <div className={(currentPath === `${BLOG.path}/article/${post.slug}` ? 'bg-gray-200 dark:bg-black' : '') + ' text-xs leading-5 py-1.5 px-5 flex'}>
               <div className='mr-2 text-gray-500'>
                 {formatDateFmt(post.lastEditedTime, 'yyyy/MM/dd')}
               </div>
diff --git a/components/SearchInput.js b/components/SearchInput.js
index df0799a3..6ed58415 100644
--- a/components/SearchInput.js
+++ b/components/SearchInput.js
@@ -45,7 +45,7 @@ const SearchInput = ({ currentTag, currentSearch }) => {
     />
     { (searchKey && searchKey.length && <i className='fa fa-close text-gray-300 float-right p-3 cursor-pointer' onClick={ cleanSearch } />)}
 
-    <div className='py-3 px-4 bg-gray-50 flex border-l dark:border-gray-700 dark:bg-gray-500 justify-center align-middle cursor-pointer'
+    <div className='py-4 px-4 bg-gray-50 flex border-l dark:border-gray-700 dark:bg-gray-500 justify-center align-middle cursor-pointer'
          onClick={() => { handleSearch(searchKey) }}>
       <i className='fa fa-search text-black cursor-pointer' />
     </div>
diff --git a/components/SideBar.js b/components/SideBar.js
index 7f3ba827..ba20e64b 100644
--- a/components/SideBar.js
+++ b/components/SideBar.js
@@ -20,14 +20,6 @@ import DarkModeButton from '@/components/DarkModeButton'
  * @constructor
  */
 const SideBar = ({ tags, currentTag, post, posts, categories, currentCategory }) => {
-  // 按时间排序
-  if (posts) {
-    posts = posts.sort((a, b) => {
-      const dateA = new Date(a?.lastEditedTime || a.createdTime)
-      const dateB = new Date(b?.lastEditedTime || b.createdTime)
-      return dateB - dateA
-    }).slice(0, 5)
-  }
 
   return <aside id='sidebar' className='pt-10 bg-white dark:bg-gray-800 w-72 z-10 dark:border-gray-500 border-gray-200 scroll-hidden h-full'>
     <section>
diff --git a/components/Toc.js b/components/Toc.js
index 641593c6..75900311 100644
--- a/components/Toc.js
+++ b/components/Toc.js
@@ -50,7 +50,7 @@ const Toc = ({ toc }) => {
     setActiveSection(currentSectionId)
   }, throttleMs))
 
-  return <>
+  return <div className='dark:bg-gray-600 min-h-screen'>
     <div
       className=' dark:border-gray-600 border-b text-2xl bg-white font-bold text-black dark:bg-gray-900 dark:text-white py-6 px-6'>
       文章目录
@@ -82,7 +82,7 @@ const Toc = ({ toc }) => {
         )
       })}
     </nav>
-  </>
+  </div>
 }
 
 export default Toc
diff --git a/components/TopNav.js b/components/TopNav.js
index 03cc106e..4a66f83d 100644
--- a/components/TopNav.js
+++ b/components/TopNav.js
@@ -28,7 +28,7 @@ const TopNav = ({ tags, currentTag, post, posts, currentSearch, categories, curr
         </div>
 
         {/* 右侧功能 */}
-        <div className='flex flex-nowrap space-x-1 ml-2'>
+        <div className='flex flex-nowrap space-x-1 ml-2 dark:text-gray-200'>
           <DarkModeButton />
         </div>
       </div>
diff --git a/layouts/BaseLayout.js b/layouts/BaseLayout.js
index 360005d7..ee68e95a 100644
--- a/layouts/BaseLayout.js
+++ b/layouts/BaseLayout.js
@@ -81,7 +81,7 @@ const BaseLayout = ({
           {children}
         </div>
         <JumpToTopButton targetRef={targetRef} showPercent={true} />
-        <div className='fixed right-4 top-4 p-1 bg-gray-700 dark:border-gray-500 dark:bg-gray-700 rounded-full text-white' style={{ boxShadow: 'rgba(41, 50, 60, 0.5) 0px 2px 16px', borderRadius: '28px' }}>
+        <div className='hidden lg:block fixed right-4 top-4 p-1 bg-gray-700 dark:border-gray-500 dark:bg-gray-700 rounded-full text-white' style={{ boxShadow: 'rgba(41, 50, 60, 0.5) 0px 2px 16px', borderRadius: '28px' }}>
           <DarkModeButton/>
         </div>
       </main>
diff --git a/lib/cache/cache_manager.js b/lib/cache/cache_manager.js
index 25d76ba0..34b5fff7 100644
--- a/lib/cache/cache_manager.js
+++ b/lib/cache/cache_manager.js
@@ -1,7 +1,11 @@
 import { getCacheFromFile, setCacheToFile } from '@/lib/cache/local_file_cache'
 import { getCacheFromMemory, setCacheToMemory } from '@/lib/cache/memory_cache'
 import BLOG from '@/blog.config'
-
+/**
+ * 为减少频繁接口请求，notion数据将被缓存
+ * @param {*} key 
+ * @returns 
+ */
 export async function getDataFromCache (key) {
   let dataFromCache
   if (BLOG.isProd) {