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

laye0619 · Apr 13, 2024 · 69617e8 · 69617e8
2 parents 496732e + c91a2e0
commit 69617e8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/lib/db/getSiteData.js b/lib/db/getSiteData.js
@@ -9,6 +9,7 @@ import { getPostBlocks, getSingleBlock } from '@/lib/notion/getPostBlocks'
 import { compressImage, mapImgUrl } from '@/lib/notion/mapImage'
 import { deepClone } from '@/lib/utils'
 import { idToUuid } from 'notion-utils'
+import { siteConfig } from '../config'
 import { extractLangId, extractLangPrefix } from '../utils/pageId'
 
 export { getAllTags } from '../notion/getAllTags'
@@ -181,7 +182,7 @@ function getCustomNav({ allPages }) {
  * @param {*} allPages
  * @returns
  */
-function getCustomMenu({ collectionData }) {
+function getCustomMenu({ collectionData, NOTION_CONFIG }) {
   const menuPages = collectionData.filter(
     post =>
       post.status === 'Published' &&
@@ -192,7 +193,10 @@ function getCustomMenu({ collectionData }) {
   if (menuPages && menuPages.length > 0) {
     menuPages.forEach(e => {
       e.show = true
-      if (e?.slug?.indexOf('http') === 0 && e?.slug?.indexOf(BLOG.LINK) < 0) {
+      if (
+        e?.slug?.indexOf('http') === 0 &&
+        e?.slug?.indexOf(siteConfig('LINK', BLOG.LINK, NOTION_CONFIG)) < 0
+      ) {
         e.target = '_blank'
         e.to = e.slug
       } else {
@@ -508,7 +512,7 @@ async function getDataBaseInfoByNotionAPI({ pageId, from }) {
     )
   })
   // 新的菜单
-  const customMenu = await getCustomMenu({ collectionData })
+  const customMenu = await getCustomMenu({ collectionData, NOTION_CONFIG })
   const latestPosts = getLatestPosts({ allPages, from, latestPostCount: 6 })
   const allNavPages = getNavPages({ allPages })
 

diff --git a/themes/game/components/Header.js b/themes/game/components/Header.js
@@ -10,7 +10,7 @@ export default function Header(props) {
   const { setSideBarVisible } = useGameGlobal()
   return (
     <header className='z-20'>
-      <div className='w-full h-16 rounded-md bg-white shadow-md hover:shadow-xl transition-shadow duration-200 dark:bg-[#1F2030] flex justify-between items-center px-4'>
+      <div className='w-full py-2 rounded-md bg-white shadow-md hover:shadow-xl transition-shadow duration-200 dark:bg-[#1F2030] flex justify-between items-center px-4'>
         <Logo siteInfo={siteInfo} />
 
         <button