+
{/* 图片封面 */}
{showPageCover && (
diff --git a/themes/heo/components/BlogPostCardInfo.js b/themes/heo/components/BlogPostCardInfo.js
index 54668297..4d233072 100644
--- a/themes/heo/components/BlogPostCardInfo.js
+++ b/themes/heo/components/BlogPostCardInfo.js
@@ -1,7 +1,5 @@
-import NotionPage from '@/components/NotionPage'
import Link from 'next/link'
import TagItemMini from './TagItemMini'
-import TwikooCommentCount from '@/components/TwikooCommentCount'
import BLOG from '@/blog.config'
/**
@@ -10,74 +8,43 @@ import BLOG from '@/blog.config'
* @returns
*/
export const BlogPostCardInfo = ({ post, showPreview, showPageCover, showSummary }) => {
- return
-
- {/* 标题 */}
-
+ return
}
diff --git a/themes/heo/components/Card.js b/themes/heo/components/Card.js
index c2db0e49..2107391b 100644
--- a/themes/heo/components/Card.js
+++ b/themes/heo/components/Card.js
@@ -1,7 +1,7 @@
const Card = ({ children, headerSlot, className }) => {
- return
- {post.title}
+
+
+
-
+ {/* 分类 */}
+ {post?.category &&
-
-
+
+ {post.category}
+
+
}
- {/* 分类 */}
- { post?.category &&
+ {/* 标题 */}
+ className={'line-clamp-2 replace cursor-pointer text-2xl font-extrabold leading-tight text-black dark:text-gray-100 hover:text-indigo-700 dark:hover:text-indigo-400'}>
-
- {post.category}
+ {post.title}
-
-
}
+ {/* 摘要 */}
+ {(!showPreview || showSummary) && !post.results && (
+ + {post.summary} +
+ )} - {/* 摘要 */} - {(!showPreview || showSummary) && !post.results && ( -- {post.summary} -
- )} - - {/* 搜索结果 */} - {post.results && ( -- {post.results.map(r => ( - {r} - ))} -
- )} - {/* 预览 */} - {showPreview && ( -
-
- )}
-
-
- {/* 日期标签 */}
-
-
- {/* 日期 */}
-
-
-
- {post?.publishTime || post.lastEditedTime}
-
-
+ {/* 搜索结果 */}
+ {post.results && (
+
- + {post.results.map(r => ( + {r} + ))} +
+ )}
@@ -88,6 +55,6 @@ export const BlogPostCardInfo = ({ post, showPreview, showPageCover, showSummary
+ return
-
<>{headerSlot}
-
+
{children}
diff --git a/themes/heo/components/CategoryBar.js b/themes/heo/components/CategoryBar.js
index 41022122..031ea6c3 100644
--- a/themes/heo/components/CategoryBar.js
+++ b/themes/heo/components/CategoryBar.js
@@ -1,3 +1,6 @@
+import { useGlobal } from '@/lib/global'
+import Link from 'next/link'
+import { useRouter } from 'next/router'
/**
* 博客列表上方嵌入条
@@ -6,14 +9,39 @@
*/
export default function CategoryBar(props) {
const { categoryOptions } = props
- console.log(categoryOptions)
- return
- {categoryOptions?.map(c => {
- return (
-
+ const { locale } = useGlobal()
+
+ return
- {c.name}
-
- )
- })}
-
+
+
+}
+
+/**
+ * 按钮
+ * @param {*} param0
+ * @returns
+ */
+const MenuItem = ({ href, name }) => {
+ const router = useRouter()
+ const selected = router.pathname === href
+ return
+
+ {categoryOptions?.map((c, index) => {
+ return (
+
+
+
+
+
+ )
+ })}
+
+
+ {locale.COMMON.MORE}
+
+
+
+ {name}
+
}
diff --git a/themes/heo/components/InfoCard.js b/themes/heo/components/InfoCard.js
index 1185e030..17ad8ece 100644
--- a/themes/heo/components/InfoCard.js
+++ b/themes/heo/components/InfoCard.js
@@ -1,8 +1,8 @@
import BLOG from '@/blog.config'
-import { useRouter } from 'next/router'
+import { ArrowRightCircle, GlobeAlt } from '@/components/HeroIcons'
+import Link from 'next/link'
+import Announcement from './Announcement'
import Card from './Card'
-import SocialButton from './SocialButton'
-import MenuGroupCard from './MenuGroupCard'
/**
* 社交信息卡
@@ -10,23 +10,39 @@ import MenuGroupCard from './MenuGroupCard'
* @returns
*/
export function InfoCard(props) {
- const { className, siteInfo } = props
- const router = useRouter()
+ const { siteInfo, notice } = props
return (
- {
- router.push('/')
- }}
- >
- {/* eslint-disable-next-line @next/next/no-img-element */}
- 
+
+
)
}
diff --git a/themes/heo/components/MenuGroupCard.js b/themes/heo/components/MenuGroupCard.js
index 25dba50c..89591369 100644
--- a/themes/heo/components/MenuGroupCard.js
+++ b/themes/heo/components/MenuGroupCard.js
@@ -17,29 +17,28 @@ const MenuGroupCard = (props) => {
]
return (
-
)
}
export default MenuGroupCard
diff --git a/themes/heo/components/SideRight.js b/themes/heo/components/SideRight.js
index a08409e9..b929b934 100644
--- a/themes/heo/components/SideRight.js
+++ b/themes/heo/components/SideRight.js
@@ -3,8 +3,10 @@ import TagGroups from './TagGroups'
import Catalog from './Catalog'
import { InfoCard } from './InfoCard'
import dynamic from 'next/dynamic'
-import Announcement from './Announcement'
import Live2D from '@/components/Live2D'
+import MenuGroupCard from './MenuGroupCard'
+import FlipCard from '@/components/FlipCard'
+import Link from 'next/link'
const FaceBookPage = dynamic(
() => {
@@ -27,25 +29,42 @@ const FaceBookPage = dynamic(
export default function SideRight(props) {
const {
post, tagOptions,
- currentTag, rightAreaSlot, notice
+ currentTag, rightAreaSlot
} = props
console.log('props', props)
return (
-
+
+
+
+ 你好！我是
+
+
+ {/* eslint-disable-next-line @next/next/no-img-element */}
+
+
+ + {BLOG.AUTHOR} +
+ +
+
+
+
+
-
+
+
+
+
+
+
了解更多
+ {BLOG.AUTHOR}
- {BLOG.BIO}
-
+
-
+
+
+ {/* 标签和成绩 */}
+
+
-
Join Us
-
-
+
+
}
+
+ backContent={交流频道
+加入我们的社群讨论分享
+ +
+
+ 点击查看联系方式
+
+
}
+ />
+
+ +
{post && post.toc && post.toc.length > 1 &&
- {link.subMenus.map(sLink => {
- return
{selected && } {tag.name + (tag.count ? `(${tag.count})` : '')}
+ className={'cursor-pointer inline-block hover:text-blue-600 duration-200 py-0.5 px-1 text-sm whitespace-nowrap ' }>
+
+ {link.subMenus.map((sLink, index) => {
+ return
{link?.icon && } {sLink.title}
diff --git a/themes/hexo/index.js b/themes/hexo/index.js
index 77690dcd..d42831eb 100644
--- a/themes/hexo/index.js
+++ b/themes/hexo/index.js
@@ -49,6 +49,7 @@ const LayoutBase = props => {
{/* 网页SEO */}