hexo-theme-volantis 5.1.0 → 5.3.0

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # Changelog
 
+## [5.3.0](https://github.com/volantis-x/hexo-theme-volantis/compare/v5.2.0...v5.3.0) (2022-05-22)
+
+
+### Features
+
+* **meta:** add artalk comment count ([75c5eeb](https://github.com/volantis-x/hexo-theme-volantis/commit/75c5eeb688d52289f466d8e26b84352d7dae74b9))
+
+
+### Bug Fixes
+
+* **artalk:** fancybox/darkmode ([c03684d](https://github.com/volantis-x/hexo-theme-volantis/commit/c03684dd6d7feced55969bddc4c357a65ec0333c))
+* **meta_library:** counter ([7d42316](https://github.com/volantis-x/hexo-theme-volantis/commit/7d42316a80909125938774b9685b4962486ecc65))
+
+## [5.2.0](https://github.com/volantis-x/hexo-theme-volantis/compare/v5.1.1...v5.2.0) (2022-05-21)
+
+
+### Features
+
+* **artalk:** Add support for using custom imgUploader ([b69c502](https://github.com/volantis-x/hexo-theme-volantis/commit/b69c502565d8b4d6d1ad1a58fdc3fc00ac200cef))
+
+### [5.1.1](https://github.com/volantis-x/hexo-theme-volantis/compare/v5.1.0...v5.1.1) (2022-05-19)
+
+
+### Bug Fixes
+
+* **#761:** overflow ([74e0d04](https://github.com/volantis-x/hexo-theme-volantis/commit/74e0d04a47d17c513f0d29ecaceb49b51d63ee18))
+
 ## [5.1.0](https://github.com/volantis-x/hexo-theme-volantis/compare/5.0.0...v5.1.0) (2022-05-19)
 
 

package/README.md

@@ -3,6 +3,7 @@
 </p>
 
 [![](https://img.shields.io/npm/v/hexo-theme-volantis.svg?style=flat-square)](https://www.npmjs.com/package/hexo-theme-volantis)
+[![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-%23FE5196?logo=conventionalcommits&logoColor=white)](https://www.conventionalcommits.org/zh-hans/v1.0.0/)
 
 ## Getting Started
 

package/_config.yml

@@ -1,7 +1,6 @@
 ############################### Volantis ###############################
 info:
   theme_name: Volantis # This is theme's name.
-  theme_version: '5.0.0-alpha.112' # This is theme's version.
   theme_docs: https://volantis.js.org/ # This is theme's URL.
   theme_repo: https://github.com/volantis-x/hexo-theme-volantis
 # Debug 调试模式
@@ -177,6 +176,9 @@ article:
     # 文章顶部信息
     # 从 meta_library 中取
     top_meta: [author, category, date, counter] #启用评论数量需在此添加
+    # 文章底部信息
+    # 从 meta_library 中取
+    bottom_meta: [updated, tags, share]
     # ----------------
     # 文章页脚组件
     footer_widget:
@@ -215,9 +217,6 @@ article:
         images:
           - volantis-static/media/org.volantis/blog/qrcode/github@volantis.png # https://cdn.jsdelivr.net/gh/volantis-x/cdn-org/blog/qrcode/github@volantis.png
           - volantis-static/media/org.volantis/blog/qrcode/github@volantis.png # https://cdn.jsdelivr.net/gh/volantis-x/cdn-org/blog/qrcode/github@volantis.png
-    # 文章底部信息
-    # 从 meta_library 中取
-    bottom_meta: [updated, tags, share]
     # meta library
     meta_library:
       # 默认文章作者（可在 _data/author.yaml 中增加其他作者，并在 front-matter 中设置）
@@ -246,7 +245,11 @@ article:
       # waline 文章评论数量
       walinecount:
         icon: fa-solid fa-comment-dots
-        desc: '' # 条评论
+        desc: '条评论' # 条评论
+      # artalk 文章评论数量
+      artalkcount:
+        icon: fa-solid fa-comment-dots
+        desc: '条评论' # 条评论
       # 文章字数和阅读时长
       wordcount:
         icon_wordcount: fa-solid fa-keyboard
@@ -285,9 +288,19 @@ comments:
     server: https://yours-artalk-domain    # 修改为自建的后端服务地址
     path:  # 全局评论地址
     placeholder: # 评论占位
+    # artalk 有三类图片：1.上传至服务端 2.上传至服务端后利用upgit上传至图床 3.前端上传至图床（本配置为此类）
+    # 配置此项时将覆盖服务端上传能力
+    imgUploader:
+      # 以兰空图床为例，下列填写内容为：
+      # url: 'https://xxxxxx/api/v1/upload'
+      # token: 'Bearer xxxxxxxxxxxxxx'
+      # resp: 'data.links.url'
+      api: # 图床地址
+      token: # 图床验证
+      resp: # 图片地址返回值的字段
     # 更多置项可在 Artalk 后端进行配置，详见 https://artalk.js.org/guide/backend/fe-control.html
     # 也可以在此处继续参考上方例子进行配置，不建议重写配置的字段除上方所述外还有：
-    # [el, useBackendConf, pageKey, pageTitle, site, darkMode, pvEl]
+    # [el, useBackendConf, pageKey, pageTitle, site, darkMode, pvEl, imgUploader]
 
   # giscus
   # https://giscus.app
@@ -595,8 +608,8 @@ site_footer:
   source: https://github.com/volantis-x/volantis-docs/
   # analytics using leancloud
   analytics: >
-    <span id="lc-sv">本站总访问量为 <span id='number'><i class="fa-solid fa-circle-notch fa-spin fa-fw" aria-hidden="true"></i></span> 次</span>
-    <span id="lc-uv">访客数为 <span id='number'><i class="fa-solid fa-circle-notch fa-spin fa-fw" aria-hidden="true"></i></span> 人</span>
+    <span id="lc-sv">本站总访问量为 <span id='number'><i class="fa-solid fa-loader fa-spin fa-fw" aria-hidden="true"></i></span> 次</span>
+    <span id="lc-uv">访客数为 <span id='number'><i class="fa-solid fa-loader fa-spin fa-fw" aria-hidden="true"></i></span> 人</span>
   # site copyright
   copyright: '[Copyright © since 2017 XXX](/)'
   # You can add your own property here. (Support markdown, for example: br: '<br>')

package/layout/_meta/artalkcount.ejs

@@ -0,0 +1,22 @@
+<% if (theme.comments.service == 'artalk'){ %> 
+  <div class="new-meta-item comments-count"> 
+    <% 
+      var path = post.path || page.path; 
+      if (path.length > 9 && (path.substring(path.length - 10) == 'index.html')) { 
+        path = path.substring(0, path.length - 10); 
+      } 
+      if(!!theme.comments.artalk.path) path = theme.comments.artalk.path 
+    %> 
+    <a href="<%- url_for(path) %>#comments"> 
+      <i class="<%- theme.article.body.meta_library.artalkcount.icon %> fa-fw"></i> 
+      <p> 
+        <span data-page-key="<%- url_for(path) %>" id="ArtalkCount"> 
+          <i class="fa-solid fa-loader fa-spin fa-fw" aria-hidden="true"></i>
+        </span> 
+        <% if(theme.article.body.meta_library.artalkcount.desc) { %> 
+          <span class="leancloud-comments-count">&nbsp;<%- theme.article.body.meta_library.artalkcount.desc %></span> 
+        <% } %> 
+      </p>       
+    </a> 
+  </div> 
+<% } %> 

package/layout/_meta/counter.ejs

@@ -1,78 +1,40 @@
-<% if (theme.analytics && theme.analytics.leancloud && theme.analytics.leancloud.app_id) { %>
-  <div class="new-meta-item browse leancloud">
-    <a class='notlink'>
-      <%
-        var path = post.path || page.path;
-        if (path.length > 9 && (path.substring(path.length - 10) == 'index.html')) {
-          path = path.substring(0, path.length - 10);
-        }
-      %>
-      <div id="lc-pv" data-title="<%- post.title || page.title %>" data-path="<%- url_for(path) %>">
-        <i class="<%- theme.article.body.meta_library.counter.icon %> fa-fw" aria-hidden="true"></i>
-        <span id='number'><i class="fa-solid fa-circle-notch fa-spin fa-fw" aria-hidden="true"></i></span>
-        <%- theme.article.body.meta_library.counter.unit %>
-      </div>
-    </a>
-  </div>
-<% } else if (theme.analytics.busuanzi) { %>
-  <div class="new-meta-item browse busuanzi">
-    <a class='notlink'>
+<%
+  let path = post.path || page.path;
+  if (path.length > 9 && (path.substring(path.length - 10) == 'index.html')) {
+    path = path.substring(0, path.length - 10);
+  }
+%>
+
+<% if (!!page.comments) { %>
+<div class="new-meta-item browse">
+  <a class='notlink'>
+    <p>
       <i class="<%- theme.article.body.meta_library.counter.icon %> fa-fw" aria-hidden="true"></i>
-      <p>
-        <span id="busuanzi_value_page_pv">
-          <i class="fa-solid fa-circle-notch fa-spin fa-fw" aria-hidden="true"></i>
-        </span>
-        <%- theme.article.body.meta_library.counter.unit %>
-      </p>
-    </a>
-  </div>
-<% } else if (theme.comments.service=='waline' && theme.comments.waline.pageview) { %>
-  <div class="new-meta-item browse">
-    <a class='notlink'>
-      <i class="<%- theme.article.body.meta_library.counter.icon %> fa-fw" aria-hidden="true"></i>
-      <%
-        var path = post.path || page.path;
-        if (path.length > 9 && (path.substring(path.length - 10) == 'index.html')) {
-          path = path.substring(0, path.length - 10);
-        }
-      %>
-      <span data-path="<%- url_for(path) %>" class="waline-pageview-count"></span>
-    </a>
-  </div>
-<% } else if (theme.comments.service=='twikoo' && !!page.comments) { %>
-  <div class="new-meta-item browse">
-    <a class='notlink'>
-      <i class="<%- theme.article.body.meta_library.counter.icon %> fa-fw" aria-hidden="true"></i>
-      <p>
-        <span id="twikoo_visitors">
-          <i class="fa-solid fa-circle-notch fa-spin fa-fw" aria-hidden="true"></i>
-        </span>
-      </p>
+      <% if (theme.analytics && theme.analytics.leancloud && theme.analytics.leancloud.app_id) { %>
+      <span id="lc-pv" data-title="<%- post.title || page.title %>" data-path="<%- url_for(path) %>">
+        <span id='number'><i class="fa-solid fa-loader fa-spin fa-fw" aria-hidden="true"></i></span>
       </span>
-    </a>
-  </div>
-<% } else if (theme.comments.service=='discuss' && !!page.comments) { %>
-  <div class="new-meta-item browse">
-    <a class='notlink'>
-      <i class="<%- theme.article.body.meta_library.counter.icon %> fa-fw" aria-hidden="true"></i>
-      <p>
-        <span id="Discuss-Visitors">
-          <i class="fa-solid fa-circle-notch fa-spin fa-fw" aria-hidden="true"></i>
-        </span>
-      </p>
+      <% } else if (theme.analytics.busuanzi) { %>
+      <span id="busuanzi_value_page_pv"><i class="fa-solid fa-loader fa-spin fa-fw" aria-hidden="true"></i></span>
+      <% } else if (theme.comments.service=='waline' && theme.comments.waline.pageview) { %>
+      <span data-path="<%- url_for(path) %>" class="waline-pageview-count">
+        <i class="fa-solid fa-loader fa-spin fa-fw" aria-hidden="true"></i>
+      </span>
+      <% } else if (theme.comments.service=='twikoo') { %>
+      <span id="twikoo_visitors">
+        <i class="fa-solid fa-loader fa-spin fa-fw" aria-hidden="true"></i>
+      </span>
+      <% } else if (theme.comments.service=='discuss') { %>
+      <span id="Discuss-Visitors">
+        <i class="fa-solid fa-loader fa-spin fa-fw" aria-hidden="true"></i>
+      </span>
+      <% } else if (theme.comments.service=='artalk') { %>
+      <span id="artalk_visitors" data-page-key="<%- url_for(path) %>">
+        <i class="fa-light fa-loader fa-spin fa-fw" aria-hidden="true"></i>
       </span>
-    </a>
-  </div>
-<% } else if (theme.comments.service=='artalk' && !!page.comments) { %>
-    <div class="new-meta-item browse">
-      <a class='notlink'>
-        <i class="<%- theme.article.body.meta_library.counter.icon %> fa-fw" aria-hidden="true"></i>
-        <p>
-        <span id="artalk_visitors">
-          <i class="fa-solid fa-circle-notch fa-spin fa-fw" aria-hidden="true"></i>
-        </span>
-        <%- theme.article.body.meta_library.counter.unit %>
-        </p>
-      </a>
-    </div>
+      <% } %>
+      <span><%- theme.article.body.meta_library.counter.unit %></span>
+    </p>
+  </a>
+</div>
 <% } %>

package/layout/_meta/walinecount.ejs

@@ -9,8 +9,14 @@
   %>
   <a href="<%- url_for(path) %>#comments">
     <i class="<%- theme.article.body.meta_library.walinecount.icon %> fa-fw"></i>
-    <span data-path="<%- url_for(path) %>" class="waline-comment-count"></span>
-    <span class="leancloud-comments-count">&nbsp;<%- theme.article.body.meta_library.walinecount.desc %></span>
+    <p>
+      <span data-path="<%- url_for(path) %>" class="waline-comment-count">
+        <i class="fa-solid fa-loader fa-spin fa-fw" aria-hidden="true"></i>
+      </span> 
+      <% if(theme.article.body.meta_library.walinecount.desc) { %> 
+        <span class="leancloud-comments-count">&nbsp;<%- theme.article.body.meta_library.walinecount.desc %></span> 
+      <% } %> 
+    </p>
   </a>
 </div>
 <% } %>

package/layout/_partial/footer.ejs

@@ -41,7 +41,7 @@
         <%- __('footer.use') %>
         <a href="https://github.com/volantis-x/hexo-theme-volantis/tree/<%- theme_version %>" target="_blank" class="codename">Volantis</a>
         <%- __('footer.theme') %><% if (theme.analytics.busuanzi) { %><%- __('symbol.comma') %><%- __('footer.total_views') %>
-          <span id="busuanzi_value_site_pv"><i class="fa-solid fa-circle-notch fa-spin fa-fw" aria-hidden="true"></i></span>
+          <span id="busuanzi_value_site_pv"><i class="fa-solid fa-loader fa-spin fa-fw" aria-hidden="true"></i></span>
           <%- __('footer.times') %>
         <% } %>
       <% } else if (item == 'source') { %>

package/layout/_plugins/comments/artalk/script.ejs

@@ -13,8 +13,11 @@
     if (path.length == 0) {
       path = '<%= theme.comments.artalk.path %>' || decodeURI(window.location.pathname);
     }
+    if(!'<%= config.permalink %>'.includes('/index.html')) {
+      path = path.replaceAll('/index.html', '/')
+    }
 
-    volantis.artalk = new Artalk(Object.assign(<%- JSON.stringify(theme.comments.artalk) %>, {
+    new Artalk(Object.assign(<%- JSON.stringify(theme.comments.artalk) %>, {
       el: '#artalk_container',
       pageKey: path,
       pageTitle: document.title,
@@ -22,11 +25,29 @@
       useBackendConf: true,
       site: '<%= config.title %>',
       darkMode: volantis.dark.mode === "dark",
-      pvEl: '#artalk_visitors'
+      pvEl: '#artalk_visitors',
+
+      <% if(!!theme.comments.artalk.imgUploader?.api){ %>
+      imgUploader: function(file) {
+        let headers = new Headers();
+        headers.set('Accept', 'application/json');
+        <% if(!!theme.comments.artalk.imgUploader?.token) { %>
+          headers.set('Authorization', '<%= theme.comments.artalk.imgUploader?.token %>')
+        <% } %>
+        let formData = new FormData();
+        formData.append('file', file);
+        return fetch('<%= theme.comments.artalk.imgUploader?.api %>',{
+          method: 'POST',
+          body: formData,
+          headers: headers
+          }).then((resp) => resp.json())
+            .then((resp) => resp.<%= theme.comments.artalk.imgUploader?.resp %>)
+      },
+      <% } %>
     }));
 
-    volantis.artalk.then(ctx => {
-      ctx.on('comments-loaded', () => {
+    Artalk.Use(ctx => {
+      ctx.on('list-loaded', () => {
         if (typeof VolantisFancyBox === "undefined"){
           const checkFancyBox = setInterval(() => {
             if(typeof VolantisFancyBox === "undefined") return;
@@ -51,7 +72,7 @@
 
   function dark_artalk() {
     if(!document.querySelectorAll("#artalk_container")[0]) return;
-    volantis.artalk.then(ctx => {
+    Artalk.Use(ctx => {
       ctx.setDarkMode(volantis.dark.mode === "dark")
     })
   }

package/layout/_widget/webinfo.ejs

@@ -31,7 +31,7 @@
           <% if (!!theme.analytics.busuanz) {%>
           <div><span id="busuanzi_value_site_uv"><i class="fa-solid fa-fan fa-spin fa-fw" aria-hidden="true"></i></span> <%= item.type.visitcounter.siteuv.unit %></div>
           <% } else { %>
-          <div><span id="lc-uv"><span id='number'><i class="fa-solid fa-circle-notch fa-spin fa-fw" aria-hidden="true"></i></span></span> <%= item.type.visitcounter.siteuv.unit %></div>
+          <div><span id="lc-uv"><span id='number'><i class="fa-solid fa-loader fa-spin fa-fw" aria-hidden="true"></i></span></span> <%= item.type.visitcounter.siteuv.unit %></div>
           <% } %>
         </div>
       <% } %>
@@ -42,7 +42,7 @@
           <% if (!!theme.analytics.busuanz) {%>
           <div><span id="busuanzi_value_site_pv"><i class="fa-solid fa-fan fa-spin fa-fw" aria-hidden="true"></i></span> <%= item.type.visitcounter.sitepv.unit %></div>
           <% } else { %>
-          <div><span id="lc-sv"><span id='number'><i class="fa-solid fa-circle-notch fa-spin fa-fw" aria-hidden="true"></i></span></span> <%= item.type.visitcounter.sitepv.unit %></div>
+          <div><span id="lc-sv"><span id='number'><i class="fa-solid fa-loader fa-spin fa-fw" aria-hidden="true"></i></span></span> <%= item.type.visitcounter.sitepv.unit %></div>
           <% } %>
         </div>
       <% } %>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-volantis",
-  "version": "5.1.0",
+  "version": "5.3.0",
   "description": "Elegant and powerful theme for Hexo.",
   "main": "package.json",
   "scripts": {

package/scripts/events/lib/config.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const { version } = require('../../../package.json');
+
 function isObject(item) {
   return item && typeof item === 'object' && !Array.isArray(item);
 }
@@ -85,4 +87,5 @@ module.exports = hexo => {
     }
   }
   volantis_static_cdn(hexo.theme.config,hexo);
+  hexo.theme.config.info.theme_version = version;
 };

package/source/css/_first/base_first.styl

@@ -109,6 +109,8 @@ if hexo-config('comments.service')=='discuss' || hexo-config('comments.service')
   .blur#comments
     @supports (backdrop-filter: blur(20px))
       backdrop-filter: unset
+  #layoutHelper-comments
+    margin-bottom: 100px
 
 .shadow
   box-shadow: $boxshadow-card

package/source/css/_style/_base/base.styl

@@ -66,7 +66,7 @@ pre
 article,aside,details,figcaption,figure,footer,hgroup,main,menu,nav,section,summary
   display: block
 
-article:not(#comments)
+article
   overflow: hidden
 
 abbr[title]

package/source/css/_style/_layout/main.styl

@@ -185,7 +185,7 @@
           &:last-child
             margin-right: 0
           img,i
-            display: inline
+            display: inline-block
           i
             margin-right: 4px
             border-radius: 0