hexo-theme-shokax 0.0.1-alpha2 → 0.0.1-alpha3

package/README.md

@@ -2,7 +2,7 @@
 [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fzkz098%2Fhexo-theme-shokaX.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Fzkz098%2Fhexo-theme-shokaX?ref=badge_shield)
 ![LICENSE](	https://img.shields.io/github/license/zkz098/hexo-theme-shokaX)
 ![stars](https://img.shields.io/github/stars/zkz098/hexo-theme-shokaX)
-
+![version](https://shields.io/npm/v/hexo-theme-shokax)
 
 此项目是shoka的一个魔改版,致力于提高性能和优化魔改体验 \
 本项目处于高强度开发期,但github仓库版本已基本可用 \s

package/_config.yml

@@ -24,14 +24,13 @@ pwa:
 experiments:
   noPlayer: false # 禁用音乐播放器
   gradient: false # 使用CSS渐变作为文章封面
-  gradientCover: "" # 当gradient为true时使用的主页面cover
+  gradientCover: "" # 当gradient为true时使用的主页面cover(为空则使用bing随机图片)
   debug: false # 使用debug模式启动
 
 icon:
   favicon: "/favicon.ico"
   apple_touch_icon: "/apple-touch-icon.png"
 
-baidu_analytics: ""
 seo:
   bing: "bing-key"
   google: "google-key"
@@ -40,6 +39,7 @@ seo:
 
 visitor:
   clarity: false
+  baiduAnalytics: false
 
 darkmode: false
 auto_dark: # 自动亮/暗模式

package/layout/_partials/head/pwa.pug

@@ -1,17 +1,18 @@
 //- https://blog.cyfan.top/p/c0af86bb.html#%E5%AE%89%E8%A3%85-Install
+- var timeNow = new Date().getTime()
 if theme.pwa.enable
-    script(data-pjax async)
-        | if ('serviceWorker' in navigator) {
-        !=    `navigator.serviceWorker.register(\"/${theme.pwa.serviceworker}?time=${new Date().getTime()}\").then(async (reg) => {`
-        |            if (window.localStorage.getItem('install') !== 'true') {
-        |                window.localStorage.setItem('install', 'true');
-        |                setTimeout(() => {
-        |                    window.location.reload()
-        |                }, 500)
-        |            }
-        |        }).catch(err => {
-        |        console.log(err)
-        |    })
-        |    ;
-        |}
+    - var sworker = theme.pwa.serviceworker
+    script(data-pjax async).
+         if ('serviceWorker' in navigator) {
+            navigator.serviceWorker.register("/#{sworker}?time=#{timeNow}").then(async (reg) => {
+                    if (window.localStorage.getItem('install') !== 'true') {
+                        window.localStorage.setItem('install', 'true');
+                        setTimeout(() => {
+                            window.location.reload()
+                        }, 500)
+                    }
+                }).catch(err => {
+                console.log(err)
+            });
+            }
     link(rel="manifest" href=`/${theme.pwa.manifest}`)

package/layout/_partials/layout.pug

@@ -31,8 +31,9 @@ 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.experiments.gradient
-                        ul
-                            li(class="item" data-background-image=theme.experiments.gradientCover)
+                        //- cover不可用时用Bing随机图片代替
+                        - var coverImage = theme?.experiments?.gradientCover || "https://7ed.net/bing/api"
+                        img(src=coverImage)
                     else
                         - var covers = _cover(page, 6)
                         if covers.length === 6
@@ -101,7 +102,7 @@ html(lang=page.language?page.language:config.language, style=theme.grayMode ? 'f
             if page.outime === false
                 | outime: false,
             else
-                | outime: true,template: "#{ __('outime.template') }",
+                | outime: true,template: `!{ __('outime.template') }`,
             if page.quiz
                 | quiz: {
                 != `choice: \'${__('quiz.choice')}\',`

package/layout/_partials/third-party/baidu-analytics.pug

@@ -1,10 +1,10 @@
-- var hmSrc = `https://hm.baidu.com/hm.js?${ theme.baidu_analytics }`
-if theme.baidu_analytics
+- var hmSrc = `https://hm.baidu.com/hm.js?${ theme.visitor.baiduAnalytics }`
+if theme.visitor.baiduAnalytics
     script(data-pjax=true).
         var _hmt = _hmt || [];
         (function () {
             const hm = document.createElement("script");
-            hm.src = #{hmSrc}
+            hm.src = "#{hmSrc}"
             hm.async = true;
             const s = document.getElementsByTagName("script")[0];
             s.parentNode.insertBefore(hm, s);

package/layout/_partials/third-party/qweather.pug

@@ -18,7 +18,7 @@ script.
             "fixed": "false",
             "vertical": "top",
             "horizontal": "left",
-            "key": #{theme.qweather.key}
+            "key": "#{theme.qweather.key}"
         }
      }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-shokax",
-  "version": "0.0.1-alpha2",
+  "version": "0.0.1-alpha3",
   "description": "a hexo theme based on shoka",
   "main": "index.js",
   "repository": "https://github.com/zkz098/hexo-theme-shokaX",
@@ -16,10 +16,10 @@
     "@types/jquery": "^3.5.14",
     "@types/js-yaml": "^4.0.5",
     "@types/lozad": "^1.16.1",
-    "@types/node": "^18.11.17",
+    "@types/node": "^18.11.18",
     "@types/shelljs": "^0.8.11",
-    "@typescript-eslint/eslint-plugin": "^5.47.0",
-    "@typescript-eslint/parser": "^5.47.0",
+    "@typescript-eslint/eslint-plugin": "^5.47.1",
+    "@typescript-eslint/parser": "^5.47.1",
     "eslint": "^8.30.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.26.0",