Merge branch 'main' into feat/theme-landing-2

lib/notion/getNotionData.js

@@ -106,7 +106,7 @@ export async function getNotionPageData({ pageId, from }) {
   const cacheKey = 'page_block_' + pageId
   const data = await getDataFromCache(cacheKey)
   if (data && data.pageIds?.length > 0) {
-    console.log('[缓存]:', `from:${from}`, `root-page-id:${pageId}`)
+    console.log('[API<<--缓存]', `from:${from}`, `root-page-id:${pageId}`)
     return data
   }
   const db = await getDataBaseInfoByNotionAPI({ pageId, from })

lib/notion/getPostBlocks.js

@@ -14,7 +14,7 @@ export async function getPostBlocks(id, from, slice) {
   const cacheKey = 'page_block_' + id
   let pageBlock = await getDataFromCache(cacheKey)
   if (pageBlock) {
-    console.log('[缓存]:', `from:${from}`, cacheKey)
+    console.log('[API<<--缓存]', `from:${from}`, cacheKey)
     return filterPostBlocks(id, pageBlock, slice)
   }
 
@@ -31,7 +31,7 @@ export async function getSingleBlock(id, from) {
   const cacheKey = 'single_block_' + id
   let pageBlock = await getDataFromCache(cacheKey)
   if (pageBlock) {
-    console.log('[缓存]:', `from:${from}`, cacheKey)
+    console.log('[API<<--缓存]', `from:${from}`, cacheKey)
     return pageBlock
   }
 

next.config.js

@@ -8,7 +8,7 @@ const withBundleAnalyzer = require('@next/bundle-analyzer')({
 })
 
 /**
- * 扫描指定目录下的文件夹名，用于获取当前有几个主题
+ * 扫描指定目录下的文件夹名，用于获取所有主题
  * @param {*} directory
  * @returns
  */
@@ -21,6 +21,8 @@ function scanSubdirectories(directory) {
     if (stats.isDirectory()) {
       subdirectories.push(file)
     }
+
+    // subdirectories.push(file)
   })
 
   return subdirectories

themes/gitbook/components/NavPostList.js

@@ -20,7 +20,7 @@ const NavPostList = (props) => {
 
     let existingGroup = null
     // 开启自动分组排序
-    if (JSON.parse(siteConfig('GITBOOK_AUTO_SORT', true, CONFIG))) {
+    if (siteConfig('GITBOOK_AUTO_SORT', true, CONFIG)) {
       existingGroup = groups.find(group => group.category === categoryName) // 搜索同名的最后一个分组
     } else {
       existingGroup = groups[groups.length - 1] // 获取最后一个分组

themes/gitbook/components/SearchInput.js

@@ -1,11 +1,15 @@
 import { useImperativeHandle, useRef, useState } from 'react'
 import { deepClone } from '@/lib/utils'
 import { useGitBookGlobal } from '@/themes/gitbook'
+import { siteConfig } from '@/lib/config'
 let lock = false
 
+/**
+ * 搜索栏
+ */
 const SearchInput = ({ currentSearch, cRef, className }) => {
   const searchInputRef = useRef()
-  const { setFilteredNavPages, allNavPages } = useGitBookGlobal()
+  const { searchModal, setFilteredNavPages, allNavPages } = useGitBookGlobal()
 
   useImperativeHandle(cRef, () => {
     return {
@@ -16,6 +20,10 @@ const SearchInput = ({ currentSearch, cRef, className }) => {
   })
 
   const handleSearch = () => {
+    // 使用Algolia
+    if (siteConfig('ALGOLIA_APP_ID')) {
+      searchModal?.current?.openSearch()
+    }
     let keyword = searchInputRef.current.value
     if (keyword) {
       keyword = keyword.trim()
@@ -23,20 +31,7 @@ const SearchInput = ({ currentSearch, cRef, className }) => {
       setFilteredNavPages(allNavPages)
     }
     const filterAllNavPages = deepClone(allNavPages)
-    // for (const filterGroup of filterAllNavPages) {
+
-    //   for (let i = filterGroup.items.length - 1; i >= 0; i--) {
-    //     const post = filterGroup.items[i]
-    //     const articleInfo = post.title + ''
-    //     const hit = articleInfo.toLowerCase().indexOf(keyword.toLowerCase()) > -1
-    //     if (!hit) {
-    //       // 删除
-    //       filterGroup.items.splice(i, 1)
-    //     }
-    //   }
-    //   if (filterGroup.items && filterGroup.items.length > 0) {
-    //     filterPosts.push(filterGroup)
-    //   }
-    // }
     for (let i = filterAllNavPages.length - 1; i >= 0; i--) {
       const post = filterAllNavPages[i]
       const articleInfo = post.title + ''
@@ -56,6 +51,12 @@ const SearchInput = ({ currentSearch, cRef, className }) => {
    * @param {*} e
    */
   const handleKeyUp = (e) => {
+    // 使用Algolia
+    if (siteConfig('ALGOLIA_APP_ID')) {
+      searchModal?.current?.openSearch()
+      return
+    }
+
     if (e.keyCode === 13) { // 回车
       handleSearch(searchInputRef.current.value)
     } else if (e.keyCode === 27) { // ESC
@@ -63,6 +64,13 @@ const SearchInput = ({ currentSearch, cRef, className }) => {
     }
   }
 
+  const handleFocus = () => {
+    // 使用Algolia
+    if (siteConfig('ALGOLIA_APP_ID')) {
+      searchModal?.current?.openSearch()
+    }
+  }
+
   /**
    * 清理搜索
    */
@@ -77,7 +85,6 @@ const SearchInput = ({ currentSearch, cRef, className }) => {
       return
     }
     searchInputRef.current.value = val
-
     if (val) {
       setShowClean(true)
     } else {
@@ -97,6 +104,7 @@ const SearchInput = ({ currentSearch, cRef, className }) => {
       ref={searchInputRef}
       type='text'
       className={`${className} outline-none w-full text-sm pl-2 transition focus:shadow-lg font-light leading-10 text-black bg-gray-100 dark:bg-gray-900 dark:text-white`}
+      onFocus={handleFocus}
       onKeyUp={handleKeyUp}
       onCompositionStart={lockSearchInput}
       onCompositionUpdate={lockSearchInput}
@@ -111,7 +119,7 @@ const SearchInput = ({ currentSearch, cRef, className }) => {
     </div>
 
     {(showClean &&
-      <div className='-ml-12 cursor-pointer float-right items-center justify-center py-2'>
+      <div className='-ml-12 cursor-pointer flex float-right items-center justify-center py-2'>
         <i className='fas fa-times hover:text-black transform duration-200 text-gray-400 cursor-pointer   dark:hover:text-gray-300' onClick={cleanSearch} />
       </div>
       )}

themes/gitbook/components/TopNavBar.js

@@ -39,7 +39,7 @@ export default function TopNavBar(props) {
   }
 
   return (
-        <div id='top-nav' className={'fixed top-0 w-full z-40 ' + className}>
+        <div id='top-nav' className={'fixed top-0 w-full ' + className}>
 
             {/* 移动端折叠菜单 */}
             <Collapse type='vertical' collapseRef={collapseRef} isOpen={isOpen} className='md:hidden'>

themes/gitbook/index.js

@@ -2,7 +2,7 @@
 
 import CONFIG from './config'
 import { useRouter } from 'next/router'
-import { useEffect, useState, createContext, useContext } from 'react'
+import { useEffect, useState, createContext, useContext, useRef } from 'react'
 import { isBrowser } from '@/lib/utils'
 import Footer from './components/Footer'
 import InfoCard from './components/InfoCard'
@@ -35,6 +35,7 @@ import dynamic from 'next/dynamic'
 import { siteConfig } from '@/lib/config'
 import NotionIcon from '@/components/NotionIcon'
 import { LAYOUT_MAPPINGS } from '@/blog.config'
+import AlgoliaSearchModal from '@/components/AlgoliaSearchModal'
 const WWAds = dynamic(() => import('@/components/WWAds'), { ssr: false })
 
 // 主题全局变量
@@ -56,16 +57,19 @@ const LayoutBase = (props) => {
   const [filteredNavPages, setFilteredNavPages] = useState(allNavPages)
 
   const showTocButton = post?.toc?.length > 1
+  const searchModal = useRef(null)
 
   useEffect(() => {
     setFilteredNavPages(allNavPages)
   }, [post])
 
   return (
-        <ThemeGlobalGitbook.Provider value={{ tocVisible, changeTocVisible, filteredNavPages, setFilteredNavPages, allNavPages, pageNavVisible, changePageNavVisible }}>
+        <ThemeGlobalGitbook.Provider value={{ searchModal, tocVisible, changeTocVisible, filteredNavPages, setFilteredNavPages, allNavPages, pageNavVisible, changePageNavVisible }}>
             <Style/>
 
             <div id='theme-gitbook' className='bg-white dark:bg-hexo-black-gray w-full h-full min-h-screen justify-center dark:text-gray-300'>
+                <AlgoliaSearchModal cRef={searchModal} {...props}/>
+
                 {/* 顶部导航栏 */}
                 <TopNavBar {...props} />
 

themes/heo/components/SideRight.js

@@ -38,6 +38,8 @@ export default function SideRight(props) {
             <InfoCard {...props} className='w-72' />
 
             <div className='sticky top-20 space-y-4'>
+
+                {/* 文章页显示目录 */}
                 {post && post.toc && post.toc.length > 0 && (
                     <Card className='bg-white dark:bg-[#1e1e1e]'>
                         <Catalog toc={post.toc} />

themes/heo/index.js

@@ -328,7 +328,10 @@ const LayoutSlug = props => {
               ? null
               : <div className={`${commentEnable && post ? '' : 'hidden'}`}>
                 <hr className="my-4 border-dashed" />
-
+                {/* 评论区上方广告 */}
+                <div className="py-2">
+                    <AdSlot />
+                </div>
                 {/* 评论互动 */}
                 <div className="duration-200 overflow-x-auto px-5">
                   <div className="text-2xl dark:text-white">
@@ -336,9 +339,6 @@ const LayoutSlug = props => {
                     {locale.COMMON.COMMENTS}
                   </div>
                   <Comment frontMatter={post} className="" />
-                  <div className="py-2">
-                    <AdSlot />
-                  </div>
                 </div>
               </div>}
           </div>