hexo-theme-shokax 0.0.1-alpha3 → 0.0.1-alpha5

package/README.md

@@ -4,8 +4,9 @@
 ![stars](https://img.shields.io/github/stars/zkz098/hexo-theme-shokaX)
 ![version](https://shields.io/npm/v/hexo-theme-shokax)
 
-此项目是shoka的一个魔改版,致力于提高性能和优化魔改体验 \
-本项目处于高强度开发期,但github仓库版本已基本可用 \s
+此项目是shoka的一个二次开发版(算精神续作),致力于提高性能和优化魔改体验 \
+诞生原因是目前shoka已经两年没有更新了,积压了大量BUG和功能请求。\
+本项目处于高强度开发期,但github仓库版本已基本可用 \
 二次开发与常见问题请看wiki
 
 ## 待办名单
@@ -19,14 +20,19 @@
 - [ ] 重构lib方法(长期计划)
 - [ ] 异步化js
 
-## 已于从shoka迁移吗?
-很容易,只需要调整shoka的部分配置,并重新安装渲染器就行
-
-## 以前的魔改呢?
-这个比较难解决,因为shokaX对编写语言进行了更改:
-- javascript -> typescript
-- njk -> pug
-  因此需要更改编写的语言
+## 和shoka的区别
+原先shoka使用了javascript+Native+nunjucks的技术 \
+而shokaX则使用了typescript+Vue 3+Pug的技术搭配 \
+图标库可能会更换为Font Awesome 6 \
+更改了大量难以访问的CDN链接
+
+## 如何安装?
+建议使用[ShokaX-CLI](https://github.com/zkz098/shokaX-CLI) ,执行下列命令即可:
+```bash
+npm i shokax-cli --location=global
+# hexo init 初始化环境
+SXC install shokaX
+```
 
 # 许可证
 许可证: MIT \

package/_config.yml

@@ -47,6 +47,11 @@ auto_dark: # 自动亮/暗模式
   start: 20     #开始时间
   end: 7        #结束时间
 
+plugin:
+  enable: false
+  load:
+    # - example
+
 auto_scroll: true
 
 loader:

package/layout/_partials/footer.pug

@@ -23,7 +23,7 @@ div(class="status")
             //- span(id="times")
     if theme.footer.powered
         div(class="powered-by")
-            != __('footer.powered', _url('https://hexo.io', 'Hexo') + ' & Theme.' + _url('https://github.com/zkz098/hexo-theme-shokaX/tree/vue', 'ShokaX with Vue'))
+            != __('footer.powered', _url('https://hexo.io', 'Hexo') + ' & Theme.' + _url('https://github.com/zkz098/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;")
@@ -36,26 +36,5 @@ div(class="status")
                     img(src=theme.statics + theme.assets + '/' + theme.footer.icp.icon style="max-width: 2em;display:inline;")
                     != beianN
 
-
-if theme.footer.lantern.enable
-    div(class="deng-box")
-        div(class="deng")
-            div(class="xian")
-            div(class="deng-a")
-                div(class="deng-b")
-                    div(class="deng-t")
-                        != theme.footer.lantern.word2
-            div(class="shui shui-a")
-                div(class="shui-c")
-                div(class="shui-b")
-    div(class="deng-box1")
-        div(class="deng")
-            div(class="xian")
-            div(class="deng-a")
-                div(class="deng-b")
-                    div(class="deng-t")
-                        != theme.footer.lantern.word1
-            div(class="shui shui-a")
-                div(class="shui-c")
-                div(class="shui-b")
+!= insert_footer()
 

package/layout/_partials/layout.pug

@@ -134,6 +134,7 @@ html(lang=page.language?page.language:config.language, style=theme.grayMode ? 'f
         != _js('app.js')
         != partial('_partials/third-party/baidu-analytics.pug', {}, {cache: true})
         != partial('_partials/third-party/qweather.pug', {}, {cache: true})
+        != partial('_partials/third-party/clarity.pug', {}, {cache: true})
         != _new_comments('twikoo')
         if theme.qweather.enable
 

package/layout/archive.pug

@@ -29,3 +29,90 @@ block content
                 != `${page.month}${__('symbol.month')}`
                 small
                     != __('title.archive')
+            else if is_year()
+                a(href=url_for(config.archive_dir))
+                    != __('title.all')
+                small /
+                != page.year + __('symbol.year')
+                small
+                    != __('title.archive')
+            else
+                a(href=url_for(site.path))
+                    != __('menu.home')
+                small /
+                - var posts_length = site.posts.length,cheers
+                if posts_length > 210
+                    - cheers = 'excellent'
+                else if posts_length > 130
+                    - cheers = 'great'
+                else if posts_length > 80
+                    - cheers = 'good'
+                else if posts_length > 50
+                    - cheers = 'nice'
+                else if posts_length > 30
+                    - cheers = 'ok'
+                else
+                    - cheers = 'um'
+                != _p('counter.archive_posts', site.posts.length)
+                small(class="cheers")
+                    != __('cheers.' + cheers)
+                    != ' '
+                    != __('keep_on')
+
+        - var current_year = '1970'
+        - var current_month = '01'
+        - var count_post = 1
+        each post in page.posts.toArray()
+            - var year = date(post.date, 'YYYY')
+            - var month = date(post.date, 'MM')
+            if !is_year()
+                if year !== current_year || month !== current_month
+                    if current_year !== '1970'
+                        small (#{count_post})
+                        </h3>
+                    <h3 class="item section">
+                    a(href=url_for(config.archive_dir + '/' + year )) #{year} #{__('symbol.year')}
+                    small /
+                    a(href=url_for(config.archive_dir + '/' + year  + '/' + month)) #{ month } #{__('symbol.month')}
+                    - current_year = year
+                    - current_month = month
+                    - count_post = 1
+                else
+                    - count_post = count_post + 1
+            else
+                if year !== current_year && !is_year()
+                    - current_year = year
+                    h3(class="item section")
+                        a(href=url_for(config.archive_dir + '/' + year )) #{ year } #{__('symbol.year')}
+                if month !== current_month && is_year() && !is_month()
+                    - current_month = month
+                    h3(class="item section")
+                        a(href=url_for(config.archive_dir + '/' + year + '/' + month)) #{ month } #{__('symbol.month')}
+                article(class="item normal" itemscope itemtype="http://schema.org/Article")
+                    div(class="meta")
+                        time(
+                            itemprop="dateCreated"
+                            datetime=moment(post.date).format()
+                            content=date(post.date, config.date_format)
+                        ) #{date(post.date, 'MM-DD')}
+                        if post.categories && post.categories.length
+                            - var cat_length = post.categories.length
+                            each cat,index in post.categories.toArray()
+                                if index == cat_length && cat.name !== page.category
+                                    span
+                                        a(href=url_for(cat.path)) #{cat.name}
+                    div(class="title")
+                        if post.link
+                            - var postTitleIcon = '<i class="ic i-link-alt"></i>'
+                            - var postText = post.title || post.link
+                            != _url(post.link, postText + postTitleIcon, {class: 'external', itemprop: 'url'})
+                        else
+                            - var postTitle = post.title || __('post.untitled')
+                            a(href=url_for(post.path) itemprop="url")
+                                span(itemprop="name") #{postTitle}
+        if !is_year()
+            small (#{count_post})
+            </h3>
+
+    include _partials/pagination.pug
+

package/layout/category.pug

@@ -11,15 +11,13 @@ block content
     div(class="collapse wrap")
         - var prev = _category_prev(page.category)
         h2(class="item header")
-            a(href=url_for(config.category_dir))
-                != __('title.all')
+            a(href=url_for(config.category_dir)) #{__('title.all')}
             if prev
                 small /
                 != prev
             small /
             != page.title
-            small
-                != __('title.category')
+            small #{__('title.category')}
         - var posts = page.posts
         - var current = "c"
         - var lastcat = ""
@@ -40,7 +38,7 @@ block content
                                 if index >= post.categories.toArray().length
                                     != cat.length
                                 else
-                                    != "/"
+                                    #{'/'}
                     - var lastcatslug = lastcatslug + cat.slug
             if lastcat && lastcatslug && lastcatslug !== current
                 h3(class="item section")
@@ -52,8 +50,7 @@ block content
                     itemprop="dateCreated"
                     datetime=moment(post.date).format()
                     content=date(post.date, config.date_format)
-                    )
-                        != date(post.date, 'MM-DD')
+                    ) #{date(post.date, 'MM-DD')}
                 div(class="title")
                     if post.link
                         - var postTitleIcon = '<i class="ic i-link-alt"></i>'

package/package.json

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

package/scripts/filters/locals.js

@@ -1,21 +1,19 @@
 'use strict'
 /* global hexo */
-const path = require('path')
-const url = require('url')
 
 const fmtNum = num => {
   return num < 10 ? '0' + num : num
 }
 
 hexo.extend.filter.register('template_locals', locals => {
-  const { env, config } = hexo
+  const { config } = hexo
   const { __, theme } = locals
   const { i18n } = hexo.theme
 
   const pangu = theme.pangu
     ? require('pangu')
     : {
-        spacing: data => {
+        spacing: (data) => {
           return data
         }
       }
@@ -32,7 +30,11 @@ hexo.extend.filter.register('template_locals', locals => {
   locals.hostname = new URL(config.url).hostname || config.url
 
   // Creative Commons
-  locals.ccURL = 'https://creativecommons.org/' + (theme.creative_commons.license === 'zero' ? 'publicdomain/zero/1.0/' : 'licenses/' + theme.creative_commons.license + '/4.0/') + (theme.creative_commons.language || '')
+  if (theme.creative_commons.license === 'zero') {
+    locals.ccURL = 'https://creativecommons.org/' + 'publicdomain/zero/1.0/' + (theme.creative_commons.language || '')
+  } else {
+    locals.ccURL = 'https://creativecommons.org/' + 'licenses/' + theme.creative_commons.license + '/4.0/' + (theme.creative_commons.language || '')
+  }
 
   if (locals.page.title) {
     locals.page.title = pangu.spacing(locals.page.title)

package/scripts/generaters/config.js

@@ -35,7 +35,7 @@ hexo.extend.filter.register('before_generate', () => {
     }
   }
 
-  if (data.images && data.images.length > 6) {
+  if (data.images && data.images.length >= 6) {
     hexo.theme.config.image_list = data.images
   } else {
     hexo.theme.config.image_list = yaml.load(fs.readFileSync(path.join(__dirname, '../../_images.yml')))

package/scripts/generaters/script.js

@@ -61,10 +61,18 @@ hexo.extend.generator.register('script', function (locals) {
   let text = '';
 
   ['library', 'global', 'page', 'vue', 'components'].forEach(function (item) {
-    text += fs.readFileSync(`themes/shokaX/source/js/_app/${item}.js`).toString()
+    if (fs.existsSync(`themes/shokaX/source/js/_app/${item}.js`)) {
+      text += fs.readFileSync(`themes/shokaX/source/js/_app/${item}.js`).toString()
+    } else {
+      text += fs.readFileSync(`node_modules/hexo-theme-shokax/source/js/_app/${item}.js`).toString()
+    }
   })
   if (!theme.experiments?.noPlayer) {
-    text += fs.readFileSync('themes/shokaX/source/js/_app/player.js').toString()
+    if (fs.existsSync('themes/shokaX/source/js/_app/player.js')) {
+      text += fs.readFileSync('themes/shokaX/source/js/_app/player.js').toString()
+    } else {
+      text += fs.readFileSync('node_modules/hexo-theme-shokax/source/js/_app/player.js').toString()
+    }
   }
   if (theme.fireworks && theme.fireworks.enable) {
     siteConfig.fireworks = theme.fireworks.color || ['rgba(255,182,185,.9)', 'rgba(250,227,217,.9)', 'rgba(187,222,214,.9)', 'rgba(138,198,209,.9)']

package/scripts/plugin/index.js

@@ -0,0 +1,58 @@
+/* global hexo */
+'use strict'
+
+/** @type {Map<string, string[]>} */
+const insertions = new Map()
+class TemplateBlock {
+  constructor (text, type = 'raw') {
+    this.text = text
+    this.type = type
+    this.result = ''
+  }
+
+  render () {
+    if (this.type === 'raw' || this.type === 'html') {
+      this.result = this.text
+    }
+    this.result = hexo.render.renderSync({ text: this.text, engine: this.type })
+  }
+
+  repalceTag (...tag) {
+    tag.forEach((item) => {
+      this.text = this.text.replace(item.tag, item.value)
+    })
+  }
+
+  insert (location) {
+    if (insertions.get(location)) {
+      insertions.get(location).push(this.result)
+    } else {
+      insertions.set(location, [])
+    }
+  }
+}
+
+const toolpack = {
+  TemplateBlock
+}
+
+hexo.extend.helper.register('insert_footer', () => {
+  if (hexo.theme.config?.plugin?.enable && insertions.get('footer')) {
+    let res = ''
+    insertions.get('footer').forEach((item) => {
+      res += item
+    })
+    return res
+  }
+})
+
+if (hexo.theme.config?.plugin?.enable) {
+  hexo.theme.config.plugin.load.forEach((item) => {
+    const p = require(item)
+    console.log(p)
+    if (p.prepare) {
+      p.prepare(hexo, this)
+    }
+    p.main(hexo, this, toolpack)
+  })
+}