hexo-theme-stellar 1.24.0 → 1.25.0

package/layout/_partial/sidebar/menu.ejs

@@ -6,8 +6,8 @@ function layoutDiv() {
     el += ' mobile-hidden';
   }
   el += '">';
-  for (let id of Object.keys(theme.sidebar.menu)) {
-    let item = theme.sidebar.menu[id];
+  for (let id of Object.keys(theme.menu)) {
+    let item = theme.menu[id];
     if (item == undefined || item.length == 0) {
       continue;
     }

package/layout/_partial/widgets/related.ejs

@@ -1,34 +1,61 @@
 <%
-function layoutDiv() {
-  if (page.layout !== "wiki") {
-    return '';
+function relatedPostsInTopic() {
+  if (page.topic?.length == 0) {
+    return ''
+  }
+  const topic = theme.topic.tree[page.topic]
+  if (topic == null) {
+    return ''
   }
-  let thisItemObject = theme.wiki.tree[page.wiki];
+  var el = ''
+  el += `<widget class="widget-wrapper recent">`
+  el += `<div class="widget-header cap theme dis-select">`
+  el += `<span class="name">${__('btn.topic') + __('symbol.colon') + topic.name}</span>`
+  el += `</div>`
+  el += `<div class="widget-body related-posts">`
+  for (let post of topic.pages) {
+    el += `<a class="item${post.path == page.path ? ' active' : ''}" href="${url_for(post.path)}">`
+    el += `<span class="title">${post.title}</span>`
+    el += `</a>`
+  }
+  el += `</div>`
+  el += `</widget>`
+  return el
+}
+function relatedWiki() {
+  let thisItemObject = theme.wiki.tree[page.wiki]
   if (thisItemObject == null) {
-    return '';
+    return ''
   }
-  const relatedItems = thisItemObject.relatedItems;
-  var el = '';
+  const relatedItems = thisItemObject.relatedItems
+  var el = ''
   for (let relatedItem of relatedItems) {
-    el += '<widget class="widget-wrapper related">';
-    el += '<div class="widget-header cap theme dis-select">';
-    el += '<span class="name">' + __('meta.more', relatedItem.name) + '</span>';
-    el += '</div>';
-    el += '<div class="widget-body related-posts">';
+    el += `<widget class="widget-wrapper related">`
+    el += `<div class="widget-header cap theme dis-select">`
+    el += `<span class="name">${__('meta.more') + __('symbol.colon') + relatedItem.name}</span>`
+    el += `</div>`
+    el += `<div class="widget-body related-posts">`
     for (let id of relatedItem.items) {
       // 同一个分组中的其它项目
-      let item = theme.wiki.tree[id];
-      el += '<a class="item wiki" href="' + url_for(item.homepage?.path) + '">';
-      el += '<span class="title">' + item.title + '</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 += `<span class="excerpt">${item.description}</span>`
       }
-      el += '</a>';
+      el += `</a>`
     }
-    el += '</div>';
-    el += '</widget>';
+    el += `</div>`
+    el += `</widget>`
+  }
+  return el
+}
+function layoutDiv() {
+  if (page.layout == 'wiki') {
+    return relatedWiki()
+  } else if (page.layout == 'topic') {
+    return relatedPostsInTopic()
   }
-  return el;
 }
 %>
 <%- layoutDiv() %>

package/layout/_partial/widgets/search.ejs

@@ -2,7 +2,7 @@
 function layoutDiv() {
   var el = '<widget class="widget-wrapper search">'
   el += '<div class="widget-body">'
-  el += '<div class="search-wrapper" id="search">'
+  el += '<div class="search-wrapper" id="search-wrapper">'
   el += '<form class="search-form">'
   var filter = ''
   if (item.filter == 'auto') {
@@ -27,7 +27,7 @@ function layoutDiv() {
   } else {
     el += ' placeholder="' + (item.placeholder || __('search.search')) + '">'
   }
-  el += '<svg t="1670596976048" class="icon search-icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2676" width="200" height="200"><path d="M938.2 832.6L723.8 618.1c-2.5-2.5-5.3-4.4-7.9-6.4 36.2-55.6 57.3-121.8 57.3-193.1C773.3 222.8 614.6 64 418.7 64S64 222.8 64 418.6c0 195.9 158.8 354.6 354.6 354.6 71.3 0 137.5-21.2 193.2-57.4 2 2.7 3.9 5.4 6.3 7.8L832.5 938c14.6 14.6 33.7 21.9 52.8 21.9 19.1 0 38.2-7.3 52.8-21.8 29.2-29.1 29.2-76.4 0.1-105.5M418.7 661.3C284.9 661.3 176 552.4 176 418.6 176 284.9 284.9 176 418.7 176c133.8 0 242.6 108.9 242.6 242.7 0 133.7-108.9 242.6-242.6 242.6" p-id="2677"></path></svg>'
+  el += '<svg t="1705074644177" class="icon search-icon" viewBox="0 0 1025 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1560" width="200" height="200"><path d="M1008.839137 935.96571L792.364903 719.491476a56.783488 56.783488 0 0 0-80.152866 0 358.53545 358.53545 0 1 1 100.857314-335.166073 362.840335 362.840335 0 0 1-3.689902 170.145468 51.248635 51.248635 0 1 0 99.217358 26.444296 462.057693 462.057693 0 1 0-158.255785 242.303546l185.930047 185.725053a51.248635 51.248635 0 0 0 72.568068 0 51.248635 51.248635 0 0 0 0-72.978056z" p-id="1561"></path><path d="M616.479587 615.969233a50.428657 50.428657 0 0 0-61.498362-5.534852 174.655348 174.655348 0 0 1-177.525271 3.484907 49.403684 49.403684 0 0 0-58.833433 6.76482l-3.074918 2.869923a49.403684 49.403684 0 0 0 8.609771 78.10292 277.767601 277.767601 0 0 0 286.992355-5.739847 49.403684 49.403684 0 0 0 8.404776-76.667958z" p-id="1562"></path></svg>'
   el += '</form>'
   el += '<div id="search-result"></div>'
   el += '<div class="search-no-result">' + __('search.no_results') + '</div>'

package/layout/_partial/widgets/toc.ejs

@@ -1,108 +1,116 @@
 <%
 let proj = theme.wiki.tree[page.wiki];
-
-function layoutToc() {
+var hasTOC = true
+function layoutTocBody() {
   if (toc(page.content).length > 0) {
+    hasTOC = true
     return toc(page.content, {
       list_number: item.list_number,
       min_depth: item.min_depth,
       max_depth: item.max_depth
     });
   }
-  return '';
+  hasTOC = false
+  return ''
 }
 
 function layoutTocHeader(title) {
-  var el = '';
-  el += '<div class="widget-header cap dis-select">';
-  el += '<span class="name">' + (title || page.title || __("meta.toc")) + '</span>';
-  el += '</div>';
-  return el;
+  var el = ''
+  el += `<div class="widget-header cap dis-select">`
+  el += `<span class="name">${title || __("meta.toc")}</span>`
+  el += `</div>`
+  return el
 }
 
 function layoutDocTree(pages) {
-  var el = '';
+  var el = ''
   for (let p of pages) {
     if (p.title == null || p.title.length == 0) {
-      continue;
+      continue
     }
-    let isActive = '';
+    let isActive = ''
     if (p.path === page.path) {
-      isActive += ' active';
+      isActive += ' active'
     }
-    el += '<div class="doc-tree' + isActive + '">';
+    el += `<div class="doc-tree${isActive}">`
     if (proj.pages.length > 1) {
       let href = url_for(p.path);
       if (p.is_homepage) {
         href += '#start'
       }
-      el += '<a class="doc-tree-link' + isActive + '" href="' + href + '">';
-      el += '<span class="toc-text">' + p.title + '</span>';
-      el += '</a>';
+      el += `<a class="doc-tree-link${isActive}" href="${href}">`
+      el += `<span class="toc-text">${p.title}</span>`
+      el += `</a>`
     }
     if (p.path === page.path) {
-      el += layoutToc();
+      el += layoutTocBody()
     }
-    el += '</div>';
+    el += `</div>`
   }
-  return el;
+  return el
 }
 
 
 function layoutDiv(fallback) {
-  var type = '';
+  var type = ''
   if (proj && proj.pages) {
     if (proj.pages.length > 1) {
-      type = 'multi';
+      type = 'multi'
     } else {
-      type = 'single';
+      type = 'single'
     }
   } else {
-    let toc_content = toc(page.content);
+    let toc_content = toc(page.content)
     if (toc_content && toc_content.length > 0) {
-      type = 'single';
+      type = 'single'
     }
   }
 
-  var el = '';
+  var el = ''
   if (type.length > 0) {
-    el += `<widget class="widget-wrapper toc ${type}" id="data-toc" collapse="${item.collapse}">`;
+    el += `<widget class="widget-wrapper toc ${type}" id="data-toc" collapse="${item.collapse}">`
     if (page.layout !== 'wiki') {
       // post 布局
-      el += layoutTocHeader(page.toc_title);
-      el += '<div class="widget-body fs14">';
-      el += '<div class="doc-tree active">';
-      el += layoutToc();
-      el += '</div>';
-      el += '</div>';
+      el += layoutTocHeader(page.toc_title)
+      el += `<div class="widget-body fs14">`
+      el += `<div class="doc-tree active">`
+      el += layoutTocBody()
+      el += `</div>`
+      el += `</div>`
+      if (hasTOC == false) {
+        return ''
+      }
     } else if (proj) {
       // wiki 布局
       if (proj.sections && proj.sections.length > 0 && proj.pages.length > 1) { // 多 pages
         for (let sec of proj.sections) {
           if (sec.pages.length == 0) {
-            continue;
+            continue
           }
           if (sec.title?.length > 0) {
-            el += layoutTocHeader(sec.title);
+            el += layoutTocHeader(sec.title)
           }
-          el += '<div class="widget-body fs14">';
-          el += layoutDocTree(sec.pages);
-          el += '</div>';
+          el += `<div class="widget-body fs14">`
+          el += layoutDocTree(sec.pages)
+          el += `</div>`
         }
       } else { // 单 page
         if (proj.pages.length == 1) {
-          el += layoutTocHeader(page.toc_title);
+          el += layoutTocHeader(page.toc_title)
+        }
+        el += `<div class="widget-body fs14">`
+        el += layoutDocTree(proj.pages)
+        el += `</div>`
+        if (hasTOC == false) {
+          return ''
         }
-        el += '<div class="widget-body fs14">';
-        el += layoutDocTree(proj.pages);
-        el += '</div>';
       }
     }
-    el += '</widget>';
+    el += `</widget>`
   } else if (item.fallback) {
-    el += partial(item.fallback, {item: theme.data.widgets[item.fallback]});
+    el += partial(item.fallback, {item: theme.data.widgets[item.fallback]})
   }
-  return el;
+  return el
 }
 
 %>

package/layout/archive.ejs

@@ -13,7 +13,7 @@ function layoutArchiveList() {
     el += partial('_partial/main/navbar/author_banner')
   } else {
     page.title = __('btn.archives')
-    el += partial('_partial/main/navbar/list_post')
+    el += partial('_partial/main/navbar/nav_tabs_blog')
   }
   el += `<div class="post-list archives">`
   var years = []

package/layout/categories.ejs

@@ -7,7 +7,7 @@ if (page.menu_id == undefined) {
 <% if (site.categories.length) { %>
   <% page.title = __('btn.categories'); %>
   <% page.layout = 'categories'; %>
-  <%- partial('_partial/main/navbar/list_post') %>
+  <%- partial('_partial/main/navbar/nav_tabs_blog') %>
   <div class='post-list'>
     <article class='<%- scrollreveal() %>' id='cats'>
       <% site.categories.sort('path').each(function(category){ %>

package/layout/index.ejs

@@ -1,10 +1,6 @@
 <%
 if (page.menu_id == undefined) {
-  if (page.layout === 'wiki_index' && page.wiki) {
-    page.menu_id = 'wiki';
-  } else {
-    page.menu_id = 'post';
-  }
+  page.menu_id = 'post';
 }
 if (page.title && page.wiki) {
   page.robots = 'noindex,follow';
@@ -48,42 +44,10 @@ function layout_post_list(partial) {
   return el;
 }
 
-function layout_wiki_list(partial) {
-  var el = '';
-  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) {
-      // 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 wikiList
-      el += '<div class="post-list wiki filter">';
-      el += layout_post_card('wiki', proj.homepage, partial(proj));
-      el += '</div>';
-    }
-  }
-  return el;
-}
 %>
 
-<% if (page.menu_id === 'post') { %>
-  <%- partial('_partial/main/navbar/list_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_wiki_list(function(proj){
-    return partial('_partial/main/post_list/wiki_card', {proj: proj})
-  }) %>
-<% } %>
+<%- partial('_partial/main/navbar/nav_tabs_blog') %>
+<%- layout_post_list(function(post){
+  return partial('_partial/main/post_list/post_card', {post: post})
+}) %>
+<%- partial('_partial/main/post_list/paginator') %>

package/layout/index_topic.ejs

@@ -0,0 +1,28 @@
+<%
+function layout_topic_list(partial) {
+  var el = ''
+  const { publish_list, tree } = theme.topic
+  for (let id of publish_list) {
+    const topic = tree[id]
+    if (topic == null) {
+      continue
+    }
+    el += `<div class="post-list wiki topic">`
+    el += `<a class="post-card wiki topic ${scrollreveal()}" href="${url_for(topic.homepage?.path || '/')}">`
+    el += partial(topic)
+    el += `</a>`
+    el += `</div>`
+  }
+  return el
+}
+function layoutDiv() {
+  var el = ''
+  el += partial('_partial/main/navbar/nav_tabs_blog')
+  el += layout_topic_list(function(topic) {
+    return partial('_partial/main/post_list/topic_card', {topic: topic})
+  })
+  return el
+}
+%>
+
+<%- layoutDiv() %>

package/layout/index_wiki.ejs

@@ -0,0 +1,42 @@
+<%
+function layout_wiki_list(partial) {
+  var el = ''
+  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) {
+      // wikiList
+      el += `<div class="post-list wiki">`
+      el += `<a class="post-card wiki ${scrollreveal()}" href="${url_for(proj.homepage?.path || '/')}">`
+      el += partial(proj)
+      el += `</a>`
+      el += `</div>`
+    } else if (proj.tags && proj.tags.includes(page.tagName) === true) {
+      // filtered wikiList
+      el += `<div class="post-list wiki filter">`
+      el += `<a class="post-card wiki ${scrollreveal()}" href="${url_for(proj.homepage?.path || '/')}">`
+      el += partial(proj)
+      el += `</a>`
+      el += `</div>`
+    }
+  }
+  return el
+}
+
+function layoutDiv() {
+  var el = ''
+  el += partial('_partial/main/navbar/nav_tabs_wiki')
+  el += layout_wiki_list(function(proj) {
+    return partial('_partial/main/post_list/wiki_card', {proj: proj})
+  })
+  return el
+}
+%>
+
+<%- layoutDiv() %>

package/layout/page.ejs

@@ -9,8 +9,8 @@ function layoutTitle() {
 }
 function layoutDiv() {
   var el = '';
-  if (page.post_list) {
-    el += partial('_partial/main/navbar/list_post');
+  if (page.nav_tabs) {
+    el += partial('_partial/main/navbar/nav_tabs_blog');
   }
   if (page.h1 || page.title || (page.content && page.content.length > 0)) {
     el += partial('_partial/main/navbar/breadcrumb');

package/layout/tags.ejs

@@ -7,7 +7,7 @@ if (page.menu_id == undefined) {
 <% if (site.tags.length) { %>
   <% page.title = __('btn.tags'); %>
   <% page.layout = 'tags'; %>
-  <%- partial('_partial/main/navbar/list_post') %>
+  <%- partial('_partial/main/navbar/nav_tabs_blog') %>
   <div class='post-list'>
     <article class='<%- scrollreveal() %>' id='tags'>
       <% site.tags.sort('length', -1).each(function(tag){ %>

package/layout/topic.ejs

@@ -0,0 +1,28 @@
+<%
+if (page.menu_id == undefined) {
+  page.menu_id = 'post'
+}
+if (page.title == undefined) {
+  page.title = __('btn.topic')
+}
+function layoutTitle() {
+  const title = page.h1 != null ? page.h1 : page.title;
+  if (title && title.length > 0) {
+    return '<h1 class="article-title"><span>' + title + '</span></h1>';
+  } else {
+    return '';
+  }
+}
+%>
+
+<%- partial('_partial/main/navbar/breadcrumb') %>
+<article class='md-text content <%- page.layout %><%- page.indent ? ' indent' : '' %><%- scrollreveal() %>'>
+<%- layoutTitle() %>
+<%- markdown(page.content) %>
+<% if (theme.plugins.tianli_gpt.enable && ['all', 'topic'].includes(theme.plugins.tianli_gpt.field)) { %>
+<%- partial('_partial/plugins/ai/tianli_gpt') %>
+<% } %>
+<%- partial('_partial/main/article/article_footer') %>
+</article>
+<%- partial('_partial/main/article/read_next') %>
+<%- partial('_partial/plugins/comments/layout') %>

package/layout/wiki.ejs

@@ -2,9 +2,6 @@
 if (page.menu_id == undefined) {
   page.menu_id = 'wiki';
 }
-if (page.layout == undefined) {
-  page.layout = 'wiki_index';
-}
 if (page.title == undefined) {
   if (page.tagName) {
     page.title = page.tagName;
@@ -21,23 +18,15 @@ function layoutTitle() {
   }
 }
 %>
-<% if (page.layout === 'wiki_index') { %>
-  <%- partial('index') %>
-<% } else { %>
-  <%
-  if (page.header == undefined) {
-    page.header = 'auto';
-  }
-  %>
-  <%- 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/plugins/ai/tianli_gpt') %>
-  <% } %>
-  <%- partial('_partial/main/article/article_footer') %>
-  </article>
-  <%- partial('_partial/main/article/read_next') %>
-  <%- partial('_partial/plugins/comments/layout') %>
+
+<%- 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/plugins/ai/tianli_gpt') %>
 <% } %>
+<%- partial('_partial/main/article/article_footer') %>
+</article>
+<%- partial('_partial/main/article/read_next') %>
+<%- partial('_partial/plugins/comments/layout') %>

package/package.json

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

package/scripts/events/index.js

@@ -8,9 +8,14 @@ hexo.on('generateBefore', () => {
   require('./lib/links')(hexo);
   require('./lib/authors')(hexo);
   require('./lib/doc_tree')(hexo);
+  require('./lib/topic_tree')(hexo);
   require('./lib/utils')(hexo);
 });
 
+hexo.on('generateAfter', () => {
+  require('./lib/merge_posts')(hexo);
+});
+
 hexo.on('ready', () => {
   const { version, homepage, repository } = require('../../package.json');
   hexo.log.info(`Welcome to Stellar ${version}

package/scripts/events/lib/authors.js

@@ -6,7 +6,7 @@
 
 module.exports = ctx => {
   var authors = ctx.locals.get('data').authors || {}
-  let basePath = ctx.config.author_dir || 'author'
+  let basePath = ctx.theme.config.site_tree.author.base_dir
   // url
   for (let key of Object.keys(authors)) {
     let author = authors[key]

package/scripts/events/lib/config.js

@@ -56,8 +56,8 @@ module.exports = hexo => {
   hexo.theme.config.data['widgets'] = widgets;
 
   // default menu
-  if (hexo.theme.config.sidebar.menu == undefined) {
-    hexo.theme.config.sidebar.menu = [];
+  if (hexo.theme.config.menu == undefined) {
+    hexo.theme.config.menu = {};
   }
 
 };

package/scripts/events/lib/doc_tree.js

@@ -177,7 +177,7 @@ module.exports = ctx => {
     }
     all_tags[tag_name] = {
       name: tag_name,
-      path: (ctx.config.wiki_dir || 'wiki') + '/tags/' + tag_name + '/index.html',
+      path: (ctx.theme.config.site_tree.wiki.base_dir) + '/tags/' + tag_name + '/index.html',
       items: items
     }
   })

package/scripts/events/lib/merge_posts.js

@@ -0,0 +1,47 @@
+/**
+ * merge_posts.js v1 | https://github.com/xaoxuu/hexo-theme-stellar/
+ * 
+ */
+
+'use strict';
+
+class RelatedPage {
+  constructor(page) { 
+    this.id = page._id
+    this.wiki = page.wiki
+    this.topic = page.topic
+    this.title = page.title
+    this.seo_title = page.seo_title
+    this.path = page.path
+    this.path_key = page.path.replace('.html', '')
+    this.layout = page.layout
+    this.date = page.date
+    this.updated = page.updated
+  }
+}
+
+module.exports = ctx => {
+  var topic = ctx.theme.config.topic
+  const posts = ctx.locals.get('posts')
+  posts.sort('date').each(function(post) {
+    let obj = new RelatedPage(post)
+    // 合并拥有共同 topic 的文章到 topic.tree
+    if (post.topic?.length > 0) {
+      var topicObject = topic.tree[post.topic]
+      if (topicObject) {
+        obj.page_number = topicObject.pages.length + 1
+        topicObject.pages.push(obj)
+      }
+    }
+  })
+  
+  // topic homepage
+  for (let tid of Object.keys(topic.tree)) {
+    let topicObject = topic.tree[tid]
+    if (topicObject.order_by == '-date') {
+      topicObject.pages = topicObject.pages.reverse()
+    }
+    topicObject.homepage = topicObject.pages[0]
+  }
+
+}