hexo-theme-shokax 0.2.6 → 0.2.7

package/LICENSE-shoka

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 霜月琉璃
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/_config.yml

@@ -173,7 +173,7 @@ waline:
     - mail
   wordLimit: 0 # 字数限制,0为不限制
   pageSize: 10 # 每页评论条数
-  pageview: true # 是否开启浏览量统计
+  pageview: false # 是否开启浏览量统计,可独立开启
 
 # https://github.com/gitalk/gitalk/blob/master/readme-cn.md
 gitalk:

package/layout/_mixin/comment.pug

@@ -13,7 +13,7 @@ mixin CommentRender()
                     })
                 }, 1000)
         else if wl
-            div(class="warp" id="wcomments")
+            div(class="wrap" id="wcomments")
             - var locale = JSON.stringify(theme.waline.locale)
             - var emoji = JSON.stringify(theme.waline.emoji)
             - var meta = JSON.stringify(theme.waline.meta)
@@ -38,7 +38,7 @@ mixin CommentRender()
                     });
                 }, 1000)
         else if gt
-            div(class="warp" id="gtcomments")
+            div(class="wrap" id="gtcomments")
             script(type="text/javascript" data-pjax).
                 const gproxy = theme.gitalk.proxy || undefined
                 const gitalk = new Gitalk({
@@ -53,7 +53,7 @@ mixin CommentRender()
                 });
                 gitalk.render("gtcomments")
         else if gs
-            div(class="warp giscus" id="gscomments")
+            div(class="wrap giscus" id="gscomments")
             script( src="https://giscus.app/client.js"
                     data-repo="#{theme.giscus.repo}"
                     data-repo-id="#{theme.giscus.repoId}"

package/layout/_mixin/widgets.pug

@@ -10,6 +10,7 @@ mixin field(item)
 
 mixin WRender(item)
     - var tk = theme?.twikoo?.enable
+    - var waline = theme.waline.enable
     if theme.widgets.random_posts
         div(class="rpost pjax")
             h2
@@ -22,10 +23,10 @@ mixin WRender(item)
         div(class="rpost pjax")
             h2 最新评论
             ul(class="leancloud-recent-comment" id="new-comment")
-                if tk
+                if tk || waline
                     li(v-for="com in coms" class="item")
                         a(v-bind:href="com.href" data-pjax-state="data-pjax-state")
-                            span(class="breadcrumb") {{com.nick}}@{{com.time}}
+                            span(class="breadcrumb") {{com.nick}} @ {{com.time}}
                             span {{com.text}}
                                 br
 

package/layout/_partials/post/footer.pug

@@ -1,9 +1,10 @@
 div(class="meta")
     if date(post.date) != date(post.updated) || time(post.date) != time(post.updated)
-        span(class="icon")
-            i(class="ic i-eye")
-        span 此文章已被阅读次数:
-        span(id="twikoo_visitors" class="waline-pageview-count" data-path=post.path) 正在加载...
+        if theme.twikoo.enable || theme.waline.pageview
+            span(class="icon")
+                i(class="ic i-eye")
+            span 此文章已被阅读次数:
+            span(id="twikoo_visitors" class="waline-pageview-count" data-path=post.path) 正在加载...
         span(class="item")
             span(class="icon")
                 i(class="ic i-calendar-check")

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hexo-theme-shokax",
-    "version": "0.2.6",
+    "version": "0.2.7",
     "description": "a hexo theme based on shoka",
     "main": "index.js",
     "repository": "https://github.com/theme-shoka-x/hexo-theme-shokaX",
@@ -8,12 +8,10 @@
     "license": "GPL-3.0-or-later",
     "scripts": {
         "test": "tsc",
-        "build": "pnpm install && tsc",
-        "docs:dev": "vuepress dev docs",
-        "docs:build": "vuepress build docs"
+        "build": "pnpm install && tsc"
     },
     "devDependencies": {
-        "@algolia/client-search": "^4",
+
         "@types/fancybox": "^3.5.3",
         "@types/hexo": "^3.8.8",
         "@types/jquery": "^3.5.16",
@@ -22,9 +20,7 @@
         "@types/node": "^20.1.0",
         "@typescript-eslint/eslint-plugin": "^5.59.0",
         "@typescript-eslint/parser": "^5.59.0",
-        "@vuepress/client": "2.0.0-beta.61",
-        "@vuepress/plugin-docsearch": "2.0.0-beta.61",
-        "algoliasearch": "^4.17.0",
+
         "eslint": "^8.39.0",
         "eslint-config-standard": "^17.0.0",
         "eslint-plugin-import": "^2.27.5",
@@ -37,12 +33,9 @@
         "theme-shokax-anime": "^0.0.4",
         "theme-shokax-pjax": "^0.0.2",
         "typescript": "^5.0.4",
-        "vue": "^3.2.47",
-        "vuepress": "2.0.0-beta.61",
-        "vuepress-plugin-sitemap2": "2.0.0-beta.208"
+        "vue": "^3.3.4"
     },
     "dependencies": {
-        "js-yaml": "^4.1.0",
-        "sass": "^1.62.0"
+        "js-yaml": "^4.1.0"
     }
 }

package/scripts/helpers/asset.js

@@ -41,12 +41,33 @@ hexo.extend.helper.register('_new_comments', function (mode) {
     else if (mode === 'waline') {
         return `
     <script type="module" data-pjax>
+        let items = []
         import { RecentComments } from 'https://unpkg.com/@waline/client@v2/dist/waline.mjs'
         RecentComments({
-          el: '#new-comment',
           serverURL: '${hexo.theme.config.waline.serverURL.replace(/\/+$/, '')}',
           count: 10,
-        });
+        }).then(({ comments }) => {
+          comments.forEach(function (item) {
+              let cText = (item.orig.length > 50) ? item.orig.substring(0,50)+'...' : item.orig
+              item.url = item.url !== '/' ?  '/' + item.url : item.url;
+              const siteLink = item.url + "#" + item.objectId
+              items.push({
+                  href: siteLink,
+                  nick: item.nick,
+                  time: item.insertedAt.split('T').shift(),
+                  text: cText
+              })
+          })
+          Vue.createApp({
+            data() {
+                return {
+                    coms: items
+                }
+            }
+          }).mount('#new-comment')
+        }).catch(function (err) {
+          console.error(err)
+        })
     </script>
     `;
     }