From add19cc4add82450a22f2332dda1440fb8bd014d Mon Sep 17 00:00:00 2001 From: tangly1024 Date: Mon, 12 Dec 2022 12:52:50 +0800 Subject: [PATCH 1/5] =?UTF-8?q?Medium=E4=B8=BB=E9=A2=98=E5=A4=9C=E9=97=B4?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E9=85=8D=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- themes/medium/LayoutBase.js | 2 +- themes/medium/components/ArticleAround.js | 4 ++-- themes/medium/components/ArticleDetail.js | 3 ++- themes/medium/components/BlogPostCard.js | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/themes/medium/LayoutBase.js b/themes/medium/LayoutBase.js index 29ea9e32ce0..427b3676fb1 100644 --- a/themes/medium/LayoutBase.js +++ b/themes/medium/LayoutBase.js @@ -24,7 +24,7 @@ const LayoutBase = props => { const router = useRouter() return ( -
+
{/* 桌面端左侧菜单 */} diff --git a/themes/medium/components/ArticleAround.js b/themes/medium/components/ArticleAround.js index 0c4363ccf75..cdedb1b9355 100644 --- a/themes/medium/components/ArticleAround.js +++ b/themes/medium/components/ArticleAround.js @@ -9,14 +9,14 @@ export default function ArticleAround ({ prev, next }) { if (!prev || !next) { return <> } - return
+ return
{prev.title} - {next.title} + {next.title} diff --git a/themes/medium/components/ArticleDetail.js b/themes/medium/components/ArticleDetail.js index ea129207ec9..1fffc2a0d21 100644 --- a/themes/medium/components/ArticleDetail.js +++ b/themes/medium/components/ArticleDetail.js @@ -21,7 +21,7 @@ export const ArticleDetail = props => { return
{/* title */} -

{post?.title}

+

{post?.title}

{/* meta */}
@@ -61,6 +61,7 @@ export const ArticleDetail = props => { data-ad-slot="3806269138" />
+
{CONFIG_MEDIUM.POST_DETAIL_CATEGORY && post.category && } diff --git a/themes/medium/components/BlogPostCard.js b/themes/medium/components/BlogPostCard.js index 7cbadf8358e..179ecdcd0bc 100644 --- a/themes/medium/components/BlogPostCard.js +++ b/themes/medium/components/BlogPostCard.js @@ -19,7 +19,7 @@ const BlogPostCard = ({ post, showSummary }) => { {post.title} From 89503ca0c1fde2379441bb77d96bb7cc6a027607 Mon Sep 17 00:00:00 2001 From: tangly1024 Date: Mon, 19 Dec 2022 16:33:41 +0800 Subject: [PATCH 2/5] Update README.md --- README.md | 75 +++++++++---------------------------------------------- 1 file changed, 12 insertions(+), 63 deletions(-) diff --git a/README.md b/README.md index 24b65760849..495a70425ad 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ # NotionNext -一个使用 NextJS + Notion API 实现的，部署在 Vercel 上的静态博客系统。为Notion和所有创作者设计。 -

@@ -17,74 +15,20 @@

-演示地址：[https://preview.tangly1024.com/](https://preview.tangly1024.com/) - -## 继承自Nobelium的亮点 ✨ - -**🚀  秒开，设备全适配** - -- 快速的页面渲染和响应式设计 -- 高效编译器的快速静态页面生成 - -**🤖  自动，无需重新部署** - -- 部署在免费、高速的 Vercel 平台 -- 支持增量式更新，更新文章后无需重复部署 - -**🚙  全功能，完全不操心** +一个使用 NextJS + Notion API 实现的，部署在 Vercel 上的静态博客系统。为Notion和所有创作者设计。 -- 评论、搜索、标签、分类 -- 订阅、网站统计 -- 本地化多语言 -- 服务端渲染、优秀的SEO -**🎨  美观，轻松自定义** -- 丰富的配置项，更支持多语言 -- 使用 Tailwind CSS，轻松实现二次开发 +## 预览效果 -## 特色 -- 支持更多的页面，功能，更多特性、欢迎移步[我的博客](https://tangly1024.com/article/notion-next)查看 -- 支持多主题切换 +在线演示：[https://preview.tangly1024.com/](https://preview.tangly1024.com/) ，项目支持多主题切换，没找到喜欢的主题？[贡献](/CONTRIBUTING.md)一个吧~ | Next | Medium | Hexo | Fukasawa | |--|--|--|--| | [预览NEXT](https://preview.tangly1024.com/?theme=next) | [预览MEDIUM](https://preview.tangly1024.com/?theme=medium) | [预览HEXO](https://preview.tangly1024.com/?theme=hexo) | [预览FUKASAWA](https://preview.tangly1024.com/?theme=fukasawa) | -*只需修改`blog.config.js`文件的`THEME`即可实现主题切换。* 没找到喜欢的主题？[贡献](/CONTRIBUTING.md)一个吧~ - - - -## 快速起步 - -- 给这个项目点个小星星 😉 -- 将 [这个 Notion 模板](https://tanghh.notion.site/02ab3b8678004aa69e9e415905ef32a5) 制作副本，并分享这个页面给所有人 -- [Fork](https://github.com/tangly1024/NotionNext/fork) 这个项目 - - _(可选)_ 用自己的图片替换 `/public` 文件夹里的 `avatar.jpg`、`favicon.svg` 和 `favicon.ico` - - 在 `blog.config.js` 配置相关选项，`NOTION_PAGE_ID`: 你刚刚分享出去的 Notion 页面网址中的页面 ID，通常是网址中工作区地址后的 32 位字符串 -- 在 [Vercel](https://vercel.com)中部署项目 -- **稍微等等就可以访问了！** 简单吗? - -更多项目特性及配置的说明，请移步 [NotionNext文档](https://docs.tangly1024.com/zh) 查看，文档正在完善中,欢迎 [参与编辑](https://github.com/tangly1024/nextjs-docs-notion-next) +## 我要如何开始？ -## 快速开发 -- 需要安装Nodejs环境 -```bash -yarn # 安装依赖 -yarn run dev # 本地开发 -yarn run build # 本地打包编译 -yarn run start # 本地启动NextJS服务 -``` - -## 引用技术 - -- **框架**: [Next.js](https://nextjs.org) -- **样式**: [Tailwind CSS](https://www.tailwindcss.cn/) 和 `@tailwindcss/jit` compiler -- **渲染**: [React-notion-x](https://github.com/NotionX/react-notion-x) -- **评论**: [Giscus](https://giscus.app/zh-CN), [Gitalk](https://gitalk.github.io), [Cusdis](https://cusdis.com), [Utterances](https://utteranc.es) -- **图标**：[fontawesome v5.15](https://fontawesome.com/v5.15/icons?d=gallery) - -## 更新日志 -请移步 [更新文档](https://docs.tangly1024.com/zh/changelog)查看 +只需几分钟即可搭建您的个人站点，欢迎移步[我的博客](https://tangly1024.com/article/notion-next) 查看教程 ## 致谢 @@ -120,12 +64,17 @@ yarn run start # 本地启动NextJS服务 SwwweetOrange
SwwweetOrange
🔧 🐛 Ylarod
Ylarod
🔧 🐛 -v -十分期待你的[贡献](/CONTRIBUTING.md)，一起来完善这个项目~ +## 引用技术 + +- **框架**: [Next.js](https://nextjs.org) +- **样式**: [Tailwind CSS](https://www.tailwindcss.cn/) 和 `@tailwindcss/jit` compiler +- **渲染**: [React-notion-x](https://github.com/NotionX/react-notion-x) +- **评论**: [Giscus](https://giscus.app/zh-CN), [Gitalk](https://gitalk.github.io), [Cusdis](https://cusdis.com), [Utterances](https://utteranc.es) +- **图标**: [Fontawesome](https://fontawesome.com/v6/icons/) ## License From 3abdb14c1a185e379111b3cb5dafe194faa18a41 Mon Sep 17 00:00:00 2001 From: tangly1024 Date: Mon, 19 Dec 2022 16:49:07 +0800 Subject: [PATCH 3/5] =?UTF-8?q?hexo-=E6=A0=B7=E5=BC=8F=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- styles/globals.css | 5 ----- themes/hexo/LayoutArchive.js | 2 +- themes/hexo/components/NavButtonGroup.js | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/styles/globals.css b/styles/globals.css index a4e86ff1f43..f2f180e8135 100644 --- a/styles/globals.css +++ b/styles/globals.css @@ -132,11 +132,6 @@ nav { backdrop-filter: blur(10px); } -.dark .glassmorphism { - background: rgba(31, 41, 55, 0.75); - -webkit-backdrop-filter: blur(10px); - backdrop-filter: blur(10px); -} .medium-zoom-overlay { background: none !important; diff --git a/themes/hexo/LayoutArchive.js b/themes/hexo/LayoutArchive.js index 5f30f76e2c8..8d2a1c084d3 100644 --- a/themes/hexo/LayoutArchive.js +++ b/themes/hexo/LayoutArchive.js @@ -39,7 +39,7 @@ export const LayoutArchive = (props) => { }, []) return -
+
{Object.keys(archivePosts).map(archiveTitle => ( { return From c44e1d4c71176ac7a5d4c22cc969d216c07b5394 Mon Sep 17 00:00:00 2001 From: tangly1024 Date: Tue, 20 Dec 2022 20:57:54 +0800 Subject: [PATCH 4/5] =?UTF-8?q?twikoo=20=E8=AF=84=E8=AE=BA=E6=8F=92?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- blog.config.js | 16 ++++++++++++---- components/Comment.js | 11 +++++++++++ components/Twikoo.js | 27 +++++++++++++++++++++++++++ package.json | 1 + 4 files changed, 51 insertions(+), 4 deletions(-) create mode 100644 components/Twikoo.js diff --git a/blog.config.js b/blog.config.js index 4baa8fe3f13..9d5becac235 100644 --- a/blog.config.js +++ b/blog.config.js @@ -66,7 +66,13 @@ const BLOG = { WIDGET_PET_LINK: 'https://cdn.jsdelivr.net/npm/live2d-widget-model-wanko@1.0.5/assets/wanko.model.json', // 挂件模型地址 @see https://github.com/xiazeyu/live2d-widget-models WIDGET_PET_SWITCH_THEME: true, // 点击宠物挂件切换博客主题 - // 评论互动 可同时开启多个支持 GISCUS CUSDIS UTTERRANCES GITALK + // ----> 评论互动 可同时开启多个支持 WALINE VALINE GISCUS CUSDIS UTTERRANCES GITALK + + // twikoo + COMMENT_TWIKOO_ENV_ID: process.env.NEXT_PUBLIC_COMMENT_ENV_ID || '', // TWIKOO地址 腾讯云环境填 envId；Vercel 环境域名地址（https://xxx.vercel.app) + + // utterance + COMMENT_UTTERRANCES_REPO: process.env.NEXT_PUBLIC_COMMENT_UTTERRANCES_REPO || '', // 你的代码仓库名， 例如我是 'tangly1024/NotionNext'； 更多文档参考 https://utteranc.es/ // giscus @see https://giscus.app/ COMMENT_GISCUS_REPO: process.env.NEXT_PUBLIC_COMMENT_GISCUS_REPO || '', // 你的Github仓库名 e.g 'tangly1024/NotionNext' @@ -84,8 +90,6 @@ const BLOG = { 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_UTTERRANCES_REPO: process.env.NEXT_PUBLIC_COMMENT_UTTERRANCES_REPO || '', // 你的代码仓库名， 例如我是 'tangly1024/NotionNext'； 更多文档参考 https://utteranc.es/ - // gitalk评论插件 更多参考 https://gitalk.github.io/ COMMENT_GITALK_REPO: process.env.NEXT_PUBLIC_COMMENT_GITALK_REPO || '', // 你的Github仓库名，例如 'NotionNext' COMMENT_GITALK_OWNER: process.env.NEXT_PUBLIC_COMMENT_GITALK_OWNER || '', // 你的用户名 e.g tangly1024 @@ -106,7 +110,9 @@ const BLOG = { COMMENT_WALINE_SERVER_URL: process.env.NEXT_PUBLIC_WALINE_SERVER_URL || '', // 请配置完整的Waline评论地址 例如 hhttps://preview-waline.tangly1024.com @see https://waline.js.org/guide/get-started.html COMMENT_WALINE_RECENT: process.env.NEXT_PUBLIC_WALINE_RECENT || false, // 最新评论 - // 站点统计 + // <---- 评论插件 + + // ----> 站点统计 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] @@ -118,6 +124,8 @@ const BLOG = { 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 + // <---- 站点统计 + // 谷歌广告 ADSENSE_GOOGLE_ID: process.env.NEXT_PUBLIC_ADSENSE_GOOGLE_ID || '', // 谷歌广告ID e.g ca-pub-xxxxxxxxxxxxxxxx diff --git a/components/Comment.js b/components/Comment.js index c1ae3d2bbff..613fad8873e 100644 --- a/components/Comment.js +++ b/components/Comment.js @@ -19,6 +19,13 @@ const CusdisComponent = dynamic( { ssr: false } ) +const TwikooCompenent = dynamic( + () => { + return import('@/components/Twikoo') + }, + { ssr: false } +) + const GitalkComponent = dynamic( () => { return import('@/components/Gitalk') @@ -66,6 +73,10 @@ const Comment = ({ frontMatter }) => {
+ { BLOG.COMMENT_TWIKOO_ENV_ID && (
+ +
)} + { BLOG.COMMENT_WALINE_SERVER_URL && (
) } diff --git a/components/Twikoo.js b/components/Twikoo.js new file mode 100644 index 00000000000..bc6baa06035 --- /dev/null +++ b/components/Twikoo.js @@ -0,0 +1,27 @@ +import BLOG from '@/blog.config' +import React from 'react' +import twikoo from 'twikoo' + +/** + * Giscus评论 @see https://giscus.app/zh-CN + * Contribute by @txs https://github.com/txs/NotionNext/commit/1bf7179d0af21fb433e4c7773504f244998678cb + * @returns {JSX.Element} + * @constructor + */ + +const Twikoo = ({ isDarkMode }) => { + React.useEffect(() => { + twikoo({ + envId: BLOG.COMMENT_TWIKOO_ENV_ID, // 腾讯云环境填 envId；Vercel 环境填地址（https://xxx.vercel.app） + el: '#twikoo', // 容器元素 + lang: BLOG.LANG // 用于手动设定评论区语言，支持的语言列表 https://github.com/imaegoo/twikoo/blob/main/src/client/utils/i18n/index.js + // region: 'ap-guangzhou', // 环境地域，默认为 ap-shanghai，腾讯云环境填 ap-shanghai 或 ap-guangzhou；Vercel 环境不填 + // path: location.pathname, // 用于区分不同文章的自定义 js 路径，如果您的文章路径不是 location.pathname，需传此参数 + }) + }) + return ( +
+ ) +} + +export default Twikoo diff --git a/package.json b/package.json index c1a01253666..949612e175d 100644 --- a/package.json +++ b/package.json @@ -52,6 +52,7 @@ "react-notion-x": "6.15.6", "react-share": "^4.4.0", "smoothscroll-polyfill": "^0.4.4", + "twikoo": "^1.6.8", "typed.js": "^2.0.12", "use-ackee": "^3.0.0", "valine": "^1.4.18" From 82a190fd8575543b75da8ea5371b0dfb3d34c4d4 Mon Sep 17 00:00:00 2001 From: tangly1024 Date: Tue, 20 Dec 2022 21:56:15 +0800 Subject: [PATCH 5/5] 3.6.8 --- .env.local | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.local b/.env.local index fed79673a3e..7b9c9266e95 100644 --- a/.env.local +++ b/.env.local @@ -1,2 +1,2 @@ # 环境变量 @see https://www.nextjs.cn/docs/basic-features/environment-variables -NEXT_PUBLIC_VERSION=3.6.7 \ No newline at end of file +NEXT_PUBLIC_VERSION=3.6.8 \ No newline at end of file diff --git a/package.json b/package.json index 949612e175d..d35fc0a4d74 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "notion-next", - "version": "3.6.7", + "version": "3.6.8", "homepage": "https://github.com/tangly1024/NotionNext.git", "license": "MIT", "repository": {