hexo-theme-shokax 0.0.1-alpha6 → 0.0.2-alpha1

package/_config.yml

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

package/layout/_mixin/comment.pug

@@ -1,4 +1,5 @@
 mixin CommentRender()
+    != shokax_inject('comment')
     - var tk = theme?.twikoo?.enable,wl = theme?.waline?.enable
     if page.comment !== false
         if tk
@@ -8,3 +9,4 @@ mixin CommentRender()
             div(class="warp" id="wcomments")
             != _init_comments("waline")
 
+

package/layout/_partials/footer.pug

@@ -36,5 +36,5 @@ div(class="status")
                     img(src=theme.statics + theme.assets + '/' + theme.footer.icp.icon style="max-width: 2em;display:inline;")
                     != beianN
 
-!= insert_footer()
+!= shokax_inject('footer')
 

package/layout/_partials/header.pug

@@ -14,6 +14,7 @@ nav(id="nav")
                 i(class="ic" :class="{'i-sun': !themeStatus,'i-moon': themeStatus}")
             li(class="item search")
                 i(class="ic i-search")
+            != shokax_inject('rightNav')
             li(class="item weather")
                 div(id="he-plugin-simple")
 

package/layout/_partials/layout.pug

@@ -7,6 +7,7 @@ html(lang=page.language?page.language:config.language, style=theme.grayMode ? 'f
     head
         != partial('_partials/head/head.pug', {}, {cache: true})
         != partial('_partials/head/head_com.pug')
+        != shokax_inject('head')
         title
             block title
                 != `${alternate?alternate + " = ":""}${title}${subtitle?" = "+subtitle:""}`
@@ -133,10 +134,11 @@ html(lang=page.language?page.language:config.language, style=theme.grayMode ? 'f
             != _vendor_js()
         != _js('app.js')
         != partial('_partials/third-party/baidu-analytics.pug', {}, {cache: true})
-        != partial('_partials/third-party/qweather.pug', {}, {cache: true})
+        if theme.qweather.enable
+            != partial('_partials/third-party/qweather.pug', {}, {cache: true})
         != partial('_partials/third-party/clarity.pug', {}, {cache: true})
         != _new_comments('twikoo')
-        if theme.qweather.enable
+
 
         - var jsInjects = theme?.inject?.body?.js,cssInjects = theme?.inject?.body?.css
         if cssInjects
@@ -145,5 +147,7 @@ html(lang=page.language?page.language:config.language, style=theme.grayMode ? 'f
         if jsInjects
             != js(jsInjects)
 
+        != shokax_inject('bodyEnd')
+
 
 

package/layout/_partials/post/footer.pug

@@ -11,3 +11,4 @@ div(class="meta")
                 != __('post.edited')
             time(title=__('post.modified') + __('symbol.colon') + full_date(post.updated) itemprop="dateModified" datetime=moment(post.updated).format())
                 != date(post.updated)
+    != shokax_inject('postMeta')

package/layout/_partials/post/post.pug

@@ -24,3 +24,4 @@ article(itemscope itemtype="http://schema.org/Article" class="post block" lang="
             != partial('_partials/post/reward.pug', {}, {cache: true})
         if theme.creative_commons.license
             != partial('_partials/post/copyright.pug')
+    != shokax_inject('postBodyEnd')

package/layout/_partials/sidebar/overview.pug

@@ -35,6 +35,8 @@ div(class="social")
         - var sidebarIcon = '<i class="ic i-' + link.split('||')[1].trim() + '"></i>'
         != _url(sidebarURL, sidebarIcon, {title: sidebarURL, class: 'item ' + name})
 
+!= shokax_inject('sidebar')
+
 div(class="menu")
     //!= partial('_partials/sidebar/menu.pug', {}, {cache: true})
     != partial('_partials/sidebar/menu.pug')

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "hexo-theme-shokax",
-  "version": "0.0.1-alpha6",
+  "version": "0.0.2-alpha1",
   "description": "a hexo theme based on shoka",
   "main": "index.js",
   "repository": "https://github.com/zkz098/hexo-theme-shokaX",
   "author": "Chou kaitaku",
-  "license": "MIT",
+  "license": "BSD-3-Clause",
   "scripts": {
     "test": "cd ./source/js && tsc"
   },

package/scripts/helpers/engine.js

@@ -182,3 +182,9 @@ hexo.extend.helper.register('random_color', function () {
       b.toString(16).length > 1 ? b.toString(16) : '0' + b.toString(16)
     }`
 })
+
+hexo.extend.helper.register('shokax_inject', function (point) {
+  return hexo.theme.config.injects[point]
+    .map(item => this.partial(item.layout, item.locals, item.options))
+    .join('')
+})

package/scripts/plugin/index.js

@@ -1,6 +1,6 @@
 /* global hexo */
 
-// hexo.on('generateBefore', () => {
-//   // 加载`theme_injects`过滤器
-//   require('./lib/injects')(hexo);
-// });
+hexo.on('generateBefore', () => {
+  // 加载`theme_injects`过滤器
+  require('./lib/injects')(hexo)
+})

package/scripts/plugin/lib/injects-point.js

@@ -3,7 +3,6 @@
 module.exports = {
   views: [
     'head',
-    'header',
     'sidebar',
     'rightNav',
     'postMeta',

package/source/css/app.styl

@@ -1,7 +1,13 @@
 @import "_variables";
 
+for $inject_variable in hexo-config('injects.variable')
+  @import $inject_variable;
+
 @import "_mixins";
 
+for $inject_mixin in hexo-config('injects.mixin')
+  @import $inject_mixin;
+
 if $colors = hexo-config('style.colors')
   @import $colors;
 else
@@ -25,3 +31,8 @@ if $custom = hexo-config('style.custom')
   @import $custom;
 
 @import "plugin.styl"
+
+for $inject_style in hexo-config('injects.style')
+  @import $inject_style;
+
+