From a0a45d2512f3c300198df02ee59ebeb05f2ce019 Mon Sep 17 00:00:00 2001
From: emengweb <emengweb@gmail.com>
Date: Mon, 24 Apr 2023 10:29:17 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=B7=E5=BC=8F=EF=BC=8C?=
 =?UTF-8?q?=E4=BE=A7=E8=BE=B9=E6=A0=8F=E5=A2=9E=E5=8A=A0=E5=85=AC=E5=91=8A?=
 =?UTF-8?q?=E6=A0=8F=EF=BC=8C=E6=96=87=E7=AB=A0=E5=88=97=E8=A1=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/fukasawa/LayoutTag.js                |  1 +
 themes/fukasawa/LayoutTagIndex.js           | 15 +++++++----
 themes/fukasawa/components/Announcement.js  | 21 ++++++++++++++++
 themes/fukasawa/components/ArticleDetail.js | 17 ++++++++-----
 themes/fukasawa/components/AsideLeft.js     | 28 +++++++++++++--------
 themes/fukasawa/components/BlogCard.js      | 24 +++++++++++++++++-
 6 files changed, 83 insertions(+), 23 deletions(-)
 create mode 100755 themes/fukasawa/components/Announcement.js

diff --git a/themes/fukasawa/LayoutTag.js b/themes/fukasawa/LayoutTag.js
index 3a546fad..46e9e0fd 100644
--- a/themes/fukasawa/LayoutTag.js
+++ b/themes/fukasawa/LayoutTag.js
@@ -1,6 +1,7 @@
 import BLOG from '@/blog.config'
 import BlogListPage from './components/BlogListPage'
 import BlogListScroll from './components/BlogListScroll'
+import TagItemMini from './components/TagItemMini'
 import LayoutBase from './LayoutBase'
 
 export const LayoutTag = (props) => {
diff --git a/themes/fukasawa/LayoutTagIndex.js b/themes/fukasawa/LayoutTagIndex.js
index eb1d690b..df43fdeb 100644
--- a/themes/fukasawa/LayoutTagIndex.js
+++ b/themes/fukasawa/LayoutTagIndex.js
@@ -1,5 +1,6 @@
 import { useGlobal } from '@/lib/global'
 import TagItem from './components/TagItem'
+import TagItemMini from './components/TagItemMini'
 import LayoutBase from './LayoutBase'
 
 export const LayoutTagIndex = (props) => {
@@ -8,11 +9,15 @@ export const LayoutTagIndex = (props) => {
   return <LayoutBase {...props} >
     <div className='bg-white dark:bg-gray-700 px-10 py-10 shadow'>
       <div className='dark:text-gray-200 mb-5'><i className='mr-4 fas fa-tag'/>{locale.COMMON.TAGS}:</div>
-      <div id='tags-list' className='duration-200 flex flex-wrap'>
-        { tagOptions.map(tag => {
-          return <div key={tag.name} className='p-2'><TagItem key={tag.name} tag={tag} /></div>
-        }) }
-      </div>
+        <div id="tags-list" className="duration-200 flex flex-wrap ml-8">
+          {tagOptions.map(tag => {
+            return (
+              <div key={tag.name} className="p-2">
+                <TagItemMini key={tag.name} tag={tag} />
+              </div>
+            )
+          })}
+        </div>
     </div>
   </LayoutBase>
 }
diff --git a/themes/fukasawa/components/Announcement.js b/themes/fukasawa/components/Announcement.js
new file mode 100755
index 00000000..dbc24db0
--- /dev/null
+++ b/themes/fukasawa/components/Announcement.js
@@ -0,0 +1,21 @@
+import { useGlobal } from '@/lib/global'
+import dynamic from 'next/dynamic'
+
+const NotionPage = dynamic(() => import('@/components/NotionPage'))
+
+const Announcement = ({ post, className }) => {
+  const { locale } = useGlobal()
+  if (post?.blockMap) {
+    return <div className={className}>
+        <section id='announcement-wrapper' className="dark:text-gray-300 rounded-xl px-2 py-4">
+            <div><i className='mr-2 fas fa-bullhorn' />{locale.COMMON.ANNOUNCEMENT}</div>
+            {post && (<div id="announcement-content">
+            <NotionPage post={post} className='text-center ' />
+        </div>)}
+        </section>
+    </div>
+  } else {
+    return <></>
+  }
+}
+export default Announcement
diff --git a/themes/fukasawa/components/ArticleDetail.js b/themes/fukasawa/components/ArticleDetail.js
index 65af8400..96a35161 100644
--- a/themes/fukasawa/components/ArticleDetail.js
+++ b/themes/fukasawa/components/ArticleDetail.js
@@ -1,3 +1,4 @@
+import TagItemMini from './TagItemMini'
 import Comment from '@/components/Comment'
 import NotionPage from '@/components/NotionPage'
 import formatDate from '@/lib/formatDate'
@@ -33,7 +34,7 @@ export default function ArticleDetail(props) {
         <header className='animate__slideInDown animate__animated'>
 
           {/* 文章Title */}
-          <div className="font-bold text-3xl text-black dark:text-white font-serif pt-10">
+          <div className="font-bold text-4xl text-black dark:text-white">
             {post.title}
           </div>
 
@@ -68,11 +69,15 @@ export default function ArticleDetail(props) {
                 </span>
               </>)}
 
-              <div className=" busuanzi_container_page_pv font-light mr-2">
-                <i className='mr-1 fas fa-eye' />
-                &nbsp;
-                <span className="mr-2 busuanzi_value_page_pv" />
-              </div>
+            <div className='my-2'>
+                {post.tagItems && (
+                    <div className="flex flex-nowrap overflow-x-auto">
+                        {post.tagItems.map(tag => (
+                            <TagItemMini key={tag.name} tag={tag} />
+                        ))}
+                    </div>
+                )}
+            </div>
             </div>
 
           </section>
diff --git a/themes/fukasawa/components/AsideLeft.js b/themes/fukasawa/components/AsideLeft.js
index ef67cc44..0f929bae 100644
--- a/themes/fukasawa/components/AsideLeft.js
+++ b/themes/fukasawa/components/AsideLeft.js
@@ -5,42 +5,48 @@ import GroupTag from './GroupTag'
 import SearchInput from './SearchInput'
 import SiteInfo from './SiteInfo'
 import Catalog from './Catalog'
+import Announcement from './Announcement'
 import { useRouter } from 'next/router'
 import DarkModeButton from '@/components/DarkModeButton'
 
 function AsideLeft (props) {
-  const { tagOptions, currentTag, categoryOptions, currentCategory, post, slot, siteInfo } = props
+  const { tagOptions, currentTag, categoryOptions, currentCategory, post, slot, siteInfo, notice } = props
   const router = useRouter()
-  return <div className='relative w-72 bg-white dark:bg-hexo-black-gray min-h-screen px-10 py-14 hidden lg:block z-20'>
+  return <div className='sideLeft relative w-80 bg-white dark:bg-hexo-black-gray min-h-screen px-10 py-14 hidden lg:block z-20'>
     <Logo {...props}/>
+    
+    <section className='siteInfo flex flex-col dark:text-gray-300 pt-8'>
+      { siteInfo?.description }
+    </section>
 
     <section className='flex flex-col text-gray-600'>
-      <hr className='w-12 my-8' />
+      <div className='w-12 my-4' />
       <MenuList {...props}/>
     </section>
 
     <section className='flex flex-col text-gray-600'>
-      <hr className='w-12 my-8' />
+      <div className='w-12 my-4' />
       <SearchInput {...props}/>
     </section>
 
-    <section className='flex flex-col dark:text-gray-300'>
-      <hr className='w-12 my-8' />
-      { siteInfo?.description }
-    </section>
 
+    <section className='flex flex-col dark:text-gray-300'>
+      <div className='w-12 my-4' />
+      <Announcement post={notice}/>
+    </section>
+      
     {router.asPath !== '/tag' && <section className='flex flex-col'>
-      <hr className='w-12 my-8 ' />
+      <div className='w-12 my-4' />
       <GroupTag tags={tagOptions} currentTag={currentTag}/>
     </section>}
 
     {router.asPath !== '/category' && <section className='flex flex-col'>
-      <hr className='w-12 my-8 ' />
+      <div className='w-12 my-4' />
       <GroupCategory categories={categoryOptions} currentCategory={currentCategory}/>
     </section>}
 
     <section className='flex flex-col'>
-      <hr className='w-12 my-8 ' />
+      <div className='w-12 my-4' />
       <SiteInfo/>
     </section>
 
diff --git a/themes/fukasawa/components/BlogCard.js b/themes/fukasawa/components/BlogCard.js
index 1d382cf7..86c4ea7f 100644
--- a/themes/fukasawa/components/BlogCard.js
+++ b/themes/fukasawa/components/BlogCard.js
@@ -1,5 +1,6 @@
 import BLOG from '@/blog.config'
 import Link from 'next/link'
+import TagItemMini from './TagItemMini'
 import React from 'react'
 import CONFIG_FUKA from '../config_fuka'
 
@@ -28,10 +29,31 @@ const BlogCard = ({ index, post, showSummary, siteInfo }) => {
             </Link>
 
             {(!showPreview || showSummary) && (
-                <p className="mt-4 mb-4 text-gray-700 dark:text-gray-300 text-sm font-light leading-7 overflow-hidden">
+                <p className="mt-1 mb-1 text-gray-700 dark:text-gray-300 text-sm font-light leading-7 overflow-hidden">
                 {post.summary}
                 </p>
             )}
+            
+                {/* 分类标签 */}
+                <div className="mt-1 text-gray-400 justify-between flex">
+                    <Link
+                        href={`/category/${post.category}`}
+                        passHref
+                        className="cursor-pointer font-light text-sm hover:underline hover:text-indigo-700 dark:hover:text-indigo-400 transform">
+            
+                        <i className="mr-1 far fa-folder" />
+                        {post.category}
+            
+                    </Link>
+                    <div className="md:flex-nowrap flex-wrap md:justify-start inline-block">
+                        <div>
+                            {' '}
+                            {post.tagItems.map(tag => (
+                                <TagItemMini key={tag.name} tag={tag} />
+                            ))}
+                        </div>
+                    </div>
+                </div>
             </div>
 
             {showPageCover && (