hexo-theme-solitude 1.2.2 → 1.2.4

package/_config.yml

@@ -259,12 +259,14 @@ page:
   tags: true # 标签页
   categories: true # 分类页
   default: # 默认值
-    cover: /img/default.png # 默认图片
+    cover:
+      - /img/default.png # 默认图片
 
 # 文章页默认设置
 post:
   default:
-    cover: /img/default.png
+    cover:
+      - /img/default.png # 默认图片
     locate: 衡阳
     copyright:
       enable: true
@@ -334,6 +336,19 @@ loading:
   fullpage: false # 全局加载动画
   pace: false # 顶部加载动画
 
+# 用于自定义的主题颜色
+# 注意：颜色值必须使用引号，如“#000”，否则可能会导致错误！
+# --------------------------------------
+theme_color:
+  dark: "#f2b94b" # 暗色模式
+  dark_op: '#f2b94b23' # 暗色模式透明
+  dark_op_deep: '#f2b94b4d' # 暗色模式透明深色
+  dark_none: '#f2b94b00' # 暗色模式透明无色
+  light: "#bdbdf0" # 亮色模式
+  light_op: '#4259ef23' # 亮色模式透明
+  light_op_deep: '#eccec5' # 亮色模式透明深色
+  light_none: '#4259ef01' # 亮色模式透明无色
+
 # 第三方设置
 thirdparty:
   wordcount: false # 字数统计
@@ -392,12 +407,18 @@ thirdparty:
 # 评论
 comment:
   enable: false # 是否开启评论
-  type: 'twikoo' # valine, twikoo
+  type:  # valine, twikoo
+  lazyload: false # 是否开启懒加载
+  count: false  # 是否显示评论数
   # 评论系统
   twikoo:
     envId: # url: https://twikoo.sondy.top/
     lang: 'zh-CN' # 语言
     accessToken:  # accessToken
+  waline:
+    envId:  # url: https://waline.js.org/
+    pageview: false # 是否开启页面访问量统计
+    option: # waline配置项
 
 # 插入代码到头部 </head> 之前 和 底部 </body> 之前
 # 插入额外代码 如：统计，广告等
@@ -487,6 +508,8 @@ cdn:
     pacejs: https://cdn.bootcdn.net/ajax/libs/pace/1.2.4/pace.min.js
     echartsjs: https://cdn.bootcdn.net/ajax/libs/echarts/5.4.2/echarts.min.js
     lunrjs: https://cdn.bootcdn.net/ajax/libs/lunr.js/2.3.9/lunr.min.js
+    walinecss: https://cdn.bootcdn.net/ajax/libs/waline/2.15.7/waline.min.css
+    walinejs: https://cdn.bootcdn.net/ajax/libs/waline/2.15.7/waline.min.js
   body:
     viewimagejs: /lib/view-image.min.js
     waterfalljs: /lib/waterfall.min.js

package/layout/category.pug

@@ -1,16 +1,13 @@
 extends includes/layout.pug
 
 block content
-  main.layout#content-inner
-    div#category
-      div#category-bar
-        div.category-bar-items#category-bar-items
-          include includes/widgets/home/categoryBar
-      div.recent-posts#recent-posts
-        - const currentCategory = page.category
-        each post in site.posts.data
-          each category in post.categories.data
-            if category.name === currentCategory
-              include includes/widgets/home/postList
-      include includes/mixins/pagination
-    include includes/widgets/aside/aside
+    main.layout#content-inner
+        div#category
+            div#category-bar
+                div.category-bar-items#category-bar-items
+                    include includes/widgets/home/categoryBar
+            div.recent-posts#recent-posts
+                each post in site.posts.find({ parent: { $exists: false } }).data
+                    include includes/widgets/home/postList
+            include includes/mixins/pagination
+        include includes/widgets/aside/aside

package/layout/includes/inject/body.pug

@@ -54,9 +54,8 @@ if theme.aside.welcome.enable
     script(src='/js/txmap.js')
 
 if theme.comment.enable
-    script(src='/js/extend/console/comment.js')
-
     if theme.comment.type === 'twikoo'
+        script(src='/js/extend/comment/twikoo.js')
         script(src='/js/commentBarrage.js')
 
 // pjax
@@ -65,4 +64,4 @@ include ../widgets/third-party/pjax.pug
 // inject custom body
 if theme.extends.body
     each item in theme.extends.body
-        item
+       != item

package/layout/includes/inject/head.pug

@@ -18,8 +18,12 @@ link(rel="stylesheet", href=cdn.snackbarcss)
 
 // comment
 if theme.comment.enable
-    if theme.comment.type === 'twikoo'
-        script(src=cdn.twikoojs)
+    case theme.comment.type
+        when 'twikoo'
+            script(src=cdn.twikoojs)
+        when 'waline'
+            script(src=cdn.walinejs)
+            link(rel="stylesheet", href=cdn.walinecss)
 
 // search
 if theme.thirdparty.search.enable
@@ -40,7 +44,7 @@ if theme.says.home_mini || theme.aside.history.enable
 // custom inject
 if theme.extends.head
     each item in theme.extends.head
-        item
+        != item
 
 // post-ai
 if theme.thirdparty.ai.enable

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

@@ -1,5 +1,5 @@
 .card-tag-cloud
-    each tag in site.tags.data
+    each tag in site.tags.find({ parent: { $exists: false } }).data
         a(href=url_for(tag.path), style="font-size: 0.8rem;")= tag.name
             sup= tag.length
 if site.tags.length > 50

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

@@ -1,26 +1,25 @@
-for post in page.posts.sort('-date').data
-    div(class="recent-post-item" onclick="pjax.loadUrl('/"+post.path+"')")
-        div.post_cover.left_radius
-            a(href=url_for(post.path), title=post.title)
-                img(src=url_for(post.cover), alt=post.title, class="post_bg")
-        div.recent-post-info
-            div.recent-post-info-top
-                div.recent-post-info-top-tips
-                    each category in post.categories.data
-                       span(class="original")= category.name
+div(class="recent-post-item" onclick="pjax.loadUrl('/" + post.path + "')")
+    div.post_cover.left_radius
+        a(href=url_for(post.path), title=post.title)
+            img(src=url_for(post.cover), alt=post.title, class="post_bg")
+    div.recent-post-info
+        div.recent-post-info-top
+            div.recent-post-info-top-tips
+                each category in post.categories.data
+                    span(class="original")= category.name
 
-                    if post.prev == null && is_home()
-                        span(class="original")="最新"
+                if post.prev == null && is_home()
+                    span(class="original")="最新"
 
-                    a(class="unvisited-post" href=url_for(post.path), data-pjax-state)= "未读"
+                a(class="unvisited-post" href=url_for(post.path), data-pjax-state)= "未读"
 
-                a(class="article-title" href=url_for(post.path), data-pjax-state, title=post.title)= post.title
+            a(class="article-title" href=url_for(post.path), data-pjax-state, title=post.title)= post.title
 
-            div.article-meta-wrap
-                span.article-meta.tags
-                   each tag in post.tags.data
-                       a(class="article-meta__tags" href=url_for(tag.path), data-pjax-state, onclick="window.event.cancelable=true")
-                         span.tags-punctuation=tag.name
+        div.article-meta-wrap
+            span.article-meta.tags
+                each tag in post.tags.data
+                    a(class="article-meta__tags" href=url_for(tag.path), data-pjax-state, onclick="window.event.cancelable=true")
+                        span.tags-punctuation=tag.name
 
-                span.post-meta-date
-                   time(datetime=moment(post.date))
+            span.post-meta-date
+                time(datetime=moment(post.date))

package/layout/includes/widgets/third-party/comments/comment.pug

@@ -11,4 +11,6 @@ div#post-comment(view-image)
             when 'gitalk'
                 include ./gitalk.pug
             when 'valine'
-                include ./valine.pug
+                include ./valine.pug
+            when 'waline'
+                include ./waline.pug

package/layout/includes/widgets/third-party/comments/waline.pug

@@ -0,0 +1,17 @@
+- const { envId, option, pageview } = theme.comment.waline
+- const { lazyload, count, type } = theme.comment
+
+script.
+    async function initComment() {
+        (() => {
+            const waline = Waline.init(Object.assign({
+                el: '#comment',
+                serverURL: '!{envId}',
+                pageview: !{lazyload ? false : pageview},
+                dark: 'html[data-theme="dark"]',
+                path: window.location.pathname,
+                search: false,
+                comment: !{lazyload ? false : count},
+            }, !{JSON.stringify(option)}))
+        })()
+    }

package/layout/index.pug

@@ -11,7 +11,8 @@ block content
             div#category-bar
                 include ./includes/widgets/home/categoryBar.pug
 
-            include ./includes/widgets/home/postList.pug
+            for post in page.posts.sort('-date').data
+                include ./includes/widgets/home/postList.pug
 
             // pageination
             include ./includes/mixins/pagination.pug

package/layout/tag.pug

@@ -1,19 +1,16 @@
 extends includes/layout.pug
 
 block content
-  main.layout#content-inner
-    div#tag
-      div#tag-page-tags
-        each tag in site.tags.find({ parent: { $exists: false } }).data
-          a(id=tag.name class=(tag.name === page.tag ? 'select' : '') href=url_for(tag.path))
-            span.tags-punctuation
-            | #{tag.name}
-            span.tagsPageCount #{tag.length}
-      div.recent-posts#recent-posts
-        - const currentTag = page.tag
-        each post in site.posts.data
-          each tag in post.tags.data
-            if tag.name === currentTag
-              include includes/widgets/home/postList
-      include includes/mixins/pagination
-    include includes/widgets/aside/aside
+    main.layout#content-inner
+        div#tag
+            div#tag-page-tags
+                each tag in site.tags.find({ parent: { $exists: false } }).data
+                    a(id=tag.name class=(tag.name === page.tag ? 'select' : '') href=url_for(tag.path))
+                        span.tags-punctuation
+                        | #{tag.name}
+                        span.tagsPageCount #{tag.length}
+            div.recent-posts#recent-posts
+                each post in site.posts.find({ parent: { $exists: false } }).data
+                    include includes/widgets/home/postList
+            include includes/mixins/pagination
+        include includes/widgets/aside/aside

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "A beautiful, powerful, and efficient Hexo theme developed by the DuoSco team",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/scripts/filter/default.js

@@ -1,23 +1,29 @@
 'use strict';
 
-hexo.extend.filter.register('after_post_render', function(data){
-  const config = hexo.theme.config
-  data.title = data.title || '无标题';
-  if(data.layout === 'post'){
-    data.locate = data.locate || config.post.default.locate
-    data.cc = data.cc || config.post.default.copyright
-    data.cover = data.cover || config.post.default.cover
-    data.excerpt =  data.description || data.excerpt
-    if(config.aside.toc.post && data.toc !== false)data.toc = true
-    else data.toc = false
-  }
-  if(data.layout === 'page'){
-    data.cover = data.cover || config.page.default.cover
-    data.excerpt =  data.title
-    if(config.aside.toc.page && data.toc !== false && data.aside)data.toc = true
-    else data.toc = false
-  }
-  if(config.comment.enable && data.comment !== false)data.comment = true
-  else data.comment = false
-  return data;
-});
+hexo.extend.filter.register('after_post_render', function (data) {
+    const config = hexo.theme.config
+    data.title = data.title || '无标题';
+    if (data.layout === 'post') {
+        data.locate = data.locate || config.post.default.locate
+        data.cc = data.cc || config.post.default.copyright
+        data.cover = data.cover || config.post.default.cover[getRandomInt(0, config.post.default.cover.length)]
+        data.excerpt = data.description || data.excerpt
+        if (config.aside.toc.post && data.toc !== false) data.toc = true
+        else data.toc = false
+    }
+    if (data.layout === 'page') {
+        data.cover = data.cover || config.page.default.cover[getRandomInt(0, config.post.default.cover.length)]
+        data.excerpt = data.title
+        if (config.aside.toc.page && data.toc !== false && data.aside) data.toc = true
+        else data.toc = false
+    }
+    if (config.comment.enable && data.comment !== false) data.comment = true
+    else data.comment = false
+    return data;
+});
+
+function getRandomInt(min, max) {
+    min = Math.ceil(min);
+    max = Math.floor(max);
+    return Math.floor(Math.random() * (max - min)) + min;
+}

package/source/css/_global/index.styl

@@ -73,48 +73,4 @@
 
   +maxWidth768()
     --style-border 0px solid var(--sco-none) !important
-    --style-border-hover 0px solid var(--sco-main) !important
-
-[data-theme=light]
-  --sco-theme #bdbdf0
-  --sco-theme-op #4259ef23
-  --sco-theme-op-deep #eccec5
-  --sco-theme-op-light #4259ef0d
-  --sco-theme-none #4259ef01
-  --sco-blue #425aef
-  --sco-red #f04a63
-  --sco-pink #ff7c7c
-  --sco-green #57bd6a
-  --sco-yellow #c28b00
-  --sco-yellow-op #d99c001a
-  --sco-orange #e38100
-  --sco-purple #7a60d2
-  --sco-fontcolor #363636
-  --sco-background #f7f9fe
-  --sco-reverse #000
-  --sco-maskbg rgba(255, 255, 255, 0.6)
-  --sco-maskbgdeep rgba(255, 255, 255, 0.85)
-  --sco-hovertext var(--sco-main)
-  --sco-ahoverbg #f7f7fa
-  --sco-lighttext var(--sco-main)
-  --sco-secondtext rgba(60, 60, 67, 0.8)
-  --sco-scrollbar rgba(60, 60, 67, 0.4)
-  --sco-card-btn-bg #edf0f7
-  --sco-post-blockquote-bg #fafcff
-  --sco-post-tabs-bg #f2f5f8
-  --sco-secondbg #f7f7f9
-  --sco-shadow-nav 0 5px 12px -5px rgba(102, 68, 68, 0.05)
-  --sco-card-bg #fff
-  --sco-card-bg-op var(--sco-black-op)
-  --sco-card-bg-none rgba(255, 255, 255, 0)
-  --sco-shadow-lightblack 0 5px 12px -5px rgba(102, 68, 68, 0.00)
-  --sco-shadow-light2black 0 5px 12px -5px rgba(102, 68, 68, 0.00)
-  --sco-card-border #e3e8f7
-  --sco-shadow-border 0 8px 16px -4px #2c2d300c
-  --style-border 1px solid var(--sco-card-border)
-  --style-border-always 1px solid var(--sco-card-border)
-  --style-border-hover 1px solid var(--sco-main)
-  --style-border-hover-always 1px solid var(--sco-main)
-  --style-border-dashed 1px dashed var(--sco-theme-op)
-  --style-border-forever 2px solid var(--sco-main)
-  --sco-navbg var(--sco-theme-op)
+    --style-border-hover 0px solid var(--sco-main) !important

package/source/css/_global/var.styl

@@ -1 +1,10 @@
-error_img = hexo-config('errorpage.img')
+error_img = hexo-config('errorpage.img')
+
+$dark_theme = convert(hexo-config('theme_color.dark'))
+$dark_theme_op = convert(hexo-config('theme_color.dark_op'))
+$dark_theme_op_deep = convert(hexo-config('theme_color.dark_op_deep'))
+$dark_theme_none = hexo-config('theme_color.dark_none')
+$light_theme = convert(hexo-config('theme_color.light'))
+$light_theme_op = convert(hexo-config('theme_color.light_op'))
+$light_theme_op_deep = convert(hexo-config('theme_color.light_op_deep'))
+$light_theme_none = hexo-config('theme_color.light_none')

package/source/css/_layout/index.styl

@@ -16,6 +16,7 @@
     border-radius 12px
     cursor pointer
     border var(--style-border)
+    margin 1rem 0 1rem
 
     &:hover
       box-shadow var(--card-hover-box-shadow)

package/source/css/_mode/index.styl

@@ -1,8 +1,8 @@
 [data-theme=dark] 
-	--sco-theme #f2b94b
-	--sco-theme-op #f2b94b23
-	--sco-theme-op-deep #f2b94bdd
-	--sco-theme-none #f2b94b00
+	--sco-theme $dark_theme
+	--sco-theme-op $dark_theme_op
+	--sco-theme-op-deep $dark_theme_op_deep
+	--sco-theme-none $dark_theme_none
 	--sco-blue #0084ff
 	--sco-red #ff3842
 	--sco-pink #d44040
@@ -49,4 +49,48 @@
 	a
 		&.darkmode_switchbutton
 			background var(--sco-orange) !important
-			color var(--sco-white) !important
+			color var(--sco-white) !important
+
+[data-theme=light]
+	--sco-theme $light_theme
+	--sco-theme-op $light_theme_op
+	--sco-theme-op-deep $light_theme_op_deep
+	--sco-theme-op-light #4259ef0d
+	--sco-theme-none $light_theme_none
+	--sco-blue #425aef
+	--sco-red #f04a63
+	--sco-pink #ff7c7c
+	--sco-green #57bd6a
+	--sco-yellow #c28b00
+	--sco-yellow-op #d99c001a
+	--sco-orange #e38100
+	--sco-purple #7a60d2
+	--sco-fontcolor #363636
+	--sco-background #f7f9fe
+	--sco-reverse #000
+	--sco-maskbg rgba(255, 255, 255, 0.6)
+	--sco-maskbgdeep rgba(255, 255, 255, 0.85)
+	--sco-hovertext var(--sco-main)
+	--sco-ahoverbg #f7f7fa
+	--sco-lighttext var(--sco-main)
+	--sco-secondtext rgba(60, 60, 67, 0.8)
+	--sco-scrollbar rgba(60, 60, 67, 0.4)
+	--sco-card-btn-bg #edf0f7
+	--sco-post-blockquote-bg #fafcff
+	--sco-post-tabs-bg #f2f5f8
+	--sco-secondbg #f7f7f9
+	--sco-shadow-nav 0 5px 12px -5px rgba(102, 68, 68, 0.05)
+	--sco-card-bg #fff
+	--sco-card-bg-op var(--sco-black-op)
+	--sco-card-bg-none rgba(255, 255, 255, 0)
+	--sco-shadow-lightblack 0 5px 12px -5px rgba(102, 68, 68, 0.00)
+	--sco-shadow-light2black 0 5px 12px -5px rgba(102, 68, 68, 0.00)
+	--sco-card-border #e3e8f7
+	--sco-shadow-border 0 8px 16px -4px #2c2d300c
+	--style-border 1px solid var(--sco-card-border)
+	--style-border-always 1px solid var(--sco-card-border)
+	--style-border-hover 1px solid var(--sco-main)
+	--style-border-hover-always 1px solid var(--sco-main)
+	--style-border-dashed 1px dashed var(--sco-theme-op)
+	--style-border-forever 2px solid var(--sco-main)
+	--sco-navbg var(--sco-theme-op)

package/source/css/_widgets/comment/waline.styl

@@ -0,0 +1,75 @@
+#comment
+  .wl-sort li
+    color var(--sco-gray)
+
+    &.active
+      color var(--sco-main) !important
+
+  .wl-comment
+    .wl-panel
+      margin 0 !important
+
+    .wl-footer
+      .wl-info
+        button
+          background-color var(--sco-card-bg)
+          border var(--style-border-always)
+          color var(--sco-fontcolor)
+
+        button:hover
+          background-color var(--sco-main)
+          border-color var(--sco-main)
+          color var(--sco-card-bg)
+
+    #wl-edit
+      font-size 13px
+      line-height 1.5
+      margin .75rem .25rem
+
+    .wl-action
+      transition .3s
+
+      &:hover
+        color var(--sco-main)
+
+  .wl-meta-head
+    .wl-count
+      color var(--sco-gray)
+      font-size 14px
+      font-weight normal
+
+  .wl-cards
+    font-size 16px!important
+    .wl-comment-actions
+      button
+        margin-right 15px
+        font-size 18px
+
+        &:hover
+          color var(--sco-main)
+    .wl-head .wl-nick
+      font-size 20px !important
+      color var(--sco-lighttext)
+      font-weight bolder
+
+    .wl-meta>span
+      background var(--sco-gray)
+      border-radius 5px
+      color var(--sco-card-bg)
+      margin-right 5px
+
+    .wl-user
+      img
+        flex-shrink 0
+        height 2.5rem
+        width 2.5rem
+        overflow hidden
+        text-align center
+        border-radius 2.5rem
+        border 2px solid var(--sco-white)
+
+[data-waline] a
+  color var(--sco-main) !important
+
+.wl-content pre, .wl-content pre[class*=language-]
+  padding .5rem!important

package/source/css/index.styl

@@ -15,8 +15,9 @@ if hexo-config('css_prefix')
 
 // comment
 if hexo-config('comment.enable')
-  @import '_comment/index.styl'
-  @import '_comment/twikoo.styl' when hexo-config('comment.type') == 'twikoo'
+  @import '_widgets/comment/index.styl'
+  @import '_widgets/comment/twikoo.styl' when hexo-config('comment.type') == 'twikoo'
+  @import '_widgets/comment/waline.styl' when hexo-config('comment.type') == 'waline'
 
 // commentBarrage
 if hexo-config('thirdparty.comment.enable')

package/source/js/extend/{console/comment.js → comment/twikoo.js}

@@ -93,4 +93,3 @@ const newestCommentInit = () => {
         getComment()
     }
 }
-  

package/source/js/main.js

@@ -846,7 +846,7 @@ let sco = {
 
         pageText.addEventListener("keydown", (event) => {
             if (event.keyCode === 13) {
-                heo.toPage();
+                sco.toPage();
                 pjax.loadUrl(pageButton.href);
             }
         });
@@ -881,7 +881,29 @@ let sco = {
                 cookiesWindow.style.display = 'none';
             }
         }
-    }
+    },
+    /**
+     * 首页分页跳转
+     */
+    toPage: function () {
+        const pageNumbers = document.querySelectorAll(".page-number");
+        const maxPageNumber = parseInt(pageNumbers[pageNumbers.length - 1].innerHTML);
+        const inputElement = document.getElementById("toPageText");
+        const inputPageNumber = parseInt(inputElement.value);
+
+        if (!isNaN(inputPageNumber) && inputPageNumber > 0 && inputPageNumber <= maxPageNumber) {
+            const currentPageUrl = window.location.href.replace(/\/page\/\d+\/$/, "/");
+            let targetPageUrl;
+
+            if (inputPageNumber === 1) {
+                targetPageUrl = currentPageUrl;
+            } else {
+                targetPageUrl = currentPageUrl + (currentPageUrl.endsWith("/") ? "" : "/") + "page/" + inputPageNumber + "/";
+            }
+
+            document.getElementById("toPageButton").href = targetPageUrl;
+        }
+    },
 }
 
 /*
@@ -1005,7 +1027,6 @@ window.refreshFn = () => {
     GLOBAL_CONFIG.lazyload.enable && sco.lazyloadImg()
     GLOBAL_CONFIG.lightbox && sco.lightbox('')
     GLOBAL_CONFIG.randomlinks && randomLinksList()
-    GLOBAL_CONFIG.comment.enable && newestCommentInit()
     if (PAGE_CONFIG.comment) {
         initComment()
     }
@@ -1022,7 +1043,10 @@ window.refreshFn = () => {
     sco.initConsoleState()
     if (document.getElementById('history-baidu')) sco.card_history() // 那年今日
     if (document.getElementById('welcome-info')) sco.card_welcome() // 个性定位
-    if (GLOBAL_CONFIG.comment.type === "twikoo" && PAGE_CONFIG.comment) initializeCommentBarrage() // 热评
+    if (GLOBAL_CONFIG.comment.type === "twikoo" && PAGE_CONFIG.comment) {
+        initializeCommentBarrage() // 热评
+        GLOBAL_CONFIG.comment.enable && newestCommentInit()
+    }
 }
 
 sco.initTheme()