hexo-theme-solitude 1.3.0 → 1.4.0

package/languages/en-US.yml

@@ -13,24 +13,16 @@ time:
   daybefore: Days ago
   runtime: days
 
-sayhello:
-  morning: The plan of the day is in the morning
-  noon: Only when you are full can you have the strength to work
-  afternoon: Concentrate and overcome the difficulties
-  night: Don't get too tired, it's healthier to go to bed early
-  goodnight: Get a good night's sleep and keep yourself energized
-
 page:
   tag: Tags
   category: Categories
+  tags: All tags
+  categories: All categories
   archives: Archives
   echarts: Echarts
 
 home:
   bannertext: Just browsing
-  bbtime:
-    text: Read more
-    image: [ Image ]
   categoryBar:
     home: Home
     more: More
@@ -42,16 +34,6 @@ home:
     recommend: Favor
     recommendmore: More
 
-about:
-  info:
-    title1: Hello, nice to meet you👋
-    title2: 'My name is '
-    title3: 'I am a '
-    tip1: Pursue
-    tip2: Originated from
-    tip3: 'Love to go '
-    tip4: Create
-
 post:
   meta_reprint: Reprint or translation
   meta_original: Original
@@ -89,7 +71,7 @@ search:
 
 head:
   noscript: Please enable JavaScript to view the site
-  console: 'Program: Hexo | Theme: Hexo-Theme-Solitude | Author: WangZhuoSco、YiFeng | Github: https://github.com/DuoSco/Hexo-theme-solitude | Version: v1.3.0 😄'
+  console: 'Program: Hexo | Theme: Hexo-Theme-Solitude | Author: WangZhuoSco、YiFeng | Github: https://github.com/DuoSco/Hexo-theme-solitude | Version: v1.4.0 😄'
 
 aside:
   postcount: 'Posts :'
@@ -98,12 +80,10 @@ aside:
   runtime: 'Runtime :'
   updatetime: 'Last update :'
   wordcount: 'Word count :'
-  welcome: Visitors
   toc: Table of contents
   tagmore: View all
   avatar: Avatar
   sticker: Mood sticker
-  history: On this day
   newpost: New posts
 
 console:

package/languages/zh-CN.yml

@@ -13,16 +13,11 @@ time:
   daybefore: 天前
   runtime:  天
 
-sayhello:
-  morning: 一日之计在于晨
-  noon: 吃饱了才有力气干活
-  afternoon: 集中精力，攻克难关
-  night: 不要太劳累了，早睡更健康
-  goodnight: 睡个好觉，保证精力充沛
-
 page:
   tag: 标签
   category: 分类
+  tags: 全部标签
+  categories: 全部分类
   archives: 文章
   echarts: 博客统计
 
@@ -36,9 +31,6 @@ nav:
 
 home:
   bannertext: 随便逛逛
-  bbtime:
-    text: 查看全文
-    image: 【图片】
   categoryBar:
     home: 首页
     more: 更多
@@ -50,16 +42,6 @@ home:
     recommend: 荐
     recommendmore: 更多推荐
 
-about:
-  info:
-    title1: 你好，很高兴认识你👋
-    title2: 我叫
-    title3: 是一名
-    tip1: 追求
-    tip2: 源于
-    tip3: 热爱而去
-    tip4: 创造
-
 post:
   meta_reprint: 转载或翻译
   meta_original: 原创
@@ -88,7 +70,7 @@ search:
 
 head:
   noscript: 开启JavaScript才能访问本站哦~
-  console: '程序：Hexo | 主题：Hexo-Theme-Solitude | 作者：王卓Sco、亦封 | Github: https://github.com/DuoSco/Hexo-theme-solitude | 版本：v1.3.0 😄'
+  console: '程序：Hexo | 主题：Hexo-Theme-Solitude | 作者：王卓Sco、亦封 | Github: https://github.com/DuoSco/Hexo-theme-solitude | 版本：v1.4.0 😄'
 
 aside:
   postcount: '文章总数 :'
@@ -97,12 +79,10 @@ aside:
   runtime: '建站天数 :'
   updatetime: '最后更新 :'
   wordcount: '全站字数 :'
-  welcome: 来访者
   toc: 文章目录
   tagmore: 查看全部
   avatar: 头像
   sticker: 心情贴纸
-  history: 那年今日
   newpost: 最近发布
 
 console:

package/layout/archive.pug

@@ -3,9 +3,8 @@ extends includes/layout.pug
 block content
     main.layout#content-inner
         #archive
-            .article-sort-title #{__('page.archives')}<sup>#{page.posts.find({ parent: { $exists: false } }).length}</sup>
+            .article-sort-title #{__('page.archives')}<sup>#{site.posts.find({ parent: { $exists: false } }).length}</sup>
             .article-sort
                 include includes/mixins/articleSort
             include includes/mixins/pagination
-        include includes/widgets/aside/aside
-
+        include includes/widgets/aside/aside

package/layout/includes/body/mode.pug

@@ -0,0 +1,35 @@
+case theme.display_mode.type
+    when "auto"
+        script.
+            initTheme = () => {
+                let isDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches
+                const cachedMode = saveToLocal.get('theme');
+                if (cachedMode === undefined) {
+                    const nowMode =
+                        isDarkMode ? 'dark' : 'light'
+                    document.documentElement.setAttribute('data-theme', nowMode);
+                } else {
+                    document.documentElement.setAttribute('data-theme', cachedMode);
+                }
+            }
+            initTheme()
+    when "dark"
+        script.
+            initTheme = () => {
+                const cachedMode = saveToLocal.get('theme');
+                if (cachedMode === undefined)
+                    document.documentElement.setAttribute('data-theme', 'dark');
+                else
+                    document.documentElement.setAttribute('data-theme', cachedMode);
+            }
+            initTheme()
+    when "light"
+        script.
+            initTheme = () => {
+                const cachedMode = saveToLocal.get('theme');
+                if (cachedMode === undefined)
+                    document.documentElement.setAttribute('data-theme', 'light');
+                else
+                    document.documentElement.setAttribute('data-theme', cachedMode);
+            }
+            initTheme()

package/layout/includes/console.pug

@@ -1,7 +1,7 @@
 div#console
     div.close-btn(onclick="sco.hideConsole()")
         i.scoicon.sco-close-fill
-    if theme.thirdparty.consolePlus
+    if theme.comment.newComment
         div.console-card-group
             div.console-card-group-left
                 div.console-card#card-newest-comments(onclick="sco.hideConsole()")
@@ -30,11 +30,11 @@ div#console
         div.console-btn-item#consoleHideAside
             a.asideSwitch(onclick="sco.switchHideAside()", title=_p('console.switch_hideAside'), href="javascript:void(0);")
                 i.scoicon.sco-side-bar-fill
-        if theme.thirdparty.aplayer.enable
+        if theme.capsule.enable
             div.console-btn-item#consoleMusic(onclick="sco.musicToggle()")
                 a.music-switch(title=_p('console.switch_music'), href="javascript:void(0);")
                     i.scoicon.sco-disc-fill
-        if theme.comment.commentBarrage
+        if theme.comment.enable && theme.comment.commentBarrage
             div.console-btn-item.on#consoleCommentBarrage(onclick="sco.switchCommentBarrage()")
                 a.commentBarrage
                     i.scoicon.sco-chat-fill

package/layout/includes/footer.pug

@@ -9,19 +9,19 @@ div#sco-footer-bar
     div.footer-bar-description= __('footer.description').replace(/\$\{title}/, config.title + " - " + config.subtitle)
     a.footer-bar-link(href="/")= __('footer.learnmore')
 div#footer_deal
-    - var leftInfo = theme.footer && theme.footer.information && theme.footer.information.left ? theme.footer.information.left : {}
-    - var rightInfo = theme.footer && theme.footer.information && theme.footer.information.right ? theme.footer.information.right : {}
+    - var leftInfo = theme.footer && theme.footer.information && theme.footer.information.left || {}
+    - var rightInfo = theme.footer && theme.footer.information && theme.footer.information.right || {}
 
     each value, i in leftInfo
         a.deal_link(href=url_for(value.url), title=i)
-            i(class=value.icon)
+            i.scoicon(class=value.icon)
 
     div#footer_mini_logo.footer_mini_logo(title=_p('nav.backtop'), onclick="sco.toTop()")
         img(src=theme.site.icon, alt=_p('nav.backtop'))
 
     each value, i in rightInfo
         a.deal_link(href=url_for(value.url), title=i)
-            i(class=value.icon)
+            i.scoicon(class=value.icon)
 div#sco-footer
     - var group = theme.footer && theme.footer.group ? theme.footer.group : {}
 
@@ -49,21 +49,22 @@ div#footer-bar
                 div.copyright © #{moment(theme.aside.siteinfo.runtime).year()} - #{new Date().getFullYear()} By 
                     a.footer-bar-link(href="/")= config.author
         div.footer-bar-right
-            if theme.footer.rss.enable
-                a.footer-bar-link(href="/rss/", target="_self")= _p('footer.rss')
+            if theme.footer.rss
+                a.footer-bar-link(href=theme.footer.rss)= _p('footer.rss')
             a.footer-bar-link(href="https://github.com/DuoSco/hexo-theme-solitude")= _p('footer.theme')
             if theme.site && theme.site.icp
-                a.footer-bar-link(href="https://beian.miit.gov.cn/#/Integrated/index")= theme.site.icp
-            a.footer-bar-link.cc(href=theme.footer.license.url)
+                a.footer-bar-link(href=theme.site.icp_url || "https://beian.miit.gov.cn/#/Integrated/index")= theme.site.icp
+            a.footer-bar-link.cc(href=theme.footer.license)
                 i.scoicon.sco-copyright-line
                 i.scoicon.sco-creative-commons-by-line
                 i.scoicon.sco-creative-commons-nc-line
                 i.scoicon.sco-creative-commons-nd-line
-div.needEndHide#cookies-window
-    div.cookies-window-title= __('cookies.title')
-    div.cookies-window-content
-        span.cookies-tip= __('cookies.tip')
-        a.cookies-link(href="/privacy/", title=_p('cookies.privacy'))
-            i.scoicon.sco-right-btn-fill
-if theme.comment.commentBarrage
+if theme.footer.privacy
+    div.needEndHide#cookies-window
+        div.cookies-window-title= __('cookies.title')
+        div.cookies-window-content
+            span.cookies-tip= __('cookies.tip')
+            a.cookies-link(href=theme.footer.privacy, title=_p('cookies.privacy'))
+                i.scoicon.sco-right-btn-fill
+if theme.comment.enable && theme.comment.commentBarrage
     div.comment-barrage.needEndHide

package/layout/includes/head/config.pug

@@ -1,25 +1,30 @@
 -
-    if (theme.thirdparty.search.enable) {
+    if (theme.search.enable) {
         var localSearch = 'undefined';
-        if (theme.thirdparty.search.local_search.enable)
-            localSearch = JSON.stringify({
-                preload: theme.thirdparty.search.local_search.preload,
-                path: theme?.thirdparty?.search?.local_search?.CDN || '/search.xml'
-            })
         var algolia = 'undefined';
-        if (theme.thirdparty.search.algolia_search.enable)
-            algolia = JSON.stringify({
-                appId: config.algolia.appId || config.algolia.applicationID,
-                apiKey: config.algolia.apiKey,
-                indexName: config.algolia.indexName,
-                hits: {
-                    per_page: theme.thirdparty?.search?.algolia_search?.hits?.per_page || 10
-                }
-            })
+        switch (theme.search.type) {
+            case 'local':
+                localSearch = JSON.stringify({
+                    preload: theme.search.local.preload,
+                    path: theme?.search?.local?.CDN || '/search.xml'
+                })
+                break;
+            case 'algolia':
+                algolia = JSON.stringify({
+                    appId: config.algolia.appId || config.algolia.applicationID,
+                    apiKey: config.algolia.apiKey,
+                    indexName: config.algolia.indexName,
+                    hits: {
+                        per_page: theme?.search?.algolia_search?.hits?.per_page || 10
+                    }
+                })
+                break;
+        }
     }
 
     const commentInfoStart = theme.comment.randomInfoStart.map(item => `"${item}"`) || ""
     const commentInfoEnd = theme.comment.randomInfoEnd.map(item => `"${item}"`) || ""
+    var sayhello2 = theme.aside.card.sayhello2.map(item => `"${item}"`) || []
 
 script.
     const GLOBAL_CONFIG = {
@@ -37,7 +42,6 @@ script.
             expand: !{theme.hightlight.expand},
             copy: !{theme.hightlight.copy},
         },
-        lightbox: !{theme.lightbox},
         randomlinks: !{theme.footer.randomlink},
         lang: {
             theme: {
@@ -56,26 +60,29 @@ script.
                 daybefore: '!{_p('time.daybefore')}',
                 runtime: '!{_p('time.runtime')}',
             },
-            sayhello: {
-                morning: `!{_p('sayhello.morning')}`,
-                noon: `!{_p('sayhello.noon')}`,
-                afternoon: `!{_p('sayhello.afternoon')}`,
-                night: `!{_p('sayhello.night')}`,
-                goodnight: `!{_p('sayhello.goodnight')}`,
-            },
             search: {
                 empty: '!{_p('search.empty')}',
                 hit: '!{_p('search.hit')}',
                 placeholder: '!{_p('search.placeholder')}',
             }
         },
+        aside: {
+            sayhello: {
+                morning: '!{theme.aside.card.sayhello.morning}',
+                noon: '!{theme.aside.card.sayhello.noon}',
+                afternoon: '!{theme.aside.card.sayhello.afternoon}',
+                night: '!{theme.aside.card.sayhello.night}',
+                goodnight: '!{theme.aside.card.sayhello.goodnight}',
+            },
+            sayhello2: [!{sayhello2}],
+        },
         covercolor: {
             enable: !{theme.post.covercolor.enable}
         },
         comment: {
             enable: !{theme.comment.enable},
             type: '!{theme.comment.type}',
-            commentBarrage: !{theme.comment.commentBarrage},
+            commentBarrage: !{theme.comment.commentBarrage && theme.comment.enable},
             randomInfoStart: [!{commentInfoStart}],
             randomInfoEnd: [!{commentInfoEnd}],
             twikoo: {
@@ -86,16 +93,17 @@ script.
                 url: '!{theme.comment.waline.envId}',
             }
         },
+        lightbox: '!{ theme.mediumZoom ? "mediumZoom" : (theme.fancybox ? "fancybox" : "null" )}',
         rightside: {
             enable: !{theme.rightside.enable}
         },
-        ai:{
-            enable: !{theme.thirdparty.ai.enable},
-            key: '!{theme.thirdparty.ai.key}',
-            talk: '!{theme.thirdparty.ai.talk}',
-            randomPost: !{theme.thirdparty.ai.randomPost},
+        ai: {
+            enable: !{theme.post_ai.enable},
+            key: '!{theme.post_ai.key}',
+            talk: '!{theme.post_ai.talk}',
+            randomPost: !{theme.post_ai.randomPost},
         },
-        music:{
+        music: {
             enable: !{theme.music.enable},
         }
     }

package/layout/includes/head/pwa.pug

@@ -1,57 +1,18 @@
 if theme.pwa.enable
     meta(name="theme-color", content=theme.pwa.theme_color)
-    link(rel="manifest", href=url_for(theme.pwa.manifest))
-    if theme.pwa.theme_color
-        meta(name="msapplication-TileColor", content=theme.pwa.theme_color)
+    link(rel="manifest" href=url_for(theme.pwa.manifest))
+    if(theme.pwa.theme_color)
+        meta(name="msapplication-TileColor" content=theme.pwa.theme_color)
     if theme.pwa.mask_icon
         link(rel="mask-icon", href=theme.pwa.mask_icon, color=theme.pwa.theme_color)
-    if theme.pwa.apple_touch_icon
-        link(rel="apple-touch-icon", sizes="180x180", href=theme.pwa.apple_touch_icon)
-        link(rel="apple-touch-icon-precomposed", sizes="180x180", href=theme.pwa.apple_touch_icon)
-        meta(name="apple-mobile-web-app-title", content=config.title)
+    if(theme.pwa.apple_touch_icon)
+        link(rel="apple-touch-icon" sizes="180x180" href=url_for(theme.pwa.apple_touch_icon))
     if theme.pwa.favicon_16_16
         link(rel="icon", type="image/png", sizes="16x16", href=theme.pwa.favicon_16_16)
     if theme.pwa.favicon_32_32
         link(rel="icon", type="image/png", sizes="32x32", href=theme.pwa.favicon_32_32)
     if theme.pwa.bookmark_icon
         link(rel="bookmark", href=theme.pwa.bookmark_icon)
-    if theme.pwa.startup_image_enable
-        -
-            var medias = {
-                "2048_2732": "(device-width: 1024px) and (device-height: 1366px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)",
-                "2732_2048": "(device-width: 1024px) and (device-height: 1366px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)",
-                "1668_2388": "(device-width: 834px) and (device-height: 1194px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)",
-                "2388_1668": "(device-width: 834px) and (device-height: 1194px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)",
-                "1536_2048": "(device-width: 768px) and (device-height: 1024px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)",
-                "2048_1536": "(device-width: 768px) and (device-height: 1024px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)",
-                "1668_2224": "(device-width: 834px) and (device-height: 1112px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)",
-                "2224_1668": "(device-width: 834px) and (device-height: 1112px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)",
-                "1620_2160": "(device-width: 810px) and (device-height: 1080px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)",
-                "2160_1620": "(device-width: 810px) and (device-height: 1080px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)",
-                "1290_2796": "(device-width: 430px) and (device-height: 932px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)",
-                "2796_1290": "(device-width: 430px) and (device-height: 932px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)",
-                "1179_2556": "(device-width: 393px) and (device-height: 852px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)",
-                "2556_1179": "(device-width: 393px) and (device-height: 852px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)",
-                "1248_2778": "(device-width: 428px) and (device-height: 926px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)",
-                "2778_1248": "(device-width: 428px) and (device-height: 926px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)",
-                "1170_2532": "(device-width: 390px) and (device-height: 844px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)",
-                "2532_1170": "(device-width: 390px) and (device-height: 844px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)",
-                "1125_2436": "(device-width: 375px) and (device-height: 812px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)",
-                "2436_1125": "(device-width: 375px) and (device-height: 812px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)",
-                "1242_2688": "(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)",
-                "2688_1242": "(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)",
-                "828_1792": "(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)",
-                "1792_828": "(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)",
-                "1242_2208": "(device-width: 414px) and (device-height: 736px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)",
-                "2208_1242": "(device-width: 414px) and (device-height: 736px) and (-webkit-device-pixel-ratio: 3) and (orientation: landscape)",
-                "750_1334": "(device-width: 375px) and (device-height: 667px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)",
-                "1334_750": "(device-width: 375px) and (device-height: 667px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)",
-                "640_1136": "(device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)",
-                "1136_640": "(device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)",
-            }
-        each media,size  in medias
-            if (theme.pwa["favicon_" + size])
-                link(rel="apple-touch-startup-image", href=theme.pwa["favicon_" + size], media=media)
 
 else
     meta(name="apple-mobile-web-app-capable", content=config.title)

package/layout/includes/head.pug

@@ -4,6 +4,8 @@
 - else if (is_tag()) title = _p('page.tag')+': '  + page.tag
 - else if (is_category()) title = _p('page.category') +': ' + page.category
 - else if (page.type === '404') title = '404'+': '  + theme.errorpage.text
+- else if (page.type === 'tags') title = _p('page.tags')
+- else if (page.type === 'categories') title = _p('page.categories')
 - else if (is_post() || is_page()) title = page.title
 
 - if (is_home()) subtitle = config.subtitle ? ' - ' + config.subtitle : ''
@@ -18,7 +20,7 @@ noscript= _p('head.noscript')
 link(rel="icon", href=theme.site.siteIcon)
 
 // index.css
-link(rel="stylesheet", href="/css/index.css")
+link(rel="stylesheet", href=url_for(theme.cdn.main_css))
 
 // inject head
 include ./inject/head.pug