Merge branch 'main' of https://github.com/tangly1024/NotionNext

anxinweb · Nov 28, 2024 · b817e0e · b817e0e
2 parents 051f933 + ffe78a5
commit b817e0e
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 18 deletions.
diff --git a/themes/gitbook/index.js b/themes/gitbook/index.js
@@ -15,6 +15,7 @@ import { isBrowser } from '@/lib/utils'
 import { getShortId } from '@/lib/utils/pageId'
 import { SignIn, SignUp } from '@clerk/nextjs'
 import dynamic from 'next/dynamic'
+import Head from 'next/head'
 import Link from 'next/link'
 import { useRouter } from 'next/router'
 import { createContext, useContext, useEffect, useRef, useState } from 'react'
@@ -305,8 +306,16 @@ const LayoutPostList = props => {
  * @returns
  */
 const LayoutSlug = props => {
-  const { post, prev, next, lock, validPassword } = props
+  const { post, prev, next, siteInfo, lock, validPassword } = props
   const router = useRouter()
+  // 如果是文档首页文章，则修改浏览器标签
+  const index = siteConfig('GITBOOK_INDEX_PAGE', 'about', CONFIG)
+  const basePath = router.asPath.split('?')[0]
+  const title =
+    basePath?.indexOf(index) > 0
+      ? `${post?.title} | ${siteInfo?.description}`
+      : `${post?.title} | ${siteInfo?.title}`
+
   useEffect(() => {
     // 404
     if (!post) {
@@ -329,6 +338,10 @@ const LayoutSlug = props => {
   }, [post])
   return (
     <>
+      <Head>
+        <title>{title}</title>
+      </Head>
+
       {/* 文章锁 */}
       {lock && <ArticleLock validPassword={validPassword} />}
 
@@ -574,17 +587,18 @@ const LayoutDashboard = props => {
 }
 
 export {
-  Layout404,
-  LayoutArchive,
-  LayoutBase,
-  LayoutCategoryIndex,
-  LayoutDashboard,
-  LayoutIndex,
-  LayoutPostList,
-  LayoutSearch,
-  LayoutSignIn,
-  LayoutSignUp,
-  LayoutSlug,
-  LayoutTagIndex,
-  CONFIG as THEME_CONFIG
+    Layout404,
+    LayoutArchive,
+    LayoutBase,
+    LayoutCategoryIndex,
+    LayoutDashboard,
+    LayoutIndex,
+    LayoutPostList,
+    LayoutSearch,
+    LayoutSignIn,
+    LayoutSignUp,
+    LayoutSlug,
+    LayoutTagIndex,
+    CONFIG as THEME_CONFIG
 }
+
diff --git a/themes/magzine/components/PostGroupArchive.js b/themes/magzine/components/PostGroupArchive.js
@@ -22,11 +22,11 @@ const PostGroupArchive = ({ posts = [], archiveTitle }) => {
       </div>
 
       {/* 列表 */}
-      <ul className='grid grid-cols-1 lg:grid-cols-4 gap-4'>
+      <div className='grid grid-cols-1 lg:grid-cols-4 gap-4'>
         {posts?.map((p, index) => {
           return <PostItemCard key={index} post={p} />
         })}
-      </ul>
+      </div>
     </div>
   )
 }

diff --git a/themes/magzine/components/PostListHorizontal.js b/themes/magzine/components/PostListHorizontal.js
@@ -32,11 +32,11 @@ const PostListHorizontal = ({ title, href, posts, hasBg }) => {
           )}
         </div>
         {/* 列表 */}
-        <ul className='hidden lg:grid grid-cols-1 lg:grid-cols-4 gap-4'>
+        <div className='hidden lg:grid grid-cols-1 lg:grid-cols-4 gap-4'>
           {posts?.map((p, index) => {
             return <PostItemCard key={index} post={p} />
           })}
-        </ul>
+        </div>
         <div className='block lg:hidden px-2'>
           <Swiper posts={posts} />
           {href && (