From 565b3ac194ce3797f7d141e0430681c8d9ebfe34 Mon Sep 17 00:00:00 2001
From: tangly1024 <tlyong1992@hotmail.com>
Date: Wed, 22 Dec 2021 16:22:17 +0800
Subject: [PATCH] =?UTF-8?q?feature:=20=E7=9B=AE=E5=BD=95=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E7=99=BE=E5=88=86=E6=AF=94=E8=BF=9B=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/ArticleDetail.js      |  7 +++++--
 components/JumpToBottomButton.js |  2 +-
 components/JumpToTopButton.js    |  4 ++--
 components/Progress.js           |  7 ++++---
 components/SideAreaLeft.js       |  7 ++++---
 components/Toc.js                | 10 +++++++---
 components/TocDrawer.js          |  8 ++++----
 layouts/BaseLayout.js            |  4 ++--
 lib/cache/cache_manager.js       |  7 ++++---
 9 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/components/ArticleDetail.js b/components/ArticleDetail.js
index e00fa544..3469ff17 100644
--- a/components/ArticleDetail.js
+++ b/components/ArticleDetail.js
@@ -165,10 +165,13 @@ export default function ArticleDetail ({ post, blockMap, recommendPosts, prev, n
       {/* 悬浮目录按钮 */}
       <div className="block lg:hidden">
         <TocDrawerButton onClick={() => { drawerRight.current.handleSwitchVisible() }} />
-        <TocDrawer post={post} cRef={drawerRight} />
+        <TocDrawer post={post} cRef={drawerRight} targetRef={targetRef} />
       </div>
 
-      <Progress targetRef={targetRef} />
+      {/* 移动端顶部进度条 */}
+      {/* <div className='fixed left-0 top-0 w-full z-40 block md:hidden'>
+        <Progress targetRef={targetRef} />
+      </div> */}
     </>)
 }
 
diff --git a/components/JumpToBottomButton.js b/components/JumpToBottomButton.js
index dbebfca2..7b87eaf1 100644
--- a/components/JumpToBottomButton.js
+++ b/components/JumpToBottomButton.js
@@ -12,7 +12,7 @@ import smoothscroll from 'smoothscroll-polyfill'
  * @returns {JSX.Element}
  * @constructor
  */
-const JumpToBottomButton = ({ targetRef, showPercent = true }) => {
+const JumpToBottomButton = ({ targetRef, showPercent = false }) => {
   const { locale } = useGlobal()
   const [show, switchShow] = useState(false)
   const [percent, changePercent] = useState(0)
diff --git a/components/JumpToTopButton.js b/components/JumpToTopButton.js
index 792d9c93..a1d4454b 100644
--- a/components/JumpToTopButton.js
+++ b/components/JumpToTopButton.js
@@ -12,7 +12,7 @@ import smoothscroll from 'smoothscroll-polyfill'
  * @returns {JSX.Element}
  * @constructor
  */
-const JumpToTopButton = ({ targetRef, showPercent = true }) => {
+const JumpToTopButton = ({ targetRef, showPercent = false }) => {
   const { locale } = useGlobal()
   const [show, switchShow] = useState(false)
   const [percent, changePercent] = useState(0)
@@ -39,7 +39,7 @@ const JumpToTopButton = ({ targetRef, showPercent = true }) => {
 
   return (<div id='jump-to-top' className='right-3 fixed flex bottom-48 duration-500 z-20'>
       <div onClick={() => window.scrollTo({ top: 0, behavior: 'smooth' })}
-        className={(show ? '' : 'hidden') + ' animate__fadeInRight animate__animated animate__faster shadow-card rounded-xl glassmorphism py-1 cursor-pointer '}>
+        className={(show ? '' : 'hidden') + ' animate__fadeInRight animate__animated animate__faster shadow-card rounded-xl glassmorphism py-3 cursor-pointer '}>
         <div className='text-center'>
         <div className='w-10 dark:text-gray-200 transform hover:scale-150 duration-200 text-xs' title={locale.POST.TOP} >
           <FontAwesomeIcon icon={faArrowUp} />
diff --git a/components/Progress.js b/components/Progress.js
index 1ce7083a..7a35457f 100644
--- a/components/Progress.js
+++ b/components/Progress.js
@@ -8,7 +8,7 @@ import React, { useEffect, useState } from 'react'
 const Progress = ({ targetRef }) => {
   const [percent, changePercent] = useState(0)
   const scrollListener = () => {
-    if (targetRef.current) {
+    if (targetRef?.current) {
       const clientHeight = targetRef ? (targetRef.current.clientHeight) : 0
       const scrollY = window.pageYOffset
       const fullHeight = clientHeight - window.outerHeight
@@ -23,8 +23,9 @@ const Progress = ({ targetRef }) => {
     return () => document.removeEventListener('scroll', scrollListener)
   }, [percent])
 
-  return (<div className='h-1  fixed left-0 top-0 w-full shadow-2xl z-40 bg-blue-200'>
-        <div className='h-1 bg-blue-600 fixed left-0 top-0 duration-200 rounded' style={{ width: `${percent}%` }}/>
+  return (<div className='h-4 w-full shadow-2xl bg-purple-400'>
+        <div className='text-center w-full absolute text-white text-xs'>{percent}%</div>
+        <div className='h-4 bg-purple-700 duration-200 rounded-r' style={{ width: `${percent}%` }}/>
       </div>)
 }
 
diff --git a/components/SideAreaLeft.js b/components/SideAreaLeft.js
index 025480e1..aa089ae4 100644
--- a/components/SideAreaLeft.js
+++ b/components/SideAreaLeft.js
@@ -8,6 +8,7 @@ import { faAngleDoubleRight, faChartBar, faThList } from '@fortawesome/free-soli
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import Link from 'next/link'
 import React from 'react'
+import Progress from './Progress'
 
 /**
  * 侧边平铺
@@ -21,7 +22,7 @@ import React from 'react'
  * @returns {JSX.Element}
  * @constructor
  */
-const SideAreaLeft = ({ title, tags, currentTag, post, posts, categories, currentCategory, currentSearch }) => {
+const SideAreaLeft = ({ title, tags, currentTag, post, posts, categories, currentCategory, currentSearch, targetRef }) => {
   const { locale } = useGlobal()
   const showToc = post && post.toc && post.toc.length > 1
   const postCount = posts?.length || 0
@@ -71,10 +72,10 @@ const SideAreaLeft = ({ title, tags, currentTag, post, posts, categories, curren
 
     {showToc && (
       <section className='sticky top-8 pb-20 rounded-xl shadow-md bg-white dark:bg-gray-800 hover:shadow-2xl duration-200'>
-        <div className='border-b text-2xl bg-white text-black rounded-t-xl dark:border-gray-700 dark:bg-gray-700 dark:text-white py-6 px-6'>
+        <div className='border-b text-center text-2xl bg-white text-black rounded-t-xl dark:border-gray-700 dark:bg-gray-700 dark:text-white py-6 px-6'>
           {locale.COMMON.TABLE_OF_CONTENTS}
         </div>
-        <Toc toc={post.toc} />
+        <Toc toc={post.toc} targetRef={targetRef} />
       </section>
     )}
  </>
diff --git a/components/Toc.js b/components/Toc.js
index 55c640e1..5818a16d 100644
--- a/components/Toc.js
+++ b/components/Toc.js
@@ -1,6 +1,7 @@
 import React, { useCallback } from 'react'
 import throttle from 'lodash.throttle'
 import { uuidToId } from 'notion-utils'
+import Progress from './Progress'
 // import { cs } from 'react-notion-x'
 
 /**
@@ -9,7 +10,7 @@ import { uuidToId } from 'notion-utils'
  * @returns {JSX.Element}
  * @constructor
  */
-const Toc = ({ toc }) => {
+const Toc = ({ toc, targetRef }) => {
   // 无目录就直接返回空
   if (!toc || toc.length < 1) return <></>
 
@@ -51,6 +52,9 @@ const Toc = ({ toc }) => {
   }, throttleMs))
 
   return <>
+    <div className='w-full'>
+      <Progress targetRef={targetRef}/>
+    </div>
     <nav className=' dark:text-gray-100 bg-white dark:bg-gray-800 overflow-y-auto scroll-hidden p-6'>
       {toc.map((tocItem) => {
         const id = uuidToId(tocItem.id)
@@ -58,9 +62,9 @@ const Toc = ({ toc }) => {
           <a
             key={id}
             href={`#${id}`}
-            className={`notion-table-of-contents-item duration-300 transform font-light
+            className={`notion-table-of-contents-item duration-300 transform font-mono
             notion-table-of-contents-item-indent-level-${tocItem.indentLevel} 
-            ${activeSection === id && ' font-bold text-blue-400 dark:text-white'}`}
+            ${activeSection === id && ' font-bold text-purple-500 dark:text-purple-400'}`}
           >
                       <span
                         style={{
diff --git a/components/TocDrawer.js b/components/TocDrawer.js
index 9a39dc8d..8d13ef42 100644
--- a/components/TocDrawer.js
+++ b/components/TocDrawer.js
@@ -9,7 +9,7 @@ import { useGlobal } from '@/lib/global'
  * @returns {JSX.Element}
  * @constructor
  */
-const TocDrawer = ({ post, cRef }) => {
+const TocDrawer = ({ post, cRef, targetRef }) => {
   // 暴露给父组件 通过cRef.current.handleMenuClick 调用
   useImperativeHandle(cRef, () => {
     return {
@@ -26,13 +26,13 @@ const TocDrawer = ({ post, cRef }) => {
       {/* 侧边菜单 */}
       <div
         className={(showDrawer ? 'animate__slideInRight ' : ' -mr-72 animate__slideOutRight') +
-        '  shadow-xl animate__animated animate__faster max-h-96 ' +
+        '  shadow-card animate__animated animate__faster max-h-96 ' +
         ' w-60 duration-200 fixed right-4 top-16 rounded overflow-y-auto'}>
           {post && <>
-            <div className='text-xl font-bold text-black dark:text-white bg-gray-200 dark:bg-gray-600 py-2 px-6'>
+            <div className='text-xl font-bold text-center text-black dark:text-white bg-white dark:bg-gray-600 py-2 px-6'>
               {locale.COMMON.TABLE_OF_CONTENTS}
             </div>
-            <Toc toc={post.toc}/>
+            <Toc toc={post.toc} targetRef={targetRef}/>
           </>
           }
       </div>
diff --git a/layouts/BaseLayout.js b/layouts/BaseLayout.js
index a09ba29a..fc293560 100644
--- a/layouts/BaseLayout.js
+++ b/layouts/BaseLayout.js
@@ -75,7 +75,7 @@ const BaseLayout = ({
       <div className='flex justify-center flex-1 mx-auto md:pt-8 pb-12'>
 
           <div id='left' className='hidden lg:block flex-col w-72'>
-            <SideAreaLeft title={meta.title} post={post} posts={totalPosts} tags={tags} currentSearch={currentSearch} currentTag={currentTag} categories={categories} currentCategory={currentCategory} />
+            <SideAreaLeft targetRef={targetRef} title={meta.title} post={post} posts={totalPosts} tags={tags} currentSearch={currentSearch} currentTag={currentTag} categories={categories} currentCategory={currentCategory} />
           </div>
 
           <div id='center' className='flex-grow max-w-4xl min-h-screen md:mx-10' ref={targetRef}>
@@ -94,7 +94,7 @@ const BaseLayout = ({
       </div>
 
       <Footer title={meta.title}/>
-      <JumpToTopButton targetRef={targetRef} showPercent={true} />
+      <JumpToTopButton targetRef={targetRef} showPercent={false} />
       <JumpToBottomButton targetRef={targetRef} showPercent={false}/>
       <FloatDarkModeButton/>
       </div>
diff --git a/lib/cache/cache_manager.js b/lib/cache/cache_manager.js
index 045b5abd..030b60a3 100644
--- a/lib/cache/cache_manager.js
+++ b/lib/cache/cache_manager.js
@@ -1,4 +1,5 @@
-import { getCacheFromMemory, setCacheToMemory } from '@/lib/cache/memory_cache'
+// import { getCacheFromMemory, setCacheToMemory } from '@/lib/cache/memory_cache'
+import { getCacheFromFile, setCacheToFile } from './local_file_cache'
 const enableCache = true // 生产环境禁用
 
 /**
@@ -10,7 +11,7 @@ export async function getDataFromCache (key) {
   if (!enableCache) {
     return null
   }
-  const dataFromCache = await getCacheFromMemory(key)
+  const dataFromCache = await getCacheFromFile(key)
   if (JSON.stringify(dataFromCache) === '[]') {
     return null
   }
@@ -21,5 +22,5 @@ export async function setDataToCache (key, data) {
   if (!enableCache || !data) {
     return
   }
-  await setCacheToMemory(key, data)
+  await setCacheToFile(key, data)
 }