diff --git a/themes/matery/LayoutBase.js b/themes/matery/LayoutBase.js index 3931ec60..d226497e 100644 --- a/themes/matery/LayoutBase.js +++ b/themes/matery/LayoutBase.js @@ -42,7 +42,7 @@ const LayoutBase = props => { }, [show]) return ( -
+
@@ -50,15 +50,9 @@ const LayoutBase = props => { {headerSlot} -
-
-
+
+
{onLoading ? : children} -
- {/* */}
diff --git a/themes/matery/LayoutSlug.js b/themes/matery/LayoutSlug.js index 327497ac..862a4225 100644 --- a/themes/matery/LayoutSlug.js +++ b/themes/matery/LayoutSlug.js @@ -9,7 +9,6 @@ import Comment from '@/components/Comment' import NotionPage from '@/components/NotionPage' import ArticleAdjacent from './components/ArticleAdjacent' import ArticleCopyright from './components/ArticleCopyright' -import ArticleRecommend from './components/ArticleRecommend' import { isBrowser } from '@/lib/utils' export const LayoutSlug = props => { @@ -46,10 +45,10 @@ export const LayoutSlug = props => { showTag={false} floatSlot={floatSlot} > -
+
{lock && } - {!lock &&
+ {!lock &&
{/* Notion文章主体 */} @@ -69,20 +68,22 @@ export const LayoutSlug = props => { {post.type === 'Post' && } - {post.type === 'Post' && } - {post.type === 'Post' && }

{/* 评论互动 */} -
+
}
+
+ {post.type === 'Post' && } +
+
diff --git a/themes/matery/components/ArticleAdjacent.js b/themes/matery/components/ArticleAdjacent.js index 80732494..34dfc921 100644 --- a/themes/matery/components/ArticleAdjacent.js +++ b/themes/matery/components/ArticleAdjacent.js @@ -1,5 +1,5 @@ -import Link from 'next/link' import CONFIG_MATERY from '../config_matery' +import BlogPostCard from './BlogPostCard' /** * 上一篇,下一篇文章 @@ -10,16 +10,14 @@ export default function ArticleAdjacent ({ prev, next }) { if (!prev || !next || !CONFIG_MATERY.ARTICLE_ADJACENT) { return <> } - return
- - - {prev.title} - - - - {next.title} - - - + return
+ +
+ +
+
+ +
+
} diff --git a/themes/matery/components/ArticleRecommend.js b/themes/matery/components/ArticleRecommend.js index eb4c4314..428b7afa 100644 --- a/themes/matery/components/ArticleRecommend.js +++ b/themes/matery/components/ArticleRecommend.js @@ -9,6 +9,8 @@ import { useGlobal } from '@/lib/global' * @returns */ export default function ArticleRecommend({ recommendPosts, siteInfo }) { + const { locale } = useGlobal() + if ( !CONFIG_MATERY.ARTICLE_RECOMMEND || !recommendPosts || @@ -16,7 +18,7 @@ export default function ArticleRecommend({ recommendPosts, siteInfo }) { ) { return <> } - const { locale } = useGlobal() + return (
diff --git a/themes/matery/components/BlogPostListPage.js b/themes/matery/components/BlogPostListPage.js index b7997236..56b91642 100644 --- a/themes/matery/components/BlogPostListPage.js +++ b/themes/matery/components/BlogPostListPage.js @@ -1,5 +1,4 @@ import BlogPostCard from './BlogPostCard' -import PaginationNumber from './PaginationNumber' import BLOG from '@/blog.config' import BlogPostListEmpty from './BlogPostListEmpty' import PaginationSimple from './PaginationSimple' @@ -20,6 +19,7 @@ const BlogPostListPage = ({ page = 1, posts = [], postCount }) => { } else { return (
+
{/* 文章列表 */}
{posts.map(post => ( diff --git a/themes/matery/components/HeaderArticle.js b/themes/matery/components/HeaderArticle.js index 8ebfe2bd..984dc314 100644 --- a/themes/matery/components/HeaderArticle.js +++ b/themes/matery/components/HeaderArticle.js @@ -1,69 +1,20 @@ -import Link from 'next/link' -import { useGlobal } from '@/lib/global' -import formatDate from '@/lib/formatDate' -import BLOG from '@/blog.config' - export default function HeaderArticle({ post, siteInfo }) { - const { locale } = useGlobal() - if (!post) { return <> } const headerImage = post?.page_cover ? `url("${post.page_cover}")` : `url("${siteInfo?.pageCover}")` - - const date = formatDate( - post?.date?.start_date || post?.createdTime, - locale.LOCALE - ) - return (
) } diff --git a/themes/matery/components/PaginationSimple.js b/themes/matery/components/PaginationSimple.js index 21e6697e..38196ab2 100644 --- a/themes/matery/components/PaginationSimple.js +++ b/themes/matery/components/PaginationSimple.js @@ -29,8 +29,8 @@ const PaginationSimple = ({ page, totalPage }) => {