hexo-theme-particlex 2.3.2 → 2.3.4

package/README.md

@@ -305,7 +305,7 @@ highlightStyle: github # Highlight style
     ```yaml
     twikoo:
         enable: false
-        envId:
+        envID:
         region:
         path: location.pathname
         lang: zh-CN

package/_config.yml

@@ -155,7 +155,7 @@ waline:
 # https://github.com/imaegoo/twikoo
 twikoo:
     enable: false
-    envId:
+    envID:
     region:
     path: location.pathname
     lang: zh-CN

package/layout/menu.ejs

@@ -1,7 +1,7 @@
 <nav id="menu">
     <div class="desktop-menu">
-        <a href="<%- config.root %>">
-            <span class="title"><%= config.title.toUpperCase() %></span>
+        <a class="title" href="<%- config.root %>">
+            <span><%= config.title.toUpperCase() %></span>
         </a>
         <% Object.keys(theme.menu).forEach(key => { %>
         <a href="<%- url_for(theme.menu[key].src) %>">

package/layout/post.ejs

@@ -40,22 +40,20 @@
     <%
         const CryptoJS = crypto();
         function sha(str) {
-            return CryptoJS.SHA256(str).toString(CryptoJS.enc.Base64);
+            return CryptoJS.SHA256(str).toString();
         }
         function encrypt(str, key) {
-            return CryptoJS.AES.encrypt(str, sha(key), {
-                mode: CryptoJS.mode.ECB,
-                padding: CryptoJS.pad.Pkcs7,
-            }).toString();
+            return CryptoJS.AES.encrypt(str, key).toString();
         }
     %>
-    <input id="crypto" class="input" placeholder="文章被加密，请输入密码" data-encrypt="<%- encrypt(page.content, page.password.toString()) %>" data-check="<%- sha(page.content) %>">
+    <input id="crypto" class="input" placeholder="文章被加密，请输入密码" data-encrypt="<%- encrypt(page.content, page.password) %>" data-shasum="<%- sha(page.content) %>">
     <div class="content" v-pre style="opacity: 0"></div>
     <% } else { %>
     <div class="content" v-pre>
         <%- page.content %>
     </div>
     <% } %>
+    <% if (page.comments) { %>
     <% if (theme.gitalk.enable) { %>
     <div id="comment">
         <div id="gitalk-container"></div>
@@ -76,4 +74,5 @@
         <div id="twikoo-container"></div>
     </div>
     <% } %>
+    <% } %>
 </div>

package/layout/script.ejs

@@ -1,6 +1,6 @@
 <script src="<%- url_for("/js/functions.js") %>"></script>
 <script src="<%- url_for("/js/particlex.js") %>"></script>
-<% if (type == "post") { %>
+<% if (type == "post" && page.comments) { %>
 <% if (theme.gitalk.enable) { %>
 <script src="https://cdn.staticfile.org/gitalk/1.8.0/gitalk.min.js"></script>
 <link rel="stylesheet" href="https://cdn.staticfile.org/gitalk/1.8.0/gitalk.min.css">
@@ -57,9 +57,9 @@
         serverURL: "<%- theme.waline.serverURL %>",
         commentCount: <%- theme.waline.commentCount %>,
         pageview: <%- theme.waline.pageview %>,
-        emoji: "<%- theme.waline.emoji %>".split(","),
-        meta: "<%- theme.waline.meta %>".split(","),
-        requiredMeta: "<%- theme.waline.requiredMeta %>".split(","),
+        emoji: <%- JSON.stringify(theme.waline.emoji) %>,
+        meta: <%- JSON.stringify(theme.waline.meta) %>,
+        requiredMeta: <%- JSON.stringify(theme.waline.requiredMeta) %>,
         lang: "<%- theme.waline.lang %>",
         wordLimit: <%- theme.waline.wordLimit %>,
         pageSize: "<%- theme.waline.pageSize %>",
@@ -73,7 +73,7 @@
 <script>
     twikoo.init({
         el: "#twikoo-container",
-        envId: "<%- theme.twikoo.envId %>",
+        envId: "<%- theme.twikoo.envID %>",
         region: "<%- theme.twikoo.region %>",
         path: <%- theme.twikoo.path %>,
         lang: "<%- theme.twikoo.lang %>",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-particlex",
-  "version": "2.3.2",
+  "version": "2.3.4",
   "description": "A concise Hexo theme, based on Particle.",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/source/css/particlex.css

@@ -406,22 +406,14 @@
 #menu .desktop-menu .title {
     color: #555;
     display: inline-block;
-    font-family: Lexend, "Noto Sans SC", sans-serif;
-    margin-left: 30px;
+    margin-left: 60px;
+    margin-right: 5px;
 }
 #menu .desktop-menu a {
     color: #555;
     display: inline-block;
     margin-left: 30px;
 }
-#menu .desktop-menu a span img {
-    height: 20px;
-    top: 3px;
-    width: 20px;
-}
-#menu .desktop-menu a span:nth-child(1) {
-    margin-right: 5px;
-}
 #menu .phone-menu {
     min-height: 50px;
     text-align: center;
@@ -740,7 +732,7 @@ blockquote {
 }
 body {
     background: #f6f8fa;
-    color: #000000d9;
+    color: #000c;
     font: 500 14px Lexend, "Noto Sans SC", sans-serif;
     overflow-x: hidden;
     width: 100%;

package/source/js/functions.js

@@ -54,15 +54,12 @@ function rendermath() {
         });
 }
 function sha(str) {
-    return CryptoJS.SHA256(str).toString(CryptoJS.enc.Base64);
+    return CryptoJS.SHA256(str).toString();
 }
-function decrypt(encrypt, key, check) {
+function decrypt(str, key, shasum) {
     try {
-        let res = CryptoJS.AES.decrypt(encrypt, sha(key), {
-            mode: CryptoJS.mode.ECB,
-            padding: CryptoJS.pad.Pkcs7,
-        }).toString(CryptoJS.enc.Utf8);
-        return { decrypt: res, check: sha(res) == check };
+        let res = CryptoJS.AES.decrypt(str, key).toString(CryptoJS.enc.Utf8);
+        return { decrypt: res, check: sha(res) === shasum };
     } catch {
         return { check: false };
     }

package/source/js/particlex.js

@@ -45,14 +45,17 @@ const app = Vue.createApp({
             });
         }
         window.addEventListener("scroll", this.handlescroll, true);
-        highlight();
-        showimg();
-        rendermath();
+        this.render();
     },
     methods: {
         homeclick() {
             window.scrollTo({ top: window.innerHeight, behavior: "smooth" });
         },
+        render() {
+            highlight();
+            showimg();
+            rendermath();
+        },
         handlescroll() {
             let newlocal = document.documentElement.scrollTop;
             let menu = document.getElementById("menu");
@@ -71,16 +74,14 @@ const app = Vue.createApp({
         handlecrypto() {
             let input = document.getElementById("crypto"),
                 content = document.getElementsByClassName("content")[0];
-            let res = decrypt(input.dataset.encrypt, input.value, input.dataset.check);
+            let res = decrypt(input.dataset.encrypt, input.value, input.dataset.shasum);
             if (res.check) {
                 input.disabled = true;
                 input.classList.remove("fail");
                 input.classList.add("success");
                 content.innerHTML = res.decrypt;
                 content.style.opacity = 1;
-                highlight();
-                showimg();
-                rendermath();
+                this.render();
             } else input.classList.add("fail");
         },
         handlesearch() {