fix-build

This commit is contained in:
tangly1024
2023-03-26 12:02:31 +08:00
parent cdcf7b5f0b
commit e2e93c2a3f
10 changed files with 45 additions and 29 deletions

View File

@@ -25,6 +25,10 @@ export const MenuList = (props) => {
links = customMenu links = customMenu
} }
if (!links || links.length === 0) {
return null
}
return (<> return (<>
<nav id='nav-pc' className='hidden md:block font-sans text-sm z-20'> <nav id='nav-pc' className='hidden md:block font-sans text-sm z-20'>
{links?.map(link => <MenuItemDrop key={link.id} link={link} />)} {links?.map(link => <MenuItemDrop key={link.id} link={link} />)}

View File

@@ -23,6 +23,11 @@ export const MenuListSide = (props) => {
if (BLOG.CUSTOM_MENU) { if (BLOG.CUSTOM_MENU) {
links = customMenu links = customMenu
} }
if (!links || links.length === 0) {
return null
}
return ( return (
<nav> <nav>
{/* {links.map(link => <MenuItemNormal key={link.id} link={link} />)} */} {/* {links.map(link => <MenuItemNormal key={link.id} link={link} />)} */}

View File

@@ -25,6 +25,10 @@ export const MenuListTop = (props) => {
links = customMenu links = customMenu
} }
if (!links || links.length === 0) {
return null
}
return (<> return (<>
<nav id='nav-mobile' className='leading-8 justify-center font-light w-full flex'> <nav id='nav-mobile' className='leading-8 justify-center font-light w-full flex'>
{links?.map(link => link && link.show && <MenuItemDrop key={link.id} link={link} />)} {links?.map(link => link && link.show && <MenuItemDrop key={link.id} link={link} />)}

View File

@@ -23,10 +23,15 @@ export const MenuListSide = (props) => {
if (BLOG.CUSTOM_MENU) { if (BLOG.CUSTOM_MENU) {
links = customMenu links = customMenu
} }
if (!links || links.length === 0) {
return null
}
return ( return (
<nav> <nav>
{/* {links.map(link => <MenuItemNormal key={link.id} link={link} />)} */} {/* {links.map(link => <MenuItemNormal key={link.id} link={link} />)} */}
{links.map(link => <MenuItemCollapse key={link.id} link={link} />)} {links?.map(link => <MenuItemCollapse key={link.id} link={link} />)}
</nav> </nav>
) )
} }

View File

@@ -23,9 +23,14 @@ export const MenuListTop = (props) => {
if (BLOG.CUSTOM_MENU) { if (BLOG.CUSTOM_MENU) {
links = customMenu links = customMenu
} }
if (!links || links.length === 0) {
return null
}
return ( return (
<nav id='nav' className='leading-8 flex justify-center font-light w-full'> <nav id='nav' className='leading-8 flex justify-center font-light w-full'>
{links.map(link => <MenuItemDrop key={link.id} link={link}/>)} {links?.map(link => <MenuItemDrop key={link.id} link={link}/>)}
</nav> </nav>
) )
} }

View File

@@ -25,6 +25,10 @@ export const MenuBarMobile = (props) => {
links = customMenu links = customMenu
} }
if (!links || links.length === 0) {
return null
}
return ( return (
<nav id='nav' className=' text-md'> <nav id='nav' className=' text-md'>
{/* {links.map(link => <NormalMenu key={link.id} link={link}/>)} */} {/* {links.map(link => <NormalMenu key={link.id} link={link}/>)} */}

View File

@@ -37,6 +37,10 @@ export default function TopNavBar(props) {
links = customMenu links = customMenu
} }
if (!links || links.length === 0) {
return null
}
return ( return (
<div id='top-nav' className={'sticky top-0 lg:relative w-full z-40 ' + className}> <div id='top-nav' className={'sticky top-0 lg:relative w-full z-40 ' + className}>

View File

@@ -27,6 +27,10 @@ export const MenuList = (props) => {
links = customMenu links = customMenu
} }
if (!links || links.length === 0) {
return null
}
return ( return (
<> <>
{/* 大屏模式菜单 */} {/* 大屏模式菜单 */}

View File

@@ -97,15 +97,19 @@ const NavBar = props => {
links = customMenu links = customMenu
} }
if (!links || links.length === 0) {
return null
}
return ( return (
<div className="flex-shrink-0"> <div className="flex-shrink-0">
<ul className=" hidden md:flex flex-row"> <ul className=" hidden md:flex flex-row">
{links.map(link => <MenuItemDrop key={link.id} link={link} />)} {links?.map(link => <MenuItemDrop key={link.id} link={link} />)}
</ul> </ul>
<div className='md:hidden'><i onClick={toggleOpen} className='fas fa-bars cursor-pointer px-5 block md:hidden'></i> <div className='md:hidden'><i onClick={toggleOpen} className='fas fa-bars cursor-pointer px-5 block md:hidden'></i>
<Collapse collapseRef={collapseRef} isOpen={isOpen} type='vertical' className='fixed top-16 right-6'> <Collapse collapseRef={collapseRef} isOpen={isOpen} type='vertical' className='fixed top-16 right-6'>
<div className='dark:border-black bg-white dark:bg-black rounded border p-2 text-sm'> <div className='dark:border-black bg-white dark:bg-black rounded border p-2 text-sm'>
{links.map(link => <MenuItemCollapse key={link.id} link={link} onHeightChange={(param) => collapseRef.current?.updateCollapseHeight(param)}/>)} {links?.map(link => <MenuItemCollapse key={link.id} link={link} onHeightChange={(param) => collapseRef.current?.updateCollapseHeight(param)}/>)}
</div> </div>
</Collapse> </Collapse>
</div> </div>

View File

@@ -1,8 +1,5 @@
import BLOG from '@/blog.config'
import { useGlobal } from '@/lib/global'
import { useRouter } from 'next/router' import { useRouter } from 'next/router'
import { useState } from 'react' import { useState } from 'react'
import CONFIG_SIMPLE from '../config_simple'
import { MenuList } from './MenuList' import { MenuList } from './MenuList'
/** /**
@@ -11,8 +8,6 @@ import { MenuList } from './MenuList'
* @returns * @returns
*/ */
export const NavBar = (props) => { export const NavBar = (props) => {
const { customNav, customMenu } = props
const { locale } = useGlobal()
const [showSearchInput, changeShowSearchInput] = useState(false) const [showSearchInput, changeShowSearchInput] = useState(false)
const router = useRouter() const router = useRouter()
@@ -29,24 +24,6 @@ export const NavBar = (props) => {
} }
} }
let links = [
{ icon: 'fas fa-search', name: locale.NAV.SEARCH, to: '/search', show: CONFIG_SIMPLE.MENU_SEARCH },
{ icon: 'fas fa-archive', name: locale.NAV.ARCHIVE, to: '/archive', show: CONFIG_SIMPLE.MENU_ARCHIVE },
{ icon: 'fas fa-folder', name: locale.COMMON.CATEGORY, to: '/category', show: CONFIG_SIMPLE.MENU_CATEGORY },
{ icon: 'fas fa-tag', name: locale.COMMON.TAGS, to: '/tag', show: CONFIG_SIMPLE.MENU_TAG }
]
if (customNav) {
links = links.concat(customNav)
}
if (BLOG.CUSTOM_MENU) {
links = customMenu
}
if (!links || links.length === 0) {
return null
}
return ( return (
<nav className="w-full bg-white md:pt-0 relative z-20 shadow border-t border-gray-100 dark:border-hexo-black-gray dark:bg-black"> <nav className="w-full bg-white md:pt-0 relative z-20 shadow border-t border-gray-100 dark:border-hexo-black-gray dark:bg-black">
<div id="nav-bar-inner" className="h-12 mx-auto max-w-9/10 justify-between items-center text-sm md:text-md md:justify-start"> <div id="nav-bar-inner" className="h-12 mx-auto max-w-9/10 justify-between items-center text-sm md:text-md md:justify-start">
@@ -56,9 +33,9 @@ export const NavBar = (props) => {
{!showSearchInput && (<MenuList {...props}/>)} {!showSearchInput && (<MenuList {...props}/>)}
</div> </div>
<div className="absolute right-12 h-full text-center px-2 flex items-center text-blue-400"> <div className="absolute right-12 h-full text-center px-2 flex items-center text-blue-400 cursor-pointer">
{/* <!-- extra links --> */} {/* <!-- extra links --> */}
<i className={showSearchInput ? 'fa-regular fa-circle-xmark' : 'fa-solid fa-magnifying-glass' + ' align-middle cursor-pointer'} onClick={toggleShowSearchInput}></i> <i className={showSearchInput ? 'fa-regular fa-circle-xmark' : 'fa-solid fa-magnifying-glass' + ' align-middle'} onClick={toggleShowSearchInput}></i>
</div> </div>
</div> </div>
</nav> </nav>