hexo-theme-shokax 0.4.0 → 0.4.2

package/layout/_mixin/widgets.pug

@@ -23,11 +23,6 @@ mixin WRender(item)
         div(class="rpost pjax")
             h2
                 != __('index.recent_comments')
-            ul(class="leancloud-recent-comment" id="new-comment")
-                if tk || waline
-                    li(v-for="com in coms" class="item")
-                        a(v-bind:href="root + com.href" data-pjax-state="data-pjax-state")
-                            span(class="breadcrumb") {{com.nick}} @ {{com.time}}
-                            span {{com.text}}
-                                br
+            if tk || waline
+                ul(class="leancloud-recent-comment" id="new-comment")
 

package/layout/_partials/footer.pug

@@ -15,7 +15,8 @@ div(class="status")
                 i(class="ic i-chart-area")
             span(title=__('symbols_count_time.count_total'))
                 != `${ symbolsCountTotal(site) } ${__('symbols_count_time.word')}`
-            span(class="post-meta-divider") |
+            span(class="post-meta-divider")
+                != " | "
             span(class="post-meta-item-icon")
                 i(class="ic i-coffee")
             span(title=__('symbols_count_time.time_total'))
@@ -27,14 +28,14 @@ div(class="status")
             != __('footer.powered', _url('https://hexo.io', 'Hexo') + ' & Theme.' + _url('https://github.com/theme-shoka-x/hexo-theme-shokaX/', 'ShokaX'))
     if theme.footer.icp.enable
         br
-        span(style="display:inline;height:20px;line-height:20px;margin: 0px 0px 0px 5px; color:#939393;")
+        span(style="display:inline;height:20px;line-height:20px;margin: 0px 0px 0px 5px; color:var(--grey-5);")
             a(href="https://beian.miit.gov.cn")
                 != theme.footer.icp.icpnumber
             - var beianN = theme.footer.icp?.beian, RC=theme.footer.icp?.recordcode
             if beianN && RC
                 br
                 a(target="_blank" href=`https://beian.mps.gov.cn/#/query/webSearch?code=${RC}`)
-                    img(loading="lazy" decoding="async" data-src=theme.statics + theme.assets + '/' + theme.footer.icp.icon style="max-width: 2em;display:inline;" width="20" height="20")
+                    img(loading="lazy" decoding="async" data-src=theme.statics + theme.assets + '/' + theme.footer.icp.icon style="max-width: 2em;display:inline;" width="20" height="20" alt="备案")
                     != beianN
     != shokax_inject('status')
 

package/layout/_partials/head/head_com.pug

@@ -11,6 +11,13 @@ else if page.tags && page.tags.length
 else if config.keywords
     meta(name="keywords" content=config.keywords)
 
+if page.description
+    meta(name="description" content=page.description)
+else if page.excerpt
+    meta(name="description" content=page.excerpt)
+else if config.description
+    meta(name="description" content=config.description)
+
 != canonical()
 
 if theme.open_graph

package/layout/_partials/layout.pug

@@ -6,10 +6,19 @@ include ../_mixin/widgets.pug
 if (theme.quicklink.ignores)
     - ignores.push(theme.quicklink.ignores)
 
+- var covers = _cover_index(page, 6)
+- var enableFixedCover = theme.homeConfig?.fixedCover
+
 doctype html
 html(lang=page.language?page.language:config.language, style=theme.grayMode ? 'filter: grayscale(1);':'' )
     head
         != partial('_partials/head/head.pug', {}, {cache: true})
+        if enableFixedCover
+            link(rel="preload" href=theme.homeConfig.fixedCover as="image" fetchpriority="high")
+        else
+            each image in covers
+                link(rel="preload" href=image as="image" fetchpriority="high")
+
         != partial('_partials/head/head_com.pug')
         != shokax_inject('head')
         title
@@ -35,18 +44,17 @@ html(lang=page.language?page.language:config.language, style=theme.grayMode ? 'f
 
                     != partial('_partials/header.pug', {}, {cache: true})
                 div(id="imgs" class="pjax")
-                    if theme.homeConfig.gradient || theme.homeConfig.fixedCover
+                    if theme.homeConfig.gradient || enableFixedCover
                         //- cover不可用时用Bing随机图片代替
-                        - var coverImage = theme.homeConfig.fixedCover || "https://7ed.net/bing/api"
-                        img(src=coverImage loading="eager" decoding="async" fetchpriority="high")
+                        - var coverImage = theme.homeConfig?.fixedCover || "https://7ed.net/bing/api"
+                        img(src=coverImage loading="eager" decoding="async" fetchpriority="high" alt=title)
                     else
-                        - var covers = _cover_index(page, 6)
                         if covers.length === 6
                             ul
                                 each image in covers
                                     li(class="item" style=`background-image: url("${image}");`)
                         else
-                            img(src=covers loading="eager" decoding="async" fetchpriority="high")
+                            img(src=covers loading="eager" decoding="async" fetchpriority="high" alt=title)
             div(id="waves")
                 svg(class="waves" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 24 150 28" preserveAspectRatio="none" shape-rendering="auto")
                     defs

package/layout/_partials/sidebar/menu.pug

@@ -8,7 +8,7 @@ mixin item(name, path, parent, sublist)
     if parent
         li(class="item dropdown")
             if itemURL === '/'
-                a(href="javascript:void(0);")
+                a(href="#" onclick="return false;")
                     != menuIcon + menuText
             else
                 != _url(itemURL, menuIcon + menuText, {rel: 'section'})

package/layout/_partials/sidebar/overview.pug

@@ -1,5 +1,5 @@
 div(class="author" itemprop="author" itemscope itemtype="http://schema.org/Person")
-    img(loading="eager" decoding="async" class="image" itemprop="image" alt=author
+    img(loading="lazy" decoding="async" class="image" itemprop="image" alt=author
         src=url_for(theme.statics + theme.assets + '/'+ theme.sidebar.avatar))
     p(class="name" itemprop="name")
         != author

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hexo-theme-shokax",
-    "version": "0.4.0",
+    "version": "0.4.2",
     "description": "a hexo theme based on shoka",
     "main": "index.js",
     "repository": "https://github.com/theme-shoka-x/hexo-theme-shokaX",
@@ -28,7 +28,7 @@
         "typescript": "^5.3.3"
     },
     "dependencies": {
-        "@waline/client": "3.0.0-alpha.11",
+        "@waline/client": "^3.0.1",
         "vue": "^3.4.15",
         "@algolia/client-search": "^4.22.1",
         "algoliasearch": "4.22.1",

package/scripts/helpers/asset.js

@@ -7,10 +7,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const package_json_1 = __importDefault(require("../../package.json"));
 const hexo_util_1 = require("hexo-util");
 const utils_1 = require("../utils");
-// TODO 弃用函数
-hexo.extend.helper.register('_new_comments', function (mode) {
-    return '';
-});
 hexo.extend.helper.register('_safedump', (source) => {
     return JSON.stringify(source);
 });
@@ -26,7 +22,7 @@ hexo.extend.helper.register('_vendor_font', () => {
         return '';
     const fontDisplay = '&display=swap';
     const fontSubset = '&subset=latin,latin-ext';
-    const fontStyles = ':300,300italic,400,400italic,700,700italic';
+    const fontStyles = ':400,400italic,700,700italic';
     const fontHost = 'https://fonts.googleapis.com';
     // Get a font list from config
     let fontFamilies = ['global', 'logo', 'title', 'headings', 'posts', 'codes'].map(item => {
@@ -44,7 +40,9 @@ hexo.extend.helper.register('_vendor_font', () => {
     return fontFamilies
         ? (0, hexo_util_1.htmlTag)('link', {
             rel: 'stylesheet',
-            href: `${fontHost}/css?family=${fontFamilies.concat(fontDisplay, fontSubset)}`
+            href: `${fontHost}/css?family=${fontFamilies.concat(fontDisplay, fontSubset)}`,
+            media: 'none',
+            onload: "this.media='all'"
         })
         : '';
 });
@@ -65,9 +63,6 @@ hexo.extend.helper.register('vendor_js', function () {
     for (const jsSync in vendors.js) {
         res += (0, hexo_util_1.htmlTag)('script', { src: (0, utils_1.getVendorLink)(hexo, vendors.js[jsSync]), async: true }, '');
     }
-    // for (const jsAsync in vendors.async_js) {
-    //   res += htmlTag('script', { src: getVendorLink(hexo, vendors.async_js[jsAsync]), async: true }, '')
-    // }
     return res;
 });
 hexo.extend.helper.register('_striptags', function (data) {

package/scripts/plugin/index.js

@@ -47,10 +47,10 @@ hexo.on('generateBefore', () => {
 });
 hexo.on('generateAfter', () => {
     // 检查版本更新
-    fetch('https://api.github.com/repos/theme-shoka-x/hexo-theme-shokaX/releases/latest').then((res) => {
+    fetch('https://registry.npmmirror.com/hexo-theme-shokax').then((res) => {
         res.json().then((resp) => {
             try {
-                const latest = resp.tag_name.replace('v', '').split('.');
+                const latest = resp['dist-tags'].latest;
                 const current = package_json_1.version.split('.');
                 let isOutdated = false;
                 for (let i = 0; i < Math.max(latest.length, current.length); i++) {

package/source/css/_common/outline/footer/footer.styl

@@ -6,7 +6,7 @@
   background: var(--body-bg-shadow);
 
   .inner {
-    margin: 0 auto;
+    margin: 2rem auto .625rem;
     width: $content-desktop;
     position: relative;
 
@@ -35,7 +35,6 @@
 .status {
   width: 100%;
   text-align: center;
-  margin-top: 2rem;
 }
 
 .languages {
@@ -65,5 +64,4 @@
 
 .powered-by, .theme-info {
   display: inline-block;
-  margin-bottom: .625rem;
 }

package/source/js/_app/components/comments.ts

@@ -1,7 +1,8 @@
 import { CONFIG } from '../globals/globalVars'
-import { init, pageviewCount, RecentComments } from '@waline/client'
+import { init, RecentComments } from '@waline/client'
+import { pageviewCount } from '@waline/client/pageview'
 
-import { createApp } from 'vue'
+import { $dom } from '../library/dom'
 
 export const walineComment = function () {
   init({
@@ -21,6 +22,7 @@ export const walineComment = function () {
 }
 
 export const walinePageview = function () {
+  // TODO waline 上游此模块存在问题
   pageviewCount({
     serverURL: CONFIG.waline.serverURL,
     path: window.location.pathname
@@ -34,24 +36,54 @@ export const walineRecentComments = async function () {
     serverURL: CONFIG.waline.serverURL.replace(/\/+$/, ''),
     count: 10
   })
-  comments.forEach(function (item) {
+  // TODO 疑似 waline API 返回格式与文档不一致，需要确认是否为上游问题
+  // @ts-ignore
+  comments.data.forEach(function (item) {
     let cText = (item.orig.length > 50) ? item.orig.substring(0, 50) + '...' : item.orig
     item.url = item.url.startsWith('/') ? item.url : '/' + item.url
     const siteLink = item.url + '#' + item.objectId
+
+    const time = new Date(item.time)
+    const now = new Date()
+    const diff = now.valueOf() - time.valueOf()
+    let dateStr:string
+    if (diff < 3600000) {
+      dateStr = `${Math.floor(diff / 60000)} 分钟前`
+    } else if (diff < 86400000) {
+      dateStr = `${Math.floor(diff / 3600000)} 小时前`
+    } else if (diff < 2592000000) {
+      dateStr = `${Math.floor(diff / 86400000)} 天前`
+    } else {
+      dateStr = `${time.getFullYear()}-${time.getMonth() + 1}-${time.getDate()}`
+    }
+
     items.push({
       href: siteLink,
       nick: item.nick,
-      // @ts-ignore
-      time: item.insertedAt.split('T').shift(),
+      time: dateStr,
       text: cText
     })
   })
-  createApp({
-    data () {
-      return {
-        coms: items,
-        root
-      }
-    }
-  }).mount('#new-comment')
+  const newComments = new DocumentFragment()
+  items.forEach(function (item) {
+    const commentEl = document.createElement('li')
+    const commentLink = document.createElement('a')
+    const commentTime = document.createElement('span')
+    const commentText = document.createElement('span')
+
+    commentText.innerText = item.text
+    commentTime.className = 'breadcrumb'
+    commentTime.innerText = `${item.nick} @ ${item.time}`
+    commentLink.href = root + item.href
+    commentLink['data-pjax-state'] = 'data-pjax-state'
+    commentEl.className = 'item'
+
+    commentText.appendChild(document.createElement('br'))
+    commentLink.appendChild(commentTime)
+    commentLink.appendChild(commentText)
+    commentEl.appendChild(commentLink)
+    newComments.appendChild(commentEl)
+  })
+
+  $dom('#new-comment').appendChild(newComments)
 }

package/source/js/_app/components/sidebar.ts

@@ -228,7 +228,7 @@ export const menuActive = () => {
     if (!target) return
     const isSamePath = target.pathname === location.pathname || target.pathname === location.pathname.replace('index.html', '')
     const isSubPath = !CONFIG.root.startsWith(target.pathname) && location.pathname.startsWith(target.pathname)
-    const active = target.hostname === location.hostname && (isSamePath || isSubPath)
+    const active = !target.onclick && target.hostname === location.hostname && (isSamePath || isSubPath)
     element.toggleClass('active', active)
     if (element.parentNode.child('.active') && parentItem.hasClass('dropdown')) {
       parentItem.removeClass('active').addClass('expand')

package/source/js/_app/components/tcomments.ts

@@ -1,6 +1,6 @@
 import twikoo from 'twikoo'
 import { CONFIG } from '../globals/globalVars'
-import { createApp } from 'vue'
+import { $dom } from '../library/dom'
 
 export const twikooComment = function () {
   twikoo.init({
@@ -30,12 +30,26 @@ export const twikooRecentComments = async function () {
       text: cText
     })
   })
-  createApp({
-    data () {
-      return {
-        coms: comments,
-        root
-      }
-    }
-  }).mount('#new-comment')
+  const newComments = new DocumentFragment()
+  comments.forEach(function (item) {
+    const commentEl = document.createElement('li')
+    const commentLink = document.createElement('a')
+    const commentTime = document.createElement('span')
+    const commentText = document.createElement('span')
+
+    commentText.innerText = item.text
+    commentTime.className = 'breadcrumb'
+    commentTime.innerText = `${item.nick} @ ${item.time}`
+    commentLink.href = root + item.href
+    commentLink['data-pjax-state'] = 'data-pjax-state'
+    commentEl.className = 'item'
+
+    commentText.appendChild(document.createElement('br'))
+    commentLink.appendChild(commentTime)
+    commentLink.appendChild(commentText)
+    commentEl.appendChild(commentLink)
+    newComments.appendChild(commentEl)
+  })
+
+  $dom('#new-comment').appendChild(newComments)
 }