hexo-theme-volantis 5.0.0-rc.9 → 5.2.0

package/layout/_plugins/pjax/index.ejs

@@ -1,4 +1,4 @@
-<!-- 
+<!--
   pjax重载区域接口：
   1.  <pjax></pjax> 标签 pjax 标签必须存在于所有页面 否则 pjax error
   2.  script[data-pjax]
@@ -19,6 +19,9 @@
       pjax = new Pjax({
         elements: 'a[href]:not([href^="#"]):not([href="javascript:void(0)"]):not([pjax-fancybox]):not([onclick="return false;"]):not([onclick="return!1"]):not([target="_blank"]):not([target="view_window"]):not([href$=".xml"])',
         selectors: [
+          "head title",
+          "head meta[name=keywords]",
+          "head meta[name=description]",
           <% if (!theme.plugins.pjax.cover){ %>"#l_cover",<% } %>
           "#l_main",
           "#pjax-header-nav-list",

package/layout/_plugins/rightmenu/layout.ejs

@@ -80,13 +80,13 @@
             <span class='vlts-menu opt fix-cursor-default' id='printHtml'>
               <i class='<%= theme.rightmenu.print.icon %> fa-fw '></i> <%- trim(theme.rightmenu.print.name) %>
             </span>
-          </li>  
+          </li>
         <% } else if (item == 'reading') { %>
           <li class='option menuOption-Content'>
             <span class='vlts-menu opt fix-cursor-default' id='readingModel'>
               <i class='<%= theme.rightmenu.reading.icon %> fa-fw '></i> <%- trim(theme.rightmenu.reading.name) %>
             </span>
-          </li>  
+          </li>
         <% } else if (item == 'music' && theme.plugins.aplayer.enable == true) { %>
           <div id="menuMusic">
             <li class='music name menuOption-Content'>

package/layout/_plugins/rightmenus/layout.ejs

@@ -1,7 +1,7 @@
 <%
   const rightMenu = {
     defaultEvent: ['copyText', 'copyLink', 'copyPaste', 'copyAll', 'copyCut', 'copyImg', 'printMode', 'readMode'],
-    defaultGroup: ['navigation', 'inputBox', 'seletctText', 'elementCheck', 'articlePage'],
+    defaultGroup: ['navigation', 'inputBox', 'seletctText', 'elementCheck', 'elementImage', 'articlePage'],
     dataGet: (data, keyStr) => {
       const keys = keyStr.split('.');
       let currentData = data;
@@ -20,10 +20,10 @@
         } else {
           if(Array.isArray(data)) {
             data.forEach(item => {
-              rightMenu.loadMenu(item) 
-            })  
+              rightMenu.loadMenu(item)
+            })
           } else {
-            rightMenu.loadMenu(data)   
+            rightMenu.loadMenu(data)
           }
         }
       })
@@ -33,10 +33,10 @@
         let data = rightMenu.dataGet(theme.rightmenus, item);
         if(Array.isArray(data)) {
           data.forEach(item => {
-            rightMenu.rederFunction(item) 
-          })  
+            rightMenu.rederFunction(item)
+          })
         } else {
-          rightMenu.rederFunction(data)   
+          rightMenu.rederFunction(data)
         }
       })
     }
@@ -45,7 +45,7 @@
 
 <% rightMenu.loadMenu = item => { %>
 <%   if(item === undefined) { %>
-  <hr class="menuLoad-Content" >
+    <hr class="menuLoad-Content" >
 <%   } else if(item['id'] === undefined) { %>
     <hr class="menuLoad-Content" >
 <%   } else if(item['link'] === undefined) { %>
@@ -54,14 +54,14 @@
       <i class="<%- item.icon %> fa-fw"></i>
       <%- item.name %>
     </span>
-  </li> 
+  </li>
 <%   } else { %>
   <li class="menuLoad-Content">
     <a class="vlts-menu fix-cursor-default" id="<%- item.id %>" href="<%- item.link %>" data-group="<%- item.group %>">
       <i class="<%- item.icon %> fa-fw"></i>
       <%- item.name %>
     </a>
-  </li> 
+  </li>
 <%   } %>
 <% } %>
 
@@ -69,7 +69,7 @@
 <% rightMenu.loadNavigation = objs => { %>
   <li class='navigation menuNavigation-Content'>
 <%   objs.forEach(item => { %>
-<%     if(item.link === undefined) { %> 
+<%     if(item.link === undefined) { %>
     <a class="nav icon-only fix-cursor-default" onclick="<%- item.event %>"><i class="<%- item.icon %> fa-fw"></i></a>
 <%     } else { %>
     <a class="nav icon-only fix-cursor-default" href="<%- item.link %>"><i class="<%- item.icon %> fa-fw"></i></a>
@@ -79,18 +79,18 @@
 <% } %>
 
 
-<% rightMenu.rederFunction = item => { %> 
+<% rightMenu.rederFunction = item => { %>
 <%   if (!!item && !!item['event'] && item['group'] !== 'navigation') { %>
 <%     if (rightMenu.defaultEvent.some(value => { return value === item['event'] })) { %>
   <!-- RightMenusFunction['<%- item.id %>'] = (fun) => {fun()} -->
-<%     } else if (item['group'] === 'seletctText') { %>  
+<%     } else if (item['group'] === 'seletctText') { %>
   RightMenusFunction['<%- item.id %>'] = (__text__) => {<%- item.event %>}
-<%     } else if (item['group'] === 'elementCheck') { %>  
+<%     } else if (item['group'] === 'elementCheck' || item['group'] === 'elementImage') { %>
   RightMenusFunction['<%- item.id %>'] = (__link__) => {<%- item.event %>}
-<%     } else { %>  
+<%     } else { %>
   RightMenusFunction['<%- item.id %>'] = () => {<%- item.event %>}
-<%     } %>  
-<%   } %>  
+<%     } %>
+<%   } %>
 <% } %>
 
 

package/layout/_widget/lastupdate.ejs

@@ -1,27 +1,27 @@
-<% 
-function genList() { 
-  let content = ''; 
-  site.posts.filter(p => { 
-    return p.title && p.title.length > 0; 
-  }).sort("updated", -1).limit(5).each(item => { 
-    content += `<li><a class="widget-last" href="${url_for(item.link || item.path)}">`; 
-    content += '<div class="item">'; 
-    content += `<time>${date(item.updated, config.date_format)}</time>`; 
-    item.categories.limit(1).forEach((cat, i) => { 
-      content += `<span>${cat.name}</span>`; 
-    }); 
-    content += '</div>'; 
-    content += `<span>${item.title}</span>`; 
-    content += '</a></li>'; 
-    content += ''; 
-  }) 
-  return `<ul class="list entry navigation">${content}</ul>`; 
-} 
-%> 
-<%- partial('_pre') %> 
-<section class="widget <%- page.widget_style %> <%- page.widget_platform %> <%- page.widget_pjax %>"> 
-  <%- partial('header', {item: item}) %> 
-  <div class='content'> 
-    <%- genList() %> 
-  </div> 
-</section> 
+<%
+function genList() {
+  let content = '';
+  site.posts.filter(p => {
+    return p.title && p.title.length > 0;
+  }).sort("updated", -1).limit(5).each(item => {
+    content += `<li><a class="widget-last" href="${url_for(item.link || item.path)}">`;
+    content += '<div class="item">';
+    content += `<time>${date(item.updated, config.date_format)}</time>`;
+    item.categories.limit(1).forEach((cat, i) => {
+      content += `<span>${cat.name}</span>`;
+    });
+    content += '</div>';
+    content += `<span>${item.title}</span>`;
+    content += '</a></li>';
+    content += '';
+  })
+  return `<ul class="list entry navigation">${content}</ul>`;
+}
+%>
+<%- partial('_pre') %>
+<section class="widget <%- page.widget_style %> <%- page.widget_platform %> <%- page.widget_pjax %>">
+  <%- partial('header', {item: item}) %>
+  <div class='content'>
+    <%- genList() %>
+  </div>
+</section>

package/layout/_widget/webinfo.ejs

@@ -25,23 +25,23 @@
         </div>
       <% } %>
 
-      <% if (item.type.visitcounter.siteuv.enable && item.type.visitcounter.service) { %>
+      <% if (item.type.visitcounter.siteuv.enable && (!!theme.analytics.busuanz || !!theme.analytics.leancloud.app_id)) { %>
         <div class="webinfo-item">
           <div><%= item.type.visitcounter.siteuv.text %></div>
-          <% if (item.type.visitcounter.service == "busuanzi") {%>
+          <% if (!!theme.analytics.busuanz) {%>
           <div><span id="busuanzi_value_site_uv"><i class="fa-solid fa-fan fa-spin fa-fw" aria-hidden="true"></i></span> <%= item.type.visitcounter.siteuv.unit %></div>
-          <% } else if (item.type.visitcounter.service == "leancloud") { %>
+          <% } else { %>
           <div><span id="lc-uv"><span id='number'><i class="fa-solid fa-circle-notch fa-spin fa-fw" aria-hidden="true"></i></span></span> <%= item.type.visitcounter.siteuv.unit %></div>
           <% } %>
         </div>
       <% } %>
 
-      <% if (item.type.visitcounter.sitepv.enable && item.type.visitcounter.service) { %>
+      <% if (item.type.visitcounter.sitepv.enable && (!!theme.analytics.busuanz || !!theme.analytics.leancloud.app_id)) { %>
         <div class="webinfo-item">
           <div><%= item.type.visitcounter.sitepv.text %></div>
-          <% if (item.type.visitcounter.service == "busuanzi") {%>
+          <% if (!!theme.analytics.busuanz) {%>
           <div><span id="busuanzi_value_site_pv"><i class="fa-solid fa-fan fa-spin fa-fw" aria-hidden="true"></i></span> <%= item.type.visitcounter.sitepv.unit %></div>
-          <% } else if (item.type.visitcounter.service == "leancloud") { %>
+          <% } else { %>
           <div><span id="lc-sv"><span id='number'><i class="fa-solid fa-circle-notch fa-spin fa-fw" aria-hidden="true"></i></span></span> <%= item.type.visitcounter.sitepv.unit %></div>
           <% } %>
         </div>
@@ -50,7 +50,7 @@
       <% if (item.type.lastupd.enable) { %>
         <div class="webinfo-item">
           <div><%= item.type.lastupd.text %></div>
-          <div id="last-update-show"><%- date(Date.now()) %> <%= item.type.lastupd.unit %></div> 
+          <div id="last-update-show"><%- date(Date.now()) %> <%= item.type.lastupd.unit %></div>
         </div>
       <% } %>
     </div>

package/layout/layout.ejs

@@ -3,6 +3,16 @@
   <%- partial('_partial/scripts/_ctrl') _%>
   <%- partial('_partial/head') _%>
   <body itemscope itemtype="http://schema.org/WebPage">
+    <!-- import body_begin begin-->
+    <%_ if (config.import && config.import.body_begin){ _%>
+      <%_ ([...config.import.body_begin]).forEach(function(item){ _%>
+        <%- item %>
+      <%_ }) _%>
+    <%_ } _%>
+    <!-- import body_begin end-->
+    <!-- Custom Files bodyBegin begin-->
+    <%- volantis_inject('bodyBegin') %>
+    <!-- Custom Files bodyBegin end-->
     <%- partial('_partial/header', null, {cache: false, path: path}) %>
     <div id="l_body">
       <%- partial('_partial/cover') %>
@@ -21,8 +31,15 @@
         <%- partial('_plugins/pjax/index') %>
       <% } %>
     </div>
-  <!-- Custom Files bodyEnd begin-->
-  <%- volantis_inject('bodyEnd') %>
-  <!-- Custom Files bodyEnd end-->
+    <!-- import body_end begin-->
+    <%_ if (config.import && config.import.body_end){ _%>
+      <%_ ([...config.import.body_end]).forEach(function(item){ _%>
+        <%- item %>
+      <%_ }) _%>
+    <%_ } _%>
+    <!-- import body_end end-->
+    <!-- Custom Files bodyEnd begin-->
+    <%- volantis_inject('bodyEnd') %>
+    <!-- Custom Files bodyEnd end-->
   </body>
 </html>

package/layout/tag.ejs

@@ -1,5 +1,5 @@
 <%- partial('_pre') %>
-<% 
+<%
 page.comments = false;
 if (!page.robots) {
   page.robots = 'noindex,follow';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-volantis",
-  "version": "5.0.0-rc.9",
+  "version": "5.2.0",
   "description": "Elegant and powerful theme for Hexo.",
   "main": "package.json",
   "scripts": {

package/scripts/events/lib/check-configuration.js

@@ -0,0 +1,43 @@
+module.exports =(hexo) => {
+  try {
+    let config = hexo.config;
+    let themeConfig = hexo.theme.config;
+    if (!config.title) {
+      return `title 未配置！
+请在站点配置 _config.yml 中配置 title
+see: https://hexo.io/zh-cn/docs/configuration
+title not configured!
+see: https://hexo.io/zh-cn/docs/configuration`
+    }
+    if (!config.description) {
+      return `description 未配置！
+请在站点配置 _config.yml 中配置 description
+description主要用于SEO，告诉搜索引擎一个关于您站点的简单描述，通常建议在其中包含您网站的关键词。
+see: https://hexo.io/zh-cn/docs/configuration
+description not configured!
+see: https://hexo.io/zh-cn/docs/configuration`
+    }
+    if (themeConfig?.search?.service===`google`||themeConfig?.search?.service===`algolia`||themeConfig?.search?.service===`azure`||themeConfig?.search?.service===`baidu`) {
+      return `原 google, algolia, azure, baidu 站内搜索 系祖传代码, 且文档丢失, 不便后续维护 在 5.0 版本被移除
+The google, algolia, azure, baidu site search is ancestral code, and the document is lost, which is inconvenient for subsequent maintenance. It was removed in version 5.0
+see: https://volantis.js.org/v5/theme-settings/#站内搜索`
+    }
+    if (`backstretch` in themeConfig?.plugins) {
+      return `jquery.backstretch 在 5.0 版本被移除, 被 parallax 替代
+jquery.backstretch was removed in version 5.0, replaced by parallax
+see: https://volantis.js.org/v5/theme-settings/#幻灯片背景-视差滚动效果`
+    }
+    if ("valinecount" in themeConfig?.article?.body?.top_meta||"valinecount" in themeConfig?.article?.body?.bottom_meta||"valinecount" in themeConfig?.article?.body?.meta_library) {
+      return `ValineCount 在 5.0 版本被移除
+ValineCount has been removed in 5.0 version
+see: https://volantis.js.org/v5/theme-settings/#文章布局配置`
+    }
+    if (themeConfig?.comments?.service=="valine"||themeConfig?.comments?.service=="minivaline") {
+      return `Valine 在 5.0 版本被移除
+Valine has been removed in 5.0 version
+see: https://volantis.js.org/v5/theme-settings/#选择评论系统`
+    }
+  } catch (error) {}
+  return true;
+};
+

package/scripts/events/lib/check-environment.js

@@ -1,9 +1,18 @@
-'use strict';
+// 环境配置检查可以避免一些奇葩的报错
+
 const exec = require('child_process').exec;
 module.exports =(hexo) => {
   if (!hexo.checkEnvironment) {
     hexo.checkEnvironment=1;
     hexo.log.info(`Checking environment configuration...`);
+
+    // Checking configuration
+    let checkConfiguration = require('./check-configuration')(hexo);
+    if (checkConfiguration!==true) {
+      CheckConfError(hexo,checkConfiguration);
+    }
+
+    // Checking environment
     exec('node -v', (err, stdout, stderr) => {
       if (err) {
         CheckError(hexo,`node.js: ${err}`);
@@ -52,4 +61,14 @@ node.js: 16.x LTS ~ latest LTS
 npm: 8.x ~ latest LTS
 ============================================================`);
   throw new Error('环境配置检查失败！| Environment configuration check failed!');
+}
+
+function CheckConfError(hexo,msg) {
+  hexo.log.error(`
+============================================================
+配置文件检查失败！| Configuration check failed!
+============================================================
+${msg}
+============================================================`);
+  throw new Error('配置文件检查失败！| Configuration check failed!');
 }

package/scripts/events/lib/config.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const { version } = require('../../../package.json');
+
 function isObject(item) {
   return item && typeof item === 'object' && !Array.isArray(item);
 }
@@ -85,4 +87,5 @@ module.exports = hexo => {
     }
   }
   volantis_static_cdn(hexo.theme.config,hexo);
+  hexo.theme.config.info.theme_version = version;
 };

package/scripts/events/lib/render-stylus.js

@@ -1,4 +1,4 @@
-// hexo.renderStylus 渲染 Stylus 的工具函数 
+// hexo.renderStylus 渲染 Stylus 的工具函数
 // hexo.createUuid   创建 uuid
 
 const stylus = require("stylus");

package/scripts/filters/content-visibility.js

@@ -9,9 +9,9 @@ hexo.extend.filter.register('after_post_render', function (data) {
     let yy = e.replace(/<h2.*?>.*?<\/h2>/, function (str) {
       if (flag) {
         flag = 0
-        return str + `<div class="story post-story">`
+        return `<div class="story post-story">` + str
       } else {
-        return `</div>` + str + `<div class="story post-story">`
+        return `</div><div class="story post-story">` + str
       }
     })
     mydata += yy

package/scripts/helpers/custom-files.js

@@ -11,13 +11,15 @@ let points = {
     "darkVar",
   ],
   views: [
-    "head",
+    "headBegin",
+    "headEnd",
     "header",
     "side",
     "topMeta",
     "bottomMeta",
     "footer",
     "postEnd",
+    "bodyBegin",
     "bodyEnd",
   ]
 }

package/scripts/helpers/head/generate_seo.js

@@ -10,7 +10,7 @@ hexo.extend.helper.register('generate_seo', function (theme, page) {
       }else{
         robots_content=theme.seo.robots.home_other_pages
       }
-    } else if (hexo.is_archive()) { 
+    } else if (hexo.is_archive()) {
       robots_content=theme.seo.robots.archive
     } else if (hexo.is_category()) {
       robots_content=theme.seo.robots.category

package/scripts/helpers/structured-data/lib/blogposting.js

@@ -4,10 +4,8 @@ module.exports = (hexo, option) => {
   const blogposting = {
     "@context": "http://schema.org",
     "@type": "BlogPosting",
-    headline: post.title,
-    description: post.description || hexo.strip_html(post.excerpt),
-    datePublished: post.date.toISOString(),
-    dateModified: post.updated.toISOString(),
+    headline: post.title || post.seo_title,
+    description: post.description || hexo.strip_html(post.excerpt) || config.description,
     inLanguage: config.language,
     mainEntityOfPage: {
       "@type": "WebPage",
@@ -37,12 +35,26 @@ module.exports = (hexo, option) => {
 
   blogposting.wordCount = hexo.strip_html(post.excerpt).length;
 
+  if (post.date) {
+    blogposting.datePublished = post.date.toISOString();
+  }
+  if (post.updated) {
+    blogposting.dateModified = post.updated.toISOString();
+  }
   if (post.categories && post.categories.length) {
-    blogposting.articleSection = post.categories.data[0].name;
+    if (post.categories.data) {
+      blogposting.articleSection = post.categories.data[0].name;
+    } else {
+      blogposting.articleSection = post.categories[0];
+    }
   }
 
   if (post.tags && post.tags.length) {
-    blogposting.keywords = post.tags.map((tag) => tag.name).join(",");
+    if (post.tags.data) {
+      blogposting.keywords = post.tags.map((tag) => tag.name).join(",");
+    } else {
+      blogposting.keywords = post.tags.map((tag) => tag).join(",");
+    }
   }
   let image = post.headimg || "";
   if (image) {

package/scripts/helpers/structured-data/lib/breadcrumblist.js

@@ -119,7 +119,31 @@ module.exports = (hexo, option) => {
       position: 3,
       item: {
         "@id": config.url + config.root + page.path,
-        name: page.title,
+        name: page.title || page.seo_title,
+      },
+    });
+  }
+
+  if (hexo.is_page()&&page.categories) {
+    let temp = "/"
+    for (let index = 0; index < page.categories.length; index++) {
+      const cat = page.categories[index];
+      temp = temp + cat + "/"
+      breadcrumb.itemListElement.push({
+        "@type": "ListItem",
+        position: 2,
+        item: {
+          "@id": config.url + config.root + config.category_dir + temp,
+          name: cat,
+        },
+      })
+    }
+    breadcrumb.itemListElement.push({
+      "@type": "ListItem",
+      position: 3,
+      item: {
+        "@id": config.url + config.root + page.path,
+        name: page.title || page.seo_title,
       },
     });
   }

package/scripts/helpers/structured-data/lib/index.js

@@ -24,15 +24,7 @@ function merge(target, source) {
 module.exports = function () {
   const hexo = this;
   const option = merge(config(hexo), hexo.theme.structured_data.data);
-  const builder = [Organization, Person, BreadcrumbList];
-
-  if (hexo.is_post()) {
-    builder.push(BlogPosting);
-  } else {
-    builder.push(WebSite);
-  }
-
+  const builder = [Organization, Person, BreadcrumbList, WebSite, BlogPosting];
   const jsonld = JSON.stringify(builder.map((f) => f(hexo, option)));
-
   return `<script type="application/ld+json">${jsonld}</script>`;
 };

package/scripts/tags/fancybox.js

@@ -17,7 +17,7 @@ function buidImgFancybox(content, group) {
   if(html.startsWith('<p>') &&  html.endsWith('</p>')) {  // 去除无用的 p 标签包裹
     html=html.substring(0, html.length-4).substring(3);
   }
-  
+
   let imageTags = html.includes('image-caption') ? 'image' : undefined;
   let imgList = html.match(/<img.*?>/g) || [];
   imgList.forEach(item => {