hexo-theme-stellar 1.19.0 → 1.21.0

package/layout/_partial/main/navbar/list_wiki.ejs

@@ -11,9 +11,10 @@ function layoutDiv() {
   el += ' href="' + url_for(config.wiki_dir || "/wiki/") + '">' + __("btn.all_wiki") + '</a>';
   el += '</a>';
   // 项目分类
-  for (let id of Object.keys(theme.wiki.all_tags)) {
-    let tag = theme.wiki.all_tags[id];
-    let projects = tag.items.filter(item => item.index !== false)
+  const { shelf, all_tags } = theme.wiki;
+  for (let id of Object.keys(all_tags)) {
+    let tag = all_tags[id];
+    let projects = tag.items.filter(item => shelf.includes(item))
     if (projects && projects.length > 0) {
       el += '<a';
       if (tag.name && tag.name.length > 0 && page.tagName === tag.name) {

package/layout/_partial/main/post_list/post_card.ejs

@@ -90,7 +90,7 @@ function div_default() {
     }
   }
   if (post.pin) {
-    el += '<span class="pin"><img src="https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.4/badge/3279dd441df8b.svg"/></span>';
+    el += '<span class="pin"><img src="https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.9/badge/3279dd441df8b.svg"/></span>';
   }
   el += '</div>';
   el += '</article>';

package/layout/_partial/main/post_list/wiki_card.ejs

@@ -2,19 +2,14 @@
 function layoutDiv() {
   var el = '';
   el += '<article class="md-text">';
-  if (proj.logo && proj.logo.src) {
-    el += '<div class="preview">';
-    el += '<img src="' + proj.logo.src + '" alt="logo"';
-    if (proj.logo.small) {
-      el += ' height="' + proj.logo.small + '"';
-    }
-    el += '/>';
-    el += '</div>';
-  }
+  el += `<div class="preview"><img src="${proj.icon ? proj.icon : theme.default.project}"/></div>`
   el += '<div class="excerpt">';
   if (proj.tags && proj.tags.length > 0) {
-    let tag = proj.tags[0];
-    el += '<div class="cap breadcrumb"' + category_color(tag) + '>' + tag + '</div>';
+    el += '<div class="caps">';
+      for (let tag of proj.tags) {
+        el += '<span class="cap breadcrumb"' + category_color(tag) + '>' + tag + '</span>';
+      }
+    el += '</div>';
   }
   el += '<h2 class="post-title">' + (proj.title || proj.name) + '</h2>';
   if (proj.description) {

package/layout/_partial/{main/article/ai_abstract.ejs → plugins/ai/tianli_gpt.ejs}

@@ -1,7 +1,8 @@
 <% if (page.layout === 'post' || (page.layout === 'wiki' && page.wiki && page.wiki.length > 0)) { %>
   <script>
-    let tianliGPT_postSelector = '.md-text.content.<%= page.layout === 'post' ? 'post' : 'wiki' %>';
+    let tianliGPT_postSelector = '.md-text.content.<%= page.layout === "post" ? "post" : "wiki" %>';
     let tianliGPT_key = '<%= theme.plugins.tianli_gpt.api %>';
+    let tianliGPT_typingAnimate = '<%= theme.plugins.tianli_gpt.typingAnimate %>';
   </script>
-  <script defer src="https://cdn1.tianli0.top/gh/zhheo/Post-Abstract-AI@0.9/tianli_gpt.js"></script>
+  <script defer src="https://cdn1.tianli0.top/gh/zhheo/Post-Abstract-AI@0.13/tianli_gpt.js"></script>
 <% } %>

package/layout/_partial/plugins/comments/beaudar/script.ejs

@@ -6,7 +6,7 @@
       try {
         el.innerHTML = '';
       } catch (error) {
-        console.log(error);
+        console.error(error);
       }
       var script = document.createElement('script');
       script.src = 'https://beaudar.lipk.org/client.js';

package/layout/_partial/plugins/comments/giscus/script.ejs

@@ -6,7 +6,7 @@
       try {
         el.innerHTML = '';
       } catch (error) {
-        console.log(error);
+        console.error(error);
       }
       var script = document.createElement('script');
       script.src = 'https://giscus.app/client.js';

package/layout/_partial/plugins/comments/layout.ejs

@@ -12,8 +12,8 @@ if (theme.comments.service && theme.comments.service.length > 0) {
   }
 }
 // 合并项目评论
-if (loadComment && page.layout == 'wiki' && page.wiki) {
-  let proj = theme.wiki.projects[page.wiki];
+let proj = theme.wiki.tree[page.wiki];
+if (loadComment && page.layout == 'wiki' && page.wiki && (proj != null)) {
   if (proj.comment_title != undefined && page.comment_title == undefined) {
     if (['utterances', 'beaudar', 'giscus'].includes(theme.comments.service)) {
       page.comment_title = proj.comment_title;

package/layout/_partial/plugins/comments/utterances/script.ejs

@@ -6,7 +6,7 @@
       try {
         el.innerHTML = '';
       } catch (error) {
-        console.log(error);
+        console.error(error);
       }
       var script = document.createElement('script');
       script.src = 'https://utteranc.es/client.js';

package/layout/_partial/sidebar/header.ejs

@@ -1,7 +1,7 @@
 <%
 var proj;
 if (page.layout === 'wiki' && page.wiki) {
-  proj = theme.wiki.projects[page.wiki];
+  proj = theme.wiki.tree[page.wiki];
 }
 function layoutTitle(main, url, sub) {
   var el = '';

package/layout/_partial/sidebar/index.ejs

@@ -1,15 +1,15 @@
 <%
 var proj;
 if (page.layout === 'wiki' && page.wiki) {
-  proj = theme.wiki.projects[page.wiki];
+  proj = theme.wiki.tree[page.wiki];
 }
 // 默认组件
 if (page.sidebar == undefined) {
   if (page.layout == 'post' && page.content) {
     page.sidebar = theme.sidebar.widgets.post;
   } else if (page.layout == 'wiki' && page.content && page.wiki) {
-    let proj = theme.wiki.projects[page.wiki];
-    if (proj.sidebar) {
+    let proj = theme.wiki.tree[page.wiki];
+    if (proj?.sidebar) {
       page.sidebar = proj.sidebar;
     } else {
       page.sidebar = theme.sidebar.widgets.wiki;
@@ -56,7 +56,7 @@ function layoutWidgets() {
     el += '<widget class="widget-wrapper logo-wrap wiki"><div class="widget-body">';
     // all products
     el += '<a style="filter: grayscale(100%)" class="wiki-home cap" href="' + url_for(config.wiki_dir) + '">';
-    el += '<svg aria-hidden="true" viewBox="0 0 16 16" width="1rem" height="1rem" fill="currentColor"><path fill-rule="evenodd" d="M7.78 12.53a.75.75 0 01-1.06 0L2.47 8.28a.75.75 0 010-1.06l4.25-4.25a.75.75 0 011.06 1.06L4.81 7h7.44a.75.75 0 010 1.5H4.81l2.97 2.97a.75.75 0 010 1.06z"></path></svg>';
+    el += '<svg aria-hidden="true" viewBox="0 0 16 16" width="1.2em" height="1.2em" fill="currentColor"><path fill-rule="evenodd" d="M7.78 12.53a.75.75 0 01-1.06 0L2.47 8.28a.75.75 0 010-1.06l4.25-4.25a.75.75 0 011.06 1.06L4.81 7h7.44a.75.75 0 010 1.5H4.81l2.97 2.97a.75.75 0 010 1.06z"></path></svg>';
     el += __('btn.all_wiki');
     el += '</a>';
     // this product

package/layout/_partial/widgets/ghissues.ejs

@@ -6,7 +6,7 @@ function layoutDiv() {
   if (page.repo) {
     repo = page.repo
   } else if (page.layout === 'wiki' && page.wiki) {
-    let proj = theme.wiki.projects[page.wiki];
+    let proj = theme.wiki.tree[page.wiki];
     if (proj && proj.repo) {
       repo = proj.repo;
       if (proj.branch != undefined) {

package/layout/_partial/widgets/ghrepo.ejs

@@ -6,7 +6,7 @@ function layoutDiv() {
   if (page.repo) {
     repo = page.repo
   } else if (page.layout === 'wiki' && page.wiki) {
-    let proj = theme.wiki.projects[page.wiki];
+    let proj = theme.wiki.tree[page.wiki];
     if (proj && proj.repo) {
       repo = proj.repo;
       if (proj.branch != undefined) {

package/layout/_partial/widgets/ghuser.ejs

@@ -42,7 +42,7 @@ function layoutDiv() {
     el += '</div>';
     // follow
     el += '<a class="follow" href="https://github.com/' + item.username + '">';
-    el += '<svg aria-hidden="true" role="img" class="color-icon-primary" viewBox="0 0 16 16" width="1rem" height="1rem" fill="currentColor" style="display:inline-block;user-select:none;vertical-align:text-bottom;overflow:visible"><path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0016 8c0-4.42-3.58-8-8-8z"></path></svg>';
+    el += '<svg aria-hidden="true" role="img" class="color-icon-primary" viewBox="0 0 16 16" width="1em" height="1em" fill="currentColor" style="display:inline-block;user-select:none;vertical-align:text-bottom;overflow:visible"><path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0016 8c0-4.42-3.58-8-8-8z"></path></svg>';
     el += 'Follow';
     el += '</a>';
     // menu

package/layout/_partial/widgets/recent.ejs

@@ -15,8 +15,8 @@ function layoutDiv() {
   if (page.menu_id == 'wiki') {
     arr = theme.wiki.all_pages.filter( p => {
       if (p.wiki) {
-        let proj = theme.wiki.projects[p.wiki];
-        return proj.index != false;
+        let proj = theme.wiki.tree[p.wiki];
+        return proj?.index != false;
       }
       return false
     })
@@ -32,7 +32,7 @@ function layoutDiv() {
     el += '<a class="item title" href="' + url_for(post.link || post.path) + '">';
     el += '<span class="title">'
     if (post.layout == 'wiki') {
-      let proj = theme.wiki.projects[post.wiki];
+      let proj = theme.wiki.tree[post.wiki];
       let name = proj?.name || post?.wiki;
       if (name) {
         el += '<strong>' + name + '</strong>' + '<span class="dot"></span>';

package/layout/_partial/widgets/related.ejs

@@ -3,36 +3,28 @@ function layoutDiv() {
   if (page.layout !== "wiki") {
     return '';
   }
-  var related = [];
-  let proj = theme.wiki.projects[page.wiki];
-  if (proj.related && proj.related.length > 0) {
-    proj.related.forEach((pid, i) => {
-      let p = theme.wiki.projects[pid];
-      if (p && p.title !== proj.title && p.index !== false) {
-        related.push(p);
-      }
-    });
+  let thisItemObject = theme.wiki.tree[page.wiki];
+  if (thisItemObject == null) {
+    return '';
   }
+  const relatedItems = thisItemObject.relatedItems;
   var el = '';
-  if (related.length > 0) {
+  for (let relatedItem of relatedItems) {
     el += '<widget class="widget-wrapper related">';
     el += '<div class="widget-header cap theme dis-select">';
-    var title = __('btn.wiki');
-    if (proj.tags && proj.tags[0]) {
-      title = proj.tags[0];
-    }
-    el += '<span class="name">' + __('meta.more', title) + '</span>';
+    el += '<span class="name">' + __('meta.more', relatedItem.name) + '</span>';
     el += '</div>';
     el += '<div class="widget-body related-posts">';
-    related.forEach((p, i) => {
+    for (let id of relatedItem.items) {
       // 同一个分组中的其它项目
-      el += '<a class="item wiki" href="' + url_for(p.homepage.path) + '">';
-      el += '<span class="title">' + p.title + '</span>';
-      if (p.description && p.description.length > 0) {
-        el += '<span class="excerpt">' + p.description + '</span>';
+      let item = theme.wiki.tree[id];
+      el += '<a class="item wiki" href="' + url_for(item.homepage?.path) + '">';
+      el += '<span class="title">' + item.title + '</span>';
+      if (item.description && item.description.length > 0) {
+        el += '<span class="excerpt">' + item.description + '</span>';
       }
       el += '</a>';
-    });
+    }
     el += '</div>';
     el += '</widget>';
   }

package/layout/_partial/widgets/toc.ejs

@@ -1,5 +1,5 @@
 <%
-let proj = theme.wiki.projects[page.wiki];
+let proj = theme.wiki.tree[page.wiki];
 
 function layoutToc() {
   if (toc(page.content).length > 0) {
@@ -22,7 +22,10 @@ function layoutTocHeader(title) {
 
 function layoutDocTree(pages) {
   var el = '';
-  pages.forEach((p, i) => {
+  for (let p of pages) {
+    if (p.title == null || p.title.length == 0) {
+      continue;
+    }
     let isActive = '';
     if (p.path === page.path) {
       isActive += ' active';
@@ -34,14 +37,14 @@ function layoutDocTree(pages) {
         href += '#start'
       }
       el += '<a class="doc-tree-link' + isActive + '" href="' + href + '">';
-      el += '<span class="toc-text">' + (p.title || p.seo_title) + '</span>';
+      el += '<span class="toc-text">' + p.title + '</span>';
       el += '</a>';
     }
     if (p.path === page.path) {
       el += layoutToc();
     }
     el += '</div>';
-  });
+  }
   return el;
 }
 
@@ -74,17 +77,22 @@ function layoutDiv(fallback) {
       el += '</div>';
     } else if (proj) {
       // wiki 布局
-      if (proj.sections && proj.sections.length > 0) {
-        proj.sections.forEach((sec, i) => {
-          // 多 section
-          el += layoutTocHeader(sec.title);
+      if (proj.sections && proj.sections.length > 0 && proj.pages.length > 1) { // 多 pages
+        for (let sec of proj.sections) {
+          if (sec.pages.length == 0) {
+            continue;
+          }
+          if (sec.title?.length > 0) {
+            el += layoutTocHeader(sec.title);
+          }
           el += '<div class="widget-body fs14">';
           el += layoutDocTree(sec.pages);
           el += '</div>';
-        });
-      } else {
-        // 单 section
-        el += layoutTocHeader(page.toc_title);
+        }
+      } else { // 单 page
+        if (proj.pages.length == 1) {
+          el += layoutTocHeader(page.toc_title);
+        }
         el += '<div class="widget-body fs14">';
         el += layoutDocTree(proj.pages);
         el += '</div>';

package/layout/index.ejs

@@ -22,7 +22,7 @@ function layout_post_card(layout, post, content) {
   return el;
 }
 
-function layout_posts(partial) {
+function layout_post_list(partial) {
   var el = '';
   el += '<div class="post-list post">';
   if (is_home()) {
@@ -48,22 +48,24 @@ function layout_posts(partial) {
   return el;
 }
 
-function layout_wikis(partial) {
+function layout_wiki_list(partial) {
   var el = '';
-  var wikis = [];
-  const projects = theme.wiki.projects;
-  for (let proj_name of Object.keys(projects)) {
-    let proj = projects[proj_name];
-    if (proj.index === false || proj.pages == undefined || proj.pages.length === 0) {
+  const { shelf, tree } = theme.wiki;
+  for (let pid of shelf) {
+    let proj = tree[pid];
+    if (proj == null) {
+      continue;
+    }
+    if (proj.pages == undefined || proj.pages.length === 0) {
       continue;
     }
     if (page.filter === false) {
-      // all wikis
+      // wikiList
       el += '<div class="post-list wiki">';
       el += layout_post_card('wiki', proj.homepage, partial(proj));
       el += '</div>';
     } else if (proj.tags && proj.tags.includes(page.tagName) === true) {
-      // filtered wikis
+      // filtered wikiList
       el += '<div class="post-list wiki filter">';
       el += layout_post_card('wiki', proj.homepage, partial(proj));
       el += '</div>';
@@ -75,13 +77,13 @@ function layout_wikis(partial) {
 
 <% if (page.menu_id === 'post') { %>
   <%- partial('_partial/main/navbar/list_post') %>
-  <%- layout_posts(function(post){
+  <%- layout_post_list(function(post){
     return partial('_partial/main/post_list/post_card', {post: post})
   }) %>
   <%- partial('_partial/main/post_list/paginator') %>
 <% } else if (page.menu_id === 'wiki') { %>
   <%- partial('_partial/main/navbar/list_wiki') %>
-  <%- layout_wikis(function(proj){
+  <%- layout_wiki_list(function(proj){
     return partial('_partial/main/post_list/wiki_card', {proj: proj})
   }) %>
 <% } %>

package/layout/mermaid.ejs

@@ -4,7 +4,11 @@
   <script>
     var mermaid_config = {
       startOnLoad: true,
-      theme: '<%- theme.plugins.mermaid.theme %>',
+      theme:
+        "<%- theme.style.darkmode %>" == "auto" &&
+          window.matchMedia("(prefers-color-scheme: dark)").matches
+          ? "dark"
+          : "<%- theme.plugins.mermaid.theme %>",
       logLevel: 3,
       themeVariables: {
         darkMode: true
@@ -12,17 +16,17 @@
       flowchart: {
         useMaxWidth: false,
         htmlLabels: true,
-        curve: 'linear'
+        curve: "linear"
       },
       gantt: {
-        axisFormat: '%m/%d/%Y'
+        axisFormat: "%Y/%m/%d"
       },
       sequence: {
         actorMargin: 50
       }
     }
     if (window.mermaid) {
-        mermaid.initialize(mermaid_config);
+      mermaid.initialize(mermaid_config);
     }
   </script>
 <% } %>

package/layout/page.ejs

@@ -12,6 +12,9 @@ function layoutDiv() {
   if (page.post_list) {
     el += partial('_partial/main/navbar/list_post');
   }
+  if (page.mermaid == true) {
+    el += partial('mermaid');
+  }
   if (page.h1 || page.title || (page.content && page.content.length > 0)) {
     el += partial('_partial/main/navbar/breadcrumb');
   }

package/layout/post.ejs

@@ -30,7 +30,7 @@ if (theme.plugins.heti && theme.plugins.heti.enable) {
 <%- layoutTitle() %>
 <%- post.content %>
 <% if (theme.plugins.tianli_gpt.enable && ['all', 'post'].includes(theme.plugins.tianli_gpt.field)) { %>
-  <%- partial('_partial/main/article/ai_abstract') %>
+  <%- partial('_partial/plugins/ai/tianli_gpt') %>
 <% } %>
 <%- partial('_partial/main/article/article_footer') %>
 </article>

package/layout/wiki.ejs

@@ -29,12 +29,15 @@ function layoutTitle() {
     page.header = 'auto';
   }
   %>
+  <% if (page.mermaid == true){ %>
+    <%- partial('mermaid') %>
+  <% } %>
   <%- partial('_partial/main/navbar/breadcrumb') %>
   <article class='md-text content <%- page.layout %><%- page.indent ? ' indent' : '' %><%- scrollreveal() %>'>
   <%- layoutTitle() %>
   <%- page.content %>
   <% if (theme.plugins.tianli_gpt.enable && ['all', 'wiki'].includes(theme.plugins.tianli_gpt.field)) { %>
-	<%- partial('_partial/main/article/ai_abstract') %>
+	<%- partial('_partial/plugins/ai/tianli_gpt') %>
   <% } %>
   <%- partial('_partial/main/article/article_footer') %>
   </article>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-stellar",
-  "version": "1.19.0",
+  "version": "1.21.0",
   "description": "Elegant and powerful theme for Hexo.",
   "main": "package.json",
   "scripts": {