diff --git a/lib/notion/getNotionData.js b/lib/notion/getNotionData.js index 118ed16b..0b2d5ba1 100644 --- a/lib/notion/getNotionData.js +++ b/lib/notion/getNotionData.js @@ -167,7 +167,7 @@ function getAllCategories({ allPosts, categoryOptions, sliceCount = 0 }) { * @param from * @returns {Promise<{title,description,pageCover}>} */ -function getBlogInfo(collection, block) { +function getBlogInfo({ collection, block }) { const title = collection?.name?.[0][0] || BLOG.TITLE const description = collection?.description?.[0][0] || BLOG.DESCRIPTION const pageCover = mapCoverUrl(collection?.cover, block) diff --git a/pages/_app.js b/pages/_app.js index 779a81eb..ef7b1408 100644 --- a/pages/_app.js +++ b/pages/_app.js @@ -27,23 +27,24 @@ const Messenger = dynamic(() => import('@/components/FacebookMessenger'), { }) const MyApp = ({ Component, pageProps }) => { + // 外部插件 + const externalPlugins = <> + {JSON.parse(BLOG.THEME_SWITCH) && } + {JSON.parse(BLOG.DEBUG) && } + {BLOG.ANALYTICS_ACKEE_TRACKER && } + {BLOG.ANALYTICS_GOOGLE_ID && } + {JSON.parse(BLOG.ANALYTICS_BUSUANZI_ENABLE) && } + {BLOG.ADSENSE_GOOGLE_ID && } + {BLOG.FACEBOOK_APP_ID && BLOG.FACEBOOK_PAGE_ID && } + + return ( - - {BLOG.THEME_SWITCH && } - {BLOG.DEBUG && } - {BLOG.ANALYTICS_ACKEE_TRACKER && } - {BLOG.ANALYTICS_GOOGLE_ID && } - {JSON.parse(BLOG.ANALYTICS_BUSUANZI_ENABLE) && } - {BLOG.ADSENSE_GOOGLE_ID && } - {BLOG.FACEBOOK_APP_ID && BLOG.FACEBOOK_PAGE_ID && } - {/* FontawesomeCDN */} - - - + + {externalPlugins} + {/* FontawesomeCDN */} + + + ) }