Merge pull request #351 from everfu/dev

Dev
everfu · Aug 1, 2024 · 9c9924a · 9c9924a
2 parents 3315cb7 + 07d19ec
commit 9c9924a
Show file tree

Hide file tree

Showing 21 changed files with 210 additions and 214 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,9 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = space
+indent_size = 2
diff --git a/_config.yml b/_config.yml
@@ -47,7 +47,7 @@ nav:
     #    icon: fas fa-train # Icon
     #    onclick: # Click event
     #    id: travellings_button # id
-# --------------------------- end --------------------------- 
+# --------------------------- end ---------------------------
 
 # --------------------------- start ---------------------------
 hometop:
@@ -75,9 +75,9 @@ hometop:
       #   img: https://i.postimg.cc/nhgjwjCS/git.png
       #   color: "#df5b40"
   group:
-    # Fire: /tags/Fire/ || fas fa-fire || linear-gradient(to right, #f65, #ffbf37)
-    # Course: /tags/Course/ || fas fa-book || linear-gradient(to right, #358bff, #15c6ff)
-    # Curation: /tags/Curation/ || fas fa-star || linear-gradient(to right, #18e7ae, #1eebeb)
+    # Fire: /tags/Fire/ || fas fa-fire || linear-gradient(to right,#f65,#ffbf37)
+    # Course: /tags/Course/ || fas fa-book || linear-gradient(to right,#358bff,#15c6ff)
+    # Curation: /tags/Curation/ || fas fa-star || linear-gradient(to right,#18e7ae,#1eebeb)
   recommendList:
     sup: Top
     title: Solitude Documentation
@@ -108,13 +108,13 @@ aside:
     author:
       img: /img/avatar.avif # url (avatar)
       sticker: # url (sticker), 24x24
-    url: /about/ # Click name to jump to address 
+    url: /about/ # Click name to jump to address
     background: # https://s3.qjqq.cn/47/663af296b85f4.webp!color # Background image(Invalid if style is 0)
     content: Here is my personal blog # Introduction (Invalid if style is 1)
     content2: I believe you can find knowledge and tutorials here that will be useful to you. # Introduction (Invalid if style is 1)
     sayhello: # Style 2 is invalid
-      morning: ✨ Good morning. It's a new day 
-      noon: It's time for a midday break 
+      morning: ✨ Good morning. It's a new day
+      noon: It's time for a midday break
       afternoon: Tea time. 🍵
       night: early bedtime
       goodnight: Good night 😴
@@ -175,7 +175,7 @@ aside:
     pv: true # PV
     uv: true # UV
     updatetime: true # Last update date
-    runtimeenable: true # Website creation time 
+    runtimeenable: true # Website creation time
     runtime: "2023-04-20 00:00:00" # Format: yyyy-MM-dd hh-mm-ss
   # --------------------------- end ---------------------------
 # --------------------------- end ---------------------------
@@ -338,6 +338,7 @@ errorpage:
 says:
   enable: false
   home_mini: false
+  page: '/essay/'
   style: 1
   strip: 30
 # --------------------------- end ---------------------------
@@ -364,8 +365,8 @@ envelope:
 # --------------------------- end ---------------------------
 
 # --------------------------- start ---------------------------
-# This part of the content uses metingjs, 
-# can only use NetEase Cloud Music, QQ Music and other music platforms supported by the mainland China region, 
+# This part of the content uses metingjs,
+# can only use NetEase Cloud Music, QQ Music and other music platforms supported by the mainland China region,
 # the subsequent consideration of the use of JSON files to store music information and customize the implementation of the third-party API does not depend on the.
 # Music Page
 meting_api: "https://meting.qjqq.cn/?server=:server&type=:type&id=:id&auth=:auth&r=:r" # Custom API
@@ -385,7 +386,7 @@ capsule:
 # --------------------------- end ---------------------------
 
 # --------------------------- start ---------------------------
-# Quick Menu 
+# Quick Menu
 # Open with shift + ?
 keyboard:
   enable: false
@@ -527,7 +528,7 @@ comment:
   lazyload: false # Lazy load
   count: false # Whether to use the comment count
   pv: false # Whether to use the page view count
-  avatar: https://cravatar.cn # Avatar
+  avatar: https://gravatar.com/avatar # Avatar
   hot_tip: # Hot comment tips
     enable: false
     count: 3 # Display when more than 3 comments
@@ -550,8 +551,8 @@ valine:
   style: true # Use custom styles when turned on
   option: # options list
 artalk:
-  server: # server url 
-  site: # site name 
+  server: # server url
+  site: # site name
   option: # options
 giscus:
   repo: # GitHub repository name
@@ -613,7 +614,7 @@ extends:
 # PWA
 pwa:
   enable: false
-  manifest: /manifest.json # manifest.json 
+  manifest: /manifest.json # manifest.json
   theme_color: "#006a73" # Theme color
   mask_icon: /img/pwa/favicon.png # Mask icon
   apple_touch_icon: /img/pwa/favicon.png # Apple touch icon
@@ -728,4 +729,4 @@ CDN:
     # swiper_js:
     # busuanzi_js:
     # snackbar_js:
-# --------------------------- end ---------------------------
+# --------------------------- end ---------------------------
diff --git a/languages/default.yml b/languages/default.yml
@@ -76,7 +76,7 @@ post:
   nav:
     next: Next
     prev: Previous
-    
+
 
 nav:
   site_name_title: Back to home
@@ -110,7 +110,7 @@ aside:
   toc: Table of contents
   tagmore: View all
   avatar: Avatar
-  hello: Long time no see,
+  hello: 'Long time no see, '
   back: Welcome back again,
   sticker: Mood sticker
   newpost: New posts
@@ -226,4 +226,9 @@ about:
 
 message:
   close: Hide message
-  open: Show message
+  open: Show message
+
+essay:
+  tip0: '- All expanded -'
+  tip1: '- Recent Exhibitions #{count} Short Articles -'
+  link: 'Link'
diff --git a/languages/en.yml b/languages/en.yml
@@ -76,7 +76,7 @@ post:
   nav:
     next: Next
     prev: Previous
-    
+
 
 nav:
   site_name_title: Back to home
@@ -110,7 +110,7 @@ aside:
   toc: Table of contents
   tagmore: View all
   avatar: Avatar
-  hello: Long time no see,
+  hello: 'Long time no see, '
   back: Welcome back again,
   sticker: Mood sticker
   newpost: New posts
@@ -226,4 +226,9 @@ about:
 
 message:
   close: Hide message
-  open: Show message
+  open: Show message
+
+essay:
+  tip0: '- All expanded -'
+  tip1: '- Recent Exhibitions #{count} Short Articles -'
+  link: 'Link'
diff --git a/languages/zh-CN.yml b/languages/zh-CN.yml
@@ -163,9 +163,9 @@ link:
   banner:
     toComment: 申请友链
     random: 随机访问
-  random: 点击前往按钮进入随机一个友链，不保证跳转网站的安全性和可用性。本次随机到的是本站友链：⌈ ${name} ⌋ 
+  random: 点击前往按钮进入随机一个友链，不保证跳转网站的安全性和可用性。本次随机到的是本站友链：⌈ ${name} ⌋
   to: 前往
-  
+
 keyboard:
   title: 博客快捷键
 
@@ -226,4 +226,9 @@ about:
 
 message:
   close: 隐藏弹幕
-  open: 显示弹幕
+  open: 显示弹幕
+
+essay:
+  tip0: '- 已展开所有短文 -'
+  tip1: '- 只展示最近 #{count} 条短文 -'
+  link: '链接'
diff --git a/languages/zh-TW.yml b/languages/zh-TW.yml
@@ -162,7 +162,7 @@ music:
 link:
   banner:
     toComment: 申請友鏈
-    random: 點擊前往按鈕進入隨機一個友鏈，不保證跳轉網站的安全性和可用性。本次隨機到的是本站友鏈：⌈ ${name} ⌋ 
+    random: 點擊前往按鈕進入隨機一個友鏈，不保證跳轉網站的安全性和可用性。本次隨機到的是本站友鏈：⌈ ${name} ⌋
     to: 前往
 keyboard:
   title: 博客快捷鍵
@@ -223,5 +223,10 @@ about:
     tip2: 瞭解更多關於
 
 message:
-  close: 隱藏彈幕 
-  open: 顯示彈幕
+  close: 隱藏彈幕
+  open: 顯示彈幕
+
+essay:
+  tip0: '- 已展開所有短文 -'
+  tip1: '- 只展示最近 #{count} 條短文 -'
+  link: '連接'
diff --git a/layout/includes/inject/head.pug b/layout/includes/inject/head.pug
@@ -5,7 +5,7 @@ link(rel="canonical" href=urlNoIndex())
 link(rel="stylesheet", href=url_for(theme.cdn.fontawesome))
 
 // aplayer
-if theme.capsule.enable || theme.music.enable
+if theme.capsule.enable || theme.music.enable || theme.says.enable
     link(rel="stylesheet", href=url_for(theme.cdn.aplayer_css))
 
 // swiper
@@ -47,4 +47,4 @@ if theme.extends.head
     each item in theme.extends.head
         != item
 
-!=fragment_cache('injectHeadJs', function(){return inject_head_js()})
+!=fragment_cache('injectHeadJs', function(){return inject_head_js()})
diff --git a/layout/includes/page/says.pug b/layout/includes/page/says.pug
@@ -41,18 +41,18 @@ if theme.says.enable
                                         i.solitude.fa-solid.fa-calendar-days
                                         time.datetime(datetime=moment(item.date).format())
                                     if item.location
-                                        .bber-info-location 
+                                        .bber-info-location
                                             i.solitude.fa-solid.fa-map
-                                            | #{item.location}
+                                            = item.location
                                     if item.link
                                         a.bber-content-link(href=url_for(item.link) target="_blank")
                                             i.solitude.fa-solid.fa-link
-                                            | 链接
+                                            = _p('essay.link')
                                 if item.content
                                     a.bber-reply(onclick=`sco.toTalk('${item.content}')`)
                                         i.solitude.fa-solid.fa-comment
             #bber-tips
                 if theme.says.strip === -1
-                    | - 已展开所有短文 -
+                    = _p('essay.tip0')
                 else
-                    | - 只展示最近 #{theme.says.strip} 条短文 -
+                    = _p('essay.tip1').replace('{count}', theme.says.strip)
diff --git a/layout/includes/widgets/home/bbTimeList.pug b/layout/includes/widgets/home/bbTimeList.pug
@@ -1,6 +1,6 @@
 .bbTimeList.container#bbTimeList(class=is_home_first_page() ? '' : 'more-page')
-    i.bber-logo.solitude.fa-solid.fa-newspaper(onclick=`pjax.loadUrl('/essay/')`)
-    .swiper-container.swiper-no-swiping.swiper-container-initialized.swiper-container-vertical.swiper-container-pointer-events#bbtalk(tabindex="-1" onclick=`pjax.loadUrl('/essay/')`)
+    i.bber-logo.solitude.fa-solid.fa-newspaper(onclick=`pjax.loadUrl('${url_for(theme.says.page)}')`)
+    .swiper-container.swiper-no-swiping.swiper-container-initialized.swiper-container-vertical.swiper-container-pointer-events#bbtalk(tabindex="-1" onclick=`pjax.loadUrl('${url_for(theme.says.page)}')`)
         .swiper-wrapper#bber-talk
             each item, i in site.data.essay.essay_list.slice(0, 10)
                 .li-style.swiper-slide
@@ -13,4 +13,4 @@
                         i.solitude.fa-solid.fa-video
                     else if item.link
                         i.solitude.fa-solid.fa-link
-    i.bber-gotobb.solitude.fa-solid.fa-circle-chevron-right(title=_p('home.bbtime.text') onclick=`pjax.loadUrl('/essay/')`)
+    i.bber-gotobb.solitude.fa-solid.fa-circle-chevron-right(title=_p('home.bbtime.text') onclick=`pjax.loadUrl('${url_for(theme.says.page)}')`)
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "A beautiful, powerful, and efficient Hexo theme developed by EverFu.",
   "main": "package.json",
   "scripts": {

diff --git a/scripts/event/merge_config.js b/scripts/event/merge_config.js
@@ -158,10 +158,10 @@ hexo.extend.filter.register('before_generate', () => {
             },
             footer: {
                 enable: true,
-                desc: "来自 Efu 的文章",
+                desc: "The article from Solitude",
                 button: {
                     enable: true,
-                    name: '返回首页',
+                    name: 'Learn More',
                     url: '/'
                 }
             }
@@ -310,7 +310,7 @@ hexo.extend.filter.register('before_generate', () => {
             commentBarrage: false,
             lazyload: false,
             count: false,
-            avatar: 'https://cravatar.cn',
+            avatar: 'https://gravatar.com/avatar',
             hot_tip: {
                 enable: true,
                 count: 3
@@ -425,4 +425,4 @@ hexo.extend.filter.register('before_generate', () => {
         }
     }
     hexo.theme.config = Object.assign(defaultConfig, hexo.theme.config)
-}, 1)
+}, 1)
diff --git a/scripts/event/welcome.js b/scripts/event/welcome.js
@@ -1,7 +1,7 @@
 hexo.on('ready', () => {
     const {version} = require('../../package.json')
     hexo.log.info(`
-  ===================================================================
+  =====================[ Hexo Theme - Solitude ]=====================
        #####  ####  #     #####  ###### #     # ######   ######
       #      #    # #       #      #    #     # #      # #
        ##### #    # #       #      #    #     # #      # ######
@@ -11,4 +11,4 @@ hexo.on('ready', () => {
   ===================================================================
   GitHub: https://github.com/everfu/hexo-theme-solitude
   `)
-})
+})