Example主题调整，规范组件命名

2026-06-07 15:10:32 +00:00 · 2024-04-28 15:03:48 +08:00
parent cda0890785
commit 2385ad868f
26 changed files with 773 additions and 638 deletions
--- a/themes/example/index.js
+++ b/themes/example/index.js
@@ -1,31 +1,28 @@
 'use client'

-import CONFIG from './config'
+import Comment from '@/components/Comment'
+import replaceSearchResult from '@/components/Mark'
+import NotionIcon from '@/components/NotionIcon'
+import NotionPage from '@/components/NotionPage'
+import ShareBar from '@/components/ShareBar'
+import { siteConfig } from '@/lib/config'
+import { useGlobal } from '@/lib/global'
+import { isBrowser } from '@/lib/utils'
+import { Transition } from '@headlessui/react'
+import Link from 'next/link'
+import { useRouter } from 'next/router'
 import { useEffect } from 'react'
-import { Header } from './components/Header'
-import { Nav } from './components/Nav'
-import { Footer } from './components/Footer'
-import { Title } from './components/Title'
-import { SideBar } from './components/SideBar'
+import BlogListArchive from './components/BlogListArchive'
 import { BlogListPage } from './components/BlogListPage'
 import { BlogListScroll } from './components/BlogListScroll'
-import { useGlobal } from '@/lib/global'
-import { ArticleLock } from './components/ArticleLock'
-import { ArticleInfo } from './components/ArticleInfo'
-import JumpToTopButton from './components/JumpToTopButton'
-import NotionPage from '@/components/NotionPage'
-import Comment from '@/components/Comment'
-import ShareBar from '@/components/ShareBar'
+import { Footer } from './components/Footer'
+import { Header } from './components/Header'
+import { PostLock } from './components/PostLock'
+import { PostMeta } from './components/PostMeta'
 import SearchInput from './components/SearchInput'
-import replaceSearchResult from '@/components/Mark'
-import { isBrowser } from '@/lib/utils'
-import BlogListGroupByDate from './components/BlogListGroupByDate'
-import CategoryItem from './components/CategoryItem'
-import TagItem from './components/TagItem'
-import { useRouter } from 'next/router'
-import { Transition } from '@headlessui/react'
+import { SideBar } from './components/SideBar'
+import CONFIG from './config'
 import { Style } from './style'
-import { siteConfig } from '@/lib/config'

 /**
 * 基础布局框架
@@ -36,84 +33,105 @@ import { siteConfig } from '@/lib/config'
 */
 const LayoutBase = props => {
  const { children } = props
-  const { onLoading, fullWidth } = useGlobal()
+  const { onLoading, fullWidth, locale } = useGlobal()
  const router = useRouter()
-  const { category, tag } = props
+  const { post, category, tag } = props
+
+  const title = post?.title || siteConfig('TITLE')
+  const description = post?.description || siteConfig('AUTHOR')
+
  // 顶部如果是按照分类或标签查看文章列表，列表顶部嵌入一个横幅
  // 如果是搜索，则列表顶部嵌入 搜索框
  let slotTop = null
  if (category) {
-    slotTop = <div className='pb-12'><i className="mr-1 fas fa-folder-open" />{category}</div>
+    slotTop = (
+      <div className='pb-12'>
+        <i className='mr-1 fas fa-folder-open' />
+        {category}
+      </div>
+    )
  } else if (tag) {
    slotTop = <div className='pb-12'>#{tag}</div>
  } else if (props.slotTop) {
    slotTop = props.slotTop
  } else if (router.route === '/search') {
    // 嵌入一个搜索框在顶部
-    slotTop = <div className='pb-12'><SearchInput {...props} /></div>
+    slotTop = (
+      <div className='pb-12'>
+        <SearchInput {...props} />
+      </div>
+    )
  }

-  // 增加一个状态以触发 Transition 组件的动画
-  //   const [showTransition, setShowTransition] = useState(true)
-  //   useEffect(() => {
-  //     // 当 location 或 children 发生变化时，触发动画
-  //     setShowTransition(false)
-  //     setTimeout(() => setShowTransition(true), 5)
-  //   }, [onLoading])
-
  return (
-        <div id='theme-example' className={`${siteConfig('FONT_STYLE')} dark:text-gray-300  bg-white dark:bg-black scroll-smooth`} >
+    <div
+      id='theme-example'
+      className={`${siteConfig('FONT_STYLE')} dark:text-gray-300  bg-white dark:bg-black scroll-smooth`}>
+      <Style />

-            <Style/>
+      {/* 页头 */}
+      <Header {...props} />

-            {/* 页头 */}
-            <Header {...props} />
+      {/* 主体 */}
+      <div id='container-inner' className='w-full relative z-10'>
+        {/* 标题栏 */}
+        {!fullWidth && (
+          <div className='text-center px-6 py-12 mb-6 bg-gray-100 dark:bg-hexo-black-gray dark:border-hexo-black-gray border-b'>
+            <h1 className='text-xl md:text-4xl pb-4'>
+              {siteConfig('POST_TITLE_ICON') && (
+                <NotionIcon icon={post?.pageIcon} />
+              )}
+              {title}
+            </h1>
+            <p className='leading-loose text-gray-dark'>{description}</p>
+          </div>
+        )}

-            {/* 菜单 */}
-            <Nav {...props} />
+        <div
+          id='container-wrapper'
+          className={
+            (JSON.parse(siteConfig('LAYOUT_SIDEBAR_REVERSE'))
+              ? 'flex-row-reverse'
+              : '') +
+            'relative container mx-auto justify-center md:flex items-start py-8 px-2'
+          }>
+          {/* 内容 */}
+          <div
+            className={`w-full ${fullWidth ? '' : 'max-w-3xl'} xl:px-14 lg:px-4`}>
+            <Transition
+              show={!onLoading}
+              appear={true}
+              enter='transition ease-in-out duration-700 transform order-first'
+              enterFrom='opacity-0 translate-y-16'
+              enterTo='opacity-100'
+              leave='transition ease-in-out duration-300 transform'
+              leaveFrom='opacity-100 translate-y-0'
+              leaveTo='opacity-0 -translate-y-16'
+              unmount={false}>
+              {/* 嵌入模块 */}
+              {slotTop}
+              {children}
+            </Transition>
+          </div>

-            {/* 主体 */}
-            <div id='container-inner' className="w-full relative z-10">
-
-                {/* 标题栏 */}
-                {fullWidth ? null : <Title {...props} />}
-
-                <div id='container-wrapper' className={(JSON.parse(siteConfig('LAYOUT_SIDEBAR_REVERSE')) ? 'flex-row-reverse' : '') + 'relative container mx-auto justify-center md:flex items-start py-8 px-2'}>
-
-                    {/* 内容 */}
-                    <div className={`w-full ${fullWidth ? '' : 'max-w-3xl'} xl:px-14 lg:px-4`}>
-                        <Transition
-                            show={!onLoading}
-                            appear={true}
-                            enter="transition ease-in-out duration-700 transform order-first"
-                            enterFrom="opacity-0 translate-y-16"
-                            enterTo="opacity-100"
-                            leave="transition ease-in-out duration-300 transform"
-                            leaveFrom="opacity-100 translate-y-0"
-                            leaveTo="opacity-0 -translate-y-16"
-                            unmount={false}
-                        >
-                            {/* 嵌入模块 */}
-                            {slotTop}
-                            {children}
-                        </Transition>
-                    </div>
-
-                    {/* 侧边栏 */}
-                    {!fullWidth && <SideBar {...props} />}
-
-                </div>
-
-            </div>
-
-            {/* 页脚 */}
-            <Footer {...props} />
-
-            {/* 回顶按钮 */}
-            <div className='fixed right-4 bottom-4 z-10'>
-                <JumpToTopButton />
-            </div>
+          {/* 侧边栏 */}
+          {!fullWidth && <SideBar {...props} />}
        </div>
+      </div>
+
+      {/* 页脚 */}
+      <Footer {...props} />
+
+      {/* 回顶按钮 */}
+      <div className='fixed right-4 bottom-4 z-10'>
+        <div
+          title={locale.POST.TOP}
+          className='cursor-pointer p-2 text-center'
+          onClick={() => window.scrollTo({ top: 0, behavior: 'smooth' })}>
+          <i className='fas fa-angle-up text-2xl' />
+        </div>
+      </div>
+    </div>
  )
 }

@@ -133,9 +151,13 @@ const LayoutIndex = props => {
 */
 const LayoutPostList = props => {
  return (
-        <>
-            {siteConfig('POST_LIST_STYLE') === 'page' ? <BlogListPage {...props} /> : <BlogListScroll {...props} />}
-        </>
+    <>
+      {siteConfig('POST_LIST_STYLE') === 'page' ? (
+        <BlogListPage {...props} />
+      ) : (
+        <BlogListScroll {...props} />
+      )}
+    </>
  )
 }

@@ -150,29 +172,34 @@ const LayoutSlug = props => {
  useEffect(() => {
    // 404
    if (!post) {
-      setTimeout(() => {
-        if (isBrowser) {
-          const article = document.getElementById('notion-article')
-          if (!article) {
-            router.push('/404').then(() => {
-              console.warn('找不到页面', router.asPath)
-            })
+      setTimeout(
+        () => {
+          if (isBrowser) {
+            const article = document.getElementById('notion-article')
+            if (!article) {
+              router.push('/404').then(() => {
+                console.warn('找不到页面', router.asPath)
+              })
+            }
          }
-        }
-      }, siteConfig('POST_WAITING_TIME_FOR_404') * 1000)
+        },
+        siteConfig('POST_WAITING_TIME_FOR_404') * 1000
+      )
    }
  }, [post])
  return (
-        <>
-            {lock
-              ? <ArticleLock validPassword={validPassword} />
-              : <div id="article-wrapper" className="px-2">
-                    <ArticleInfo post={post} />
-                    <NotionPage post={post} />
-                    <ShareBar post={post} />
-                    <Comment frontMatter={post} />
-                </div>}
-        </>
+    <>
+      {lock ? (
+        <PostLock validPassword={validPassword} />
+      ) : (
+        <div id='article-wrapper' className='px-2'>
+          <PostMeta post={post} />
+          <NotionPage post={post} />
+          <ShareBar post={post} />
+          <Comment frontMatter={post} />
+        </div>
+      )}
+    </>
  )
 }

@@ -181,7 +208,7 @@ const LayoutSlug = props => {
 * @param {*} props
 * @returns
 */
-const Layout404 = (props) => {
+const Layout404 = props => {
  return <>404 Not found.</>
 }

@@ -220,13 +247,19 @@ const LayoutSearch = props => {
 */
 const LayoutArchive = props => {
  const { archivePosts } = props
-  return (<>
-            <div className="mb-10 pb-20 md:py-12 p-3  min-h-screen w-full">
-                {Object.keys(archivePosts).map(archiveTitle => (
-                    <BlogListGroupByDate key={archiveTitle} archiveTitle={archiveTitle} archivePosts={archivePosts} />
-                ))}
-            </div>
-        </>)
+  return (
+    <>
+      <div className='mb-10 pb-20 md:py-12 p-3  min-h-screen w-full'>
+        {Object.keys(archivePosts).map(archiveTitle => (
+          <BlogListArchive
+            key={archiveTitle}
+            archiveTitle={archiveTitle}
+            archivePosts={archivePosts}
+          />
+        ))}
+      </div>
+    </>
+  )
 }

 /**
@@ -237,11 +270,25 @@ const LayoutArchive = props => {
 const LayoutCategoryIndex = props => {
  const { categoryOptions } = props
  return (
-        <>
-            <div id='category-list' className='duration-200 flex flex-wrap'>
-                {categoryOptions?.map(category => <CategoryItem key={category.name} category={category} />)}
+    <>
+      <div id='category-list' className='duration-200 flex flex-wrap'>
+        {categoryOptions?.map(category => (
+          <Link
+            key={category.name}
+            href={`/category/${category.name}`}
+            passHref
+            legacyBehavior>
+            <div
+              className={
+                'hover:text-black dark:hover:text-white dark:text-gray-300 dark:hover:bg-gray-600 px-5 cursor-pointer py-2 hover:bg-gray-100'
+              }>
+              <i className='mr-4 fas fa-folder' />
+              {category.name}({category.count})
            </div>
-        </>
+          </Link>
+        ))}
+      </div>
+    </>
  )
 }

@@ -250,26 +297,39 @@ const LayoutCategoryIndex = props => {
 * @param {*} props
 * @returns
 */
-const LayoutTagIndex = (props) => {
+const LayoutTagIndex = props => {
  const { tagOptions } = props
  return (
-        <>
-            <div id='tags-list' className='duration-200 flex flex-wrap'>
-                {tagOptions.map(tag => <TagItem key={tag.name} tag={tag} />)}
-            </div>
-        </>
+    <>
+      <div id='tags-list' className='duration-200 flex flex-wrap'>
+        {tagOptions.map(tag => (
+          <div key={tag.name} className='p-2'>
+            <Link
+              key={tag}
+              href={`/tag/${encodeURIComponent(tag.name)}`}
+              passHref
+              className={`cursor-pointer inline-block rounded hover:bg-gray-500 hover:text-white duration-200 mr-2 py-1 px-2 text-xs whitespace-nowrap dark:hover:text-white text-gray-600 hover:shadow-xl dark:border-gray-400 notion-${tag.color}_background dark:bg-gray-800`}>
+              <div className='font-light dark:text-gray-400'>
+                <i className='mr-1 fas fa-tag' />{' '}
+                {tag.name + (tag.count ? `(${tag.count})` : '')}{' '}
+              </div>
+            </Link>
+          </div>
+        ))}
+      </div>
+    </>
  )
 }

 export {
-  CONFIG as THEME_CONFIG,
-  LayoutBase,
-  LayoutIndex,
-  LayoutSearch,
-  LayoutArchive,
-  LayoutSlug,
  Layout404,
-  LayoutPostList,
+  LayoutArchive,
+  LayoutBase,
  LayoutCategoryIndex,
-  LayoutTagIndex
+  LayoutIndex,
+  LayoutPostList,
+  LayoutSearch,
+  LayoutSlug,
+  LayoutTagIndex,
+  CONFIG as THEME_CONFIG
 }