diff --git a/blog.config.js b/blog.config.js index 92116339..5cebfefa 100644 --- a/blog.config.js +++ b/blog.config.js @@ -1,17 +1,17 @@ // 注: 配置文件可以读取Vercel的环境变量，配置方式参考：https://docs.tangly1024.com/zh/features/personality -const BLOG = Object.assign({ +const BLOG = { TITLE: 'NotionNext BLOG', // 站点标题 DESCRIPTION: '这是一个由NotionNext生成的站点', // 站点描述 AUTHOR: 'tangly1024', // 作者 BIO: '一个普通的干饭人🍚', // 作者简介 LINK: 'https://tangly1024.com', // 网站地址 - NOTION_PAGE_ID: '02ab3b8678004aa69e9e415905ef32a5', // Important page_id！！！Duplicate Template from https://www.notion.so/tanghh/02ab3b8678004aa69e9e415905ef32a5 - NOTION_ACCESS_TOKEN: '', // Useful if you prefer not to make your database public KEYWORDS: 'Notion, 博客', // 网站关键词 英文逗号隔开 - LANG: 'zh-CN', // e.g 'zh-CN','en-US' see /lib/lang.js for more. - BEI_AN: '', // 备案号 闽ICP备XXXXXXX - SINCE: 2020, // if leave this empty, current year will be used. + NOTION_PAGE_ID: process.env.NOTION_PAGE_ID || '02ab3b8678004aa69e9e415905ef32a5', // Important page_id！！！Duplicate Template from https://www.notion.so/tanghh/02ab3b8678004aa69e9e415905ef32a5 + NOTION_ACCESS_TOKEN: process.env.NOTION_ACCESS_TOKEN || '', // Useful if you prefer not to make your database 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. + BEI_AN: '', // 备案号 闽ICP备XXXXXXX APPEARANCE: 'auto', // ['light', 'dark', 'auto'], FONT: 'font-serif tracking-wider subpixel-antialiased', // 文章字体 ['font-sans', 'font-serif', 'font-mono'] @see https://www.tailwindcss.cn/docs/font-family BACKGROUND_LIGHT: '#eeeeee', // use hex value, don't forget '#' e.g #fffefc @@ -21,62 +21,48 @@ const BLOG = Object.assign({ POST_LIST_STYLE: 'page', // ['page','scroll] 文章列表样式:页码分页、单页滚动加载 POST_PREVIEW_LINES: 12, // 预览博客行数 POSTS_PER_PAGE: 6, // post counts per page - POSTS_SORT_BY_DATE: false, // 是否强制按时间排序，否则默认由notion排序文章 + POSTS_SORT_BY: 'notion', // 排序方式 'date'按时间,'notion'由notion控制 // 社交链接，不需要可留空白，例如 CONTACT_WEIBO:'' - CONTACT_EMAIL: 'tlyong1992@hotmail.com', // 联系邮箱 - CONTACT_WEIBO: 'https://weibo.com/tangly1024', - CONTACT_TWITTER: 'https://twitter.com/troy1024_1', - CONTACT_GITHUB: 'https://github.com/tangly1024', - CONTACT_TELEGRAM: 'https://t.me/tangly_1024', + CONTACT_EMAIL: '', // 联系邮箱 e.g tlyong1992@hotmail.com + CONTACT_WEIBO: '', // e.g https://weibo.com/tangly1024 + CONTACT_TWITTER: '', // e.g https://twitter.com/troy1024_1 + CONTACT_GITHUB: '', // e.g https://github.com/tangly1024 + CONTACT_TELEGRAM: '', // e.g https://t.me/tangly_1024 - COMMENT_PROVIDER: '', // 支持 gitalk, utterances, cusdis + // 评论互动 可同时开启 CUSDIS UTTERRANCES GITALK + COMMENT_CUSDIS_APP_ID: process.env.NEXT_PUBLIC_COMMENT_CUSDIS_APP_ID || '', // data-app-id 36位 see https://cusdis.com/ + COMMENT_CUSDIS_HOST: process.env.NEXT_PUBLIC_COMMENT_CUSDIS_HOST || 'https://cusdis.com', // data-host, change this if you're using self-hosted version + COMMENT_CUSDIS_SCRIPT_SRC: process.env.NEXT_PUBLIC_COMMENT_CUSDIS_SCRIPT_SRC || 'https://cusdis.com/js/cusdis.es.js', // change this if you're using self-hosted version - COMMENT_GITALK_REPO: '', // e.g NotionNext - COMMENT_GITALK_OWNER: '', // e.g tangly1024 - COMMENT_GITALK_ADMIN: '', // e.g 'tangly1024' - COMMENT_GITALK_CLIENT_ID: '', - COMMENT_GITALK_CLIENT_SECRET: '', + COMMENT_UTTERRANCES_REPO: process.env.NEXT_PUBLIC_COMMENT_UTTERRANCES_REPO || '', // e.g 'tangly1024/NotionNext' see https://utteranc.es/ + + COMMENT_GITALK_REPO: process.env.NEXT_PUBLIC_COMMENT_GITALK_REPO || '', // e.g NotionNext + COMMENT_GITALK_OWNER: process.env.NEXT_PUBLIC_COMMENT_GITALK_OWNER || '', // e.g tangly1024 + COMMENT_GITALK_ADMIN: process.env.NEXT_PUBLIC_COMMENT_GITALK_ADMIN || '', // e.g 'tangly1024' + COMMENT_GITALK_CLIENT_ID: process.env.NEXT_PUBLIC_COMMENT_GITALK_CLIENT_ID || '', // e.g 20位ID + COMMENT_GITALK_CLIENT_SECRET: process.env.NEXT_PUBLIC_COMMENT_GITALK_CLIENT_SECRET || '', // e.g 40位ID COMMENT_GITALK_DISTRACTION_FREE_MODE: false, - COMMENT_CUSDIS_APP_ID: '', // data-app-id - COMMENT_CUSDIS_HOST: 'https://cusdis.com', // data-host, change this if you're using self-hosted version - COMMENT_CUSDIS_SCRIPT_SRC: 'https://cusdis.com/js/cusdis.es.js', // change this if you're using self-hosted version - - COMMENT_UTTERRANCES_REPO: '', // e.g 'tangly1024/NotionNext' - - COMMENT_GITTER_ENABLE: false, // gitter see https://gitter.im/ - COMMENT_GITTER_ROOM: '', // gitter聊天室 - - COMMENT_DAO_VOICE_ENABLE: false, // DaoVoice see http://dashboard.daovoice.io/get-started - COMMENT_DAO_VOICE_ID: '', // DaoVoice http://dashboard.daovoice.io/get-started - - COMMENT_TIDIO_ENABLE: false, // https://www.tidio.com/ - COMMENT_TIDIO_ID: '', // [tidio_id] -> //code.tidio.co/[tidio_id].js + COMMENT_GITTER_ROOM: process.env.NEXT_PUBLIC_COMMENT_GITTER_ROOM || '', // gitter聊天室 see https://gitter.im/ 不需要则留空 + COMMENT_DAO_VOICE_ID: process.env.NEXT_PUBLIC_COMMENT_DAO_VOICE_ID || '', // DaoVoice http://dashboard.daovoice.io/get-started + COMMENT_TIDIO_ID: process.env.NEXT_PUBLIC_COMMENT_TIDIO_ID || '', // [tidio_id] -> //code.tidio.co/[tidio_id].js // 站点统计 - ANALYTICS_BUSUANZI_ENABLE: true, // 展示网站阅读量、访问数 see http://busuanzi.ibruce.info/ + ANALYTICS_BAIDU_ID: process.env.NEXT_PUBLIC_ANALYTICS_BAIDU_ID || '', // e.g 只需要填写百度统计的id，[baidu_id] -> https://hm.baidu.com/hm.js?[baidu_id] + ANALYTICS_CNZZ_ID: process.env.NEXT_PUBLIC_ANALYTICS_CNZZ_ID || '', // 只需要填写站长统计的id, [cnzz_id] -> https://s9.cnzz.com/z_stat.php?id=[cnzz_id]&web_id=[cnzz_id] + ANALYTICS_GOOGLE_ID: process.env.NEXT_PUBLIC_ANALYTICS_GOOGLE_ID || '', // 谷歌Analytics的id e.g: G-XXXXXXXXXX - ANALYTICS_BAIDU_ENABLE: false, - ANALYTICS_BAIDU_ID: '', // e.g 只需要填写百度统计的id，[baidu_id] -> https://hm.baidu.com/hm.js?[baidu_id] + ANALYTICS_ACKEE_TRACKER: process.env.NEXT_PUBLIC_ANALYTICS_ACKEE_TRACKER || '', // e.g 'https://ackee.tangly1024.net/tracker.js' + ANALYTICS_ACKEE_DATA_SERVER: process.env.NEXT_PUBLIC_ANALYTICS_ACKEE_DATA_SERVER || '', // e.g https://ackee.tangly1024.net , don't end with a slash + ANALYTICS_ACKEE_DOMAIN_ID: process.env.NEXT_PUBLIC_ANALYTICS_ACKEE_DOMAIN_ID || '', // e.g '0e2257a8-54d4-4847-91a1-0311ea48cc7b' - ANALYTICS_CNZZ_ENABLE: false, - ANALYTICS_CNZZ_ID: '', // 只需要填写站长统计的id, [cnzz_id] -> https://s9.cnzz.com/z_stat.php?id=[cnzz_id]&web_id=[cnzz_id] + SEO_GOOGLE_SITE_VERIFICATION: process.env.NEXT_PUBLIC_SEO_GOOGLE_SITE_VERIFICATION || '', // Remove the value or replace it with your own google site verification code - ANALYTICS_GOOGLE_ENABLE: false, - ANALYTICS_GOOGLE_ID: '', // 谷歌Analytics的id e.g: G-XXXXXXXXXX + ADSENSE_GOOGLE_ID: process.env.NEXT_PUBLIC_ADSENSE_GOOGLE_ID || '', // 谷歌广告ID e.g ca-pub-xxxxxxxxxxxxxxxx - ANALYTICS_ACKEE_ENABLE: false, - ANALYTICS_ACKEE_TRACKER: '', // e.g 'https://ackee.tangly1024.net/tracker.js' - ANALYTICS_ACKEE_DATA_SERVER: '', // e.g https://ackee.tangly1024.net , don't end with a slash - ANALYTICS_ACKEE_DOMAIN_ID: '', // e.g '0e2257a8-54d4-4847-91a1-0311ea48cc7b' - - SEO_GOOGLE_SITE_VERIFICATION: '', // Remove the value or replace it with your own google site verification code - - GOOGLE_ADSENSE_ENABLE: false, - GOOGLE_ADSENSE_ID: '', // 谷歌广告ID e.g ca-pub-xxxxxxxxxxxxxxxx - isProd: process.env.VERCEL_ENV === 'production' // distinguish between development and production environment (ref: https://vercel.com/docs/environment-variables#system-environment-variables) -}, JSON.parse(JSON.stringify(process.env))) + 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) +} module.exports = BLOG diff --git a/components/Ackee.js b/components/Ackee.js index 9813c169..ab22c969 100644 --- a/components/Ackee.js +++ b/components/Ackee.js @@ -3,14 +3,12 @@ import useAckee from 'use-ackee' import BLOG from '@/blog.config' const Ackee = () => { - const ackeeServerUrl = BLOG.ANALYTICS_ACKEE_DATA_SERVER - const ackeeDomainId = BLOG.ANALYTICS_ACKEE_DOMAIN_ID const router = useRouter() useAckee( router.asPath, { - server: ackeeServerUrl, - domainId: ackeeDomainId + server: BLOG.ANALYTICS_ACKEE_DATA_SERVER, + domainId: BLOG.ANALYTICS_ACKEE_DOMAIN_ID }, { detailed: false, diff --git a/components/Comment.js b/components/Comment.js index 4aed2007..fcb7879b 100644 --- a/components/Comment.js +++ b/components/Comment.js @@ -27,11 +27,23 @@ const CusdisComponent = dynamic( const Comment = ({ frontMatter }) => { const router = useRouter() const { theme } = useGlobal() - return ( -
+
- {BLOG.COMMENT_GITALK_CLIENT_ID && (
+ {BLOG.COMMENT_CUSDIS_APP_ID && (
+ +
)} + {BLOG.COMMENT_GITALK_CLIENT_ID && (
{ repo: BLOG.COMMENT_GITALK_REPO, owner: BLOG.COMMENT_GITALK_OWNER, admin: BLOG.COMMENT_GITALK_ADMIN.split(','), - distractionFreeMode: BLOG.COMMENT_GITALK_DISTRACTION_FREE_MODE + distractionFreeMode: JSON.parse(BLOG.COMMENT_GITALK_DISTRACTION_FREE_MODE) }} />
)} - {BLOG.COMMENT_UTTERRANCES_REPO && (
+ {BLOG.COMMENT_UTTERRANCES_REPO && (
)} - {BLOG.COMMENT_CUSDIS_APP_ID && (<> -