feat: twikoo 增加 option 配置

feat: aside widget 增加排序（只對page頁和sticky內的有效）
feat: aside 增加自定義 widget
improvement: readmode 優化
improvement: html結構優化

layout/includes/layout.pug

@@ -1,5 +1,6 @@
 - var htmlClassHideAside = theme.aside.enable && theme.aside.hide ? 'hide-aside' : ''
 - var hideAside = !theme.aside.enable || page.aside === false ? 'hide-aside' : ''
+- var pageType = is_post() ? 'post' : 'page'
 
 doctype html
 html(lang=config.language data-theme=theme.display_mode class=htmlClassHideAside)
@@ -14,7 +15,7 @@ html(lang=config.language data-theme=theme.display_mode class=htmlClassHideAside
       
     !=partial('includes/sidebar', {}, {cache:theme.fragment_cache})
 
-    #body-wrap
+    #body-wrap(class=pageType)
       include ./header/index.pug
 
       main#content-inner.layout(class=hideAside)

layout/includes/page/artitalk.pug

@@ -13,7 +13,7 @@ script.
 
     if (!{Boolean(option)}) {
       const otherSetting = !{option}
-      setting = Object.assign({}, setting, otherSetting)
+      setting = Object.assign(setting, otherSetting)
     }
 
     const init = () => {

layout/includes/third-party/comments/index.pug

@@ -32,7 +32,7 @@ hr
           when 'Twikoo'
             #twikoo-wrap
           when 'Waline'
-            #waline
+            #waline-wrap
           when 'Facebook Comments'
             .fb-comments(data-colorscheme = theme.display_mode === 'dark' ? 'dark' : 'light'
                         data-numposts= theme.facebook_comments.pageSize || 10

layout/includes/third-party/comments/twikoo.pug

@@ -1,16 +1,25 @@
+- let option = theme.twikoo.option ? JSON.stringify(theme.twikoo.option) : false
+
 script.
   (()=>{
     const $countDom = document.getElementById('twikoo-count')
     const init = () => {
-      twikoo.init({
-        envId: '!{theme.twikoo}',
+      let initData = {
+        envId: '!{theme.twikoo.envId}',
         el: '#twikoo-wrap'
-      })
+      }
+
+      if (!{Boolean(option)}) {
+        const otherData = !{option}
+        initData = Object.assign(initData, otherData)
+      }
+      
+      twikoo.init(initData)
     }
 
     const getCount = () => {
       twikoo.getCommentsCount({
-        envId: '!{theme.twikoo}',
+        envId: '!{theme.twikoo.envId}',
         urls: [window.location.pathname],
         includeReply: false
       }).then(function (res) {

layout/includes/third-party/comments/valine.pug

@@ -29,7 +29,7 @@ script.
       
       if (!{Boolean(option)}) {
         const otherData = !{option}
-        initData = Object.assign({}, initData, otherData)
+        initData = Object.assign(initData, otherData)
       }
       
       const valine = new Valine(initData)
@@ -40,7 +40,7 @@ script.
   }
 
   if ('!{theme.comments.use[0]}' === 'Valine' || !!{theme.comments.lazyload}) {
-    if (!{theme.comments.lazyload}) btf.loadComment(document.querySelector('#vcomment'),loadValine)
+    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('vcomment'),loadValine)
     else setTimeout(loadValine, 0)
   } else {
     function loadOtherComment () {

layout/includes/third-party/comments/waline.pug

@@ -4,7 +4,7 @@ script.
   function loadWaline () {
     function initWaline () {
       let initData = {
-        el: '#waline',
+        el: '#waline-wrap',
         serverURL: '!{theme.waline.serverURL}',
         avatar: '#{theme.waline.avatar}',
         path: location.pathname,
@@ -12,7 +12,7 @@ script.
       
       if (!{Boolean(option)}) {
         const otherData = !{option}
-        initData = Object.assign({}, initData, otherData)
+        initData = Object.assign(initData, otherData)
       }
       
       const waline = new Waline(initData)
@@ -23,7 +23,7 @@ script.
   }
 
   if ('!{theme.comments.use[0]}' === 'Waline' || !!{theme.comments.lazyload}) {
-    if (!{theme.comments.lazyload}) btf.loadComment(document.querySelector('#waline'),loadWaline)
+    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('waline-wrap'),loadWaline)
     else setTimeout(loadWaline, 0)
   } else {
     function loadOtherComment () {

layout/includes/third-party/newest-comments/twikoo-comment.pug

@@ -16,7 +16,7 @@ script.
     const getComment = () => {
       const runTwikoo = () => {
         twikoo.getRecentComments({
-          envId: '!{theme.twikoo}',
+          envId: '!{theme.twikoo.envId}',
           pageSize: !{theme.newest_comments.limit},
           includeReply: true
         }).then(function (res) {

layout/includes/widget/card_announcement.pug

@@ -1,7 +1,6 @@
 if theme.aside.card_announcement.enable
   .card-widget.card-announcement
-    .card-content
-      .item-headline
-        i.fas.fa-bullhorn.card-announcement-animation
-        span= _p('aside.card_announcement')
-      .announcement_content!= theme.aside.card_announcement.content
+    .item-headline
+      i.fas.fa-bullhorn.card-announcement-animation
+      span= _p('aside.card_announcement')
+    .announcement_content!= theme.aside.card_announcement.content

layout/includes/widget/card_archives.pug

@@ -1,12 +1,11 @@
 if theme.aside.card_archives.enable
   .card-widget.card-archives
-    .card-content
-      .item-headline
-        i.fas.fa-archive
-        span= _p('aside.card_archives')
-      
-      - let type = theme.aside.card_archives.type || 'monthly'
-      - let format = theme.aside.card_archives.format || 'MMMM YYYY'
-      - let order = theme.aside.card_archives.order || -1
-      - let limit = theme.aside.card_archives.limit === 0 ? 0 : theme.aside.card_archives.limit || 8
-      != aside_archives({ type:type, format: format, order: order, limit: limit })
+    .item-headline
+      i.fas.fa-archive
+      span= _p('aside.card_archives')
+    
+    - let type = theme.aside.card_archives.type || 'monthly'
+    - let format = theme.aside.card_archives.format || 'MMMM YYYY'
+    - let order = theme.aside.card_archives.order || -1
+    - let limit = theme.aside.card_archives.limit === 0 ? 0 : theme.aside.card_archives.limit || 8
+    != aside_archives({ type:type, format: format, order: order, limit: limit })

layout/includes/widget/card_author.pug

@@ -1,37 +1,36 @@
 if theme.aside.card_author.enable
   .card-widget.card-info
-    .card-content
-      .card-info-avatar.is-center
-        if theme.lazyload.enable
-          img.avatar-img(data-lazy-src=url_for(theme.avatar.img) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt="avatar")
-        else
-          img.avatar-img(src=url_for(theme.avatar.img) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt="avatar")      
-        .author-info__name= config.author
-        .author-info__description!= theme.aside.card_author.description || config.description
+    .card-info-avatar.is-center
+      if theme.lazyload.enable
+        img.avatar-img(data-lazy-src=url_for(theme.avatar.img) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt="avatar")
+      else
+        img.avatar-img(src=url_for(theme.avatar.img) onerror=`this.onerror=null;this.src='` + url_for(theme.error_img.flink) + `'` alt="avatar")      
+      .author-info__name= config.author
+      .author-info__description!= theme.aside.card_author.description || config.description
 
-      .card-info-data
-        if site.posts.length
-          .card-info-data-item.is-center
-            a(href=url_for(config.archive_dir) + '/')
-              .headline= _p('aside.articles') 
-              .length-num= site.posts.length
+    .card-info-data
+      if site.posts.length
+        .card-info-data-item.is-center
+          a(href=url_for(config.archive_dir) + '/')
+            .headline= _p('aside.articles') 
+            .length-num= site.posts.length
 
-        if site.tags.length
-          .card-info-data-item.is-center
-            a(href=url_for(config.tag_dir) + '/')
-              .headline= _p('aside.tags')
-              .length-num= site.tags.length
+      if site.tags.length
+        .card-info-data-item.is-center
+          a(href=url_for(config.tag_dir) + '/')
+            .headline= _p('aside.tags')
+            .length-num= site.tags.length
 
-        if site.categories.length
-          .card-info-data-item.is-center
-            a(href=url_for(config.category_dir) + '/')
-              .headline= _p('aside.categories') 
-              .length-num= site.categories.length
+      if site.categories.length
+        .card-info-data-item.is-center
+          a(href=url_for(config.category_dir) + '/')
+            .headline= _p('aside.categories') 
+            .length-num= site.categories.length
 
-      a#card-info-btn.button--animated(href=theme.aside.card_author.button.link)
-        i(class=theme.aside.card_author.button.icon)
-        span=theme.aside.card_author.button.text
-    
-      if(theme.social)
-          .card-info-social-icons.is-center
-            !=fragment_cache('social', function(){return partial('includes/header/social')}) 
+    a#card-info-btn.button--animated(href=theme.aside.card_author.button.link)
+      i(class=theme.aside.card_author.button.icon)
+      span=theme.aside.card_author.button.text
+  
+    if(theme.social)
+        .card-info-social-icons.is-center
+          !=fragment_cache('social', function(){return partial('includes/header/social')}) 

layout/includes/widget/card_categories.pug

@@ -1,8 +1,7 @@
 if theme.aside.card_categories.enable
   if site.categories.length
     .card-widget.card-categories
-        .card-content
-          .item-headline
-            i.fas.fa-folder-open
-            span= _p('aside.card_categories')
-          !=aside_categories({ limit: theme.aside.card_categories.limit === 0 ? 0 : theme.aside.card_categories.limit || 8 , expand: theme.aside.card_categories.expand })
+      .item-headline
+        i.fas.fa-folder-open
+        span= _p('aside.card_categories')
+      !=aside_categories({ limit: theme.aside.card_categories.limit === 0 ? 0 : theme.aside.card_categories.limit || 8 , expand: theme.aside.card_categories.expand })

layout/includes/widget/card_newest_comment.pug

@@ -1,8 +1,7 @@
 if theme.newest_comments.enable
   .card-widget#card-newest-comments
-    .card-content
-      .item-headline
-        i.fas.fa-bolt
-        span= _p('aside.card_newest_comments.headline')
-      .aside-list
-        span= _p('aside.card_newest_comments.loading_text')
+    .item-headline
+      i.fas.fa-bolt
+      span= _p('aside.card_newest_comments.headline')
+    .aside-list
+      span= _p('aside.card_newest_comments.loading_text')

layout/includes/widget/card_post_toc.pug

@@ -1,13 +1,12 @@
 - let tocNumber = page.toc_number !== undefined ? page.toc_number : theme.toc.number
 
 #card-toc.card-widget
-  .card-content
-    .item-headline
-      i.fas.fa-stream
-      span= _p('aside.card_toc')
+  .item-headline
+    i.fas.fa-stream
+    span= _p('aside.card_toc')
 
-    if (page.encrypt == true)
-      .toc-content.toc-div-class(style="display:none")!=toc(page.origin, {list_number: tocNumber})
-    else 
-      .toc-content!=toc(page.content, {list_number: tocNumber})
+  if (page.encrypt == true)
+    .toc-content.toc-div-class(style="display:none")!=toc(page.origin, {list_number: tocNumber})
+  else 
+    .toc-content!=toc(page.content, {list_number: tocNumber})
       

layout/includes/widget/card_recent_post.pug

@@ -1,28 +1,27 @@
 if theme.aside.card_recent_post.enable
   .card-widget.card-recent-post
-    .card-content
-      .item-headline
-        i.fas.fa-history
-        span= _p('aside.card_recent_post')
-      .aside-list
-        - let postLimit = theme.aside.card_recent_post.limit === 0 ? site.posts.length : theme.aside.card_recent_post.limit || 5
-        - let sort = theme.aside.card_recent_post.sort === 'updated' ? 'updated' : 'date'
-        - site.posts.sort(sort, -1).limit(postLimit).each(function(article){
-          - let link = article.link || article.path
-          - let title = article.title || _p('no_title')
-          - let no_cover = article.cover === false || !theme.cover.aside_enable ? 'no-cover' : ''
-          - let post_cover = article.cover
-          .aside-list-item(class=no_cover)
-            if post_cover && theme.cover.aside_enable
-              a.thumbnail(href=url_for(link) title=title)
-                if theme.lazyload.enable
-                  img(data-lazy-src=url_for(post_cover) onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'` alt=title)
-                else
-                  img(src=url_for(post_cover) onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'` alt=title)
-            .content
-              a.title(href=url_for(link) title=title)= title
-              if theme.aside.card_recent_post.sort === 'updated'
-                time(datetime=date_xml(article.updated) title=_p('post.updated') + ' ' + full_date(article.updated)) #[=date(article.updated, config.date_format)]
+    .item-headline
+      i.fas.fa-history
+      span= _p('aside.card_recent_post')
+    .aside-list
+      - let postLimit = theme.aside.card_recent_post.limit === 0 ? site.posts.length : theme.aside.card_recent_post.limit || 5
+      - let sort = theme.aside.card_recent_post.sort === 'updated' ? 'updated' : 'date'
+      - site.posts.sort(sort, -1).limit(postLimit).each(function(article){
+        - let link = article.link || article.path
+        - let title = article.title || _p('no_title')
+        - let no_cover = article.cover === false || !theme.cover.aside_enable ? 'no-cover' : ''
+        - let post_cover = article.cover
+        .aside-list-item(class=no_cover)
+          if post_cover && theme.cover.aside_enable
+            a.thumbnail(href=url_for(link) title=title)
+              if theme.lazyload.enable
+                img(data-lazy-src=url_for(post_cover) onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'` alt=title)
               else
-                time(datetime=date_xml(article.date) title=_p('post.created') + ' ' + full_date(article.date)) #[=date(article.date, config.date_format)]
-        - })
+                img(src=url_for(post_cover) onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'` alt=title)
+          .content
+            a.title(href=url_for(link) title=title)= title
+            if theme.aside.card_recent_post.sort === 'updated'
+              time(datetime=date_xml(article.updated) title=_p('post.updated') + ' ' + full_date(article.updated)) #[=date(article.updated, config.date_format)]
+            else
+              time(datetime=date_xml(article.date) title=_p('post.created') + ' ' + full_date(article.date)) #[=date(article.date, config.date_format)]
+      - })

layout/includes/widget/card_self.pug

@@ -0,0 +1,9 @@
+if site.data.widget
+  each item in site.data.widget
+    .card-widget(class=item.class_name id=item.id_name style=item.order ? `order: ${item.order}` : '')
+      .item-headline
+        i(class=item.icon)
+        span=item.name
+      .item-content
+        !=item.html
+

layout/includes/widget/card_tags.pug

@@ -1,13 +1,12 @@
 if theme.aside.card_tags.enable
   if site.tags.length
     .card-widget.card-tags
-      .card-content
-        .item-headline
-          i.fas.fa-tags
-          span= _p('aside.card_tags')
+      .item-headline
+        i.fas.fa-tags
+        span= _p('aside.card_tags')
 
-        - let tagLimit = theme.aside.card_tags.limit === 0 ? 0 : theme.aside.card_tags.limit || 40
-        if theme.aside.card_tags.color
-          .card-tag-cloud!= cloudTags({source: site.tags, minfontsize: 1.1, maxfontsize: 1.5, limit: tagLimit, unit: 'em'})
-        else
-          .card-tag-cloud!= tagcloud({min_font: 1.1, max_font: 1.5, amount: tagLimit , color: true, start_color: '#999', end_color: '#99a9bf', unit: 'em'})
+      - let tagLimit = theme.aside.card_tags.limit === 0 ? 0 : theme.aside.card_tags.limit || 40
+      if theme.aside.card_tags.color
+        .card-tag-cloud!= cloudTags({source: site.tags, minfontsize: 1.1, maxfontsize: 1.5, limit: tagLimit, unit: 'em'})
+      else
+        .card-tag-cloud!= tagcloud({min_font: 1.1, max_font: 1.5, amount: tagLimit , color: true, start_color: '#999', end_color: '#99a9bf', unit: 'em'})

layout/includes/widget/card_webinfo.pug

@@ -1,32 +1,31 @@
 if theme.aside.card_webinfo.enable
   .card-widget.card-webinfo
-    .card-content
-      .item-headline
-        i.fas.fa-chart-line
-        span= _p('aside.card_webinfo.headline')
-      .webinfo
-        if theme.aside.card_webinfo.post_count
-          .webinfo-item
-            .item-name= _p('aside.card_webinfo.article_name') + " :"
-            .item-count= site.posts.length
-        if theme.runtimeshow.enable
-          .webinfo-item
-            .item-name= _p('aside.card_webinfo.runtime.name') + " :"
-            .item-count#runtimeshow(data-publishDate=date_xml(theme.runtimeshow.publish_date))
-        if theme.wordcount.enable && theme.wordcount.total_wordcount
-          .webinfo-item
-            .item-name=_p('aside.card_webinfo.site_wordcount') + " :"
-            .item-count=totalcount(site)
-        if theme.busuanzi.site_uv 
-          .webinfo-item
-            .item-name= _p('aside.card_webinfo.site_uv_name') + " :"
-            .item-count#busuanzi_value_site_uv
-        if theme.busuanzi.site_pv
-          .webinfo-item
-            .item-name= _p('aside.card_webinfo.site_pv_name') + " :"
-            .item-count#busuanzi_value_site_pv
-        if theme.aside.card_webinfo.last_push_date
-          .webinfo-item
-            .item-name= _p('aside.card_webinfo.last_push_date.name') + " :"
-            .item-count#last-push-date(data-lastPushDate=date_xml(Date.now()))
+    .item-headline
+      i.fas.fa-chart-line
+      span= _p('aside.card_webinfo.headline')
+    .webinfo
+      if theme.aside.card_webinfo.post_count
+        .webinfo-item
+          .item-name= _p('aside.card_webinfo.article_name') + " :"
+          .item-count= site.posts.length
+      if theme.runtimeshow.enable
+        .webinfo-item
+          .item-name= _p('aside.card_webinfo.runtime.name') + " :"
+          .item-count#runtimeshow(data-publishDate=date_xml(theme.runtimeshow.publish_date))
+      if theme.wordcount.enable && theme.wordcount.total_wordcount
+        .webinfo-item
+          .item-name=_p('aside.card_webinfo.site_wordcount') + " :"
+          .item-count=totalcount(site)
+      if theme.busuanzi.site_uv 
+        .webinfo-item
+          .item-name= _p('aside.card_webinfo.site_uv_name') + " :"
+          .item-count#busuanzi_value_site_uv
+      if theme.busuanzi.site_pv
+        .webinfo-item
+          .item-name= _p('aside.card_webinfo.site_pv_name') + " :"
+          .item-count#busuanzi_value_site_pv
+      if theme.aside.card_webinfo.last_push_date
+        .webinfo-item
+          .item-name= _p('aside.card_webinfo.last_push_date.name') + " :"
+          .item-count#last-push-date(data-lastPushDate=date_xml(Date.now()))
 

layout/includes/widget/index.pug

@@ -1,4 +1,4 @@
-#aside_content.aside_content
+#aside-content.aside-content
   //- post
   if is_post()
     if showToc && theme.toc.style_simple
@@ -23,4 +23,5 @@
       !=partial('includes/widget/card_categories', {}, {cache:theme.fragment_cache})
       !=partial('includes/widget/card_tags', {}, {cache:theme.fragment_cache})
       !=partial('includes/widget/card_archives', {}, {cache:theme.fragment_cache})
-      !=partial('includes/widget/card_webinfo', {}, {cache:theme.fragment_cache})
+      !=partial('includes/widget/card_webinfo', {}, {cache:theme.fragment_cache})
+      !=partial('includes/widget/card_self', {}, {cache:theme.fragment_cache})