From b0120bfd8fdb532fdb9f97016e2c19fbcb9e38b4 Mon Sep 17 00:00:00 2001
From: CodeMaker-Zhao <zlq1440169549@qq.com>
Date: Thu, 8 Dec 2022 16:42:53 +0800
Subject: [PATCH 01/26] dynamic import waline/client

---
 themes/example/components/ExampleRecentComments.js | 4 +++-
 themes/hexo/components/HexoRecentComments.js       | 4 +++-
 themes/next/components/NextRecentComments.js       | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/themes/example/components/ExampleRecentComments.js b/themes/example/components/ExampleRecentComments.js
index 32d11463..824246ed 100644
--- a/themes/example/components/ExampleRecentComments.js
+++ b/themes/example/components/ExampleRecentComments.js
@@ -1,7 +1,9 @@
 import React from 'react'
-import { RecentComments } from '@waline/client'
 import BLOG from '@/blog.config'
 import Link from 'next/link'
+import dynamic from 'next/dynamic'
+
+const { RecentComments } = dynamic(() => import('@waline/client'))
 
 /**
  * @see https://waline.js.org/guide/get-started.html
diff --git a/themes/hexo/components/HexoRecentComments.js b/themes/hexo/components/HexoRecentComments.js
index 4977ccf4..8925aa90 100644
--- a/themes/hexo/components/HexoRecentComments.js
+++ b/themes/hexo/components/HexoRecentComments.js
@@ -1,9 +1,11 @@
 import React from 'react'
-import { RecentComments } from '@waline/client'
 import BLOG from '@/blog.config'
 import Card from '@/themes/hexo/components/Card'
 import { useGlobal } from '@/lib/global'
 import Link from 'next/link'
+import dynamic from 'next/dynamic'
+
+const { RecentComments } = dynamic(() => import('@waline/client'))
 
 /**
  * @see https://waline.js.org/guide/get-started.html
diff --git a/themes/next/components/NextRecentComments.js b/themes/next/components/NextRecentComments.js
index 961c3e08..041d8431 100644
--- a/themes/next/components/NextRecentComments.js
+++ b/themes/next/components/NextRecentComments.js
@@ -1,7 +1,9 @@
 import React from 'react'
-import { RecentComments } from '@waline/client'
 import BLOG from '@/blog.config'
 import Link from 'next/link'
+import dynamic from 'next/dynamic'
+
+const { RecentComments } = dynamic(() => import('@waline/client'))
 
 /**
  * @see https://waline.js.org/guide/get-started.html

From 9abce273816ea07149c809eafff0ac5318cd1eff Mon Sep 17 00:00:00 2001
From: huisc <huisc@foxmail.com>
Date: Fri, 9 Dec 2022 18:14:57 +0800
Subject: [PATCH 02/26] =?UTF-8?q?next=E4=B8=BB=E9=A2=98=E7=BB=86=E5=BE=AE?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/next/components/BlogPostCard.js | 2 +-
 themes/next/components/Logo.js         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/next/components/BlogPostCard.js b/themes/next/components/BlogPostCard.js
index 43ae9e65..e1bcd070 100644
--- a/themes/next/components/BlogPostCard.js
+++ b/themes/next/components/BlogPostCard.js
@@ -86,7 +86,7 @@ const BlogPostCard = ({ post, showSummary }) => {
 
           <div className="text-right border-t pt-8 border-dashed">
             <Link href={`${BLOG.SUB_PATH}/${post.slug}`}>
-              <a className="hover:bg-opacity-100 hover:underline transform duration-300 p-3 text-white bg-gray-800 dark:bg-black cursor-pointer">
+              <a className="hover:bg-opacity-100 hover:underline transform duration-300 p-3 text-white bg-gray-800 cursor-pointer">
                 {locale.COMMON.ARTICLE_DETAIL}
                 <i className="ml-1 fas fa-angle-right" />
               </a>
diff --git a/themes/next/components/Logo.js b/themes/next/components/Logo.js
index 46cb814e..69c13a1e 100644
--- a/themes/next/components/Logo.js
+++ b/themes/next/components/Logo.js
@@ -4,7 +4,7 @@ import React from 'react'
 const Logo = props => {
   const { siteInfo, className } = props
   return <Link href='/' passHref>
-    <div className={'flex flex-col justify-center items-center cursor-pointer bg-black space-y-3 font-bold ' + className}>
+    <div className={'flex flex-col justify-center items-center cursor-pointer bg-black dark:bg-gray-900 space-y-3 font-bold ' + className}>
       <div className='font-serif text-xl text-white'> {siteInfo?.title}</div>
       <div className='text-sm text-gray-300 font-light text-center'> {siteInfo?.description}</div>
     </div>

From 4757fd52144fbbc0fa1d206f7dc66e70b78ca55d Mon Sep 17 00:00:00 2001
From: huisc <huisc@foxmail.com>
Date: Fri, 9 Dec 2022 18:43:38 +0800
Subject: [PATCH 03/26] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E3=80=81=E6=A0=87=E7=AD=BE=E3=80=81=E5=BD=92=E6=A1=A3=E4=B8=89?=
 =?UTF-8?q?=E4=B8=AA=E9=A1=B5=E9=9D=A2=E7=9A=84=E8=83=8C=E6=99=AF=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/next/LayoutArchive.js       | 2 +-
 themes/next/LayoutCategoryIndex.js | 2 +-
 themes/next/LayoutTagIndex.js      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/themes/next/LayoutArchive.js b/themes/next/LayoutArchive.js
index ce66e25f..3db36dbd 100644
--- a/themes/next/LayoutArchive.js
+++ b/themes/next/LayoutArchive.js
@@ -39,7 +39,7 @@ export const LayoutArchive = (props) => {
 
   return (
     <LayoutBase {...props}>
-      <div className="mb-10 pb-20 bg-white md:p-12 p-3 dark:bg-gray-800 shadow-md min-h-full">
+      <div className="mb-10 pb-20 bg-white md:p-12 p-3 dark:bg-hexo-black-gray shadow-md min-h-full">
         {Object.keys(archivePosts).map(archiveTitle => (
           <BlogPostArchive
             key={archiveTitle}
diff --git a/themes/next/LayoutCategoryIndex.js b/themes/next/LayoutCategoryIndex.js
index 6f674a68..c20ba566 100644
--- a/themes/next/LayoutCategoryIndex.js
+++ b/themes/next/LayoutCategoryIndex.js
@@ -6,7 +6,7 @@ export const LayoutCategoryIndex = (props) => {
   const { allPosts, categories } = props
   const { locale } = useGlobal()
   return <LayoutBase totalPosts={allPosts} {...props}>
-    <div className='bg-white dark:bg-gray-700 px-10 py-10 shadow h-full'>
+    <div className='bg-white dark:bg-hexo-black-gray px-10 py-10 shadow h-full'>
       <div className='dark:text-gray-200 mb-5'>
         <i className='mr-4 fas faTh' />{locale.COMMON.CATEGORY}:
       </div>
diff --git a/themes/next/LayoutTagIndex.js b/themes/next/LayoutTagIndex.js
index d7fae64e..45100a9e 100644
--- a/themes/next/LayoutTagIndex.js
+++ b/themes/next/LayoutTagIndex.js
@@ -6,7 +6,7 @@ export const LayoutTagIndex = (props) => {
   const { tags } = props
   const { locale } = useGlobal()
   return <LayoutBase {...props}>
-    <div className='bg-white dark:bg-gray-700 px-10 py-10 shadow h-full'>
+    <div className='bg-white dark:bg-hexo-black-gray px-10 py-10 shadow h-full'>
       <div className='dark:text-gray-200 mb-5'><i className='fas fa-tags mr-4'/>{locale.COMMON.TAGS}:</div>
       <div id='tags-list' className='duration-200 flex flex-wrap'>
         { tags.map(tag => {

From 073516351e087e81e300d24058851c0d232a29ee Mon Sep 17 00:00:00 2001
From: huisc <huisc@foxmail.com>
Date: Fri, 9 Dec 2022 22:39:26 +0800
Subject: [PATCH 04/26] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=83=8C?=
 =?UTF-8?q?=E6=99=AF=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/next/components/Footer.js      | 2 +-
 themes/next/components/Logo.js        | 2 +-
 themes/next/components/SearchInput.js | 2 +-
 themes/next/components/TopNav.js      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/themes/next/components/Footer.js b/themes/next/components/Footer.js
index cb83aebe..be38a58a 100644
--- a/themes/next/components/Footer.js
+++ b/themes/next/components/Footer.js
@@ -14,7 +14,7 @@ const Footer = ({ title }) => {
 
   return (
     <footer
-      className='dark:bg-gray-900 flex-shrink-0 justify-center text-center m-auto w-full leading-6 text-sm p-6 dark:text-gray-400'
+      className='dark:bg-gray-800 flex-shrink-0 justify-center text-center m-auto w-full leading-6 text-sm p-6 dark:text-gray-400'
     >
       <DarkModeButton/>
       <span>
diff --git a/themes/next/components/Logo.js b/themes/next/components/Logo.js
index 69c13a1e..f53ff0c0 100644
--- a/themes/next/components/Logo.js
+++ b/themes/next/components/Logo.js
@@ -4,7 +4,7 @@ import React from 'react'
 const Logo = props => {
   const { siteInfo, className } = props
   return <Link href='/' passHref>
-    <div className={'flex flex-col justify-center items-center cursor-pointer bg-black dark:bg-gray-900 space-y-3 font-bold ' + className}>
+    <div className={'flex flex-col justify-center items-center cursor-pointer bg-black dark:bg-gray-800 space-y-3 font-bold ' + className}>
       <div className='font-serif text-xl text-white'> {siteInfo?.title}</div>
       <div className='text-sm text-gray-300 font-light text-center'> {siteInfo?.description}</div>
     </div>
diff --git a/themes/next/components/SearchInput.js b/themes/next/components/SearchInput.js
index 09fde988..9ba7d04b 100644
--- a/themes/next/components/SearchInput.js
+++ b/themes/next/components/SearchInput.js
@@ -66,7 +66,7 @@ const SearchInput = ({ currentTag, currentSearch, cRef }) => {
     ref={searchInputRef}
     type='text'
     placeholder={currentTag ? `${locale.SEARCH.TAGS} #${currentTag}` : `${locale.SEARCH.ARTICLES}`}
-    className={'w-full text-sm pl-4 transition focus:shadow-lg font-light leading-10 text-black bg-gray-100 dark:bg-gray-900 dark:text-white'}
+    className={'w-full text-sm pl-4 transition focus:shadow-lg font-light leading-10 text-black bg-gray-100 dark:bg-gray-800 dark:text-white'}
     onKeyUp={handleKeyUp}
     onCompositionStart={lockSearchInput}
     onCompositionUpdate={lockSearchInput}
diff --git a/themes/next/components/TopNav.js b/themes/next/components/TopNav.js
index f8b815c1..5fbd4e5a 100644
--- a/themes/next/components/TopNav.js
+++ b/themes/next/components/TopNav.js
@@ -89,7 +89,7 @@ const TopNav = (props) => {
 
     {/* 导航栏 */}
     <div id='sticky-nav' className={`${CONFIG_NEXT.NAV_TYPE !== 'normal' ? 'fixed' : ''} lg:relative w-full top-0 z-20 transform duration-500`}>
-      <div className='w-full flex justify-between items-center p-4 bg-black text-white'>
+      <div className='w-full flex justify-between items-center p-4 bg-black dark:bg-gray-800 text-white'>
         {/* 左侧LOGO 标题 */}
         <div className='flex flex-none flex-grow-0'>
           <div onClick={toggleMenuOpen} className='w-8 cursor-pointer'>

From dd09f5ff1f25d3628b4939b83db8a539dbe7fb4c Mon Sep 17 00:00:00 2001
From: huisc <huisc@foxmail.com>
Date: Fri, 9 Dec 2022 23:02:01 +0800
Subject: [PATCH 05/26] =?UTF-8?q?=E4=BA=AE=E8=89=B2=E4=B8=BB=E9=A2=98=20Fo?=
 =?UTF-8?q?oter=20=E8=83=8C=E6=99=AF=E4=BF=AE=E6=94=B9=E4=B8=BA=E7=99=BD?=
 =?UTF-8?q?=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/next/components/Footer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/next/components/Footer.js b/themes/next/components/Footer.js
index be38a58a..3e90a5f5 100644
--- a/themes/next/components/Footer.js
+++ b/themes/next/components/Footer.js
@@ -14,7 +14,7 @@ const Footer = ({ title }) => {
 
   return (
     <footer
-      className='dark:bg-gray-800 flex-shrink-0 justify-center text-center m-auto w-full leading-6 text-sm p-6 dark:text-gray-400'
+      className='dark:bg-gray-800 flex-shrink-0 justify-center text-center m-auto w-full leading-6 text-sm p-6 bg-white dark:text-gray-400'
     >
       <DarkModeButton/>
       <span>

From c21f4625880c1c2bacdedefab34c2c446b1bbae4 Mon Sep 17 00:00:00 2001
From: huisc <huisc@foxmail.com>
Date: Sat, 10 Dec 2022 00:18:46 +0800
Subject: [PATCH 06/26] =?UTF-8?q?=E6=A0=87=E7=AD=BEBar=E8=83=8C=E6=99=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/next/components/StickyBar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/next/components/StickyBar.js b/themes/next/components/StickyBar.js
index 2f56dc4a..837daf51 100644
--- a/themes/next/components/StickyBar.js
+++ b/themes/next/components/StickyBar.js
@@ -39,7 +39,7 @@ const StickyBar = ({ children }) => {
 
   return (
     <div id='sticky-bar' className='sticky flex-grow justify-center top-0 duration-500 z-10 pb-16'>
-      <div className='bg-white dark:bg-black  px-5 absolute shadow-md w-full scroll-hidden'>
+      <div className='bg-white dark:bg-hexo-black-gray px-5 absolute shadow-md w-full scroll-hidden'>
         <div id='tag-container' className="md:pl-3 overflow-x-auto">
           {children}
         </div>

From 64551bf52885526108f6f5fa2f94b7044720784e Mon Sep 17 00:00:00 2001
From: tangly1024 <mail@tangly1024.com>
Date: Sat, 10 Dec 2022 15:37:17 +0800
Subject: [PATCH 07/26] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/next/components/PaginationNumber.js | 2 +-
 themes/next/components/StickyBar.js        | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/themes/next/components/PaginationNumber.js b/themes/next/components/PaginationNumber.js
index 764e3eb4..55311e56 100644
--- a/themes/next/components/PaginationNumber.js
+++ b/themes/next/components/PaginationNumber.js
@@ -16,7 +16,7 @@ const PaginationNumber = ({ page, totalPage }) => {
   const pages = generatePages(pagePrefix, page, currentPage, totalPage)
 
   return (
-        <div className="my-5 flex justify-center items-end font-medium text-black hover:shadow-xl duration-500 bg-white dark:bg-gray-700 dark:text-gray-300 py-3 shadow space-x-2">
+        <div className="my-5 flex justify-center items-end font-medium text-black hover:shadow-xl duration-500 bg-white dark:bg-hexo-black-gray dark:text-gray-300 py-3 shadow space-x-2">
             {/* 上一页 */}
             <Link
                 href={{
diff --git a/themes/next/components/StickyBar.js b/themes/next/components/StickyBar.js
index 837daf51..b34e2132 100644
--- a/themes/next/components/StickyBar.js
+++ b/themes/next/components/StickyBar.js
@@ -11,7 +11,7 @@ let windowTop = 0
  * @constructor
  */
 const StickyBar = ({ children }) => {
-  if (!children) return <></>
+  // 滚动页面时导航条样式调整
   const scrollTrigger = useCallback(throttle(() => {
     if (CONFIG_NEXT.NAV_TYPE === 'normal') {
       return
@@ -37,6 +37,8 @@ const StickyBar = ({ children }) => {
     }
   }, [])
 
+  if (!children) return <></>
+
   return (
     <div id='sticky-bar' className='sticky flex-grow justify-center top-0 duration-500 z-10 pb-16'>
       <div className='bg-white dark:bg-hexo-black-gray px-5 absolute shadow-md w-full scroll-hidden'>

From 373b7e3f0baa29c82a0b401da147ba841e4db56d Mon Sep 17 00:00:00 2001
From: tangly1024 <mail@tangly1024.com>
Date: Sat, 10 Dec 2022 15:39:15 +0800
Subject: [PATCH 08/26] v3.6.5

---
 .env.local   | 2 +-
 package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.local b/.env.local
index ce96b790..618efc87 100644
--- a/.env.local
+++ b/.env.local
@@ -1,2 +1,2 @@
 # 环境变量 @see https://www.nextjs.cn/docs/basic-features/environment-variables
-NEXT_PUBLIC_VERSION=3.6.4
\ No newline at end of file
+NEXT_PUBLIC_VERSION=3.6.5
\ No newline at end of file
diff --git a/package.json b/package.json
index 6eb4edad..c9e3b948 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "notion-next",
-  "version": "3.6.4",
+  "version": "3.6.5",
   "homepage": "https://github.com/tangly1024/NotionNext.git",
   "license": "MIT",
   "repository": {

From 7e477b79baa566f47780b106e3a5e7157f6db520 Mon Sep 17 00:00:00 2001
From: tangly1024 <mail@tangly1024.com>
Date: Sat, 10 Dec 2022 15:57:30 +0800
Subject: [PATCH 09/26] =?UTF-8?q?RecentComment=20=E5=BC=82=E6=AD=A5?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/example/components/ExampleRecentComments.js | 4 +---
 themes/example/components/SideBar.js               | 3 ++-
 themes/hexo/components/HexoRecentComments.js       | 4 +---
 themes/hexo/components/SideRight.js                | 3 ++-
 themes/next/components/NextRecentComments.js       | 4 +---
 themes/next/components/SideAreaRight.js            | 3 ++-
 6 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/themes/example/components/ExampleRecentComments.js b/themes/example/components/ExampleRecentComments.js
index 824246ed..e1fe86ca 100644
--- a/themes/example/components/ExampleRecentComments.js
+++ b/themes/example/components/ExampleRecentComments.js
@@ -1,9 +1,7 @@
 import React from 'react'
 import BLOG from '@/blog.config'
 import Link from 'next/link'
-import dynamic from 'next/dynamic'
-
-const { RecentComments } = dynamic(() => import('@waline/client'))
+import { RecentComments } from '@waline/client'
 
 /**
  * @see https://waline.js.org/guide/get-started.html
diff --git a/themes/example/components/SideBar.js b/themes/example/components/SideBar.js
index 0e737fa3..ea45f851 100644
--- a/themes/example/components/SideBar.js
+++ b/themes/example/components/SideBar.js
@@ -2,7 +2,8 @@ import BLOG from '@/blog.config'
 import Live2D from '@/components/Live2D'
 import { useGlobal } from '@/lib/global'
 import Link from 'next/link'
-import ExampleRecentComments from './ExampleRecentComments'
+import dynamic from 'next/dynamic'
+const ExampleRecentComments = dynamic(() => import('./ExampleRecentComments'))
 
 export const SideBar = (props) => {
   const { locale } = useGlobal()
diff --git a/themes/hexo/components/HexoRecentComments.js b/themes/hexo/components/HexoRecentComments.js
index 8925aa90..d4cbacab 100644
--- a/themes/hexo/components/HexoRecentComments.js
+++ b/themes/hexo/components/HexoRecentComments.js
@@ -3,9 +3,7 @@ import BLOG from '@/blog.config'
 import Card from '@/themes/hexo/components/Card'
 import { useGlobal } from '@/lib/global'
 import Link from 'next/link'
-import dynamic from 'next/dynamic'
-
-const { RecentComments } = dynamic(() => import('@waline/client'))
+import { RecentComments } from '@waline/client'
 
 /**
  * @see https://waline.js.org/guide/get-started.html
diff --git a/themes/hexo/components/SideRight.js b/themes/hexo/components/SideRight.js
index 8079fb2d..8680f144 100644
--- a/themes/hexo/components/SideRight.js
+++ b/themes/hexo/components/SideRight.js
@@ -6,9 +6,10 @@ import Catalog from './Catalog'
 import { InfoCard } from './InfoCard'
 import { AnalyticsCard } from './AnalyticsCard'
 import CONFIG_HEXO from '../config_hexo'
-import HexoRecentComments from './HexoRecentComments'
 import BLOG from '@/blog.config'
+import dynamic from 'next/dynamic'
 
+const HexoRecentComments = dynamic(() => import('./HexoRecentComments'))
 /**
  * Hexo主题右侧栏
  * @param {*} props
diff --git a/themes/next/components/NextRecentComments.js b/themes/next/components/NextRecentComments.js
index 041d8431..81e9845d 100644
--- a/themes/next/components/NextRecentComments.js
+++ b/themes/next/components/NextRecentComments.js
@@ -1,9 +1,7 @@
 import React from 'react'
 import BLOG from '@/blog.config'
 import Link from 'next/link'
-import dynamic from 'next/dynamic'
-
-const { RecentComments } = dynamic(() => import('@waline/client'))
+import { RecentComments } from '@waline/client'
 
 /**
  * @see https://waline.js.org/guide/get-started.html
diff --git a/themes/next/components/SideAreaRight.js b/themes/next/components/SideAreaRight.js
index d5ccfe15..bca085e0 100644
--- a/themes/next/components/SideAreaRight.js
+++ b/themes/next/components/SideAreaRight.js
@@ -6,8 +6,9 @@ import CategoryGroup from './CategoryGroup'
 import TagGroups from './TagGroups'
 import CONFIG_NEXT from '../config_next'
 import { useRouter } from 'next/router'
-import NextRecentComments from './NextRecentComments'
 import BLOG from '@/blog.config'
+import dynamic from 'next/dynamic'
+const NextRecentComments = dynamic(() => import('./NextRecentComments'))
 
 /**
  * 侧边平铺

From 87da9c0dbfcf5a80efd40de6e6c16e0f10c8158f Mon Sep 17 00:00:00 2001
From: xloong <soxlong@gmail.com>
Date: Mon, 12 Dec 2022 14:44:33 +0800
Subject: [PATCH 10/26] =?UTF-8?q?fix=20=E4=BB=85=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=BAPublished=E7=9A=84=EF=BC=8C=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97category=E4=B8=8Etags=E8=AE=A1=E6=95=B0=EF=BC=8CInvisi?=
 =?UTF-8?q?ble=E7=9A=84=E6=96=87=E7=AB=A0=E4=B8=8D=E5=8F=82=E4=B8=8E?=
 =?UTF-8?q?=E8=AE=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/notion/getAllCategories.js | 2 +-
 lib/notion/getAllTags.js       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/notion/getAllCategories.js b/lib/notion/getAllCategories.js
index 2225b965..b7700bc1 100644
--- a/lib/notion/getAllCategories.js
+++ b/lib/notion/getAllCategories.js
@@ -14,7 +14,7 @@ import { isIterable } from '../utils'
  * @returns {Promise<{}|*[]>}
  */
 export function getAllCategories({ allPages, categoryOptions, sliceCount = 0 }) {
-  const allPosts = allPages.filter(page => page.type === 'Post')
+  const allPosts = allPages.filter(page => page.type === 'Post' && page.status === 'Published')
   if (!allPosts || !categoryOptions) {
     return []
   }
diff --git a/lib/notion/getAllTags.js b/lib/notion/getAllTags.js
index 098f62fb..b9144be8 100644
--- a/lib/notion/getAllTags.js
+++ b/lib/notion/getAllTags.js
@@ -8,7 +8,7 @@ import { isIterable } from '../utils'
  * @returns {Promise<{}|*[]>}
  */
 export function getAllTags({ allPages, sliceCount = 0, tagOptions }) {
-  const allPosts = allPages.filter(page => page.type === 'Post')
+  const allPosts = allPages.filter(page => page.type === 'Post' && page.status === 'Published')
 
   if (!allPosts || !tagOptions) {
     return []

From 5d8c852c52f4a4f1f2893b35f1c59fe727d7215d Mon Sep 17 00:00:00 2001
From: tangly1024 <mail@tangly1024.com>
Date: Tue, 13 Dec 2022 09:50:49 +0800
Subject: [PATCH 11/26] =?UTF-8?q?toggle-header=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 styles/notion.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/styles/notion.css b/styles/notion.css
index 92acdb96..d010bb0c 100644
--- a/styles/notion.css
+++ b/styles/notion.css
@@ -392,7 +392,7 @@
 
 .notion-h {
   position: relative;
-  display: block;
+  /* display: block; */
   font-weight: 600;
   line-height: 1.3;
   padding: 3px 2px;

From afe4c679fa537e6e824124132c18750f1077fdd5 Mon Sep 17 00:00:00 2001
From: tangly1024 <mail@tangly1024.com>
Date: Tue, 13 Dec 2022 21:21:32 +0800
Subject: [PATCH 12/26] =?UTF-8?q?hook=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/hexo/LayoutSlug.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/hexo/LayoutSlug.js b/themes/hexo/LayoutSlug.js
index 7875c990..0818ba01 100644
--- a/themes/hexo/LayoutSlug.js
+++ b/themes/hexo/LayoutSlug.js
@@ -15,6 +15,7 @@ import { isBrowser } from '@/lib/utils'
 
 export const LayoutSlug = props => {
   const { post, lock, validPassword } = props
+  const drawerRight = useRef(null)
 
   if (!post) {
     return <LayoutBase
@@ -30,7 +31,6 @@ export const LayoutSlug = props => {
     post.toc = getPageTableOfContents(post, post.blockMap)
   }
 
-  const drawerRight = useRef(null)
   const targetRef = isBrowser() ? document.getElementById('container') : null
 
   const floatSlot = <>

From ff24524aae59bce9187c5de59befabb434315cc9 Mon Sep 17 00:00:00 2001
From: tangly1024 <mail@tangly1024.com>
Date: Wed, 14 Dec 2022 12:19:28 +0800
Subject: [PATCH 13/26] =?UTF-8?q?=E5=B0=81=E8=A3=85=E5=8A=A0=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/[...slug].js                        | 13 ++++++++++---
 themes/example/LayoutSlug.js              |  8 +-------
 themes/example/components/ArticleLock.js  |  6 ++----
 themes/fukasawa/LayoutSlug.js             | 10 ++--------
 themes/fukasawa/components/ArticleLock.js |  6 ++----
 themes/hexo/LayoutSlug.js                 |  8 +-------
 themes/hexo/components/ArticleLock.js     |  6 ++----
 themes/hexo/components/HeaderArticle.js   |  3 ++-
 themes/medium/LayoutSlug.js               |  9 +--------
 themes/medium/components/ArticleLock.js   |  6 ++----
 themes/next/LayoutSlug.js                 |  8 +-------
 themes/next/components/ArticleLock.js     |  6 ++----
 12 files changed, 28 insertions(+), 61 deletions(-)

diff --git a/pages/[...slug].js b/pages/[...slug].js
index c790f211..cae6d4b1 100644
--- a/pages/[...slug].js
+++ b/pages/[...slug].js
@@ -4,7 +4,7 @@ import { getGlobalNotionData } from '@/lib/notion/getNotionData'
 import { useGlobal } from '@/lib/global'
 import * as ThemeMap from '@/themes'
 import React from 'react'
-import { idToUuid } from 'notion-utils'
+import { idToUuid, getPageTableOfContents } from 'notion-utils'
 import Router from 'next/router'
 import { isBrowser } from '@/lib/utils'
 import { getNotion } from '@/lib/notion/getNotion'
@@ -28,6 +28,11 @@ const Slug = props => {
     if (post?.password && post?.password !== '') {
       setLock(true)
     } else {
+      if (!lock && post?.blockMap?.block) {
+        post.content = Object.keys(post.blockMap.block)
+        post.toc = getPageTableOfContents(post, post.blockMap)
+      }
+
       setLock(false)
     }
   }, [post])
@@ -51,10 +56,12 @@ const Slug = props => {
    * 验证文章密码
    * @param {*} result
    */
-  const validPassword = result => {
-    if (result) {
+  const validPassword = passInput => {
+    if (passInput && passInput === post.password) {
       setLock(false)
+      return true
     }
+    return false
   }
 
   props = { ...props, lock, setLock, validPassword }
diff --git a/themes/example/LayoutSlug.js b/themes/example/LayoutSlug.js
index 1f7fd409..b16892b7 100644
--- a/themes/example/LayoutSlug.js
+++ b/themes/example/LayoutSlug.js
@@ -1,4 +1,3 @@
-import { getPageTableOfContents } from 'notion-utils'
 import LayoutBase from './LayoutBase'
 import { ArticleLock } from './components/ArticleLock'
 import NotionPage from '@/components/NotionPage'
@@ -12,15 +11,10 @@ export const LayoutSlug = props => {
     return <LayoutBase {...props} />
   }
 
-  if (!lock && post?.blockMap?.block) {
-    post.content = Object.keys(post.blockMap.block)
-    post.toc = getPageTableOfContents(post, post.blockMap)
-  }
-
   return (
         <LayoutBase {...props}>
 
-                {lock && <ArticleLock password={post.password} validPassword={validPassword} />}
+                {lock && <ArticleLock validPassword={validPassword} />}
 
                 {!lock && <div id="notion-article" className="px-2">
 
diff --git a/themes/example/components/ArticleLock.js b/themes/example/components/ArticleLock.js
index a9f5f59d..43b6647e 100644
--- a/themes/example/components/ArticleLock.js
+++ b/themes/example/components/ArticleLock.js
@@ -8,14 +8,12 @@ import { useGlobal } from '@/lib/global'
  * @returns
  */
 export const ArticleLock = props => {
-  const { password, validPassword } = props
+  const { validPassword } = props
   const { locale } = useGlobal()
 
   const submitPassword = () => {
     const p = document.getElementById('password')
-    if (p && p.value && p.value === password) {
-      validPassword(true)
-    } else {
+    if (!validPassword(p?.value)) {
       const tips = document.getElementById('tips')
       if (tips) {
         tips.innerHTML = ''
diff --git a/themes/fukasawa/LayoutSlug.js b/themes/fukasawa/LayoutSlug.js
index 30265a6c..fb78690c 100644
--- a/themes/fukasawa/LayoutSlug.js
+++ b/themes/fukasawa/LayoutSlug.js
@@ -1,19 +1,13 @@
-import { getPageTableOfContents } from 'notion-utils'
 import ArticleDetail from './components/ArticleDetail'
 import LayoutBase from './LayoutBase'
 import { ArticleLock } from './components/ArticleLock'
 
 export const LayoutSlug = (props) => {
-  const { post, lock, validPassword } = props
-  if (!lock && post?.blockMap?.block) {
-    post.content = Object.keys(post.blockMap.block)
-    post.toc = getPageTableOfContents(post, post.blockMap)
-  }
-
+  const { lock, validPassword } = props
   return (
     <LayoutBase {...props} >
       {!lock && <ArticleDetail {...props} />}
-      {lock && <ArticleLock password={post.password} validPassword={validPassword} />}
+      {lock && <ArticleLock validPassword={validPassword} />}
     </LayoutBase>
   )
 }
diff --git a/themes/fukasawa/components/ArticleLock.js b/themes/fukasawa/components/ArticleLock.js
index 23112eeb..8ae18a4e 100644
--- a/themes/fukasawa/components/ArticleLock.js
+++ b/themes/fukasawa/components/ArticleLock.js
@@ -8,14 +8,12 @@ import { useGlobal } from '@/lib/global'
  * @returns
  */
 export const ArticleLock = props => {
-  const { password, validPassword } = props
+  const { validPassword } = props
   const { locale } = useGlobal()
 
   const submitPassword = () => {
     const p = document.getElementById('password')
-    if (p && p.value && p.value === password) {
-      validPassword(true)
-    } else {
+    if (!validPassword(p?.value)) {
       const tips = document.getElementById('tips')
       if (tips) {
         tips.innerHTML = ''
diff --git a/themes/hexo/LayoutSlug.js b/themes/hexo/LayoutSlug.js
index 0818ba01..327497ac 100644
--- a/themes/hexo/LayoutSlug.js
+++ b/themes/hexo/LayoutSlug.js
@@ -1,4 +1,3 @@
-import { getPageTableOfContents } from 'notion-utils'
 import { useRef } from 'react'
 import { ArticleLock } from './components/ArticleLock'
 import HeaderArticle from './components/HeaderArticle'
@@ -26,11 +25,6 @@ export const LayoutSlug = props => {
     ></LayoutBase>
   }
 
-  if (!lock && post?.blockMap?.block) {
-    post.content = Object.keys(post.blockMap.block)
-    post.toc = getPageTableOfContents(post, post.blockMap)
-  }
-
   const targetRef = isBrowser() ? document.getElementById('container') : null
 
   const floatSlot = <>
@@ -53,7 +47,7 @@ export const LayoutSlug = props => {
       floatSlot={floatSlot}
     >
       <div className="w-full lg:shadow-sm lg:hover:shadow lg:border lg:rounded-xl lg:px-2 lg:py-4 bg-white dark:bg-hexo-black-gray dark:border-black">
-        {lock && <ArticleLock password={post.password} validPassword={validPassword} />}
+        {lock && <ArticleLock validPassword={validPassword} />}
 
         {!lock && <div id="container" className="overflow-x-auto flex-grow mx-auto md:w-full md:px-5 ">
 
diff --git a/themes/hexo/components/ArticleLock.js b/themes/hexo/components/ArticleLock.js
index 84ef905f..1a1bd193 100644
--- a/themes/hexo/components/ArticleLock.js
+++ b/themes/hexo/components/ArticleLock.js
@@ -8,13 +8,11 @@ import { useGlobal } from '@/lib/global'
  * @returns
  */
 export const ArticleLock = props => {
-  const { password, validPassword } = props
+  const { validPassword } = props
   const { locale } = useGlobal()
   const submitPassword = () => {
     const p = document.getElementById('password')
-    if (p && p.value && p.value === password) {
-      validPassword(true)
-    } else {
+    if (!validPassword(p?.value)) {
       const tips = document.getElementById('tips')
       if (tips) {
         tips.innerHTML = ''
diff --git a/themes/hexo/components/HeaderArticle.js b/themes/hexo/components/HeaderArticle.js
index 918c75c7..8ebfe2bd 100644
--- a/themes/hexo/components/HeaderArticle.js
+++ b/themes/hexo/components/HeaderArticle.js
@@ -4,12 +4,13 @@ import formatDate from '@/lib/formatDate'
 import BLOG from '@/blog.config'
 
 export default function HeaderArticle({ post, siteInfo }) {
+  const { locale } = useGlobal()
+
   if (!post) {
     return <></>
   }
   const headerImage = post?.page_cover ? `url("${post.page_cover}")` : `url("${siteInfo?.pageCover}")`
 
-  const { locale } = useGlobal()
   const date = formatDate(
     post?.date?.start_date || post?.createdTime,
     locale.LOCALE
diff --git a/themes/medium/LayoutSlug.js b/themes/medium/LayoutSlug.js
index f7fdc4d0..bdeec1a5 100644
--- a/themes/medium/LayoutSlug.js
+++ b/themes/medium/LayoutSlug.js
@@ -1,5 +1,3 @@
-import { getPageTableOfContents } from 'notion-utils'
-
 import LayoutBase from './LayoutBase'
 import { useGlobal } from '@/lib/global'
 import React from 'react'
@@ -16,11 +14,6 @@ export const LayoutSlug = props => {
     />
   }
 
-  if (!lock && post?.blockMap?.block) {
-    post.content = Object.keys(post.blockMap.block)
-    post.toc = getPageTableOfContents(post, post.blockMap)
-  }
-
   const slotRight = post?.toc && post?.toc?.length > 3 && (
     <div key={locale.COMMON.TABLE_OF_CONTENTS} >
       <Catalog toc={post.toc} />
@@ -29,7 +22,7 @@ export const LayoutSlug = props => {
 
   return (
     <LayoutBase showInfoCard={true} slotRight={slotRight} {...props} >
-      {!lock ? <ArticleDetail {...props} /> : <ArticleLock password={post.password} validPassword={validPassword} />}
+      {!lock ? <ArticleDetail {...props} /> : <ArticleLock validPassword={validPassword} />}
     </LayoutBase>
   )
 }
diff --git a/themes/medium/components/ArticleLock.js b/themes/medium/components/ArticleLock.js
index 4b969835..1e1bb228 100644
--- a/themes/medium/components/ArticleLock.js
+++ b/themes/medium/components/ArticleLock.js
@@ -8,14 +8,12 @@ import { useGlobal } from '@/lib/global'
  * @returns
  */
 export const ArticleLock = props => {
-  const { password, validPassword } = props
+  const { validPassword } = props
   const { locale } = useGlobal()
 
   const submitPassword = () => {
     const p = document.getElementById('password')
-    if (p && p.value && p.value === password) {
-      validPassword(true)
-    } else {
+    if (!validPassword(p?.value)) {
       const tips = document.getElementById('tips')
       if (tips) {
         tips.innerHTML = ''
diff --git a/themes/next/LayoutSlug.js b/themes/next/LayoutSlug.js
index aa1cc4d2..fa1915a1 100644
--- a/themes/next/LayoutSlug.js
+++ b/themes/next/LayoutSlug.js
@@ -1,4 +1,3 @@
-import { getPageTableOfContents } from 'notion-utils'
 import TocDrawerButton from './components/TocDrawerButton'
 import LayoutBase from './LayoutBase'
 import Card from './components/Card'
@@ -12,11 +11,6 @@ import { isBrowser } from '@/lib/utils'
 
 export const LayoutSlug = (props) => {
   const { post, latestPosts, lock, validPassword } = props
-  if (!lock && post?.blockMap?.block) {
-    post.content = Object.keys(post.blockMap.block)
-    post.toc = getPageTableOfContents(post, post.blockMap)
-  }
-
   const drawerRight = useRef(null)
   const targetRef = isBrowser() ? document.getElementById('container') : null
   const floatSlot = post?.toc?.length > 1
@@ -45,7 +39,7 @@ export const LayoutSlug = (props) => {
 
       {!lock && <ArticleDetail {...props} />}
 
-      {lock && <ArticleLock password={post.password} validPassword={validPassword} />}
+      {lock && <ArticleLock validPassword={validPassword} />}
 
       {/* 悬浮目录按钮 */}
       <div className='block lg:hidden'>
diff --git a/themes/next/components/ArticleLock.js b/themes/next/components/ArticleLock.js
index 4bb2ef65..3e4a2019 100644
--- a/themes/next/components/ArticleLock.js
+++ b/themes/next/components/ArticleLock.js
@@ -8,14 +8,12 @@ import { useGlobal } from '@/lib/global'
  * @returns
  */
 export const ArticleLock = props => {
-  const { password, validPassword } = props
+  const { validPassword } = props
   const { locale } = useGlobal()
 
   const submitPassword = () => {
     const p = document.getElementById('password')
-    if (p && p.value && p.value === password) {
-      validPassword(true)
-    } else {
+    if (!validPassword(p?.value)) {
       const tips = document.getElementById('tips')
       if (tips) {
         tips.innerHTML = ''

From 771819985aee595157182fc6dceb5293f27ffdfd Mon Sep 17 00:00:00 2001
From: tangly1024 <mail@tangly1024.com>
Date: Wed, 14 Dec 2022 13:47:14 +0800
Subject: [PATCH 14/26] encrypt-password

---
 lib/notion/getNotionData.js     | 5 ++---
 lib/notion/getPageProperties.js | 2 ++
 package.json                    | 1 +
 pages/[...slug].js              | 3 ++-
 themes/medium/LayoutCategory.js | 2 +-
 themes/medium/LayoutTag.js      | 2 +-
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/notion/getNotionData.js b/lib/notion/getNotionData.js
index 11913b2d..80444cdb 100644
--- a/lib/notion/getNotionData.js
+++ b/lib/notion/getNotionData.js
@@ -212,17 +212,16 @@ async function getPageRecordMapByNotionAPI({ pageId, from }) {
       collectionData.push(properties)
     }
   }
-  // 读取映射 配置
-  let postCount = 0
 
   // 获取page作为自定义菜单
   const customNav = getCustomNav({ allPages: collectionData.filter(post => post.type === 'Page' && post.status === 'Published') })
 
+  // 文章计数
+  let postCount = 0
   const allPages = collectionData.filter(post => {
     if (post.type === 'Post' && post.status === 'Published') {
       postCount++
     }
-
     return post &&
             post.type &&
             (post.type === 'Post' || post.type === 'Page') &&
diff --git a/lib/notion/getPageProperties.js b/lib/notion/getPageProperties.js
index f4ee3282..ef93f84b 100644
--- a/lib/notion/getPageProperties.js
+++ b/lib/notion/getPageProperties.js
@@ -3,6 +3,7 @@ import { NotionAPI } from 'notion-client'
 import BLOG from '@/blog.config'
 import formatDate from '../formatDate'
 import { defaultMapImageUrl } from 'react-notion-x'
+import md5 from 'js-md5'
 
 export default async function getPageProperties(id, block, schema, authToken, tagOptions, siteInfo) {
   const rawProperties = Object.entries(block?.[id]?.value?.properties || [])
@@ -89,6 +90,7 @@ export default async function getPageProperties(id, block, schema, authToken, ta
   properties.pageIcon = getImageUrl(block[id].value?.format?.page_icon, block[id].value) ?? ''
   properties.page_cover = getImageUrl(block[id].value?.format?.page_cover, block[id].value) ?? siteInfo?.pageCover
   properties.content = value.content ?? []
+  properties.password = properties.password ? md5(properties.slug + properties.password) : ''
   properties.tagItems = properties?.tags?.map(tag => {
     return { name: tag, color: tagOptions?.find(t => t.value === tag)?.color || 'gray' }
   }) || []
diff --git a/package.json b/package.json
index c9e3b948..f022f9d0 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
     "eslint-plugin-react-hooks": "^4.6.0",
     "feed": "^4.2.2",
     "gitalk": "^1.7.2",
+    "js-md5": "^0.7.3",
     "localStorage": "^1.0.4",
     "lodash.throttle": "^4.1.1",
     "mark.js": "^8.11.1",
diff --git a/pages/[...slug].js b/pages/[...slug].js
index cae6d4b1..9d521d8f 100644
--- a/pages/[...slug].js
+++ b/pages/[...slug].js
@@ -8,6 +8,7 @@ import { idToUuid, getPageTableOfContents } from 'notion-utils'
 import Router from 'next/router'
 import { isBrowser } from '@/lib/utils'
 import { getNotion } from '@/lib/notion/getNotion'
+import md5 from 'js-md5'
 
 /**
  * 根据notion的slug访问页面
@@ -57,7 +58,7 @@ const Slug = props => {
    * @param {*} result
    */
   const validPassword = passInput => {
-    if (passInput && passInput === post.password) {
+    if (passInput && md5(post.slug + passInput) === post.password) {
       setLock(false)
       return true
     }
diff --git a/themes/medium/LayoutCategory.js b/themes/medium/LayoutCategory.js
index a3018144..7522e264 100644
--- a/themes/medium/LayoutCategory.js
+++ b/themes/medium/LayoutCategory.js
@@ -5,7 +5,7 @@ import BLOG from '@/blog.config'
 
 export const LayoutCategory = props => {
   const { category } = props
-  const slotTop = <div className='flex items-center font-sans p-8'><div className='text-xl'><i className='mr-2 fas fa-th' />分类：</div>{category}</div>
+  const slotTop = <div className='flex items-center font-sans py-8'><div className='text-xl'><i className='mr-2 fas fa-th' />分类：</div>{category}</div>
 
   return <LayoutBase {...props} slotTop={slotTop}>
         {BLOG.POST_LIST_STYLE === 'page' ? <BlogPostListPage {...props} /> : <BlogPostListScroll {...props} />}
diff --git a/themes/medium/LayoutTag.js b/themes/medium/LayoutTag.js
index 6f072aa9..41164ce3 100644
--- a/themes/medium/LayoutTag.js
+++ b/themes/medium/LayoutTag.js
@@ -5,7 +5,7 @@ import BlogPostListPage from './components/BlogPostListPage'
 
 export const LayoutTag = (props) => {
   const { tag } = props
-  const slotTop = <div className='flex items-center font-sans p-8'><div className='text-xl'><i className='mr-2 fas fa-tag'/>标签：</div>{tag}</div>
+  const slotTop = <div className='flex items-center font-sans py-8'><div className='text-xl'><i className='mr-2 fas fa-tag'/>标签：</div>{tag}</div>
 
   return <LayoutBase {...props} slotTop={slotTop}>
         {BLOG.POST_LIST_STYLE === 'page' ? <BlogPostListPage {...props} /> : <BlogPostListScroll {...props} />}

From 727fa0e2e605a25b791abafc0343bf1b1569e6b9 Mon Sep 17 00:00:00 2001
From: tangly1024 <mail@tangly1024.com>
Date: Wed, 14 Dec 2022 21:14:56 +0800
Subject: [PATCH 15/26] get-page-table-of-content

---
 lib/notion/getPageTableOfContents.js | 76 ++++++++++++++++++++++++++++
 pages/[...slug].js                   |  3 +-
 2 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 lib/notion/getPageTableOfContents.js

diff --git a/lib/notion/getPageTableOfContents.js b/lib/notion/getPageTableOfContents.js
new file mode 100644
index 00000000..a15ebe2d
--- /dev/null
+++ b/lib/notion/getPageTableOfContents.js
@@ -0,0 +1,76 @@
+import { getTextContent } from 'notion-utils'
+
+const indentLevels = {
+  header: 0,
+  sub_header: 1,
+  sub_sub_header: 2
+}
+
+/**
+ * @see https://github.com/NotionX/react-notion-x/blob/master/packages/notion-utils/src/get-page-table-of-contents.ts
+ * Gets the metadata for a table of contents block by parsing the page's
+ * H1, H2, and H3 elements.
+ */
+export const getPageTableOfContents = (page, recordMap) => {
+  const toc = (page.content ?? []).map((blockId) => {
+    const block = recordMap.block[blockId]?.value
+
+    if (block) {
+      const { type } = block
+
+      if (
+        type === 'header' ||
+          type === 'sub_header' ||
+          type === 'sub_sub_header'
+      ) {
+        return {
+          id: blockId,
+          type,
+          text: getTextContent(block.properties?.title),
+          indentLevel: indentLevels[type]
+        }
+      }
+    }
+
+    return null
+  }).filter(e => e)
+
+  console.log('目录', toc)
+
+  const indentLevelStack = [
+    {
+      actual: -1,
+      effective: -1
+    }
+  ]
+
+  // Adjust indent levels to always change smoothly.
+  // This is a little tricky, but the key is that when increasing indent levels,
+  // they should never jump more than one at a time.
+  for (const tocItem of toc) {
+    const { indentLevel } = tocItem
+    const actual = indentLevel
+
+    do {
+      const prevIndent = indentLevelStack[indentLevelStack.length - 1]
+      const { actual: prevActual, effective: prevEffective } = prevIndent
+
+      if (actual > prevActual) {
+        tocItem.indentLevel = prevEffective + 1
+        indentLevelStack.push({
+          actual,
+          effective: tocItem.indentLevel
+        })
+      } else if (actual === prevActual) {
+        tocItem.indentLevel = prevEffective
+        break
+      } else {
+        indentLevelStack.pop()
+      }
+
+      // eslint-disable-next-line no-constant-condition
+    } while (true)
+  }
+
+  return toc
+}
diff --git a/pages/[...slug].js b/pages/[...slug].js
index 9d521d8f..6ca98c93 100644
--- a/pages/[...slug].js
+++ b/pages/[...slug].js
@@ -4,11 +4,12 @@ import { getGlobalNotionData } from '@/lib/notion/getNotionData'
 import { useGlobal } from '@/lib/global'
 import * as ThemeMap from '@/themes'
 import React from 'react'
-import { idToUuid, getPageTableOfContents } from 'notion-utils'
+import { idToUuid } from 'notion-utils'
 import Router from 'next/router'
 import { isBrowser } from '@/lib/utils'
 import { getNotion } from '@/lib/notion/getNotion'
 import md5 from 'js-md5'
+import { getPageTableOfContents } from '@/lib/notion/getPageTableOfContents'
 
 /**
  * 根据notion的slug访问页面

From 068639647d1de773d8d0000d96ba360996815550 Mon Sep 17 00:00:00 2001
From: tangly1024 <mail@tangly1024.com>
Date: Thu, 15 Dec 2022 10:37:37 +0800
Subject: [PATCH 16/26] rewrite.toc.

---
 lib/notion/getPageTableOfContents.js | 64 +++++++++++++++++-----------
 styles/notion.css                    |  2 +-
 2 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/lib/notion/getPageTableOfContents.js b/lib/notion/getPageTableOfContents.js
index a15ebe2d..a23be7cb 100644
--- a/lib/notion/getPageTableOfContents.js
+++ b/lib/notion/getPageTableOfContents.js
@@ -12,31 +12,8 @@ const indentLevels = {
  * H1, H2, and H3 elements.
  */
 export const getPageTableOfContents = (page, recordMap) => {
-  const toc = (page.content ?? []).map((blockId) => {
-    const block = recordMap.block[blockId]?.value
-
-    if (block) {
-      const { type } = block
-
-      if (
-        type === 'header' ||
-          type === 'sub_header' ||
-          type === 'sub_sub_header'
-      ) {
-        return {
-          id: blockId,
-          type,
-          text: getTextContent(block.properties?.title),
-          indentLevel: indentLevels[type]
-        }
-      }
-    }
-
-    return null
-  }).filter(e => e)
-
-  console.log('目录', toc)
-
+  const contents = (page.content ?? [])
+  const toc = getBlockHeader(contents, recordMap)
   const indentLevelStack = [
     {
       actual: -1,
@@ -74,3 +51,40 @@ export const getPageTableOfContents = (page, recordMap) => {
 
   return toc
 }
+
+/**
+ * 重写获取目录方法
+ */
+function getBlockHeader(contents, recordMap, toc) {
+  if (!toc) {
+    toc = []
+  }
+  if (!contents) {
+    return toc
+  }
+
+  for (const blockId of contents) {
+    const block = recordMap.block[blockId]?.value
+    if (!block) {
+      continue
+    }
+    const { type } = block
+    if (type.indexOf('header') >= 0) {
+      const existed = toc.find(e => e.id === blockId)
+      if (!existed) {
+        toc.push({
+          id: blockId,
+          type,
+          text: getTextContent(block.properties?.title),
+          indentLevel: indentLevels[type]
+        })
+      }
+    }
+
+    if (block.content?.length > 0) {
+      getBlockHeader(block.content, recordMap, toc)
+    }
+  }
+
+  return toc
+}
diff --git a/styles/notion.css b/styles/notion.css
index d010bb0c..d55d8456 100644
--- a/styles/notion.css
+++ b/styles/notion.css
@@ -427,7 +427,7 @@
   margin-top: 2px;
 } */
 .notion-h2 {
-  font-size: 1.5em;
+  font-size: 1.4em;
   margin-top: 1.1em;
 }
 .notion-h3 {

From 25f24d69c7418b7676345800ec31f7d0f1e0892d Mon Sep 17 00:00:00 2001
From: tangly1024 <mail@tangly1024.com>
Date: Thu, 15 Dec 2022 10:58:23 +0800
Subject: [PATCH 17/26] v3.6.3

---
 .env.local   | 2 +-
 package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.local b/.env.local
index 618efc87..ffa93893 100644
--- a/.env.local
+++ b/.env.local
@@ -1,2 +1,2 @@
 # 环境变量 @see https://www.nextjs.cn/docs/basic-features/environment-variables
-NEXT_PUBLIC_VERSION=3.6.5
\ No newline at end of file
+NEXT_PUBLIC_VERSION=3.6.6
\ No newline at end of file
diff --git a/package.json b/package.json
index f022f9d0..b7d9f09f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "notion-next",
-  "version": "3.6.5",
+  "version": "3.6.6",
   "homepage": "https://github.com/tangly1024/NotionNext.git",
   "license": "MIT",
   "repository": {

From e7ebedae232e50dffde2e97454067abc28e3be6f Mon Sep 17 00:00:00 2001
From: tangly1024 <mail@tangly1024.com>
Date: Thu, 15 Dec 2022 13:18:24 +0800
Subject: [PATCH 18/26] mermaid-async

---
 components/PrismMac.js | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/components/PrismMac.js b/components/PrismMac.js
index 22fc3709..956e9f73 100644
--- a/components/PrismMac.js
+++ b/components/PrismMac.js
@@ -8,7 +8,6 @@ import 'prismjs/plugins/line-numbers/prism-line-numbers.css'
 // 所有语言的prismjs 使用autoloader引入
 import 'prismjs/plugins/autoloader/prism-autoloader'
 // mermaid图
-import mermaid from 'mermaid'
 import BLOG from '@/blog.config'
 
 /**
@@ -18,6 +17,7 @@ import BLOG from '@/blog.config'
 const PrismMac = () => {
   React.useEffect(() => {
     renderPrismMac()
+    renderMermaid()
 
     // 折叠代码行号bug
     const observer = new MutationObserver(mutationsList => {
@@ -35,21 +35,10 @@ const PrismMac = () => {
   return <></>
 }
 
-function renderPrismMac() {
-  const container = document?.getElementById('container-inner')
-  const codeToolBars = container?.getElementsByClassName('code-toolbar')
-
-  // Add line numbers
-  const codeBlocks = container?.getElementsByTagName('pre')
-  if (codeBlocks) {
-    Array.from(codeBlocks).forEach(item => {
-      if (!item.classList.contains('line-numbers')) {
-        item.classList.add('line-numbers')
-        item.style.whiteSpace = 'pre-wrap'
-      }
-    })
-  }
-
+/**
+ * 将mermaid语言 渲染成图片
+ */
+const renderMermaid = async() => {
   //   支持 Mermaid
   const mermaidPres = document.querySelectorAll('pre.notion-code.language-mermaid')
   if (mermaidPres) {
@@ -73,9 +62,26 @@ function renderPrismMac() {
       }
     }
     if (needLoad) {
-      mermaid.contentLoaded()
+      const asyncMermaid = await import('mermaid')
+      asyncMermaid.default.contentLoaded()
     }
   }
+}
+
+function renderPrismMac() {
+  const container = document?.getElementById('container-inner')
+  const codeToolBars = container?.getElementsByClassName('code-toolbar')
+
+  // Add line numbers
+  const codeBlocks = container?.getElementsByTagName('pre')
+  if (codeBlocks) {
+    Array.from(codeBlocks).forEach(item => {
+      if (!item.classList.contains('line-numbers')) {
+        item.classList.add('line-numbers')
+        item.style.whiteSpace = 'pre-wrap'
+      }
+    })
+  }
 
   // 重新渲染之前检查所有的多余text
 

From 606b5df0ca0e280226ce2582312b4cf93270f519 Mon Sep 17 00:00:00 2001
From: tangly1024 <mail@tangly1024.com>
Date: Thu, 15 Dec 2022 13:50:16 +0800
Subject: [PATCH 19/26] busuanzi-repeat

---
 lib/busuanzi.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/busuanzi.js b/lib/busuanzi.js
index 9255485a..439aa4b7 100644
--- a/lib/busuanzi.js
+++ b/lib/busuanzi.js
@@ -94,11 +94,6 @@ bszTag = {
   }
 }
 
-// 修复Node同构代码的问题
-if (typeof document !== 'undefined') {
-  fetch()
-}
-
 module.exports = {
   fetch
 }

From 9f44833a68c2af09768619b4a1699879146242ad Mon Sep 17 00:00:00 2001
From: tangly1024 <mail@tangly1024.com>
Date: Thu, 15 Dec 2022 13:50:24 +0800
Subject: [PATCH 20/26] hook-checks

---
 themes/next/components/Toc.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/themes/next/components/Toc.js b/themes/next/components/Toc.js
index 5dbbad5f..6d98ee4a 100644
--- a/themes/next/components/Toc.js
+++ b/themes/next/components/Toc.js
@@ -11,10 +11,6 @@ import Progress from './Progress'
  * @constructor
  */
 const Toc = ({ toc }) => {
-  // 无目录就直接返回空
-  if (!toc || toc.length < 1) {
-    return <></>
-  }
   // 监听滚动事件
   React.useEffect(() => {
     window.addEventListener('scroll', actionSectionScrollSpy)
@@ -58,6 +54,11 @@ const Toc = ({ toc }) => {
     tRef?.current?.scrollTo({ top: 28 * index, behavior: 'smooth' })
   }, throttleMs))
 
+  // 无目录就直接返回空
+  if (!toc || toc.length < 1) {
+    return <></>
+  }
+
   return <div className='px-3'>
     <div className='w-full pb-1'>
       <Progress />

From 6969f6289e7e6d9e5514c7c22efe5e5b0901cda3 Mon Sep 17 00:00:00 2001
From: tangly1024 <mail@tangly1024.com>
Date: Thu, 15 Dec 2022 18:12:57 +0800
Subject: [PATCH 21/26] async css-font

---
 lib/font.js        |  2 +-
 pages/_app.js      | 18 ++++++++++++++++--
 pages/_document.js |  4 ----
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/lib/font.js b/lib/font.js
index d485eebd..05ba86ff 100644
--- a/lib/font.js
+++ b/lib/font.js
@@ -50,4 +50,4 @@ const fontFamilies = {
   ]
 }
 
-module.exports = fontFamilies
+module.exports = { fontFamilies }
diff --git a/pages/_app.js b/pages/_app.js
index 9a3969a3..79506c43 100644
--- a/pages/_app.js
+++ b/pages/_app.js
@@ -23,6 +23,8 @@ import { GlobalContextProvider } from '@/lib/global'
 import { DebugPanel } from '@/components/DebugPanel'
 import { ThemeSwitch } from '@/components/ThemeSwitch'
 import { Fireworks } from '@/components/Fireworks'
+import React from 'react'
+import { loadExternalResource } from '@/lib/utils'
 
 const Ackee = dynamic(() => import('@/components/Ackee'), { ssr: false })
 const Gtag = dynamic(() => import('@/components/Gtag'), { ssr: false })
@@ -47,14 +49,26 @@ const MyApp = ({ Component, pageProps }) => {
         {JSON.parse(BLOG.FIREWORKS) && <Fireworks/>}
     </>
 
+  // 延迟加载字体
+  React.useEffect(() => {
+    loadFont()
+  }, [])
+
   return (
         <GlobalContextProvider>
-            {/* FontawesomeCDN */}
-            <link rel="stylesheet" href={BLOG.FONT_AWESOME_PATH} referrerPolicy="no-referrer" />
             {externalPlugins}
             <Component {...pageProps} />
         </GlobalContextProvider>
   )
 }
 
+/**
+ * 延迟加载字体
+ */
+const loadFont = () => {
+  loadExternalResource(BLOG.FONT_AWESOME_PATH, 'css')
+  for (const fontUrl of BLOG.CUSTOM_FONT_URL) {
+    loadExternalResource(fontUrl, 'css')
+  }
+}
 export default MyApp
diff --git a/pages/_document.js b/pages/_document.js
index 7aae613a..4438697e 100644
--- a/pages/_document.js
+++ b/pages/_document.js
@@ -15,10 +15,6 @@ class MyDocument extends Document {
         <Head>
           <link rel='icon' href='/favicon.ico' />
           <link rel='icon' href='/favicon.svg' type='image/svg+xml' />
-          { BLOG.CUSTOM_FONT
-            ? BLOG.CUSTOM_FONT_URL?.map(fontUrl =>
-                <link href={`${fontUrl}`} key={fontUrl} rel='stylesheet' />)
-            : <link href='https://fonts.font.im/css2?family=Noto+Serif+SC&display=swap' rel='stylesheet' /> }
           <CommonScript />
         </Head>
 

From 39c39d12d4095be1164723144a4b5faf6c6b8685 Mon Sep 17 00:00:00 2001
From: tangly1024 <mail@tangly1024.com>
Date: Thu, 15 Dec 2022 18:34:31 +0800
Subject: [PATCH 22/26] SEO

---
 themes/hexo/components/InfoCard.js        | 2 +-
 themes/medium/components/ArticleDetail.js | 2 +-
 themes/medium/components/InfoCard.js      | 2 +-
 themes/next/components/InfoCard.js        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/themes/hexo/components/InfoCard.js b/themes/hexo/components/InfoCard.js
index 3b28d0fa..1393211a 100644
--- a/themes/hexo/components/InfoCard.js
+++ b/themes/hexo/components/InfoCard.js
@@ -14,7 +14,7 @@ export function InfoCard (props) {
       }}
     >
     {/* eslint-disable-next-line @next/next/no-img-element */}
-    <img src={siteInfo?.icon} className='rounded-full' width={120}/>
+    <img src={siteInfo?.icon} className='rounded-full' width={120} alt={BLOG.AUTHOR}/>
     </div>
     <div className='text-center text-xl pb-4'>{BLOG.AUTHOR}</div>
     <div className='text-sm text-center'>{BLOG.BIO}</div>
diff --git a/themes/medium/components/ArticleDetail.js b/themes/medium/components/ArticleDetail.js
index ea129207..b0a5090e 100644
--- a/themes/medium/components/ArticleDetail.js
+++ b/themes/medium/components/ArticleDetail.js
@@ -36,7 +36,7 @@ export const ArticleDetail = props => {
             <Link href="/about" passHref>
                 <div className='flex pt-2'>
                     {/* eslint-disable-next-line @next/next/no-img-element */}
-                    <img src={siteInfo?.icon} className='rounded-full cursor-pointer' width={22} />
+                    <img src={siteInfo?.icon} className='rounded-full cursor-pointer' width={22} alt={BLOG.AUTHOR} />
 
                     <div className="mr-3 ml-2 my-auto text-green-500 cursor-pointer">
                         {BLOG.AUTHOR}
diff --git a/themes/medium/components/InfoCard.js b/themes/medium/components/InfoCard.js
index ce3f7bc3..f34b2ee6 100644
--- a/themes/medium/components/InfoCard.js
+++ b/themes/medium/components/InfoCard.js
@@ -9,7 +9,7 @@ const InfoCard = (props) => {
     <div className='items-center justify-center font-sans '>
         <div className='hover:scale-105 transform duration-200 cursor-pointer flex justify-center' onClick={ () => { Router.push('/about') }}>
             {/* eslint-disable-next-line @next/next/no-img-element */}
-            <img src={siteInfo?.icon} className='rounded-full' width={120}/>
+            <img src={siteInfo?.icon} className='rounded-full' width={120} alt={BLOG.AUTHOR}/>
          </div>
         <div className='text-xl py-2 hover:scale-105 transform duration-200 flex justify-center dark:text-gray-300'>{BLOG.AUTHOR}</div>
         <div className='font-light text-gray-600 mb-2 hover:scale-105 transform duration-200 flex justify-center dark:text-gray-400'>{BLOG.BIO}</div>
diff --git a/themes/next/components/InfoCard.js b/themes/next/components/InfoCard.js
index 5bbed271..3adb5825 100644
--- a/themes/next/components/InfoCard.js
+++ b/themes/next/components/InfoCard.js
@@ -9,7 +9,7 @@ const InfoCard = (props) => {
     <div className='flex flex-col items-center justify-center '>
         <div className='hover:rotate-45 hover:scale-125 transform duration-200 cursor-pointer' onClick={ () => { Router.push('/') }}>
         {/* eslint-disable-next-line @next/next/no-img-element */}
-        <img src={siteInfo?.icon} className='rounded-full' width={120}/>
+        <img src={siteInfo?.icon} className='rounded-full' width={120} alt={BLOG.AUTHOR}/>
         </div>
         <div className='text-2xl font-serif dark:text-white py-2 hover:scale-105 transform duration-200'>{BLOG.AUTHOR}</div>
         <div className='font-light dark:text-white py-2 hover:scale-105 transform duration-200 text-center'>{BLOG.BIO}</div>

From 4e99df18b594fd3884896b8d35e47f4deeca95b3 Mon Sep 17 00:00:00 2001
From: tangly1024 <mail@tangly1024.com>
Date: Thu, 15 Dec 2022 18:41:22 +0800
Subject: [PATCH 23/26] v3.6.7

---
 .env.local   | 2 +-
 package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.local b/.env.local
index ffa93893..fed79673 100644
--- a/.env.local
+++ b/.env.local
@@ -1,2 +1,2 @@
 # 环境变量 @see https://www.nextjs.cn/docs/basic-features/environment-variables
-NEXT_PUBLIC_VERSION=3.6.6
\ No newline at end of file
+NEXT_PUBLIC_VERSION=3.6.7
\ No newline at end of file
diff --git a/package.json b/package.json
index b7d9f09f..c1a01253 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "notion-next",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "homepage": "https://github.com/tangly1024/NotionNext.git",
   "license": "MIT",
   "repository": {

From 88118e0fb7af179d657b166328d33bd0a16b461d Mon Sep 17 00:00:00 2001
From: tangly1024 <mail@tangly1024.com>
Date: Fri, 16 Dec 2022 10:33:32 +0800
Subject: [PATCH 24/26] fix font-custom

---
 components/CommonHead.js |  6 ++++++
 pages/_app.js            | 13 ++-----------
 tailwind.config.js       |  2 +-
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/components/CommonHead.js b/components/CommonHead.js
index de4c7d25..5938dc6d 100644
--- a/components/CommonHead.js
+++ b/components/CommonHead.js
@@ -43,6 +43,12 @@ const CommonHead = ({ meta, children }) => {
       <meta name="twitter:card" content="summary_large_image" />
       <meta name="twitter:description" content={description} />
       <meta name="twitter:title" content={title} />
+
+      { BLOG.CUSTOM_FONT
+        ? BLOG.CUSTOM_FONT_URL?.map(fontUrl =>
+            <link href={`${fontUrl}`} key={fontUrl} rel="stylesheet"/>)
+        : <link href='https://fonts.font.im/css2?family=Noto+Serif+SC&display=optional' rel="stylesheet"/> }
+
       {JSON.parse(BLOG.ANALYTICS_BUSUANZI_ENABLE) && <meta name="referrer" content="no-referrer-when-downgrade" />}
       {meta?.type === 'Post' && (
         <>
diff --git a/pages/_app.js b/pages/_app.js
index 79506c43..200a6b43 100644
--- a/pages/_app.js
+++ b/pages/_app.js
@@ -49,9 +49,9 @@ const MyApp = ({ Component, pageProps }) => {
         {JSON.parse(BLOG.FIREWORKS) && <Fireworks/>}
     </>
 
-  // 延迟加载字体
+  // 延迟加载fontAwesome
   React.useEffect(() => {
-    loadFont()
+    loadExternalResource(BLOG.FONT_AWESOME_PATH, 'css')
   }, [])
 
   return (
@@ -62,13 +62,4 @@ const MyApp = ({ Component, pageProps }) => {
   )
 }
 
-/**
- * 延迟加载字体
- */
-const loadFont = () => {
-  loadExternalResource(BLOG.FONT_AWESOME_PATH, 'css')
-  for (const fontUrl of BLOG.CUSTOM_FONT_URL) {
-    loadExternalResource(fontUrl, 'css')
-  }
-}
 export default MyApp
diff --git a/tailwind.config.js b/tailwind.config.js
index 829bee9f..5079e173 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -1,5 +1,5 @@
 const BLOG = require('./blog.config')
-const fontFamilies = require('./lib/font')
+const { fontFamilies } = require('./lib/font')
 
 module.exports = {
   purge: ['./pages/**/*.js', './components/**/*.js', './layouts/**/*.js', './themes/**/*.js'],

From 89503ca0c1fde2379441bb77d96bb7cc6a027607 Mon Sep 17 00:00:00 2001
From: tangly1024 <mail@tangly1024.com>
Date: Mon, 19 Dec 2022 16:33:41 +0800
Subject: [PATCH 25/26] Update README.md

---
 README.md | 75 +++++++++----------------------------------------------
 1 file changed, 12 insertions(+), 63 deletions(-)

diff --git a/README.md b/README.md
index 24b65760..495a7042 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,5 @@
 # NotionNext
 
-一个使用 NextJS + Notion API 实现的，部署在 Vercel 上的静态博客系统。为Notion和所有创作者设计。
-
 <p>
   <a aria-label="GitHub commit activity" href="https://github.com/tangly1024/NotionNext/commits/main" title="GitHub commit activity">
     <img src="https://img.shields.io/github/commit-activity/m/tangly1024/NotionNext?style=for-the-badge"/>
@@ -17,74 +15,20 @@
   </a>
 </p>
 
-演示地址：[https://preview.tangly1024.com/](https://preview.tangly1024.com/)
+一个使用 NextJS + Notion API 实现的，部署在 Vercel 上的静态博客系统。为Notion和所有创作者设计。
 
-## 继承自Nobelium的亮点 ✨ 
 
-**🚀 &nbsp;秒开，设备全适配**
+## 预览效果
 
-- 快速的页面渲染和响应式设计
-- 高效编译器的快速静态页面生成
-
-**🤖 &nbsp;自动，无需重新部署**
-
-- 部署在免费、高速的 Vercel 平台
-- 支持增量式更新，更新文章后无需重复部署
-
-**🚙 &nbsp;全功能，完全不操心**
-
-- 评论、搜索、标签、分类
-- 订阅、网站统计
-- 本地化多语言
-- 服务端渲染、优秀的SEO
-
-**🎨 &nbsp;美观，轻松自定义**
-- 丰富的配置项，更支持多语言
-- 使用 Tailwind CSS，轻松实现二次开发
-
-## 特色
-- 支持更多的页面，功能，更多特性、欢迎移步[我的博客](https://tangly1024.com/article/notion-next)查看
-- 支持多主题切换
+在线演示：[https://preview.tangly1024.com/](https://preview.tangly1024.com/) ，项目支持多主题切换，没找到喜欢的主题？[贡献](/CONTRIBUTING.md)一个吧~
 
 | Next | Medium | Hexo | Fukasawa |
 |--|--|--|--|
 | <img src='./docs/theme-next.png' width='300'/> [预览NEXT](https://preview.tangly1024.com/?theme=next)  | <img src='./docs/theme-medium.png' width='300'/> [预览MEDIUM](https://preview.tangly1024.com/?theme=medium) | <img src='./docs/theme-hexo.png' width='300'/> [预览HEXO](https://preview.tangly1024.com/?theme=hexo) | <img src='./docs/theme-fukasawa.png' width='300'/> [预览FUKASAWA](https://preview.tangly1024.com/?theme=fukasawa) |
 
-*只需修改`blog.config.js`文件的`THEME`即可实现主题切换。* 没找到喜欢的主题？[贡献](/CONTRIBUTING.md)一个吧~
+## 我要如何开始？
 
-
-
-## 快速起步
-
-- 给这个项目点个小星星 😉
-- 将 [这个 Notion 模板](https://tanghh.notion.site/02ab3b8678004aa69e9e415905ef32a5) 制作副本，并分享这个页面给所有人
-- [Fork](https://github.com/tangly1024/NotionNext/fork) 这个项目
-  - _(可选)_ 用自己的图片替换 `/public` 文件夹里的 `avatar.jpg`、`favicon.svg` 和 `favicon.ico`
-  - 在 `blog.config.js` 配置相关选项，`NOTION_PAGE_ID`: 你刚刚分享出去的 Notion 页面网址中的页面 ID，通常是网址中工作区地址后的 32 位字符串
-- 在 [Vercel](https://vercel.com)中部署项目
-- **稍微等等就可以访问了！** 简单吗?
-
-更多项目特性及配置的说明，请移步 [NotionNext文档](https://docs.tangly1024.com/zh) 查看，文档正在完善中,欢迎 [参与编辑](https://github.com/tangly1024/nextjs-docs-notion-next)
-
-## 快速开发
-- 需要安装Nodejs环境
-```bash
-yarn # 安装依赖
-yarn run dev # 本地开发
-yarn run build # 本地打包编译
-yarn run start # 本地启动NextJS服务
-```
-
-## 引用技术
-
-- **框架**: [Next.js](https://nextjs.org)
-- **样式**: [Tailwind CSS](https://www.tailwindcss.cn/) 和 `@tailwindcss/jit` compiler
-- **渲染**: [React-notion-x](https://github.com/NotionX/react-notion-x)
-- **评论**: [Giscus](https://giscus.app/zh-CN), [Gitalk](https://gitalk.github.io), [Cusdis](https://cusdis.com), [Utterances](https://utteranc.es)
-- **图标**：[fontawesome v5.15](https://fontawesome.com/v5.15/icons?d=gallery)
-
-## 更新日志
-请移步 [更新文档](https://docs.tangly1024.com/zh/changelog)查看
+只需几分钟即可搭建您的个人站点，欢迎移步[我的博客](https://tangly1024.com/article/notion-next) 查看教程 
 
 
 ## 致谢
@@ -120,12 +64,17 @@ yarn run start # 本地启动NextJS服务
   <td align="center"><a href="https://github.com/SwwweetOrange"><img src="https://avatars.githubusercontent.com/u/71168966" width="64px;"  alt="SwwweetOrange"/><br/><sub><b>SwwweetOrange</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=SwwweetOrange" title="SwwweetOrange" >🔧 🐛</a></td>
 
   <td align="center"><a href="https://github.com/Ylarod"><img src="https://avatars.githubusercontent.com/u/30978685" width="64px;"  alt="Ylarod"/><br/><sub><b>Ylarod</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=Ylarod" title="Ylarod" >🔧 🐛</a></td>
-v
 
 </tr>
 </table>
 
-十分期待你的[贡献](/CONTRIBUTING.md)，一起来完善这个项目~
+## 引用技术
+
+- **框架**: [Next.js](https://nextjs.org)
+- **样式**: [Tailwind CSS](https://www.tailwindcss.cn/) 和 `@tailwindcss/jit` compiler
+- **渲染**: [React-notion-x](https://github.com/NotionX/react-notion-x)
+- **评论**: [Giscus](https://giscus.app/zh-CN), [Gitalk](https://gitalk.github.io), [Cusdis](https://cusdis.com), [Utterances](https://utteranc.es)
+- **图标**: [Fontawesome](https://fontawesome.com/v6/icons/)
 
 
 ## License

From 3abdb14c1a185e379111b3cb5dafe194faa18a41 Mon Sep 17 00:00:00 2001
From: tangly1024 <mail@tangly1024.com>
Date: Mon, 19 Dec 2022 16:49:07 +0800
Subject: [PATCH 26/26] =?UTF-8?q?hexo-=E6=A0=B7=E5=BC=8F=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 styles/globals.css                       | 5 -----
 themes/hexo/LayoutArchive.js             | 2 +-
 themes/hexo/components/NavButtonGroup.js | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/styles/globals.css b/styles/globals.css
index a4e86ff1..f2f180e8 100644
--- a/styles/globals.css
+++ b/styles/globals.css
@@ -132,11 +132,6 @@ nav {
   backdrop-filter: blur(10px);
 }
 
-.dark .glassmorphism {
-  background: rgba(31, 41, 55, 0.75);
-  -webkit-backdrop-filter: blur(10px);
-  backdrop-filter: blur(10px);
-}
 
 .medium-zoom-overlay {
   background: none !important;
diff --git a/themes/hexo/LayoutArchive.js b/themes/hexo/LayoutArchive.js
index 5f30f76e..8d2a1c08 100644
--- a/themes/hexo/LayoutArchive.js
+++ b/themes/hexo/LayoutArchive.js
@@ -39,7 +39,7 @@ export const LayoutArchive = (props) => {
   }, [])
   return <LayoutBase {...props} >
     <Card className='w-full'>
-    <div className="mb-10 pb-20 bg-white md:p-12 p-3 dark:bg-gray-800 min-h-full">
+    <div className="mb-10 pb-20 bg-white md:p-12 p-3 min-h-full dark:bg-hexo-black-gray">
         {Object.keys(archivePosts).map(archiveTitle => (
           <BlogPostArchive
             key={archiveTitle}
diff --git a/themes/hexo/components/NavButtonGroup.js b/themes/hexo/components/NavButtonGroup.js
index 7a71ee02..f15b992d 100644
--- a/themes/hexo/components/NavButtonGroup.js
+++ b/themes/hexo/components/NavButtonGroup.js
@@ -16,7 +16,7 @@ const NavButtonGroup = (props) => {
   return <nav id='home-nav-button' className={'md:h-52 md:mt-6 xl:mt-32 px-5 py-2 mt-8 flex flex-wrap md:max-w-5xl space-y-2 md:space-y-0 md:flex justify-center max-h-80 overflow-auto'}>
     {categories.map(category => {
       return <Link key={`${category.name}`} title={`${category.name}`} href={`/category/${category.name}`} passHref>
-            <a className='text-center w-full md:mx-6 md:w-40 md:h-14 lg:h-20 h-14 justify-center items-center flex border-2 cursor-pointer rounded-lg glassmorphism  hover:bg-white hover:text-black duration-200 font-bold hover:scale-110 transform'>{category.name}</a>
+            <a className='text-center w-full md:mx-6 md:w-40 md:h-14 lg:h-20 h-14 justify-center items-center flex border-2 cursor-pointer rounded-lg glassmorphism hover:bg-white hover:text-black duration-200 font-bold hover:scale-110 transform'>{category.name}</a>
         </Link>
     })}
   </nav>