From 083f03f69dae8ce0a410807a1531486169984689 Mon Sep 17 00:00:00 2001 From: Evan Luo Date: Tue, 14 Nov 2023 17:37:05 -0500 Subject: [PATCH 1/4] refactor: Update welcome.js message format and remove unnecessary information --- scripts/events/welcome.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/events/welcome.js b/scripts/events/welcome.js index c3024722..8ac351fe 100644 --- a/scripts/events/welcome.js +++ b/scripts/events/welcome.js @@ -32,8 +32,8 @@ hexo.on("ready", async () => { | | | | _ | |___| | | | |___ | _ <| |___| |_| | |___| _| | || |\\ | |___ | | |_| |_| |_|_____|_| |_|_____| |_| \\_\\_____|____/|_____|_| |___|_| \\_|_____| | | | - | current version v${version} | - | latest version v${jsonData["dist-tags"].latest} | + | current v${version} latest v${jsonData["dist-tags"].latest} | + | https://github.com/EvanNotFound/hexo-theme-redefine | +======================================================================================+ `, ); @@ -55,8 +55,8 @@ hexo.on("ready", async () => { | | | | _ | |___| | | | |___ | _ <| |___| |_| | |___| _| | || |\\ | |___ | | |_| |_| |_|_____|_| |_|_____| |_| \\_\\_____|____/|_____|_| |___|_| \\_|_____| | | | - | current version v2.5.1 | - | fetch latest version failed | + | current v${version} fetch latest failed | + | https://github.com/EvanNotFound/hexo-theme-redefine | +======================================================================================+ `, ); From b79165b642d52ccdfa12602c9dedb4bfeddc9d92 Mon Sep 17 00:00:00 2001 From: Evan Luo Date: Tue, 14 Nov 2023 17:45:40 -0500 Subject: [PATCH 2/4] fix(copyright): incorrect display when hexo generate --- layout/_meta/article-copyright.ejs | 27 +-- layout/article-content.ejs | 2 +- source/assets/build/styles.css | 329 +++++------------------------ 3 files changed, 66 insertions(+), 292 deletions(-) diff --git a/layout/_meta/article-copyright.ejs b/layout/_meta/article-copyright.ejs index 03b54794..4ef61f22 100755 --- a/layout/_meta/article-copyright.ejs +++ b/layout/_meta/article-copyright.ejs @@ -48,24 +48,15 @@ url: null } }; - const isValidLicense = (licenseKey) => { - return licenseMap.hasOwnProperty(licenseKey); - }; - - - const getLicenseType = () => { - if (page.copyright && page.copyright !== "") { - return 'custom'; - } else if (page.license && isValidLicense(page.license)) { - return page.license; - } else if (theme.articles.copyright.default && isValidLicense(theme.articles.copyright.default)) { - return theme.articles.copyright.default; - } else { - return 'cc_by_nc_sa'; - } - }; - const licenseType = getLicenseType(); + let licenseType = 'cc_by_nc_sa'; // Default license type + if (page.copyright && page.copyright !== "") { + licenseType = 'custom'; + } else if (page.license && licenseMap[page.license]) { + licenseType = page.license; + } else if (theme.articles.copyright.default && licenseMap[theme.articles.copyright.default]) { + licenseType = theme.articles.copyright.default; + } %> <% if (licenseType === 'custom') { %> @@ -73,8 +64,6 @@ <% } else { %> <%- licenseMap[licenseType].label %> <% } %> - - diff --git a/layout/article-content.ejs b/layout/article-content.ejs index 28d08b57..13d31c1f 100755 --- a/layout/article-content.ejs +++ b/layout/article-content.ejs @@ -107,7 +107,7 @@ <%- articleRecommendationGenerator(page) %> <% if (page.prev || page.next) { %> -
+
<% if (page.prev) { %>
CC BY-NC-SA 4.0'), + label: __('copyright.license_content', 'CC BY-NC-SA 4.0'), url: 'https://creativecommons.org/licenses/by-nc-sa/4.0' }, 'public_domain': { From 60d57789af5292259e29b1867163d4ab121b4f32 Mon Sep 17 00:00:00 2001 From: Evan Luo Date: Tue, 14 Nov 2023 18:34:53 -0500 Subject: [PATCH 4/4] chore: bump version to v2.5.2 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4733f32d..a8dfb75c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "hexo-theme-redefine", - "version": "2.5.1", + "version": "2.5.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "hexo-theme-redefine", - "version": "2.5.1", + "version": "2.5.2", "license": "AGPL-3.0", "dependencies": { "axios": "^1.6.1", diff --git a/package.json b/package.json index 994a6bbc..25c4fc09 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hexo-theme-redefine", - "version": "2.5.1", + "version": "2.5.2", "private": false, "description": "Redefine your writing in Hexo Theme Redefine.", "scripts": {