hexo-theme-solitude 2.1.16 → 3.0.0

package/_config.yml

@@ -1,11 +1,11 @@
 # ---------------------------
 # Hexo Theme Solitude
-# Author: Ever Fu
+# Author: 伍十七(@everfu)
 # Github: https://github.com/everfu/hexo-theme-solitude
 #
 # Guide: https://solitude.js.org
 # You can get more detailed help from the guide
-# 指南：https://solitude.js.org
+# 指南：https://solitude.js.org/zh
 # 你可以从指南中获取更详细的帮助
 #
 # sponsor: https://ko-fi.com/everfu
@@ -21,7 +21,7 @@ site:
   name:
     class: text # text / i_class / img
     custom: Solitude # Solitude / fas fa-ghost / /img/pwa/favicon.ico
-  icon: /img/pwa/favicon.ico # Site icon / 网站图标
+  icon: /img/pwa/favicon.png # Site icon / 网站图标
 # --------------------------- end ---------------------------
 
 # --------------------------- start ---------------------------
@@ -69,8 +69,11 @@ nav:
 hometop:
   enable: false
   banner:
-    title: # 宁静致远 <br> 热爱生活 # 标题
-    url: Hexo Theme Solitude # 小字
+    title: 分享技术<br >与科技生活 # 大字
+    desc: 一个热爱生活的人 # 小字
+      # - 我只是一个普通的程序员
+      # - 但我有一个不平凡的梦想
+      # - 我希望能够改变世界
     icon:
       # HTML: # name
       #   img: https://i.postimg.cc/vBWVnY8q/html.png # url
@@ -380,7 +383,7 @@ font:
   code-font-size: 16px
   # Global font
   # 全局字体
-  font-family: "PingFang SC, Hiragino Sans GB, Microsoft YaHei"
+  font-family: "PingFang SC, Hiragino Sans GB, Microsoft YaHei, sans-serif"
   # Code font
   # 代码字体
   code-font-family: '"monospace", monospace'

package/layout/includes/inject/body.pug

@@ -25,7 +25,7 @@ div
   if theme.chart
     script(src=url_for(theme.cdn.chart_js))
 
-  if theme.typeit
+  if theme.typeit || typeof theme.hometop.banner.desc === 'object'
     script(src=url_for(theme.cdn.typeit_js))
 
   if theme.display_mode.universe

package/layout/includes/page/kit.pug

@@ -0,0 +1,3 @@
+if page.banner
+    include ../widgets/page/banner
+include ../widgets/page/kit/content

package/layout/includes/page/links.pug

@@ -1,7 +1,9 @@
-.flink#banners
-    include ../widgets/page/links/banner
+- var $data = page.data
+if page.banner
+    .flink#banners
+        include ../widgets/page/links/banner
 .flink.article-container
-    each data in site.data.links.links
+    each data in site.data[$data].links
         h2= data.class_name + " (" + data.link_list.length + ")"
         .flink-desc= data.descr
         case data.type

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

@@ -1,8 +1,15 @@
-- const { title, url, icon} = theme.hometop.banner
+- const { title, desc, icon} = theme.hometop.banner
 
 div.banners-title
     div.banners-title-big!= title
-    div.banners-title-small= url
+    - console.log(typeof(desc))
+    if typeof(desc) === 'object'
+        div.banners-title-small
+        script.
+            var home_subtitle = !{JSON.stringify(desc || [])};
+    else
+        div.banners-title-small= desc
+
 - var group = theme.hometop.group
 if group
     div.banners-links

package/layout/includes/widgets/page/{equipment → kit}/content.pug

@@ -1,6 +1,7 @@
+- var $data = page.data
 #equipment
-    if site.data.equipment
-        each i in site.data.equipment
+    if $data
+        each i in site.data[$data]
             .equipment-item
                 h2.equipment-item-title= i.class_name
                 .equipment-item-description= i.description

package/layout/page.pug

@@ -10,14 +10,12 @@ block content
                     include includes/page/tags
                 when 'links'
                     include includes/page/links
-                when 'tlink'
-                    include includes/page/tlink
                 when 'about'
                     include includes/page/about
-                when 'says'
-                    include includes/page/says
-                when 'equipment'
-                    include includes/page/equipment
+                when 'brevity'
+                    include includes/page/brevity
+                when 'kit'
+                    include includes/page/kit
                 when 'music'
                     include includes/page/music
                 when 'message'

package/package.json

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

package/plugins.yml

@@ -111,7 +111,7 @@ mermaid_js:
 chart_js:
   name: chart.js
   file: dist/chart.umd.js
-  version: 4.4.1
+  version: 4.4.7
   other_name: Chart.js
 typeit_js:
   name: typeit

package/scripts/event/cdn.js

@@ -3,117 +3,48 @@
  * Merge CDN
  */
 
-'use strict'
+'use strict';
 
-const { version } = require('../../package.json')
-const path = require('path')
+const { version } = require('../../package.json');
+const path = require('path');
 
 hexo.extend.filter.register('before_generate', () => {
-    const themeConfig = hexo.theme.config
-    const { CDN } = themeConfig
+    const themeConfig = hexo.theme.config;
+    const { CDN } = themeConfig;
+    const name = 'hexo-theme-solitude';
 
-    const thirdPartySrc = hexo.render.renderSync({ path: path.join(hexo.theme_dir, '/plugins.yml'), engine: 'yaml' })
+    const thirdPartySrc = hexo.render.renderSync({ path: path.join(hexo.theme_dir, '/plugins.yml'), engine: 'yaml' });
     const internalSrc = {
-        main: {
-            name: 'hexo-theme-solitude',
-            file: 'js/main.js',
-            version
-        },
-        utils: {
-            name: 'hexo-theme-solitude',
-            file: 'js/utils.js',
-            version
-        },
-        local_search: {
-            name: 'hexo-theme-solitude',
-            file: 'js/search/local.js',
-            version
-        },
-        algolia_js: {
-            name: 'hexo-theme-solitude',
-            file: 'js/search/algolia.js',
-            version
-        },
-        cover_local: {
-            name: 'hexo-theme-solitude',
-            file: 'js/covercolor/local.js',
-            version
-        },
-        cover_api: {
-            name: 'hexo-theme-solitude',
-            file: 'js/covercolor/api.js',
-            version
-        },
-        cover_ave: {
-            name: 'hexo-theme-solitude',
-            file: 'js/covercolor/ave.js',
-            version
-        },
-        music_js: {
-            name: 'hexo-theme-solitude',
-            file: 'js/music.js',
-            version
-        },
-        right_menu_js: {
-            name: 'hexo-theme-solitude',
-            file: 'js/right_menu.js',
-            version
-        },
-        translate_js:{
-            name: 'hexo-theme-solitude',
-            file: 'js/tw_cn.js',
-            version
-        },
-        post_ai: {
-            name: 'hexo-theme-solitude',
-            file: 'js/third_party/post_ai.min.js',
-            version
-        },
-        commentBarrage: {
-            name: 'hexo-theme-solitude',
-            file: 'js/third_party/barrage.min.js',
-            version
-        },
-        waterfall: {
-            name: 'hexo-theme-solitude',
-            file: 'js/third_party/waterfall.min.js',
-            version
-        },
-        universe_js: {
-            name: 'hexo-theme-solitude',
-            file: 'js/third_party/universe.min.js',
-            version
-        },
-        envelope_js: {
-            name: 'hexo-theme-solitude',
-            file: 'js/third_party/envelope.min.js',
-            version
-        }
-    }
+        main: { name, file: 'js/main.js', version },
+        utils: { name, file: 'js/utils.js', version },
+        local_search: { name, file: 'js/search/local.js', version },
+        algolia_js: { name, file: 'js/search/algolia.js', version },
+        cover_local: { name, file: 'js/covercolor/local.js', version },
+        cover_api: { name, file: 'js/covercolor/api.js', version },
+        cover_ave: { name, file: 'js/covercolor/ave.js', version },
+        music_js: { name, file: 'js/music.js', version },
+        right_menu_js: { name, file: 'js/right_menu.js', version },
+        translate_js: { name, file: 'js/tw_cn.js', version },
+        post_ai: { name, file: 'js/third_party/post_ai.min.js', version },
+        commentBarrage: { name, file: 'js/third_party/barrage.min.js', version },
+        waterfall: { name, file: 'js/third_party/waterfall.min.js', version },
+        universe_js: { name, file: 'js/third_party/universe.min.js', version },
+        envelope_js: { name, file: 'js/third_party/envelope.min.js', version }
+    };
 
-    const minFile = file => {
-        return file.replace(/(?<!\.min)\.(js|css)$/g, ext => '.min' + ext)
-    }
+    const minFile = file => file.replace(/(?<!\.min)\.(js|css)$/g, ext => `.min${ext}`);
 
     const createCDNLink = (data, type, cond = '') => {
         Object.keys(data).forEach(key => {
-            let { name, version, file, other_name } = data[key]
-            const cdnjs_name = other_name || name
-            const cdnjs_file = file.replace(/^[lib|dist]*\/|browser\//g, '')
-            const min_cdnjs_file = minFile(cdnjs_file)
-            if (cond === 'internal') file = `source/${file}`
-            const min_file = minFile(file)
-            const verType = CDN.version ? (type === 'local' ? `?v=${version}` : `@${version}`) : ''
+            let { name, version, file, other_name } = data[key];
+            const cdnjs_name = other_name || name;
+            const cdnjs_file = file.replace(/^[lib|dist]*\/|browser\//g, '');
+            const min_cdnjs_file = minFile(cdnjs_file);
+            if (cond === 'internal') file = `source/${file}`;
+            const min_file = minFile(file);
+            const verType = CDN.version ? (type === 'local' ? `?v=${version}` : `@${version}`) : '';
 
-            const value = {
-                version,
-                name,
-                file,
-                cdnjs_file,
-                min_file,
-                min_cdnjs_file,
-                cdnjs_name
-            }
+            const value = { version, name, file, cdnjs_file, min_file, min_cdnjs_file, cdnjs_name };
 
             const cdnSource = {
                 local: cond === 'internal' ? `${cdnjs_file + verType}` : `/pluginsSrc/${name}/${file + verType}`,
@@ -121,27 +52,26 @@ 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]),
-            }
+            };
 
-            data[key] = cdnSource[type]
-        })
+            data[key] = cdnSource[type];
+        });
 
-        if (cond === 'internal') data.main_css = 'css/index.css' + (CDN.version ? `?v=${version}` : '')
-        return data
-    }
+        if (cond === 'internal') data.main_css = `css/index.css${CDN.version ? `?v=${version}` : ''}`;
+        return data;
+    };
 
-    // delete null value
     const deleteNullValue = obj => {
-        if (!obj) return
-        for (const i in obj) {
-            obj[i] === null && delete obj[i]
+        if (!obj) return;
+        for (const key in obj) {
+            if (obj[key] === null) delete obj[key];
         }
-        return obj
-    }
+        return obj;
+    };
 
     themeConfig.cdn = Object.assign(
         createCDNLink(internalSrc, CDN.internal, 'internal'),
         createCDNLink(thirdPartySrc, CDN.third_party),
         deleteNullValue(CDN.options)
-    )
-})
+    );
+});

package/scripts/event/merge_config.js

@@ -327,7 +327,7 @@ hexo.extend.filter.register('before_generate', () => {
     font: {
       'font-size': '16px',
       'code-font-size': '16px',
-      'font-family': 'PingFang SC, Hiragino Sans GB,Microsoft YaHei',
+      'font-family': 'PingFang SC, Hiragino Sans GB,Microsoft YaHei, sans-serif',
       'code-font-family': '"monospace", monospace',
     },
     extends: {

package/scripts/helper/stylus.js

@@ -3,8 +3,6 @@ hexo.extend.filter.register('stylus:renderer', function (style) {
     const data = hexo.locals.get('data');
 
     style.define('$about', data && data.about ? Object.keys(data.about) : false);
-    style.define('$link', !!(data && data.links) || !!(data && data.tlink))
-    style.define('$equipment', !!(data && data.equipment))
 
     // highlight
     const {syntax_highlighter: syntaxHighlighter, highlight, prismjs} = hexo.config

package/source/css/_comments/twikoo.styl

@@ -282,7 +282,7 @@
   code
   kbd
   samp
-    font-family ui-monospace, SFMono-Regular, "SF Mono", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace
+    font-family $code-font-family
 
   pre
     background var(--efu-secondbg)

package/source/css/_layout/footer.styl

@@ -100,7 +100,7 @@
     flex-direction row
     width 100%
     max-width 1200px
-    justify-content space-between
+    justify-content space-evenly
     flex-wrap wrap
     margin 1rem auto 3rem
     padding 0 1rem

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

@@ -34,7 +34,7 @@
       margin-right auto
       width 100%
       font-size 36px
-      font-family Helvetica
+      font-family $font-family
       line-height 1.06
       letter-spacing -.02em
       color var(--efu-fontcolor)

package/source/css/_page/error.styl

@@ -57,7 +57,7 @@
         padding .5rem
         text-align center
         font-size 14px
-        font-family "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei"
+        font-family $font-family
 
         +maxWidth768()
           width 100%

package/source/css/_page/index.styl

@@ -18,14 +18,11 @@ if hexo-config('music.enable')
 if hexo-config('google_adsense.enable')
   @import "google.styl"
 
-if $equipment
-  @import "equipment.styl"
+@import "equipment.styl"
 
-if $link
-  @import "links.styl"
+@import "links.styl"
 
-if $about
-  @import "_about/about"
+@import "_about/about"
 
 @import "other"
 

package/source/js/main.js

@@ -483,6 +483,19 @@ const sco = {
       }
     };
     utils.addEventListenerPjax(switchBtn, 'click', handleSwitchBtn);
+  },
+  homeTypeit() {
+    if(typeof(home_subtitle) === 'undefined') return;
+    const ty = new TypeIt(".banners-title-small", {
+        speed: 200,
+        waitUntilVisible: true,
+        loop: true,
+        lifeLike: true,
+    });
+    home_subtitle.forEach(item => {
+        ty.type(item).pause(500).delete(item);
+    });
+    ty.go();
   }
 };
 
@@ -747,6 +760,7 @@ window.refreshFn = () => {
   initObserver();
   if (is_home) {
     showTodayCard();
+    sco.homeTypeit();
   }
   typeof updatePostsBasedOnComments === 'function' && updatePostsBasedOnComments();
   if (is_post || is_page) {

package/source/js/third_party/waterfall.min.js

@@ -2,4 +2,4 @@
  * @license Copyright 2024 Ever Funnel. All rights reserved.
  * Licensed under the MIT License.
  */
-function waterfall(t){function e(t,e){var n=window.getComputedStyle(t);return parseFloat(n["margin"+e])||0}function n(t){return t+"px"}function r(t){return parseFloat(t.style.top)||0}function o(t){return parseFloat(t.style.left)||0}function i(t){return t.clientWidth}function l(t){return t.clientHeight}function u(t){return r(t)+l(t)+e(t,"Bottom")}function a(t){return o(t)+i(t)+e(t,"Right")}function s(t){t.sort(function(t,e){var n=u(t),r=u(e);return n===r?o(e)-o(t):r-n})}function f(e){i(t)!==containerWidth&&(window.removeEventListener(e.type,f),waterfall(t))}"string"==typeof t&&(t=document.querySelector(t));var c=Array.from(t.children).map(function(t){return(t.style.position="absolute"),t});t.style.position="relative";var p=Array.from(t.querySelectorAll("img")),y=p.map(function(t){return new Promise(function(e){t.complete?e():(t.addEventListener("load",e),t.addEventListener("error",e))})});return Promise.all(y).then(function(){var r=[];c.length&&(c[0].style.top="0px",c[0].style.left=n(e(c[0],"Left")),r.push(c[0]));for(var l=1;l<c.length;l++){var p=c[l-1],y=c[l];if(!(a(p)+i(y)<=i(t)))break;y.style.top=p.style.top;y.style.left=n(a(p));r.push(y)}for(var v=r.length;v<c.length;v++){s(r);var d=c[v],h=r.pop();d.style.top=n(u(h)+e(d,"Top"));d.style.left=n(o(h));r.push(d)}s(r);var m=r[0];t.style.height=n(u(m)+e(m,"Bottom"));i(t);window.addEventListener("resize",f)})}
+function waterfall(t){function e(t,e){var n=window.getComputedStyle(t);return parseFloat(n["margin"+e])||0}function n(t){return t+"px"}function r(t){return parseFloat(t.style.top)||0}function o(t){return parseFloat(t.style.left)||0}function i(t){return t.clientWidth}function l(t){return t.clientHeight}function u(t){return r(t)+l(t)+e(t,"Bottom")}function a(t){return o(t)+i(t)+e(t,"Right")}function s(t){t.sort(function(t,e){var n=u(t),r=u(e);return n===r?o(e)-o(t):r-n})}function f(e){var containerWidth = i(t);i(t)!==containerWidth&&(window.removeEventListener(e.type,f),waterfall(t))}"string"==typeof t&&(t=document.querySelector(t));var c=Array.from(t.children).map(function(t){return(t.style.position="absolute"),t});t.style.position="relative";var p=Array.from(t.querySelectorAll("img")),y=p.map(function(t){return new Promise(function(e){t.complete?e():(t.addEventListener("load",e),t.addEventListener("error",e))})});return Promise.all(y).then(function(){var r=[];c.length&&(c[0].style.top="0px",c[0].style.left=n(e(c[0],"Left")),r.push(c[0]));for(var l=1;l<c.length;l++){var p=c[l-1],y=c[l];if(!(a(p)+i(y)<=i(t)))break;y.style.top=p.style.top;y.style.left=n(a(p));r.push(y)}for(var v=r.length;v<c.length;v++){s(r);var d=c[v],h=r.pop();d.style.top=n(u(h)+e(d,"Top"));d.style.left=n(o(h));r.push(d)}s(r);var m=r[0];t.style.height=n(u(m)+e(m,"Bottom"));i(t);window.addEventListener("resize",f)})}

package/.github/workflows/code-review-bot.yml

@@ -1,28 +0,0 @@
-name: Code Review Bot
-
-permissions:
-  contents: read
-  pull-requests: write
-
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-
-jobs:
-  test:
-    # if: ${{ contains(github.event.*.labels.*.name, 'gpt review') }} # Optional; to run only when a label is attached
-    runs-on: ubuntu-latest
-    steps:
-      - uses: anc95/ChatGPT-CodeReview@main
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
-          # Optional
-          LANGUAGE: Chinese
-          OPENAI_API_ENDPOINT: https://api.openai.com/v1
-          MODEL: gpt-3.5-turbo
-          PROMPT:
-          top_p: 1
-          temperature: 1
-          max_tokens: 1000
-          MAX_PATCH_LENGTH: 1000

package/.github/workflows/issue_close_question.yml

@@ -1,25 +0,0 @@
-name: Close need info
-
-on:
-  schedule:
-    - cron: "0 0 */1 * *"
-  workflow_dispatch:
-
-jobs:
-  close-need-info:
-    runs-on: ubuntu-latest
-    steps:
-      - name: close-issues
-        uses: actions-cool/issues-helper@v3
-        with:
-          actions: "close-issues"
-          token: ${{ secrets.GITHUB_TOKEN }}
-          labels: "question"
-          inactive-day: 60
-          close-reason: "not_planned"
-          body: |
-            Hi there! This issue has been automatically closed because it has not had any activity for 60 days. We label issues as "questions" in hopes of community or maintainer input, and it seems this issue has gone stale.
-          
-            If you still need assistance or believe this closure is a mistake, please feel free to reopen the issue or create a new one with updated details. We're here to help!
-          
-            Thank you for your contributions to our project!

package/layout/includes/page/equipment.pug

@@ -1,2 +0,0 @@
-include ../widgets/page/banner
-include ../widgets/page/equipment/content

package/layout/includes/page/tlink.pug

@@ -1,13 +0,0 @@
-include ../widgets/page/banner
-.flink.article-container
-    each data in site.data.tlink.links
-        h2= data.class_name + " (" + data.link_list.length + ")"
-        .flink-desc= data.descr
-        case data.type
-            when 'card'
-                include ../widgets/page/links/linksCard
-            when 'item'
-                include ../widgets/page/links/linksItem
-            when 'discn'
-                include ../widgets/page/links/linksDiscn
-    != page.content

package/scripts/tags/article.js

@@ -1,56 +0,0 @@
-'use strict';
-
-const article = ([path]) => {
-  const post = hexo.locals.get("posts").data.find(post => post.path === path);
-  if (!post) return '';
-
-  const createTagLinks = tags => tags.map(tag => 
-    `<a class="article-meta__tags fancybox" href="${tag.path}" onclick="event.stopPropagation();">
-      <span class="tags-punctuation">
-        <i class="solitude fa-solid fa-hashtag"></i>${tag.name}
-      </span>
-    </a>`
-  ).join('');
-
-  const createCategory = categories => categories.length > 0 
-    ? `<span class="article-meta sticky-warp">
-         <span class="original">${categories[0].name}</span>
-       </span>` 
-    : '';
-
-  const createPostCover = post => 
-    `<div class="post_cover">
-       <a href="/${post.path}" class="fancybox" title="${post.title}">
-         <img class="post_bg" src="${post.cover}" alt="${post.title}">
-       </a>
-     </div>`;
-
-  const createRecentPostInfoTop = (category, post) => 
-    `<div class="recent-post-info-top">
-       <div class="recent-post-info-top-tips">${category}</div>
-       <a class="article-title fancybox" href="/${post.path}" title="${post.title}">${post.title}</a>
-     </div>`;
-
-  const createContent = description => 
-    `<div class="content">${description || ''}</div>`;
-
-  const createArticleMetaWrap = (tags, date) => 
-    `<div class="article-meta-wrap">
-       <span class="article-meta tags">${tags}</span>
-       <span class="post-meta-date">
-         <time datetime="${date}" style="display: inline;"></time>
-       </span>
-     </div>`;
-
-  const tags = createTagLinks(post.tags);
-  const category = createCategory(post.categories.data);
-  const postCover = createPostCover(post);
-  const recentPostInfoTop = createRecentPostInfoTop(category, post);
-  const content = createContent(post.description);
-  const articleMetaWrap = createArticleMetaWrap(tags, post.date);
-  const recentPostInfo = `<div class="recent-post-info">${recentPostInfoTop + content + articleMetaWrap}</div>`;
-
-  return `<div class="recent-post-item" onclick="pjax.loadUrl('/${post.path}')">${postCover + recentPostInfo}</div>`;
-};
-
-hexo.extend.tag.register('article', article);

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

@@ -1,38 +0,0 @@
-#gallery
-  padding 16px 0
-  display flex
-  flex-wrap wrap
-  -webkit-box-pack start
-  justify-content flex-start
-  margin -8px
-  -webkit-box-align stretch
-  align-items stretch
-
-#album
-  margin 5px auto
-
-  .locate
-    display flex
-    position absolute
-    left 8px
-    top 8px
-    padding 4px 6px
-    border-radius 8px
-    background var(--efu-black-op)
-    font-size 12px
-    color var(--efu-white)
-    transition .3s
-    z-index 1
-    user-select none
-
-  .st-gallery-item
-    margin-bottom 24px
-    overflow hidden
-    border-radius 8px
-    transition all .3s
-    border var(--style-border-always)
-
-  .st-gallery-image
-    width 100%
-    display block
-    height auto