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

package/README.md

@@ -7,7 +7,9 @@
 此项目是shoka的一个二次开发版(算精神续作),致力于提高性能和优化魔改体验 \
 诞生原因是目前shoka已经两年没有更新了,积压了大量BUG和功能请求。\
 本项目处于高强度开发期,但github仓库版本已基本可用 \
-二次开发与常见问题请看wiki
+二次开发与常见问题请看wiki \
+`0.0.2-alpha2`开始,`lantern`和`qweather`已迁移为插件 \
+插件系统已完工,食用方法见[awesome-shokaX](https://github.com/zkz098/awesome-shokaX)
 
 ## 待办名单
 - [x] 推出一个可用的测试版
@@ -17,7 +19,7 @@
 - [x] 注入js和css支持
 - [x] 自定义font
 - [x] 部分功能调整为可关闭
-- [ ] 插件系统
+- [x] 插件系统
 
 ## 和shoka的区别
 原先shoka使用了javascript+Native+nunjucks的技术 \

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,5 @@ nav(id="nav")
                 i(class="ic" :class="{'i-sun': !themeStatus,'i-moon': themeStatus}")
             li(class="item search")
                 i(class="ic i-search")
-            li(class="item weather")
-                div(id="he-plugin-simple")
+            != shokax_inject('rightNav')
 

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

@@ -1,4 +1,5 @@
-article(itemscope itemtype="http://schema.org/Article" class="post block" lang="{{ post.lang or config.language }}")
+- var temp = post.lang || config.language
+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))
@@ -24,3 +25,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-alpha2",
   "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
@@ -24,4 +30,7 @@ else
 if $custom = hexo-config('style.custom')
   @import $custom;
 
-@import "plugin.styl"
+for $inject_style in hexo-config('injects.style')
+  @import $inject_style;
+
+

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

@@ -1,35 +0,0 @@
-script.
-     WIDGET = {
-        "CONFIG": {
-            "modules": "012",
-            "background": "5",
-            "tmpColor": "var(--text-color);",
-            "tmpSize": "16",
-            "cityColor": "var(--text-color);",
-            "citySize": "16",
-            "aqiColor": "FFFFFF",
-            "aqiSize": "16",
-            "weatherIconSize": "24",
-            "alertIconSize": "18",
-            "padding": "10px 10px 10px 10px",
-            "shadow": "0",
-            "language": "auto",
-            "borderRadius": "5",
-            "fixed": "false",
-            "vertical": "top",
-            "horizontal": "left",
-            "key": "#{theme.qweather.key}"
-        }
-     }
-
-script.
-    (function (d) {
-        const c = d.createElement('link')
-        c.rel = 'stylesheet'
-        c.href = 'https://widget.qweather.net/simple/static/css/he-simple.css?v=1.4.0'
-        const s = d.createElement('script')
-        s.src = 'https://widget.qweather.net/simple/static/js/he-simple.js?v=1.4.0'
-        const sn = d.getElementsByTagName('script')[0]
-        sn.parentNode.insertBefore(c, sn)
-        sn.parentNode.insertBefore(s, sn)
-    })(document)

package/source/css/plugin.styl

@@ -1,174 +0,0 @@
-.deng-box {
-  position: fixed;
-  top: -40px;
-  right: -20px;
-  z-index: 99;
-}
-.deng-box1 {
-  position: fixed;
-  top: -30px;
-  right: 10px;
-  z-index: 99;
-  .deng {
-    position: relative;
-    width: 120px;
-    height: 90px;
-    margin: 50px;
-    background: #d8000f;
-    background: rgba(216, 0, 15, 0.8);
-    border-radius: 50% 50%;
-    -webkit-transform-origin: 50% -100px;
-    -webkit-animation: swing 5s infinite ease-in-out;
-    box-shadow: -5px 5px 30px 4px rgba(252, 144, 61, 1);
-  }
-}
-.deng {
-  position: relative;
-  width: 120px;
-  height: 90px;
-  margin: 50px;
-  background: #d8000f;
-  background: rgba(216, 0, 15, 0.8);
-  border-radius: 50% 50%;
-  -webkit-transform-origin: 50% -100px;
-  -webkit-animation: swing 3s infinite ease-in-out;
-  box-shadow: -5px 5px 50px 4px rgba(250, 108, 0, 1);
-  &:before {
-    position: absolute;
-    top: -7px;
-    left: 29px;
-    height: 12px;
-    width: 60px;
-    content: " ";
-    display: block;
-    z-index: 999;
-    border-radius: 5px 5px 0 0;
-    border: solid 1px #dc8f03;
-    background: #ffa500;
-    background: linear-gradient(to right, #dc8f03, #ffa500, #dc8f03, #ffa500, #dc8f03);
-  }
-  &:after {
-    position: absolute;
-    bottom: -7px;
-    left: 10px;
-    height: 12px;
-    width: 60px;
-    content: " ";
-    display: block;
-    margin-left: 20px;
-    border-radius: 0 0 5px 5px;
-    border: solid 1px #dc8f03;
-    background: #ffa500;
-    background: linear-gradient(to right, #dc8f03, #ffa500, #dc8f03, #ffa500, #dc8f03);
-  }
-}
-.deng-a {
-  width: 100px;
-  height: 90px;
-  background: #d8000f;
-  background: rgba(216, 0, 15, 0.1);
-  margin: 12px 8px 8px 10px;
-  border-radius: 50% 50%;
-  border: 2px solid #dc8f03;
-}
-.deng-b {
-  width: 45px;
-  height: 90px;
-  background: #d8000f;
-  background: rgba(216, 0, 15, 0.1);
-  margin: -4px 8px 8px 26px;
-  border-radius: 50% 50%;
-  border: 2px solid #dc8f03;
-}
-.xian {
-  position: absolute;
-  top: -20px;
-  left: 60px;
-  width: 2px;
-  height: 20px;
-  background: #dc8f03;
-}
-.shui-a {
-  position: relative;
-  width: 5px;
-  height: 20px;
-  margin: -5px 0 0 59px;
-  -webkit-animation: swing 4s infinite ease-in-out;
-  -webkit-transform-origin: 50% -45px;
-  background: #ffa500;
-  border-radius: 0 0 5px 5px;
-}
-.shui-b {
-  position: absolute;
-  top: 14px;
-  left: -2px;
-  width: 10px;
-  height: 10px;
-  background: #dc8f03;
-  border-radius: 50%;
-}
-.shui-c {
-  position: absolute;
-  top: 18px;
-  left: -2px;
-  width: 10px;
-  height: 35px;
-  background: #ffa500;
-  border-radius: 0 0 0 5px;
-}
-.deng-t {
-  font-size: 3.2rem;
-  color: #dc8f03;
-  font-weight: bold;
-  line-height: 85px;
-  text-align: center;
-}
-.night .deng-t,
-.night .deng-box,
-.night .deng-box1 {
-  background: transparent !important;
-}
-@-moz-keyframes swing {
-  0% {
-    -moz-transform: rotate(-10deg)
-  }
-  50% {
-    -moz-transform: rotate(10deg)
-  }
-  100% {
-    -moz-transform: rotate(-10deg)
-  }
-}
-
-@-webkit-keyframes swing {
-  0% {
-    -webkit-transform: rotate(-10deg)
-  }
-  50% {
-    -webkit-transform: rotate(10deg)
-  }
-  100% {
-    -webkit-transform: rotate(-10deg)
-  }
-}
-
-@keyframes swing {
-  0% {
-    -webkit-transform: rotate(-10deg)
-  }
-  50% {
-    -webkit-transform: rotate(10deg)
-  }
-  100% {
-    -webkit-transform: rotate(-10deg)
-  }
-}
-
-@media (max-width: 870px){
-  .s-sticker-tmp ,.s-sticker-city{
-    display: none !important;
-  }
-  .s-sticker {
-    padding: 0
-  }
-}