Merge pull request #194 from valor-x/dev

Dev

README.md

@@ -35,7 +35,7 @@
 [![gitee](https://img.shields.io/badge/Gitee-red?logo=gitee)](https://gitee.com/nsjjd_w/hexo-theme-solitude)
 [![gitlab](https://img.shields.io/badge/GitLab-blue?logo=gitlab)](https://gitlab.com/efu/hexo-theme-solitude)
 
-[Preview](https://solitude-demo.efu.me/) 丨  [Documentation](https://solitude-docs.efu.me/)
+[Preview](https://efu.me/) 丨  [Documentation](https://solitude-docs.efu.me/)
 
 </div>
 

README_zh-cn.md

@@ -35,7 +35,7 @@
 [![gitee](https://img.shields.io/badge/Gitee-red?logo=gitee)](https://gitee.com/nsjjd_w/hexo-theme-solitude)
 [![gitlab](https://img.shields.io/badge/GitLab-blue?logo=gitlab)](https://gitlab.com/efu/hexo-theme-solitude)
 
-[预览](https://solitude-demo.efu.me/) 丨  [文档](https://solitude-docs.efu.me/)
+[预览](https://efu.me/) 丨  [文档](https://solitude-docs.efu.me/)
 
 </div>
 

README_zh-tw.md

@@ -35,7 +35,7 @@
 [![gitee](https://img.shields.io/badge/Gitee-red?logo=gitee)](https://gitee.com/nsjjd_w/hexo-theme-solitude)
 [![gitlab](https://img.shields.io/badge/GitLab-blue?logo=gitlab)](https://gitlab.com/efu/hexo-theme-solitude)
 
-[預覽](https://solitude-demo.efu.me/) 丨  [文档](https://solitude-docs.efu.me/)
+[預覽](https://efu.me/) 丨  [文档](https://solitude-docs.efu.me/)
 
 </div>
 

SECURITY.md

@@ -1,9 +1,9 @@
-# 安全策略
+# Security Policy
 
-## 报告漏洞
+## Report a vulnerability
 
-要报告漏洞，请在正确的 GitHub 存储库上 [通过安全选项卡私下报告](https://github.com/valor-x/hexo-theme-solitude/security/advisories/new)（请参阅 [文档](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)）。如果无法报告，请随时发送电子邮件至 **[email protected]**。
+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].
 
-所有安全漏洞都将得到及时验证和解决。
+All security vulnerabilities will be verified and resolved in a timely manner.
 
-虽然发现新漏洞的情况很少见，但建议始终使用最新版本的主题和其他依赖项，通过维护锁定文件（`yarn.lock`、`package-lock.json`），以保证尽可能安全。
+While it is rare for new vulnerabilities to be discovered, it is recommended to always use the latest version of the theme and other dependencies by maintaining locked files (`yarn.lock`, `package-lock.json`) to ensure that they are as secure as possible.

_config.yml

@@ -295,7 +295,7 @@ aside:
 # Configure information on the home page
 index_post_list:
   direction: column # row / column
-  content: 3 # 1: post.description / 2: 自动获取description或截取内容(Automatically get descriptions or screenshots) / 3: 只使用截取内容(Use only screenshots) / false: 不显示内容(No content is displayed)
+  content: false # 1: post.description / 2: 自动获取description或截取内容(Automatically get descriptions or screenshots) / 3: 只使用截取内容(Use only screenshots) / false: 不显示内容(No content is displayed)
   length: 500 # 截取内容的长度 : The length of the screenshot content
   cover: both # left: 在左侧 : left / right: 在右侧 : right / both: 两侧 : both
 
@@ -568,6 +568,14 @@ keyboard:
   #   key: L
   #   url: "/links/"
 
+# 复制
+# Copy
+copy:
+  enable: true
+  copyright: # Turn on Link copyright information after copying.（开启后将在默认增加版权信息）
+    enable: false
+    limit: 50 # word count. （字数）
+
 # 懒加载
 # lazyload
 lazyload:
@@ -701,17 +709,11 @@ comment:
   enable: false
   type: # waline, twikoo
   commentBarrage: false # 热评开关 / Hot comment switch
-  newComment: false # 最新评论开关 / Latest comment switch
-  # 匿名评论前部分随机信息 / Anonymous comment front random information
-  randomInfoStart:
-    - "聪敏的"
-    - "可爱的"
-    - "美丽的"
-  # 匿名评论后部分随机信息 / Anonymous comment after random information
-  randomInfoEnd:
-    - "白菜"
-    - "小可爱"
-    - "小仙女"
+  lazyload: true # 懒加载
+  count: true # 评论数展示
+  newest_comment:
+    enable: false
+    storage: 421000 # 缓存时间
   # twikoo 配置信息
   # twikoo settings
   twikoo: # https://twikoo.js.org/
@@ -722,8 +724,21 @@ comment:
   # waline settings
   waline: # https://waline.js.org/
     envId:  # url: https://waline.wzsco.top
-    pageview: true # 是否开启页面访问量统计 / Whether to enable page access statistics
+    pageview: false # 是否开启页面访问量统计 / Whether to enable page access statistics
     option: # waline配置项 / waline configuration item
+  # valine 配置信息
+  # valine settings
+  valine:
+    appId: # leancloud application app id
+    appKey: # leancloud application app key
+    serverURLs: # This configuration is suitable for domestic custom domain name users, overseas version will be automatically detected (no need to manually fill in)
+    avatar:
+    visitor: false
+    option: # options list
+
+
+# 中控台扩展 ： 最新评论 + 标签 + 文章
+console_plus: false
 
 # 站点验证
 # Site verification
@@ -748,8 +763,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/en.yml

@@ -1,4 +1,6 @@
 more: More
+star: Behold, those who found delight in this piece also perused
+random: Around
 
 theme:
   dark: dark
@@ -130,4 +132,16 @@ link:
   random: You are about to ⌈ ${name} ⌋ , security unknown.
 
 keyboard:
-  title: Blog shortcuts
+  title: Blog shortcuts
+
+newest_comment:
+  error: Unable to get a comment, please confirm that the relevant configuration is correct.
+  zero: No comments.
+
+comment:
+  title: ' Comment'
+
+commentBarrage:
+  title: Hot
+
+f12: Developer mode is turned on, please follow the GPL.

languages/zh-CN.yml

@@ -1,4 +1,6 @@
 more: 更多
+star: 喜欢这篇的人也看了
+random: 随便逛逛
 
 # Language: 简体中文
 theme:
@@ -9,6 +11,12 @@ copy:
   success: 复制成功
   error: 复制失败
 
+copy_copyright:
+  author: 作者
+  link: 链接
+  source: 来源
+  info: 著作权归作者所有。 商业转载请联系作者获得授权，非商业转载请注明出处。
+
 lately:
   second: 秒
   minute: 分钟
@@ -125,4 +133,16 @@ link:
   random: 您即将前往 ⌈ ${name} ⌋ , 安全性未知
 
 keyboard:
-  title: 博客快捷键
+  title: 博客快捷键
+
+newest_comment:
+  error: 无法获取评论，请确认相关配置是否正确。
+  zero: 没有评论
+
+comment:
+  title: 评论
+
+commentBarrage:
+  title: 热评
+
+f12: 开发者模式已打开，请遵循GPL协议。

languages/zh-TW.yml

@@ -1,4 +1,6 @@
 more: 更多
+star: 喜歡這篇的人也看了
+random: 随便逛逛
 
 # Language: 繁體中文 (台灣)
 theme:
@@ -9,6 +11,12 @@ copy:
   success: 複製成功
   error: 複製失敗
 
+copy_copyright:
+  author: 作者
+  link: 連結
+  source: 來源
+  info: 著作權歸作者所有。 商業轉載請聯繫作者獲得授權，非商業轉載請註明出處。
+
 lately:
   second: 秒
   minute: 分鐘
@@ -125,4 +133,16 @@ link:
   random: 您即將前往 ⌈ ${name} ⌋ ， 安全性未知
 
 keyboard:
-  title: 博客快捷鍵
+  title: 博客快捷鍵
+
+newest_comment:
+  error: 無法獲取評論，請確認相關配置是否正確。
+  zero: 沒有評論
+
+comment:
+  title: 評論
+
+commentBarrage:
+  title: 熱評
+
+f12: 開發者模式已打開，請遵循GPL協定。

layout/category.pug

@@ -6,7 +6,7 @@ block content
             #category-bar
                 include includes/widgets/home/categoryBar
             .recent-posts#recent-posts
-                each post in page.posts.find({ parent: { $exists: false } }).data
+                each post,index in page.posts.find({ parent: { $exists: false } }).data
                     include includes/widgets/home/postList
             include includes/mixins/pagination
         include includes/widgets/aside/aside

layout/includes/console.pug

@@ -1,14 +1,15 @@
 div#console
     div.close-btn(onclick="sco.hideConsole()")
         i.solitude.st-close-fill
-    if theme.comment.newComment
+    if theme.console_plus
         div.console-card-group
-            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')
-                    div.aside-list
+            if theme.console_plus && theme.comment.newest_comment.enable
+                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')
+                        div.aside-list
 
             div.console-card-group-right
                 div.console-card.tags(onclick="sco.hideConsole()")