From 52a3bc7d0a6853c16f610d7b7e87da68948affbe Mon Sep 17 00:00:00 2001
From: tangly1024 <tlyong1992@hotmail.com>
Date: Sun, 27 Feb 2022 21:57:03 +0800
Subject: [PATCH] =?UTF-8?q?Fukasawa:=20Fontawesome=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/Fukasawa/LayoutBase.js               |  8 ++------
 themes/Fukasawa/LayoutCategoryIndex.js      |  6 ++----
 themes/Fukasawa/LayoutTagIndex.js           |  4 +---
 themes/Fukasawa/components/ArticleAround.js |  6 ++----
 themes/Fukasawa/components/ArticleDetail.js |  6 ++----
 themes/Fukasawa/components/AsideLeft.js     |  5 +++--
 themes/Fukasawa/components/GroupCategory.js |  4 +---
 themes/Fukasawa/components/GroupMenu.js     | 20 ++++++++++++--------
 themes/Fukasawa/components/SearchInput.js   |  6 ++----
 themes/Fukasawa/components/SiteInfo.js      |  8 +++-----
 themes/Fukasawa/components/TagItem.js       |  4 +---
 themes/Fukasawa/components/TagItemMini.js   |  4 +---
 themes/Fukasawa/components/TopNav.js        | 12 ++++--------
 themes/index.js                             |  4 ++--
 14 files changed, 38 insertions(+), 59 deletions(-)

diff --git a/themes/Fukasawa/LayoutBase.js b/themes/Fukasawa/LayoutBase.js
index 1d3f3a57..39603acb 100644
--- a/themes/Fukasawa/LayoutBase.js
+++ b/themes/Fukasawa/LayoutBase.js
@@ -20,17 +20,13 @@ const LayoutBase = (props) => {
   const {
     children,
     headerSlot,
-    tags,
-    meta,
-    currentCategory,
-    currentTag,
-    categories
+    meta
   } = props
   return (<>
     <CommonHead meta={meta} />
     <TopNav {...props}/>
     <div className='flex'>
-      <AsideLeft tags={tags} currentTag={currentTag} categories={categories} currentCategory={currentCategory}/>
+      <AsideLeft {...props}/>
       <main id='wrapper' className='flex w-full py-8 justify-center'>
         <div className='2xl:max-w-6xl md:max-w-3xl w-full'>
           <div> {headerSlot} </div>
diff --git a/themes/Fukasawa/LayoutCategoryIndex.js b/themes/Fukasawa/LayoutCategoryIndex.js
index 0def1581..0941d901 100644
--- a/themes/Fukasawa/LayoutCategoryIndex.js
+++ b/themes/Fukasawa/LayoutCategoryIndex.js
@@ -1,7 +1,5 @@
 import BLOG from '@/blog.config'
 import { useGlobal } from '@/lib/global'
-import { faFolder, faTh } from '@fortawesome/free-solid-svg-icons'
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import Link from 'next/link'
 import LayoutBase from './LayoutBase'
 
@@ -16,14 +14,14 @@ export const LayoutCategoryIndex = (props) => {
   return <LayoutBase {...props} meta={meta}>
     <div className='bg-white dark:bg-gray-700 px-10 py-10 shadow'>
       <div className='dark:text-gray-200 mb-5'>
-        <FontAwesomeIcon icon={faTh} className='mr-4' />{locale.COMMON.CATEGORY}:
+        <i className='mr-4 fas fa-th' />{locale.COMMON.CATEGORY}:
       </div>
       <div id='category-list' className='duration-200 flex flex-wrap'>
         {Object.keys(categories).map(category => {
           return <Link key={category} href={`/category/${category}`} passHref>
             <div
               className={'hover:text-black dark:hover:text-white dark:text-gray-300 dark:hover:bg-gray-600 px-5 cursor-pointer py-2 hover:bg-gray-100'}>
-              <FontAwesomeIcon icon={faFolder} className='mr-4' />{category}({categories[category]})
+              <i className='mr-4 fas fa-folder' />{category}({categories[category]})
             </div>
           </Link>
         })}
diff --git a/themes/Fukasawa/LayoutTagIndex.js b/themes/Fukasawa/LayoutTagIndex.js
index 1d93708d..0642dbd9 100644
--- a/themes/Fukasawa/LayoutTagIndex.js
+++ b/themes/Fukasawa/LayoutTagIndex.js
@@ -1,7 +1,5 @@
 import BLOG from '@/blog.config'
 import { useGlobal } from '@/lib/global'
-import { faTag } from '@fortawesome/free-solid-svg-icons'
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import TagItem from './components/TagItem'
 import LayoutBase from './LayoutBase'
 
@@ -16,7 +14,7 @@ export const LayoutTagIndex = (props) => {
 
   return <LayoutBase {...props} meta={meta}>
     <div className='bg-white dark:bg-gray-700 px-10 py-10 shadow'>
-      <div className='dark:text-gray-200 mb-5'><FontAwesomeIcon icon={faTag} className='mr-4'/>{locale.COMMON.TAGS}:</div>
+      <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'>
         { tags.map(tag => {
           return <div key={tag.name} className='p-2'><TagItem key={tag.name} tag={tag} /></div>
diff --git a/themes/Fukasawa/components/ArticleAround.js b/themes/Fukasawa/components/ArticleAround.js
index 7f42e575..efb6c09b 100644
--- a/themes/Fukasawa/components/ArticleAround.js
+++ b/themes/Fukasawa/components/ArticleAround.js
@@ -1,6 +1,4 @@
 import Link from 'next/link'
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import { faAngleDoubleLeft, faAngleDoubleRight } from '@fortawesome/free-solid-svg-icons'
 
 /**
  * 上一篇，下一篇文章
@@ -14,12 +12,12 @@ export default function ArticleAround ({ prev, next }) {
   return <section className='text-gray-800 h-28 flex items-center justify-between space-x-5 my-4'>
     <Link href={`/article/${prev.slug}`} passHref>
       <a className='text-sm cursor-pointer justify-center items-center flex w-full h-full bg-gray-400 bg-opacity-40 hover:bg-gray-700 hover:text-white duration-300'>
-        <FontAwesomeIcon icon={faAngleDoubleLeft} className='mr-1' />{prev.title}
+        <i className='mr-1 fas fa-angle-double-left' />{prev.title}
       </a>
     </Link>
     <Link href={`/article/${next.slug}`} passHref>
       <a className='text-sm  cursor-pointer justify-center items-center flex w-full h-full bg-gray-400 bg-opacity-40 hover:bg-gray-700 hover:text-white duration-300'>{next.title}
-        <FontAwesomeIcon icon={faAngleDoubleRight} className='ml-1 my-1' />
+        <i className='ml-1 my-1 fas fa-angle-double-right' />
       </a>
     </Link>
   </section>
diff --git a/themes/Fukasawa/components/ArticleDetail.js b/themes/Fukasawa/components/ArticleDetail.js
index cdc46ff7..7974d413 100644
--- a/themes/Fukasawa/components/ArticleDetail.js
+++ b/themes/Fukasawa/components/ArticleDetail.js
@@ -1,8 +1,6 @@
 import Comment from '@/components/Comment'
 import formatDate from '@/lib/formatDate'
 import { useGlobal } from '@/lib/global'
-import { faEye, faFolderOpen } from '@fortawesome/free-solid-svg-icons'
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import mediumZoom from 'medium-zoom'
 import Link from 'next/link'
 import 'prismjs'
@@ -64,7 +62,7 @@ export default function ArticleDetail ({ post, recommendPosts, prev, next }) {
             <div>
               <Link href={`/category/${post.category}`} passHref>
                 <a className="cursor-pointer text-md mr-2 hover:text-black dark:hover:text-white border-b dark:border-gray-500 border-dashed">
-                  <FontAwesomeIcon icon={faFolderOpen} className="mr-1" />
+                  <i className="mr-1 fas fa-folder-open" />
                   {post.category}
                 </a>
               </Link>
@@ -83,7 +81,7 @@ export default function ArticleDetail ({ post, recommendPosts, prev, next }) {
               </>)}
 
               <div className="hidden busuanzi_container_page_pv font-light mr-2">
-                <FontAwesomeIcon icon={faEye} className='mr-1'/>
+                <i className='mr-1 fas fa-eye'/>
                 &nbsp;
                 <span className="mr-2 busuanzi_value_page_pv"/>
                 <span className='mr-2'>|</span>
diff --git a/themes/Fukasawa/components/AsideLeft.js b/themes/Fukasawa/components/AsideLeft.js
index 79aaed1c..2f668d43 100644
--- a/themes/Fukasawa/components/AsideLeft.js
+++ b/themes/Fukasawa/components/AsideLeft.js
@@ -6,14 +6,15 @@ import GroupTag from './GroupTag'
 import SearchInput from './SearchInput'
 import SiteInfo from './SiteInfo'
 
-function AsideLeft ({ tags, currentTag, categories, currentCategory }) {
+function AsideLeft (props) {
+  const { tags, currentTag, categories, currentCategory } = props
   return <div className='w-72 bg-white min-h-screen px-10 py-14 hidden lg:block'>
 
     <Logo />
 
     <section className='flex flex-col text-gray-600'>
       <hr className='w-12 my-8' />
-      <GroupMenu/>
+      <GroupMenu {...props}/>
     </section>
 
     <section className='flex flex-col text-gray-600'>
diff --git a/themes/Fukasawa/components/GroupCategory.js b/themes/Fukasawa/components/GroupCategory.js
index 8e17fd5e..3dd437d8 100644
--- a/themes/Fukasawa/components/GroupCategory.js
+++ b/themes/Fukasawa/components/GroupCategory.js
@@ -1,5 +1,3 @@
-import { faFolder, faFolderOpen } from '@fortawesome/free-solid-svg-icons'
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import Link from 'next/link'
 import React from 'react'
 
@@ -17,7 +15,7 @@ function GroupCategory ({ currentCategory, categories }) {
             ? 'hover:text-white dark:hover:text-white bg-gray-600 text-white '
             : 'dark:text-gray-400 text-gray-500 hover:text-white hover:bg-gray-500 dark:hover:text-white') +
             '  text-sm w-full items-center duration-300 px-2  cursor-pointer py-1 font-light'}>
-            <FontAwesomeIcon icon={selected ? faFolderOpen : faFolder} className={`${selected ? 'text-white' : 'text-gray-400'} mr-2`} />{category}({categories[category]})
+            <i className={`${selected ? 'text-white fa-folder-open' : 'fa-folder text-gray-400'} fas mr-2`} />{category}({categories[category]})
             </a>
         </Link>
       })}
diff --git a/themes/Fukasawa/components/GroupMenu.js b/themes/Fukasawa/components/GroupMenu.js
index 4b97583d..79fccdef 100644
--- a/themes/Fukasawa/components/GroupMenu.js
+++ b/themes/Fukasawa/components/GroupMenu.js
@@ -4,22 +4,26 @@ import { useRouter } from 'next/router'
 import { useGlobal } from '@/lib/global'
 import CONFIG_FUKA from '../config_fuka'
 
-function GroupMenu () {
+function GroupMenu ({ customNav }) {
   const { locale } = useGlobal()
   const router = useRouter()
 
-  const links = [
-    { id: 0, name: locale.NAV.INDEX, to: '/' || '/', show: true },
-    { id: 1, name: locale.COMMON.CATEGORY, to: '/category', show: CONFIG_FUKA.MENU_CATEGORY },
-    { id: 2, name: locale.COMMON.TAGS, to: '/tag', show: CONFIG_FUKA.MENU_TAG },
-    { id: 3, name: locale.NAV.ARCHIVE, to: '/archive', show: CONFIG_FUKA.MENU_ARCHIVE },
-    { id: 4, name: locale.NAV.ABOUT, to: '/about', show: CONFIG_FUKA.MENU_ABOUT }
+  let links = [
+    { name: locale.NAV.INDEX, to: '/' || '/', show: true },
+    { name: locale.COMMON.CATEGORY, to: '/category', show: CONFIG_FUKA.MENU_CATEGORY },
+    { name: locale.COMMON.TAGS, to: '/tag', show: CONFIG_FUKA.MENU_TAG },
+    { name: locale.NAV.ARCHIVE, to: '/archive', show: CONFIG_FUKA.MENU_ARCHIVE }
   ]
+
+  if (customNav) {
+    links = links.concat(customNav)
+  }
+
   return <nav id='nav' className='font-sans text-sm'>
       {links.map(link => {
         if (link.show) {
           const selected = (router.pathname === link.to) || (router.asPath === link.to)
-          return <Link key={`${link.id}-${link.to}`} title={link.to} href={link.to} >
+          return <Link key={`${link.to}`} title={link.to} href={link.to} >
           <a className={'py-0.5 duration-500 justify-between text-gray-500 hover:text-black cursor-pointer flex flex-nowrap items-center ' +
               (selected ? 'text-black' : ' ')} >
               <div className='my-auto items-center justify-center flex '>
diff --git a/themes/Fukasawa/components/SearchInput.js b/themes/Fukasawa/components/SearchInput.js
index a91cd46a..7a7c4aba 100644
--- a/themes/Fukasawa/components/SearchInput.js
+++ b/themes/Fukasawa/components/SearchInput.js
@@ -1,7 +1,5 @@
 import { useRouter } from 'next/router'
 import { useImperativeHandle, useRef, useState } from 'react'
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import { faSearch, faSpinner, faTimes } from '@fortawesome/free-solid-svg-icons'
 
 const SearchInput = ({ currentTag, currentSearch, cRef }) => {
   const [searchKey, setSearchKey] = useState(currentSearch || '')
@@ -54,12 +52,12 @@ const SearchInput = ({ currentTag, currentSearch, cRef }) => {
 
     <div className='-ml-8 cursor-pointer dark:bg-gray-600 dark:hover:bg-gray-800 float-right items-center justify-center py-2'
       onClick={() => { handleSearch(searchKey) }}>
-        <FontAwesomeIcon spin={onLoading} icon={onLoading ? faSpinner : faSearch} className='hover:text-black transform duration-200 text-gray-500 cursor-pointer' />
+        <i className={`hover:text-black transform duration-200 text-gray-500 cursor-pointer fas ${onLoading ? 'fa-spinner animate-spin' : 'fa-search'}`} />
     </div>
 
     {(searchKey && searchKey.length &&
       <div className='-ml-12 cursor-pointer dark:bg-gray-600 dark:hover:bg-gray-800 float-right items-center justify-center py-2'>
-        <FontAwesomeIcon icon={faTimes} className='hover:text-black transform duration-200 text-gray-400 cursor-pointer' onClick={cleanSearch} />
+        <i className='hover:text-black transform duration-200 text-gray-400 cursor-pointer fas fa-times' onClick={cleanSearch} />
       </div>
       )}
   </div>
diff --git a/themes/Fukasawa/components/SiteInfo.js b/themes/Fukasawa/components/SiteInfo.js
index 9b4990e2..4fa0991f 100644
--- a/themes/Fukasawa/components/SiteInfo.js
+++ b/themes/Fukasawa/components/SiteInfo.js
@@ -1,6 +1,4 @@
 import BLOG from '@/blog.config'
-import { faEye, faShieldAlt, faUsers } from '@fortawesome/free-solid-svg-icons'
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 
 function SiteInfo ({ title }) {
   const d = new Date()
@@ -14,10 +12,10 @@ function SiteInfo ({ title }) {
 
                 <span>Powered by  <a href='https://github.com/tangly1024/NotionNext' className='underline font-bold text-gray-500 dark:text-gray-300'>NotionNext</a>.</span><br /></span>
 
-            {BLOG.BEI_AN && <><FontAwesomeIcon icon={faShieldAlt} /> <a href='https://beian.miit.gov.cn/' className='mr-2'>{BLOG.BEI_AN}</a><br/></>}
+            {BLOG.BEI_AN && <><i className='fas fa-shield-alt' /> <a href='https://beian.miit.gov.cn/' className='mr-2'>{BLOG.BEI_AN}</a><br/></>}
 
-            <span className='hidden busuanzi_container_site_pv'> <FontAwesomeIcon icon={faEye} /><span className='px-1 busuanzi_value_site_pv'> </span>  </span>
-            <span className='pl-2 hidden busuanzi_container_site_uv'> <FontAwesomeIcon icon={faUsers} /> <span className='px-1 busuanzi_value_site_uv'> </span> </span>
+            <span className='hidden busuanzi_container_site_pv'> <i className='fas fa-eye' /><span className='px-1 busuanzi_value_site_pv'> </span>  </span>
+            <span className='pl-2 hidden busuanzi_container_site_uv'> <i className='fas fa-users' /> <span className='px-1 busuanzi_value_site_uv'> </span> </span>
             <br />
             <h1>{title}</h1>
         </footer>
diff --git a/themes/Fukasawa/components/TagItem.js b/themes/Fukasawa/components/TagItem.js
index d972e0cd..ef1139b5 100644
--- a/themes/Fukasawa/components/TagItem.js
+++ b/themes/Fukasawa/components/TagItem.js
@@ -1,5 +1,3 @@
-import { faTag } from '@fortawesome/free-solid-svg-icons'
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import Link from 'next/link'
 import React from 'react'
 import { useGlobal } from '@/lib/global'
@@ -16,7 +14,7 @@ const TagItem = ({ tag, selected }) => {
       duration-200 mr-1 my-1 px-2 py-1 text-sm whitespace-nowrap 
        hover:bg-gray-200 dark:hover:bg-gray-800 `}>
       <div className='text-gray-600 dark:text-gray-300 dark:hover:text-white'>
-        {selected && <FontAwesomeIcon icon={faTag} className='mr-1'/>} {`${tag.name} `} {tag.count ? `(${tag.count})` : ''}
+        {selected && <i className='mr-1 fas fa-tag'/>} {`${tag.name} `} {tag.count ? `(${tag.count})` : ''}
       </div>
     </li>
   </Link>
diff --git a/themes/Fukasawa/components/TagItemMini.js b/themes/Fukasawa/components/TagItemMini.js
index 9fec9e35..fb9efc58 100644
--- a/themes/Fukasawa/components/TagItemMini.js
+++ b/themes/Fukasawa/components/TagItemMini.js
@@ -1,5 +1,3 @@
-import { faTag } from '@fortawesome/free-solid-svg-icons'
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import Link from 'next/link'
 
 const TagItemMini = ({ tag, selected = false }) => {
@@ -9,7 +7,7 @@ const TagItemMini = ({ tag, selected = false }) => {
        ${selected
       ? 'text-white dark:text-gray-300 bg-black dark:bg-black dark:hover:bg-gray-900'
       : `text-gray-600 hover:shadow-xl dark:border-gray-400 notion-${tag.color}_background dark:bg-gray-800`}` }>
-    <div className='font-light dark:text-gray-400'>{selected && <FontAwesomeIcon icon={faTag} className='mr-1'/>} {tag.name + (tag.count ? `(${tag.count})` : '')} </div>
+    <div className='font-light dark:text-gray-400'>{selected && <i className='mr-1 fas fa-tag'/>} {tag.name + (tag.count ? `(${tag.count})` : '')} </div>
     </a>
   </Link>
 }
diff --git a/themes/Fukasawa/components/TopNav.js b/themes/Fukasawa/components/TopNav.js
index f3e196aa..0adf1a63 100644
--- a/themes/Fukasawa/components/TopNav.js
+++ b/themes/Fukasawa/components/TopNav.js
@@ -1,5 +1,3 @@
-import { faBars, faTimes } from '@fortawesome/free-solid-svg-icons'
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { useState } from 'react'
 import Collapse from './Collapse'
 import GroupMenu from './GroupMenu'
@@ -10,7 +8,7 @@ import Logo from './Logo'
  * @param {*} param0
  * @returns
  */
-const TopNav = ({ tags, currentTag, categories, currentCategory, postCount }) => {
+const TopNav = (props) => {
   const [isOpen, changeShow] = useState(false)
 
   const toggleMenuOpen = () => {
@@ -23,23 +21,21 @@ const TopNav = ({ tags, currentTag, categories, currentCategory, postCount }) =>
     <div id='sticky-nav' className={'lg:relative w-full top-0 z-20 transform duration-500'}>
       <Collapse isOpen={isOpen}>
         <div className='bg-white py-1 px-5'>
-          <GroupMenu/>
+          <GroupMenu {...props}/>
           </div>
       </Collapse>
       <div className='w-full flex justify-between items-center p-4 bg-white'>
         {/* 左侧LOGO 标题 */}
         <div className='flex flex-none flex-grow-0'>
-        <Logo/>
-
+          <Logo/>
         </div>
-
         <div className='flex'>
         </div>
 
         {/* 右侧功能 */}
         <div className='mr-1 flex justify-end items-center text-sm space-x-4 font-serif dark:text-gray-200'>
           <div onClick={toggleMenuOpen} className='w-18 cursor-pointer'>
-           菜单 { isOpen ? <FontAwesomeIcon icon={faTimes} size={'lg'}/> : <FontAwesomeIcon icon={faBars} size={'lg'}/> }
+           菜单 { isOpen ? <i className='fas fa-times'/> : <i className='fas fa-bars'/> }
             </div>
         </div>
       </div>
diff --git a/themes/index.js b/themes/index.js
index 5acc65dd..13b192e4 100644
--- a/themes/index.js
+++ b/themes/index.js
@@ -4,6 +4,6 @@
 
 // export * from './Empty' //  空主题
 // export * from './NEXT'
-// export * from './Fukasawa'
-export * from './Hexo'
+export * from './Fukasawa'
+// export * from './Hexo'
 // export * from './Medium'