hexo-theme-stellar 1.12.0 → 1.14.0

package/README.md

@@ -1,16 +1,16 @@
-# hexo-theme-stellar
+# Stellar - 每个人的独立博客
 
-Elegant and powerful theme for Hexo.
+Stellar 是一个内置文档系统的简约商务风 Hexo 主题，支持丰富的标签和动态数据组件，请配合 [文档](https://xaoxuu.com/wiki/stellar/) 使用。
 
 ## Getting Started
 
 Check your environment:
 
 ```yaml
-Hexo: 5.4.0
-hexo-cli: 4.3.0
-node.js: 14.17.3 LTS
-npm: 6.14.13 LTS
+Hexo: 5.4.0 ~ 6.3.0
+hexo-cli: 4.3.0 ~ latest
+node.js: 14.17.3 ～ 18.12.0
+npm: 6.14.13 ~ 8.19.2
 ```
 
 Edit your `_config.yml`:
@@ -31,7 +31,7 @@ See docs: https://xaoxuu.com/wiki/stellar/
 
 ## Examples
 
-https://xaoxuu.com
+https://xaoxuu.com/wiki/stellar/examples/
 
 ## Feedback
 

package/_config.yml

@@ -1,6 +1,6 @@
 ######## Stellar info ########
 stellar:
-  version: '1.12.0'
+  version: '1.14.0'
   homepage: 'https://xaoxuu.com/wiki/stellar/'
   repo: 'https://github.com/xaoxuu/hexo-theme-stellar'
   cdn_css: # Use cdn links instead of /css/main.css
@@ -30,6 +30,10 @@ sidebar:
     post: [toc, ghrepo, ghissues] # for pages using 'layout:post'
     wiki: [toc, ghrepo, ghissues, related] # for pages using 'layout:wiki'
 
+######## Index ########
+post-index: # 近期发布 分类 标签 归档 and ...
+  # '朋友文章': /friends/rss/
+
 
 ######## Main ########
 breadcrumb:
@@ -59,7 +63,7 @@ article:
 
 ######## Comments ########
 comments:
-  service: # beaudar, utterances, valine, twikoo, waline
+  service: # beaudar, utterances, twikoo, waline
   # beaudar
   # https://beaudar.lipk.org/
   beaudar:
@@ -98,28 +102,6 @@ comments:
     data-loading: lazy
     crossorigin: anonymous
 
-  valine:
-    js: https://fastly.jsdelivr.net/gh/XuxuGood/simple-blog-cdn@main/js/Valine.min.js
-    appId: # your appId
-    appKey: # your appKey
-    placeholder:
-    requiredFields: [nick, mail]
-    enableQQ: true # Unstable avatar link
-    recordIP: false # Record commenter IP
-    avatar: robohash # gravatar style https://valine.js.org/avatar
-    pageSize: 10 # comment list page size
-    lang: zh-cn
-    highlight: true
-    mathJax: false
-    tagMeta: [博主, 小伙伴, 访客] # 标签要显示的文字,默认'博主,小伙伴,访客'
-    metaPlaceholder:
-      nick: "昵称/QQ号(必填)"
-      mail: "邮箱（必填，完全保密）"
-      link: "网址(https://)"
-    master: #md5加密后的博主邮箱
-      - 6783037F2DF30EAB99F9FC256157D875
-    friends: #md5加密后的小伙伴邮箱
-      - 6783037F2DF30EAB99F9FC256157D875
   # Twikoo
   # https://twikoo.js.org/
   twikoo:
@@ -230,6 +212,7 @@ tag_plugins:
     qq: https://fastly.jsdelivr.net/gh/cdn-x/emoji/qq/%s.gif
     aru: https://fastly.jsdelivr.net/gh/cdn-x/emoji/aru-l/%s.gif
     tieba: https://fastly.jsdelivr.net/gh/cdn-x/emoji/tieba/%s.png
+    blobcat: https://gcore.jsdelivr.net/gh/norevi/waline-blobcatemojis@1.0/blobs/%s.png
   # {% image %}
   image:
     fancybox: # true, false
@@ -251,9 +234,10 @@ plugins:
     ghinfo: /js/plugins/ghinfo.js
     timeline: /js/plugins/timeline.js
     linkcard: /js/plugins/linkcard.js
+    fcircle: /js/plugins/fcircle.js
 
   marked: https://cdn.bootcdn.net/ajax/libs/marked/4.0.18/marked.min.js
-
+  
   ## optional plugins ##
   # preload
   preload:
@@ -285,7 +269,6 @@ plugins:
     js: https://fastly.jsdelivr.net/npm/@fancyapps/ui@4.0/dist/fancybox.umd.js
     css: https://fastly.jsdelivr.net/npm/@fancyapps/ui@4.0/dist/fancybox.css
     # 可以处理评论区的图片（不支持 iframe 类评论系统）例如：
-    # 使用valine评论可以写: .vcontent img:not(.vemoji)
     # 使用twikoo评论可以写: .tk-content img:not([class*="emo"])
     # 使用waline评论可以写: #waline_container .vcontent img
     selector: .swiper-slide img # 多个选择器用英文逗号隔开
@@ -343,7 +326,7 @@ style:
       card: white # 卡片背景颜色
       title: '#000' # 标题文本颜色
       text: '#333' # 正文文本颜色
-      code: '#111' # 行内代码颜色
+      code: '#f33a00' # 行内代码颜色
     dark:
       background: '#313438' # 深色背景颜色
       background-mobile: black # 移动端深色背景（OLED调成纯黑可以省电）

package/_data/links.yml

@@ -0,0 +1,7 @@
+# 不要直接在这里写，要复制到 blog/source/_data/links.yml 位置
+'示例':
+  - title: XAOXUU
+    avatar: https://bu.dusays.com/2021/09/24/2f74810ceb3d3.png
+    url: https://xaoxuu.com
+    screenshot: https://bu.dusays.com/2022/10/23/63542895cfd29.png
+    description:

package/_data/widgets.yml

@@ -61,10 +61,12 @@ welcome:
     **第二步**
     创建 `blog/source/_data/widgets.yml` 文件，此文件中填写需要自定义的侧边栏组件，例如 `welcome` 组件。
     <br>
-    如果有任何疑问，请先查阅[文档](https://xaoxuu.com/wiki/stellar/)，如果文档中没有提供，请提 [issue](https://github.com/xaoxuu/hexo-theme-stellar/issues/) 向开发中询问。
+    如果有任何疑问，请先查阅 [文档](https://xaoxuu.com/wiki/stellar/)，如果文档中没有提供，请提 [issue](https://github.com/xaoxuu/hexo-theme-stellar/issues/) 向开发中询问。
 
 timeline:
   layout: timeline
   title: 近期动态
-  api: https://api.github.com/repos/xaoxuu/hexo-theme-stellar/issues
-  user:
+  api: # https://api.github.com/repos/xaoxuu/hexo-theme-stellar/issues
+  user: # 默认显示所有人的数据，设置名称可过滤为仅显示某人的数据，多个名称用英文逗号隔开，不要加空格
+  type: # 默认不用写，如果是友链朋友圈数据请写 fcircle
+  limit: # 默认通过 api 上增加 per_page 来设置，如果是友链朋友圈，可通过这个设置数量

package/layout/_partial/head.ejs

@@ -45,6 +45,7 @@ function og_args() {
 %>
 <head>
   <%- meta_generator() %>
+  <meta name="hexo-theme" content="<%- stellar_info('tree') %>">
   <meta charset="utf-8">
   <%- generate_robots() %>
 
@@ -60,6 +61,7 @@ function og_args() {
   <meta name="apple-mobile-web-app-capable" content="yes">
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
   <meta name="theme-color" content="#f8f8f8">
+  
   <title><%- generate_title() %></title>
 
   <% if (theme.open_graph && theme.open_graph.enable) { %>

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

@@ -1,34 +1,57 @@
-<div class='nav-wrap'>
-  <nav class='sub post cap'>
-    <% if (is_home()) { %>
-      <a class='active' href='<%- url_for("/") %>'><%- __('btn.recent_publish') %></a>
-    <% } else { %>
-      <a href='<%- url_for("/") %>'><%- __('btn.recent_publish') %></a>
-    <% } %>
-    <% if (site.categories && site.categories.length > 0) { %>
-      <% if (page.category) { %>
-        <a class='active' href='<%- url_for(config.category_dir) %>'><%- __('btn.category') + __('symbol.colon') + page.category %></a>
-      <% } else if (page.layout == 'categories') { %>
-        <a class='active' href='<%- url_for(config.category_dir) %>'><%- __('btn.categories') %></a>
-      <% } else { %>
-        <a href='<%- url_for(config.category_dir) %>'><%- __('btn.categories') %></a>
-      <% } %>
-    <% } %>
-    <% if (site.tags && site.tags.length > 0) { %>
-      <% if (page.tag) { %>
-        <a class='active' href='<%- url_for(config.tag_dir) %>'><%- __('btn.tag') + __('symbol.colon') + page.tag %></a>
-      <% } else if (page.layout == 'tags') { %>
-        <a class='active' href='<%- url_for(config.tag_dir) %>'><%- __('btn.tags') %></a>
-      <% } else { %>
-        <a href='<%- url_for(config.tag_dir) %>'><%- __('btn.tags') %></a>
-      <% } %>
-    <% } %>
-    <% if (site.posts && site.posts.length > 0) { %>
-      <% if (is_archive()) { %>
-        <a class='active' href='<%- url_for(config.archive_dir) %>'><%- __('btn.archives') %></a>
-      <% } else { %>
-        <a href='<%- url_for(config.archive_dir) %>'><%- __('btn.archives') %></a>
-      <% } %>
-    <% } %>
-  </nav>
-</div>
+<%
+function layoutDiv() {
+  var el = '';
+  el += '<div class="nav-wrap">';
+  el += '<nav class="sub post cap">';
+  if (is_home()) {
+    el += '<a class="active" href="' + url_for("/") + '">' + __("btn.recent_publish") + '</a>';
+  } else {
+    el += '<a href="' + url_for("/") + '">' + __("btn.recent_publish") + '</a>';
+  }
+
+  if (site.categories && site.categories.length > 0) {
+    if (page.category) {
+      el += '<a class="active" href="' + url_for(config.category_dir) + '">' + __("btn.category") + __("symbol.colon") + page.category + '</a>';
+    } else if (page.layout == "categories") {
+      el += '<a class="active" href="' + url_for(config.category_dir) + '">' + __("btn.categories") + '</a>';
+    } else {
+      el += '<a href="' + url_for(config.category_dir) + '">' + __("btn.categories") + '</a>';
+    }
+  }
+
+  if (site.tags && site.tags.length > 0) {
+    if (page.tag) {
+      el += '<a class="active" href="' + url_for(config.tag_dir) + '">' + __("btn.tag") + __("symbol.colon") + page.tag + '</a>';
+    } else if (page.layout == "tags") {
+      el += '<a class="active" href="' + url_for(config.tag_dir) + '">' + __("btn.tags") + '</a>';
+    } else {
+      el += '<a href="' + url_for(config.tag_dir) + '">' + __("btn.tags") + '</a>';
+    }
+  }
+  
+  if (site.posts && site.posts.length > 0) {
+    if (is_archive()) {
+      el += '<a class="active" href="' + url_for(config.archive_dir) + '">' + __("btn.archives") + '</a>';
+    } else {
+      el += '<a href="' + url_for(config.archive_dir) + '">' + __("btn.archives") + '</a>';
+    }
+  }
+  
+  if (theme['post-index']) {
+    const obj = theme['post-index'];
+    for (let key of Object.keys(obj)) {
+      if (full_url_for(page.path) == full_url_for(obj[key])) {
+        el += '<a class="active" href="' + url_for(obj[key]) + '">' + key + '</a>';
+      } else {
+        el += '<a href="' + url_for(obj[key]) + '">' + key + '</a>';
+      }
+    }
+  }
+
+  el += '</nav>';
+  el += '</div>';
+  return el;
+}
+%>
+
+<%- layoutDiv() %>

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

@@ -1,10 +1,14 @@
 <%
-const obj = {
-  image: post['cover'],
-  title: post['cover-title'],
-  cat: post['cover-cat'],
-  subtitle: post['cover-subtitle']
+const poster = post.poster;
+var obj = {
+  image: post.cover
 };
+if (poster) {
+  obj.headline = poster.headline;
+  obj.topic = poster.topic;
+  obj.caption = poster.caption;
+  obj.color = poster.color;
+}
 function div_default() {
   var el = '';
   el += '<article class="md">';
@@ -96,21 +100,24 @@ function div_photo() {
   var el = '';
   el += '<div class="cover">';
   el += '<img src="' + obj.image + '"/>';
-  if (obj.title || obj.cat || obj.subtitle) {
+  if (obj.headline || obj.topic || obj.caption) {
     el += '<div class="cover-info"';
-    if (obj.cat) {
+    if (obj.color) {
+      el += 'style="color:' + obj.color + '"';
+    }
+    if (obj.topic) {
       el += 'position="top">';
     } else {
       el += 'position="bottom">';
     }
-    if (obj.cat) {
-      el += '<div class="cap">' + obj.cat + '</div>';
+    if (obj.topic) {
+      el += '<div class="cap">' + obj.topic + '</div>';
     }
-    if (obj.title) {
-      el += '<div class="title">' + obj.title + '</div>';
+    if (obj.headline) {
+      el += '<div class="title">' + obj.headline + '</div>';
     }
-    if (obj.subtitle) {
-      el += '<div class="cap">' + obj.subtitle + '</div>';
+    if (obj.caption) {
+      el += '<div class="cap">' + obj.caption + '</div>';
     }
     el += '</div>';
 
@@ -119,7 +126,7 @@ function div_photo() {
   return el;
 }
 function div() {
-  if (obj.image && obj.image.length > 0 && obj.title != undefined) {
+  if (obj.image && obj.image.length > 0 && obj.headline != undefined) {
     return div_photo();
   }
   return div_default();

package/layout/_partial/scripts/index.ejs

@@ -90,6 +90,7 @@
       }
     }
   };
+  stellar.version = '<%- theme.stellar.version %>';
   stellar.github = 'https://github.com/xaoxuu/hexo-theme-stellar/tree/<%- theme.stellar.version %>';
   stellar.config = {
     date_suffix: {

package/layout/_partial/sidebar/widgets/ghissues.ejs

@@ -22,7 +22,6 @@ function layoutDiv() {
   if (item.labels) {
     item.api += '&labels=' + item.labels;
   }
-  console.log(item.api);
   el += '<div class="widget-wrap" id="timeline">';
     if (item.title) {
       el += '<div class="widget-header cap theme dis-select">';

package/layout/_partial/sidebar/widgets/timeline.ejs

@@ -11,8 +11,8 @@ function layoutDiv() {
       el += '</div>';
     }
     el += '<div class="widget-body fs14">';
-      el += '<div class="tag-plugin timeline stellar-timeline-api"';
-      ['api', 'user'].forEach(key => {
+      el += '<div class="tag-plugin timeline stellar-' + (item.type || "timeline") + '-api"';
+      ['api', 'user', 'hide', 'limit'].forEach(key => {
         if (item[key]) {
           el += ' ' + key + '="' + item[key] + '"';
         }

package/layout/index.ejs

@@ -13,7 +13,7 @@ if (page.title && page.wiki) {
 function layout_post_card(layout, post, content) {
   var el = '';
   var layout = layout;
-  if (layout == 'post' && post['cover'] != undefined && post['cover-title'] != undefined) {
+  if (layout == 'post' && post.cover != undefined && post.poster != undefined) {
     layout += ' photo';
   }
   el += '<a class="post-card ' + layout + ' ' + scrollreveal() + '" href="' + url_for(post.link || post.path) + '">';

package/layout/page.ejs

@@ -7,14 +7,23 @@ function layoutTitle() {
     return '';
   }
 }
+function layoutDiv() {
+  var el = '';
+  if (page.post_list) {
+    el += partial('_partial/main/navbar/list_post');
+  }
+  if (page.h1 || page.title || (page.content && page.content.length > 0)) {
+    el += partial('_partial/main/navbar/breadcrumb');
+  }
+  el += '<article class="content md ' + page.layout + (page.indent ? ' indent' : '') + scrollreveal() + '">';
+  el += layoutTitle();
+  if (page.content && page.content.length > 0) {
+    el += page.content;
+  }
+  el += '</article>';
+  el += partial('_partial/plugins/comments/layout');
+  return el;
+}
 %>
-<% if (page.h1 || page.title || (page.content && page.content.length > 0)) { %>
-  <%- partial('_partial/main/navbar/breadcrumb') %>
-  <article class='content md <%- page.layout %><%- page.indent ? ' indent' : '' %><%- scrollreveal() %>'>
-  <%- layoutTitle() %>
-  <% if (page.content && page.content.length > 0) { %>
-    <%- page.content %>
-  <% } %>
-  </article>
-<% } %>
-<%- partial('_partial/plugins/comments/layout') %>
+
+<%- layoutDiv() %>

package/package.json

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

package/scripts/events/lib/config.js

@@ -25,7 +25,7 @@ module.exports = hexo => {
     warning('caching', '`relative_link` option in Hexo `_config.yml`');
     hexo.config.relative_link = false;
   }
-  hexo.config.meta_generator = false;
+  // hexo.config.meta_generator = false;
 
   // merge data
   const data = hexo.locals.get('data');

package/scripts/tags/friends.js

@@ -1,92 +1,53 @@
 /**
- * friends.js v1 | https://github.com/xaoxuu/hexo-theme-stellar/
+ * friends.js v2 | https://github.com/xaoxuu/hexo-theme-stellar/
  * 格式与官方标签插件一致使用空格分隔，中括号内的是可选参数（中括号不需要写出来）
  *
- * {% friends [only:group1] [not:group2] %}
+ * {% friends [group] [repo:owner/repo] [api:http] %}
  */
 
 'use strict';
 
 hexo.extend.tag.register('friends', function(args) {
-  args = hexo.args.map(args, ['only', 'not', 'repo', 'api']);
-  if (args.only) {
-    args.only = args.only.split(',');
+  args = hexo.args.map(args, ['repo', 'api'], ['group']);
+  var links = hexo.locals.get('data').links;
+  if (links == undefined) {
+    links = {};
   }
-  if (args.not) {
-    args.not = args.not.split(',');
-  }
-  var friends = hexo.locals.get('data').friends;
-  if (friends == undefined) {
-    friends = {};
-  }
-  if (args.repo) {
-    friends = {
-      group: {
-        api: args.api,
-        repo: args.repo
-      }
-    }
+  var api;
+  if (args.api) {
+    api = args.api;
+  } else if (args.repo) {
+    api = 'https://data.json.vlts.cc/v2/' + args.repo;
   }
+  
   var el = '<div class="tag-plugin users-wrap">';
-  function groupHeader(group) {
-    var header = '<div class="group-header">';
-    if (group.title) {
-      header += hexo.render.renderSync({text: group.title, engine: 'markdown'}).split('\n').join('');
-    }
-    if (group.description) {
-      header += hexo.render.renderSync({text: group.description, engine: 'markdown'}).split('\n').join('');
-    }
-    header += '</div>';
-    return header;
-  }
-  function cell(friend) {
-    if (friend.url && friend.title) {
-      var cell = '<div class="user-card">';
-      cell += '<a class="card-link" target="_blank" rel="external nofollow noopener noreferrer" href="' + friend.url + '">';
-      cell += '<img src="' + (friend.avatar || hexo.theme.config.default.avatar) + '" onerror="javascript:this.removeAttribute(&quot;data-src&quot;);this.src=&quot;' + hexo.theme.config.default.avatar + '&quot;;"/>';
-      cell += '<div class="name"><span>' + friend.title + '</span></div>';
-      cell += '</a></div>'
-      return cell;
-    } else {
-      return '';
-    }
-  }
-  for (let groupId of Object.keys(friends)) {
-    function f() {
-      if (args.not && args.not.includes(groupId)) {
-        return;
-      }
-      if (groupId in friends) {
-        let group = friends[groupId];
-        if ((typeof group == 'object') && group.constructor == Array) {
-          group = {items: group};
-        }
-        if (group.title || group.description) {
-          el += groupHeader(group);
-        }
-        if (group.repo) {
-          el += '<div class="stellar-friends-api"';
-          el += ' api="' + (group.api || 'https://issues-api.xaoxuu.com') + '/v1/' + group.repo + '"';
-          el += '>';
-          el += '<div class="group-body"></div>';
-          el += '</div>';
-        } else if (group.items) {
-          el += '<div class="group-body">';
-          group.items.forEach((friend, i) => {
-            el += cell(friend);
-          });
-          el += '</div>';
-        }
-      }
-    }
-    if (args.only) {
-      if (args.only.includes(groupId)) {
-        f();
+  if (api) {
+    el += '<div class="stellar-friends-api"';
+    el += ' api="' + api + '"';
+    el += '>';
+    el += '<div class="group-body"></div>';
+    el += '</div>';
+  } else if (args.group) {
+    function cell(item) {
+      if (item.url && item.title) {
+        var cell = '<div class="user-card">';
+        cell += '<a class="card-link" target="_blank" rel="external nofollow noopener noreferrer" href="' + item.url + '">';
+        cell += '<img src="' + (item.avatar || hexo.theme.config.default.avatar) + '" onerror="javascript:this.removeAttribute(&quot;data-src&quot;);this.src=&quot;' + hexo.theme.config.default.avatar + '&quot;;"/>';
+        cell += '<div class="name"><span>' + item.title + '</span></div>';
+        cell += '</a></div>'
+        return cell;
+      } else {
+        return '';
       }
-    } else {
-      f();
     }
+    el += '<div class="group-body">';
+    const items = links[args.group] || [];
+    items.forEach((item, i) => {
+      el += cell(item);
+    });
+    el += '</div>';
   }
+  
   el += '</div>';
   return el;
 });

package/scripts/tags/link.js

@@ -7,18 +7,30 @@
 
 'use strict';
 
-var util = require('hexo-util');
 const full_url_for = require('hexo-util').full_url_for.bind(hexo);
 
 hexo.extend.tag.register('link', function(args) {
   args = hexo.args.map(args, ['icon', 'desc'], ['url', 'title']);
-
+  var autofill = [];
+  if (!args.title) {
+    autofill.push('title');
+  }
+  if (!args.icon) {
+    autofill.push('icon');
+  }
+  if (args.desc) {
+    autofill.push('desc');
+  }
   var el = '';
   el += '<div class="tag-plugin link dis-select">';
-  el += '<a class="link-card' + (args.desc ? ' rich' : ' plain') + '" title="' + args.title + '" href="' + args.url + '"';
+  el += '<a class="link-card' + (args.desc ? ' rich' : ' plain') + '" title="' + (args.title || '') + '" href="' + args.url + '"';
   if (args.url.includes('://')) {
     el += ' target="_blank" rel="external nofollow noopener noreferrer"';
   }
+  el += ' cardlink';
+  el += ' autofill="';
+  el += autofill.join(',');
+  el += '"';
   el += '>';
 
   function loadIcon() {