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

wensley · Dec 3, 2024 · 7b9c304 · 7b9c304
2 parents 30085ed + dc0a8d8
commit 7b9c304
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/lib/config.js b/lib/config.js
@@ -38,6 +38,12 @@ export const siteConfig = (key, defaultVal = null, extendConfig = {}) => {
     case 'TAG_SORT_BY_COUNT':
     case 'THEME':
     case 'LINK':
+      // LINK比较特殊，
+      if (key === 'LINK') {
+        if (!extendConfig || Object.keys(extendConfig).length === 0) {
+          break
+        }
+      }
       return convertVal(
         getValue(extendConfig[key], getValue(defaultVal, BLOG[key]))
       )

diff --git a/pages/category/index.js b/pages/category/index.js
@@ -10,7 +10,9 @@ import { DynamicLayout } from '@/themes/theme'
  */
 export default function Category(props) {
   const theme = siteConfig('THEME', BLOG.THEME, props.NOTION_CONFIG)
-  return <DynamicLayout theme={theme} layoutName='LayoutPostList' {...props} />
+  return (
+    <DynamicLayout theme={theme} layoutName='LayoutCategoryIndex' {...props} />
+  )
 }
 
 export async function getStaticProps({ locale }) {

diff --git a/pages/sitemap.xml.js b/pages/sitemap.xml.js
@@ -17,7 +17,11 @@ export const getServerSideProps = async ctx => {
       pageId: id,
       from: 'sitemap.xml'
     })
-    const link = siteConfig('LINK', '', siteData.NOTION_CONFIG)
+    const link = siteConfig(
+      'LINK',
+      siteData?.siteInfo?.link,
+      siteData.NOTION_CONFIG
+    )
     const localeFields = generateLocalesSitemap(link, siteData.allPages, locale)
     fields = fields.concat(localeFields)
   }

diff --git a/pages/tag/index.js b/pages/tag/index.js
@@ -12,7 +12,7 @@ import { useRouter } from 'next/router'
 const TagIndex = props => {
   const router = useRouter()
   const theme = siteConfig('THEME', BLOG.THEME, props.NOTION_CONFIG)
-  return <DynamicLayout theme={theme} layoutName='LayoutPostList' {...props} />
+  return <DynamicLayout theme={theme} layoutName='LayoutTagIndex' {...props} />
 }
 
 export async function getStaticProps(req) {

diff --git a/themes/gitbook/components/BottomMenuBar.js b/themes/gitbook/components/BottomMenuBar.js
@@ -28,7 +28,7 @@ export default function BottomMenuBar({ post, className }) {
           onClick={togglePageNavVisible}
           className='inline-flex flex-col items-center justify-center px-5 border-gray-200 border-x hover:bg-gray-50 dark:hover:bg-gray-800 group dark:border-gray-600'>
           <i className='fa-book fas w-5 h-5 mb-2 text-gray-500 dark:text-gray-400 group-hover:text-gray-600 dark:group-hover:text-gray-500' />
-          <span class='text-sm text-gray-500 dark:text-gray-400 group-hover:text-gray-600 dark:group-hover:text-gray-500'>
+          <span className='text-sm text-gray-500 dark:text-gray-400 group-hover:text-gray-600 dark:group-hover:text-gray-500'>
             {locale.COMMON.ARTICLE_LIST}
           </span>
         </button>