mirror of
https://github.com/d0zingcat/NotionNext.git
synced 2026-05-30 23:16:52 +00:00
fix-config
This commit is contained in:
@@ -9,7 +9,6 @@
|
|||||||
import { getDateValue, getTextContent } from 'notion-utils'
|
import { getDateValue, getTextContent } from 'notion-utils'
|
||||||
import { getPostBlocks } from './getPostBlocks'
|
import { getPostBlocks } from './getPostBlocks'
|
||||||
import getAllPageIds from './getAllPageIds'
|
import getAllPageIds from './getAllPageIds'
|
||||||
import BLOG from '@/blog.config'
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 从Notion中读取Config配置表
|
* 从Notion中读取Config配置表
|
||||||
@@ -18,7 +17,7 @@ import BLOG from '@/blog.config'
|
|||||||
*/
|
*/
|
||||||
export async function getConfigMapFromConfigPage(allPages) {
|
export async function getConfigMapFromConfigPage(allPages) {
|
||||||
// 默认返回配置文件
|
// 默认返回配置文件
|
||||||
const notionConfig = BLOG
|
const notionConfig = {}
|
||||||
|
|
||||||
if (!allPages || !Array.isArray(allPages) || allPages.length === 0) {
|
if (!allPages || !Array.isArray(allPages) || allPages.length === 0) {
|
||||||
console.warn('[Notion配置] 忽略的配置')
|
console.warn('[Notion配置] 忽略的配置')
|
||||||
|
|||||||
@@ -285,7 +285,7 @@ async function getDataBaseInfoByNotionAPI({ pageId, from }) {
|
|||||||
})
|
})
|
||||||
|
|
||||||
// 站点配置优先读取配置表格,否则读取blog.config.js 文件
|
// 站点配置优先读取配置表格,否则读取blog.config.js 文件
|
||||||
const NOTION_CONFIG = await getConfigMapFromConfigPage(collectionData) || BLOG
|
const NOTION_CONFIG = await getConfigMapFromConfigPage(collectionData) || {}
|
||||||
|
|
||||||
// Sort by date
|
// Sort by date
|
||||||
if (BLOG.POSTS_SORT_BY === 'date') {
|
if (BLOG.POSTS_SORT_BY === 'date') {
|
||||||
|
|||||||
@@ -17,15 +17,15 @@ export function InfoCard(props) {
|
|||||||
const { siteInfo, notice } = props
|
const { siteInfo, notice } = props
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
// 在文章详情页特殊处理
|
// 在文章详情页特殊处理
|
||||||
const isSlugPage = router.pathname === '/[...slug]'
|
const isSlugPage = router.pathname.indexOf('/[prefix]') === 0
|
||||||
|
console.log('TITLE:', siteConfig('TITLE'))
|
||||||
return (
|
return (
|
||||||
<Card className='bg-[#4f65f0] dark:bg-yellow-600 text-white flex flex-col w-72 overflow-hidden relative'>
|
<Card className='bg-[#4f65f0] dark:bg-yellow-600 text-white flex flex-col w-72 overflow-hidden relative'>
|
||||||
{/* 信息卡牌第一行 */}
|
{/* 信息卡牌第一行 */}
|
||||||
<div className='flex justify-between'>
|
<div className='flex justify-between'>
|
||||||
{/* 问候语 */}
|
{/* 问候语 */}
|
||||||
<GreetingsWords />
|
<GreetingsWords />
|
||||||
<div className={`${isSlugPage ? 'absolute right-0 -mt-8 -mr-5 hover:opacity-0 hover:scale-150 blur' : 'cursor-pointer'} justify-center items-center flex dark:text-gray-100 transform transitaion-all duration-200`}>
|
<div className={`${isSlugPage ? 'absolute right-0 -mt-8 -mr-6 hover:opacity-0 hover:scale-150 blur' : 'cursor-pointer'} justify-center items-center flex dark:text-gray-100 transform transitaion-all duration-200`}>
|
||||||
<LazyImage src={siteInfo?.icon} className='rounded-full' width={isSlugPage ? 100 : 28} alt={siteConfig('AUTHOR')} />
|
<LazyImage src={siteInfo?.icon} className='rounded-full' width={isSlugPage ? 100 : 28} alt={siteConfig('AUTHOR')} />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user