hexo-theme-solitude 1.2.6 → 1.3.1

package/layout/page.pug

@@ -1,32 +1,37 @@
 extends includes/layout.pug
 
 block content
-  main.layout(class=page.aside ? '' : 'hide-aside', id='content-inner')
-    div#page
-      case page.type
-        when 'categories'
-          include includes/page/categories
-        when 'tags'
-          include includes/page/tags
-        when 'links'
-          include includes/page/links
-        when 'tlink'
-          include includes/page/tlink
-        when 'about'
-          include includes/page/about
-        when 'says'
-          include includes/page/says
-        when 'equipment'
-          include includes/page/equipment
-        when 'moments'
-          include includes/page/moments
-        when 'echarts'
-          include includes/page/echarts
-        when 'rss'
-          include includes/page/rss
-        default
-          include includes/page/default
-      if page.comment
-        include includes/widgets/third-party/comments/comment
-    if page.aside
-      include includes/widgets/aside/aside
+    main.layout#content-inner(class=page.aside ? '' : 'hide-aside')
+        #page
+            case page.type
+                when 'categories'
+                    include includes/page/categories
+                when 'tags'
+                    include includes/page/tags
+                when 'links'
+                    include includes/page/links
+                when 'tlink'
+                    include includes/page/tlink
+                when 'about'
+                    include includes/page/about
+                when 'says'
+                    include includes/page/says
+                when 'equipment'
+                    include includes/page/equipment
+                when 'moments'
+                    include includes/page/moments
+                when 'echarts'
+                    include includes/page/echarts
+                when 'rss'
+                    include includes/page/rss
+                when 'douban'
+                    include includes/widgets/page/banner
+                    include includes/page/default
+                when 'music'
+                    include includes/page/music
+                default
+                    include includes/page/default
+            if page.comment
+                include includes/widgets/third-party/comments/comment
+        if page.aside
+            include includes/widgets/aside/aside

package/layout/post.pug

@@ -3,6 +3,8 @@ extends includes/layout.pug
 block content
     main.layout#content-inner
         #post
+            if theme.thirdparty.ai.enable
+                include includes/widgets/third-party/ai/index
             article.post-content#article-container!= page.content
             include includes/widgets/post/copyright
             .post-tools-right
@@ -18,26 +20,4 @@ block content
             != related_posts(page, site.posts)
             if page.comment
                 include includes/widgets/third-party/comments/comment
-        include includes/widgets/aside/aside
-        if theme.thirdparty.ai.enable
-            -  let ai_black_list = theme.thirdparty.ai.BlackWhite_List.mode === 'black' ? theme.thirdparty.ai.BlackWhite_List.List.map(item => `'${item}'`).join(', ') : '';
-            -  let ai_white_list = theme.thirdparty.ai.BlackWhite_List.mode === 'white' ? theme.thirdparty.ai.BlackWhite_List.List.map(item => `'${item}'`).join(', ') : '';
-            script(data-pjax, defer).
-                new ChucklePostAI({
-                    el: '#post #article-container',
-                    key: '#{theme.thirdparty.ai.key}',
-                    title_el: '.post-title',
-                    rec_method: '#{theme.thirdparty.ai.rec_method || 'web'}',
-                    interface: {
-                        name: "#{theme.thirdparty.ai.ai_name || 'Solitude AI'}",
-                        introduce: "#{theme.thirdparty.ai.ai_introduce || '我是文章辅助AI生成工具: Solitude AI。你可以点击下方的按钮，让我生成本文简介、推荐相关文章等。'}",
-                        version: "#{theme.thirdparty.ai.ai_tips || 'GPT 4'}",
-                    },
-                    hide_shuttle: !{!!theme.thirdparty.ai.hide_shuttle},
-                    typewriter: !{!!theme.thirdparty.ai.typewriter},
-                    speed: !{!!theme.thirdparty.ai.speed},
-                    eliminate: [!{ai_black_list}],
-                    whitelist: [!{ai_white_list}],
-                    total_length: !{page.ai_total_length ? page.ai_total_length : 0},
-                    ratio_string: !{page.ai_ratio_string ? page.ai_ratio_string : 0},
-                })
+        include includes/widgets/aside/aside

package/layout/tag.pug

@@ -2,14 +2,14 @@ extends includes/layout.pug
 
 block content
     main.layout#content-inner
-        div#tag
-            div#tag-page-tags
+        #tag
+            #tag-page-tags
                 each tag in site.tags.find({ parent: { $exists: false } }).data
                     a(id=tag.name class=(tag.name === page.tag ? 'select' : '') href=url_for(tag.path))
                         span.tags-punctuation
                         | #{tag.name}
                         span.tagsPageCount #{tag.length}
-            div.recent-posts#recent-posts
+            .recent-posts#recent-posts
                 each post in page.posts.find({ parent: { $exists: false } }).data
                     include includes/widgets/home/postList
             include includes/mixins/pagination

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "1.2.6",
+  "version": "1.3.1",
   "description": "A beautiful, powerful, and efficient Hexo theme developed by the DuoSco team",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -20,4 +20,4 @@
     "url": "https://github.com/DuoSco/Hexo-theme-solitude/issues"
   },
   "homepage": "https://github.com/DuoSco/hexo-theme-solitude#readme"
-}
+}

package/scripts/filter/checkThemeConfig.js

@@ -3,15 +3,10 @@
 hexo.extend.filter.register('before_post_render', () => {
     const logger = hexo.log;
     const theme = hexo.theme.config;
-    const config = hexo.config;
     if (theme.hometop.banner.enable && !theme.hometop.banner.icon) {
         logger.error('\n 启用banner的情况下，必须提供 icon 图片！\n 请在主题配置文件中设置 hometop.banner.icon 选项。');
         logger.error('\n If banner is enabled, icon image must be supplied! \n Please set the hometop.banner.icon option in the theme configuration file.');
         process.exit(-1);
     }
-    if (config.language !== 'zh-CN' && config.language !== 'en-US') {
-        logger.error('\n 请在站点配置文件中设置 language 选项为 zh-CN 或 en-US。');
-        process.exit(-1);
-    }
 }
 );

package/scripts/helper/cdn.js

@@ -0,0 +1,12 @@
+'use strict';
+
+hexo.extend.helper.register('cdn_url_for', function(path) {
+    const {config, theme} = this
+    const cdnPrefix = theme.cdn.prefix;
+    const urlFor = hexo.extend.helper.get('url_for').bind(this);
+    if (cdnPrefix) {
+        return cdnPrefix + urlFor(path);
+    } else {
+        return urlFor(path);
+    }
+});

package/scripts/helper/page.js

@@ -0,0 +1,13 @@
+"use strict";
+const { stripHTML, escapeHTML } = require('hexo-util')
+hexo.extend.helper.register('page_description', function () {
+    const { config, page } = this
+    let description =  page.description || page.content || page.title || config.description
+
+    if (description) {
+        description = escapeHTML(stripHTML(description).substring(0, 150)
+            .trim()
+        ).replace(/\n/g, ' ').replace(/\s+/g, ' ');
+        return description
+    }
+})

package/scripts/helper/related_post.js

@@ -35,7 +35,6 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
         return ''
     }
     let result = ''
-    const hexoConfig = hexo.config
     const config = hexo.theme.config
 
     const limitNum = config.related_post.limit || 6

package/scripts/tags/button.js

@@ -0,0 +1,21 @@
+"use strict";
+
+const urlFor = require("hexo-util").url_for.bind(hexo);
+
+function btn(args) {
+    args = args.join(" ").split(",");
+    let url = args[0] || "";
+    let text = args[1] || "";
+    let icon = args[2] || "";
+    let option = args[3] || "";
+
+    url = url.trim();
+    text = text.trim();
+    icon = icon.trim();
+    option = option.trim();
+
+    return `<button class="btn-sco ${option}" onclick="location.href = '${urlFor(url)}'" 
+  title="${text}">${icon.length ? `<i class="${icon}"></i>` : ""}${text.length ? `<span>${text}</span>` : ""}</button>`;
+}
+
+hexo.extend.tag.register("btn", btn, { ends: false });

package/scripts/tags/card.js

@@ -0,0 +1,9 @@
+'use strict';
+
+hexo.extend.tag.register('card', function (args, content) {
+    args = args.join(' ').split(',');
+    let icon = args[0] || 'no-icon';
+    let color = args[1] || 'info';
+    let title = args[2] || '';
+    return `<div class="card card-${color}"><div class="card-title"><i class="scoicon ${icon}"></i>${title}</div>${hexo.render.renderSync({text: content, engine: 'markdown'})}</div>`
+}, {ends: true});

package/scripts/tags/checkbox.js

@@ -0,0 +1,51 @@
+'use strict';
+
+function postCheckbox(args) {
+    args = args.join(' ').split(',')
+    var cls = ''
+    var text = ''
+    var checked = false
+    if (args.length > 1) {
+        cls = (args[0] || '').trim()
+        if (cls.length > 0) {
+            cls = ' ' + cls
+        }
+        if (cls.indexOf('checked') > -1) {
+            checked = true
+        }
+        text = (args[1] || '').trim()
+    } else if (args.length > 0) {
+        text = (args[0] || '').trim()
+    }
+    if (text.length > 0) {
+        return `<div class='checkbox${cls}'><input type="checkbox" ${ checked ? 'checked="checked"' : '' }/>
+            ${hexo.render.renderSync({text: text, engine: 'markdown'}).split('\n').join('')}
+            </div>`
+    }
+}
+function postRadio(args) {
+    args = args.join(' ').split(',')
+    var cls = ''
+    var text = ''
+    var checked = false
+    if (args.length > 1) {
+        cls = (args[0] || '').trim()
+        if (cls.length > 0) {
+            cls = ' ' + cls
+        }
+        if (cls.indexOf('checked') > -1) {
+            checked = true
+        }
+        text = (args[1] || '').trim()
+    } else if (args.length > 0) {
+        text = (args[0] || '').trim()
+    }
+    if (text.length > 0) {
+        return `<div class='checkbox${cls}'><input type="radio" ${ checked ? 'checked="checked"' : '' }/>
+            ${hexo.render.renderSync({text: text, engine: 'markdown'}).split('\n').join('')}
+            </div>`
+    }
+}
+
+hexo.extend.tag.register('checkbox', postCheckbox);
+hexo.extend.tag.register('radio', postRadio);

package/scripts/tags/fold.js

@@ -1,8 +1,3 @@
-/**
- * Fold
- * from acrylic
- */
-
 'use strict'
 
 function postTabs(args, content) {

package/scripts/tags/image.js

@@ -0,0 +1,75 @@
+'use strict';
+
+hexo.extend.tag.register('image', function(args) {
+    args = args.join(' ').split(', ');
+    let url = args[0].trim();
+    let alt = '';
+    let bg = '';
+    let style = '';
+    if (args.length > 1) {
+        for (let i = 1; i < args.length; i++) {
+            let tmp = args[i].trim();
+            if (tmp.includes('alt=')) {
+                alt = tmp.substring(4, tmp.length);
+            } else if (tmp.includes('width=')) {
+                style += 'width:' + tmp.substring(6, tmp.length) + ';';
+            } else if (tmp.includes('height=')) {
+                style += 'height:' + tmp.substring(7, tmp.length) + ';';
+            } else if (tmp.includes('bg=')) {
+                bg = tmp.substring(3, tmp.length);
+            }
+        }
+    }
+    function img(url, alt, style) {
+        let img = '';
+        img += '<img class="img" src="' + url + '"';
+        if (alt.length > 0) {
+            img += ' alt="' + alt + '"';
+        }
+        if (style.length > 0) {
+            img += ' style="' + style + '"';
+        }
+        img += '/>';
+        return img;
+    }
+
+    let ret = '';
+    ret += '<div class="img-wrap">';
+    ret += '<div class="img-bg"';
+    if (bg.length > 0) {
+        ret += ' style="background:' + bg + '"';
+    }
+    ret += '>';
+    ret += img(url, alt, style);
+    ret += '</div>';
+
+    if (alt.length > 0) {
+        ret += '<span class="image-caption">' + alt + '</span>';
+    }
+
+    ret += '</div>';
+    return ret;
+});
+
+hexo.extend.tag.register('inlineimage', function(args) {
+    args = args.join(' ').split(', ');
+    let url = args[0].trim();
+    let ret = '';
+    ret += '<img no-lazy class="inline" src="' + url + '"';
+    let style = '';
+    if (args.length > 1) {
+        for (let i = 1; i < args.length; i++) {
+            let tmp = args[i].trim();
+            if (tmp.includes('height=')) {
+                style += 'height:' + tmp.substring(7, tmp.length) + ';';
+            }
+        }
+    }
+    if (style.length > 0) {
+        ret += ' style="' + style + '"';
+    } else {
+        ret += ' style="height:1.5em"';
+    }
+    ret += '/>';
+    return ret;
+});

package/scripts/tags/inline-image.js

@@ -0,0 +1,12 @@
+'use strict'
+
+const urlFor = require('hexo-util').url_for.bind(hexo)
+
+function inlineImg (args) {
+    const img = args[0]
+    const height = args[1] ? `style="height:${args[1]}"` : ''
+
+    return `<img class="inline-img" src="${urlFor(img)}" ${height}/>`
+}
+
+hexo.extend.tag.register('inlineimage', inlineImg, { ends: false })

package/scripts/tags/label.js

@@ -0,0 +1,10 @@
+'use strict'
+
+function addLabel (args, content) {
+    const text = args[0]
+    const className = args[1] || 'default'
+
+    return `<label class="hl-label bg-${className}">${text}</label> `
+}
+
+hexo.extend.tag.register('label', addLabel, { ends: false })

package/scripts/tags/link.js

@@ -1,3 +1,5 @@
+'use strict'
+
 function link(args) {
     let urlNoProtocol = args[2].replace(/^https?\:\/\//i, "");
     let imgUrl = "https://api.iowen.cn/favicon/" + urlNoProtocol + ".png";

package/scripts/tags/media.js

@@ -0,0 +1,29 @@
+'use strict';
+
+function postAudio(args) {
+    let src = args[0].trim()
+    return `<div class="audio"><audio controls preload><source src='${src}' type='audio/mp3'>Your browser does not support the audio tag.</audio></div>`;
+}
+
+function postVideo(args) {
+    let src = args[0].trim()
+    return `<div class="video"><video controls preload><source src='${src}' type='video/mp4'>Your browser does not support the video tag.</video></div>`;
+}
+
+function postVideos(args, content) {
+    args = args.join(' ').split(',')
+    var cls = args[0]
+    if (cls.length > 0) {
+        cls = ' ' + cls
+    }
+    var col = Number(args[1]) || 0;
+    if (col > 0) {
+        return `<div class="videos${cls}" col='${col}'>${content}</div>`
+    } else {
+        return `<div class="videos${cls}">${content}</div>`
+    }
+}
+
+hexo.extend.tag.register('audio', postAudio);
+hexo.extend.tag.register('video', postVideo);
+hexo.extend.tag.register('videos', postVideos, {ends: true});

package/scripts/tags/span.js

@@ -0,0 +1,17 @@
+'use strict';
+
+function postP(args) {
+    args = args.join(' ').split(',')
+    let p0 = args[0].trim()
+    let p1 = args[1].trim()
+    return `<p class='p ${p0}'>${p1}</p>`;
+}
+function postSpan(args) {
+    args = args.join(' ').split(',')
+    let p0 = args[0].trim()
+    let p1 = args[1].trim()
+    return `<span class='p ${p0}'>${p1}</span>`;
+}
+
+hexo.extend.tag.register('p', postP);
+hexo.extend.tag.register('span', postSpan);

package/scripts/tags/timeline.js

@@ -1,8 +1,4 @@
-/**
- * timeline.js | https://volantis.js.org/v3/tag-plugins/#Timeline
- */
-
-"use strict";
+"use strict"
 
 function postTimeline(args, content) {
     if (args.length > 0) {
@@ -15,21 +11,12 @@ function postTimeline(args, content) {
 function postTimenode(args, content) {
     args = args.join(" ").split(",");
     var time = args[0];
-    return `<div class="timenode"><div class="meta"><p>${hexo.render.renderSync({
-        text: time,
-        engine: "markdown",
-    })}</p></div><div class="body">${hexo.render
+    return `<div class="timenode"><div class="meta"><p>${time}</p></div><div class="body">${hexo.render
         .renderSync({ text: content, engine: "markdown" })
         .split("\n")
         .join("")}</div></div>`;
 }
 
-// {% timeline %}
-// ... timenode ...
-// {% endtimeline %}
 hexo.extend.tag.register("timeline", postTimeline, { ends: true });
 
-// {% timenode time %}
-// what happened
-// {% endtimenode %}
 hexo.extend.tag.register("timenode", postTimenode, { ends: true });

package/scripts/tags/u.js

@@ -0,0 +1,7 @@
+"use strict"
+
+function u(args, content) {
+    return `<u>${hexo.render.renderSync({text: text, engine: 'markdown'}).split('\n').join('')}</u>`;
+}
+
+hexo.extend.tag.register("u", u, { ends: false });

package/source/css/_global/animation.css

@@ -753,4 +753,61 @@
     100% {
         transform: translate(0, -4px)
     }
+}
+
+@media screen and (min-width: 768px) {
+    @keyframes showCover {
+        from {
+            opacity: 0;
+            transform: rotate(10deg) translateY(-8%) scale(1.8);
+        }
+        to {
+            opacity: 0.5;
+            transform: rotate(10deg) translateY(-10%) scale(2);
+        }
+    }
+}
+
+@keyframes blinking-cursor {
+    0% {
+        transform: scale(.6)
+    }
+
+    25% {
+        transform: scale(1)
+    }
+
+    50% {
+        transform: scale(.6)
+    }
+
+    75% {
+        transform: scale(1)
+    }
+
+    100% {
+        transform: scale(.6)
+    }
+}
+
+@keyframes AILoading {
+    0% {
+        opacity: 1
+    }
+
+    25% {
+        opacity: .3
+    }
+
+    50% {
+        opacity: 1
+    }
+
+    75% {
+        opacity: .3
+    }
+
+    100% {
+        opacity: 1
+    }
 }

package/source/css/_global/index.styl

@@ -6,7 +6,10 @@
   --sco-none #00000000
   --sco-gray #999999
   --sco-gray-op #9999992b
+  --sco-cyan #00bcd4
+  --sco-cyan-op #00bcd42b
   --sco-vip #e5a80d
+  --sco-life #57bd6a
   --sco-main var(--sco-theme)
   --sco-main-op var(--sco-theme-op)
   --sco-main-op-deep var(--sco-theme-op-deep)
@@ -51,26 +54,8 @@
   --card-box-shadow 0 3px 8px 6px rgba(7, 17, 27, 0.06)
   --card-hover-box-shadow 0 3px 8px 6px rgba(7, 17, 27, 0.15)
   --offset 0px
-
-  // highlight
-  --hl-color #eff
-  --hl-bg #212121
-  --hltools-bg #1c1c1c
-  --hltools-color rgba(238, 255, 255, 0.8)
-  --hlnumber-bg #212121
-  --hlnumber-color rgba(238, 255, 255, 0.5)
   --hlscrollbar-bg #121212
-  --hlexpand-bg linear-gradient(180deg, rgba(33, 33, 33, 0.6), rgba(33, 33, 33, 0.9))
-
-  // ai摘要
-  --ai-post-bg rgba(255, 255, 255, 0.32)
-  --ai-border 1px solid #e3e8f7bd
-  --ai-tag-bg rgba(48, 52, 63, 0.86)
-  --ai-cursor #333
-
-  // 个性定位
-  --icat-card-welcome #49b1f5
 
   +maxWidth768()
-    --style-border 0px solid var(--sco-none) !important
-    --style-border-hover 0px solid var(--sco-main) !important
+    --style-border 0px solid var(--sco-none)
+    --style-border-hover 0px solid var(--sco-main)

package/source/css/_global/var.styl

@@ -7,4 +7,19 @@ $dark_theme_none = hexo-config('theme_color.dark_none')
 $light_theme = convert(hexo-config('theme_color.light'))
 $light_theme_op = convert(hexo-config('theme_color.light_op'))
 $light_theme_op_deep = convert(hexo-config('theme_color.light_op_deep'))
-$light_theme_none = hexo-config('theme_color.light_none')
+$light_theme_none = hexo-config('theme_color.light_none')
+
+$todayCardColor = convert(hexo-config('hometop.recommendList.color'))
+
+// highlight code
+if hexo-config('hightlight.theme') == 'default'
+  $hl_bg_light = #fff
+  $hltools_bg_light = #f7f7f9
+  $hl_bg_dark = #1b1c20
+  $hltools_bg_dark = #21232a
+
+else if hexo-config('hightlight.theme') == 'mac'
+  $hl_bg_light = #FFFFFF
+  $hltools_bg_light = #E7E7E7
+  $hl_bg_dark = #1C1E1E
+  $hltools_bg_dark = #2A282A