diff --git a/components/LoadingCover.js b/components/LoadingCover.js
index 148425e7..c9ec6752 100644
--- a/components/LoadingCover.js
+++ b/components/LoadingCover.js
@@ -1,15 +1,13 @@
/**
- * 加载主题文件时的全局遮罩
+ * 加载文件时的全局遮罩
* @returns
*/
const LoadingCover = (props) => {
const { onReading } = props
- return <>
-
-
-
-
+ return
+
+
}
export default LoadingCover
diff --git a/lib/global.js b/lib/global.js
index db8b3349..f96d326a 100644
--- a/lib/global.js
+++ b/lib/global.js
@@ -33,6 +33,8 @@ export function GlobalContextProvider({ children }) {
const handleBeforeUnload = (event) => {
setOnReading(true)
}
+ // 监听页面元素加载完
+ setOnReading(false)
window.addEventListener('beforeunload', handleBeforeUnload)
return () => {
window.removeEventListener('beforeunload', handleBeforeUnload)
diff --git a/pages/404.js b/pages/404.js
index 3afa60ee..f23edcec 100644
--- a/pages/404.js
+++ b/pages/404.js
@@ -1,7 +1,6 @@
import { getGlobalNotionData } from '@/lib/notion/getNotionData'
import { useGlobal } from '@/lib/global'
import dynamic from 'next/dynamic'
-import Loading from '@/components/Loading'
/**
* 404
@@ -11,7 +10,7 @@ import Loading from '@/components/Loading'
const NoFound = props => {
const { theme, siteInfo } = useGlobal()
const meta = { title: `${props?.siteInfo?.title} | 页面找不到啦`, image: siteInfo?.pageCover }
- const Layout404 = dynamic(() => import(`@/themes/${theme}/Layout404`).then(async (m) => { return m.Layout404 }), { ssr: true, loading: () =>
})
+ const Layout404 = dynamic(() => import(`@/themes/${theme}/Layout404`))
return
}
diff --git a/pages/[...slug].js b/pages/[...slug].js
index 138a9cda..f0d3f8d2 100644
--- a/pages/[...slug].js
+++ b/pages/[...slug].js
@@ -2,7 +2,7 @@ import BLOG from '@/blog.config'
import { getPostBlocks } from '@/lib/notion'
import { getGlobalNotionData } from '@/lib/notion/getNotionData'
import { useGlobal } from '@/lib/global'
-import { useEffect, useState } from 'react'
+import { Suspense, useEffect, useState } from 'react'
import { idToUuid } from 'notion-utils'
import { useRouter } from 'next/router'
import { isBrowser } from '@/lib/utils'
@@ -12,6 +12,11 @@ import md5 from 'js-md5'
import dynamic from 'next/dynamic'
import Loading from '@/components/Loading'
+/**
+ * 懒加载默认主题
+ */
+const DefaultLayout = dynamic(() => import(`@/themes/${BLOG.THEME}/LayoutSlug`), { ssr: true })
+
/**
* 根据notion的slug访问页面
* @param {*} props
@@ -21,10 +26,18 @@ const Slug = props => {
const { theme, setOnLoading } = useGlobal()
const { post, siteInfo } = props
const router = useRouter()
+ const [Layout, setLayout] = useState(DefaultLayout)
+
+ // 切换主题
+ useEffect(() => {
+ const loadLayout = async () => {
+ setLayout(dynamic(() => import(`@/themes/${theme}/LayoutSlug`)))
+ }
+ loadLayout()
+ }, [theme])
// 文章锁🔐
const [lock, setLock] = useState(post?.password && post?.password !== '')
- const LayoutSlug = dynamic(() => import(`@/themes/${theme}`).then(async (m) => { return m.LayoutSlug }), { ssr: true, loading: () => })
/**
* 验证文章密码
@@ -39,9 +52,24 @@ const Slug = props => {
return false
}
+ // 文章加载
useEffect(() => {
setOnLoading(false)
+ // 404
+ if (!post) {
+ setTimeout(() => {
+ if (isBrowser()) {
+ const article = document.getElementById('notion-article')
+ if (!article) {
+ router.push('/404').then(() => {
+ console.warn('找不到页面', router.asPath)
+ })
+ }
+ }
+ }, 8 * 1000) // 404时长 8秒
+ }
+ // 文章加密
if (post?.password && post?.password !== '') {
setLock(true)
} else {
@@ -56,37 +84,20 @@ const Slug = props => {
})
}, [post])
- if (!post) {
- setTimeout(() => {
- if (isBrowser()) {
- const article = document.getElementById('notion-article')
- if (!article) {
- router.push('/404').then(() => {
- console.warn('找不到页面', router.asPath)
- })
- }
- }
- }, 8 * 1000) // 404时长 8秒
- const meta = { title: `${props?.siteInfo?.title || BLOG.TITLE} | loading`, image: siteInfo?.pageCover || BLOG.HOME_BANNER_IMAGE }
-
- return
- }
-
- props = { ...props, lock, setLock, validPassword }
-
const meta = {
- title: `${post?.title} | ${siteInfo?.title}`,
+ title: post ? `${post?.title} | ${siteInfo?.title}` : `${props?.siteInfo?.title || BLOG.TITLE} | loading`,
description: post?.summary,
type: post?.type,
slug: post?.slug,
- image: post?.page_cover,
+ image: post?.page_cover || (siteInfo?.pageCover || BLOG.HOME_BANNER_IMAGE),
category: post?.category?.[0],
tags: post?.tags
}
+ props = { ...props, lock, meta, setLock, validPassword }
- return (
-
- )
+ return }>
+
+
}
export async function getStaticPaths() {
diff --git a/pages/archive/index.js b/pages/archive/index.js
index 6a247414..bb095411 100644
--- a/pages/archive/index.js
+++ b/pages/archive/index.js
@@ -1,13 +1,28 @@
import { getGlobalNotionData } from '@/lib/notion/getNotionData'
-import React from 'react'
+import React, { Suspense, useEffect, useState } from 'react'
import { useGlobal } from '@/lib/global'
import dynamic from 'next/dynamic'
import BLOG from '@/blog.config'
+
import Loading from '@/components/Loading'
+/**
+ * 加载默认主题
+ */
+const DefaultLayout = dynamic(() => import(`@/themes/${BLOG.THEME}/LayoutArchive`), { ssr: true })
+
const ArchiveIndex = props => {
- const { theme, locale } = useGlobal()
const { siteInfo } = props
+ const { theme, locale } = useGlobal()
+ const [Layout, setLayout] = useState(DefaultLayout)
+ // 切换主题
+ useEffect(() => {
+ const loadLayout = async () => {
+ setLayout(dynamic(() => import(`@/themes/${theme}/LayoutArchive`)))
+ }
+ loadLayout()
+ }, [theme])
+
const meta = {
title: `${locale.NAV.ARCHIVE} | ${siteInfo?.title}`,
description: siteInfo?.description,
@@ -16,8 +31,11 @@ const ArchiveIndex = props => {
type: 'website'
}
- const LayoutArchive = dynamic(() => import(`@/themes/${theme}`).then(async (m) => { return m.LayoutArchive }), { ssr: true, loading: () => })
- return
+ props = { ...props, meta }
+
+ return }>
+
+
}
export async function getStaticProps() {
diff --git a/pages/category/[category]/index.js b/pages/category/[category]/index.js
index 28725614..1db1e85c 100644
--- a/pages/category/[category]/index.js
+++ b/pages/category/[category]/index.js
@@ -1,23 +1,33 @@
import { getGlobalNotionData } from '@/lib/notion/getNotionData'
-import React from 'react'
+import React, { Suspense, useEffect, useState } from 'react'
import { useGlobal } from '@/lib/global'
import dynamic from 'next/dynamic'
import BLOG from '@/blog.config'
+
import Loading from '@/components/Loading'
+/**
+ * 加载默认主题
+ */
+const DefaultLayout = dynamic(() => import(`@/themes/${BLOG.THEME}/LayoutCategory`), { ssr: true })
+
/**
* 分类页
* @param {*} props
* @returns
*/
export default function Category(props) {
- const { theme } = useGlobal()
- const { siteInfo, posts } = props
- const { locale } = useGlobal()
- if (!posts) {
- const Layout404 = dynamic(() => import(`@/themes/${theme}`).then(async (m) => { return m.Layout404 }), { ssr: true, loading: () => })
- return
- }
+ const { siteInfo } = props
+ const { locale, theme } = useGlobal()
+ const [Layout, setLayout] = useState(DefaultLayout)
+ // 切换主题
+ useEffect(() => {
+ const loadLayout = async () => {
+ setLayout(dynamic(() => import(`@/themes/${theme}/LayoutCategory`)))
+ }
+ loadLayout()
+ }, [theme])
+
const meta = {
title: `${props.category} | ${locale.COMMON.CATEGORY} | ${
siteInfo?.title || ''
@@ -28,8 +38,11 @@ export default function Category(props) {
type: 'website'
}
- const LayoutCategory = dynamic(() => import(`@/themes/${theme}`).then(async (m) => { return m.LayoutCategory }), { ssr: true, loading: () => })
- return
+ props = { ...props, meta }
+
+ return }>
+
+
}
export async function getStaticProps({ params: { category } }) {
diff --git a/pages/category/[category]/page/[page].js b/pages/category/[category]/page/[page].js
index bb7d6d26..7ed2d109 100644
--- a/pages/category/[category]/page/[page].js
+++ b/pages/category/[category]/page/[page].js
@@ -1,10 +1,16 @@
import { getGlobalNotionData } from '@/lib/notion/getNotionData'
-import React from 'react'
+import React, { Suspense, useEffect, useState } from 'react'
import { useGlobal } from '@/lib/global'
import dynamic from 'next/dynamic'
import BLOG from '@/blog.config'
+
import Loading from '@/components/Loading'
+/**
+ * 加载默认主题
+ */
+const DefaultLayout = dynamic(() => import(`@/themes/${BLOG.THEME}/LayoutCategory`), { ssr: true })
+
/**
* 分类页
* @param {*} props
@@ -12,12 +18,18 @@ import Loading from '@/components/Loading'
*/
export default function Category(props) {
const { theme } = useGlobal()
- const { siteInfo, posts } = props
+ const { siteInfo } = props
const { locale } = useGlobal()
- if (!posts) {
- const Layout404 = dynamic(() => import(`@/themes/${theme}`).then(async (m) => { return m.Layout404 }), { ssr: true, loading: () => })
- return
- }
+
+ const [Layout, setLayout] = useState(DefaultLayout)
+ // 切换主题
+ useEffect(() => {
+ const loadLayout = async () => {
+ setLayout(dynamic(() => import(`@/themes/${theme}/LayoutCategory`)))
+ }
+ loadLayout()
+ }, [theme])
+
const meta = {
title: `${props.category} | ${locale.COMMON.CATEGORY} | ${
siteInfo?.title || ''
@@ -28,8 +40,11 @@ export default function Category(props) {
type: 'website'
}
- const LayoutCategory = dynamic(() => import(`@/themes/${theme}`).then(async (m) => { return m.LayoutCategory }), { ssr: true, loading: () => })
- return
+ props = { ...props, meta }
+
+ return }>
+
+
}
export async function getStaticProps({ params: { category, page } }) {
diff --git a/pages/category/index.js b/pages/category/index.js
index 8c7c6515..d4c6ab00 100644
--- a/pages/category/index.js
+++ b/pages/category/index.js
@@ -1,9 +1,16 @@
import { getGlobalNotionData } from '@/lib/notion/getNotionData'
-import React from 'react'
+import React, { Suspense, useEffect, useState } from 'react'
import { useGlobal } from '@/lib/global'
import dynamic from 'next/dynamic'
import BLOG from '@/blog.config'
+import Loading from '@/components/Loading'
+
+/**
+ * 加载默认主题
+ */
+const DefaultLayout = dynamic(() => import(`@/themes/${BLOG.THEME}/LayoutCategoryIndex`), { ssr: true })
+
/**
* 分类首页
* @param {*} props
@@ -13,6 +20,16 @@ export default function Category(props) {
const { theme } = useGlobal()
const { locale } = useGlobal()
const { siteInfo } = props
+ const [Layout, setLayout] = useState(DefaultLayout)
+
+ // 切换主题
+ useEffect(() => {
+ const loadLayout = async () => {
+ setLayout(dynamic(() => import(`@/themes/${theme}/LayoutCategoryIndex`)))
+ }
+ loadLayout()
+ }, [theme])
+
const meta = {
title: `${locale.COMMON.CATEGORY} | ${siteInfo?.title}`,
description: siteInfo?.description,
@@ -20,8 +37,11 @@ export default function Category(props) {
slug: 'category',
type: 'website'
}
- const LayoutCategoryIndex = dynamic(() => import(`@/themes/${theme}`).then(async (m) => { return m.LayoutCategoryIndex }), { ssr: false })
- return
+ props = { ...props, meta }
+
+ return }>
+
+
}
export async function getStaticProps() {
diff --git a/pages/index.js b/pages/index.js
index 94334aef..8de156c9 100644
--- a/pages/index.js
+++ b/pages/index.js
@@ -11,9 +11,7 @@ import Loading from '@/components/Loading'
/**
* 懒加载默认主题
*/
-const DefaultLayoutIndex = dynamic(() => import(`@/themes/${BLOG.THEME}`).then(async (m) => {
- return m.LayoutIndex
-}), { ssr: true })
+const DefaultLayout = dynamic(() => import(`@/themes/${BLOG.THEME}/LayoutIndex`), { ssr: true })
/**
* 首页布局
@@ -22,31 +20,19 @@ const DefaultLayoutIndex = dynamic(() => import(`@/themes/${BLOG.THEME}`).then(a
*/
const Index = props => {
// 动态切换主题
- const { theme, setOnReading } = useGlobal()
- const [LayoutIndex, setLayoutIndex] = useState(DefaultLayoutIndex)
-
+ const { theme } = useGlobal()
+ const [Layout, setLayoutIndex] = useState(DefaultLayout)
useEffect(() => {
const loadLayout = async () => {
- try {
- const NewLayoutIndex = await dynamic(() => import(`@/themes/${theme}`).then(async (m) => {
- setOnReading(false)
- return m.LayoutIndex
- }))
-
- setLayoutIndex(NewLayoutIndex)
- } catch (error) {
- console.error('Error while loading layout:', error)
- }
+ setLayoutIndex(dynamic(() => import(`@/themes/${theme}/LayoutIndex`)))
}
-
- loadLayout()
+ console.log(loadLayout)
+ // loadLayout()
}, [theme])
- return (
- }>
-
-
- )
+ return }>
+
+
}
/**
diff --git a/pages/page/[page].js b/pages/page/[page].js
index 252ec566..e3b03ddd 100644
--- a/pages/page/[page].js
+++ b/pages/page/[page].js
@@ -3,24 +3,43 @@ import { getPostBlocks } from '@/lib/notion'
import { getGlobalNotionData } from '@/lib/notion/getNotionData'
import { useGlobal } from '@/lib/global'
import dynamic from 'next/dynamic'
+import { Suspense, useEffect, useState } from 'react'
import Loading from '@/components/Loading'
+/**
+ * 加载默认主题
+ */
+const DefaultLayout = dynamic(() => import(`@/themes/${BLOG.THEME}/LayoutPage`), { ssr: true })
+/**
+ * 文章列表分页
+ * @param {*} props
+ * @returns
+ */
const Page = props => {
const { theme } = useGlobal()
const { siteInfo } = props
- if (!siteInfo) {
- return <>
- }
+ const [Layout, setLayout] = useState(DefaultLayout)
+ // 切换主题
+ useEffect(() => {
+ const loadLayout = async () => {
+ setLayout(dynamic(() => import(`@/themes/${theme}/LayoutPage`)))
+ }
+ loadLayout()
+ }, [theme])
+
const meta = {
- title: `${props.page} | Page | ${siteInfo?.title}`,
+ title: `${props?.page} | Page | ${siteInfo?.title}`,
description: siteInfo?.description,
image: siteInfo?.pageCover,
slug: 'page/' + props.page,
type: 'website'
}
- const LayoutPage = dynamic(() => import(`@/themes/${theme}`).then(async (m) => { return m.LayoutPage }), { ssr: true, loading: () => })
- return
+ props = { ...props, meta }
+
+ return }>
+
+
}
export async function getStaticPaths() {
diff --git a/pages/search/[keyword]/index.js b/pages/search/[keyword]/index.js
index dd81f60f..92b18fb3 100644
--- a/pages/search/[keyword]/index.js
+++ b/pages/search/[keyword]/index.js
@@ -3,11 +3,26 @@ import { useGlobal } from '@/lib/global'
import { getDataFromCache } from '@/lib/cache/cache_manager'
import BLOG from '@/blog.config'
import dynamic from 'next/dynamic'
+import { Suspense, useEffect, useState } from 'react'
import Loading from '@/components/Loading'
+/**
+ * 加载默认主题
+ */
+const DefaultLayout = dynamic(() => import(`@/themes/${BLOG.THEME}/LayoutSearch`), { ssr: true })
+
const Index = props => {
const { keyword, siteInfo } = props
- const { locale } = useGlobal()
+ const { locale, theme } = useGlobal()
+ const [Layout, setLayout] = useState(DefaultLayout)
+ // 切换主题
+ useEffect(() => {
+ const loadLayout = async () => {
+ setLayout(dynamic(() => import(`@/themes/${theme}/LayoutSearch`)))
+ }
+ loadLayout()
+ }, [theme])
+
const meta = {
title: `${keyword || ''}${keyword ? ' | ' : ''}${locale.NAV.SEARCH} | ${siteInfo?.title}`,
description: siteInfo?.title,
@@ -15,10 +30,12 @@ const Index = props => {
slug: 'search/' + (keyword || ''),
type: 'website'
}
- const { theme } = useGlobal()
- const LayoutSearch = dynamic(() => import(`@/themes/${theme}`).then(async (m) => { return m.LayoutSearch }), { ssr: true, loading: () => })
- return
+ props = { ...props, meta }
+
+ return }>
+
+
}
/**
diff --git a/pages/search/[keyword]/page/[page].js b/pages/search/[keyword]/page/[page].js
index 57ab7163..a279f332 100644
--- a/pages/search/[keyword]/page/[page].js
+++ b/pages/search/[keyword]/page/[page].js
@@ -3,11 +3,25 @@ import { useGlobal } from '@/lib/global'
import { getDataFromCache } from '@/lib/cache/cache_manager'
import dynamic from 'next/dynamic'
import BLOG from '@/blog.config'
+import { Suspense, useEffect, useState } from 'react'
import Loading from '@/components/Loading'
+/**
+ * 加载默认主题
+ */
+const DefaultLayout = dynamic(() => import(`@/themes/${BLOG.THEME}/LayoutSearch`), { ssr: true })
+
const Index = props => {
const { keyword, siteInfo } = props
- const { locale } = useGlobal()
+ const { locale, theme } = useGlobal()
+ const [Layout, setLayout] = useState(DefaultLayout)
+ // 切换主题
+ useEffect(() => {
+ const loadLayout = async () => {
+ setLayout(dynamic(() => import(`@/themes/${theme}/LayoutSearch`)))
+ }
+ loadLayout()
+ }, [theme])
const meta = {
title: `${keyword || ''}${keyword ? ' | ' : ''}${locale.NAV.SEARCH} | ${siteInfo?.title}`,
description: siteInfo?.title,
@@ -15,9 +29,12 @@ const Index = props => {
slug: 'search/' + (keyword || ''),
type: 'website'
}
- const { theme } = useGlobal()
- const LayoutSearch = dynamic(() => import(`@/themes/${theme}`).then(async (m) => { return m.LayoutSearch }), { ssr: true, loading: () => })
- return
+
+ props = { ...props, meta, currentSearch: keyword }
+
+ return }>
+
+
}
/**
diff --git a/pages/search/index.js b/pages/search/index.js
index a2347808..06fd3984 100644
--- a/pages/search/index.js
+++ b/pages/search/index.js
@@ -3,10 +3,26 @@ import { useGlobal } from '@/lib/global'
import { useRouter } from 'next/router'
import BLOG from '@/blog.config'
import dynamic from 'next/dynamic'
+import { Suspense, useEffect, useState } from 'react'
import Loading from '@/components/Loading'
+/**
+ * 加载默认主题
+ */
+const DefaultLayout = dynamic(() => import(`@/themes/${BLOG.THEME}/LayoutSearch`), { ssr: true })
const Search = props => {
const { posts, siteInfo } = props
+ const { theme } = useGlobal()
+ const [Layout, setLayout] = useState(DefaultLayout)
+
+ // 切换主题
+ useEffect(() => {
+ const loadLayout = async () => {
+ setLayout(dynamic(() => import(`@/themes/${theme}/LayoutSearch`)))
+ }
+ loadLayout()
+ }, [theme])
+
const router = useRouter()
let filteredPosts
const keyword = getSearchKey(router)
@@ -32,10 +48,11 @@ const Search = props => {
type: 'website'
}
- const { theme } = useGlobal()
+ props = { ...props, meta, posts: { filteredPosts } }
- const LayoutSearch = dynamic(() => import(`@/themes/${theme}`).then(async (m) => { return m.LayoutSearch }), { ssr: true, loading: () => })
- return
+ return }>
+
+
}
/**
diff --git a/pages/tag/[tag]/index.js b/pages/tag/[tag]/index.js
index 1ba4f220..8b5729f3 100644
--- a/pages/tag/[tag]/index.js
+++ b/pages/tag/[tag]/index.js
@@ -2,17 +2,27 @@ import { useGlobal } from '@/lib/global'
import { getGlobalNotionData } from '@/lib/notion/getNotionData'
import BLOG from '@/blog.config'
import dynamic from 'next/dynamic'
+import { Suspense, useEffect, useState } from 'react'
import Loading from '@/components/Loading'
+/**
+ * 加载默认主题
+ */
+const DefaultLayout = dynamic(() => import(`@/themes/${BLOG.THEME}/LayoutTag`), { ssr: true })
+
const Tag = props => {
const { theme } = useGlobal()
const { locale } = useGlobal()
- const { tag, siteInfo, posts } = props
+ const { tag, siteInfo } = props
+ const [Layout, setLayout] = useState(DefaultLayout)
- if (!posts) {
- const Layout404 = dynamic(() => import(`@/themes/${theme}`).then(async (m) => { return m.Layout404 }), { ssr: true, loading: () => })
- return
- }
+ // 切换主题
+ useEffect(() => {
+ const loadLayout = async () => {
+ setLayout(dynamic(() => import(`@/themes/${theme}/LayoutTag`)))
+ }
+ loadLayout()
+ }, [theme])
const meta = {
title: `${tag} | ${locale.COMMON.TAGS} | ${siteInfo?.title}`,
@@ -21,8 +31,11 @@ const Tag = props => {
slug: 'tag/' + tag,
type: 'website'
}
- const LayoutTag = dynamic(() => import(`@/themes/${theme}`).then(async (m) => { return m.LayoutTag }), { ssr: true, loading: () => })
- return
+ props = { ...props, meta }
+
+ return }>
+
+
}
export async function getStaticProps({ params: { tag } }) {
diff --git a/pages/tag/[tag]/page/[page].js b/pages/tag/[tag]/page/[page].js
index c3fc2009..2adb6c2c 100644
--- a/pages/tag/[tag]/page/[page].js
+++ b/pages/tag/[tag]/page/[page].js
@@ -2,17 +2,26 @@ import { useGlobal } from '@/lib/global'
import { getGlobalNotionData } from '@/lib/notion/getNotionData'
import BLOG from '@/blog.config'
import dynamic from 'next/dynamic'
+import { Suspense, useEffect, useState } from 'react'
import Loading from '@/components/Loading'
+/**
+ * 加载默认主题
+ */
+const DefaultLayout = dynamic(() => import(`@/themes/${BLOG.THEME}/LayoutTag`), { ssr: true })
+
const Tag = props => {
const { theme } = useGlobal()
const { locale } = useGlobal()
- const { tag, siteInfo, posts } = props
-
- if (!posts) {
- const Layout404 = dynamic(() => import(`@/themes/${theme}`).then(async (m) => { return m.Layout404 }), { ssr: true, loading: () => })
- return
- }
+ const { tag, siteInfo } = props
+ const [Layout, setLayout] = useState(DefaultLayout)
+ // 切换主题
+ useEffect(() => {
+ const loadLayout = async () => {
+ setLayout(dynamic(() => import(`@/themes/${theme}/LayoutTag`)))
+ }
+ loadLayout()
+ }, [theme])
const meta = {
title: `${tag} | ${locale.COMMON.TAGS} | ${siteInfo?.title}`,
@@ -21,8 +30,11 @@ const Tag = props => {
slug: 'tag/' + tag,
type: 'website'
}
- const LayoutTag = dynamic(() => import(`@/themes/${theme}`).then(async (m) => { return m.LayoutTag }), { ssr: true, loading: () => })
- return
+ props = { ...props, meta }
+
+ return }>
+
+
}
export async function getStaticProps({ params: { tag, page } }) {
diff --git a/pages/tag/index.js b/pages/tag/index.js
index 3f69551e..8b8bc1c7 100644
--- a/pages/tag/index.js
+++ b/pages/tag/index.js
@@ -1,9 +1,13 @@
import { getGlobalNotionData } from '@/lib/notion/getNotionData'
-import React from 'react'
+import { Suspense, useEffect, useState } from 'react'
import { useGlobal } from '@/lib/global'
import BLOG from '@/blog.config'
import dynamic from 'next/dynamic'
import Loading from '@/components/Loading'
+/**
+ * 默认主题
+ */
+const DefaultLayout = dynamic(() => import(`@/themes/${BLOG.THEME}/LayoutTagIndex`), { ssr: true })
/**
* 标签首页
@@ -11,9 +15,18 @@ import Loading from '@/components/Loading'
* @returns
*/
const TagIndex = props => {
- const { theme } = useGlobal()
const { locale } = useGlobal()
const { siteInfo } = props
+ const { theme } = useGlobal()
+ const [Layout, setLayout] = useState(DefaultLayout)
+ // 切换主题
+ useEffect(() => {
+ const loadLayout = async () => {
+ setLayout(dynamic(() => import(`@/themes/${theme}/LayoutTagIndex`)))
+ }
+ loadLayout()
+ }, [theme])
+
const meta = {
title: `${locale.COMMON.TAGS} | ${siteInfo?.title}`,
description: siteInfo?.description,
@@ -21,8 +34,11 @@ const TagIndex = props => {
slug: 'tag',
type: 'website'
}
- const LayoutTagIndex = dynamic(() => import(`@/themes/${theme}`).then(async (m) => { return m.LayoutTagIndex }), { ssr: true, loading: () => })
- return
+ props = { ...props, meta }
+
+ return }>
+
+
}
export async function getStaticProps() {
diff --git a/themes/example/Layout404.js b/themes/example/Layout404.js
index 5f92f0cc..c0992ad3 100644
--- a/themes/example/Layout404.js
+++ b/themes/example/Layout404.js
@@ -5,3 +5,5 @@ export const Layout404 = (props) => {
404 Not found.
}
+
+export default Layout404
diff --git a/themes/example/LayoutArchive.js b/themes/example/LayoutArchive.js
index 4ba92d8a..81ec0781 100644
--- a/themes/example/LayoutArchive.js
+++ b/themes/example/LayoutArchive.js
@@ -43,3 +43,5 @@ export const LayoutArchive = props => {
)
}
+
+export default LayoutArchive
diff --git a/themes/example/LayoutCategory.js b/themes/example/LayoutCategory.js
index 6d819185..517a5e82 100644
--- a/themes/example/LayoutCategory.js
+++ b/themes/example/LayoutCategory.js
@@ -8,3 +8,5 @@ export const LayoutCategory = props => {
{BLOG.POST_LIST_STYLE === 'page' ? : }
}
+
+export default LayoutCategory
diff --git a/themes/example/LayoutCategoryIndex.js b/themes/example/LayoutCategoryIndex.js
index a4c19033..d969516b 100644
--- a/themes/example/LayoutCategoryIndex.js
+++ b/themes/example/LayoutCategoryIndex.js
@@ -24,3 +24,5 @@ export const LayoutCategoryIndex = props => {
)
}
+
+export default LayoutCategoryIndex
diff --git a/themes/example/LayoutIndex.js b/themes/example/LayoutIndex.js
index 94eaac2f..18024d9c 100644
--- a/themes/example/LayoutIndex.js
+++ b/themes/example/LayoutIndex.js
@@ -11,3 +11,5 @@ export const LayoutIndex = props => {
)
}
+
+export default LayoutIndex
diff --git a/themes/example/LayoutPage.js b/themes/example/LayoutPage.js
index 15355018..184251a8 100644
--- a/themes/example/LayoutPage.js
+++ b/themes/example/LayoutPage.js
@@ -8,3 +8,5 @@ export const LayoutPage = props => {
)
}
+
+export default LayoutPage
diff --git a/themes/example/LayoutSlug.js b/themes/example/LayoutSlug.js
index b19f51ff..2ab9c557 100644
--- a/themes/example/LayoutSlug.js
+++ b/themes/example/LayoutSlug.js
@@ -29,3 +29,5 @@ export const LayoutSlug = props => {
)
}
+
+export default LayoutSlug
diff --git a/themes/example/LayoutTag.js b/themes/example/LayoutTag.js
index 06a6d778..f12ae546 100644
--- a/themes/example/LayoutTag.js
+++ b/themes/example/LayoutTag.js
@@ -8,3 +8,5 @@ export const LayoutTag = props => {
{BLOG.POST_LIST_STYLE === 'page' ? : }
}
+
+export default LayoutTag
diff --git a/themes/example/LayoutTagIndex.js b/themes/example/LayoutTagIndex.js
index 0705c2d6..63ffa7ca 100644
--- a/themes/example/LayoutTagIndex.js
+++ b/themes/example/LayoutTagIndex.js
@@ -27,3 +27,5 @@ export const LayoutTagIndex = (props) => {
)
}
+
+export default LayoutTagIndex
diff --git a/themes/example/index.js b/themes/example/index.js
deleted file mode 100644
index dd762bd4..00000000
--- a/themes/example/index.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import CONFIG_EXAMPLE from './config_example'
-import { LayoutIndex } from './LayoutIndex'
-import { LayoutSearch } from './LayoutSearch'
-import { LayoutArchive } from './LayoutArchive'
-import { LayoutSlug } from './LayoutSlug'
-import { Layout404 } from './Layout404'
-import { LayoutCategory } from './LayoutCategory'
-import { LayoutCategoryIndex } from './LayoutCategoryIndex'
-import { LayoutPage } from './LayoutPage'
-import { LayoutTag } from './LayoutTag'
-import { LayoutTagIndex } from './LayoutTagIndex'
-
-export {
- CONFIG_EXAMPLE as THEME_CONFIG,
- LayoutIndex,
- LayoutSearch,
- LayoutArchive,
- LayoutSlug,
- Layout404,
- LayoutCategory,
- LayoutCategoryIndex,
- LayoutPage,
- LayoutTag,
- LayoutTagIndex
-}
diff --git a/themes/fukasawa/Layout404.js b/themes/fukasawa/Layout404.js
index 183001c9..98ae689a 100644
--- a/themes/fukasawa/Layout404.js
+++ b/themes/fukasawa/Layout404.js
@@ -3,3 +3,5 @@ import LayoutBase from './LayoutBase'
export const Layout404 = props => {
return 404 Not found.
}
+
+export default Layout404
diff --git a/themes/medium/LayoutArchive.js b/themes/medium/LayoutArchive.js
index a1449b72..101b7119 100644
--- a/themes/medium/LayoutArchive.js
+++ b/themes/medium/LayoutArchive.js
@@ -45,3 +45,5 @@ export const LayoutArchive = props => {
)
}
+
+export default LayoutArchive
diff --git a/themes/medium/LayoutCategory.js b/themes/medium/LayoutCategory.js
index c20a4cde..a947b70e 100644
--- a/themes/medium/LayoutCategory.js
+++ b/themes/medium/LayoutCategory.js
@@ -11,3 +11,5 @@ export const LayoutCategory = props => {
{BLOG.POST_LIST_STYLE === 'page' ?