hexo-theme-solitude 1.9.3 → 1.10.1

package/README.md

@@ -1,4 +1,4 @@
-简体中文丨[繁体中文](README_zh-Hant.md)丨[English](README_en-US.md)丨[Français](README_fr.md)丨[日本語](README_ja.md)
+简体中文丨[繁体中文](README_zh-Hant.md)丨[English](README_en-US.md)
 
 <div align="center">
 
@@ -38,11 +38,11 @@
 [![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://www.efu.me/) 丨  [文档](https://docs.efu.me/)
+[预览](https://www.efu.me/) 丨  [文档](https://solitude.js.org/)
 
 </div>
 
-![Screenshot](.github/screenshot.png)
+![Screenshot](.github/screenshot.webp)
 
 ## 特性
 
@@ -51,7 +51,7 @@
 - 昼夜切换(ColorMode)
 - 灯箱(medium-zoom、fancybox)
 - 数学公式(Latex)
-- 特色页面：即刻短文、我的装备、在线工具、音乐馆、友链鱼塘、相册页、豆瓣页
+- 特色页面：即刻短文、我的装备、在线工具、音乐馆、友链鱼塘、相册页、豆瓣页、弹幕留言页
 - 文章功能：AI 摘要、代码高亮
 
 ## Todo
@@ -59,6 +59,8 @@
 - [x] Artalk 评论
 - [x] 双评论
 - [x] 相册
+- [x] 弹幕留言页
+- [ ] 首页顶部新样式 
 
 > 如有問題請提 [issue](https://github.com/valor-x/hexo-theme-solitude/issues)
 
@@ -73,7 +75,7 @@
       theme: solitude
       ```
    
-前往 [文档](https://docs.efu.me/) 获取更多信息。
+前往 [文档](https://solitude.js.org/) 获取更多信息。
 
 ## 赞助者
 

package/README_en-US.md

@@ -1,4 +1,4 @@
-[简体中文](README.md)丨[繁体中文](README_zh-Hant.md)丨English丨[Français](README_fr.md)丨[日本語](README_ja.md)
+[简体中文](README.md)丨[繁体中文](README_zh-Hant.md)丨English
 
 <div align="center">
 
@@ -38,11 +38,11 @@
 [![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://efu.me/) 丨  [Documentation](https://docs.efu.me/)
+[Preview](https://efu.me/) 丨  [Documentation](https://solitude.js.org/)
 
 </div>
 
-![Screenshot](.github/screenshot.png)
+![Screenshot](.github/screenshot.webp)
 
 ## Features
 
@@ -51,7 +51,7 @@
 - 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
+- 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
@@ -59,6 +59,8 @@
 - [x] Artalk
 - [x] Use double comment
 - [x] Album
+- [x] Barrage message page
+- [ ] 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)
 
@@ -73,7 +75,7 @@
       theme: solitude
       ```
 
-Check out the [Documentation](https://docs.efu.me/) for more information.
+Check out the [Documentation](https://solitude.js.org/) for more information.
 
 ## Sponsors
 

package/README_zh-Hant.md

@@ -1,4 +1,4 @@
-[简体中文](README.md)丨繁体中文丨[English](README_en-US.md)丨[Français](README_fr.md)丨[日本語](README_ja.md)
+[简体中文](README.md)丨繁体中文丨[English](README_en-US.md)
 
 <div align="center">
   
@@ -38,11 +38,11 @@
 [![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://efu.me/) 丨  [文档](https://docs.efu.me/)
+[預覽](https://efu.me/) 丨  [文档](https://solitude.js.org/)
 
 </div>
 
-![Screenshot](.github/screenshot.png)
+![Screenshot](.github/screenshot.webp)
 
 ## 特性
 
@@ -51,7 +51,7 @@
 - 晝夜切換（ColorMode） 
 - 燈箱（medium-zoom、fancybox） 
 - 數學公式（Latex） 
-- 特色頁面：即刻短文、我的裝備、在線工具、音樂館、友鏈魚塘、相冊頁、豆瓣頁 
+- 特色頁面：即刻短文、我的裝備、在線工具、音樂館、友鏈魚塘、相冊頁、豆瓣頁、留言彈幕頁
 - 文章功能：AI 摘要、代碼高亮
 
 ## Todo
@@ -59,6 +59,8 @@
 - [x] Artalk 評論
 - [x] 雙評論
 - [x] 相冊
+- [x] 留言彈幕頁
+- [ ] 首頁頂部新樣式 
 
 ## 應用
 
@@ -71,7 +73,7 @@
       theme: solitude
       ```
 
-前往 [文檔](https://docs.efu.me) 獲取更多資訊。
+前往 [文檔](https://solitude.js.org/) 獲取更多資訊。
 
 ## 贊助者
 

package/_config.yml

@@ -3,10 +3,10 @@
 # Author: Valor Team
 # Github: https://github.com/valor-x/hexo-theme-solitude
 #
-# 配置指南: https://docs.efu.me/
+# 配置指南: https://solitude.js.org/
 # 你可以从指南中获得更详细的说明
 #
-# Guide: https://docs.efu.me/
+# Guide: https://solitude.js.org/
 # You can get more detailed help from the guide
 #
 # 赞助：https://afdian.net/a/efu0u0
@@ -130,7 +130,7 @@ hometop:
     title: Solitude 主题文档
     # 点击跳转链接
     # Click the jump link
-    url: https://docs.efu.me/
+    url: https://solitude.js.org/
     # 显示背景图片
     # Display background image
     img: /img/default.png
@@ -383,6 +383,14 @@ post:
     mode: local # local：本地取色 / api：img2color取色 : local: local color / api: img2color color
     api: https://api.qjqq.cn/api/Imgcolor?img= # api地址 / api address
     time: 43200000 # api取色间隔（毫秒），默认为12小时 / api color interval (milliseconds), default is 12 hours
+  # footer
+  footer:
+    enable: true
+    desc: 来自 Efu 的文章 # 介绍文字
+    button: # 跳转按钮
+      enable: true
+      name: 了解更多
+      url: /about/
 
 # -------------------------
 # 自定义主题
@@ -596,7 +604,7 @@ lazyload:
   placeholder: /img/loading.gif
   # 加载失败显示图片
   # Loading failed display image
-  errorimg: /img/error_load.png
+  errorimg: /img/error_load.webp
 
 # 加载动画
 # loading animation
@@ -725,7 +733,7 @@ post_ai:
 
 # latex 公式支持
 # latex formula support
-# docs: https://docs.efu.me/configuration/extra#数学公式
+# docs: https://solitude.js.org/configuration/extra#数学公式
 katex:
   enable: false
   per_page: false # 是否在每页都加载 / Whether to load on each page
@@ -733,7 +741,7 @@ katex:
 
 # 评论
 # comment
-# getting start: http://docs.efu.me/comments/comment
+# getting start: https://solitude.js.org/comments/comment
 comment:
   use: # waline, twikoo, valine, artalk
   commentBarrage: false # 热评开关 / Hot comment switch
@@ -819,7 +827,7 @@ extends:
 
 # PWA
 # https://developer.mozilla.org/zh-CN/docs/Web/Progressive_web_apps
-# docs: https://docs.efu.me/configuration/extra#pwa
+# docs: https://solitude.js.org/configuration/extra#pwa
 pwa:
   enable: false
   manifest: /manifest.json # manifest.json 文件路径
@@ -835,6 +843,9 @@ google_adsense:
   enable: false
   auto_ads: false # 自动广告关闭后则为手动广告 / After auto ads are turned off, it is manual ads
   enable_page_level_ads: true # 页面级广告 / Page-level ads
+  aside_card: true # 侧边栏卡片广告 / Sidebar card ads（开启后自行到需要添加的页面使用：ads）
+  post_card: true # 文章卡片广告 / Post card ads（首页文章列表）
+  post_content: true # 文章内容广告 / Post content ads（文章内容底部广告）
   js: https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js # 谷歌广告js / Google Adsense js
   # client id
   # 无论是否开启自动广告，都需要填写 client id

package/languages/default.yml

@@ -39,6 +39,7 @@ home:
   new: New
   read: Unread
   recommendmore: More
+  archives: All articles
 
 post:
   reprint: Reprint

package/languages/en.yml

@@ -39,6 +39,7 @@ home:
   new: New
   read: Unread
   recommendmore: More
+  archives: All articles
 
 post:
   reprint: Reprint

package/languages/zh-CN.yml

@@ -49,6 +49,7 @@ home:
   read: 未读
   recommend: 荐
   recommendmore: 更多推荐
+  archives: 全部文章
 
 post:
   reprint: 转载或翻译

package/languages/zh-TW.yml

@@ -49,6 +49,7 @@ home:
   read: 未讀
   recommend: 荐
   recommendmore: 更多推薦
+  archives: 全部文章
 
 post:
   reprint: 轉載或翻譯

package/layout/includes/body/gadsense.pug

@@ -1,5 +1,5 @@
-if (theme.google_adsense && theme.google_adsense.enable)
-	script(async src=theme.google_adsense.js)
+if theme.google_adsense && theme.google_adsense.enable
+	script(async src=theme.google_adsense.js onerror="document.querySelectorAll('.google-ads-warp').forEach(i => i.style.display='none')")
 
 	if theme.google_adsense.auto_ads
 		script.

package/layout/includes/footer.pug

@@ -1,13 +1,15 @@
-div#st-footer-bar
-    div.footer-logo
-        if theme.site.name.class === 'i_class'
-            i.solitude(class=theme.site.name.custom)
-        else if theme.site.name.class === 'img'
-            img.solitude.nolazyload(src=url_for(theme.site.name.custom))
-        else if theme.site.name.class === 'text'
-            span= theme.site.name.custom
-    div.footer-bar-description= __('footer.description').replace(/\$\{title}/, config.title + " - " + config.subtitle)
-    a.footer-bar-link(href=url_for('/'))= __('footer.learnmore')
+if theme.post.footer.enable && is_post()
+    div#st-footer-bar
+        div.footer-logo
+            if theme.site.name.class === 'i_class'
+                i.solitude(class=theme.site.name.custom)
+            else if theme.site.name.class === 'img'
+                img.solitude.nolazyload(src=url_for(theme.site.name.custom))
+            else if theme.site.name.class === 'text'
+                span= theme.site.name.custom
+        div.footer-bar-description=theme.post.footer.desc
+        if theme.post.footer.button.enable
+            a.footer-bar-link(href=url_for(theme.post.footer.button.url))= theme.post.footer.button.name
 div#footer_deal
     - var leftInfo = theme.footer && theme.footer.information && theme.footer.information.left || {}
     - var rightInfo = theme.footer && theme.footer.information && theme.footer.information.right || {}
@@ -52,7 +54,6 @@ div#footer-bar
                 div.copyright © #{moment(theme.aside.siteinfo.runtime).year()} - #{new Date().getFullYear()} By 
                     a.footer-bar-link(href=url_for("/"))= config.author
         div.footer-bar-right
-            a.footer-bar-link(href="https://github.com/valor-x/hexo-theme-solitude" title=__('footer.theme'))= __('footer.theme')
             each item in theme.footer.links
                 a.footer-bar-link(href=url_for(item.url), alt=item.name)!= item.name
             a.footer-bar-link.cc(href=url_for(theme.footer.license), aria-label = 'copyright')

package/layout/includes/inject/head.pug

@@ -27,10 +27,10 @@ include ../head/pwa.pug
 
 script.
     console.log(
-        "%c Program: Hexo %c Theme: Solitude %c Version: v1.9.3",
+        "%c Program: Hexo %c Theme: Solitude %c Version: v1.10.1",
         "border-radius:5px 0 0 5px;padding: 5px 10px;color:white;background:#ff3842;",
         "padding: 5px 10px;color:white;background:#3e9f50;",
-        "padding: 5px 10px;color:white;background:#0084ff;",
+        "padding: 5px 10px;color:white;background:#0084ff;border-radius:0 5px 5px 0",
     )
 
 if theme.extends.head

package/layout/includes/widgets/aside/asideAdsense.pug

@@ -0,0 +1,5 @@
+if theme.google_adsense.enable
+    .card-widget.card-adsense
+        ins.adsbygoogle(style="display:block; text-align:center; min-height:120px; min-width: 100%", data-ad-layout="in-article", data-ad-format="fluid", hide-unfilled="true", data-ad-client=theme.google_adsense.client, data-ad-slot=theme.google_adsense.slot)
+        script.
+            (adsbygoogle = window.adsbygoogle || []).push({});

package/layout/includes/widgets/aside/asideCustom.pug

@@ -1,6 +1,7 @@
 .card-widget(class=custom.class, id=custom.id)
-    .item-headline
-        i(class=custom.icon)
-        span=custom.title
+    if !custom.no_head
+        .item-headline
+            i(class=custom.icon)
+            span=custom.title
     div(class=custom.content_class ||'item-content', id=custom.content_id, style=custom.content_css)
         != custom.content_html

package/layout/includes/widgets/aside/asideSwitch.pug

@@ -7,6 +7,8 @@ case item
         include ./asideNewestPost.pug
     when 'allInfo'
         include ./asideAllInfo.pug
+    when 'ads'
+        include ./asideAdsense.pug
     default
         - const custom = site.data?.aside?.find((i) => i.name === item)
         if custom

package/layout/includes/widgets/home/categoryBar.pug

@@ -1,11 +1,15 @@
-.category-bar-items#category-bar-items
+.category-bar-items#category-bar-items(class=is_home() ? 'home' : '')
     .category-bar-item(class=is_home() ? 'select' : '', id="category-bar-home")
         a(href=url_for('/'))= __('home.home')
+    .category-bar-item
+        a(href=url_for('/archives/'))= __('home.archives')
     each item in site.categories.find({ parent: { $exists: false } }).data
         .category-bar-item(class=select ? (select === item.name ? 'select' : '') : '', id=item.name)
             a(href=url_for(item.path))= item.name
 div.category-bar-right
-    if site.categories.find({parent: {$exists: false}}).data.length > 10
+    - let categories = site.categories.find({parent: {$exists: false}})
+    - let wordcount = categories.map(category => category.name).join('').length
+    if wordcount > 40 || categories.data.length > 10
         .category-bar-next#category-bar-next(onclick="sco.scrollCategoryBarToRight()")
             i.solitude.st-show-right-line
     a.category-bar-more(href=url_for('/categories/'))= __('more')

package/layout/includes/widgets/home/postList.pug

@@ -72,9 +72,9 @@ div.recent-post-item(onclick="pjax.loadUrl('" + url_for(post.path) + "')")
                     +cover()
 
 
-if (theme.google_adsense && theme.google_adsense.enable && theme.google_adsense.auto_ads === false)
+if theme.google_adsense && theme.google_adsense.enable && theme.google_adsense.auto_ads === false && theme.google_adsense.post_card
     if (index + 1) % 3 === 0
         div.recent-post-item.google-ads-warp
-            ins.adsbygoogle(style="display:block; text-align:center;", data-ad-layout="in-article", data-ad-format="fluid", data-ad-client=theme.google_adsense.client, data-ad-slot=theme.google_adsense.slot)
+            ins.adsbygoogle(style="display:block; text-align:center; min-width: 100%; height:220px", data-ad-layout="in-article", data-ad-format="fluid", hide-unfilled="true", data-ad-client=theme.google_adsense.client, data-ad-slot=theme.google_adsense.slot)
             script.
                 (adsbygoogle = window.adsbygoogle || []).push({});

package/layout/post.pug

@@ -37,6 +37,11 @@ block content
                                 a.social-share-ico.icon-facebook(href=`https://www.facebook.com/sharer/sharer.php?u=${encodedPath}` title="Facebook")
                             when 'twitter'
                                 a.social-share-ico.icon-twitter(href=`https://twitter.com/intent/tweet?url=${encodedPath}&text=${encodedTitle}` title="Twitter")
+            if theme.google_adsense.enable && theme.google_adsense.post_content
+                div.google-ads-warp
+                    ins.adsbygoogle(style="display:block; text-align:center; height:284px", data-ad-layout="in-article", data-ad-format="fluid", hide-unfilled="true", data-ad-client=theme.google_adsense.client, data-ad-slot=theme.google_adsense.slot)
+                    script.
+                        (adsbygoogle = window.adsbygoogle || []).push({});
             if site.posts.length > 1
                 include includes/widgets/post/postNav
             if theme.related_post.enable

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "1.9.3",
+  "version": "1.10.1",
   "description": "A beautiful, powerful, and efficient Hexo theme developed by the efu.",
   "main": "package.json",
   "scripts": {