hexo-theme-solitude 1.1.0 → 1.2.1

package/languages/en-US.yml

@@ -25,6 +25,7 @@ page:
   tag: Tags
   category: Categories
   archives: Archives
+  echarts: Echarts
 
 nav:
   backtop: Back to top

package/languages/zh-CN.yml

@@ -14,17 +14,17 @@ time:
   runtime:  天
 
 sayhello:
-  morning: 早上好
-  noon: 中午好
-  afternoon: 下午好
-  night: 晚上好
-  goodnight: 晚安
-  iam: '!  我是'
+  morning: 一日之计在于晨
+  noon: 吃饱了才有力气干活
+  afternoon: 集中精力，攻克难关
+  night: 不要太劳累了，早睡更健康
+  goodnight: 睡个好觉，保证精力充沛
 
 page:
   tag: 标签
   category: 分类
   archives: 文章
+  echarts: 博客统计
 
 nav:
   backtop: 返回顶部
@@ -34,6 +34,6 @@ nav:
   console: 中控台
 
 search:
-  empty: 搜索结果为空
-  hit: 已为您找到 ${query} 条结果
+  empty: 找不到你查询的内容：${query}
+  hit: 找到 ${hits} 条结果，用时 ${time} 毫秒
   placeholder: 输入关键词快速查找

package/layout/404.pug

@@ -0,0 +1,24 @@
+extends includes/layout.pug
+
+block content
+    #error-wrap
+        .error-content
+            .error-img(style='background-image: url(' + url_for(theme.errorpage.img) + ')')
+            .error-info
+                h1.error_title 404
+                .error_subtitle= theme.errorpage.text
+                a.button--animated(href="/")
+                    i.scoicon.sco-external-link
+                    | 回到主页
+
+    if theme.errorpage.recommendList
+        .aside-list
+            .aside-list-group
+                each post, index in site.posts.sort('-date').data
+                    if index >= 5
+                        break
+                    .aside-list-item
+                        a.thumbnail(href=url_for(post.path), title=post.title)
+                            img(src=post.cover, alt=post.title)
+                        .content
+                            a.title(href=url_for(post.path), title=post.title)= post.title

package/layout/archive.pug

@@ -0,0 +1,11 @@
+extends includes/layout.pug
+
+block content
+    main.layout#content-inner
+        div#archive
+            div.article-sort-title #{__('page.archives')}<sup>#{page.posts.length}</sup>
+            div.article-sort
+                include includes/mixins/articleSort
+            include includes/mixins/pagination
+        include includes/widgets/aside/aside
+

package/layout/category.pug

@@ -0,0 +1,16 @@
+extends includes/layout.pug
+
+block content
+  main.layout#content-inner
+    div#category
+      div#category-bar
+        div.category-bar-items#category-bar-items
+          include includes/widgets/home/categoryBar
+      div.recent-posts#recent-posts
+        - const currentCategory = page.category
+        each post in site.posts.data
+          each category in post.categories.data
+            if category.name === currentCategory
+              include includes/widgets/home/postList
+      include includes/mixins/pagination
+    include includes/widgets/aside/aside

package/layout/includes/console.pug

@@ -0,0 +1,42 @@
+div#console(style="zoom: 1")
+    div.close-btn(onclick="sco.hideConsole()", href="javascript:void(0);")
+        i.scoicon.sco-close-fill
+    if theme.thirdparty.consolePlus
+        div.console-card-group
+            div.console-card-group-left
+                div.console-card#card-newest-comments(onclick="sco.hideConsole()")
+                    div.card-content
+                        div.author-content-item-tips= "互动"
+                        div.author-content-item-title= "最新评论"
+                    div.aside-list
+
+            div.console-card-group-right
+                div.console-card.tags(onclick="sco.hideConsole()")
+                    div.card-content
+                        div.author-content-item-tips= "标签"
+                        div.author-content-item-title= "寻找感兴趣的领域"
+                    div.card-tag-cloud
+                        each tag in site.tags.data
+                            a(href=url_for(tag.path), style="font-size: 0.8rem; color: #d3d3d3")= tag.name
+                                sup= tag.length
+
+                div.console-card.history(onclick="sco.hideConsole()")
+                    include ./widgets/aside/asideArchive.pug
+
+    div.button-group
+        div.console-btn-item
+            a.darkmode_switchbutton(onclick="sco.switchDarkMode()", title="昼夜切换", href="javascript:void(0);" rel="nofollow" data-pjax-state)
+                i.scoicon.sco-moon-clear-fill(style="font-size: 1rem;")
+        div.console-btn-item#consoleHideAside
+            a.asideSwitch(onclick="sco.switchHideAside()", title="边栏显示控制", href="javascript:void(0);" rel="nofollow" data-pjax-state)
+                i.scoicon.sco-side-bar-fill(style="font-size: 1rem;")
+        if theme.thirdparty.aplayer.enable
+            div.console-btn-item#consoleMusic(onclick="sco.musicToggle()")
+                a.music-switch(title="音乐开关")
+                    i.scoicon.sco-disc-fill(style="font-size: 1rem;")
+
+        if theme.comment.enable
+            div.console-btn-item.on#consoleCommentBarrage(onclick="sco.switchCommentBarrage()")
+                a.commentBarrage
+                    i.scoicon.sco-chat-fill(style="font-size: 1rem;")
+    div.console-mask(onclick="sco.hideConsole()")

package/layout/includes/footer.pug

@@ -0,0 +1,71 @@
+div#sco-footer-bar
+    div.footer-logo
+        if theme.site.name.class === 'i_class'
+            i.scoicon(class=theme.site.name.custom, style="font-size: 1rem")
+        else if theme.site.name.class === 'img'
+            i.scoicon(style="background-image: url(" + url_for(theme.site.name.custom) + ")")
+        else if theme.site.name.class === 'text'
+            span.scoicon= theme.site.name.custom
+    div.footer-bar-description= "来自" + config.title + " - " + config.subtitle + "的文章"
+    a.footer-bar-link(href="/", data-pjax-state)= "了解更多"
+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 : {}
+
+    each value, i in leftInfo
+        a.deal_link(href=url_for(value.url), rel="external nofollow", title=i)
+            i(class=value.icon)
+
+    img.footer_mini_logo(src=theme.site.icon, title="返回顶部", onclick="sco.toTop()")
+
+    each value, i in rightInfo
+        a.deal_link(href=url_for(value.url), rel="external nofollow", title=i)
+            i(class=value.icon)
+div#sco-footer
+    - var group = theme.footer && theme.footer.group ? theme.footer.group : {}
+
+    each value, x in group
+        div.footer-group
+            h3.footer-title= x
+            div.footer-links
+                each url, y in value
+                    a.footer-item(href=url_for(url), title=y, rel="noopener external nofollow noreferrer")= y
+
+    if theme.footer && theme.footer.randomlink
+        div.footer-group
+            div.footer-title-group
+                h3.footer-title 友链
+                a.random-friends-btn(href="javascript:randomLinksList();", rel="external nofollow")
+                    i.scoicon.sco-refresh-line
+            div.footer-links#friend-links-in-footer
+div#footer-bar
+    div.footer-bar-links
+        div.footer-bar-left
+            div#footer-bar-tips
+                if moment(theme.aside.siteinfo.runtime).year() === new Date().getFullYear()
+                    div.copyright © #{moment(theme.aside.siteinfo.runtime).year()} By 
+                        a.footer-bar-link(href="/", rel="external nofollow")= config.author
+                else
+                    div.copyright © #{moment(theme.aside.siteinfo.runtime).year()} - #{new Date().getFullYear()} By 
+                        a.footer-bar-link(href="/", rel="external nofollow")= config.author
+        div.footer-bar-right
+            if theme.footer && theme.footer.rss && theme.footer.rss.enable
+                a.footer-bar-link(href="/rss/", rel="external nofollow", target="_self") 订阅
+            a.footer-bar-link(href="https://github.com/DuoSco/hexo-theme-solitude", rel="external nofollow", target="_self") 主题
+            if theme.site && theme.site.icp
+                a.footer-bar-link(href="https://beian.miit.gov.cn/#/Integrated/index", target="_blank", rel="noopener external nofollow noreferrer noopener")= theme.site.icp
+            a.footer-bar-link.cc(href=theme.footer.license.url, target="_self", rel="external nofollow")
+                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 协议提醒助手
+    div.cookies-window-content
+        span.cookies-tip 查看本站为你的个人隐私做出的努力
+        a.cookies-link(href="/privacy/", title="本站如何保护你的隐私", data-pjax-state="")
+            i.scoicon.sco-arrow-right-circle-fill
+if theme.post.award.enable
+    div#quit-box(onclick="RemoveRewardMask()", style="display=none")
+if theme.comment.enable
+    div.comment-barrage.needEndHide

package/layout/includes/head/config.pug

@@ -0,0 +1,79 @@
+-
+    if (theme.thirdparty.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.path || '/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
+                }
+            })
+    }
+
+script.
+    const GLOBAL_CONFIG = {
+        root: '!{config.root}',
+        algolia: !{algolia ? algolia : 'undefined'},
+        localsearch: !{localSearch ? localSearch : 'undefined'},
+        runtime: '!{theme.aside.siteinfo.runtimeenable ? theme.aside.siteinfo.runtime : false}',
+        lazyload: {
+            enable: !{theme.lazyload.enable},
+            error: '!{theme.lazyload.errorimg}'
+        },
+        hightlight: {
+            enable: !{theme.hightlight.enable},
+            limit: '!{theme.hightlight.hightlimit}'
+        },
+        lightbox: !{theme.lightbox},
+        randomlinks: !{theme.footer.randomlink},
+        lang: {
+            theme: {
+                dark: '!{_p('theme.dark')}',
+                light: '!{_p('theme.light')}',
+            },
+            copy: {
+                success: '!{_p('copy.success')}',
+                error: '!{_p('copy.error')}',
+            },
+            backtop: '!{_p('nav.backtop')}',
+            time: {
+                recent: '!{_p('time.recent')}',
+                yesterday: '!{_p('time.yesterday')}',
+                berforeyesterday: '!{_p('time.berforeyesterday')}',
+                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')}',
+            }
+        },
+        covercolor: !{theme.post.covercolor.enable},
+        comment: {
+            enable: !{theme.comment.enable},
+            type: '!{theme.comment.type}',
+            twikoo: {
+                url: '!{theme.comment.twikoo.envId}',
+                accessToken: '!{theme.comment.twikoo.accessToken}'
+            },
+        },
+        rightside: {
+            enable: !{theme.rightside.enable}
+        }
+    }

package/layout/includes/head/pwa.pug

@@ -0,0 +1,59 @@
+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)
+    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.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)
+    link(rel="bookmark", href=theme.site.siteIcon)
+    link(rel="apple-touch-icon", href=theme.site.siteIcon, sizes="180x180")

package/layout/includes/head.pug

@@ -0,0 +1,29 @@
+- let title = page.title, subtitle =''
+- if (is_home()) title = config.title
+- else if (is_archive()) title = _p('page.archives') + (page.year || "")
+- 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 (is_post() || is_page()) title = page.title
+
+- if (is_home()) subtitle = config.subtitle ? ' - ' + config.subtitle : ''
+- else subtitle = title ? ' | ' + config.title : config.title
+- var description = page.desc || page.excerpt || config.description
+
+meta(charset="utf-8")
+meta(http-equiv="X-UA-Compatible", content="IE=edge")
+meta(name="viewport" content="width=device-width, initial-scale=1")
+
+title= title + subtitle
+noscript 开启JavaScript才能访问本站哦
+link(rel="icon", href=theme.site.siteIcon)
+meta(name="description", content=description)
+
+// index.css
+link(rel="stylesheet", href="/css/index.css")
+
+// inject head
+include ./inject/head.pug
+
+// global head
+include ./head/config.pug

package/layout/includes/header.pug

@@ -0,0 +1,4 @@
+header(class=is_post() ? 'post-bg' : 'not-top-img', id="page-header")
+    include ./nav.pug
+    if is_post()
+        include ./widgets/post/postMeta.pug

package/layout/includes/inject/body.pug

@@ -0,0 +1,68 @@
+- cdn = theme.cdn.body
+
+script(src=url_for(cdn.pjaxjs))
+if theme.lazyload.enable
+    script(src=url_for(cdn.lazyloadjs))
+script(src=url_for(cdn.snackbarjs))
+if theme.lightbox
+    script(src=url_for(cdn.viewimagejs))
+if theme.says.home_mini || theme.aside.history.enable
+    script(src=url_for(cdn.swiperjs))
+
+if theme.rightside.enable
+    include ../widgets/rightside/index.pug
+    script(src='/js/rightside.js')
+
+div#js-pjax
+    if page.type === 'says'
+        script(src=url_for(cdn.waterfalljs))
+        script.
+            window.addEventListener('resize', utils.throttle(function () {
+                if (document.getElementById('waterfall')) {
+                    sco.reflashEssayWaterFall();
+                }
+            }), 500);
+    if theme.thirdparty.busuanzi && (theme.aside.siteinfo.uv || theme.aside.siteinfo.pv || theme.thirdparty.busuanzi.usecomment === false)
+        script(async src=url_for(cdn.busuanzijs))
+
+    script#config-diff.
+        var PAGE_CONFIG = {
+            is_post: !{is_post()},
+            is_page: !{is_page()},
+            is_home: !{is_home()},
+            page: '!{page.type || 'default'}',
+            toc: !{!!page.toc},
+            comment: !{!!page.comment},
+        }
+if theme.thirdparty.aplayer.enable
+    script(src=url_for(cdn.aplayerjs))
+    script(src=url_for(cdn.metingjs))
+    script.
+        const meting_api = '!{theme.thirdparty.aplayer.api}';
+
+if theme.post.covercolor
+    script(src='/js/extend/covercolor/local.js')
+
+if theme.footer.randomlink
+    include ../widgets/randomlink.pug
+
+if page.katex
+    link(rel="stylesheet", href=url_for(cdn.katexcss))
+    script(src=url_for(cdn.katexjs))
+
+if theme.aside.welcome.enable
+    script(src='/js/txmap.js')
+
+if theme.comment.enable
+    script(src='/js/extend/console/comment.js')
+
+    if theme.comment.type === 'twikoo'
+        script(src='/js/commentBarrage.js')
+
+// pjax
+include ../widgets/third-party/pjax.pug
+
+// inject custom body
+if theme.extends.body
+    each item in theme.extends.body
+        item

package/layout/{partial/compoment/inject/head.ejs → includes/inject/head.pug}

@@ -1,31 +1,55 @@
-<% const cdn = theme.cdn.head %>
-<% if(theme.verify.baidu){%>
-    <meta name="baidu-site-verification" content="<%- theme.verify.baidu %>" />
-<%} %>
-<% if(theme.loading.pace){ %>
-    <script data-pace-options="{ &quot;restartOnRequestAfter&quot;:false,&quot;eventLag&quot;:false}" src="<%= cdn.pacejs %>"></script>
-<% } %>
-<% if(theme.icon.customicon){ %>
-    <%- css(theme.icon.customicon) %>
-<% } %>
-<%- css(cdn.scoicon) %>
-<%- css(cdn.snackbarcss) %>
-<% if(theme.comment.enable){ %>
-    <%- css('/css/commentBarrage') %>
-    <%- js(cdn.twikoojs) %>
-<% } %>
-<% if(theme.thirdparty.search.algolia_search.enable){ %>
-    <%- js(cdn.instantsearch) %>
-    <%- js(cdn.algolia) %>
-<% } %>
-<% if(theme.thirdparty.aplayer.enable){%>
-    <%- css(cdn.aplayercss) %>
-<%} %>
-<% if(theme.hometop.bbtime || theme.aside.history.enable){ %>
-    <%- css(cdn.swipercss) %>
-<% } %>
-<script>
-    (win=> {
+- var cdn = theme.cdn.head
+
+if theme.verify.baidu
+    meta(name="baidu-site-verification", content=theme.verify.baidu)
+
+if theme.verify.google
+    meta(name="google-site-verification", content=theme.verify.google)
+
+if theme.loading.pace
+    script(src=cdn.pace, data-pace-options='{ &quot;restartOnRequestAfter&quot;:false,&quot;eventLag&quot;:false}')
+
+// pwa
+if theme.pwa.enable
+    include ../head/pwa.pug
+
+link(rel="stylesheet", href=cdn.scoicon)
+link(rel="stylesheet", href=cdn.snackbarcss)
+
+// comment
+if theme.comment.enable
+    if theme.comment.type === 'twikoo'
+        script(src=cdn.twikoojs)
+
+// search
+if theme.thirdparty.search.enable
+    if theme.thirdparty.search.type === 'algolia'
+        script(src=url_for(cdn.instantsearch))
+        script(src=url_for(cdn.algoliajs))
+
+// aplayer
+if theme.thirdparty.aplayer.enable
+    link(rel="stylesheet", href=cdn.aplayercss)
+
+// swiper
+if theme.says.home_mini || theme.aside.history.enable
+    link(rel="stylesheet", href=cdn.swipercss)
+
+// custom inject
+if theme.extends.head
+    each item in theme.extends.head
+        item
+
+// post-ai
+if theme.thirdparty.ai.enable
+    script(src='/lib/chuckle-post-ai.js')
+
+// echarts
+if theme.about.echarts.enable && theme.about.enable
+    script(src=url_for(cdn.echartsjs))
+
+script.
+    (win => {
             win.saveToLocal = {
                 set: function setWithExpiry(key, value, ttl) {
                     if (ttl === 0)
@@ -56,12 +80,11 @@
                 }
             }
 
-            const DarkModeStatus = saveToLocal.get('theme')
-            if(DarkModeStatus !== undefined){
-                if(DarkModeStatus === 'dark'){
+            const DarkModeStatus = localStorage.getItem('theme')
+            if (DarkModeStatus !== null) {
+                if (DarkModeStatus === 'dark') {
                     document.documentElement.setAttribute('data-theme', 'dark')
-
-                }else{
+                } else {
                     document.documentElement.setAttribute('data-theme', 'light')
                 }
             }
@@ -78,7 +101,7 @@
     )(window)
 
     console.log("%c🔥 程序：Hexo | 主题：Hexo-Theme-Solitude | 作者：DuoSco团队 | 官网：https://github.com/DuoSco/Hexo-theme-solitude 😋", "color:#fff; background: linear-gradient(270deg, #18d7d3, #68b7dd, #8695e6, #986fee); padding: 8px 15px; border-radius: 8px");
-</script>
-<% if(theme.ai.enable){ %>
-    <%- js('/lib/chuckle-post-ai') %>
-<% } %>
+
+div
+    script(src="/js/utils.js")
+    script(src="/js/main.js")

package/layout/includes/layout.pug

@@ -0,0 +1,35 @@
+doctype html
+html(lang=config.language, data-theme="light")
+    head
+        include ./head.pug
+    body(id="body")
+        // loading
+        if theme.loading.fullpage
+            include ./loading.pug
+
+        // console
+        include ./console.pug
+
+        // sidebar
+        include ./sidebar.pug
+
+        if(page.type !== '404')
+            div(class = is_post() ? 'post' : 'page', id="body-wrap")
+                include ./header.pug
+
+                block content
+
+                footer#footer
+                    include ./footer.pug
+        else
+            div.error#body-wrap
+                block content
+
+        // inject body
+        include ./inject/body.pug
+
+        // search
+        include ./widgets/third-party/search/index.pug
+
+        // music
+        include ./widgets/third-party/music.pug

package/layout/{partial/loading.ejs → includes/loading.pug}

@@ -1,26 +1,29 @@
-<div id="loading-box" onclick="preloader.endLoading();" class style="zoom: 1;">
-    <div class="loading-bg">
-        <img class="loading-img nolazyload" alt="loading image"
-            src="<%= theme.site.icon %>">
-        </div>
-</div>
-<script>
+div(id="loading-box" onclick="preloader.endLoading();" style="zoom:1")
+    div.loading-bg
+        img.loading-img(src=url_for(theme.site.icon), alt="loading image")
+
+script.
     const preloader = {
         endLoading: () => {
-            document.getElementById('loading-box').classList.add("loaded")
+            document.getElementById('loading-box').classList.add('loaded');
         },
         initLoading: () => {
-            document.getElementById('loading-box').classList.remove("loaded")
+            document.getElementById('loading-box').classList.remove('loaded');
         },
         removePaceDone: () => {
-            document.getElementById('body').classList = 'pace-done'
+            document.getElementById('body').classList = 'pace-done';
         }
     }
-    window.addEventListener('load',()=> { preloader.endLoading() })
-    document.addEventListener('pjax:send', () => { preloader.initLoading() })
-    document.addEventListener('pjax:complete', () => { preloader.endLoading() })
-</script>
-<style>
+    window.addEventListener('load', () => {
+        preloader.endLoading();
+    });
+    window.addEventListener('pjax:send', () => {
+        preloader.initLoading();
+    });
+    document.addEventListener('pjax:complete', () => {
+        preloader.endLoading();
+    });
+style.
     #loading-box {
         -webkit-user-select: none;
     }
@@ -82,5 +85,4 @@
         to {
             opacity: 1;
         }
-    }
-</style>
+    }