From f4fb87985282ff184ba6df8828c86ec5dcdb5414 Mon Sep 17 00:00:00 2001
From: tangly1024 <tlyong1992@hotmail.com>
Date: Wed, 12 Jan 2022 09:59:32 +0800
Subject: [PATCH] =?UTF-8?q?build:=20=E4=BF=AE=E5=A4=8D=E9=A2=84=E7=BC=96?=
 =?UTF-8?q?=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/BlogPostCard.js |  2 +-
 pages/article/[slug].js    | 15 ++++++++++-----
 pages/tag/[tag].js         | 21 +++++++--------------
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/components/BlogPostCard.js b/components/BlogPostCard.js
index 5d4eb7c8..cb2eff98 100644
--- a/components/BlogPostCard.js
+++ b/components/BlogPostCard.js
@@ -57,7 +57,7 @@ const BlogPostCard = ({ post, showSummary }) => {
           />
         </div> }
 
-        <div className='article-cover'>
+        <div className='article-cover pointer-events-none'>
           <Link href={`${BLOG.path}/article/${post.slug}`} passHref>
               <a className='hover:bg-opacity-100 hover:scale-105 transform duration-300 rounded-md p-2 text-red-500 cursor-pointer'>
                 {locale.COMMON.ARTICLE_DETAIL}
diff --git a/pages/article/[slug].js b/pages/article/[slug].js
index d07466ae..6ca1254d 100644
--- a/pages/article/[slug].js
+++ b/pages/article/[slug].js
@@ -4,7 +4,7 @@ import Live2D from '@/components/Live2D'
 import TocDrawer from '@/components/TocDrawer'
 import TocDrawerButton from '@/components/TocDrawerButton'
 import BaseLayout from '@/layouts/BaseLayout'
-import { getAllPosts, getPostBlocks } from '@/lib/notion'
+import { getPostBlocks } from '@/lib/notion'
 import { getGlobalNotionData } from '@/lib/notion/getNotionData'
 import Custom404 from '@/pages/404'
 import { getPageTableOfContents } from 'notion-utils'
@@ -69,12 +69,17 @@ const Slug = ({
 }
 
 export async function getStaticPaths () {
-  let posts = []
-  if (BLOG.isProd) {
-    posts = await getAllPosts({ from: 'slug - paths', includePage: false })
+  if (!BLOG.isProd) {
+    return {
+      paths: [],
+      fallback: true
+    }
   }
+
+  const from = '[slug-paths'
+  const { allPosts } = await getGlobalNotionData({ from, includePage: false })
   return {
-    paths: posts.map(row => ({ params: { slug: row.slug } })),
+    paths: allPosts.map(row => ({ params: { slug: row.slug } })),
     fallback: true
   }
 }
diff --git a/pages/tag/[tag].js b/pages/tag/[tag].js
index 60d82fa5..06a8160d 100644
--- a/pages/tag/[tag].js
+++ b/pages/tag/[tag].js
@@ -4,7 +4,6 @@ import StickyBar from '@/components/StickyBar'
 import TagList from '@/components/TagList'
 import BaseLayout from '@/layouts/BaseLayout'
 import { useGlobal } from '@/lib/global'
-import { getAllPosts } from '@/lib/notion'
 import { getGlobalNotionData } from '@/lib/notion/getNotionData'
 
 export default function Tag ({ tags, posts, tag, categories, postCount, latestPosts }) {
@@ -56,27 +55,21 @@ export async function getStaticProps ({ params }) {
  * @param {*}} allPosts
  * @returns
  */
-function getTagNames (allPosts) {
-  const tags = allPosts.map(p => p.tags).flat()
-
-  const tagObj = {}
+function getTagNames (tags) {
+  const tagNames = []
   tags.forEach(tag => {
-    if (tag in tagObj) {
-      tagObj[tag]++
-    } else {
-      tagObj[tag] = 1
-    }
+    tagNames.push(tag.name)
   })
-  return tagObj
+  return tagNames
 }
 
 export async function getStaticPaths () {
   const from = 'tag-static-path'
-  const posts = await getAllPosts({ from })
-  const tagNames = getTagNames(posts)
+  const { tags } = await getGlobalNotionData({ from, tagsCount: 0 })
+  const tagNames = getTagNames(tags)
 
   return {
-    paths: Object.keys(tagNames).map(tag => ({ params: { tag } })),
+    paths: Object.keys(tagNames).map(index => ({ params: { tag: tagNames[index] } })),
     fallback: true
   }
 }