diff --git a/next.config.js b/next.config.js index 33b66908..4f2dd12a 100644 --- a/next.config.js +++ b/next.config.js @@ -11,7 +11,8 @@ module.exports = withBundleAnalyzer({ 'gravatar.com', 'www.notion.so', 'avatars.githubusercontent.com', - 'images.unsplash.com' + 'images.unsplash.com', + 'p1.qhimg.com' ] }, // 默认将feed重定向至 /public/rss/feed.xml diff --git a/pages/_app.js b/pages/_app.js index 33fe5ffa..41feba71 100644 --- a/pages/_app.js +++ b/pages/_app.js @@ -62,8 +62,8 @@ const MyApp = ({ Component, pageProps }) => { return ( - {externalPlugins} + {externalPlugins} ) } diff --git a/public/bg_image.jpg b/public/bg_image.jpg old mode 100644 new mode 100755 index d602ff36..191b9554 Binary files a/public/bg_image.jpg and b/public/bg_image.jpg differ diff --git a/themes/hexo/LayoutBase.js b/themes/hexo/LayoutBase.js index a9ec3442..80d06934 100644 --- a/themes/hexo/LayoutBase.js +++ b/themes/hexo/LayoutBase.js @@ -14,7 +14,13 @@ import dynamic from 'next/dynamic' const FacebookPage = dynamic( () => { - return import('@/components/FacebookPage') + let facebook = <> + try { + facebook = import('@/components/FacebookPage') + } catch (err) { + console.error(err) + } + return facebook }, { ssr: false } ) diff --git a/themes/hexo/LayoutIndex.js b/themes/hexo/LayoutIndex.js index be20b425..48cc29e4 100644 --- a/themes/hexo/LayoutIndex.js +++ b/themes/hexo/LayoutIndex.js @@ -9,7 +9,6 @@ import React from 'react' export const LayoutIndex = (props) => { const headerSlot = CONFIG_HEXO.HOME_BANNER_ENABLE &&
return - {BLOG.POST_LIST_STYLE === 'page' ? : } } diff --git a/themes/hexo/components/Announcement.js b/themes/hexo/components/Announcement.js index 18cb3f8a..391fd3a8 100644 --- a/themes/hexo/components/Announcement.js +++ b/themes/hexo/components/Announcement.js @@ -6,12 +6,7 @@ const NotionPage = dynamic(() => import('@/components/NotionPage')) const Announcement = ({ post, className }) => { const { locale } = useGlobal() if (post?.blockMap) { - return
+ return
{locale.COMMON.ANNOUNCEMENT}
{post && (
diff --git a/themes/hexo/components/BlogPostCard.js b/themes/hexo/components/BlogPostCard.js index 74912ee8..acc06a34 100644 --- a/themes/hexo/components/BlogPostCard.js +++ b/themes/hexo/components/BlogPostCard.js @@ -4,6 +4,7 @@ import React from 'react' import TagItemMini from './TagItemMini' import CONFIG_HEXO from '../config_hexo' import NotionPage from '@/components/NotionPage' +import Image from 'next/image' const BlogPostCard = ({ post, showSummary, siteInfo }) => { const showPreview = CONFIG_HEXO.POST_LIST_PREVIEW && post.blockMap @@ -15,6 +16,7 @@ const BlogPostCard = ({ post, showSummary, siteInfo }) => {
{
{showPageCover && !showPreview && post?.page_cover && ( -
+
{/* eslint-disable-next-line @next/next/no-img-element */} - {post.title} - {/* {post.title} */} + className="w-full cursor-pointer object-cover duration-200 hover:scale-125 " + /> */} +
+ {post.title} +
)} diff --git a/themes/hexo/components/Header.js b/themes/hexo/components/Header.js index 7f38552e..3644b6c1 100644 --- a/themes/hexo/components/Header.js +++ b/themes/hexo/components/Header.js @@ -1,3 +1,4 @@ +import Image from 'next/image' import { useEffect, useState } from 'react' import Typed from 'typed.js' import CONFIG_HEXO from '../config_hexo' @@ -45,7 +46,7 @@ const Header = props => { } }) - function updateHeaderHeight () { + function updateHeaderHeight() { requestAnimationFrame(() => { const wrapperElement = document.getElementById('wrapper') wrapperTop = wrapperElement?.offsetTop @@ -53,32 +54,34 @@ const Header = props => { } return ( - ) } @@ -104,12 +107,12 @@ const scrollTrigger = () => { ) { autoScroll = true window.scrollTo({ top: wrapperTop, behavior: 'smooth' }) - requestAnimationFrame(autoScrollEnd) + autoScrollEnd() } if ((scrollS < windowTop) && (scrollS < window.innerHeight) && !autoScroll) { autoScroll = true window.scrollTo({ top: 0, behavior: 'smooth' }) - requestAnimationFrame(autoScrollEnd) + autoScrollEnd() } windowTop = scrollS }) diff --git a/themes/hexo/components/LatestPostsGroup.js b/themes/hexo/components/LatestPostsGroup.js index 9e799aa9..009e91cb 100644 --- a/themes/hexo/components/LatestPostsGroup.js +++ b/themes/hexo/components/LatestPostsGroup.js @@ -1,5 +1,6 @@ import BLOG from '@/blog.config' import { useGlobal } from '@/lib/global' +import Image from 'next/image' import Link from 'next/link' import { useRouter } from 'next/router' @@ -19,46 +20,51 @@ const LatestPostsGroup = ({ latestPosts, siteInfo }) => { } return <> -
-
- - {locale.COMMON.LATEST_POSTS} -
-
- {latestPosts.map(post => { - const selected = currentPath === `${BLOG.SUB_PATH}/${post.slug}` - const headerImage = post?.page_cover - ? `url("${post.page_cover}")` - : `url("${siteInfo?.pageCover}")` - - return ( - ( - -
-
+
-
{post.title}
-
{post.lastEditedTime}
+ + {locale.COMMON.LATEST_POSTS}
-
+
+ {latestPosts.map(post => { + const selected = currentPath === `${BLOG.SUB_PATH}/${post.slug}` - ) - ) - })} - + const headerImage = post?.page_cover ? post.page_cover : siteInfo?.pageCover + + return ( + ( + +
+ {post.title} +
+
+
+
{post.title}
+
{post.lastEditedTime}
+
+
+ + ) + ) + })} + } export default LatestPostsGroup diff --git a/themes/hexo/components/TopNav.js b/themes/hexo/components/TopNav.js index 374f59ce..d3fe3f1b 100644 --- a/themes/hexo/components/TopNav.js +++ b/themes/hexo/components/TopNav.js @@ -61,7 +61,7 @@ const TopNav = props => { nav && nav.classList.replace('transparent', 'dark:bg-hexo-black-gray') } - const showNav = scrollS <= windowTop || scrollS < 5 || (header && scrollS <= header.clientHeight)// 非首页无大图时影藏顶部 滚动条置顶时隐藏 + const showNav = scrollS <= windowTop || scrollS < 5 || (header && scrollS <= header.clientHeight * 2)// 非首页无大图时影藏顶部 滚动条置顶时隐藏 if (!showNav) { nav && nav.classList.replace('top-0', '-top-20') windowTop = scrollS