hexo-theme-shokax 0.0.7 → 0.1.0

package/README.md

@@ -71,4 +71,4 @@ shokaX的贡献者包括以非代码形式进行贡献的开发者(例如社区
 |:-----------|:---------------------------|
 | Lavender   | https://www.lavenderdh.cn/ |
 | AdminZhang | https://www.a9-9.top/      |
-| D-Sketon   | http://d-sketon.top/       | 
+| D-Sketon   | https://d-sketon.top/      | 

package/_config.yml

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

package/layout/_alternate/atom.ejs

@@ -3,7 +3,7 @@
     <id><%= config.url %></id>
     <title><%= config.title %></title>
     <subtitle><%= config.subtitle %></subtitle>
-    <icon><%= full_url_for('/images/favicon.ico') %></icon>
+    <icon><%= full_url_for('/assets/favicon.ico') %></icon>
     <link href="<%= config.url %>" />
     <author>
       <name><%= config.author %></name>

package/layout/_alternate/json.ejs

@@ -2,7 +2,7 @@
     version: 'https://jsonfeed.org/version/1',
     title: config.title,
     subtitle: config.subtitle,
-    icon: full_url_for('/images/favicon.ico'),
+    icon: full_url_for('/assets/favicon.ico'),
     description: config.description,
     home_page_url: config.url,
     items: posts.map(post => ({

package/layout/_alternate/rss.ejs

@@ -3,7 +3,7 @@
     <channel>
         <title><%= config.title %></title>
         <subtitle><%= config.subtitle %></subtitle>
-        <icon><%= full_url_for('/images/favicon.ico') %></icon>
+        <icon><%= full_url_for('/assets/favicon.ico') %></icon>
         <link><%= config.url %></link>
         <author>
           <name><%= config.author %></name>

package/layout/_mixin/comment.pug

@@ -14,20 +14,27 @@ mixin CommentRender()
                 }, 1000)
         else if wl
             div(class="warp" id="wcomments")
+            - var locale = JSON.stringify(theme.waline.locale)
+            - var emoji = JSON.stringify(theme.waline.emoji)
+            - var meta = JSON.stringify(theme.waline.meta)
+            - var requiredMeta = JSON.stringify(theme.waline.requiredMeta)
             script(type="module" data-pjax).
                 import { init } from 'https://unpkg.com/@waline/client@v2/dist/waline.mjs';
 
+                var path = document.getElementById("twikoo_visitors").getAttribute("data-path");
                 setTimeout(function () {
                     init({
                         el: '#wcomments',
                         serverURL: '#{hexo.theme.config.waline.serverURL}',
                         lang: '#{hexo.theme.config.waline.lang}',
-                        locale: #{hexo.theme.config.waline.locale},
-                        emoji: #{hexo.theme.config.waline.emoji},
-                        meta: #{hexo.theme.config.waline.meta},
-                        requiredMeta: #{hexo.theme.config.waline.requiredMeta},
+                        locale: !{locale},
+                        emoji: !{emoji},
+                        meta: !{meta},
+                        requiredMeta: !{requiredMeta},
                         wordLimit: #{hexo.theme.config.waline.wordLimit},
-                        pageSize: #{hexo.theme.config.waline.pageSize}
+                        pageSize: #{hexo.theme.config.waline.pageSize},
+                        pageview: #{theme.waline.pageview},
+                        path: path
                     });
                 }, 1000)
         else if gt

package/layout/_partials/post/post.pug

@@ -2,7 +2,7 @@
 article(itemscope itemtype="http://schema.org/Article" class="post block" lang=temp)
     link(itemprop="mainEntityOfPage" href!=post.permalink)
     span(hidden itemprop="author" itemscope itemtype="http://schema.org/Person")
-        meta(itemprop="image" content=url_for(theme.statics + theme.images + '/' + theme.sidebar.avatar))
+        meta(itemprop="image" content=url_for(theme.statics + theme.assets + '/' + theme.sidebar.avatar))
         meta(itemprop="name" content=author)
         meta(itemprop="description" content=`${ subtitle }, ${ description }`)
     span(hidden itemprop="publisher" itemscope itemtype="http://schema.org/Organization")

package/layout/_partials/post/reward.pug

@@ -13,6 +13,6 @@ if page.reward !== false
                 else
                     - var translation = name
                 div
-                    img(data-src=`${url_for(theme.statics + theme.images + image) }` alt=`${ author } ${ translation }`)
+                    img(data-src=`${url_for(theme.statics + theme.assets + image) }` alt=`${ author } ${ translation }`)
                     p
                         != translation

package/layout/category.pug

@@ -30,6 +30,7 @@ block content
                         - var lastcat = ""
                         - var lastcatslug = ""
                     else
+                        - var lastcat = true
                         mixin lastcat
                             != lastcat
                             a(href=url_for(cat.path))

package/layout/page.pug

@@ -27,7 +27,6 @@ block header
                 != __('title.not_found')
             else
                 != page.title
-            != "|"
 
 block content
     if page.type === 'categories'
@@ -37,6 +36,7 @@ block content
                     != __('menu.home')
                 small
                 != _p('counter.categories', site.categories.length)
+            != _list_categories(3)
     else if page.type === 'tags'
         div(class="collapse wrap")
             h2(class="item title")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-shokax",
-  "version": "0.0.7",
+  "version": "0.1.0",
   "description": "a hexo theme based on shoka",
   "main": "index.js",
   "repository": "https://github.com/zkz098/hexo-theme-shokaX",

package/scripts/helpers/asset.js

@@ -38,7 +38,7 @@ hexo.extend.helper.register('_new_comments', function (mode) {
         </script>`
   } else if (mode === 'waline') {
     return `
-    <script type="module">
+    <script type="module" data-pjax>
         import { RecentComments } from 'https://unpkg.com/@waline/client@v2/dist/waline.mjs'
         RecentComments({
           el: '#new-comment',

package/scripts/tags/links.js

@@ -53,7 +53,7 @@ function linkGrid (args, content) {
       urlparam = new URL(item.url)
     }
 
-    let item_image = item.image || theme.images + '/404.png'
+    let item_image = item.image || theme.assets + '/404.png'
 
     if (!item_image.startsWith('//') && !item_image.startsWith('http')) {
       item_image = theme.statics + item_image

package/source/css/_common/components/pages/pages.styl

@@ -8,7 +8,7 @@
   .notfound {
     width: 18.75rem;
     height: 22.625rem;
-    background: url("../images/404.png") no-repeat center bottom;
+    background: url("../assets/404.png") no-repeat center bottom;
     text-align: center;
     margin: 6.25rem auto;
   }

package/source/css/_common/components/tags/player.styl

@@ -303,7 +303,7 @@
       content: "";
       position: absolute;
       z-index: 1;
-      background: url("../images/play_needle.png") no-repeat center/contain;
+      background: url("../assets/play_needle.png") no-repeat center/contain;
       width: 3.4375rem;
       height: 5.1875rem;
       top: -1.5625rem;
@@ -322,7 +322,7 @@
       &::after {
         content: "";
         position: absolute;
-        background: url("../images/play_disc.png") no-repeat center/contain;
+        background: url("../assets/play_disc.png") no-repeat center/contain;
         z-index: 1;
         width: 100%;
         height: 100%;

package/source/css/_common/components/third-party/search.styl

@@ -71,7 +71,7 @@
     padding: 1.875rem 1.875rem .3125rem;
     border-radius: .3125rem;
 
-    background: var(--grey-1-a7) url(../images/search.png) no-repeat bottom right;
+    background: var(--grey-1-a7) url(../assets/search.png) no-repeat bottom right;
 
     color: var(--text-color);
 
@@ -91,7 +91,7 @@
 
 .algolia-powered {
   float: right;
-  background: url('../images/algolia_logo.svg') no-repeat;
+  background: url('../assets/algolia_logo.svg') no-repeat;
   display: inline-block;
   height: 1.125rem;
   width: 4.25rem;

package/source/js/_app/page.js

@@ -567,7 +567,7 @@ const siteRefresh = function (reload) {
     vendorJs('copy_tex');
     vendorCss('mermaid');
     vendorJs('chart');
-    if (!reload) {
+    if (reload !== 1) {
         $dom.each('script[data-pjax]', pjaxScript);
     }
     originTitle = document.title;