hexo-theme-solitude 1.8.12 → 1.9.0

package/README.md

@@ -38,7 +38,7 @@
 [![gitee](https://img.shields.io/badge/Gitee-red?logo=gitee)](https://gitee.com/nsjjd_w/hexo-theme-solitude)
 [![gitlab](https://img.shields.io/badge/GitLab-blue?logo=gitlab)](https://gitlab.com/efu/hexo-theme-solitude)
 
-[预览](https://www.efu.me/) 丨  [文档](https://solitude-docs.efu.me/)
+[预览](https://www.efu.me/) 丨  [文档](https://docs.efu.me/)
 
 </div>
 
@@ -73,13 +73,13 @@
       theme: solitude
       ```
    
-前往 [文档](https://solitude-docs.efu.me/) 获取更多信息。
+前往 [文档](https://docs.efu.me/) 获取更多信息。
 
 ## 赞助者
 
 <p align="center">
   <a href="https://cdn.jsdelivr.net/gh/efuo/static/sponsors.svg">
-    <img src='https://cdn.jsdelivr.net/gh/efuo/static/sponsors.svg'/>
+    <img src='https://cdn.jsdelivr.net/gh/efuo/static/sponsors.svg' alt="赞助者"/>
   </a>
 </p>
 

package/README_en-US.md

@@ -38,7 +38,7 @@
 [![gitee](https://img.shields.io/badge/Gitee-red?logo=gitee)](https://gitee.com/nsjjd_w/hexo-theme-solitude)
 [![gitlab](https://img.shields.io/badge/GitLab-blue?logo=gitlab)](https://gitlab.com/efu/hexo-theme-solitude)
 
-[Preview](https://efu.me/) 丨  [Documentation](https://solitude-docs.efu.me/)
+[Preview](https://efu.me/) 丨  [Documentation](https://docs.efu.me/)
 
 </div>
 
@@ -73,7 +73,7 @@
       theme: solitude
       ```
 
-Check out the [Documentation](https://solitude-docs.efu.me/) for more information.
+Check out the [Documentation](https://docs.efu.me/) for more information.
 
 ## Sponsors
 

package/README_fr.md

@@ -39,7 +39,7 @@ Le thème se compose de [@张洪Heo](https://github.com/zhheo) Autorisation comp
 [![gitee](https://img.shields.io/badge/Gitee-red?logo=gitee)](https://gitee.com/nsjjd_w/hexo-theme-solitude)
 [![gitlab](https://img.shields.io/badge/GitLab-blue?logo=gitlab)](https://gitlab.com/efu/hexo-theme-solitude)
 
-[Aperçu](https://www.efu.me/) 丨  [documentation](https://solitude-docs.efu.me/)
+[Aperçu](https://www.efu.me/) 丨  [documentation](https://docs.efu.me/)
 
 </div>
 
@@ -75,7 +75,7 @@ Le thème se compose de [@张洪Heo](https://github.com/zhheo) Autorisation comp
       theme: solitude
       ```
 
-Go to [Docs](https://solitude-docs.efu.me) for more information.
+Go to [Docs](https://docs.efu.me) for more information.
 
 ## Sponsors
 

package/README_ja.md

@@ -38,7 +38,7 @@
 [![gitee](https://img.shields.io/badge/Gitee-red?logo=gitee)](https://gitee.com/nsjjd_w/hexo-theme-solitude)
 [![gitlab](https://img.shields.io/badge/GitLab-blue?logo=gitlab)](https://gitlab.com/efu/hexo-theme-solitude)
 
-[プレビュー](https://www.efu.me/) 丨  [ドキュメンテーション](https://solitude-docs.efu.me/)
+[プレビュー](https://www.efu.me/) 丨  [ドキュメンテーション](https://docs.efu.me/)
 
 </div>
 
@@ -73,7 +73,7 @@
       theme: solitude
       ```
 
-詳しくは [Docs](https://solitude-docs.efu.me) をご覧ください。
+詳しくは [Docs](https://docs.efu.me) をご覧ください。
 
 ## スポンサー
 

package/README_zh-Hant.md

@@ -38,7 +38,7 @@
 [![gitee](https://img.shields.io/badge/Gitee-red?logo=gitee)](https://gitee.com/nsjjd_w/hexo-theme-solitude)
 [![gitlab](https://img.shields.io/badge/GitLab-blue?logo=gitlab)](https://gitlab.com/efu/hexo-theme-solitude)
 
-[預覽](https://efu.me/) 丨  [文档](https://solitude-docs.efu.me/)
+[預覽](https://efu.me/) 丨  [文档](https://docs.efu.me/)
 
 </div>
 
@@ -71,7 +71,7 @@
       theme: solitude
       ```
 
-前往 [文檔](https://solitude-docs.efu.me) 獲取更多資訊。
+前往 [文檔](https://docs.efu.me) 獲取更多資訊。
 
 ## 贊助者
 

package/_config.yml

@@ -354,9 +354,14 @@ post:
     title: 感谢您的赞赏。
     desc: 因为有你们的支持，我才体会到写文章的价值。
     list:
-    #  - name: 支付宝
-    #    qcode: https://7.isyangs.cn/34/65f2e5a6d2ef5-34.png
-    #    color: var(--efu-blue)
+    #  - name: 爱发电
+    #    qcode: https://s3.qjqq.cn/47/661ba8e695f17.webp!color
+    #    url: https://afdian.net/a/efu0u0/
+    #    color: var(--efu-purple)
+    #  - name: Github Sponsor
+    #    qcode: https://s3.qjqq.cn/47/661ba900c4bc1.webp!color
+    #    url: https://github.com/sponsors/efuo
+    #    color: var(--efu-black)
   # 版权中订阅按钮跳转链接，填写地址后开启
   # Subscription button jump link in copyright
   rss: # /atom.xml
@@ -655,6 +660,23 @@ search:
     preload: false
     CDN:
 
+# Post Chat AI
+# 后台地址：https://ai.tianli0.top/?InviteID=OZ3Z0V2R
+tianli_talk:
+  enable: false
+  title: 智能客服与搜索
+  key: # https://ai.tianli0.top/?InviteID=OZ3Z0V2R
+  # 默认值
+  # backgroundColor: "var(--efu-main)",
+  # bottom: "60px",
+  option: #https://ai.tianli0.top/codeMaker.html
+  #  defaultInput: false
+  #  upLoadWeb: true
+  #  userTitle: Efu Chat
+  #  userDesc: 你好，我是 Efu 的智能客服，有什么可以帮助你的？
+  #  showInviteLink: 'https://ai.tianli0.top/?InviteID=OZ3Z0V2R'
+  #  blackDom:
+  #    - .aplayer
 # 文章摘要AI
 # post abstract AI
 post_ai:

package/languages/default.yml

@@ -180,6 +180,11 @@ right_menu:
     forward: Forward
     copyMusicName: CopyName
 
+pagination:
+  prev: Prev
+  next: Next
+  to: To page
+
 about:
   other:
     oneself:

package/languages/en.yml

@@ -180,6 +180,11 @@ right_menu:
     forward: Forward
     copyMusicName: CopyName
 
+pagination:
+  prev: Prev
+  next: Next
+  to: To page
+
 about:
   other:
     oneself:

package/languages/zh-CN.yml

@@ -182,6 +182,11 @@ right_menu:
     forward: 切换到下一首
     copyMusicName: 复制歌名
 
+pagination:
+  prev: 上一页
+  next: 下一页
+  to: 跳转到指定页面
+
 about:
   other:
     oneself:

package/languages/zh-TW.yml

@@ -182,6 +182,11 @@ right_menu:
     forward: 切換到下一首
     copyMusicName: 複製歌名
 
+pagination:
+  prev: 上一頁
+  next: 下一頁
+  to: 跳轉到指定頁面
+
 about:
   other:
     oneself:

package/layout/includes/inject/head.pug

@@ -27,7 +27,7 @@ include ../head/pwa.pug
 
 script.
     console.log(
-        "%c Program: Hexo %c Theme: Solitude %c Version: v1.8.12",
+        "%c Program: Hexo %c Theme: Solitude %c Version: v1.9.0",
         "border-radius:5px 0 0 5px;padding: 5px 10px;color:white;background:#ff3842;",
         "padding: 5px 10px;color:white;background:#3e9f50;",
         "padding: 5px 10px;color:white;background:#0084ff;",

package/layout/includes/layout.pug

@@ -45,6 +45,10 @@ html(lang=config.language, data-theme="light")
         // search
         include ./widgets/third-party/search/index.pug
 
+        // Tianli-Talk
+        if theme.tianli_talk.enable
+            include ./widgets/third-party/tianli-talk.pug
+
         // music
         if theme.capsule.enable
             include ./widgets/third-party/music.pug

package/layout/includes/mixins/pagination.pug

@@ -1,8 +1,8 @@
 nav#pagination
     div.pagination
-        - var options = {mid_size: 1,escape: false,next_text: '<div class="pagination_tips_next">下页</div> <i class="solitude st-arrow-right-bold"></i>',prev_text: '<i class="solitude st-arrow-left-bold"></i> <div class="pagination_tips_prev">上页</div>'}
+        - var options = {mid_size: 1,escape: false,next_text: `<div class="pagination_tips_next">${_p("pagination.next")}</div> <i class="solitude st-arrow-right-bold"></i>`,prev_text: `<i class="solitude st-arrow-left-bold"></i> <div class="pagination_tips_prev">${_p("pagination.prev")}</div>`}
         !=paginator(options)
         div.toPageGroup
-            input#toPageText(oninput="value=value.replace(/[^0-9]/g,'')" maxlength="3" title="跳转到指定页面" onkeyup="if (this.value === '0') this.value = ''")
+            input#toPageText(oninput="value=value.replace(/[^0-9]/g,'')" maxlength="3" title=_p('pagination.to') onkeyup="if (this.value === '0') this.value = ''")
             a#toPageButton(onclick="sco.toPage()")
                 i.solitude.st-show-right-line

package/layout/includes/widgets/aside/aside.pug

@@ -2,29 +2,17 @@
     - var noSticky, Sticky, customNoSticky, customSticky;
     if(is_home())
         - noSticky = theme.aside.home.noSticky.split(',')
-        - customNoSticky = site.data.aside?.home?.noSticky
-        - customSticky = site.data.aside?.home?.Sticky
         - Sticky = theme.aside.home.Sticky.split(',')
     else if(is_post())
         - noSticky = theme.aside.post.noSticky.split(',')
-        - customNoSticky = site.data.aside?.post?.noSticky
-        - customSticky = site.data.aside?.post?.Sticky
         - Sticky = theme.aside.post.Sticky.split(',')
     else if(is_page() || is_archive() || is_tag() || is_category())
         - noSticky = theme.aside.page.noSticky.split(',')
-        - customNoSticky = site.data.aside?.page?.noSticky
-        - customSticky = site.data.aside?.page?.Sticky
         - Sticky = theme.aside.page.Sticky.split(',')
     each item in noSticky
         include ./asideSwitch.pug
-    if customNoSticky
-        each item in customNoSticky
-            include ./asideCustom.pug
     .sticky_layout
         if page.toc
             include ./asideToc.pug
-        if customSticky
-            each item in customSticky
-                include ./asideCustom.pug
         each item in Sticky
             include ./asideSwitch.pug

package/layout/includes/widgets/aside/asideCustom.pug

@@ -1,6 +1,6 @@
-.card-widget(class=item.class_name, id=item.id_name)
+.card-widget(class=item.class, id=item.id)
     .item-headline
         i(class=item.icon)
-        span=item.name
-    div(class=item.class_content ||'item-content', id=item.id_content, style=item.style_content)
-        != item.html
+        span=item.title
+    div(class=item.content_class ||'item-content', id=item.content_id, style=item.content_css)
+        != item.content_html

package/layout/includes/widgets/aside/asideSwitch.pug

@@ -8,4 +8,8 @@ case item
     when 'allInfo'
         include ./asideAllInfo.pug
     default
-        include ../../page/default.pug
+        - const custom = site.data?.aside?.find((i) => i.name === item)
+        if custom
+            != partial("includes/widgets/aside/asideCustom", {item: custom}, {cache: true})
+        else
+            include ../../page/default.pug

package/layout/includes/widgets/post/award.pug

@@ -1,5 +1,5 @@
-.post-reward(onclick="AddRewardMask()")
-    .reward-button(title=_p('award.tipping'))
+.post-reward
+    .reward-button(title=_p('award.tipping') onclick="AddRewardMask()")
         i.solitude.st-hand-heart-fill
         =_p('award.tipping')
     .reward-main
@@ -9,7 +9,8 @@
                 - let list = theme.post.award.list || []
                 for item in list
                     li.reward-item
-                        img.post-qr-code-img.nolazyload(src=item.qcode, alt=item.name, style="border-color: " + item.color)
+                        a(href=url_for(item.url))
+                            img.post-qr-code-img.nolazyload(src=item.qcode, alt=item.name, style="border-color: " + item.color)
                         .post-qr-code-desc=item.name
             a.reward-main-btn(href=url_for(theme.post.award.appreciators))
                 .reward-text= _p('award.title')
@@ -20,8 +21,6 @@ script.
         let rewardMainElements = document.querySelectorAll(".reward-main");
         let quitBoxElement = document.querySelector("#quit-box");
 
-        console.log("RemoveRewardMask")
-
         rewardMainElements.forEach(element => {
             element.style.display = "none";
         });
@@ -35,8 +34,6 @@ script.
         let rewardMainElements = document.querySelectorAll(".reward-main");
         let quitBoxElement = document.querySelector("#quit-box");
 
-        console.log("AddRewardMask")
-
         rewardMainElements.forEach(element => {
             element.style.display = "flex";
         });

package/layout/includes/widgets/third-party/tianli-talk.pug

@@ -0,0 +1,26 @@
+- const {key,option,title} = theme.tianli_talk
+
+span.needEndHide#efuTalk(onclick="togglePostChatContainer(); return false;" title=title)
+    i.solitude.st-robot-fill
+    span.efuTalkTitle=title
+
+script.
+    var postChatConfig = {
+    backgroundColor: "var(--efu-main)",
+    bottom: "60px",
+    ...!{JSON.stringify(option)}
+    };
+
+    let b = true;
+
+    document.getElementById('efuTalk').addEventListener('click', function () {
+        this.classList.toggle('on');
+        let efu = this
+        b && setTimeout(() => {
+            document.getElementById('close-button').addEventListener('click', function () {
+                efu.classList.remove('on');
+            })
+        }, 0);
+        b = false
+    });
+script(pjax data-postChat_key=key src="https://ai.tianli0.top/static/public/postChatUser.min.js")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "1.8.12",
+  "version": "1.9.0",
   "description": "A beautiful, powerful, and efficient Hexo theme developed by the efu.",
   "main": "package.json",
   "scripts": {

package/source/css/_layout/header.styl

@@ -791,52 +791,54 @@ if hexo-config('nav.group')
         &:after
           color var(--efu-card-bg)
 
-.back-menu-list-groups
-  .back-menu-list
-    display flex
-    flex-direction row
-    flex-wrap wrap
-    width 340px
-    justify-content space-between
+.back-menu-list
+  display flex
+  flex-direction row
+  flex-wrap wrap
+  width 340px
+  justify-content space-between
 
-    &::before
-      position absolute
-      top -15px
-      left 0
-      width 100%
-      height 20px
-      content ''
+  &::before
+    position absolute
+    top -15px
+    left 0
+    width 100%
+    height 20px
+    content ''
 
-    .back-menu-item
-      display flex
-      align-items center
-      margin 4px 8px
-      padding 4px 8px
+.back-menu-item
+  display flex
+  align-items center
+  margin 4px 8px
+  padding 4px 8px
 
-      #nav &
-        padding 4px 8px
+  #nav &
+    padding 4px 8px
 
-      &:hover
-        background var(--efu-lighttext)
-        transform scale(1)
+  #nav &
+    &:hover
+      background var(--efu-lighttext)
 
-        .back-menu-item-text
-          color var(--efu-card-bg)
+  &:hover
+    background var(--efu-lighttext)
 
-      .back-menu-item-icon
-        width 24px
-        height 24px
-        border-radius 8px
-        background var(--efu-none)
+    .back-menu-item-text
+      color var(--efu-card-bg)
 
-      .back-menu-item-text
-        font-size 16px
-        transition .3s
-        margin-left .5rem
-        color var(--efu-fontcolor)
+  .back-menu-item-icon
+    width 24px
+    height 24px
+    border-radius 8px
+    background var(--efu-none)
 
-        +maxWidth768()
-          font-size 14px
+  .back-menu-item-text
+    font-size 16px
+    transition .3s
+    margin-left .5rem
+    color var(--efu-fontcolor)
+
+    +maxWidth768()
+      font-size 14px
 
 .page
   #nav

package/source/css/_page/index.styl

@@ -61,4 +61,8 @@ if $about
 +minWidth768()
   .needEndHide.hide
     bottom -200px !important
-    opacity 0
+    opacity 0
+
++maxWidth768()
+  .needEndHide
+    display none!important

package/source/css/index.styl

@@ -27,4 +27,8 @@ if hexo-config('search.enable')
 
 // comment
 if hexo-config('comment.use')
-  @import '_comments/comment.styl'
+  @import '_comments/comment.styl'
+
+// third party
+if hexo-config('tianli_talk.enable')
+  @import 'third_party/tianli_talk.styl'

package/source/css/third_party/tianli_talk.styl

@@ -0,0 +1,62 @@
+#efuTalk
+  display flex
+  align-items center
+  z-index 1001
+  position fixed
+  bottom 70px
+  left 20px
+  height 38px
+  cursor pointer
+  transition .3s
+  box-shadow var(--efu-shadow-border)
+  background var(--efu-card-bg)
+  border-radius 20px
+  overflow hidden
+  padding 8px
+  color var(--efu-fontcolor)
+  width 42px
+  border var(--style-border-always)
+
+#efuTalk.on, #efuTalk:hover
+  background var(--efu-lighttext)
+  color var(--efu-card-bg)
+  width 159px
+  border-color var(--efu-lighttext)
+
+#efuTalk span.efuTalkTitle
+  display flex
+  font-size 14px
+  padding 0 12px
+  line-height 1
+  white-space nowrap
+  opacity 0
+  transition .3s
+
+#postChat_iframeContainer
+  z-index 1000
+  border var(--style-border-always)
+  background var(--efu-card-bg)
+  animation to_show_fromLeftBottom .2s ease-out
+  border-radius 12px
+
+#efuTalk.on span.efuTalkTitle, #efuTalk:hover span.efuTalkTitle
+  color var(--efu-card-bg)
+  opacity 1
+
+#postChat_button
+  display none!important
+
+#efuTalk i.solitude.efuTalkIcon
+  width 18px
+  height 18px
+  font-size 18px
+  margin-left 3px
+  line-height 1
+
+@keyframes to_show_fromLeftBottom
+  from
+    opacity 0
+    transform scale(0)
+  to
+    opacity 1
+    transform scale(1)

package/source/js/right_menu.js

@@ -111,7 +111,6 @@ window.oncontextmenu = (ele) => {
     let x = ele.clientX + 10;
     let y = ele.clientY;
     Array.from(rm.menuItems.other).forEach(item => item.style.display = 'block');
-
     rm.globalEvent = ele
 
     let display = false
@@ -174,7 +173,7 @@ window.oncontextmenu = (ele) => {
     return false;
 }
 
-(function() {
+(function () {
     const addEventListener = (element, event, handler) => element.addEventListener(event, handler);
 
     addEventListener(rm.menuItems.back, 'click', () => window.history.back() || rm.hideRightMenu());
@@ -212,7 +211,7 @@ window.oncontextmenu = (ele) => {
         rm.hideRightMenu();
     });
 
-    if(utils.saveToLocal.get('commentBarrageSwitch') !== null){
+    if (utils.saveToLocal.get('commentBarrageSwitch') !== null) {
         rm.menuItems.barrage && rm.barrage(!utils.saveToLocal.get('commentBarrageSwitch'));
     }
 
@@ -221,6 +220,7 @@ window.oncontextmenu = (ele) => {
     addEventListener(rm.menuItems.new, 'click', () => window.open(rm.domhref) && rm.hideRightMenu());
     addEventListener(rm.menuItems.downloadImg, 'click', () => rm.downloadImage() && rm.hideRightMenu());
     addEventListener(rm.menuItems.copyImg, 'click', () => rm.copyImage() && rm.hideRightMenu());
+    addEventListener(rm.menuItems.copyLink, 'click', () => rm.copyText(rm.domhref) && rm.hideRightMenu());
 })();
 
 is_rm = true