From ca32dca8e75d9c41841b41516b8114421fa1a4da Mon Sep 17 00:00:00 2001 From: tangly1024 Date: Sun, 11 Dec 2022 18:01:30 +0800 Subject: [PATCH 01/31] Update blog.config.js --- blog.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blog.config.js b/blog.config.js index 4baa8fe3..cb48160b 100644 --- a/blog.config.js +++ b/blog.config.js @@ -23,7 +23,7 @@ const BLOG = { CONTACT_LINKEDIN: '', // 你的linkedIn 首页 // 自定义字体示例： 请先将 CUSTOM_FONT 改为 true， 并将 CUSTOM_FONT_URL 改为你的字体CSS地址，同时在 CUSTOM_FONT_SANS 与 CUSTOM_FONT_SERIF 中指定你的 fontfamily - CUSTOM_FONT: true, // 是否使用自定义字体 + CUSTOM_FONT: false, // 是否使用自定义字体 CUSTOM_FONT_URL: ['https://npm.elemecdn.com/lxgw-wenkai-webfont@1.6.0/style.css'], // 自定义字体的CSS CUSTOM_FONT_SANS: ['LXGW WenKai'], // 自定义无衬线字体 CUSTOM_FONT_SERIF: ['LXGW WenKai'], // 自定义衬线字体 From d9e203a385ebfcb3a8ae517103899b2fb2abb06a Mon Sep 17 00:00:00 2001 From: tangly1024 Date: Thu, 22 Dec 2022 09:37:55 +0800 Subject: [PATCH 02/31] Update blog.config.js --- blog.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blog.config.js b/blog.config.js index 36c666e3..4041ee69 100644 --- a/blog.config.js +++ b/blog.config.js @@ -3,7 +3,7 @@ const BLOG = { // Important page_id！！！Duplicate Template from https://www.notion.so/tanghh/02ab3b8678004aa69e9e415905ef32a5 NOTION_PAGE_ID: process.env.NOTION_PAGE_ID || '02ab3b8678004aa69e9e415905ef32a5', PSEUDO_STATIC: false, // 伪静态路径，开启后所有文章URL都以 .html 结尾。 - NEXT_REVALIDATE_SECOND: 5, // 更新内容缓存间隔 单位(秒)；即每个页面有5秒的纯静态期、此期间无论多少次访问都不会抓取notion数据；调大该值有助于节省Vercel资源、同时提升访问速率，但也会使文章更新有延迟。 + NEXT_REVALIDATE_SECOND: 86400, // 更新内容缓存间隔 单位(秒)；即每个页面有5秒的纯静态期、此期间无论多少次访问都不会抓取notion数据；调大该值有助于节省Vercel资源、同时提升访问速率，但也会使文章更新有延迟。 THEME: process.env.NEXT_PUBLIC_THEME || 'hexo', // 主题， 支持 ['next','hexo',"fukasawa','medium','example'] @see https://preview.tangly1024.com THEME_SWITCH: process.env.NEXT_PUBLIC_THEME_SWITCH || false, // 是否显示切换主题按钮 LANG: 'zh-CN', // e.g 'zh-CN','en-US' see /lib/lang.js for more. From 15d90c1be76c22584b082710ec944a435d1df661 Mon Sep 17 00:00:00 2001 From: tangly1024 Date: Sun, 25 Dec 2022 21:00:38 +0800 Subject: [PATCH 03/31] Update blog.config.js --- blog.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blog.config.js b/blog.config.js index 4041ee69..c2e12ff9 100644 --- a/blog.config.js +++ b/blog.config.js @@ -52,7 +52,7 @@ const BLOG = { POST_LIST_PREVIEW: process.env.NEXT_PUBLIC_POST_PREVIEW || 'false', // 是否在列表加载文章预览 POST_PREVIEW_LINES: 12, // 预览博客行数 POST_RECOMMEND_COUNT: 6, // 推荐文章数量 - POSTS_PER_PAGE: 6, // post counts per page + POSTS_PER_PAGE: 10, // post counts per page POSTS_SORT_BY: 'notion', // 排序方式 'date'按时间,'notion'由notion控制 PREVIEW_CATEGORY_COUNT: 16, // 首页最多展示的分类数量，0为不限制 From db4087197c0bdf8776656081a9c379ce85960936 Mon Sep 17 00:00:00 2001 From: tangly1024 Date: Sun, 25 Dec 2022 21:57:37 +0800 Subject: [PATCH 04/31] Update blog.config.js --- blog.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blog.config.js b/blog.config.js index c2e12ff9..3bde8c72 100644 --- a/blog.config.js +++ b/blog.config.js @@ -52,7 +52,7 @@ const BLOG = { POST_LIST_PREVIEW: process.env.NEXT_PUBLIC_POST_PREVIEW || 'false', // 是否在列表加载文章预览 POST_PREVIEW_LINES: 12, // 预览博客行数 POST_RECOMMEND_COUNT: 6, // 推荐文章数量 - POSTS_PER_PAGE: 10, // post counts per page + POSTS_PER_PAGE: 12, // post counts per page POSTS_SORT_BY: 'notion', // 排序方式 'date'按时间,'notion'由notion控制 PREVIEW_CATEGORY_COUNT: 16, // 首页最多展示的分类数量，0为不限制 From c45f64f4eb296f07f2fa208c9754f040156fec52 Mon Sep 17 00:00:00 2001 From: Etherrreal <65111206+lifeafter619@users.noreply.github.com> Date: Thu, 29 Dec 2022 10:57:50 +0800 Subject: [PATCH 05/31] Update WalineComponent.js --- components/WalineComponent.js | 51 ++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/components/WalineComponent.js b/components/WalineComponent.js index 22d6ceee..75f5ec2f 100644 --- a/components/WalineComponent.js +++ b/components/WalineComponent.js @@ -20,6 +20,50 @@ const WalineComponent = (props) => { waline.update(props) } } + const locale = { + nick: '昵称', + nickError: '昵称不能少于3个字符', + mail: '邮箱', + mailError: '请填写正确的邮件地址', + link: '网址', + optional: '可选', + placeholder: '欢迎评论', + sofa: '来发评论吧~', + submit: '提交', + like: '喜欢', + cancelLike: '取消喜欢', + reply: '回复~', + cancelReply: '取消回复', + comment: '评论', + refresh: '刷新', + more: '加载更多...', + preview: '预览', + emoji: '表情', + uploadImage: '上传图片', + seconds: '秒前', + minutes: '分钟前', + hours: '小时前', + days: '天前', + now: '刚刚', + uploading: '正在上传', + login: '登录', + logout: '退出', + admin: '博主', + sticky: '置顶', + word: '字', + wordHint: '评论字数应在 $0 到 $1 字之间！\n当前字数：$2', + anonymous: '匿名', + gif: '表情包', + profile: '个人资料', + approved: '通过', + waiting: '待审核', + spam: '垃圾', + unsticky: '取消置顶', + oldest: '按倒序', + latest: '按正序', + hottest: '按热度', + reactionTitle: '你认为这篇文章怎么样？' + } React.useEffect(() => { if (!waline) { @@ -28,7 +72,12 @@ const WalineComponent = (props) => { el: containerRef.current, serverURL: BLOG.COMMENT_WALINE_SERVER_URL, lang: BLOG.lang, - reaction: true + reaction: true, + emoji: [ + '//npm.elemecdn.com/@waline/emojis@1.1.0/tieba', + '//npm.elemecdn.com/@waline/emojis@1.1.0/weibo', + '//npm.elemecdn.com/@waline/emojis@1.1.0/bilibili' + ] }) } From a5f2da84dc069ff716e084b0049a6eb6ce4ef5d7 Mon Sep 17 00:00:00 2001 From: Etherrreal <65111206+lifeafter619@users.noreply.github.com> Date: Thu, 29 Dec 2022 11:02:59 +0800 Subject: [PATCH 06/31] Update .eslintrc.js --- .eslintrc.js | 1 + 1 file changed, 1 insertion(+) diff --git a/.eslintrc.js b/.eslintrc.js index 4b95adcd..6751e7c3 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -29,6 +29,7 @@ module.exports = { 'react/prop-types': 'off', 'space-before-function-paren': 0, 'react-hooks/rules-of-hooks': 'error' // Checks rules of Hooks + 'no-unused-vars': "off" }, globals: { React: true From dd3860633d537726f8d2766d528d58c1049b3ef3 Mon Sep 17 00:00:00 2001 From: Etherrreal <65111206+lifeafter619@users.noreply.github.com> Date: Thu, 29 Dec 2022 11:08:20 +0800 Subject: [PATCH 07/31] Update .eslintrc.js --- .eslintrc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index 6751e7c3..f5a9a1b6 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -28,7 +28,7 @@ module.exports = { rules: { 'react/prop-types': 'off', 'space-before-function-paren': 0, - 'react-hooks/rules-of-hooks': 'error' // Checks rules of Hooks + 'react-hooks/rules-of-hooks': 'error', // Checks rules of Hooks 'no-unused-vars': "off" }, globals: { From c8e2ad5fe3a76be164e19bac24d30901c121b908 Mon Sep 17 00:00:00 2001 From: tangly1024 Date: Thu, 29 Dec 2022 20:19:29 +0800 Subject: [PATCH 08/31] =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E7=9A=84emoji?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintrc.js | 3 +-- components/WalineComponent.js | 44 ----------------------------------- 2 files changed, 1 insertion(+), 46 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index f5a9a1b6..4b95adcd 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -28,8 +28,7 @@ module.exports = { rules: { 'react/prop-types': 'off', 'space-before-function-paren': 0, - 'react-hooks/rules-of-hooks': 'error', // Checks rules of Hooks - 'no-unused-vars': "off" + 'react-hooks/rules-of-hooks': 'error' // Checks rules of Hooks }, globals: { React: true diff --git a/components/WalineComponent.js b/components/WalineComponent.js index 75f5ec2f..7ddc00ee 100644 --- a/components/WalineComponent.js +++ b/components/WalineComponent.js @@ -20,50 +20,6 @@ const WalineComponent = (props) => { waline.update(props) } } - const locale = { - nick: '昵称', - nickError: '昵称不能少于3个字符', - mail: '邮箱', - mailError: '请填写正确的邮件地址', - link: '网址', - optional: '可选', - placeholder: '欢迎评论', - sofa: '来发评论吧~', - submit: '提交', - like: '喜欢', - cancelLike: '取消喜欢', - reply: '回复~', - cancelReply: '取消回复', - comment: '评论', - refresh: '刷新', - more: '加载更多...', - preview: '预览', - emoji: '表情', - uploadImage: '上传图片', - seconds: '秒前', - minutes: '分钟前', - hours: '小时前', - days: '天前', - now: '刚刚', - uploading: '正在上传', - login: '登录', - logout: '退出', - admin: '博主', - sticky: '置顶', - word: '字', - wordHint: '评论字数应在 $0 到 $1 字之间！\n当前字数：$2', - anonymous: '匿名', - gif: '表情包', - profile: '个人资料', - approved: '通过', - waiting: '待审核', - spam: '垃圾', - unsticky: '取消置顶', - oldest: '按倒序', - latest: '按正序', - hottest: '按热度', - reactionTitle: '你认为这篇文章怎么样？' - } React.useEffect(() => { if (!waline) { From 42586992b048de0e2fcdf82f744a1ff077dac81d Mon Sep 17 00:00:00 2001 From: tangly1024 Date: Sat, 31 Dec 2022 12:37:38 +0800 Subject: [PATCH 09/31] Update blog.config.js --- blog.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blog.config.js b/blog.config.js index ce820eae..74188d83 100644 --- a/blog.config.js +++ b/blog.config.js @@ -3,7 +3,7 @@ const BLOG = { // Important page_id！！！Duplicate Template from https://www.notion.so/tanghh/02ab3b8678004aa69e9e415905ef32a5 NOTION_PAGE_ID: process.env.NOTION_PAGE_ID || '02ab3b8678004aa69e9e415905ef32a5', PSEUDO_STATIC: false, // 伪静态路径，开启后所有文章URL都以 .html 结尾。 - NEXT_REVALIDATE_SECOND: 86400, // 更新内容缓存间隔 单位(秒)；即每个页面有5秒的纯静态期、此期间无论多少次访问都不会抓取notion数据；调大该值有助于节省Vercel资源、同时提升访问速率，但也会使文章更新有延迟。 + NEXT_REVALIDATE_SECOND: 5, // 更新内容缓存间隔 单位(秒)；即每个页面有5秒的纯静态期、此期间无论多少次访问都不会抓取notion数据；调大该值有助于节省Vercel资源、同时提升访问速率，但也会使文章更新有延迟。 THEME: process.env.NEXT_PUBLIC_THEME || 'hexo', // 主题， 支持 ['next','hexo',"fukasawa','medium','example'] @see https://preview.tangly1024.com THEME_SWITCH: process.env.NEXT_PUBLIC_THEME_SWITCH || false, // 是否显示切换主题按钮 LANG: 'zh-CN', // e.g 'zh-CN','en-US' see /lib/lang.js for more. From 2440a4591244c601efee14dc44bf2788834e4749 Mon Sep 17 00:00:00 2001 From: ykxkykx Date: Sun, 1 Jan 2023 14:45:00 +0800 Subject: [PATCH 10/31] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dmatery=E4=B8=BB?= =?UTF-8?q?=E9=A2=98=E4=B8=8B,notion=E7=9A=84description=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E8=BF=87=E9=95=BF,=E5=AF=BC=E8=87=B4=E4=BE=A7=E8=BE=B9side?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=97=B6=E6=BA=A2=E5=87=BA=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/SideBarDrawer.js | 8 ++++---- tailwind.config.js | 5 ++++- themes/matery/components/SideBar.js | 6 +++--- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/components/SideBarDrawer.js b/components/SideBarDrawer.js index dac43d75..b03b9b98 100644 --- a/components/SideBarDrawer.js +++ b/components/SideBarDrawer.js @@ -29,22 +29,22 @@ const SideBarDrawer = ({ children, isOpen, onOpen, onClose, className }) => { const sideBarDrawerBackground = window.document.getElementById('sidebar-drawer-background') if (showStatus) { - sideBarDrawer.classList.replace('-ml-56', 'ml-0') + sideBarDrawer.classList.replace('-ml-60', 'ml-0') sideBarDrawerBackground.classList.replace('hidden', 'block') } else { - sideBarDrawer.classList.replace('ml-0', '-ml-56') + sideBarDrawer.classList.replace('ml-0', '-ml-60') sideBarDrawerBackground.classList.replace('block', 'hidden') } } return