NAV主题

next.config.js

@@ -91,6 +91,12 @@ module.exports = withBundleAnalyzer({
     //   })
     // }
 
+    // 排除所有后缀名为 .md 的文件的编译
+    config.module.rules.push({
+      test: /\.md$/,
+      use: 'raw-loader'
+    });
+
     // 动态主题：添加 resolve.alias 配置，将动态路径映射到实际路径
     config.resolve.alias['@theme-components'] = path.resolve(__dirname, 'themes', THEME)
     return config

themes/heo/README.md

@@ -0,0 +1,7 @@
+# HEO 主题说明
+
+> 主题设计者 [张洪](https://zhheo.com/)
+> 主题开发者 [tangly1024](https://github.com/tangly1024)
+ 
+1. 开启方式 在blog.config.js 将主题配置为 `HEO`
+2. 更多说明参考此[文档](https://docs.tangly1024.com/article/notionnext-heo)

themes/nav/README.md

@@ -0,0 +1,5 @@
+# NAV 主题说明
+
+> 主题开发者 [emengweb](https://github.com/emengweb)
+ 
+1. 开启方式 在blog.config.js 将主题配置为 `NAV`

themes/nav/components/LogoBar.js

@@ -1,6 +1,4 @@
 import BLOG from '@/blog.config'
-import LazyImage from '@/components/LazyImage'
-import { useNavGlobal } from '@/themes/nav'
 import Link from 'next/link'
 import CONFIG from '../config'
 
@@ -11,23 +9,15 @@ import CONFIG from '../config'
  */
 export default function LogoBar(props) {
   const { siteInfo } = props
-  const { pageNavVisible, changePageNavVisible } = useNavGlobal()
-  // const logo = siteInfo?.icon?.replaceAll("width=400", "width=280")
 
-  const togglePageNavVisible = () => {
-    changePageNavVisible(!pageNavVisible)
-  }
   return (
         <div id='top-wrapper' className='w-full flex items-center'>
-            {/* <div onClick={togglePageNavVisible} className='cursor-pointer md:hidden text-xl pr-3 hover:scale-110 duration-150'>
-                <i className={`fa-solid ${pageNavVisible ? 'fa-align-justify' : 'fa-indent'}`}></i>
-            </div> */}
-            <div className='md:w-48'>
-              <a href='/' className='grid justify-items-center text-md md:text-xl dark:text-gray-200'>
-                  <img src={siteInfo?.icon?.replaceAll("width=400", "width=280")} height='44px' alt={BLOG.AUTHOR + ' - ' + BLOG.NEXT_PUBLIC_BIO} className='md:block' placeholderSrc=''/>
-                  {CONFIG.SHOW_TITLE_TEXT && siteInfo?.title}
-              </a>
-            </div>
+                <Link href='/' className='md:w-48 grid justify-items-center text-md md:text-xl dark:text-gray-200'>
+                    {/* eslint-disable-next-line @next/next/no-img-element */}
+                    <img src={siteInfo?.icon?.replaceAll('width=400', 'width=280')}
+                        height='44px' alt={BLOG.AUTHOR + ' - ' + BLOG.NEXT_PUBLIC_BIO} className='md:block transition-all hover:scale-110 duration-150' placeholderSrc='' />
+                    {CONFIG.SHOW_TITLE_TEXT && siteInfo?.title}
+                </Link>
         </div>
   )
 }

themes/nav/components/MenuBarMobile.js

@@ -4,6 +4,11 @@ import CONFIG from '../config'
 import BLOG from '@/blog.config'
 import { MenuItemCollapse } from './MenuItemCollapse'
 
+/**
+ * 移动端菜单栏
+ * @param {*} props
+ * @returns
+ */
 export const MenuBarMobile = (props) => {
   const { customMenu, customNav } = props
   const { locale } = useGlobal()

themes/nav/components/MenuItem.js

@@ -1,84 +1,64 @@
 import Link from 'next/link'
 import { useState } from 'react'
-import { useRouter } from 'next/router'
 import Collapse from './Collapse'
 
+/**
+ * 菜单
+ * @param {} param0
+ * @returns
+ */
 export const MenuItem = ({ link }) => {
-  const [show, changeShow] = useState(false)
-  //   const show = true
-  //   const changeShow = () => {}
-  const router = useRouter()
-
-  if (!link || !link.show) {
-    return null
-  }
-  const hasSubMenu = link?.subMenus?.length > 0
-  const selected = (router.pathname === link.to) || (router.asPath === link.to)
-
   link.selected = true
 
-//   const { group } = props
   const [isOpen, changeIsOpen] = useState(link?.selected)
 
   const toggleOpenSubMenu = () => {
     changeIsOpen(!isOpen)
   }
-  console.log('link::')
-  console.log(link)
 
-    return <>
-            <div
-                onClick={toggleOpenSubMenu}
-                className='nav-menu dark:text-neutral-400 text-gray-500 hover:text-black dark:hover:text-white text-sm text-gray w-full items-center duration-300 cursor-pointer pt-2 font-light select-none flex justify-between cursor-pointer' key={link?.name}>
-                <span className='dark:text-neutral-400 dark:hover:text-white font-bold w-full display-block'>{link?.icon && <i className={`text-base ${link?.icon}`} />}{link?.name}</span>
-                <div className='inline-flex items-center select-none pointer-events-none '><i className={`text-xs dark:text-neutral-500 text-gray-300 hover:text-black dark:hover:text-white-400 px-2 fas fa-chevron-left transition-all duration-200 ${isOpen ? '-rotate-90' : ''}`}></i></div>
-            </div>
+  if (!link || !link.show) {
+    return null
+  }
+
+  return <>
+        {/* 菜单 */}
+        <div
+            onClick={toggleOpenSubMenu}
+            className='nav-menu dark:text-neutral-400 text-gray-500 hover:text-black dark:hover:text-white text-sm text-gray w-full items-center duration-300 pt-2 font-light select-none flex justify-between cursor-pointer' key={link?.name}>
+
+            {link?.subMenus
+              ? (<>
+                    <span className='dark:text-neutral-400 dark:hover:text-white font-bold w-full display-block'>
+                        {link?.icon && <i className={`text-base ${link?.icon}`} />}{link?.title}
+                    </span>
+                    <div className='inline-flex items-center select-none pointer-events-none '>
+                        <i className={`${isOpen ? '-rotate-90' : ''} text-xs dark:text-neutral-500 text-gray-300 hover:text-black dark:hover:text-white-400 px-2 fas fa-chevron-left transition-all duration-200`}></i>
+                    </div>
+                </>)
+              : (
+                    <Link href={link?.to} className='dark:text-neutral-400 dark:hover:text-white font-bold w-full display-block'>
+                        {link?.icon && <i className={`text-base ${link?.icon}`} />}{link?.title}
+                    </Link>
+                )
+
+            }
+        </div>
+
+        {/* 菜单按钮 */}
+        {link?.subMenus && (
             <Collapse isOpen={isOpen} key='collapse'>
-            {link?.subMenus?.map((sLink, index) => (
-                <div key={index} className='nav-submenu'>
-                    {/* <BlogPostCard className='text-sm ml-3' post={post} /></div> */}
-                    <a href={`/#${sLink.title}`}>
-                        <span className='dark:text-neutral-400 text-gray-500 hover:text-black dark:hover:text-white text-xs font-bold'><i className={`text-xs mr-2 ${sLink?.icon ? sLink?.icon : 'fas fa-hashtag'}`} />{sLink.title}</span>
-                    </a>
-                </div>
-                ))
+                {
+                    link?.subMenus?.map((sLink, index) => (
+                        <div key={index} className='nav-submenu'>
+                            <a href={sLink?.to}>
+                                <span className='dark:text-neutral-400 text-gray-500 hover:text-black dark:hover:text-white text-xs font-bold'><i className={`text-xs mr-1 ${sLink?.icon ? sLink?.icon : 'fas fa-hashtag'}`} />{sLink.title}</span>
+                            </a>
+                        </div>
+                    ))
                 }
+
             </Collapse>
-        </>
+        )}
 
-
-
-//   return <li className='cursor-pointer list-none items-center flex mx-2' onMouseOver={() => changeShow(true)} onMouseOut={() => changeShow(false)} >
-
-//         {hasSubMenu &&
-//             <div className={'px-2 h-full whitespace-nowrap duration-300 text-sm justify-between dark:text-gray-300 cursor-pointer flex flex-nowrap items-center ' +
-//                 (selected ? 'bg-green-600 text-white hover:text-white' : 'hover:text-green-600')}>
-//                 <div>
-//                     {link?.icon && <i className={link?.icon} />} {link?.name}
-//                     {hasSubMenu && <i className={`px-2 fas fa-chevron-down duration-500 transition-all ${show ? ' rotate-180' : ''}`}></i>}
-//                 </div>
-//             </div>
-//         }
-
-//         {!hasSubMenu &&
-//             <div className={'px-2 h-full whitespace-nowrap duration-300 text-sm justify-between dark:text-gray-300 cursor-pointer flex flex-nowrap items-center ' +
-//                 (selected ? 'bg-green-600 text-white hover:text-white' : 'hover:text-green-600')}>
-//                 <Link href={link?.to} target={link?.to?.indexOf('http') === 0 ? '_blank' : '_self'}>
-//                     {link?.icon && <i className={link?.icon} />} {link?.name}
-//                 </Link>
-//             </div>
-//         }
-
-//         {/* 子菜单 */}
-//         {hasSubMenu && <ul className={`${show ? 'visible opacity-100 top-12 ' : 'invisible opacity-0 top-10 '} border-gray-100  bg-white  dark:bg-black dark:border-gray-800 transition-all duration-300 z-20 block drop-shadow-lg `}>
-//             {link?.subMenus?.map((sLink, index) => {
-//               return <li key={index} className='not:last-child:border-b-0 border-b text-gray-700 dark:text-gray-200  hover:bg-gray-50 dark:hover:bg-gray-900 tracking-widest transition-all duration-200  dark:border-gray-800 py-3 pr-6 pl-3'>
-//                     <Link href={sLink.to} target={link?.to?.indexOf('http') === 0 ? '_blank' : '_self'}>
-//                         <span className='text-xs font-extralight'>{link?.icon && <i className={sLink?.icon} > &nbsp; </i>}{sLink.title}</span>
-//                     </Link>
-//                 </li>
-//             })}
-//         </ul>}
-
-//     </li>
+    </>
 }

themes/nav/components/TopNavBar.js

@@ -1,15 +1,10 @@
-import LogoBar from './LogoBar'
 import { useCallback, useEffect, useRef, useState } from 'react'
 import Collapse from '@/components/Collapse'
 import { MenuBarMobile } from './MenuBarMobile'
-import { useGlobal } from '@/lib/global'
-import CONFIG from '../config'
-import BLOG from '@/blog.config'
 import throttle from 'lodash.throttle'
-import { useRouter } from 'next/router'
-import { MenuItemDrop } from './MenuItemDrop'
 import SearchInput from './SearchInput'
 import DarkModeButton from '@/components/DarkModeButton'
+import LogoBar from './LogoBar'
 
 /**
  * 顶部导航栏 + 菜单
@@ -17,13 +12,10 @@ import DarkModeButton from '@/components/DarkModeButton'
  * @returns
  */
 export default function TopNavBar(props) {
-  const { className, customNav, customMenu } = props
+  const { className } = props
   const [isOpen, changeShow] = useState(false)
   const collapseRef = useRef(null)
 
-  const { locale } = useGlobal()
-
-
   let windowTop = 0
 
   // 监听滚动
@@ -53,28 +45,16 @@ export default function TopNavBar(props) {
   }, throttleMs)
   )
 
-
-
-  const defaultLinks = [
-    { icon: 'fas fa-th', name: locale.COMMON.CATEGORY, to: '/category', show: CONFIG.MENU_CATEGORY },
-    { icon: 'fas fa-tag', name: locale.COMMON.TAGS, to: '/tag', show: CONFIG.MENU_TAG },
-    { icon: 'fas fa-archive', name: locale.NAV.ARCHIVE, to: '/archive', show: CONFIG.MENU_ARCHIVE },
-    { icon: 'fas fa-search', name: locale.NAV.SEARCH, to: '/search', show: CONFIG.MENU_SEARCH }
-  ]
-
-  let links = defaultLinks.concat(customNav)
-
   const toggleMenuOpen = () => {
     changeShow(!isOpen)
   }
 
-  // 如果 开启自定义菜单，则覆盖Page生成的菜单
-  if (BLOG.CUSTOM_MENU) {
-    links = customMenu
-  }
-
   return (
         <div id='top-nav' className={'fixed top-0 w-full z-40 bg-white dark:bg-neutral-900 shadow bg-opacity-70 dark:bg-opacity-60 backdrop-filter backdrop-blur-lg  md:shadow-none pb-2 md:pb-0 ' + className}>
+            {/* 图标Logo */}
+            <div className='fixed top-0 left-5 md:left-4 z-40 pt-3 md:pt-4'>
+                <LogoBar {...props} />
+            </div>
 
             {/* 移动端折叠菜单 */}
             <Collapse type='vertical' collapseRef={collapseRef} isOpen={isOpen} className='md:hidden mt-16'>
@@ -86,10 +66,6 @@ export default function TopNavBar(props) {
             {/* 导航栏菜单 */}
             <div className='h-18 px-5'>
 
-              {/* 左侧图标Logo */}
-              {/* <div className='absolute top-0 left-5 md:left-4 z-40 pt-3 md:pt-4 md:pt-0'>
-                <LogoBar {...props} />
-              </div> */}
               <div className='absolute top-0 right-5'>
                 {/* 搜索框、折叠按钮、仅移动端显示 */}
                 <div className='pt-1 flex md:hidden justify-end items-center space-x-3 font-serif dark:text-gray-200 '>

themes/nav/config.js

@@ -5,7 +5,7 @@ const CONFIG = {
   AUTO_SORT: process.env.NEXT_PUBLIC_GITBOOK_AUTO_SORT || true, // 是否自动按分类名 归组排序文章；自动归组可能会打乱您Notion中的文章顺序
 
   SHOW_TITLE_TEXT: false, // 标题栏显示文本
-  USE_CUSTEM_MENU: true, // 使用自定义分组菜单（可支持子菜单，支持自定义分类图标）
+  USE_CUSTOM_MENU: true, // 使用自定义菜单（可支持子菜单，支持自定义分类图标），若为true则显示所有的category分类
 
   // 菜单
   MENU_CATEGORY: true, // 显示分类

themes/nav/index.js

@@ -1,29 +1,18 @@
 'use client'
 
 import CONFIG from './config'
-import { useRouter } from 'next/router'
 import { useEffect, useState, createContext, useContext } from 'react'
-import { isBrowser } from '@/lib/utils'
 import Footer from './components/Footer'
-import InfoCard from './components/InfoCard'
-import RevolverMaps from './components/RevolverMaps'
 import TopNavBar from './components/TopNavBar'
-import SearchInput from './components/SearchInput'
 import { useGlobal } from '@/lib/global'
-import Live2D from '@/components/Live2D'
 import BLOG from '@/blog.config'
-import NavPostList from './components/NavPostList'
-import ArticleInfo from './components/ArticleInfo'
-import Catalog from './components/Catalog'
 import Announcement from './components/Announcement'
 import PageNavDrawer from './components/PageNavDrawer'
 import FloatTocButton from './components/FloatTocButton'
 import { AdSlot } from '@/components/GoogleAdsense'
 import JumpToTopButton from './components/JumpToTopButton'
-import ShareBar from '@/components/ShareBar'
 import CategoryItem from './components/CategoryItem'
 import TagItemMini from './components/TagItemMini'
-import ArticleAround from './components/ArticleAround'
 import Comment from '@/components/Comment'
 import TocDrawer from './components/TocDrawer'
 import NotionPage from '@/components/NotionPage'
@@ -33,14 +22,12 @@ import { Style } from './style'
 import CommonHead from '@/components/CommonHead'
 import BlogArchiveItem from './components/BlogArchiveItem'
 import BlogPostListAll from './components/BlogPostListAll'
-import BlogPostListPage from './components/BlogPostListPage'
 import BlogPostCard from './components/BlogPostCard'
-import LogoBar from './components/LogoBar'
 import Link from 'next/link'
 import dynamic from 'next/dynamic'
-const WWAds = dynamic(() => import('@/components/WWAds'), { ssr: false })
 
 import { MenuItem } from './components/MenuItem'
+const WWAds = dynamic(() => import('@/components/WWAds'), { ssr: false })
 
 // 主题全局变量
 const ThemeGlobalNav = createContext()
@@ -53,9 +40,8 @@ export const useNavGlobal = () => useContext(ThemeGlobalNav)
  * @constructor
  */
 const LayoutBase = (props) => {
-  const { customMenu, children, post, allNavPages, categoryOptions, slotLeft, slotRight, slotTop, meta } = props
+  const { customMenu, children, post, allNavPages, categoryOptions, slotLeft, slotTop, meta } = props
   const { onLoading } = useGlobal()
-  const router = useRouter()
   const [tocVisible, changeTocVisible] = useState(false)
   const [pageNavVisible, changePageNavVisible] = useState(false)
   const [filteredNavPages, setFilteredNavPages] = useState(allNavPages)
@@ -67,133 +53,55 @@ const LayoutBase = (props) => {
   }, [post])
 
   let links = customMenu
-  // let categoryOptions = filteredNavPages
+
+  if (!CONFIG.USE_CUSTOM_MENU) {
+    links = categoryOptions && categoryOptions?.map(c => {
+      return { id: c.name, title: `# ${c.name}`, to: `/category/${c.name}`, show: true }
+    })
+  }
 
   return (
         <ThemeGlobalNav.Provider value={{ tocVisible, changeTocVisible, filteredNavPages, setFilteredNavPages, allNavPages, pageNavVisible, changePageNavVisible, categoryOptions }}>
+            {/* HEAD */}
             <CommonHead meta={meta}/>
-            {/* <Head>
-                <script>
-                  // Stack - 自动将数据库卡片视图下的卡片链接替换为网址
-                  // 获取所有的notion-collection-card元素
-                  document.addEventListener("DOMContentLoaded", function() {
-                    console.log("DOM content loaded!");
-                    updateHref();
-                  });
-                    
-                  // 创建一个MutationObserver对象，用于监听body元素的变化
-                  let observer = new MutationObserver(function(mutations) {
-                    // 遍历每个变化记录
-                    for (let mutation of mutations) {
-                      // 如果变化类型是子节点变化
-                      if (mutation.type === "childList") {
-                        // 调用一个函数，用于更新notion-collection-card元素的href属性
-                        updateHref();
-                      }
-                    }
-                  });
-    
-                  // 定义一个函数，用于更新notion-collection-card元素的href属性
-                  function updateHref() {
-                    let cards = document.querySelectorAll(".notion-collection-card");;
-                    // 遍历每个元素
-                    for (let card of cards) {
-                      // 获取该元素下的最后一个notion-property元素
-                      let lastProperty = card.querySelector(".notion-collection-card-property:last-child");
-                      // 如果该元素存在，并且包含一个网址
-                      if (lastProperty && lastProperty.textContent.startsWith("http")) {
-                        // 获取该网址
-                        let url = lastProperty.textContent;
-                        // 将该元素的href属性设置为该网址
-                        if(card.href == url) continue;
-                        card.href = url;
-                        // 将该元素的target属性设置为"_blank"，使链接在新窗口或标签页中打开
-                        card.target = "_blank";
-                      }
-                    }
-                  }
-    
-                  //   console.log("load");
-                  // 在页面载入时，调用一次updateHref函数，并将isLoaded设为true
-                  window.addEventListener("load", function() {
-                    console.log("window load");
-                    updateHref();
-                  });
-    
-                  // 在页面大小改变时，调用一次updateHref函数
-                  // window.addEventListener("resize", updateHref);
-    
-                  // 开始监听body元素的变化，配置选项为子节点变化和子孙节点变化
-                  observer.observe(document.body, {childList: true, subtree: true});
-    
-                  // 在每个变化记录之后，检查isLoaded是否为true，如果是，则执行updateHref函数
-                  // observer.disconnect(); // 停止监听body元素的变化
-                  // observer.observe(document.body, {childList: true, subtree: true}); // 重新开始监听body元素的变化
-                </script>
-            </Head> */}
+            {/* 样式 */}
             <Style/>
 
+            {/* 主题样式根基 */}
             <div id='theme-onenav' className=' dark:bg-hexo-black-gray w-full h-screen min-h-screen justify-center dark:text-gray-300'>
-                {/* 顶部导航栏 */}
+
+                {/* 端顶部导航栏 */}
                 <TopNavBar {...props} />
-                <div id='nav-bg' className=' fixed -top-20 w-full h-14 z-20 shadow glassmorphism duration-300 transition-all '
-                data-aos="fade-up"
-                data-aos-duration="300"
-                data-aos-once="false"
-                data-aos-anchor-placement="top-center"
-                >a</div>
 
-                <main id='wrapper' className={(BLOG.LAYOUT_SIDEBAR_REVERSE ? 'flex-row-reverse' : '') + 'relative flex justify-between w-full h-screen mx-auto'}>
+                {/* 左右布局区块 */}
+                <main id='wrapper' className={(BLOG.LAYOUT_SIDEBAR_REVERSE ? 'flex-row-reverse' : '') + ' relative flex justify-between w-full h-screen mx-auto'}>
 
-                        {/* 左侧图标Logo */}
-                        <div className='fixed top-0 left-5 md:left-4 z-40 pt-3 md:pt-4 md:pt-0'>
-                          <LogoBar {...props} />
-                        </div>
                     {/* 左侧推拉抽屉 */}
-                    <div className={'font-sans hidden md:block dark:border-transparent relative z-10 ml-4 h- max-h-full pb-44'}>
+                    <div className={'font-sans hidden md:block dark:border-transparent relative z-10 mx-4 w-52 max-h-full pb-44'}>
 
-                        <div className='main-menu z-20 w-48 mt-20 pl-9 pr-7 pb-5 sticky pt-1 top-0 overflow-y-scroll h-fit max-h-full scroll-hidden bg-white dark:bg-neutral-800 rounded-xl '>
+                        <div className='main-menu z-20 mt-20 pl-9 pr-7 pb-5 sticky pt-1 top-0 overflow-y-scroll h-fit max-h-full scroll-hidden bg-white dark:bg-neutral-800 rounded-xl '>
+                           {/* 嵌入 */}
                             {slotLeft}
+
                             <div className='grid pt-2'>
-                                {/* 所有文章列表 */}
-                                {CONFIG.USE_CUSTEM_MENU && links && links?.map((link, index) => <MenuItem key={index} link={link} />)}
-                                {/* {!CONFIG.USE_CUSTEM_MENU && <NavPostList {...props}/>} */}
-                                {/* {links && links?.map((link, index) => {
-
-                                })} */}
-                                
-                                {/* href={`/category/${category.name}`} */}
-                                {!CONFIG.USE_CUSTEM_MENU && categoryOptions && categoryOptions?.map(category => {
-                                  // let selected = currentCategory === category.name
-                                  let selected = false;
-                                  return (
-                                    <Link
-                                      key={category.name}
-                                      href={`#${category.name}`}
-                                      passHref
-                                      className={(selected
-                                        ? 'hover:text-black dark:hover:text-neutral text-black '
-                                        : 'dark:text-neutral-400 text-gray-500 hover:text-black dark:hover:text-white ') +
-                                        '  text-sm text-gray w-full items-center duration-300 px-2  cursor-pointer py-1 font-light pt-2 pb-2'}>
-
-                                      <div className='font-bold '> <i className={`mr-2 fas ${selected ? 'fa-folder-open' : 'fa-hashtag'}`} />{category.name}({category.count})</div>
-
-                                    </Link>
-                                  )
-                                })}
+                                {/* 显示菜单 */}
+                                {links && links?.map((link, index) => <MenuItem key={index} link={link} />)}
                             </div>
 
                         </div>
 
+                        {/* 页脚站点信息 */}
                         <div className='w-56 fixed left-0 bottom-0 z-0'>
                             <Footer {...props} />
                         </div>
                     </div>
 
+                    {/* 右侧主要内容区块 */}
                     <div id='center-wrapper' className='flex flex-col justify-between w-full relative z-10 pt-20 md:pt-5 pb-8 min-h-screen overflow-y-auto'>
 
                         <div id='container-inner' className='w-full px-6 pb-6 md:pb-20 max-w-8xl justify-center mx-auto'>
                             {slotTop}
+                            {/* 广告植入 */}
                             <WWAds className='w-full' orientation='horizontal'/>
 
                             <Transition
@@ -224,29 +132,6 @@ const LayoutBase = (props) => {
                         </div>
                     </div>
 
-                    {/*  右侧侧推拉抽屉 */}
-                    {/*<div style={{ width: '32rem' }} className={'hidden xl:block dark:border-transparent relative z-10 '}>
-                        <div className='py-14 px-6 sticky top-0'>
-                            <ArticleInfo post={props?.post ? props?.post : props.notice} />
-
-                            <div className='py-4'>
-                                <Catalog {...props} />
-                                {slotRight}
-                                {router.route === '/' && <>
-                                    <InfoCard {...props} />
-                                    {CONFIG.WIDGET_REVOLVER_MAPS === 'true' && <RevolverMaps />}
-                                    <Live2D />
-                                </>}*/}
-                                {/* onenav主题首页只显示公告 */}
-                                {/*<Announcement {...props} />
-                            </div>
-
-                            <AdSlot type='in-article' />
-                            <Live2D />
-
-                        </div>
-                    </div>*/}
-
                 </main>
 
                 {/* 移动端悬浮目录按钮 */}
@@ -257,15 +142,11 @@ const LayoutBase = (props) => {
                 {/* 移动端导航抽屉 */}
                 <PageNavDrawer {...props} filteredNavPages={filteredNavPages} />
 
-                {/* 移动端底部导航栏 */}
-                {/* <BottomMenuBar {...props} className='block md:hidden' /> */}
-
             </div>
         </ThemeGlobalNav.Provider>
   )
 }
 
-
 /**
  * 首页
  * @param {*} props
@@ -291,22 +172,13 @@ const LayoutPostListIndex = props => {
   )
 }
 
-/**
- * 首页
- * @param {*} props
- * @returns 此主题首页就是列表
- */
-const LayoutIndexNew = props => {
-  return <LayoutPostList props={[customMenu, filteredNavPages]} />
-}
-
 /**
  * 文章列表
  * @param {*} props
  * @returns
  */
 const LayoutPostList = props => {
-  const { posts, category, tag } = props
+  const { posts } = props
   // 顶部如果是按照分类或标签查看文章列表，列表顶部嵌入一个横幅
   // 如果是搜索，则列表顶部嵌入 搜索框
   return (
@@ -322,53 +194,13 @@ const LayoutPostList = props => {
   )
 }
 
-/**
- * 首页
- * 重定向到某个文章详情页
- * @param {*} props
- * @returns
- */
-const LayoutIndexCustemPage = (props) => {
-  const router = useRouter()
-  useEffect(() => {
-    router.push(CONFIG.INDEX_PAGE).then(() => {
-      // console.log('跳转到指定首页', CONFIG.INDEX_PAGE)
-      setTimeout(() => {
-        if (isBrowser) {
-          const article = document.getElementById('notion-article')
-          if (!article) {
-            console.log('请检查您的Notion数据库中是否包含此slug页面： ', CONFIG.INDEX_PAGE)
-            const containerInner = document.querySelector('#theme-onenav #container-inner')
-            const newHTML = `<h1 class="text-3xl pt-12  dark:text-gray-300">配置有误</h1><blockquote class="notion-quote notion-block-ce76391f3f2842d386468ff1eb705b92"><div>请在您的notion中添加一个slug为${CONFIG.INDEX_PAGE}的文章</div></blockquote>`
-            containerInner?.insertAdjacentHTML('afterbegin', newHTML)
-          }
-        }
-      }, 7 * 1000)
-    })
-  }, [])
-
-  return <LayoutBase {...props} />
-}
-
-/**
- * 文章列表 无
- * 全靠页面导航
- * @param {*} props
- * @returns
- */
-const LayoutPostListOld = (props) => {
-  return <LayoutBase {...props} >
-            <div className='mt-10'><BlogPostListPage {...props} /></div>
-    </LayoutBase>
-}
-
 /**
  * 文章详情
  * @param {*} props
  * @returns
  */
 const LayoutSlug = (props) => {
-  const { post, prev, next, lock, validPassword } = props
+  const { post, lock, validPassword } = props
 
   return (
         <LayoutBase {...props} >