Merge branch 'main' into fix/hexo_404

README.md

@@ -2,7 +2,7 @@
 
 访问帮助：[NotionNext帮助手册](https://docs.tangly1024.com/)
 
-> 本项目教程为免费、公开资源，仅限个人学习使用。严禁任何个人或组织将本教程用于商业用途，包括但不限于直接售卖、间接收费、或其他变相盈利行为。转载、复制或介绍本教程内容时，须保留作者信息并明确注明来源。
+> 本项目教程为免费、公开资源，仅限个人学习使用，禁止利用本教程建立的博客发布非法内容、进行违法犯罪活动。严禁任何个人或组织将本教程用于商业用途，包括但不限于直接售卖、间接收费、或其他变相盈利行为。转载、复制或介绍本教程内容时，须保留作者信息并明确注明来源。 
 > 本项目仅提供由作者团队授权的付费咨询服务，请注意辨别，谨防诈骗行为。任何未经授权的收费服务均可能存在法律风险。
 
 Notion是一个能让效率暴涨的生产力引擎，可以帮你书写文档、管理笔记，搭建知识库，甚至可以为你规划项目、时间管理、组织团队、提高生产力、还有当前最强大的AI技术加持。
@@ -52,142 +52,9 @@ Notion是一个能让效率暴涨的生产力引擎，可以帮你书写文档
 
 ## 贡献者
 
-<table>
-  <tr align="left">
-  <td align="center">
-  <a href="https://github.com/tangly1024" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/15920488" width="64px;"alt="tangly1024"/><br/><sub><b>tangly1024</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=tangly1024" title="Owner" >🎫 🔧 🐛</a>
-  </td> 
-    
-  <td align="center">
-    <a href="https://github.com/uWayLu"  style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/21689326" width="64px;" alt="uWayLu"/><br/><sub><b>uWayLu</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=uWayLu" title="uWayLu" >🔧 🐛</a>
-  </td>
-    
-  <td align="center">
-    <a href="https://github.com/txs" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/554329" width="64px;" alt="txs"/><br/><sub><b>txs</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=txs" title="txs" >🔧 🐛</a>
-  </td>
+感谢所有为 NotionNext 做出贡献的人！
 
-  <td align="center">
-    <a href="https://github.com/yuzhanglong" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/56540811" width="64px;" alt="yuzhanglong"/><br/><sub><b>yuzhanglong</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=yuzhanglong" title="yuzhanglong" >🔧 🐛</a>
-  </td> 
-    
-  <td align="center">
-    <a href="https://github.com/Hscpro" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/13926044" width="64px;" alt="Hscpro"/><br/><sub><b>Hscpro</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=Hscpro" title="Hscpro" >🔧 🐛</a>
-  </td> 
-    
-  <td align="center">
-    <a href="https://github.com/JensonMiao" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/46488783" width="64px;" alt="JensonMiao"/><br/><sub><b>JensonMiao</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=JensonMiao" title="JensonMiao" >🔧 🐛</a>
-  </td> 
-  
-  <td align="center">
-    <a href="https://github.com/haixin1225" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/28828438" width="64px;"  alt="haixin1225"/><br/><sub><b>haixin1225</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=haixin1225" title="haixin1225" >🔧 🐛</a>
-  </td>
-
-  <td align="center">
-    <a href="https://github.com/mouyase" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/7844572" width="64px;"  alt="mouyase"/><br/><sub><b>mouyase</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=mouyase" title="mouyase" >🔧 🐛</a>
-  </td>
-  
-  <td align="center">
-    <a href="https://github.com/qfdk" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/2404478" width="64px;"  alt="qfdk"/><br/><sub><b>qfdk</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=qfdk" title="qfdk" >🔧 🐛</a>
-  </td>
-  
-  <td align="center">
-    <a href="https://github.com/ifyz" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/118271360" width="64px;"  alt="ifyz"/><br/><sub><b>ifyz</b></sub></a><br><a href="https://github.com/tangly1024/NotionNext/commits?author=ifyz" title="ifyz" >🔧 🐛</a>
-  </td>
-
-  <td align="center">
-    <a href="https://github.com/liqun98" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/71168966" width="64px;"  alt="Liqun Zhao"/><br/><sub><b>Liqun Zhao</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=liqun98" title="liqun98" >🔧 🐛</a>
-  </td>
-
-  <td align="center">
-    <a href="https://github.com/Ylarod" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/30978685" width="64px;"  alt="Ylarod"/><br/><sub><b>Ylarod</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=Ylarod" title="Ylarod" >🔧 🐛</a>
-  </td>
-
-  <td align="center">
-    <a href="https://github.com/lifeafter619" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/65111206" width="64px;"  alt="Etherrreal."/><br/><sub><b>Etherrreal.</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=lifeafter619" title="Etherrreal." >🔧 🐛</a>
-  </td>
-  
-  <td align="center">
-  <a href="https://github.com/ykxkykx" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/17985993" width="64px;"  alt="Joshua Astray"/><br/><sub><b>Joshua Astray</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=ykxkykx" title="ykxkykx" >🔧 🐛</a>
-  </td>
-
-  <td align="center">
-    <a href="https://github.com/Vixcity" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/57704177" width="64px;"  alt="Vixcity"/><br/><sub><b>Vixcity</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=Vixcity" title="Vixcity" >🔧 🐛</a>
-  </td>
-
-  <td align="center">
-    <a href="https://github.com/ipatpat" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/39089551" width="64px;"  alt="ipatpat"/><br/><sub><b>ipatpat</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=ipatpat" title="ipatpat" >🔧 🐛</a>
-  </td>
-
-  <td align="center">
-    <a href="https://github.com/xloong" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/8479955" width="64px;"  alt="xloong"/><br/><sub><b>xloong</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=xloong" title="xloong" >🔧 🐛</a>
-  </td>
-
-  <td align="center">
-    <a href="https://github.com/expoli" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/31023767" width="64px;"  alt="expoli"/><br/><sub><b>expoli</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=expoli" title="expoli" >🔧 🐛</a>
-  </td>
-
-  <td align="center">
-    <a href="https://github.com/SuperHuangXu" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/14816052" width="64px;"  alt="SuperHuangXu"/><br/><sub><b>bUBBLE</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=SuperHuangXu" title="SuperHuangXu" >🔧 🐛</a>
-  </td>
-
-  <td align="center">
-    <a href="https://github.com/Pylogmon" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/59004461" width="64px;"  alt="Pylogmon"/><br/><sub><b>派了个萌 </b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=Pylogmon" title="Pylogmon" >🔧 🐛</a>
-  </td>
-  
-  <td align="center">
-    <a href="https://github.com/SkysCrystal" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/49473463" width="64px;"  alt="SkysCrystal"/><br/><sub><b>Simon Shi</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=SkysCrystal" title="SkysCrystal" >🔧 🐛</a>
-  </td>
-  
-  <td align="center">
-    <a href="https://github.com/siygle" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/173408" width="64px;"  alt="S.Y. Lee"/><br/><sub><b>S.Y. Lee</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=siygle" title="siygle" >🔧 🐛</a>
-  </td>
-
-  <td align="center">
-    <a href="https://github.com/fighting-bug" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/56441589" width="64px;"  alt="fighting-buf"/><br/><sub><b>fighting-buf</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=fighting-bug" title="fighting-buf" >🔧 🐛</a>
-  </td>
-
-  <td align="center">
-    <a href="https://github.com/cliouo" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/71540889" width="64px;"  alt="cliouo"/><br/><sub><b>cliouo</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=cliouo" title="cliouo" >🔧 🐛</a>
-  </td>
-  
-  <td align="center">
-    <a href="https://github.com/sudeakq" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/102792219" width="64px;"  alt="Sude Akgün"/><br/><sub><b>Sude Akgün</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=sudeakq" title="sudeakq" >🔧 🐛</a>
-  </td>
-
-  <td align="center">
-    <a href="https://github.com/fgprodigal" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/769910" width="64px;"  alt="Ray"/><br/><sub><b>Ray</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=fgprodigal" title="Ray" >🔧 🐛</a>
-  </td>
-
-  <td align="center">
-    <a href="https://github.com/hongzzz" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/25585061" width="64px;"  alt="Hongzzz"/><br/><sub><b>Hongzzz</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=hongzzz" title="hongzzz" >🔧 🐛</a>
-  </td>
-
-  <td align="center">
-    <a href="https://github.com/RedhairHambagu" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/129669334" width="64px;"  alt="RedhairHambagu"/><br/><sub><b>RedhairHambagu</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=RedhairHambagu" title="RedhairHambagu" >🔧 🐛</a>
-  </td>
-
-  <td align="center">
-    <a href="https://github.com/Allengl" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/58612763" width="64px;"  alt="Allen"/><br/><sub><b>Allen</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=Allengl" title="Allengl" >🔧 🐛</a>
-  </td>
-
-  <td align="center">
-    <a href="https://github.com/zdf1230" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/5999425" width="64px;"  alt="zdf1230"/><br/><sub><b>zdf</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=zdf1230" title="zdf1230" >🔧 🐛</a>
-  </td>
-
-  <td align="center">
-    <a href="https://github.com/emengweb" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/31469739" width="64px;"  alt="emengweb"/><br/><sub><b>emengweb</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=emengweb" title="emengweb" >🔧 🐛</a>
-  </td>
-
-  <td align="center">
-    <a href="https://github.com/kitety" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/22906933" width="64px;"  alt="kitety"/><br/><sub><b>kitety</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=kitety" title="kitety" >🔧 🐛</a>
-  </td>
-
- <td align="center">
-    <a href="https://github.com/jxpeng98" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/83734772" width="64px;"  alt=" Jiaxin Peng"/><br/><sub><b> Jiaxin Peng</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=jxpeng98" title="jxpeng98" >🔧 🐛</a>
-  </td>
-
-</tr>
-</table>
+[![Contributors](https://contrib.rocks/image?repo=tangly1024/NotionNext)](https://github.com/tangly1024/NotionNext/graphs/contributors)
 
 ## 引用技术
 

README_EN.md

@@ -53,123 +53,9 @@ Special thanks to Craig Hart for initiating the Nobelium project.
 
 ## Contributors
 
-<table>
-  <tr align="left">
-  <td align="center">
-  <a href="https://github.com/tangly1024" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/15920488" width="64px;"alt="tangly1024"/><br/><sub><b>tangly1024</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=tangly1024" title="Owner" >🎫 🔧 🐛</a>
-  </td> 
-    
-  <td align="center">
-    <a href="https://github.com/uWayLu"  style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/21689326" width="64px;" alt="uWayLu"/><br/><sub><b>uWayLu</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=uWayLu" title="uWayLu" >🔧 🐛</a>
-  </td>
-    
-  <td align="center">
-    <a href="https://github.com/txs" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/554329" width="64px;" alt="txs"/><br/><sub><b>txs</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=txs" title="txs" >🔧 🐛</a>
-  </td>
-
-  <td align="center">
-    <a href="https://github.com/yuzhanglong" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/56540811" width="64px;" alt="yuzhanglong"/><br/><sub><b>yuzhanglong</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=yuzhanglong" title="yuzhanglong" >🔧 🐛</a>
-  </td> 
-    
-  <td align="center">
-    <a href="https://github.com/Hscpro" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/13926044" width="64px;" alt="Hscpro"/><br/><sub><b>Hscpro</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=Hscpro" title="Hscpro" >🔧 🐛</a>
-  </td> 
-    
-  <td align="center">
-    <a href="https://github.com/JensonMiao" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/46488783" width="64px;" alt="JensonMiao"/><br/><sub><b>JensonMiao</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=JensonMiao" title="JensonMiao" >🔧 🐛</a>
-  </td> 
-  
-  <td align="center">
-    <a href="https://github.com/haixin1225" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/28828438" width="64px;"  alt="haixin1225"/><br/><sub><b>haixin1225</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=haixin1225" title="haixin1225" >🔧 🐛</a>
-  </td>
-
-  <td align="center">
-    <a href="https://github.com/mouyase" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/7844572" width="64px;"  alt="mouyase"/><br/><sub><b>mouyase</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=mouyase" title="mouyase" >🔧 🐛</a>
-  </td>
-  
-  <td align="center">
-    <a href="https://github.com/qfdk" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/2404478" width="64px;"  alt="qfdk"/><br/><sub><b>qfdk</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=qfdk" title="qfdk" >🔧 🐛</a>
-  </td>
-  
-  <td align="center">
-    <a href="https://github.com/ifyz" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/118271360" width="64px;"  alt="ifyz"/><br/><sub><b>ifyz</b></sub></a><br><a href="https://github.com/tangly1024/NotionNext/commits?author=ifyz" title="ifyz" >🔧 🐛</a>
-  </td>
-
-  <td align="center">
-    <a href="https://github.com/liqun98" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/71168966" width="64px;"  alt="Liqun Zhao"/><br/><sub><b>Liqun Zhao</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=liqun98" title="liqun98" >🔧 🐛</a>
-  </td>
-
-  <td align="center">
-    <a href="https://github.com/Ylarod" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/30978685" width="64px;"  alt="Ylarod"/><br/><sub><b>Ylarod</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=Ylarod" title="Ylarod" >🔧 🐛</a>
-  </td>
-
-  <td align="center">
-    <a href="https://github.com/lifeafter619" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/65111206" width="64px;"  alt="Etherrreal."/><br/><sub><b>Etherrreal.</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=lifeafter619" title="Etherrreal." >🔧 🐛</a>
-  </td>
-  
-  <td align="center">
-  <a href="https://github.com/ykxkykx" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/17985993" width="64px;"  alt="Joshua Astray"/><br/><sub><b>Joshua Astray</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=ykxkykx" title="ykxkykx" >🔧 🐛</a>
-  </td>
-
-  <td align="center">
-    <a href="https://github.com/Vixcity" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/57704177" width="64px;"  alt="Vixcity"/><br/><sub><b>Vixcity</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=Vixcity" title="Vixcity" >🔧 🐛</a>
-  </td>
-
-  <td align="center">
-    <a href="https://github.com/ipatpat" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/39089551" width="64px;"  alt="ipatpat"/><br/><sub><b>ipatpat</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=ipatpat" title="ipatpat" >🔧 🐛</a>
-  </td>
-
-  <td align="center">
-    <a href="https://github.com/xloong" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/8479955" width="64px;"  alt="xloong"/><br/><sub><b>xloong</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=xloong" title="xloong" >🔧 🐛</a>
-  </td>
-
-  <td align="center">
-    <a href="https://github.com/expoli" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/31023767" width="64px;"  alt="expoli"/><br/><sub><b>expoli</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=expoli" title="expoli" >🔧 🐛</a>
-  </td>
-
-  <td align="center">
-    <a href="https://github.com/SuperHuangXu" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/14816052" width="64px;"  alt="SuperHuangXu"/><br/><sub><b>bUBBLE</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=SuperHuangXu" title="SuperHuangXu" >🔧 🐛</a>
-  </td>
-
-  <td align="center">
-    <a href="https://github.com/Pylogmon" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/59004461" width="64px;"  alt="Pylogmon"/><br/><sub><b>派了个萌 </b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=Pylogmon" title="Pylogmon" >🔧 🐛</a>
-  </td>
-  
-  <td align="center">
-    <a href="https://github.com/SkysCrystal" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/49473463" width="64px;"  alt="SkysCrystal"/><br/><sub><b>Simon Shi</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=SkysCrystal" title="SkysCrystal" >🔧 🐛</a>
-  </td>
-  
-  <td align="center">
-    <a href="https://github.com/siygle" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/173408" width="64px;"  alt="S.Y. Lee"/><br/><sub><b>S.Y. Lee</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=siygle" title="siygle" >🔧 🐛</a>
-  </td>
-
-  <td align="center">
-    <a href="https://github.com/fighting-bug" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/56441589" width="64px;"  alt="fighting-buf"/><br/><sub><b>fighting-buf</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=fighting-bug" title="fighting-buf" >🔧 🐛</a>
-  </td>
-
-  <td align="center">
-    <a href="https://github.com/cliouo" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/71540889" width="64px;"  alt="cliouo"/><br/><sub><b>cliouo</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=cliouo" title="cliouo" >🔧 🐛</a>
-  </td>
-  
-  <td align="center">
-    <a href="https://github.com/sudeakq" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/102792219" width="64px;"  alt="Sude Akgün"/><br/><sub><b>Sude Akgün</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=sudeakq" title="sudeakq" >🔧 🐛</a>
-  </td>
-
-  <td align="center">
-    <a href="https://github.com/fgprodigal" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/769910" width="64px;"  alt="Ray"/><br/><sub><b>Ray</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=fgprodigal" title="Ray" >🔧 🐛</a>
-  </td>
-
-  <td align="center">
-    <a href="https://github.com/hongzzz" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/25585061" width="64px;"  alt="Hongzzz"/><br/><sub><b>Hongzzz</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=hongzzz" title="hongzzz" >🔧 🐛</a>
-  </td>
-
-  <td align="center">
-    <a href="https://github.com/RedhairHambagu" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/129669334" width="64px;"  alt="RedhairHambagu"/><br/><sub><b>RedhairHambagu</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=RedhairHambagu" title="RedhairHambagu" >🔧 🐛</a>
-  </td>
-
-</tr>
-</table>
+This project exists thanks to all the people who contribute.
 
+[![Contributors](https://contrib.rocks/image?repo=tangly1024/NotionNext)](https://github.com/tangly1024/NotionNext/graphs/contributors)
 
 ## Technologies Used
 

components/DebugPanel.js

@@ -1,10 +1,10 @@
-import { useEffect, useState } from 'react'
-import Select from './Select'
+import { siteConfigMap } from '@/lib/config'
 import { useGlobal } from '@/lib/global'
+import { getQueryParam } from '@/lib/utils'
 import { THEMES } from '@/themes/theme'
 import { useRouter } from 'next/router'
-import { siteConfigMap } from '@/lib/config'
-import { getQueryParam } from '@/lib/utils'
+import { useEffect, useState } from 'react'
+import Select from './Select'
 
 /**
  *
@@ -50,79 +50,83 @@ const DebugPanel = () => {
   }
 
   return (
-        <>
-            {/* 调试按钮 */}
-            <div>
-                <div
-                    style={{ writingMode: 'vertical-lr' }}
-                    className={`bg-black text-xs text-white shadow-2xl p-1.5 rounded-l-xl cursor-pointer ${show ? 'right-96' : 'right-0'} fixed bottom-72 duration-200 z-50`}
-                    onClick={toggleShow}
-                >
-                    {show
-                      ? <i className="fas fa-times">&nbsp;{locale.COMMON.DEBUG_CLOSE}</i>
-                      : <i className="fas fa-tools">&nbsp;{locale.COMMON.DEBUG_OPEN}</i>}
-                </div>
-            </div>
+    <>
+      {/* 调试按钮 */}
+      <div>
+        <div
+          style={{ writingMode: 'vertical-lr' }}
+          className={`bg-black text-xs text-white shadow-2xl p-1.5 rounded-l-xl cursor-pointer ${show ? 'right-96' : 'right-0'} fixed bottom-72 duration-200 z-50`}
+          onClick={toggleShow}>
+          {show ? (
+            <i className='fas fa-times'>&nbsp;{locale.COMMON.DEBUG_CLOSE}</i>
+          ) : (
+            <i className='fas fa-tools'>&nbsp;{locale.COMMON.DEBUG_OPEN}</i>
+          )}
+        </div>
+      </div>
 
-            {/* 调试侧拉抽屉 */}
+      {/* 调试侧拉抽屉 */}
+      <div
+        className={` ${show ? 'shadow-card w-96 right-0 ' : '-right-96 invisible w-0'} overflow-y-scroll h-full p-5 bg-white fixed bottom-0 z-50 duration-200`}>
+        <div className='flex justify-between space-x-1 my-5'>
+          <div className='flex-col px-5'>
+            <Select
+              label={locale.COMMON.THEME_SWITCH}
+              value={currentTheme}
+              options={themeOptions}
+              onChange={handleUpdateDebugTheme}
+            />
             <div
-                className={` ${show ? 'shadow-card w-96 right-0 ' : '-right-96 invisible w-0'} overflow-y-scroll h-full p-5 bg-white fixed bottom-0 z-50 duration-200`}
-            >
-                <div className="flex justify-between space-x-1 my-5">
-                    <div className='flex'>
-                        <Select
-                            label={locale.COMMON.THEME_SWITCH}
-                            value={currentTheme}
-                            options={themeOptions}
-                            onChange={handleUpdateDebugTheme}
-                        />
-                        <div className="p-2 cursor-pointer" onClick={handleChangeDebugTheme}>
-                            <i className="fas fa-sync" />
-                        </div>
-                    </div>
-
-                    <div className='p-2'>
-                        <i className='fas fa-times' onClick={toggleShow}/>
-                    </div>
-                </div>
-
-                <div>
-                    {/* <div>
-                        <div className="font-bold w-18 border-b my-2">
-                            主题配置{`config_${debugTheme}.js`}:
-                        </div>
-                        <div className="text-xs">
-                            {Object.keys(themeConfig).map(k => (
-                                <div key={k} className="justify-between flex py-1">
-                                    <span className="bg-indigo-500 p-0.5 rounded text-white mr-2">
-                                        {k}
-                                    </span>
-                                    <span className="whitespace-nowrap">
-                                        {filterResult(themeConfig[k] + '')}
-                                    </span>
-                                </div>
-                            ))}
-                        </div>
-                    </div> */}
-                    <div className="font-bold w-18 border-b my-2">
-                        站点配置[blog.config.js]
-                    </div>
-                    <div className="text-xs">
-                        {siteConfig && Object.keys(siteConfig).map(k => (
-                            <div key={k} className="justify-between flex py-1">
-                                <span className="bg-blue-500 p-0.5 rounded text-white mr-2">
-                                    {k}
-                                </span>
-                                <span className="whitespace-nowrap">
-                                    {filterResult(siteConfig[k] + '')}
-                                </span>
-                            </div>
-                        ))}
-                    </div>
-                </div>
-
+              className='p-2 cursor-pointer'
+              onClick={handleChangeDebugTheme}>
+              <i className='fas fa-sync' />
             </div>
-        </>
+          </div>
+
+          <div className='p-2'>
+            <i className='fas fa-times' onClick={toggleShow} />
+          </div>
+        </div>
+
+        <div className='flex-col px-5'>
+          {/* 
+            <div>
+                <div className="font-bold w-18 border-b my-2">
+                    主题配置{`config_${debugTheme}.js`}:
+                </div>
+                <div className="text-xs">
+                    {Object.keys(themeConfig).map(k => (
+                        <div key={k} className="justify-between flex py-1">
+                            <span className="bg-indigo-500 p-0.5 rounded text-white mr-2">
+                                {k}
+                            </span>
+                            <span className="whitespace-nowrap">
+                                {filterResult(themeConfig[k] + '')}
+                            </span>
+                        </div>
+                    ))}
+                </div>
+            </div> 
+            */}
+          <div className='font-bold w-18 border-b my-2'>
+            站点配置[blog.config.js]
+          </div>
+          <div className='text-xs'>
+            {siteConfig &&
+              Object.keys(siteConfig).map(k => (
+                <div key={k} className='justify-between flex py-1'>
+                  <span className='bg-blue-500 p-0.5 rounded text-white mr-2'>
+                    {k}
+                  </span>
+                  <span className='whitespace-nowrap'>
+                    {filterResult(siteConfig[k] + '')}
+                  </span>
+                </div>
+              ))}
+          </div>
+        </div>
+      </div>
+    </>
   )
 }
 export default DebugPanel

components/ExternalPlugins.js

@@ -10,6 +10,7 @@ import { initGoogleAdsense } from './GoogleAdsense'
 import Head from 'next/head'
 import ExternalScript from './ExternalScript'
 import WebWhiz from './Webwhiz'
+import IconFont from './IconFont'
 
 /**
  * 各种插件脚本
@@ -124,6 +125,8 @@ const ExternalPlugin = props => {
     NOTION_CONFIG
   )
 
+  const ENABLE_ICON_FONT = siteConfig('ENABLE_ICON_FONT', false)
+
   // 自定义样式css和js引入
   if (isBrowser) {
     // 初始化AOS动画
@@ -165,7 +168,7 @@ const ExternalPlugin = props => {
     }
 
     setTimeout(() => {
-      // 映射url
+      // 将notion-id格式的url转成自定义slug
       convertInnerUrl(props?.allNavPages)
     }, 500)
   }, [router])
@@ -184,6 +187,7 @@ const ExternalPlugin = props => {
     <>
       {/* 全局样式嵌入 */}
       <GlobalStyle />
+      {ENABLE_ICON_FONT && <IconFont />}
       {MOUSE_FOLLOW && <MouseFollow />}
       {THEME_SWITCH && <ThemeSwitch />}
       {DEBUG && <DebugPanel />}

components/IconFont.js

@@ -0,0 +1,54 @@
+import { siteConfig } from '@/lib/config'
+import { loadExternalResource } from '@/lib/utils'
+import { useRouter } from 'next/router'
+import { useEffect } from 'react'
+
+/**
+ * iconfont
+ */
+export default function IconFont() {
+    const router = useRouter()
+
+    useEffect(() => {
+        loadExternalResource('/webfonts/iconfont.js').then(u => {
+            console.log('iconfont loaded')
+
+            // 查找所有 <i> 标签且 class 包含 'icon-'
+            const iElements = document.querySelectorAll('i[class*="icon-"]');
+            iElements.forEach(element => {
+                const className = Array.from(element.classList).find(cls => cls.startsWith('icon-'));
+                if (className) {
+                    // 创建新的 <svg> 元素
+                    const svgElement = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
+                    svgElement.setAttribute('class', 'icon');
+                    svgElement.setAttribute('aria-hidden', 'true');
+
+                    const useElement = document.createElementNS('http://www.w3.org/2000/svg', 'use');
+                    useElement.setAttributeNS('http://www.w3.org/1999/xlink', 'xlink:href', `#${className}`);
+                    svgElement.appendChild(useElement);
+
+                    // 替换原来的 <i> 元素
+                    element.replaceWith(svgElement);
+                    console.log(`Replaced <i> with class "${className}" to <svg>`);
+                }
+            });
+        })
+    }, [router])
+
+    return <style jsx global>
+        {`
+        .icon {
+            width: 1.1em;
+            height: 1.1em;
+            vertical-align: -0.15em;
+            fill: currentColor;
+            overflow: hidden;
+            
+        }
+
+        svg.icon {
+            display: inline;
+        }
+        
+        `}</style>
+}

components/NotionPage.js

@@ -98,6 +98,22 @@ const NotionPage = ({ post, className }) => {
         })
       })
     }
+
+    // 查找所有具有 'notion-collection-page-properties' 类的元素,删除notion自带的页面properties
+    const timer = setTimeout(() => {
+      // 查找所有具有 'notion-collection-page-properties' 类的元素
+      const elements = document.querySelectorAll(
+        '.notion-collection-page-properties'
+      )
+
+      // 遍历这些元素并将其从 DOM 中移除
+      elements?.forEach(element => {
+        element?.remove()
+      })
+    }, 1000) // 1000 毫秒 = 1 秒
+
+    // 清理定时器，防止组件卸载时执行
+    return () => clearTimeout(timer)
   }, [post])
 
   return (

components/PrismMac.js

@@ -43,9 +43,15 @@ const PrismMac = () => {
       loadExternalResource('/css/prism-mac-style.css', 'css')
     }
     // 加载prism样式
-    loadPrismThemeCSS(isDarkMode, prismThemeSwitch, prismThemeDarkPath, prismThemeLightPath, prismThemePrefixPath)
+    loadPrismThemeCSS(
+      isDarkMode,
+      prismThemeSwitch,
+      prismThemeDarkPath,
+      prismThemeLightPath,
+      prismThemePrefixPath
+    )
     // 折叠代码
-    loadExternalResource(prismjsAutoLoader, 'js').then((url) => {
+    loadExternalResource(prismjsAutoLoader, 'js').then(url => {
       if (window?.Prism?.plugins?.autoloader) {
         window.Prism.plugins.autoloader.languages_path = prismjsPath
       }
@@ -62,7 +68,13 @@ const PrismMac = () => {
 /**
  * 加载Prism主题样式
  */
-const loadPrismThemeCSS = (isDarkMode, prismThemeSwitch, prismThemeDarkPath, prismThemeLightPath, prismThemePrefixPath) => {
+const loadPrismThemeCSS = (
+  isDarkMode,
+  prismThemeSwitch,
+  prismThemeDarkPath,
+  prismThemeLightPath,
+  prismThemePrefixPath
+) => {
   let PRISM_THEME
   let PRISM_PREVIOUS
   if (prismThemeSwitch) {
@@ -73,8 +85,14 @@ const loadPrismThemeCSS = (isDarkMode, prismThemeSwitch, prismThemeDarkPath, pri
       PRISM_THEME = prismThemeLightPath
       PRISM_PREVIOUS = prismThemeDarkPath
     }
-    const previousTheme = document.querySelector(`link[href="${PRISM_PREVIOUS}"]`)
-    if (previousTheme && previousTheme.parentNode && previousTheme.parentNode.contains(previousTheme)) {
+    const previousTheme = document.querySelector(
+      `link[href="${PRISM_PREVIOUS}"]`
+    )
+    if (
+      previousTheme &&
+      previousTheme.parentNode &&
+      previousTheme.parentNode.contains(previousTheme)
+    ) {
       previousTheme.parentNode.removeChild(previousTheme)
     }
     loadExternalResource(PRISM_THEME, 'css')
@@ -103,14 +121,17 @@ const renderCollapseCode = (codeCollapse, codeCollapseExpandDefault) => {
     const collapseWrapper = document.createElement('div')
     collapseWrapper.className = 'collapse-wrapper w-full py-2'
     const panelWrapper = document.createElement('div')
-    panelWrapper.className = 'border dark:border-gray-600 rounded-md hover:border-indigo-500 duration-200 transition-colors'
+    panelWrapper.className =
+      'border dark:border-gray-600 rounded-md hover:border-indigo-500 duration-200 transition-colors'
 
     const header = document.createElement('div')
-    header.className = 'flex justify-between items-center px-4 py-2 cursor-pointer select-none'
+    header.className =
+      'flex justify-between items-center px-4 py-2 cursor-pointer select-none'
     header.innerHTML = `<h3 class="text-lg font-medium">${language}</h3><svg class="transition-all duration-200 w-5 h-5 transform rotate-0" viewBox="0 0 20 20" fill="currentColor"><path fill-rule="evenodd" d="M6.293 6.293a1 1 0 0 1 1.414 0L10 8.586l2.293-2.293a1 1 0 0 1 1.414 1.414l-3 3a1 1 0 0 1-1.414 0l-3-3a1 1 0 0 1 0-1.414z" clip-rule="evenodd"/></svg>`
 
     const panel = document.createElement('div')
-    panel.className = 'invisible h-0 transition-transform duration-200 border-t border-gray-300'
+    panel.className =
+      'invisible h-0 transition-transform duration-200 border-t border-gray-300'
 
     panelWrapper.appendChild(header)
     panelWrapper.appendChild(panel)
@@ -145,7 +166,7 @@ const renderMermaid = async(mermaidCDN) => {
       if (m.target.className === 'notion-code language-mermaid') {
         const chart = m.target.querySelector('code').textContent
         if (chart && !m.target.querySelector('.mermaid')) {
-          const mermaidChart = document.createElement('div')
+          const mermaidChart = document.createElement('pre')
           mermaidChart.className = 'mermaid'
           mermaidChart.innerHTML = chart
           m.target.appendChild(mermaidChart)
@@ -172,7 +193,10 @@ const renderMermaid = async(mermaidCDN) => {
     }
   })
   if (document.querySelector('#notion-article')) {
-    observer.observe(document.querySelector('#notion-article'), { attributes: true, subtree: true })
+    observer.observe(document.querySelector('#notion-article'), {
+      attributes: true,
+      subtree: true
+    })
   }
 }
 
@@ -234,7 +258,10 @@ const fixCodeLineStyle = () => {
       }
     }
   })
-  observer.observe(document.querySelector('#notion-article'), { attributes: true, subtree: true })
+  observer.observe(document.querySelector('#notion-article'), {
+    attributes: true,
+    subtree: true
+  })
   setTimeout(() => {
     const preCodes = document.querySelectorAll('pre.notion-code')
     for (const preCode of preCodes) {

components/SEO.js

@@ -247,7 +247,7 @@ const getSEOMeta = (props, router, locale) => {
       }
     case '/404':
       return {
-        title: `${siteInfo?.title} | 页面找不到啦`,
+        title: `${siteInfo?.title} | ${locale.NAV.PAGE_NOT_FOUND}`,
         image: `${siteInfo?.pageCover}`
       }
     case '/tag':

components/ShareButtons.js

@@ -37,6 +37,8 @@ import {
   TumblrShareButton,
   TwitterIcon,
   TwitterShareButton,
+  ThreadsIcon,
+  ThreadsShareButton,
   ViberIcon,
   ViberShareButton,
   VKIcon,
@@ -312,6 +314,16 @@ const ShareButtons = ({ post }) => {
                 <HatenaIcon size={32} round />
               </HatenaShareButton>
             )
+          case 'threads':
+            return (
+              <ThreadsShareButton
+                key={singleService}
+                url={shareUrl}
+                title={titleWithSiteInfo}
+                className='mx-1'>
+                <ThreadsIcon size={32} round />
+              </ThreadsShareButton>
+            )
           case 'qq':
             return (
               <button

conf/code.config.js

@@ -28,7 +28,7 @@ module.exports = {
   // Mermaid 图表CDN
   MERMAID_CDN:
     process.env.NEXT_PUBLIC_MERMAID_CDN ||
-    'https://cdnjs.cloudflare.com/ajax/libs/mermaid/10.2.4/mermaid.min.js' // CDN
+    'https://cdnjs.cloudflare.com/ajax/libs/mermaid/11.4.0/mermaid.min.js' // CDN
 
   // END********代码相关********
 }

lib/db/getSiteData.js

@@ -245,7 +245,7 @@ async function convertNotionToSiteDate(pageId, from, pageRecordMap) {
   })
 
   // Sort by date
-  if (siteConfig('POSTS_SORT_BY', '', NOTION_CONFIG) === 'date') {
+  if (siteConfig('POSTS_SORT_BY', null, NOTION_CONFIG) === 'date') {
     allPages.sort((a, b) => {
       return b?.publishDate - a?.publishDate
     })

lib/lang/en-US.js

@@ -17,7 +17,9 @@ export default {
     NAVIGATOR: 'NAV',
     ABOUT: 'About',
     MAIL: 'E-Mail',
-    ARCHIVE: 'Archive'
+    ARCHIVE: 'Archive',
+    PAGE_NOT_FOUND: 'Page Not Found',
+    PAGE_NOT_FOUND_REDIRECT: 'Page Not Found, Redirecting to Home Page...'
   },
   COMMON: {
     THEME: 'Theme',

lib/lang/zh-CN.js

@@ -17,7 +17,9 @@ export default {
     ABOUT: '关于',
     NAVIGATOR: '导航',
     MAIL: '邮箱',
-    ARCHIVE: '归档'
+    ARCHIVE: '归档',
+    PAGE_NOT_FOUND: '页面找不到啦',
+    PAGE_NOT_FOUND_REDIRECT: '页面无法加载，即将返回首页'
   },
   COMMON: {
     THEME: 'Theme',

lib/notion/convertInnerUrl.js

@@ -1,6 +1,6 @@
+import { loadLangFromLocalStorage } from '@/lib/lang'
 import { idToUuid } from 'notion-utils'
 import { checkStrIsNotionId, getLastPartOfUrl, isBrowser } from '../utils'
-import { loadLangFromLocalStorage } from '@/lib/lang'
 
 /**
  * 处理页面内连接跳转:
@@ -13,12 +13,13 @@ export const convertInnerUrl = allPages => {
   }
   const allAnchorTags = document
     ?.getElementById('notion-article')
-    ?.querySelectorAll('a.notion-link')
+    ?.querySelectorAll('a.notion-link, a.notion-collection-card')
 
   if (!allAnchorTags) {
     return
   }
-  const { origin, pathname } = window.location;
+
+  const { origin, pathname } = window.location
   const currentURL = origin + pathname
   const currentPathLang = pathname.split('/').filter(Boolean)[0]
   const lang = loadLangFromLocalStorage().split(/[-_]/)[0]
@@ -49,5 +50,18 @@ export const convertInnerUrl = allPages => {
         anchorTag.target = '_self'
       }
     }
+
+    // 如果链接以#号结尾，则强制在新窗口打开
+    if (anchorTag.href.endsWith('#')) {
+      anchorTag.target = '_blank'
+    }
   }
-}
+  for (const anchorTag of allAnchorTags) {
+    const slug = getLastPartOfUrl(anchorTag.href)
+    const slugPage = allPages?.find(page => {
+      return page.slug.indexOf(slug) >= 0
+    })
+    if (slugPage) {
+    }
+  }
+}

lib/notion/getPostBlocks.js

@@ -1,5 +1,9 @@
 import BLOG from '@/blog.config'
-import { getDataFromCache, getOrSetDataWithCache, setDataToCache } from '@/lib/cache/cache_manager'
+import {
+  getDataFromCache,
+  getOrSetDataWithCache,
+  setDataToCache
+} from '@/lib/cache/cache_manager'
 import { deepClone, delay } from '../utils'
 import notionAPI from '@/lib/notion/getNotionAPI'
 
@@ -139,8 +143,7 @@ function convertNotionBlocksToPost(id, blockMap, slice) {
         b?.value?.type === 'pdf' ||
         b?.value?.type === 'video' ||
         b?.value?.type === 'audio') &&
-      b?.value?.properties?.source?.[0][0] &&
-      b?.value?.properties?.source?.[0][0].indexOf('amazonaws.com') > 0
+      b?.value?.properties?.source?.[0][0]
     ) {
       const oldUrl = b?.value?.properties?.source?.[0][0]
       const newUrl = `https://notion.so/signed/${encodeURIComponent(oldUrl)}?table=block&id=${b?.value?.id}`

lib/plugins/gtag.js

@@ -1,5 +1,6 @@
 // https://developers.google.com/analytics/devguides/collection/gtagjs/pages
 export const pageview = (url, ANALYTICS_GOOGLE_ID) => {
+  if (window.gtag === undefined) { return }
   window.gtag('config', ANALYTICS_GOOGLE_ID, {
     page_path: url
   })
@@ -7,6 +8,7 @@ export const pageview = (url, ANALYTICS_GOOGLE_ID) => {
 
 // https://developers.google.com/analytics/devguides/collection/gtagjs/events
 export const event = ({ action, category, label, value }) => {
+  if (window.gtag === undefined) { return }
   window.gtag('event', action, {
     event_category: category,
     event_label: label,

lib/sitemap.xml.js

@@ -6,7 +6,11 @@ import { siteConfig } from './config'
  * @param {*} param0
  */
 export async function generateSitemapXml({ allPages, NOTION_CONFIG }) {
-  const link = siteConfig('LINK', BLOG.LINK, NOTION_CONFIG)
+  let link = siteConfig('LINK', BLOG.LINK, NOTION_CONFIG)
+  // 确保链接不以斜杠结尾
+  if (link && link.endsWith('/')) {
+    link = link.slice(0, -1)
+  }
   const urls = [
     {
       loc: `${link}`,

package.json

@@ -43,7 +43,7 @@
     "react-facebook": "^8.1.4",
     "react-hotkeys-hook": "^4.5.0",
     "react-notion-x": "6.16.0",
-    "react-share": "^4.4.1",
+    "react-share": "^5.2.2",
     "react-tweet-embed": "~2.0.0"
   },
   "devDependencies": {

pages/sitemap.xml.js

@@ -38,6 +38,11 @@ export const getServerSideProps = async ctx => {
 }
 
 function generateLocalesSitemap(link, allPages, locale) {
+  // 确保链接不以斜杠结尾
+  if (link && link.endsWith('/')) {
+    link = link.slice(0, -1)
+  }
+
   if (locale && locale.length > 0 && locale.indexOf('/') !== 0) {
     locale = '/' + locale
   }

public/js/ribbon.js

@@ -22,7 +22,7 @@ function createRibbon() {
       a = window.innerWidth,
       l = window.innerHeight,
       d = e.s
-    i.id = id
+    i.id = '__next'
     let r, s
     const u = Math
     let h = 0

styles/notion.css

@@ -2027,6 +2027,10 @@ code.language-mermaid {
   display: none;
 }
 
+.mermaid .invisible{
+  visibility: inherit;
+}
+
 .code-toolbar {
   @apply w-full shadow-md pb-0;
 }

themes/fukasawa/components/SiteInfo.js

@@ -22,7 +22,7 @@ function SiteInfo({ title }) {
         {siteConfig('BEI_AN') && (
           <>
             <i className='fas fa-shield-alt' />
-            <a href='https://beian.miit.gov.cn/' className='mr-2'>
+            <a href={siteConfig('BEI_AN_LINK')} className='mr-2'>
               {siteConfig('BEI_AN')}
             </a>
             <br />

themes/fukasawa/index.js

@@ -215,6 +215,7 @@ const LayoutArchive = props => {
  */
 const Layout404 = props => {
   const router = useRouter()
+  const { locale } = useGlobal()
   useEffect(() => {
     // 延时3秒如果加载失败就返回首页
     setTimeout(() => {
@@ -232,7 +233,7 @@ const Layout404 = props => {
             <div className='dark:text-gray-200'>
                 <h2 className='inline-block border-r-2 border-gray-600 mr-2 px-3 py-2 align-top'><i className='mr-2 fas fa-spinner animate-spin' />404</h2>
                 <div className='inline-block text-left h-32 leading-10 items-center'>
-                    <h2 className='m-0 p-0'>页面无法加载，即将返回首页</h2>
+                    <h2 className='m-0 p-0'>{locale.NAV.PAGE_NOT_FOUND_REDIRECT}</h2>
                 </div>
             </div>
         </div>

themes/game/index.js

@@ -6,9 +6,11 @@ import NotionPage from '@/components/NotionPage'
 import { PWA as initialPWA } from '@/components/PWA'
 import ShareBar from '@/components/ShareBar'
 import { siteConfig } from '@/lib/config'
+import { useGlobal } from '@/lib/global'
 import { loadWowJS } from '@/lib/plugins/wow'
 import { deepClone, isBrowser, shuffleArray } from '@/lib/utils'
 import Link from 'next/link'
+import { useRouter } from 'next/router'
 import { createContext, useContext, useEffect, useRef, useState } from 'react'
 import Announcement from './components/Announcement'
 import { ArticleLock } from './components/ArticleLock'
@@ -30,7 +32,6 @@ import SideBarContent from './components/SideBarContent'
 import SideBarDrawer from './components/SideBarDrawer'
 import CONFIG from './config'
 import { Style } from './style'
-import { useRouter } from 'next/router'
 
 // const AlgoliaSearchModal = dynamic(() => import('@/components/AlgoliaSearchModal'), { ssr: false })
 
@@ -354,6 +355,7 @@ const LayoutSlug = props => {
  */
 const Layout404 = props => {
   const router = useRouter()
+  const { locale } = useGlobal()
   useEffect(() => {
     // 延时3秒如果加载失败就返回首页
     setTimeout(() => {
@@ -366,16 +368,21 @@ const Layout404 = props => {
     }, 3000)
   }, [])
 
-  return <>
-        <div className='md:-mt-20 text-black w-full h-screen text-center justify-center content-center items-center flex flex-col'>
-            <div className='dark:text-gray-200'>
-                <h2 className='inline-block border-r-2 border-gray-600 mr-2 px-3 py-2 align-top'><i className='mr-2 fas fa-spinner animate-spin' />404</h2>
-                <div className='inline-block text-left h-32 leading-10 items-center'>
-                    <h2 className='m-0 p-0'>页面无法加载，即将返回首页</h2>
-                </div>
-            </div>
+  return (
+    <>
+      <div className='md:-mt-20 text-black w-full h-screen text-center justify-center content-center items-center flex flex-col'>
+        <div className='dark:text-gray-200'>
+          <h2 className='inline-block border-r-2 border-gray-600 mr-2 px-3 py-2 align-top'>
+            <i className='mr-2 fas fa-spinner animate-spin' />
+            404
+          </h2>
+          <div className='inline-block text-left h-32 leading-10 items-center'>
+            <h2 className='m-0 p-0'>{locale.NAV.PAGE_NOT_FOUND_REDIRECT}</h2>
+          </div>
         </div>
+      </div>
     </>
+  )
 }
 
 /**

themes/gitbook/components/Footer.js

@@ -33,7 +33,7 @@ const Footer = ({ siteInfo }) => {
       {siteConfig('BEI_AN') && (
         <>
           <i className='fas fa-shield-alt' />{' '}
-          <a href='https://beian.miit.gov.cn/' className='mr-2'>
+          <a href={siteConfig('BEI_AN_LINK')} className='mr-2'>
             {siteConfig('BEI_AN')}
           </a>
           <BeiAnGongAn />

themes/gitbook/index.js

@@ -438,6 +438,7 @@ const LayoutArchive = props => {
  */
 const Layout404 = props => {
   const router = useRouter()
+  const { locale } = useGlobal()
   useEffect(() => {
     // 延时3秒如果加载失败就返回首页
     setTimeout(() => {
@@ -455,7 +456,7 @@ const Layout404 = props => {
             <div className='dark:text-gray-200'>
                 <h2 className='inline-block border-r-2 border-gray-600 mr-2 px-3 py-2 align-top'><i className='mr-2 fas fa-spinner animate-spin' />404</h2>
                 <div className='inline-block text-left h-32 leading-10 items-center'>
-                    <h2 className='m-0 p-0'>页面无法加载，即将返回首页</h2>
+                <h2 className='m-0 p-0'>{locale.NAV.PAGE_NOT_FOUND_REDIRECT}</h2>
                 </div>
             </div>
         </div>

themes/heo/components/Footer.js

@@ -9,6 +9,7 @@ import SocialButton from './SocialButton'
  */
 const Footer = () => {
   const BEI_AN = siteConfig('BEI_AN')
+  const BEI_AN_LINK = siteConfig('BEI_AN_LINK')
   const BIO = siteConfig('BIO')
   return (
     <footer className='relative flex-shrink-0 bg-white dark:bg-[#1a191d] justify-center text-center m-auto w-full leading-6  text-gray-600 dark:text-gray-100 text-sm'>
@@ -46,7 +47,7 @@ const Footer = () => {
           {BEI_AN && (
             <>
               <i className='fas fa-shield-alt' />{' '}
-              <a href='https://beian.miit.gov.cn/' className='mr-2'>
+              <a href={BEI_AN_LINK} className='mr-2'>
                 {siteConfig('BEI_AN')}
               </a>
             </>

themes/heo/components/MenuItemDrop.js

@@ -25,8 +25,12 @@ export const MenuItemDrop = ({ link }) => {
       {/* 含子菜单的按钮 */}
       {hasSubMenu && (
         <>
-          <div className='cursor-pointer  hover:bg-black hover:bg-opacity-10 rounded-2xl flex justify-center items-center px-3 py-1 no-underline tracking-widest'>
+          <div className='cursor-pointer hover:bg-black hover:bg-opacity-10 rounded-2xl flex justify-center items-center px-3 py-1 no-underline tracking-widest relative'>
             {link?.icon && <i className={link?.icon} />} {link?.name}
+            {/* 主菜单下方的安全区域 */}
+            {show && (
+              <div className='absolute w-full h-4 -bottom-4 left-0 bg-transparent z-30'></div>
+            )}
           </div>
         </>
       )}
@@ -34,7 +38,7 @@ export const MenuItemDrop = ({ link }) => {
       {hasSubMenu && (
         <ul
           style={{ backdropFilter: 'blur(3px)' }}
-          className={`${show ? 'visible opacity-100 top-14' : 'invisible opacity-0 top-20'} drop-shadow-md overflow-hidden rounded-xl bg-white dark:bg-[#1e1e1e] transition-all duration-300 z-20 absolute`}>
+          className={`${show ? 'visible opacity-100 top-14 pointer-events-auto' : 'invisible opacity-0 top-20 pointer-events-none'} drop-shadow-md overflow-hidden rounded-xl bg-white dark:bg-[#1e1e1e] transition-all duration-300 z-20 absolute`}>
           {link.subMenus.map((sLink, index) => {
             return (
               <li

themes/hexo/components/MenuItemDrop.js

@@ -29,10 +29,14 @@ export const MenuItemDrop = ({ link }) => {
 
       {hasSubMenu && (
         <>
-          <div className='cursor-pointer menu-link pl-2 pr-4  no-underline tracking-widest pb-1'>
+          <div className='cursor-pointer menu-link pl-2 pr-4 no-underline tracking-widest pb-1 relative'>
             {link?.icon && <i className={link?.icon} />} {link?.name}
             <i
               className={`px-2 fa fa-angle-down duration-300  ${show ? 'rotate-180' : 'rotate-0'}`}></i>
+            {/* 主菜单下方的安全区域 */}
+            {show && (
+              <div className='absolute w-full h-3 -bottom-1 left-0 bg-transparent z-30'></div>
+            )}
           </div>
         </>
       )}
@@ -41,7 +45,7 @@ export const MenuItemDrop = ({ link }) => {
       {hasSubMenu && (
         <ul
           style={{ backdropFilter: 'blur(3px)' }}
-          className={`${show ? 'visible opacity-100 top-12' : 'invisible opacity-0 top-20'} drop-shadow-md overflow-hidden rounded-md text-black dark:text-white bg-white dark:bg-black transition-all duration-300 z-20 absolute block  `}>
+          className={`${show ? 'visible opacity-100 top-12 pointer-events-auto' : 'invisible opacity-0 top-20 pointer-events-none'} drop-shadow-md overflow-hidden rounded-md text-black dark:text-white bg-white dark:bg-black transition-all duration-300 z-20 absolute block  `}>
           {link.subMenus.map((sLink, index) => {
             return (
               <li

themes/magzine/components/MenuItemDrop.js

@@ -52,7 +52,7 @@ export const MenuItemDrop = ({ link }) => {
       {/* 子菜单 */}
       {hasSubMenu && (
         <ul
-          className={`${show ? 'visible opacity-100 top-14' : 'invisible opacity-0 top-20'} p-1 absolute border bg-white dark:bg-black dark:border-gray-800 transition-all duration-150 z-20 block rounded-lg drop-shadow-lg`}>
+          className={`${show ? 'visible opacity-100 top-14 pointer-events-auto' : 'invisible opacity-0 top-20 pointer-events-none'} p-1 absolute border bg-white dark:bg-black dark:border-gray-800 transition-all duration-150 z-20 block rounded-lg drop-shadow-lg`}>
           {link?.subMenus?.map(sLink => {
             return (
               <li

themes/matery/components/Footer.js

@@ -31,7 +31,7 @@ const Footer = ({ title }) => {
         {siteConfig('BEI_AN') && (
           <>
             <i className='fas fa-shield-alt' />{' '}
-            <a href='https://beian.miit.gov.cn/' className='mr-2'>
+            <a href={siteConfig('BEI_AN_LINK')} className='mr-2'>
               {siteConfig('BEI_AN')}
             </a>
             <br />

themes/matery/components/MenuItemDrop.js

@@ -28,10 +28,14 @@ export const MenuItemDrop = ({ link }) => {
 
       {hasSubMenu && (
         <>
-          <div className='cursor-pointer  menu-link pl-2 pr-4  no-underline tracking-widest pb-1'>
+          <div className='cursor-pointer  menu-link pl-2 pr-4  no-underline tracking-widest pb-1 relative'>
             {link?.icon && <i className={link?.icon} />} {link?.name}
             <i
               className={`px-2 fa fa-angle-down duration-300  ${show ? 'rotate-180' : 'rotate-0'}`}></i>
+            {/* 主菜单下方的安全区域 */}
+            {show && (
+              <div className='absolute w-full h-3 -bottom-1 left-0 bg-transparent z-30'></div>
+            )}
           </div>
         </>
       )}
@@ -40,7 +44,7 @@ export const MenuItemDrop = ({ link }) => {
       {hasSubMenu && (
         <ul
           style={{ backdropFilter: 'blur(3px)' }}
-          className={`${show ? 'visible opacity-100 top-12' : 'invisible opacity-0 top-20'} drop-shadow-md overflow-hidden rounded-md bg-white transition-all duration-300 z-20 absolute block  `}>
+          className={`${show ? 'visible opacity-100 top-12 pointer-events-auto' : 'invisible opacity-0 top-20 pointer-events-none'} drop-shadow-md overflow-hidden rounded-md bg-white transition-all duration-300 z-20 absolute block  `}>
           {link.subMenus.map((sLink, index) => {
             return (
               <li

themes/medium/components/Footer.js

@@ -24,7 +24,7 @@ const Footer = ({ title }) => {
         {siteConfig('BEI_AN') && (
           <>
             <i className='fas fa-shield-alt' />
-            <a href='https://beian.miit.gov.cn/' className='mr-2'>
+            <a href={siteConfig('BEI_AN_LINK')} className='mr-2'>
               {siteConfig('BEI_AN')}
             </a>
             <br />

themes/movie/components/Footer.js

@@ -27,7 +27,7 @@ export const Footer = props => {
           {/* <a href="#" className="text-black no-underline hover:underline">Privacy Policy</a> */}
           {siteConfig('BEI_AN') && (
             <a
-              href='https://beian.miit.gov.cn/'
+              href={siteConfig('BEI_AN_LINK')}
               className='text-black dark:text-gray-200 no-underline hover:underline ml-4'>
               {siteConfig('BEI_AN')}
             </a>

themes/movie/components/MenuItemDrop.js

@@ -37,7 +37,7 @@ export const MenuItemDrop = ({ link }) => {
       {hasSubMenu && (
         <ul
           style={{ backdropFilter: 'blur(3px)' }}
-          className={`${show ? 'visible opacity-100 top-14' : 'invisible opacity-0 top-20'} drop-shadow-md overflow-hidden rounded-md text-black dark:text-white bg-white dark:bg-black transition-all duration-300 z-30 absolute block  `}>
+          className={`${show ? 'visible opacity-100 top-14 pointer-events-auto' : 'invisible opacity-0 top-20 pointer-events-none'} drop-shadow-md overflow-hidden rounded-md text-black dark:text-white bg-white dark:bg-black transition-all duration-300 z-30 absolute block  `}>
           {link.subMenus.map((sLink, index) => {
             return (
               <li

themes/nav/components/Footer.js

@@ -37,7 +37,7 @@ const Footer = ({ siteInfo }) => {
       {siteConfig('BEI_AN') && (
         <>
           <i className='fas fa-shield-alt' />{' '}
-          <a href='https://beian.miit.gov.cn/' className='mr-2'>
+          <a href={siteConfig('BEI_AN_LINK')} className='mr-2'>
             {siteConfig('BEI_AN')}
           </a>
           <br />

themes/next/components/Footer.js

@@ -24,7 +24,7 @@ const Footer = ({ title }) => {
         {siteConfig('BEI_AN') && (
           <>
             <i className='fas fa-shield-alt' />{' '}
-            <a href='https://beian.miit.gov.cn/' className='mr-2'>
+            <a href={siteConfig('BEI_AN_LINK')} className='mr-2'>
               {siteConfig('BEI_AN')}
             </a>
             <br />

themes/photo/components/Footer.js

@@ -27,7 +27,7 @@ export const Footer = props => {
           {/* <a href="#" className="text-black no-underline hover:underline">Privacy Policy</a> */}
           {siteConfig('BEI_AN') && (
             <a
-              href='https://beian.miit.gov.cn/'
+              href={siteConfig('BEI_AN_LINK')}
               className='text-black dark:text-gray-200 no-underline hover:underline ml-4'>
               {siteConfig('BEI_AN')}
             </a>

themes/simple/components/NavBar.js

@@ -25,7 +25,7 @@ export default function NavBar(props) {
 
   const onKeyUp = e => {
     if (e.keyCode === 13) {
-      const search = document.getElementById('simple-search').innerText
+      const search = document.getElementById('simple-search').value
       if (search) {
         router.push({ pathname: '/search/' + search })
       }

themes/simple/components/SocialButton.js

@@ -99,6 +99,15 @@ const SocialButton = () => {
             <i className='fab fa-youtube transform hover:scale-125 duration-150' />
           </a>
         )}
+        {siteConfig('CONTACT_THREADS') && (
+          <a
+            target='_blank'
+            rel='noreferrer'
+            title={'threads'}
+            href={siteConfig('CONTACT_THREADS')}>
+            <i className='fab fa-threads transform hover:scale-125 duration-150' />
+          </a>
+        )}
       </div>
     </div>
   )

tsconfig.json

@@ -32,5 +32,8 @@
     "**/*.jsx",
     ".eslintrc.js"
   ],
-  "exclude": ["node_modules"]
+  "exclude": [
+    "node_modules",
+    "public"
+  ]
 }