+ className={'cursor-pointer inline-block whitespace-nowrap'}>
+
{tag.name}
{tag.count ?
{tag.count} : <>}
diff --git a/components/CommonHead.js b/components/CommonHead.js
index 32b71fad..24bfae69 100644
--- a/components/CommonHead.js
+++ b/components/CommonHead.js
@@ -58,7 +58,7 @@ const CommonHead = ({ meta, children }) => {
<>
diff --git a/lib/algolia.js b/lib/algolia.js
index b7439438..da92b334 100644
--- a/lib/algolia.js
+++ b/lib/algolia.js
@@ -17,26 +17,88 @@ const generateAlgoliaSearch = async({ allPages, force = false }) => {
/**
* 上传数据
+ * 根据上次修改文章日期和上次更新索引数据判断是否需要更新algolia索引
*/
-const uploadDataToAlgolia = (post) => {
+const uploadDataToAlgolia = async(post) => {
// Connect and authenticate with your Algolia app
const client = algoliasearch(BLOG.ALGOLIA_APP_ID, BLOG.ALGOLIA_ADMIN_APP_KEY)
// Create a new index and add a record
const index = client.initIndex(BLOG.ALGOLIA_INDEX)
- const record = {
- objectID: post.id,
- title: post.title,
- category: post.category,
- tags: post.tags,
- pageCover: post.pageCover,
- slug: post.slug,
- summary: post.summary,
- content: getPageContentText(post, post.blockMap)
+
+ if (!post) {
+ return
}
- index.saveObject(record).wait().then(r => {
- console.log('Algolia索引', r, record)
- })
+
+ // 检查是否有索引
+ let existed
+ let needUpdateIndex = false
+ try {
+ existed = await index.getObject(post.id)
+ } catch (error) {
+ // 通常是不存在索引
+ }
+
+ if (!existed || !existed?.lastEditedDate || !existed?.lastIndexDate) {
+ needUpdateIndex = true
+ } else {
+ const lastEditedDate = new Date(existed.lastEditedDate)
+ const lastIndexDate = new Date(existed.lastIndexDate)
+ if (lastEditedDate.getTime() > lastIndexDate.getTime()) {
+ needUpdateIndex = true
+ }
+ }
+
+ // 如果需要更新搜索
+ if (needUpdateIndex) {
+ const record = {
+ objectID: post.id,
+ title: post.title,
+ category: post.category,
+ tags: post.tags,
+ pageCover: post.pageCover,
+ slug: post.slug,
+ summary: post.summary,
+ lastEditedDate: post.lastEditedDate, // 更新文章时间
+ lastIndexDate: new Date(), // 更新索引时间
+ content: truncate(getPageContentText(post, post.blockMap), 9000) // 索引9000个字节，因为api限制总请求内容上限1万个字节
+ }
+ console.log('更新Algolia索引', record)
+ index.saveObject(record).wait().then(r => {
+ console.log('更新成功', r)
+ }).catch(err => {
+ console.log('algolia', err)
+ })
+ }
+}
+
+/**
+ * 限制内容字节数
+ * @param {*} str
+ * @param {*} maxBytes
+ * @returns
+ */
+function truncate(str, maxBytes) {
+ let count = 0
+ let result = ''
+ for (let i = 0; i < str.length; i++) {
+ const code = str.charCodeAt(i)
+ if (code <= 0x7f) {
+ count += 1
+ } else if (code <= 0x7ff) {
+ count += 2
+ } else if (code <= 0xffff) {
+ count += 3
+ } else {
+ count += 4
+ }
+ if (count <= maxBytes) {
+ result += str[i]
+ } else {
+ break
+ }
+ }
+ return result
}
export { uploadDataToAlgolia, generateAlgoliaSearch }
diff --git a/lib/notion/getNotion.js b/lib/notion/getNotion.js
index f73100c2..3da84ee8 100644
--- a/lib/notion/getNotion.js
+++ b/lib/notion/getNotion.js
@@ -25,7 +25,7 @@ export async function getNotion(pageId) {
title: postInfo?.properties?.title?.[0],
status: 'Published',
createdTime: formatDate(new Date(postInfo.created_time).toString(), BLOG.LANG),
- lastEditedTime: formatDate(new Date(postInfo?.last_edited_time).toString(), BLOG.LANG),
+ lastEditedDay: formatDate(new Date(postInfo?.last_edited_time).toString(), BLOG.LANG),
fullWidth: false,
page_cover: getPageCover(postInfo),
date: { start_date: formatDate(new Date(postInfo?.last_edited_time).toString(), BLOG.LANG) },
diff --git a/lib/notion/getNotionData.js b/lib/notion/getNotionData.js
index 393e3c63..d452eb5f 100644
--- a/lib/notion/getNotionData.js
+++ b/lib/notion/getNotionData.js
@@ -25,7 +25,8 @@ export async function getGlobalData({
from
}) {
// 从notion获取
- const db = deepClone(await getNotionPageData({ pageId, from }))
+ const data = await getNotionPageData({ pageId, from })
+ const db = deepClone(data)
// 不返回的敏感数据
delete db.block
delete db.schema
@@ -48,8 +49,8 @@ function getLatestPosts({ allPages, from, latestPostCount }) {
const allPosts = allPages?.filter(page => page.type === 'Post' && page.status === 'Published')
const latestPosts = Object.create(allPosts).sort((a, b) => {
- const dateA = new Date(a?.lastEditedTime || a?.publishDate)
- const dateB = new Date(b?.lastEditedTime || b?.publishDate)
+ const dateA = new Date(a?.lastEditedDay || a?.publishDate)
+ const dateB = new Date(b?.lastEditedDay || b?.publishDate)
return dateB - dateA
})
return latestPosts.slice(0, latestPostCount)
@@ -217,7 +218,7 @@ const EmptyData = (pageId) => {
const empty = {
notice: null,
siteInfo: getSiteInfo({}),
- allPages: [{ id: 1, title: `无法获取Notion数据，请检查Notion_ID： \n 当前 ${pageId}`, summary: '访问文档获取帮助→ https://tangly1024.com/article/vercel-deploy-notion-next', status: 'Published', type: 'Post', slug: '13a171332816461db29d50e9f575b00d', date: { start_date: '2023-04-24', lastEditedTime: '2023-04-24', tagItems: [] } }],
+ allPages: [{ id: 1, title: `无法获取Notion数据，请检查Notion_ID： \n 当前 ${pageId}`, summary: '访问文档获取帮助→ https://tangly1024.com/article/vercel-deploy-notion-next', status: 'Published', type: 'Post', slug: '13a171332816461db29d50e9f575b00d', date: { start_date: '2023-04-24', lastEditedDay: '2023-04-24', tagItems: [] } }],
allNavPages: [],
collection: [],
collectionQuery: {},
diff --git a/lib/notion/getPageProperties.js b/lib/notion/getPageProperties.js
index dea5c2b1..b9bdbe4d 100644
--- a/lib/notion/getPageProperties.js
+++ b/lib/notion/getPageProperties.js
@@ -78,8 +78,9 @@ export default async function getPageProperties(id, block, schema, authToken, ta
mapProperties(properties)
properties.publishDate = new Date(properties?.date?.start_date || value.created_time).getTime()
- properties.publishTime = formatDate(properties.publishDate, BLOG.LANG)
- properties.lastEditedTime = formatDate(new Date(value?.last_edited_time), BLOG.LANG)
+ properties.publishDay = formatDate(properties.publishDate, BLOG.LANG)
+ properties.lastEditedDate = new Date(value?.last_edited_time)
+ properties.lastEditedDay = formatDate(new Date(value?.last_edited_time), BLOG.LANG)
properties.fullWidth = value.format?.page_full_width ?? false
properties.pageIcon = mapImgUrl(block[id].value?.format?.page_icon, block[id].value) ?? ''
properties.pageCover = mapImgUrl(block[id].value?.format?.page_cover, block[id].value) ?? ''
@@ -141,14 +142,14 @@ function generateCustomizeUrl(postProperties) {
let fullPrefix = ''
const allSlugPatterns = BLOG.POST_URL_PREFIX.split('/')
allSlugPatterns.forEach((pattern, idx) => {
- if (pattern === '%year%' && postProperties?.publishTime) {
- const formatPostCreatedDate = new Date(postProperties?.publishTime)
+ if (pattern === '%year%' && postProperties?.publishDay) {
+ const formatPostCreatedDate = new Date(postProperties?.publishDay)
fullPrefix += formatPostCreatedDate.getUTCFullYear()
- } else if (pattern === '%month%' && postProperties?.publishTime) {
- const formatPostCreatedDate = new Date(postProperties?.publishTime)
+ } else if (pattern === '%month%' && postProperties?.publishDay) {
+ const formatPostCreatedDate = new Date(postProperties?.publishDay)
fullPrefix += String(formatPostCreatedDate.getUTCMonth() + 1).padStart(2, 0)
- } else if (pattern === '%day%' && postProperties?.publishTime) {
- const formatPostCreatedDate = new Date(postProperties?.publishTime)
+ } else if (pattern === '%day%' && postProperties?.publishDay) {
+ const formatPostCreatedDate = new Date(postProperties?.publishDay)
fullPrefix += String(formatPostCreatedDate.getUTCDate()).padStart(2, 0)
} else if (pattern === '%slug%') {
fullPrefix += (postProperties.slug ?? postProperties.id)
diff --git a/lib/rss.js b/lib/rss.js
index d40b940b..fff81f7c 100644
--- a/lib/rss.js
+++ b/lib/rss.js
@@ -46,7 +46,7 @@ export async function generateRss(posts) {
link: `${BLOG.LINK}/${post.slug}`,
description: post.summary,
content: await createFeedContent(post),
- date: new Date(post?.publishTime)
+ date: new Date(post?.publishDay)
})
}
diff --git a/lib/sitemap.xml.js b/lib/sitemap.xml.js
index 6c8bd040..c520c0ff 100644
--- a/lib/sitemap.xml.js
+++ b/lib/sitemap.xml.js
@@ -26,7 +26,7 @@ export async function generateSitemapXml({ allPages }) {
const slugWithoutLeadingSlash = post?.slug?.startsWith('/') ? post?.slug?.slice(1) : post.slug
urls.push({
loc: `${BLOG.LINK}/${slugWithoutLeadingSlash}`,
- lastmod: new Date(post?.publishTime).toISOString().split('T')[0],
+ lastmod: new Date(post?.publishDay).toISOString().split('T')[0],
changefreq: 'daily'
})
})
diff --git a/lib/utils.js b/lib/utils.js
index d5ba09b5..e13b192f 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -117,7 +117,13 @@ export function deepClone(obj) {
if (obj && typeof obj === 'object') {
for (const key in obj) {
if (Object.prototype.hasOwnProperty.call(obj, key)) {
- newObj[key] = (obj && typeof obj[key] === 'object') ? deepClone(obj[key]) : obj[key]
+ if (obj[key] instanceof Date) { // 判断属性值是否为 Date 对象
+ newObj[key] = new Date(obj[key].getTime()).toISOString() // 直接拷贝引用
+ } else if (obj[key] && typeof obj[key] === 'object') {
+ newObj[key] = deepClone(obj[key])
+ } else {
+ newObj[key] = obj[key]
+ }
}
}
}
diff --git a/pages/[prefix]/[slug].js b/pages/[prefix]/[slug].js
index a3e9983a..7b99ddd8 100644
--- a/pages/[prefix]/[slug].js
+++ b/pages/[prefix]/[slug].js
@@ -64,8 +64,8 @@ export async function getStaticProps({ params: { prefix, slug } }) {
if (!props?.posts?.blockMap) {
props.post.blockMap = await getPostBlocks(props.post.id, from)
}
- // 生成全文索引
- if (BLOG.ALGOLIA_APP_ID && JSON.parse(BLOG.ALGOLIA_RECREATE_DATA) && process.env.npm_lifecycle_event === 'build') {
+ // 生成全文索引 && JSON.parse(BLOG.ALGOLIA_RECREATE_DATA)
+ if (BLOG.ALGOLIA_APP_ID) {
uploadDataToAlgolia(props?.post)
}
diff --git a/pages/[prefix]/index.js b/pages/[prefix]/index.js
index 14c26bf4..3db22414 100644
--- a/pages/[prefix]/index.js
+++ b/pages/[prefix]/index.js
@@ -95,8 +95,10 @@ export async function getStaticPaths() {
}
}
-export async function getStaticProps({ params: { prefix } }) {
- let fullSlug = prefix
+export async function getStaticProps(p) {
+ const { params } = p
+ console.log('getStaticProps', p)
+ let fullSlug = params.prefix
if (JSON.parse(BLOG.PSEUDO_STATIC)) {
if (!fullSlug.endsWith('.html')) {
fullSlug += '.html'
@@ -111,7 +113,7 @@ export async function getStaticProps({ params: { prefix } }) {
// 处理非列表内文章的内信息
if (!props?.post) {
- const pageId = prefix.slice(-1)[0]
+ const pageId = params.PSEUDO_STATICprefix.slice(-1)[0]
if (pageId.length >= 32) {
const post = await getNotion(pageId)
props.post = post
@@ -129,8 +131,8 @@ export async function getStaticProps({ params: { prefix } }) {
props.post.blockMap = await getPostBlocks(props.post.id, from)
}
- // 生成全文索引
- if (BLOG.ALGOLIA_APP_ID && JSON.parse(BLOG.ALGOLIA_RECREATE_DATA) && process.env.npm_lifecycle_event === 'build') {
+ // 生成全文索引 && process.env.npm_lifecycle_event === 'build' && JSON.parse(BLOG.ALGOLIA_RECREATE_DATA)
+ if (BLOG.ALGOLIA_APP_ID) {
uploadDataToAlgolia(props?.post)
}
diff --git a/pages/index.js b/pages/index.js
index 404fab19..86d9de24 100644
--- a/pages/index.js
+++ b/pages/index.js
@@ -6,7 +6,6 @@ import { generateRobotsTxt } from '@/lib/robots.txt'
import { useRouter } from 'next/router'
import { getLayoutByTheme } from '@/themes/theme'
-import { generateAlgoliaSearch } from '@/lib/algolia'
/**
* 首页布局
@@ -64,9 +63,6 @@ export async function getStaticProps() {
}
// 生成全文索引 - 仅在 yarn build 时执行 && process.env.npm_lifecycle_event === 'build'
- if (BLOG.ALGOLIA_APP_ID && JSON.parse(BLOG.ALGOLIA_RECREATE_DATA)) {
- generateAlgoliaSearch({ allPages: props.allPages })
- }
delete props.allPages
diff --git a/pages/sitemap.xml.js b/pages/sitemap.xml.js
index 58011385..58c9a846 100644
--- a/pages/sitemap.xml.js
+++ b/pages/sitemap.xml.js
@@ -42,7 +42,7 @@ export const getServerSideProps = async (ctx) => {
const slugWithoutLeadingSlash = post?.slug.startsWith('/') ? post?.slug?.slice(1) : post.slug
return {
loc: `${BLOG.LINK}/${slugWithoutLeadingSlash}`,
- lastmod: new Date(post?.publishTime).toISOString().split('T')[0],
+ lastmod: new Date(post?.publishDay).toISOString().split('T')[0],
changefreq: 'daily',
priority: '0.7'
}
diff --git a/themes/example/components/ArticleInfo.js b/themes/example/components/ArticleInfo.js
index cd29e978..825fc774 100644
--- a/themes/example/components/ArticleInfo.js
+++ b/themes/example/components/ArticleInfo.js
@@ -29,12 +29,12 @@ export const ArticleInfo = (props) => {
passHref
className="pl-1 mr-2 cursor-pointer hover:text-gray-700 dark:hover:text-gray-200 border-b dark:border-gray-500 border-dashed">
- {post?.publishTime}
+ {post?.publishDay}
|
- {locale.COMMON.LAST_EDITED_TIME}: {post?.lastEditedTime}
+ {locale.COMMON.LAST_EDITED_TIME}: {post?.lastEditedDay}
|
diff --git a/themes/example/components/BlogListGroupByDate.js b/themes/example/components/BlogListGroupByDate.js
index 7759eaca..ac5f9cbd 100644
--- a/themes/example/components/BlogListGroupByDate.js
+++ b/themes/example/components/BlogListGroupByDate.js
@@ -19,9 +19,9 @@ export default function BlogListGroupByDate({ archiveTitle, archivePosts }) {
key={post.id}
className="border-l-2 p-1 text-xs md:text-base items-center hover:scale-x-105 hover:border-gray-500 dark:hover:border-gray-300 dark:border-gray-400 transform duration-500"
>
-
+
- {post?.publishTime}
+ {post?.publishDay}
{' '}
diff --git a/themes/fukasawa/components/ArticleDetail.js b/themes/fukasawa/components/ArticleDetail.js
index 2e2cce59..9e47a925 100644
--- a/themes/fukasawa/components/ArticleDetail.js
+++ b/themes/fukasawa/components/ArticleDetail.js
@@ -59,12 +59,12 @@ export default function ArticleDetail(props) {
passHref
className="pl-1 mr-2 cursor-pointer hover:text-gray-700 dark:hover:text-gray-200 border-b dark:border-gray-500 border-dashed">
- {post?.publishTime}
+ {post?.publishDay}
|
- {locale.COMMON.LAST_EDITED_TIME}: {post.lastEditedTime}
+ {locale.COMMON.LAST_EDITED_TIME}: {post.lastEditedDay}
)}
diff --git a/themes/fukasawa/components/BlogPostArchive.js b/themes/fukasawa/components/BlogPostArchive.js
index ba68f8cf..08557ae3 100644
--- a/themes/fukasawa/components/BlogPostArchive.js
+++ b/themes/fukasawa/components/BlogPostArchive.js
@@ -26,7 +26,7 @@ const BlogArchiveItem = ({ posts = [], archiveTitle }) => {
key={post.id}
className="border-l-2 p-1 text-xs md:text-base items-center hover:scale-x-105 hover:border-gray-500 dark:hover:border-gray-300 dark:border-gray-400 transform duration-500"
>
-
+
{post.date?.start_date}{' '}
+
{post.title}
-
{post.lastEditedTime}
+
{post.lastEditedDay}
diff --git a/themes/heo/components/PostHeader.js b/themes/heo/components/PostHeader.js
index 5a707477..c7f47b5c 100644
--- a/themes/heo/components/PostHeader.js
+++ b/themes/heo/components/PostHeader.js
@@ -79,13 +79,13 @@ export default function PostHeader({ post, siteInfo }) {
href={`/archive#${formatDateFmt(post?.publishDate, 'yyyy-MM')}`}
passHref
className="pl-1 mr-2 cursor-pointer hover:underline">
-
{post?.publishTime}
+
{post?.publishDay}
)}
- {post.lastEditedTime}
+ {post.lastEditedDay}
diff --git a/themes/hexo/components/BlogPostArchive.js b/themes/hexo/components/BlogPostArchive.js
index 08feff4c..ea3c6cd2 100644
--- a/themes/hexo/components/BlogPostArchive.js
+++ b/themes/hexo/components/BlogPostArchive.js
@@ -26,7 +26,7 @@ const BlogPostArchive = ({ posts = [], archiveTitle }) => {
key={post.id}
className="border-l-2 p-1 text-xs md:text-base items-center hover:scale-x-105 hover:border-indigo-500 dark:hover:border-indigo-300 dark:border-indigo-400 transform duration-500"
>
-
+
{post.date?.start_date}{' '}
- {post?.publishTime || post.lastEditedTime}
+ {post?.publishDay || post.lastEditedDay}
diff --git a/themes/hexo/components/LatestPostsGroup.js b/themes/hexo/components/LatestPostsGroup.js
index d315367a..bc3002dd 100644
--- a/themes/hexo/components/LatestPostsGroup.js
+++ b/themes/hexo/components/LatestPostsGroup.js
@@ -52,7 +52,7 @@ const LatestPostsGroup = ({ latestPosts, siteInfo }) => {
>
{post.title}
-
{post.lastEditedTime}
+
{post.lastEditedDay}
diff --git a/themes/hexo/components/PostHeader.js b/themes/hexo/components/PostHeader.js
index 21eec51a..acafaf0f 100644
--- a/themes/hexo/components/PostHeader.js
+++ b/themes/hexo/components/PostHeader.js
@@ -47,13 +47,13 @@ export default function PostHeader({ post, siteInfo }) {
passHref
className="pl-1 mr-2 cursor-pointer hover:underline">
- {locale.COMMON.POST_TIME}: {post?.publishTime}
+ {locale.COMMON.POST_TIME}: {post?.publishDay}
)}
- {locale.COMMON.LAST_EDITED_TIME}: {post.lastEditedTime}
+ {locale.COMMON.LAST_EDITED_TIME}: {post.lastEditedDay}
diff --git a/themes/matery/components/ArticleInfo.js b/themes/matery/components/ArticleInfo.js
index 293eb3e7..d8507686 100644
--- a/themes/matery/components/ArticleInfo.js
+++ b/themes/matery/components/ArticleInfo.js
@@ -28,11 +28,11 @@ export const ArticleInfo = (props) => {
passHref
className="cursor-pointer whitespace-nowrap">
-
{locale.COMMON.POST_TIME}: {post?.publishTime}
+
{locale.COMMON.POST_TIME}: {post?.publishDay}
- {locale.COMMON.LAST_EDITED_TIME}: {post.lastEditedTime}
+ {locale.COMMON.LAST_EDITED_TIME}: {post.lastEditedDay}
diff --git a/themes/matery/components/BlogPostArchive.js b/themes/matery/components/BlogPostArchive.js
index 08feff4c..ea3c6cd2 100644
--- a/themes/matery/components/BlogPostArchive.js
+++ b/themes/matery/components/BlogPostArchive.js
@@ -26,7 +26,7 @@ const BlogPostArchive = ({ posts = [], archiveTitle }) => {
key={post.id}
className="border-l-2 p-1 text-xs md:text-base items-center hover:scale-x-105 hover:border-indigo-500 dark:hover:border-indigo-300 dark:border-indigo-400 transform duration-500"
>
-
+
{post.date?.start_date}{' '}
{
className="font-light hover:underline cursor-pointer text-sm leading-4 mr-3">
- {post.date?.start_date || post.lastEditedTime}
+ {post.date?.start_date || post.lastEditedDay}
diff --git a/themes/medium/components/ArticleInfo.js b/themes/medium/components/ArticleInfo.js
index 3d4abce5..0ecff45e 100644
--- a/themes/medium/components/ArticleInfo.js
+++ b/themes/medium/components/ArticleInfo.js
@@ -17,9 +17,9 @@ export default function ArticleInfo(props) {
{/* meta */}
-
{post?.publishTime}
+
{post?.publishDay}
|
-
{post?.lastEditedTime}
+
{post?.lastEditedDay}
diff --git a/themes/medium/components/BlogArchiveItem.js b/themes/medium/components/BlogArchiveItem.js
index 52b2fefb..8e9693dc 100644
--- a/themes/medium/components/BlogArchiveItem.js
+++ b/themes/medium/components/BlogArchiveItem.js
@@ -17,7 +17,7 @@ export default function BlogArchiveItem({ archiveTitle, archivePosts }) {
-
+
{post.date?.start_date}
{' '}
diff --git a/themes/next/components/ArticleDetail.js b/themes/next/components/ArticleDetail.js
index a2d6fc48..a4f575ec 100644
--- a/themes/next/components/ArticleDetail.js
+++ b/themes/next/components/ArticleDetail.js
@@ -59,10 +59,10 @@ export default function ArticleDetail(props) {
passHref
legacyBehavior>
- {post?.publishTime}
+ {post?.publishDay}
-
| {post.lastEditedTime}
+
| {post.lastEditedDay}
diff --git a/themes/next/components/BlogPostArchive.js b/themes/next/components/BlogPostArchive.js
index a6c0e796..b1f22296 100644
--- a/themes/next/components/BlogPostArchive.js
+++ b/themes/next/components/BlogPostArchive.js
@@ -26,7 +26,7 @@ const BlogPostArchive = ({ posts = [], archiveTitle }) => {
key={post.id}
className="border-l-2 p-1 text-xs md:text-base items-center hover:scale-x-105 hover:border-gray-500 dark:hover:border-gray-300 dark:border-gray-400 transform duration-500"
>
-
+
{post.date?.start_date}{' '}
{
/
- {post?.publishTime}
+ {post?.publishDay}
{post?.tags && (
diff --git a/themes/nobelium/components/BlogArchiveItem.js b/themes/nobelium/components/BlogArchiveItem.js
index 3b16fc3b..b8184f45 100644
--- a/themes/nobelium/components/BlogArchiveItem.js
+++ b/themes/nobelium/components/BlogArchiveItem.js
@@ -19,7 +19,7 @@ export default function BlogArchiveItem({ archiveTitle, archivePosts }) {
key={post.id}
className="border-l-2 p-1 text-xs md:text-base items-center hover:scale-x-105 hover:border-gray-500 dark:hover:border-gray-300 dark:border-gray-400 transform duration-500"
>
-
+
{post.date?.start_date}
{' '}
diff --git a/themes/nobelium/components/BlogPost.js b/themes/nobelium/components/BlogPost.js
index 91ad3bd4..b1080b35 100644
--- a/themes/nobelium/components/BlogPost.js
+++ b/themes/nobelium/components/BlogPost.js
@@ -12,7 +12,7 @@ const BlogPost = ({ post }) => {
{post.title}
diff --git a/themes/plog/components/ArticleInfo.js b/themes/plog/components/ArticleInfo.js
index 7cc873aa..0ecb4895 100644
--- a/themes/plog/components/ArticleInfo.js
+++ b/themes/plog/components/ArticleInfo.js
@@ -32,7 +32,7 @@ export const ArticleInfo = (props) => {
/
- {post?.publishTime}
+ {post?.publishDay}
{post?.tags && (
diff --git a/themes/plog/components/BlogArchiveItem.js b/themes/plog/components/BlogArchiveItem.js
index 3b16fc3b..b8184f45 100644
--- a/themes/plog/components/BlogArchiveItem.js
+++ b/themes/plog/components/BlogArchiveItem.js
@@ -19,7 +19,7 @@ export default function BlogArchiveItem({ archiveTitle, archivePosts }) {
key={post.id}
className="border-l-2 p-1 text-xs md:text-base items-center hover:scale-x-105 hover:border-gray-500 dark:hover:border-gray-300 dark:border-gray-400 transform duration-500"
>
-
+
{post.date?.start_date}
{' '}
diff --git a/themes/simple/components/ArticleInfo.js b/themes/simple/components/ArticleInfo.js
index 6f17b0df..30e1b5f4 100644
--- a/themes/simple/components/ArticleInfo.js
+++ b/themes/simple/components/ArticleInfo.js
@@ -20,7 +20,7 @@ export const ArticleInfo = (props) => {
{post?.type !== 'Page' && (<>
{BLOG.AUTHOR}
-
- {post?.publishTime}
+
- {post?.publishDay}
{post?.category &&
- {post?.category}}
{post?.tags && post?.tags?.length > 0 && post?.tags.map(t =>
/ {t})}
@@ -32,12 +32,12 @@ export const ArticleInfo = (props) => {
href={`/archive#${formatDateFmt(post?.publishDate, 'yyyy-MM')}`}
passHref
className="pl-1 mr-2 cursor-pointer hover:text-gray-700 dark:hover:text-gray-200 border-b dark:border-gray-500 border-dashed">
- {post?.publishTime}
+ {post?.publishDay}
|
- {locale.COMMON.LAST_EDITED_TIME}: {post?.lastEditedTime}
+ {locale.COMMON.LAST_EDITED_TIME}: {post?.lastEditedDay}
|
diff --git a/themes/simple/components/BlogArchiveItem.js b/themes/simple/components/BlogArchiveItem.js
index 3b16fc3b..b8184f45 100644
--- a/themes/simple/components/BlogArchiveItem.js
+++ b/themes/simple/components/BlogArchiveItem.js
@@ -19,7 +19,7 @@ export default function BlogArchiveItem({ archiveTitle, archivePosts }) {
key={post.id}
className="border-l-2 p-1 text-xs md:text-base items-center hover:scale-x-105 hover:border-gray-500 dark:hover:border-gray-300 dark:border-gray-400 transform duration-500"
>
-
+
{post.date?.start_date}
{' '}
From c5ba9a80333e2cd9616b272666b6bd4d2a35ce8c Mon Sep 17 00:00:00 2001
From: tangly1024
Date: Sat, 29 Jul 2023 16:46:36 +0800
Subject: [PATCH 18/39] =?UTF-8?q?algolia=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
lib/algolia.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/algolia.js b/lib/algolia.js
index da92b334..d2d9cb37 100644
--- a/lib/algolia.js
+++ b/lib/algolia.js
@@ -63,11 +63,11 @@ const uploadDataToAlgolia = async(post) => {
lastIndexDate: new Date(), // 更新索引时间
content: truncate(getPageContentText(post, post.blockMap), 9000) // 索引9000个字节，因为api限制总请求内容上限1万个字节
}
- console.log('更新Algolia索引', record)
+ // console.log('更新Algolia索引', record)
index.saveObject(record).wait().then(r => {
- console.log('更新成功', r)
+ console.log('Algolia索引更新', r)
}).catch(err => {
- console.log('algolia', err)
+ console.log('Algolia异常', err)
})
}
}
From aca80a775042bb590e94ed0589545754dcd748fc Mon Sep 17 00:00:00 2001
From: tangly1024
Date: Sat, 29 Jul 2023 17:00:52 +0800
Subject: [PATCH 19/39] fix
---
components/AlgoliaSearchModal.js | 2 +-
pages/[prefix]/index.js | 8 +++-----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/components/AlgoliaSearchModal.js b/components/AlgoliaSearchModal.js
index 53cd0fcf..7af1fd6a 100644
--- a/components/AlgoliaSearchModal.js
+++ b/components/AlgoliaSearchModal.js
@@ -109,7 +109,7 @@ export default function AlgoliaSearchModal({ cRef }) {
handleInputChange(e)}
diff --git a/pages/[prefix]/index.js b/pages/[prefix]/index.js
index 3db22414..e20bf690 100644
--- a/pages/[prefix]/index.js
+++ b/pages/[prefix]/index.js
@@ -95,10 +95,8 @@ export async function getStaticPaths() {
}
}
-export async function getStaticProps(p) {
- const { params } = p
- console.log('getStaticProps', p)
- let fullSlug = params.prefix
+export async function getStaticProps({ params: { prefix } }) {
+ let fullSlug = prefix
if (JSON.parse(BLOG.PSEUDO_STATIC)) {
if (!fullSlug.endsWith('.html')) {
fullSlug += '.html'
@@ -113,7 +111,7 @@ export async function getStaticProps(p) {
// 处理非列表内文章的内信息
if (!props?.post) {
- const pageId = params.PSEUDO_STATICprefix.slice(-1)[0]
+ const pageId = prefix.slice(-1)[0]
if (pageId.length >= 32) {
const post = await getNotion(pageId)
props.post = post
From 1353acf8c7e3bd82056da056da4a70744d24dd58 Mon Sep 17 00:00:00 2001
From: tangly1024
Date: Sun, 30 Jul 2023 11:44:18 +0800
Subject: [PATCH 20/39] =?UTF-8?q?=E6=95=B4=E7=90=86filterNavPages?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/AlgoliaSearchModal.js | 2 +-
lib/notion/getNotionData.js | 20 ++-------
pages/index.js | 2 -
themes/gitbook/components/NavPostList.js | 24 ++++++++---
themes/gitbook/components/PageNavDrawer.js | 18 +++++++-
themes/gitbook/components/SearchInput.js | 49 +++++++++++++++-------
themes/gitbook/index.js | 11 ++---
themes/heo/index.js | 1 +
8 files changed, 78 insertions(+), 49 deletions(-)
diff --git a/components/AlgoliaSearchModal.js b/components/AlgoliaSearchModal.js
index 7af1fd6a..71f363c7 100644
--- a/components/AlgoliaSearchModal.js
+++ b/components/AlgoliaSearchModal.js
@@ -132,7 +132,7 @@ export default function AlgoliaSearchModal({ cRef }) {
{totalHit > 0 &&
共搜索到 {totalHit} 条结果，用时 {useTime} 毫秒
}
Algolia 提供搜索服务
+ Algolia 提供搜索服务
{/* 遮罩 */}
diff --git a/lib/notion/getNotionData.js b/lib/notion/getNotionData.js
index d452eb5f..047823cf 100644
--- a/lib/notion/getNotionData.js
+++ b/lib/notion/getNotionData.js
@@ -174,8 +174,8 @@ function getSiteInfo({ collection, block }) {
}
/**
- * 获取导航pages
- * 转为gitbook这类文档主题设计，精减的标题和内容
+ * 获取导航用的精减文章列表
+ * gitbook主题用到，只保留文章的标题分类标签分类信息，精减掉摘要密码日期等数据
* 导航页面的条件，必须是Posts
* @param {*} param0
*/
@@ -183,22 +183,8 @@ export function getNavPages({ allPages }) {
const allNavPages = allPages.filter(post => {
return post && post?.slug && (!post?.slug?.startsWith('http')) && post?.type === 'Post' && post?.status === 'Published'
})
- const result = allNavPages.map(item => ({ id: item.id, title: item.title || '', category: item.category || null, tags: item.tags || null, summary: item.summary || null, slug: item.slug }))
- const groupedArray = result.reduce((groups, item) => {
- const categoryName = item?.category ? item?.category : '' // 将category转换为字符串
- const lastGroup = groups[groups.length - 1] // 获取最后一个分组
-
- if (!lastGroup || lastGroup?.category !== categoryName) { // 如果当前元素的category与上一个元素不同，则创建新分组
- groups.push({ category: categoryName, items: [] })
- }
-
- groups[groups.length - 1].items.push(item) // 将元素加入对应的分组
-
- return groups
- }, [])
-
- return groupedArray
+ return allNavPages.map(item => ({ id: item.id, title: item.title || '', pageCover: item.pageCover || '', category: item.category || null, tags: item.tags || null, summary: item.summary || null, slug: item.slug }))
}
/**
diff --git a/pages/index.js b/pages/index.js
index 86d9de24..fbbe0eff 100644
--- a/pages/index.js
+++ b/pages/index.js
@@ -3,7 +3,6 @@ import { getPostBlocks } from '@/lib/notion'
import { getGlobalData } from '@/lib/notion/getNotionData'
import { generateRss } from '@/lib/rss'
import { generateRobotsTxt } from '@/lib/robots.txt'
-
import { useRouter } from 'next/router'
import { getLayoutByTheme } from '@/themes/theme'
@@ -12,7 +11,6 @@ import { getLayoutByTheme } from '@/themes/theme'
* @param {*} props
* @returns
*/
-
const Index = props => {
// 根据页面路径加载不同Layout文件
const Layout = getLayoutByTheme(useRouter())
diff --git a/themes/gitbook/components/NavPostList.js b/themes/gitbook/components/NavPostList.js
index 1dff3722..9ffc0cf9 100644
--- a/themes/gitbook/components/NavPostList.js
+++ b/themes/gitbook/components/NavPostList.js
@@ -10,12 +10,24 @@ import NavPostItem from './NavPostItem'
* @constructor
*/
const NavPostList = (props) => {
- const { filteredPostGroups } = props
+ const { filteredNavPages } = props
const router = useRouter()
let selectedSth = false
+ const groupedArray = filteredNavPages?.reduce((groups, item) => {
+ const categoryName = item?.category ? item?.category : '' // 将category转换为字符串
+ const lastGroup = groups[groups.length - 1] // 获取最后一个分组
+
+ if (!lastGroup || lastGroup?.category !== categoryName) { // 如果当前元素的category与上一个元素不同，则创建新分组
+ groups.push({ category: categoryName, items: [] })
+ }
+
+ groups[groups.length - 1].items.push(item) // 将元素加入对应的分组
+
+ return groups
+ }, [])
// 处理是否选中
- filteredPostGroups?.map((group) => {
+ groupedArray?.map((group) => {
let groupSelected = false
for (const post of group?.items) {
if (router.asPath.split('?')[0] === '/' + post.slug) {
@@ -28,16 +40,16 @@ const NavPostList = (props) => {
})
// 如果都没有选中默认打开第一个
- if (!selectedSth && filteredPostGroups && filteredPostGroups?.length > 0) {
- filteredPostGroups[0].selected = true
+ if (!selectedSth && groupedArray && groupedArray?.length > 0) {
+ groupedArray[0].selected = true
}
- if (!filteredPostGroups || filteredPostGroups.length === 0) {
+ if (!groupedArray || groupedArray.length === 0) {
return
} else {
return
{/* 文章列表 */}
- {filteredPostGroups?.map((group, index) => )}
+ {groupedArray?.map((group, index) => )}
}
}
diff --git a/themes/gitbook/components/PageNavDrawer.js b/themes/gitbook/components/PageNavDrawer.js
index 17448c94..86c39e9a 100644
--- a/themes/gitbook/components/PageNavDrawer.js
+++ b/themes/gitbook/components/PageNavDrawer.js
@@ -10,7 +10,21 @@ import NavPostList from './NavPostList'
*/
const PageNavDrawer = (props) => {
const { pageNavVisible, changePageNavVisible } = useGitBookGlobal()
- const { filteredPostGroups } = props
+ const { filteredNavPages } = props
+
+ const groupedArray = filteredNavPages.reduce((groups, item) => {
+ const categoryName = item?.category ? item?.category : '' // 将category转换为字符串
+ const lastGroup = groups[groups.length - 1] // 获取最后一个分组
+
+ if (!lastGroup || lastGroup?.category !== categoryName) { // 如果当前元素的category与上一个元素不同，则创建新分组
+ groups.push({ category: categoryName, items: [] })
+ }
+
+ groups[groups.length - 1].items.push(item) // 将元素加入对应的分组
+
+ return groups
+ }, [])
+
const switchVisible = () => {
changePageNavVisible(!pageNavVisible)
}
@@ -23,7 +37,7 @@ const PageNavDrawer = (props) => {
' overflow-y-hidden shadow-card w-72 duration-200 fixed left-1 top-16 rounded py-2 bg-white dark:bg-gray-600'}>
{/* 所有文章列表 */}
-
+
diff --git a/themes/gitbook/components/SearchInput.js b/themes/gitbook/components/SearchInput.js
index 43062eb2..bad985da 100644
--- a/themes/gitbook/components/SearchInput.js
+++ b/themes/gitbook/components/SearchInput.js
@@ -5,7 +5,7 @@ let lock = false
const SearchInput = ({ currentSearch, cRef, className }) => {
const searchInputRef = useRef()
- const { setFilterPosts, allNavPages } = useGitBookGlobal()
+ const { setFilteredNavPages, allNavPages } = useGitBookGlobal()
useImperativeHandle(cRef, () => {
return {
@@ -17,31 +17,44 @@ const SearchInput = ({ currentSearch, cRef, className }) => {
const handleSearch = () => {
let keyword = searchInputRef.current.value
- const filterPosts = []
if (keyword) {
keyword = keyword.trim()
} else {
- setFilterPosts(allNavPages)
+ setFilteredNavPages(allNavPages)
}
const filterAllNavPages = deepClone(allNavPages)
- for (const filterGroup of filterAllNavPages) {
- for (let i = filterGroup.items.length - 1; i >= 0; i--) {
- const post = filterGroup.items[i]
- const articleInfo = post.title + ''
- const hit = articleInfo.toLowerCase().indexOf(keyword.toLowerCase()) > -1
- if (!hit) {
- // 删除
- filterGroup.items.splice(i, 1)
- }
- }
- if (filterGroup.items && filterGroup.items.length > 0) {
- filterPosts.push(filterGroup)
+ // for (const filterGroup of filterAllNavPages) {
+ // for (let i = filterGroup.items.length - 1; i >= 0; i--) {
+ // const post = filterGroup.items[i]
+ // const articleInfo = post.title + ''
+ // const hit = articleInfo.toLowerCase().indexOf(keyword.toLowerCase()) > -1
+ // if (!hit) {
+ // // 删除
+ // filterGroup.items.splice(i, 1)
+ // }
+ // }
+ // if (filterGroup.items && filterGroup.items.length > 0) {
+ // filterPosts.push(filterGroup)
+ // }
+ // }
+ for (let i = filterAllNavPages.length - 1; i >= 0; i--) {
+ const post = filterAllNavPages[i]
+ const articleInfo = post.title + ''
+ const hit = articleInfo.toLowerCase().indexOf(keyword.toLowerCase()) > -1
+ if (!hit) {
+ // 删除
+ filterAllNavPages.splice(i, 1)
}
}
// 更新完
- setFilterPosts(filterPosts)
+ setFilteredNavPages(filterAllNavPages)
}
+
+ /**
+ * 回车键
+ * @param {*} e
+ */
const handleKeyUp = (e) => {
if (e.keyCode === 13) { // 回车
handleSearch(searchInputRef.current.value)
@@ -49,6 +62,10 @@ const SearchInput = ({ currentSearch, cRef, className }) => {
cleanSearch()
}
}
+
+ /**
+ * 清理搜索
+ */
const cleanSearch = () => {
searchInputRef.current.value = ''
handleSearch()
diff --git a/themes/gitbook/index.js b/themes/gitbook/index.js
index 125b3423..0d606343 100644
--- a/themes/gitbook/index.js
+++ b/themes/gitbook/index.js
@@ -47,16 +47,17 @@ const LayoutBase = (props) => {
const router = useRouter()
const [tocVisible, changeTocVisible] = useState(false)
const [pageNavVisible, changePageNavVisible] = useState(false)
- const [filteredPostGroups, setFilteredPostGroups] = useState(allNavPages)
+ const [filteredNavPages, setFilteredNavPages] = useState(allNavPages)
const showTocButton = post?.toc?.length > 1
useEffect(() => {
- setFilteredPostGroups(allNavPages)
+ console.log('更新导航', allNavPages)
+ setFilteredNavPages(allNavPages)
}, [post])
return (
-
+
@@ -72,7 +73,7 @@ const LayoutBase = (props) => {
{/* 所有文章列表 */}
-
+
}
{/* 移动端导航抽屉 */}
-
+
{/* 移动端底部导航栏 */}
{/*
*/}
diff --git a/themes/heo/index.js b/themes/heo/index.js
index dea88fdf..1a40a67a 100644
--- a/themes/heo/index.js
+++ b/themes/heo/index.js
@@ -79,6 +79,7 @@ const LayoutBase = props => {
* @returns
*/
const LayoutIndex = (props) => {
+ console.log('首页', props)
const headerSlot =
{/* 顶部导航 */}
From d1dfd32af26e522057778882c3144ca5d1c08803 Mon Sep 17 00:00:00 2001
From: tangly1024
Date: Sun, 30 Jul 2023 11:52:14 +0800
Subject: [PATCH 21/39] Common
---
pages/_app.js | 4 ----
themes/example/index.js | 7 ++++++-
themes/fukasawa/index.js | 5 ++++-
themes/gitbook/index.js | 4 +++-
themes/heo/index.js | 4 +++-
themes/hexo/index.js | 2 +-
themes/medium/index.js | 5 ++++-
themes/next/index.js | 5 ++++-
themes/nobelium/index.js | 5 ++++-
themes/plog/index.js | 5 ++++-
themes/simple/index.js | 5 ++++-
11 files changed, 37 insertions(+), 14 deletions(-)
diff --git a/pages/_app.js b/pages/_app.js
index 57c4047a..ed0c8f76 100644
--- a/pages/_app.js
+++ b/pages/_app.js
@@ -17,8 +17,6 @@ import dynamic from 'next/dynamic'
// 自定义样式css和js引入
import ExternalScript from '@/components/ExternalScript'
-import CommonHead from '@/components/CommonHead'
-
// 各种扩展插件 动画等
const ExternalPlugins = dynamic(() => import('@/components/ExternalPlugins'))
@@ -26,11 +24,9 @@ const MyApp = ({ Component, pageProps }) => {
useEffect(() => {
AOS.init()
}, [])
- const { meta } = pageProps
return (
-
diff --git a/themes/example/index.js b/themes/example/index.js
index 8dffec78..0772f7fd 100644
--- a/themes/example/index.js
+++ b/themes/example/index.js
@@ -26,6 +26,7 @@ import TagItem from './components/TagItem'
import { useRouter } from 'next/router'
import { Transition } from '@headlessui/react'
import { Style } from './style'
+import CommonHead from '@/components/CommonHead'
/**
* 基础布局框架
@@ -35,7 +36,7 @@ import { Style } from './style'
* @constructor
*/
const LayoutBase = props => {
- const { children, slotTop } = props
+ const { children, slotTop, meta } = props
const { onLoading } = useGlobal()
// 增加一个状态以触发 Transition 组件的动画
@@ -48,6 +49,10 @@ const LayoutBase = props => {
return (
+
+ {/* SEO信息 */}
+
+
{/* 页头 */}
diff --git a/themes/fukasawa/index.js b/themes/fukasawa/index.js
index 1e7705bd..6b5eb94b 100644
--- a/themes/fukasawa/index.js
+++ b/themes/fukasawa/index.js
@@ -20,6 +20,7 @@ import dynamic from 'next/dynamic'
import { AdSlot } from '@/components/GoogleAdsense'
import { Style } from './style'
import replaceSearchResult from '@/components/Mark'
+import CommonHead from '@/components/CommonHead'
const Live2D = dynamic(() => import('@/components/Live2D'))
@@ -42,7 +43,7 @@ export const useFukasawaGlobal = () => useContext(ThemeGlobalFukasawa)
* @constructor
*/
const LayoutBase = (props) => {
- const { children, headerSlot } = props
+ const { children, headerSlot, meta } = props
const leftAreaSlot =
const { onLoading } = useGlobal()
@@ -65,6 +66,8 @@ const LayoutBase = (props) => {
+ {/* SEO信息 */}
+
diff --git a/themes/gitbook/index.js b/themes/gitbook/index.js
index 0d606343..e5fcaeac 100644
--- a/themes/gitbook/index.js
+++ b/themes/gitbook/index.js
@@ -30,6 +30,7 @@ import NotionPage from '@/components/NotionPage'
import { ArticleLock } from './components/ArticleLock'
import { Transition } from '@headlessui/react'
import { Style } from './style'
+import CommonHead from '@/components/CommonHead'
// 主题全局变量
const ThemeGlobalGitbook = createContext()
@@ -42,7 +43,7 @@ export const useGitBookGlobal = () => useContext(ThemeGlobalGitbook)
* @constructor
*/
const LayoutBase = (props) => {
- const { children, post, allNavPages, slotLeft, slotRight, slotTop } = props
+ const { children, post, allNavPages, slotLeft, slotRight, slotTop, meta } = props
const { onLoading } = useGlobal()
const router = useRouter()
const [tocVisible, changeTocVisible] = useState(false)
@@ -58,6 +59,7 @@ const LayoutBase = (props) => {
return (
+
diff --git a/themes/heo/index.js b/themes/heo/index.js
index 1a40a67a..d2f6097a 100644
--- a/themes/heo/index.js
+++ b/themes/heo/index.js
@@ -39,10 +39,12 @@ import LazyImage from '@/components/LazyImage'
* @constructor
*/
const LayoutBase = props => {
- const { children, headerSlot, slotTop, slotRight, siteInfo, className } = props
+ const { children, headerSlot, slotTop, slotRight, siteInfo, className, meta } = props
return (
+ {/* SEO信息 */}
+
{/* 顶部嵌入 导航栏，首页放hero，文章页放文章详情 */}
diff --git a/themes/hexo/index.js b/themes/hexo/index.js
index 78f3ab69..fae9a7f4 100644
--- a/themes/hexo/index.js
+++ b/themes/hexo/index.js
@@ -47,7 +47,7 @@ const LayoutBase = props => {
return (
{/* 网页SEO */}
-
+
{/* 顶部导航 */}
diff --git a/themes/medium/index.js b/themes/medium/index.js
index f9edb252..01d3f904 100644
--- a/themes/medium/index.js
+++ b/themes/medium/index.js
@@ -35,6 +35,7 @@ import { Transition } from '@headlessui/react'
import { Style } from './style'
import replaceSearchResult from '@/components/Mark'
import ArticleInfo from './components/ArticleInfo'
+import CommonHead from '@/components/CommonHead'
// 主题全局状态
const ThemeGlobalMedium = createContext()
@@ -47,7 +48,7 @@ export const useMediumGlobal = () => useContext(ThemeGlobalMedium)
* @constructor
*/
const LayoutBase = props => {
- const { children, showInfoCard = true, slotRight, slotTop, siteInfo, notice } = props
+ const { children, showInfoCard = true, slotRight, slotTop, siteInfo, notice, meta } = props
const { locale } = useGlobal()
const router = useRouter()
const [tocVisible, changeTocVisible] = useState(false)
@@ -55,6 +56,8 @@ const LayoutBase = props => {
return (
+ {/* SEO相关 */}
+
{/* CSS样式 */}
diff --git a/themes/next/index.js b/themes/next/index.js
index 0ffcbd28..e3b079a0 100644
--- a/themes/next/index.js
+++ b/themes/next/index.js
@@ -25,6 +25,7 @@ import BlogListBar from './components/BlogListBar'
import { Transition } from '@headlessui/react'
import { Style } from './style'
import replaceSearchResult from '@/components/Mark'
+import CommonHead from '@/components/CommonHead'
/**
* 基础布局 采用左中右三栏布局，移动端使用顶部导航栏
@@ -32,7 +33,7 @@ import replaceSearchResult from '@/components/Mark'
* @constructor
*/
const LayoutBase = (props) => {
- const { children, headerSlot, floatSlot, rightAreaSlot, siteInfo } = props
+ const { children, headerSlot, floatSlot, rightAreaSlot, siteInfo, meta } = props
const { onLoading } = useGlobal()
const targetRef = useRef(null)
const floatButtonGroup = useRef(null)
@@ -69,6 +70,8 @@ const LayoutBase = (props) => {
return (
+ {/* SEO相关 */}
+
{/* 移动端顶部导航栏 */}
diff --git a/themes/nobelium/index.js b/themes/nobelium/index.js
index 6a9e7f32..d9a930e0 100644
--- a/themes/nobelium/index.js
+++ b/themes/nobelium/index.js
@@ -23,6 +23,7 @@ import BlogListBar from './components/BlogListBar'
import { Transition } from '@headlessui/react'
import { Style } from './style'
import replaceSearchResult from '@/components/Mark'
+import CommonHead from '@/components/CommonHead'
/**
* 基础布局 采用左右两侧布局，移动端使用顶部导航栏
@@ -31,13 +32,15 @@ import replaceSearchResult from '@/components/Mark'
* @constructor
*/
const LayoutBase = props => {
- const { children, post, topSlot } = props
+ const { children, post, topSlot, meta } = props
const fullWidth = post?.fullWidth ?? false
const { onLoading } = useGlobal()
return (
+ {/* SEO相关 */}
+
{/* SEO相关 */}
diff --git a/themes/plog/index.js b/themes/plog/index.js
index bb9d4cf6..55895df4 100644
--- a/themes/plog/index.js
+++ b/themes/plog/index.js
@@ -22,6 +22,7 @@ import { saveDarkModeToCookies } from '@/themes/theme'
import Modal from './components/Modal'
import { Style } from './style'
import replaceSearchResult from '@/components/Mark'
+import CommonHead from '@/components/CommonHead'
// 主题全局状态
const ThemeGlobalPlog = createContext()
@@ -34,7 +35,7 @@ export const usePlogGlobal = () => useContext(ThemeGlobalPlog)
* @constructor
*/
const LayoutBase = props => {
- const { children, topSlot } = props
+ const { children, topSlot, meta } = props
const { onLoading, updateDarkMode } = useGlobal()
const [showModal, setShowModal] = useState(false)
const [modalContent, setModalContent] = useState(null)
@@ -58,6 +59,8 @@ const LayoutBase = props => {
return (
+ {/* SEO相关 */}
+
{/* 移动端顶部导航栏 */}
diff --git a/themes/simple/index.js b/themes/simple/index.js
index b88dce95..b0c9f95c 100644
--- a/themes/simple/index.js
+++ b/themes/simple/index.js
@@ -24,6 +24,7 @@ import SearchInput from './components/SearchInput'
import { Transition } from '@headlessui/react'
import { Style } from './style'
import replaceSearchResult from '@/components/Mark'
+import CommonHead from '@/components/CommonHead'
/**
* 基础布局
@@ -32,7 +33,7 @@ import replaceSearchResult from '@/components/Mark'
* @returns
*/
const LayoutBase = props => {
- const { children, slotTop } = props
+ const { children, slotTop, meta } = props
const { onLoading } = useGlobal()
if (isBrowser()) {
@@ -40,6 +41,8 @@ const LayoutBase = props => {
}
return (
+ {/* SEO相关 */}
+
{CONFIG.TOP_BAR && }
From ec26ab8fa8d5c9737ca75ddd62573efb42a537b8 Mon Sep 17 00:00:00 2001
From: tangly1024
Date: Sun, 30 Jul 2023 12:31:36 +0800
Subject: [PATCH 22/39] =?UTF-8?q?heo=20=E4=B8=BB=E9=A2=98=E7=BD=AE?=
=?UTF-8?q?=E9=A1=B6=E6=8E=A8=E8=8D=90=E6=96=87=E7=AB=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
lib/notion/getNotionData.js | 2 +-
themes/heo/components/Hero.js | 24 +++++++++++++++++++++---
themes/heo/config.js | 3 +++
themes/heo/index.js | 1 -
4 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/lib/notion/getNotionData.js b/lib/notion/getNotionData.js
index 047823cf..24b1fb8e 100644
--- a/lib/notion/getNotionData.js
+++ b/lib/notion/getNotionData.js
@@ -184,7 +184,7 @@ export function getNavPages({ allPages }) {
return post && post?.slug && (!post?.slug?.startsWith('http')) && post?.type === 'Post' && post?.status === 'Published'
})
- return allNavPages.map(item => ({ id: item.id, title: item.title || '', pageCover: item.pageCover || '', category: item.category || null, tags: item.tags || null, summary: item.summary || null, slug: item.slug }))
+ return allNavPages.map(item => ({ id: item.id, title: item.title || '', pageCoverThumbnail: item.pageCoverThumbnail || '', category: item.category || null, tags: item.tags || null, summary: item.summary || null, slug: item.slug }))
}
/**
diff --git a/themes/heo/components/Hero.js b/themes/heo/components/Hero.js
index ff815b9b..8e3c2565 100644
--- a/themes/heo/components/Hero.js
+++ b/themes/heo/components/Hero.js
@@ -154,16 +154,34 @@ function GroupMenu() {
* 置顶文章区域
*/
function TopGroup(props) {
- const { latestPosts, siteInfo } = props
+ const { latestPosts, allNavPages, siteInfo } = props
const todayCardRef = useRef()
function handleMouseLeave() {
todayCardRef.current.coverUp()
}
+
+ let topPosts = []
+ // 默认展示最近更新
+ if (!CONFIG.HERO_RECOMMEND_POST_TAG || CONFIG.HERO_RECOMMEND_POST_TAG === '') {
+ topPosts = latestPosts
+ } else {
+ // 展示特定标签文章
+ for (const post of allNavPages) {
+ if (topPosts.length === 6) {
+ break
+ }
+ // 查找标签
+ if (post.tags.indexOf(CONFIG.HERO_RECOMMEND_POST_TAG) >= 0) {
+ topPosts.push(post)
+ }
+ }
+ }
+ console.log('top', topPosts)
return (
- {/* 置顶最新文章 */}
+ {/* 置顶推荐文章 */}
- {latestPosts?.map((p, index) => {
+ {topPosts?.map((p, index) => {
return
diff --git a/themes/heo/config.js b/themes/heo/config.js
index 86ed342e..ee7b4361 100644
--- a/themes/heo/config.js
+++ b/themes/heo/config.js
@@ -22,6 +22,9 @@ const CONFIG = {
HERO_CATEGORY_2: { title: '热门文章', url: '/tag/热门文章' },
HERO_CATEGORY_3: { title: '实用教程', url: '/tag/实用教程' },
+ // 英雄区右侧推荐文章标签, 例如 [推荐] , 最多六篇文章; 若留空白''，则推荐最近更新文章
+ HERO_RECOMMEND_POST_TAG: '推荐', // 例如 推荐
+
// 右侧个人资料卡牌欢迎语，点击可自动切换
INFOCARD_GREETINGS: [
'你好！我是',
diff --git a/themes/heo/index.js b/themes/heo/index.js
index d2f6097a..8c761449 100644
--- a/themes/heo/index.js
+++ b/themes/heo/index.js
@@ -81,7 +81,6 @@ const LayoutBase = props => {
* @returns
*/
const LayoutIndex = (props) => {
- console.log('首页', props)
const headerSlot =
{/* 顶部导航 */}
From 2619aba5b6497fc71c0aab23437484ca16d80339 Mon Sep 17 00:00:00 2001
From: tangly1024
Date: Sun, 30 Jul 2023 12:32:33 +0800
Subject: [PATCH 23/39] =?UTF-8?q?=E6=8E=A8=E8=8D=90=E6=96=87=E7=AB=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
themes/heo/config.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/themes/heo/config.js b/themes/heo/config.js
index ee7b4361..2789fde3 100644
--- a/themes/heo/config.js
+++ b/themes/heo/config.js
@@ -23,7 +23,7 @@ const CONFIG = {
HERO_CATEGORY_3: { title: '实用教程', url: '/tag/实用教程' },
// 英雄区右侧推荐文章标签, 例如 [推荐] , 最多六篇文章; 若留空白''，则推荐最近更新文章
- HERO_RECOMMEND_POST_TAG: '推荐', // 例如 推荐
+ HERO_RECOMMEND_POST_TAG: '推荐',
// 右侧个人资料卡牌欢迎语，点击可自动切换
INFOCARD_GREETINGS: [
From 595a0bdee42a8ff42c99d32aece94bf5af2dcc45 Mon Sep 17 00:00:00 2001
From: tangly1024
Date: Sun, 30 Jul 2023 12:45:44 +0800
Subject: [PATCH 24/39] =?UTF-8?q?=E6=89=93=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
blog.config.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/blog.config.js b/blog.config.js
index f19effce..fab696b8 100644
--- a/blog.config.js
+++ b/blog.config.js
@@ -376,7 +376,7 @@ const BLOG = {
// 开发相关
NOTION_ACCESS_TOKEN: process.env.NOTION_ACCESS_TOKEN || '', // Useful if you prefer not to make your database public
DEBUG: process.env.NEXT_PUBLIC_DEBUG || false, // 是否显示调试按钮
- ENABLE_CACHE: process.env.ENABLE_CACHE || false, // 开启缓存会将Notion数据缓存在内存中，通常在开发调试中使用，正式部署开启此功能意义不大。
+ ENABLE_CACHE: process.env.ENABLE_CACHE || process.env.npm_lifecycle_event === 'build', // 缓存在开发调试和打包过程中选择性开启，正式部署开启此功能意义不大。
isProd: process.env.VERCEL_ENV === 'production', // distinguish between development and production environment (ref: https://vercel.com/docs/environment-variables#system-environment-variables) isProd: process.env.VERCEL_ENV === 'production' // distinguish between development and production environment (ref: https://vercel.com/docs/environment-variables#system-environment-variables)
VERSION: process.env.NEXT_PUBLIC_VERSION // 版本号
}
From a9be55f4c1c5916cf65b27d07b3fafcc28a44b7d Mon Sep 17 00:00:00 2001
From: tangly1024
Date: Sun, 30 Jul 2023 13:39:12 +0800
Subject: [PATCH 25/39] heo mobile hero style
---
themes/heo/components/Hero.js | 13 ++++++-------
themes/heo/index.js | 10 +++++-----
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/themes/heo/components/Hero.js b/themes/heo/components/Hero.js
index 8e3c2565..15614734 100644
--- a/themes/heo/components/Hero.js
+++ b/themes/heo/components/Hero.js
@@ -19,7 +19,7 @@ const Hero = props => {
return (
-
+
{/* 左侧banner组 */}
@@ -116,22 +116,22 @@ function TagsGroupBar() {
*/
function GroupMenu() {
return (
-
+
-
+
{CONFIG.HERO_CATEGORY_1?.title}
-
+
-
+
{CONFIG.HERO_CATEGORY_2?.title}
-
+
@@ -176,7 +176,6 @@ function TopGroup(props) {
}
}
}
- console.log('top', topPosts)
return (
{/* 置顶推荐文章 */}
diff --git a/themes/heo/index.js b/themes/heo/index.js
index 8c761449..3ea96256 100644
--- a/themes/heo/index.js
+++ b/themes/heo/index.js
@@ -93,7 +93,7 @@ const LayoutIndex = (props) => {
const slotRight =
return
-
+
{/* 文章分类条 */}
{BLOG.POST_LIST_STYLE === 'page' ?
:
}
@@ -115,7 +115,7 @@ const LayoutPostList = (props) => {
return
-
+
{/* 文章分类条 */}
{BLOG.POST_LIST_STYLE === 'page' ?
:
}
@@ -155,7 +155,7 @@ const LayoutSearch = props => {
}, [])
return (
-
+
{!currentSearch
?
:
{BLOG.POST_LIST_STYLE === 'page' ? : }
}
@@ -348,7 +348,7 @@ const LayoutCategoryIndex = props => {
return (
-
+
{locale.COMMON.CATEGORY}
@@ -386,7 +386,7 @@ const LayoutTagIndex = props => {
return (
-
+
{locale.COMMON.TAGS}
From fd6449e12af931779317ebb1f0af48da93f78429 Mon Sep 17 00:00:00 2001
From: tangly1024
Date: Sun, 30 Jul 2023 13:40:34 +0800
Subject: [PATCH 26/39] v4.0.7
---
.env.local | 2 +-
package.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.env.local b/.env.local
index 3eba4322..7ed26a3c 100644
--- a/.env.local
+++ b/.env.local
@@ -1,2 +1,2 @@
# 环境变量 @see https://www.nextjs.cn/docs/basic-features/environment-variables
-NEXT_PUBLIC_VERSION=4.0.6
\ No newline at end of file
+NEXT_PUBLIC_VERSION=4.0.7
\ No newline at end of file
diff --git a/package.json b/package.json
index b9f1bb5c..21def24a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "notion-next",
- "version": "4.0.6",
+ "version": "4.0.7",
"homepage": "https://github.com/tangly1024/NotionNext.git",
"license": "MIT",
"repository": {
From b230617039b891b926e4dfcaf95856a74ecff555 Mon Sep 17 00:00:00 2001
From: tangly1024
Date: Sun, 30 Jul 2023 13:56:08 +0800
Subject: [PATCH 27/39] fix hexo overflow-x
---
themes/hexo/index.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/themes/hexo/index.js b/themes/hexo/index.js
index 78f3ab69..b20b3262 100644
--- a/themes/hexo/index.js
+++ b/themes/hexo/index.js
@@ -71,7 +71,7 @@ const LayoutBase = props => {
{/* 主区块 */}
-
+
Date: Sun, 30 Jul 2023 14:08:06 +0800
Subject: [PATCH 28/39] fix/build
---
themes/heo/components/Hero.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/themes/heo/components/Hero.js b/themes/heo/components/Hero.js
index 15614734..4d8da6ca 100644
--- a/themes/heo/components/Hero.js
+++ b/themes/heo/components/Hero.js
@@ -171,7 +171,7 @@ function TopGroup(props) {
break
}
// 查找标签
- if (post.tags.indexOf(CONFIG.HERO_RECOMMEND_POST_TAG) >= 0) {
+ if (post?.tags?.indexOf(CONFIG.HERO_RECOMMEND_POST_TAG) >= 0) {
topPosts.push(post)
}
}
From b4d1a1acc99d33efe7f18ea69f3e665ff5e0b7be Mon Sep 17 00:00:00 2001
From: tangly1024
Date: Sun, 30 Jul 2023 14:41:48 +0800
Subject: [PATCH 29/39] fix build
---
themes/gitbook/components/PageNavDrawer.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/themes/gitbook/components/PageNavDrawer.js b/themes/gitbook/components/PageNavDrawer.js
index 86c39e9a..bee5a19a 100644
--- a/themes/gitbook/components/PageNavDrawer.js
+++ b/themes/gitbook/components/PageNavDrawer.js
@@ -12,7 +12,7 @@ const PageNavDrawer = (props) => {
const { pageNavVisible, changePageNavVisible } = useGitBookGlobal()
const { filteredNavPages } = props
- const groupedArray = filteredNavPages.reduce((groups, item) => {
+ const groupedArray = filteredNavPages?.reduce((groups, item) => {
const categoryName = item?.category ? item?.category : '' // 将category转换为字符串
const lastGroup = groups[groups.length - 1] // 获取最后一个分组
From 49831089d9d1e3b33f6e3c944df18ce3ba7228ae Mon Sep 17 00:00:00 2001
From: tangly1024
Date: Sun, 30 Jul 2023 15:22:09 +0800
Subject: [PATCH 30/39] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BC=96=E8=AF=91?=
=?UTF-8?q?=EF=BC=8C=E6=95=B0=E6=8D=AE=E5=BA=93=E6=94=AF=E6=8C=81=E5=A4=9A?=
=?UTF-8?q?=E8=A7=86=E5=9B=BE=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
lib/notion/getAllCategories.js | 2 +-
lib/notion/getAllPageIds.js | 16 +++++++++-------
lib/notion/getAllTags.js | 2 +-
lib/notion/getNotionData.js | 2 +-
pages/[prefix]/[slug].js | 2 +-
pages/[prefix]/index.js | 2 +-
pages/archive/index.js | 2 +-
pages/category/[category]/index.js | 2 +-
pages/category/[category]/page/[page].js | 4 ++--
pages/index.js | 2 +-
pages/page/[page].js | 2 +-
pages/search/[keyword]/index.js | 2 +-
pages/search/[keyword]/page/[page].js | 2 +-
pages/search/index.js | 2 +-
pages/tag/[tag]/index.js | 2 +-
pages/tag/[tag]/page/[page].js | 4 ++--
16 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/lib/notion/getAllCategories.js b/lib/notion/getAllCategories.js
index 7cfd4588..97c8ab3a 100644
--- a/lib/notion/getAllCategories.js
+++ b/lib/notion/getAllCategories.js
@@ -14,7 +14,7 @@ import { isIterable } from '../utils'
* @returns {Promise<{}|*[]>}
*/
export function getAllCategories({ allPages, categoryOptions, sliceCount = 0 }) {
- const allPosts = allPages.filter(page => page.type === 'Post' && page.status === 'Published')
+ const allPosts = allPages?.filter(page => page.type === 'Post' && page.status === 'Published')
if (!allPosts || !categoryOptions) {
return []
}
diff --git a/lib/notion/getAllPageIds.js b/lib/notion/getAllPageIds.js
index e8f6dd8f..4bb12fe0 100644
--- a/lib/notion/getAllPageIds.js
+++ b/lib/notion/getAllPageIds.js
@@ -4,7 +4,15 @@ export default function getAllPageIds (collectionQuery, collectionId, collection
return []
}
let pageIds = []
- if (collectionQuery && Object.values(collectionQuery).length > 0) {
+ // 优先按照第一个视图排序
+ if (viewIds && viewIds.length > 0) {
+ const ids = collectionView[viewIds[0]].value.page_sort
+ // console.log('PageIds: 从viewId获取', viewIds)
+ for (const id of ids) {
+ pageIds.push(id)
+ }
+ // 否则按照数据库原始排序
+ } else if (collectionQuery && Object.values(collectionQuery).length > 0) {
const pageSet = new Set()
Object.values(collectionQuery[collectionId]).forEach(view => {
view?.blockIds?.forEach(id => pageSet.add(id)) // group视图
@@ -12,12 +20,6 @@ export default function getAllPageIds (collectionQuery, collectionId, collection
})
pageIds = [...pageSet]
// console.log('PageIds: 从collectionQuery获取', collectionQuery, pageIds.length)
- } else if (viewIds && viewIds.length > 0) {
- const ids = collectionView[viewIds[0]].value.page_sort
- // console.log('PageIds: 从viewId获取', viewIds)
- for (const id of ids) {
- pageIds.push(id)
- }
}
return pageIds
}
diff --git a/lib/notion/getAllTags.js b/lib/notion/getAllTags.js
index 968b8ca3..dfc92ac7 100644
--- a/lib/notion/getAllTags.js
+++ b/lib/notion/getAllTags.js
@@ -8,7 +8,7 @@ import { isIterable } from '../utils'
* @returns {Promise<{}|*[]>}
*/
export function getAllTags({ allPages, sliceCount = 0, tagOptions }) {
- const allPosts = allPages.filter(page => page.type === 'Post' && page.status === 'Published')
+ const allPosts = allPages?.filter(page => page.type === 'Post' && page.status === 'Published')
if (!allPosts || !tagOptions) {
return []
diff --git a/lib/notion/getNotionData.js b/lib/notion/getNotionData.js
index 24b1fb8e..4e42d349 100644
--- a/lib/notion/getNotionData.js
+++ b/lib/notion/getNotionData.js
@@ -180,7 +180,7 @@ function getSiteInfo({ collection, block }) {
* @param {*} param0
*/
export function getNavPages({ allPages }) {
- const allNavPages = allPages.filter(post => {
+ const allNavPages = allPages?.filter(post => {
return post && post?.slug && (!post?.slug?.startsWith('http')) && post?.type === 'Post' && post?.status === 'Published'
})
diff --git a/pages/[prefix]/[slug].js b/pages/[prefix]/[slug].js
index 7b99ddd8..237b793a 100644
--- a/pages/[prefix]/[slug].js
+++ b/pages/[prefix]/[slug].js
@@ -70,7 +70,7 @@ export async function getStaticProps({ params: { prefix, slug } }) {
}
// 推荐关联文章处理
- const allPosts = props.allPages.filter(page => page.type === 'Post' && page.status === 'Published')
+ const allPosts = props.allPages?.filter(page => page.type === 'Post' && page.status === 'Published')
if (allPosts && allPosts.length > 0) {
const index = allPosts.indexOf(props.post)
props.prev = allPosts.slice(index - 1, index)[0] ?? allPosts.slice(-1)[0]
diff --git a/pages/[prefix]/index.js b/pages/[prefix]/index.js
index e20bf690..885ea4aa 100644
--- a/pages/[prefix]/index.js
+++ b/pages/[prefix]/index.js
@@ -135,7 +135,7 @@ export async function getStaticProps({ params: { prefix } }) {
}
// 推荐关联文章处理
- const allPosts = props.allPages.filter(page => page.type === 'Post' && page.status === 'Published')
+ const allPosts = props.allPages?.filter(page => page.type === 'Post' && page.status === 'Published')
if (allPosts && allPosts.length > 0) {
const index = allPosts.indexOf(props.post)
props.prev = allPosts.slice(index - 1, index)[0] ?? allPosts.slice(-1)[0]
diff --git a/pages/archive/index.js b/pages/archive/index.js
index 917fee76..1ef1f216 100644
--- a/pages/archive/index.js
+++ b/pages/archive/index.js
@@ -44,7 +44,7 @@ const ArchiveIndex = props => {
export async function getStaticProps() {
const props = await getGlobalData({ from: 'archive-index' })
// 处理分页
- props.posts = props.allPages.filter(page => page.type === 'Post' && page.status === 'Published')
+ props.posts = props.allPages?.filter(page => page.type === 'Post' && page.status === 'Published')
delete props.allPages
const postsSortByDate = Object.create(props.posts)
diff --git a/pages/category/[category]/index.js b/pages/category/[category]/index.js
index 55300733..03cd4fbd 100644
--- a/pages/category/[category]/index.js
+++ b/pages/category/[category]/index.js
@@ -37,7 +37,7 @@ export async function getStaticProps({ params: { category } }) {
let props = await getGlobalData({ from })
// 过滤状态
- props.posts = props.allPages.filter(page => page.type === 'Post' && page.status === 'Published')
+ props.posts = props.allPages?.filter(page => page.type === 'Post' && page.status === 'Published')
// 处理过滤
props.posts = props.posts.filter(post => post && post.category && post.category.includes(category))
// 处理文章页数
diff --git a/pages/category/[category]/page/[page].js b/pages/category/[category]/page/[page].js
index 2f860c25..9174e117 100644
--- a/pages/category/[category]/page/[page].js
+++ b/pages/category/[category]/page/[page].js
@@ -37,7 +37,7 @@ export async function getStaticProps({ params: { category, page } }) {
let props = await getGlobalData({ from })
// 过滤状态类型
- props.posts = props.allPages.filter(page => page.type === 'Post' && page.status === 'Published').filter(post => post && post.category && post.category.includes(category))
+ props.posts = props.allPages?.filter(page => page.type === 'Post' && page.status === 'Published').filter(post => post && post.category && post.category.includes(category))
// 处理文章页数
props.postCount = props.posts.length
// 处理分页
@@ -61,7 +61,7 @@ export async function getStaticPaths() {
categoryOptions?.forEach(category => {
// 过滤状态类型
- const categoryPosts = allPages.filter(page => page.type === 'Post' && page.status === 'Published').filter(post => post && post.category && post.category.includes(category.name))
+ const categoryPosts = allPages?.filter(page => page.type === 'Post' && page.status === 'Published').filter(post => post && post.category && post.category.includes(category.name))
// 处理文章页数
const postCount = categoryPosts.length
const totalPages = Math.ceil(postCount / BLOG.POSTS_PER_PAGE)
diff --git a/pages/index.js b/pages/index.js
index fbbe0eff..328ece1e 100644
--- a/pages/index.js
+++ b/pages/index.js
@@ -26,7 +26,7 @@ export async function getStaticProps() {
const props = await getGlobalData({ from })
const { siteInfo } = props
- props.posts = props.allPages.filter(page => page.type === 'Post' && page.status === 'Published')
+ props.posts = props.allPages?.filter(page => page.type === 'Post' && page.status === 'Published')
const meta = {
title: `${siteInfo?.title} | ${siteInfo?.description}`,
diff --git a/pages/page/[page].js b/pages/page/[page].js
index 74b7f25b..02b847a8 100644
--- a/pages/page/[page].js
+++ b/pages/page/[page].js
@@ -45,7 +45,7 @@ export async function getStaticProps({ params: { page } }) {
const from = `page-${page}`
const props = await getGlobalData({ from })
const { allPages } = props
- const allPosts = allPages.filter(page => page.type === 'Post' && page.status === 'Published')
+ const allPosts = allPages?.filter(page => page.type === 'Post' && page.status === 'Published')
// 处理分页
props.posts = allPosts.slice(BLOG.POSTS_PER_PAGE * (page - 1), BLOG.POSTS_PER_PAGE * page)
props.page = page
diff --git a/pages/search/[keyword]/index.js b/pages/search/[keyword]/index.js
index 93fa6826..042bbf85 100644
--- a/pages/search/[keyword]/index.js
+++ b/pages/search/[keyword]/index.js
@@ -36,7 +36,7 @@ export async function getStaticProps({ params: { keyword } }) {
pageType: ['Post']
})
const { allPages } = props
- const allPosts = allPages.filter(page => page.type === 'Post' && page.status === 'Published')
+ const allPosts = allPages?.filter(page => page.type === 'Post' && page.status === 'Published')
props.posts = await filterByMemCache(allPosts, keyword)
props.postCount = props.posts.length
// 处理分页
diff --git a/pages/search/[keyword]/page/[page].js b/pages/search/[keyword]/page/[page].js
index 11a682f7..20240f19 100644
--- a/pages/search/[keyword]/page/[page].js
+++ b/pages/search/[keyword]/page/[page].js
@@ -36,7 +36,7 @@ export async function getStaticProps({ params: { keyword, page } }) {
pageType: ['Post']
})
const { allPages } = props
- const allPosts = allPages.filter(page => page.type === 'Post' && page.status === 'Published')
+ const allPosts = allPages?.filter(page => page.type === 'Post' && page.status === 'Published')
props.posts = await filterByMemCache(allPosts, keyword)
props.postCount = props.posts.length
// 处理分页
diff --git a/pages/search/index.js b/pages/search/index.js
index ba09db8e..22061cbd 100644
--- a/pages/search/index.js
+++ b/pages/search/index.js
@@ -55,7 +55,7 @@ export async function getStaticProps() {
pageType: ['Post']
})
const { allPages } = props
- props.posts = allPages.filter(page => page.type === 'Post' && page.status === 'Published')
+ props.posts = allPages?.filter(page => page.type === 'Post' && page.status === 'Published')
return {
props,
revalidate: parseInt(BLOG.NEXT_REVALIDATE_SECOND)
diff --git a/pages/tag/[tag]/index.js b/pages/tag/[tag]/index.js
index db2aaed8..bd9f7529 100644
--- a/pages/tag/[tag]/index.js
+++ b/pages/tag/[tag]/index.js
@@ -33,7 +33,7 @@ export async function getStaticProps({ params: { tag } }) {
const props = await getGlobalData({ from })
// 过滤状态
- props.posts = props.allPages.filter(page => page.type === 'Post' && page.status === 'Published').filter(post => post && post?.tags && post?.tags.includes(tag))
+ props.posts = props.allPages?.filter(page => page.type === 'Post' && page.status === 'Published').filter(post => post && post?.tags && post?.tags.includes(tag))
// 处理文章页数
props.postCount = props.posts.length
diff --git a/pages/tag/[tag]/page/[page].js b/pages/tag/[tag]/page/[page].js
index bf383870..2eaef518 100644
--- a/pages/tag/[tag]/page/[page].js
+++ b/pages/tag/[tag]/page/[page].js
@@ -27,7 +27,7 @@ export async function getStaticProps({ params: { tag, page } }) {
const from = 'tag-page-props'
const props = await getGlobalData({ from })
// 过滤状态、标签
- props.posts = props.allPages.filter(page => page.type === 'Post' && page.status === 'Published').filter(post => post && post?.tags && post?.tags.includes(tag))
+ props.posts = props.allPages?.filter(page => page.type === 'Post' && page.status === 'Published').filter(post => post && post?.tags && post?.tags.includes(tag))
// 处理文章数
props.postCount = props.posts.length
// 处理分页
@@ -48,7 +48,7 @@ export async function getStaticPaths() {
const paths = []
tagOptions?.forEach(tag => {
// 过滤状态类型
- const tagPosts = allPages.filter(page => page.type === 'Post' && page.status === 'Published').filter(post => post && post?.tags && post?.tags.includes(tag.name))
+ const tagPosts = allPages?.filter(page => page.type === 'Post' && page.status === 'Published').filter(post => post && post?.tags && post?.tags.includes(tag.name))
// 处理文章页数
const postCount = tagPosts.length
const totalPages = Math.ceil(postCount / BLOG.POSTS_PER_PAGE)
From 6937b685db7ee4a6d137b8f44e6756549323c154 Mon Sep 17 00:00:00 2001
From: tangly1024
Date: Sun, 30 Jul 2023 15:27:36 +0800
Subject: [PATCH 31/39] v4.0.8
---
.env.local | 2 +-
package.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.env.local b/.env.local
index 7ed26a3c..c7c37481 100644
--- a/.env.local
+++ b/.env.local
@@ -1,2 +1,2 @@
# 环境变量 @see https://www.nextjs.cn/docs/basic-features/environment-variables
-NEXT_PUBLIC_VERSION=4.0.7
\ No newline at end of file
+NEXT_PUBLIC_VERSION=4.0.8
\ No newline at end of file
diff --git a/package.json b/package.json
index 21def24a..c1baace5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "notion-next",
- "version": "4.0.7",
+ "version": "4.0.8",
"homepage": "https://github.com/tangly1024/NotionNext.git",
"license": "MIT",
"repository": {
From 5cce8c58a5bd97047aaff9759a1badf7065e75ce Mon Sep 17 00:00:00 2001
From: tangly1024
Date: Sun, 30 Jul 2023 16:00:54 +0800
Subject: [PATCH 32/39] fix algolia ui
---
components/AlgoliaSearchModal.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/AlgoliaSearchModal.js b/components/AlgoliaSearchModal.js
index 71f363c7..b927fee2 100644
--- a/components/AlgoliaSearchModal.js
+++ b/components/AlgoliaSearchModal.js
@@ -113,7 +113,7 @@ export default function AlgoliaSearchModal({ cRef }) {
handleInputChange(e)}
- className="bg-gray-50 dark:bg-gray-600 outline-blue-500 w-full px-4 my-2 py-1 mb-4 border rounded-md" />
+ className="text-black dark:text-gray-200 bg-gray-50 dark:bg-gray-600 outline-blue-500 w-full px-4 my-2 py-1 mb-4 border rounded-md" />
{/* 标签组 */}
@@ -123,7 +123,7 @@ export default function AlgoliaSearchModal({ cRef }) {
{searchResults.map((result) => (
-
-
+
{result.title}
From 386edbde10c266668ee5e592045993508ae47c57 Mon Sep 17 00:00:00 2001
From: tangly1024
Date: Sun, 30 Jul 2023 21:44:36 +0800
Subject: [PATCH 33/39] gitbook
---
themes/gitbook/components/PageNavDrawer.js | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/themes/gitbook/components/PageNavDrawer.js b/themes/gitbook/components/PageNavDrawer.js
index bee5a19a..14846699 100644
--- a/themes/gitbook/components/PageNavDrawer.js
+++ b/themes/gitbook/components/PageNavDrawer.js
@@ -12,19 +12,6 @@ const PageNavDrawer = (props) => {
const { pageNavVisible, changePageNavVisible } = useGitBookGlobal()
const { filteredNavPages } = props
- const groupedArray = filteredNavPages?.reduce((groups, item) => {
- const categoryName = item?.category ? item?.category : '' // 将category转换为字符串
- const lastGroup = groups[groups.length - 1] // 获取最后一个分组
-
- if (!lastGroup || lastGroup?.category !== categoryName) { // 如果当前元素的category与上一个元素不同，则创建新分组
- groups.push({ category: categoryName, items: [] })
- }
-
- groups[groups.length - 1].items.push(item) // 将元素加入对应的分组
-
- return groups
- }, [])
-
const switchVisible = () => {
changePageNavVisible(!pageNavVisible)
}
@@ -37,7 +24,7 @@ const PageNavDrawer = (props) => {
' overflow-y-hidden shadow-card w-72 duration-200 fixed left-1 top-16 rounded py-2 bg-white dark:bg-gray-600'}>
{/* 所有文章列表 */}
-
+
From ab111100bd8a881107ac72ad671d35340e368e12 Mon Sep 17 00:00:00 2001
From: "tangly1024.com"
Date: Mon, 31 Jul 2023 15:38:18 +0800
Subject: [PATCH 34/39] =?UTF-8?q?=E6=8E=A8=E8=8D=90=E6=96=87=E7=AB=A0?=
=?UTF-8?q?=EF=BC=8C=E6=94=AF=E6=8C=81=E6=97=B6=E9=97=B4=E5=80=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
lib/notion/getNotionData.js | 2 +-
themes/heo/components/Hero.js | 55 +++++++++++++++++++++++++----------
themes/heo/config.js | 1 +
3 files changed, 41 insertions(+), 17 deletions(-)
diff --git a/lib/notion/getNotionData.js b/lib/notion/getNotionData.js
index 4e42d349..20f47be3 100644
--- a/lib/notion/getNotionData.js
+++ b/lib/notion/getNotionData.js
@@ -184,7 +184,7 @@ export function getNavPages({ allPages }) {
return post && post?.slug && (!post?.slug?.startsWith('http')) && post?.type === 'Post' && post?.status === 'Published'
})
- return allNavPages.map(item => ({ id: item.id, title: item.title || '', pageCoverThumbnail: item.pageCoverThumbnail || '', category: item.category || null, tags: item.tags || null, summary: item.summary || null, slug: item.slug }))
+ return allNavPages.map(item => ({ id: item.id, title: item.title || '', pageCoverThumbnail: item.pageCoverThumbnail || '', category: item.category || null, tags: item.tags || null, summary: item.summary || null, slug: item.slug, lastEditedDate: item.lastEditedDate }))
}
/**
diff --git a/themes/heo/components/Hero.js b/themes/heo/components/Hero.js
index 4d8da6ca..b9269561 100644
--- a/themes/heo/components/Hero.js
+++ b/themes/heo/components/Hero.js
@@ -160,22 +160,9 @@ function TopGroup(props) {
todayCardRef.current.coverUp()
}
- let topPosts = []
- // 默认展示最近更新
- if (!CONFIG.HERO_RECOMMEND_POST_TAG || CONFIG.HERO_RECOMMEND_POST_TAG === '') {
- topPosts = latestPosts
- } else {
- // 展示特定标签文章
- for (const post of allNavPages) {
- if (topPosts.length === 6) {
- break
- }
- // 查找标签
- if (post?.tags?.indexOf(CONFIG.HERO_RECOMMEND_POST_TAG) >= 0) {
- topPosts.push(post)
- }
- }
- }
+ // 获取置顶推荐文章
+ const topPosts = getTopPosts({ latestPosts, allNavPages })
+
return (
{/* 置顶推荐文章 */}
@@ -198,6 +185,42 @@ function TopGroup(props) {
)
}
+/**
+ * 获取推荐置顶文章
+ */
+function getTopPosts({ latestPosts, allNavPages }) {
+ // 默认展示最近更新
+ if (!CONFIG.HERO_RECOMMEND_POST_TAG || CONFIG.HERO_RECOMMEND_POST_TAG === '') {
+ return latestPosts
+ }
+
+ // 显示包含‘推荐’标签的文章
+ let sortPosts = []
+
+ // 排序方式
+ if (JSON.parse(CONFIG.HERO_RECOMMEND_POST_SORT_BY_UPDATE_TIME)) {
+ sortPosts = Object.create(allNavPages).sort((a, b) => {
+ const dateA = new Date(a?.lastEditedDate)
+ const dateB = new Date(b?.lastEditedDate)
+ return dateB - dateA
+ })
+ } else {
+ sortPosts = Object.create(allNavPages)
+ }
+
+ const topPosts = []
+ for (const post of sortPosts) {
+ if (topPosts.length === 6) {
+ break
+ }
+ // 查找标签
+ if (post?.tags?.indexOf(CONFIG.HERO_RECOMMEND_POST_TAG) >= 0) {
+ topPosts.push(post)
+ }
+ }
+ return topPosts
+}
+
/**
* 英雄区右侧，今日卡牌
* @returns
diff --git a/themes/heo/config.js b/themes/heo/config.js
index 2789fde3..f62be177 100644
--- a/themes/heo/config.js
+++ b/themes/heo/config.js
@@ -24,6 +24,7 @@ const CONFIG = {
// 英雄区右侧推荐文章标签, 例如 [推荐] , 最多六篇文章; 若留空白''，则推荐最近更新文章
HERO_RECOMMEND_POST_TAG: '推荐',
+ HERO_RECOMMEND_POST_SORT_BY_UPDATE_TIME: false, // 推荐文章排序，为`true`时将强制按最后修改时间倒序
// 右侧个人资料卡牌欢迎语，点击可自动切换
INFOCARD_GREETINGS: [
From 943e9f9885d62b72d398429d6f43db067b7e8874 Mon Sep 17 00:00:00 2001
From: "tangly1024.com"
Date: Mon, 31 Jul 2023 16:07:54 +0800
Subject: [PATCH 35/39] fix build
---
pages/[prefix]/[slug].js | 2 +-
pages/[prefix]/index.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pages/[prefix]/[slug].js b/pages/[prefix]/[slug].js
index 237b793a..da51c1b9 100644
--- a/pages/[prefix]/[slug].js
+++ b/pages/[prefix]/[slug].js
@@ -26,7 +26,7 @@ export async function getStaticPaths() {
const from = 'slug-paths'
const { allPages } = await getGlobalData({ from })
return {
- paths: allPages?.filter(row => row.slug.indexOf('/') > 0).map(row => ({ params: { prefix: row.slug.split('/')[0], slug: row.slug.split('/')[1] } })),
+ paths: allPages?.filter(row => row.slug.indexOf('/') < 0 && row.type.indexOf('Menu') < 0).map(row => ({ params: { prefix: row.slug } })),
fallback: true
}
}
diff --git a/pages/[prefix]/index.js b/pages/[prefix]/index.js
index 885ea4aa..5f6ac5c8 100644
--- a/pages/[prefix]/index.js
+++ b/pages/[prefix]/index.js
@@ -90,7 +90,7 @@ export async function getStaticPaths() {
const from = 'slug-paths'
const { allPages } = await getGlobalData({ from })
return {
- paths: allPages?.filter(row => row.slug.indexOf('/') < 0).map(row => ({ params: { prefix: row.slug } })),
+ paths: allPages?.filter(row => row.slug.indexOf('/') < 0 && row.type.indexOf('Menu') < 0).map(row => ({ params: { prefix: row.slug } })),
fallback: true
}
}
From 86063ae6fcab03190e00fab5f8eaf5e71602978f Mon Sep 17 00:00:00 2001
From: "tangly1024.com"
Date: Mon, 31 Jul 2023 16:53:17 +0800
Subject: [PATCH 36/39] landing
---
themes/landing/config.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/themes/landing/config.js b/themes/landing/config.js
index b3cb3a6a..08487f34 100644
--- a/themes/landing/config.js
+++ b/themes/landing/config.js
@@ -47,7 +47,7 @@ const CONFIG = {
FEATURES_BLOCK_6_P: 'NotionNext，助您轻松开始写作',
// 感言
- TESTIMONIALS_HEADER: '已搭建近4000个网站、浏览量突破 100,000,000+',
+ TESTIMONIALS_HEADER: '已搭建超4000个网站、浏览量突破 100,000,000+',
TESTIMONIALS_P: '网站内容涵盖地产、教育、建筑、医学、机械、IT、电子、软件、自媒体、数位游民、短视频、电商、学生、摄影爱好者、旅行爱好者等等各行各业',
TESTIMONIALS_AVATAR: 'https://www.notion.so/image/https%3A%2F%2Fs3-us-west-2.amazonaws.com%2Fsecure.notion-static.com%2F22de3fcb-d90d-4271-bc01-f815f476122b%2F4FE0A0C0-E487-4C74-BF8E-6F01A27461B8-14186-000008094BC289A6.jpg?table=collection&id=a320a2cc-6ebe-4a8d-95cc-ea94e63bced9&width=200',
From 3faf956d084b61eea08c326e65bfc48867fadf57 Mon Sep 17 00:00:00 2001
From: "tangly1024.com"
Date: Mon, 31 Jul 2023 16:56:52 +0800
Subject: [PATCH 37/39] fix build
---
pages/[prefix]/[slug].js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pages/[prefix]/[slug].js b/pages/[prefix]/[slug].js
index da51c1b9..3b05c31a 100644
--- a/pages/[prefix]/[slug].js
+++ b/pages/[prefix]/[slug].js
@@ -26,7 +26,7 @@ export async function getStaticPaths() {
const from = 'slug-paths'
const { allPages } = await getGlobalData({ from })
return {
- paths: allPages?.filter(row => row.slug.indexOf('/') < 0 && row.type.indexOf('Menu') < 0).map(row => ({ params: { prefix: row.slug } })),
+ paths: allPages?.filter(row => row.slug.indexOf('/') < 0 && row.type.indexOf('Menu') < 0).map(row => ({ params: { prefix: row.slug.split('/')[0], slug: row.slug.split('/')[1] } })),
fallback: true
}
}
From 72dbf54e114dc9d96aef24ddb646aaac820e04e1 Mon Sep 17 00:00:00 2001
From: "tangly1024.com"
Date: Mon, 31 Jul 2023 16:57:42 +0800
Subject: [PATCH 38/39] fix build
---
pages/[prefix]/[slug].js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pages/[prefix]/[slug].js b/pages/[prefix]/[slug].js
index 3b05c31a..2beae09c 100644
--- a/pages/[prefix]/[slug].js
+++ b/pages/[prefix]/[slug].js
@@ -26,7 +26,7 @@ export async function getStaticPaths() {
const from = 'slug-paths'
const { allPages } = await getGlobalData({ from })
return {
- paths: allPages?.filter(row => row.slug.indexOf('/') < 0 && row.type.indexOf('Menu') < 0).map(row => ({ params: { prefix: row.slug.split('/')[0], slug: row.slug.split('/')[1] } })),
+ paths: allPages?.filter(row => row.slug.indexOf('/') > 0 && row.type.indexOf('Menu') < 0).map(row => ({ params: { prefix: row.slug.split('/')[0], slug: row.slug.split('/')[1] } })),
fallback: true
}
}
From 91fac55b421f38844525f28fc45f9a985892da40 Mon Sep 17 00:00:00 2001
From: tangly1024
Date: Mon, 31 Jul 2023 20:46:21 +0800
Subject: [PATCH 39/39] =?UTF-8?q?=E4=B8=BB=E9=A2=98=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
blog.config.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/blog.config.js b/blog.config.js
index fab696b8..d1a0d961 100644
--- a/blog.config.js
+++ b/blog.config.js
@@ -5,7 +5,7 @@ const BLOG = {
process.env.NOTION_PAGE_ID || '02ab3b8678004aa69e9e415905ef32a5',
PSEUDO_STATIC: process.env.NEXT_PUBLIC_PSEUDO_STATIC || false, // 伪静态路径，开启后所有文章URL都以 .html 结尾。
NEXT_REVALIDATE_SECOND: process.env.NEXT_PUBLIC_REVALIDATE_SECOND || 5, // 更新内容缓存间隔 单位(秒)；即每个页面有5秒的纯静态期、此期间无论多少次访问都不会抓取notion数据；调大该值有助于节省Vercel资源、同时提升访问速率，但也会使文章更新有延迟。
- THEME: process.env.NEXT_PUBLIC_THEME || 'hexo', // 主题， 支持 ['next','hexo',"fukasawa','medium','example','matery','gitbook','simple'] @see https://preview.tangly1024.com
+ THEME: process.env.NEXT_PUBLIC_THEME || 'hexo', // 当前主题，在themes文件夹下可找到所有支持的主题；主题名称就是文件夹名，例如 example,fukasawa,gitbook,heo,hexo,landing,matery,medium,next,nobelium,plog,simple
THEME_SWITCH: process.env.NEXT_PUBLIC_THEME_SWITCH || false, // 是否显示切换主题按钮
LANG: process.env.NEXT_PUBLIC_LANG || 'zh-CN', // e.g 'zh-CN','en-US' see /lib/lang.js for more.
SINCE: 2021, // e.g if leave this empty, current year will be used.