hexo-theme-solitude 1.4.2 → 1.4.4

package/layout/includes/widgets/rightside/index.pug

@@ -11,66 +11,77 @@ div#rightMenu
     div.rightMenu-group.rightMenu-line.rightMenuPlugin
         div.rightMenu-item#menu-copytext
             i.scoicon.sco-copy-fill
-            span 复制选中文本
+            span= _p('rightmenu.copytext')
         div.rightMenu-item#menu-pastetext
             i.scoicon.sco-clipboard-fill
-            span 粘贴文本
+            span= _p('rightmenu.pastetext')
         if theme.comment.enable
             a.rightMenu-item#menu-commenttext
                 i.scoicon.sco-chat-new-fill
-                span 引用到评论
+                span= _p('rightmenu.commenttext')
         div.rightMenu-item#menu-newwindow
             i.scoicon.sco-window-fill
-            span 新窗口打开
+            span= _p('rightmenu.newwindow')
         div.rightMenu-item#menu-copylink
             i.scoicon.sco-link-line
-            span 复制链接地址
+            span= _p('rightmenu.copylink')
         div.rightMenu-item#menu-copyimg
             i.scoicon.sco-copy-fill
-            span 复制此图片
+            span= _p('rightmenu.copyimg')
         div.rightMenu-item#menu-downloadimg
             i.scoicon.sco-download-cloud-fill
-            span 下载此图片
+            span= _p('rightmenu.downloadimg')
         div.rightMenu-item#menu-search
             i.scoicon.sco-search-line
-            span 站内搜索
-        div.rightMenu-item#menu-searchBaidu
-            i.scoicon.sco-baidu-fill
-            span 百度搜索
+            span= _p('rightmenu.search')
         div.rightMenu-item#menu-music-toggle
             i.scoicon.sco-play-fill
-            span 播放音乐
+            span= _p('rightmenu.music.toggle')
         div.rightMenu-item#menu-music-back
             i.scoicon.sco-skip-back-fill
-            span 切换到上一首
+            span= _p('rightmenu.music.back')
         div.rightMenu-item#menu-music-forward
             i.scoicon.sco-skip-forward-fill
-            span 切换到下一首
+            span= _p('rightmenu.music.forward')
         div.rightMenu-item#menu-music-playlist(onclick=`window.open('${theme.capsule.server === 'tencent' ? `https://y.qq.com/n/ryqq/playlist/${theme.capsule.id}` : `https://music.163.com/#/playlist?id=${theme.capsule.id}`}', '_blank');`)
             i.scoicon.sco-play-list-2-line
-            span 查看所有歌曲
+            span= _p('rightmenu.music.playlist')
         div.rightMenu-item#menu-music-copyMusicName
             i.scoicon.sco-copy-fill
-            span 复制歌名
+            span= _p('rightmenu.music.copyMusicName')
     div.rightMenu-group.rightMenu-line.rightMenuOther
         a.rightMenu-item.menu-Link#menu-randomPost
             i.scoicon.sco-signal-tower-fill
-            span 随便逛逛
+            span= _p('rightmenu.randomPost')
         a.rightMenu-item.menu-link(href="/categories/")
             i.scoicon.sco-checkbox-multiple-blank-fill
-            span 博客分类
+            span= _p('rightmenu.categories')
         a.rightMenu-item.menu-link(href="/tags/")
             i.scoicon.sco-price-tag-fill
-            span 文章标签
+            span= _p('rightmenu.tags')
     div.rightMenu-group.rightMenu-line.rightMenuOther
         div.rightMenu-item#menu-copy
             i.scoicon.sco-external-link-fill
-            span 复制地址
+            span= _p('rightmenu.copyaddress')
         if  theme.comment.enable && theme.comment.commentBarrage
             div.rightMenu-item#menu-commentBarrage
                 i.scoicon.sco-chat-fill
-                span.menu-commentBarrage-text 关闭热评
+                span.menu-commentBarrage-text= _p('rightmenu.commentBarrage')
         div.rightMenu-item#menu-darkmode
             i.scoicon.sco-moon-clear-fill
-            span.menu-darkmode-text 深色模式
+            case theme.display_mode.type
+                when 'auto'
+                when 'light'
+                    span.menu-darkmode-text= _p('rightmenu.dark')
+                when 'dark'
+                    span.menu-darkmode-text= _p('rightmenu.light')
+        if theme.translate.enable
+            div.rightMenu-item#menu-translate
+                case theme.translate.defaultEncoding
+                    when 2
+                        i.scoicon.sco-panben-line
+                        span= _p('rightmenu.chs_to_cht')
+                    when 1
+                        i.scoicon.sco-jianben-line
+                        span= _p('rightmenu.cht_to_chs')
 div#rightmenu-mask

package/package.json

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

package/plugins.yml

@@ -64,7 +64,7 @@ pace_js:
   file: pace.min.js
   version: 1.2.4
 lunr_js:
-  name: lunr
+  name: lunr.js
   file: lunr.min.js
   version: 2.3.9
 swiper_css:
@@ -90,11 +90,15 @@ snackbar:
 scoicon_css:
   name: solitude-source
   file: icon/scoicon.min.css
-  version: 1.0.3
+  version: 1.0.5
 waterfall:
   name: solitude-source
   file: js/waterfall.min.js
-  version: 1.0.3
+  version: 1.0.5
+universe_js:
+  name: solitude-source
+  file: js/universe.min.js
+  version: 1.0.5
 medium_zoom:
   name: medium-zoom
   file: dist/medium-zoom.min.js

package/scripts/event/cdn.js

@@ -54,6 +54,11 @@ hexo.extend.filter.register('before_generate', () => {
             file: 'js/music.js',
             version
         },
+        translate:{
+            name: 'hexo-theme-solitude',
+            file: 'js/tw_cn.js',
+            version
+        },
         sco_ai_js: {
             name: 'hexo-theme-solitude',
             file: 'js/sco-ai.min.js',
@@ -101,7 +106,6 @@ hexo.extend.filter.register('before_generate', () => {
                 unpkg: `https://unpkg.com/${name}${verType}/${file}`,
                 cdnjs: `https://cdnjs.cloudflare.com/ajax/libs/${cdnjs_name}/${version}/${min_cdnjs_file}`,
                 custom: (CDN.custom_format || '').replace(/\$\{(.+?)\}/g, (match, $1) => value[$1]),
-                custom_cdn: `${CDN.custom_cdn + cdnjs_file}`,
                 cdncbd: `https://cdn.cbd.int/${name}${verType}/${file}`,
             }
 

package/scripts/event/init.js

@@ -1,22 +1,21 @@
 hexo.extend.filter.register('before_generate', () => {
-    // Get first two digits of the Hexo version number
-    const hexoVer = hexo.version.replace(/(^.*\..*)\..*/, '$1')
-    const nodeVer = process.version.replace(/^v/, '');
-    const [majorVer] = nodeVer.split('.');
-    const logger = hexo.log, config = hexo.config
-  
-    if (hexoVer < 5.3) {
-      logger.error('请把 Hexo 升级到 V5.3.0 或更高的版本！')
-      process.exit(-1)
-    }
+        const hexoVer = hexo.version.replace(/(^.*\..*)\..*/, '$1')
+        const nodeVer = process.version.replace(/^v/, '');
+        const [majorVer] = nodeVer.split('.');
+        const logger = hexo.log, config = hexo.config
+
+        if (hexoVer < 6.3) {
+            logger.error('请把 Hexo 升级到 V6.3.0 或更高的版本！')
+            process.exit(-1)
+        }
 
-    if(config.prismjs.enable){
-      logger.error('主题尚未支持 prismjs 请使用 highlightjs ！')
-      process.exit(-1)
+        if (config.prismjs.enable) {
+            logger.error('主题尚未支持 prismjs 请使用 highlightjs ！')
+            process.exit(-1)
+        }
+        if (Number(majorVer) < 14) {
+            logger.error('请将 Node.js 升级到 v14.0.0 或更高的版本！');
+            process.exit(-1);
+        }
     }
-    if (Number(majorVer) < 14) {
-      logger.error('请将 Node.js 升级到 v14.0.0 或更高的版本！');
-      process.exit(-1);
-  }
-  }
-  )
+)

package/scripts/event/page.js

@@ -1,4 +1,3 @@
-// generate 404 Page
 hexo.extend.generator.register('404', function (locals) {
   if(!this.theme.config.page.error)return
   return {
@@ -10,8 +9,6 @@ hexo.extend.generator.register('404', function (locals) {
     }
   }
 })
-
-// generate tags Page
 hexo.extend.generator.register('tags', function(locals) {
   if(!this.theme.config.page.tags)return
   return {
@@ -23,8 +20,6 @@ hexo.extend.generator.register('tags', function(locals) {
     }
   };
 });
-
-// generate categories Page
 hexo.extend.generator.register('categories', function(locals) {
   if(!this.theme.config.page.categories)return
   return {

package/scripts/filter/checkThemeConfig.js

@@ -1,12 +1,28 @@
 'use strict';
 
 hexo.extend.filter.register('before_post_render', () => {
-    const logger = hexo.log;
-    const theme = hexo.theme.config;
-    if (theme.hometop.banner.enable && !theme.hometop.banner.icon) {
-        logger.error('\n 启用banner的情况下，必须提供 icon 图片！\n 请在主题配置文件中设置 hometop.banner.icon 选项。');
-        logger.error('\n If banner is enabled, icon image must be supplied! \n Please set the hometop.banner.icon option in the theme configuration file.');
-        process.exit(-1);
+        const data = hexo.locals.get('data');
+        const logger = hexo.log;
+        const theme = hexo.theme.config;
+        if (theme.hometop.banner.enable && !theme.hometop.banner.icon) {
+            logger.error('\n 启用banner的情况下，必须提供 icon 图片！\n 请在主题配置文件中设置 hometop.banner.icon 选项。');
+            logger.error('\n If banner is enabled, icon image must be supplied! \n Please set the hometop.banner.icon option in the theme configuration file.');
+            process.exit(-1);
+        }
+        if (theme.says.enable && theme.says.mode === 'local' && !data.essay) {
+            logger.error('\n 启用说说的情况下，必须提供 essay 数据文件！\n 请新建 essay.yaml。');
+            logger.error('\n If says is enabled, essay data must be supplied! \n Please create essay.yaml.');
+            process.exit(-1);
+        }
+        if (theme.footer.randomlink && !data.links){
+            logger.error('\n 启用随机链接的情况下，必须提供 links 数据！\n 请新建 links.yaml。');
+            logger.error('\n If randomlink is enabled, links data must be supplied! \n Please create links.yaml.');
+            process.exit(-1);
+        }
+        if (theme.lightbox && !theme.fancybox && !theme.mediumZoom){
+            logger.error('\n 启用 lightbox 的情况下，必须提供 fancybox 或 mediumZoom 选项！\n 请在主题配置文件中设置 fancybox 或 mediumZoom 选项。');
+            logger.error('\n If lightbox is enabled, fancybox or mediumZoom option must be supplied! \n Please set the fancybox or mediumZoom option in the theme configuration file.');
+            process.exit(-1);
+        }
     }
-}
 );

package/scripts/filter/lazyload.js

@@ -3,9 +3,8 @@ const urlFor = require('hexo-util').url_for.bind(hexo)
 hexo.extend.filter.register('after_render:html', function (data) {
     const config = hexo.theme.config.lazyload
     if (!config.enable) return
-    const bg = config.placeholder ? urlFor(config.placeholder) : 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7'
     return data.replace(
-        /(<img(?!.*?class[\t]*=[\t]*['"].*?nolazyload.*?['"]).*? src=)/gi,
-        `$1 "${bg}" data-lazy-src=`
+        /(<img(?!.*?class[\t]*=[\t]*['"].*?nolazyload.*?['"]).*?)( src=)/gi,
+        `$1 data-lazy-src=`
     )
 })

package/scripts/generator/gallery.js

@@ -0,0 +1,47 @@
+/**
+ * Created by wleelw on 2024/2/4.
+ */
+
+hexo.extend.generator.register('gallery', function (locals) {
+    if (!hexo.theme.config.album.enable) return;
+    const album = locals.data.gallery.gallery;
+    if (!album) return;
+    return {
+        path: album.url + '/index.html', layout: ['page'], data: {
+            url: album.url,
+            cover: album.cover,
+            type: 'gallery',
+            comment: album.comment,
+            desc: album.title,
+            title: album.title,
+            album: album.album_list,
+            leftend: album.descr,
+            rightbtn: album.rightbtn,
+            rightbtnlink: album.rightbtnlink
+        }
+    }
+});
+
+hexo.extend.generator.register('album', function (locals) {
+    if (!hexo.theme.config.album.enable) return;
+    const album = locals.data.gallery.gallery;
+    let back = hexo.config.language === 'zh-CN' ? '返回相册' : hexo.config.language === 'zh-TW' ? '返回相冊' : 'Back to Album';
+    if (!album) return;
+    const albumPages = [];
+    album.album_list.forEach(function (item) {
+        albumPages.push({
+            path: album.url + '/' + item.album + '/index.html', layout: ['page'], data: {
+                album: item,
+                type: 'album',
+                cover: item.cover,
+                title: item.class_name,
+                desc: item.class_name,
+                leftend: item.descr,
+                rightbtn: back,
+                rightbtnlink: `/${album.url}/`,
+                comment: item.comment
+            }
+        });
+    });
+    return albumPages;
+});

package/scripts/helper/related_post.js

@@ -1,9 +1,3 @@
-/**
- * Solitude
- * Related Posts
- * According the tag
- */
-
 'use strict'
 
 hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {

package/scripts/helper/stylus.js

@@ -1,13 +1,12 @@
 hexo.extend.filter.register('stylus:renderer', function (style) {
     const {config, theme} = this
+    const data = hexo.locals.get('data');
 
-    // 侧边栏标签高亮
     if (theme.config.aside.tags.highlight) {
         let array = theme.config.aside.tags.list.map(item => encodeURIComponent(item));
         style.define('highlightTags', array);
     }
 
-    // 侧边栏加载样式控制
     let aside = [
         theme.config.aside.home.noSticky,
         theme.config.aside.home.Sticky,
@@ -17,7 +16,13 @@ hexo.extend.filter.register('stylus:renderer', function (style) {
         theme.config.aside.page.noSticky
     ].join(',').split(',');
     let uniqueArr = [...new Set(aside)]; // 去重
-    if (uniqueArr.length > 0) { // 是否为空
+    if (uniqueArr.length > 0) {
         style.define('aside', uniqueArr);
     }
+
+    if (data && data.about) {
+        style.define('about', Object.keys(data.about));
+    } else {
+        style.define('about', []);
+    }
 });

package/source/css/_layout/basic.styl

@@ -59,9 +59,6 @@ a
   overflow-wrap break-word
   -webkit-user-drag none
 
-  &:hover
-    color var(--sco-lighttext)
-
 abbr[title]
   border-bottom none
   text-decoration underline dotted

package/source/css/_layout/index.styl

@@ -54,40 +54,41 @@ span.tags-punctuation::before
     line-height 32px
 
 // snackbar
-.snackbar-container 
-  background var(--sco-lighttext)!important
-  color var(--sco-card-bg)!important
-  border-radius 0!important
+.snackbar-container
+  background var(--sco-lighttext) !important
+  color var(--sco-card-bg) !important
+  border-radius 0 !important
   display flex
-  justify-content center!important
-  max-width none!important
-  min-width 100%!important
-  margin 0!important
-  left 0!important
-  height 60px!important
-  transform none!important
-
-.snackbar-container p 
-  color var(--sco-card-bg)!important
-  font-weight 700!important
-  text-align center!important
-  font-size .8rem!important
-  display flex!important
-  justify-content center!important
-
-.snackbar-container .action 
-  color var(--sco-card-bg)!important
-  background var(--sco-lighttext)!important
-  padding 4px 6px!important
+  justify-content center !important
+  max-width none !important
+  min-width 100% !important
+  margin 0 !important
+  left 0 !important
+  height 60px !important
+  transform none !important
+
+.snackbar-container p
+  color var(--sco-card-bg) !important
+  font-weight 700 !important
+  text-align center !important
+  font-size .8rem !important
+  display flex !important
+  justify-content center !important
+
+.snackbar-container .action
+  color var(--sco-card-bg) !important
+  background var(--sco-lighttext) !important
+  padding 4px 6px !important
   font-weight 700
-  border-radius 8px!important
+  border-radius 8px !important
   transition .3s
-  border var(--style-border)!important
-.snackbar-container .action:hover 
-  color var(--sco-lighttext)!important
-  background var(--sco-card-bg)!important
+  border var(--style-border) !important
+
+.snackbar-container .action:hover
+  color var(--sco-lighttext) !important
+  background var(--sco-card-bg) !important
 
-.snackbar-container::after 
+.snackbar-container::after
   position absolute
   width 0
   height 100%
@@ -99,8 +100,27 @@ span.tags-punctuation::before
   animation snackbar-progress var(--sco-snackbar-time) linear forwards
   pointer-events none
 
-@keyframes snackbar-progress 
-  from 
+@keyframes snackbar-progress
+  from
     width 0
-  to 
-    width 100%
+  to
+    width 100%
+
+// universe
+if hexo-config('display_mode.universe')
+  #universe
+    display block
+    position fixed
+    margin 0
+    padding 0
+    border 0
+    outline 0
+    left 0
+    top 0
+    width 100%
+    height 100%
+    pointer-events none
+    z-index 1
+  [data-theme=light]
+    #universe
+      display none

package/source/css/_page/_about/index.styl

@@ -0,0 +1,49 @@
+#about-page
+  display flex
+  padding-top 1rem
+  flex-direction column
+  align-items center
+
+  .author-title
+    font-size 2rem
+    font-weight 700
+    margin 1rem 0
+    line-height 1
+
+if "tenyear" in about
+  @import "tenyear"
+
+if "authorinfo" in about
+  @import "author"
+
+if "contentinfo" in about
+  @import "contentinfo"
+
+if "skills" in about
+  @import "skills"
+
+if "oneself" in about
+  @import "oneself"
+
+if "motto" in about
+  @import "buff"
+  @import "maxim"
+
+if "game1" in about
+  @import "game"
+
+if "personalities" in about
+  @import "personalities"
+  @import "myphoto"
+
+if "careers" in about
+  @import "careers"
+
+if "likes" in about
+  @import "like"
+
+if "tj" in about
+  @import "statistic"
+
+if "award" in about
+  @import "reward"

package/source/css/_page/{about → _about}/reward.styl

@@ -98,10 +98,17 @@
             color var(--sco-card-bg)
             font-size 12px
             line-height 1
+            display flex
+            align-items center
+            justify-content center
             border-radius 4px
             margin-right 4px
             white-space nowrap
 
+            .scoicon
+              font-size 14px
+              margin-right 4px
+
           .reward-list-item-time
             font-size 12px
             color var(--sco-secondtext)

package/source/css/_page/{gallery → _gallery}/index.styl

@@ -1,19 +1,29 @@
 #gallery
-  width 100%
+  padding 16px 0
   display flex
   flex-wrap wrap
-  justify-content start
-  padding 10px 0
+  -webkit-box-pack start
+  justify-content flex-start
+  margin -8px
+  -webkit-box-align stretch
+  align-items stretch
 
   .gallery-item
     overflow hidden
     border var(--style-border-always)
     border-radius 12px
     position relative
+    float left
     display flex
     height 250px
-    width calc(100% / 3 - 10px)
+    width calc(100% / 3 - 16px)
     cursor pointer
+    margin 8px
+    +maxWidth1200()
+      width calc(100% / 2 - 16px)
+
+    +maxWidth768()
+      width 100%
 
     &:hover
       .cover
@@ -65,7 +75,7 @@
       text-wrap break-word
 
 #album
-  margin 22px auto 0
+  margin 5px auto
 
   .locate
     display flex
@@ -81,14 +91,12 @@
     z-index 1
     user-select none
 
-  #sco-container 
-    margin-top 22px
-
   .sco-gallery-item
     margin-bottom 24px
     overflow hidden
     border-radius 8px
     transition all .3s
+    border var(--style-border-always)
 
   .sco-gallery-image
     width 100%