hexo-theme-solitude 1.3.0 → 1.4.0

package/layout/includes/widgets/nav/right.pug

@@ -1,12 +1,13 @@
-if theme.nav.right.travellings
-    .nav-button.only-home#travellings_button
-        a.site-page(href="https://www.travellings.cn/go.html", title=_p('nav.travellings'), target="_blank")
-            i.scoicon.sco-train-line
+- var custom = theme.nav.right.custom || []
+each item in custom
+    .nav-button(id=item.id)
+        a.site-page(href=item.url || 'javascript:void(0);', onclick=item.onclick, title=item.title || '')
+            i.scoicon(class=item.icon || '')
 if theme.nav.right.random
     .nav-button#randomPost_button
         a.site-page(onclick="toRandomPost()", title=_p('nav.randompost'), href="javascript:void(0);")
             i.scoicon.sco-signal-tower-fill
-if theme.thirdparty.search.enable
+if theme.search.enable
     .nav-button#search-button
         a.site-page.social-icon.search(href="javascript:void(0);", title=_p('nav.search'))
             i.scoicon.sco-search-line

package/layout/includes/widgets/page/about/authorinfo.pug

@@ -1,12 +1,13 @@
 - const authorinfo = site.data.about.authorinfo
 
-.author-info
-    .author-tag-left
-        each tag in authorinfo.leftTags
-            span.author-tag= tag
-    .author-img
-        img(src=authorinfo.image)
-    .author-tag-right
-        each tag in authorinfo.rightTags
-            span.author-tag= tag
+if authorinfo
+    .author-info
+        .author-tag-left
+            each tag in authorinfo.leftTags
+                span.author-tag= tag
+        .author-img
+            img(src=authorinfo.image)
+        .author-tag-right
+            each tag in authorinfo.rightTags
+                span.author-tag= tag
 .author-title= authorinfo.title

package/layout/includes/widgets/page/about/contentinfo.pug

@@ -1,38 +1,39 @@
 - const contentinfo = site.data.about.contentinfo
 
-.author-content
-    .author-content-item.myInfoAndSayHello
-        .title1= _p('about.info.title1')
-        .title2= _p('about.info.title2')
-            span.inline-word= contentinfo.name
-        .title1= _p('about.info.title3') + contentinfo.title
-    .aboutsiteTips.author-content-item
-        .author-content-item-tips= _p('about.info.tip1')
-        h2
-            = _p('about.info.tip2')
-            br
-            = _p('about.info.tip3')
-            span.inline-word= _p('about.info.tip4')
-            .mask
-                span.first-tips(data-show='')= contentinfo.product
-                span= contentinfo.design
-                span= contentinfo.program
-                span(data-up='')= contentinfo.user_experience
+if contentinfo
+    .author-content
+        .author-content-item.myInfoAndSayHello
+            .title1= contentinfo.sup
+            .title2
+                span.inline-word= contentinfo.name
+            .title1= contentinfo.title
+        .aboutsiteTips.author-content-item
+            .author-content-item-tips= contentinfo.tip
+            h2
+                span.inline-word!= contentinfo.slogan
+                .mask
+                    each item,index in contentinfo.mask
+                        if index === 0
+                            span.first-tips(data-show='')= item
+                        else if index === contentinfo.mask.length - 1
+                            span(data-up='')= item
+                        else
+                            span= item
 
-script.
-    var pursuitInterval = null;
-    pursuitInterval = setInterval(function () {
-        const show = document.querySelector('span[data-show]')
-        const next = show.nextElementSibling || document.querySelector('.first-tips')
-        const up = document.querySelector('span[data-up]')
-        if (up) {
-            up.removeAttribute('data-up')
-        }
-        show.removeAttribute('data-show')
-        show.setAttribute('data-up', '')
-        next.setAttribute('data-show', '')
-    }, 2000)
+    script.
+        var pursuitInterval = null;
+        pursuitInterval = setInterval(function () {
+            const show = document.querySelector('span[data-show]')
+            const next = show.nextElementSibling || document.querySelector('.first-tips')
+            const up = document.querySelector('span[data-up]')
+            if (up) {
+                up.removeAttribute('data-up')
+            }
+            show.removeAttribute('data-show')
+            show.setAttribute('data-up', '')
+            next.setAttribute('data-show', '')
+        }, 2000)
 
-    document.addEventListener('pjax:send', function(){
-        clearInterval(pursuitInterval);
-    });
+        document.addEventListener('pjax:send', function () {
+            clearInterval(pursuitInterval);
+        });

package/layout/includes/widgets/page/about/hobbies.pug

@@ -1,20 +1,24 @@
-.author-content
-    if site.data.about.game1
-        .author-content-item.game-apex(style=`background: url(${site.data.about.game1.img}) no-repeat top; background-size: cover;`)
-            .card-content
-                .author-content-item-tips= site.data.about.game1.title
-                span.author-content-item-title= site.data.about.game1.subtitle
-                .content-bottom
-                    .tips= site.data.about.game1.tips_left
-                    .tips= site.data.about.game1.tips_right
-    if site.data.about.game2
-        .author-content-item.game-jl(style=`background: url(${site.data.about.game2.img}) no-repeat top; background-size: cover;`)
-            .card-content
-                .author-content-item-tips= site.data.about.game2.title
-                span.author-content-item-title= site.data.about.game2.subtitle
-                .content-bottom
-                    .tips= site.data.about.game2.tips_left
-                    .tips= site.data.about.game2.tips_right
+- var game1 = game1
+- var game2 = game2
+
+if game1 || game2
+    .author-content
+        if game1
+            .author-content-item.game-apex(style=`background: url(${game1.img}) no-repeat top; background-size: cover;`)
+                .card-content
+                    .author-content-item-tips= game1.title
+                    span.author-content-item-title= game1.subtitle
+                    .content-bottom
+                        .tips= game1.tips_left
+                        .tips= game1.tips_right
+        if game2
+            .author-content-item.game-jl(style=`background: url(${game2.img}) no-repeat top; background-size: cover;`)
+                .card-content
+                    .author-content-item-tips= game2.title
+                    span.author-content-item-title= game2.subtitle
+                    .content-bottom
+                        .tips= game2.tips_left
+                        .tips= game2.tips_right
 
 if site.data.about.likes
     - const likes = site.data.about.likes

package/layout/includes/widgets/page/about/motto.pug

@@ -1,19 +1,20 @@
 - const motto = site.data.about.motto
 - const expertise = site.data.about.expertise
 
-.author-content
-    .author-content-item.maxim
-        .author-content-item-tips= motto.title
-        span.maxim-title
-            span= motto.prefix
-            span= motto.content
-    .author-content-item.buff
-        .card-content
-            .author-content-item-tips= expertise.title
-            span.buff-title
-                span
-                    | #{expertise.prefix}
-                    span.inline-word= expertise.specialist
-                span
-                    | #{expertise.content}
-                    span.inline-word= expertise.level
+if motto || expertise
+    .author-content
+        .author-content-item.maxim
+            .author-content-item-tips= motto.title
+            span.maxim-title
+                span= motto.prefix
+                span= motto.content
+        .author-content-item.buff
+            .card-content
+                .author-content-item-tips= expertise.title
+                span.buff-title
+                    span
+                        | #{expertise.prefix}
+                        span.inline-word= expertise.specialist
+                    span
+                        | #{expertise.content}
+                        span.inline-word= expertise.level

package/layout/includes/widgets/page/about/other.pug

@@ -1,6 +1,9 @@
+- var tj = site.data.about.tj
+- var oneself = site.data.about.oneself
+
 .author-content
-    if site.data.about.tj
-        .about-statistic.author-content-item(style=`background: url(${site.data.about.tj.img});`)
+    if tj
+        .about-statistic.author-content-item(style=`background: url(${tj.img});`)
             .card-content
                 .author-content-item-tips 数据
                 span.author-content-item-title 访问统计
@@ -8,13 +11,9 @@
                 .post-tips
                     | 统计信息来自
                     a(href="https://invite.51.la/1NzKqTeb?target=V6") 51la网站统计
-                if theme.about.echarts.enable
-                    .banner-button-group
-                        a.banner-button(onclick="pjax.loadUrl('/echart/');")
-                            i.scoicon.sco-right-btn-fill
-                            span.banner-button-text 文章统计
+
             script.
-                fetch("#{site.data.about.tj.url}")
+                fetch("#{tj.url}")
                     .then(res => res.text())
                     .then(data => {
                         const title = ["最近活跃", "今日人数", "今日访问", "昨日人数", "昨日访问", "本月访问", "总访问量"];
@@ -33,13 +32,12 @@
                     });
 
 
-    if site.data.about.oneself
+    if oneself
         style.
             :root {
-                --site-about-oneself-map--light: url(#{site.data.about.oneself.map.light});
-                --site-about-oneself-map--dark: url(#{site.data.about.oneself.map.dark});
+                --site-about-oneself-map--light: url(#{oneself.map.light});
+                --site-about-oneself-map--dark: url(#{oneself.map.dark});
             }
-        - const oneself = site.data.about.oneself
         .author-content-item-group.column.mapAndInfo
             .author-content-item.map.single
                 span.map-title 我现在住在 #{oneself.location}
@@ -54,9 +52,11 @@
                     span.selfInfo-title 现在职业
                     span.selfInfo-content(style="color: #b04fe6;")= oneself.occupation
 
-if site.data.about.cause
+- var cause = site.data.about.cause
+
+if cause
     .author-content
         .create-site-post.author-content-item.single
-            .author-content-item-tips 心路历程
-            span.author-content-item-title 为什么建站？
-            != site.data.about.cause
+            .author-content-item-tips= cause.tip
+            span.author-content-item-title= cause.title
+            != cause.content

package/layout/includes/widgets/page/about/personalities.pug

@@ -1,16 +1,17 @@
 - const personalities = site.data.about.personalities
 
-.author-content
-    .author-content-item.personalities
-        .author-content-item-tips= personalities.tips
-        span.author-content-item-title= personalities.title
-        .title2(style=`color:${personalities.color}`)= personalities.type
-        .image
-            img(src=personalities.image)
-        .post-tips
-            | 在
-            a(href="https://www.16personalities.com/")= personalities.linkText
-            | 了解更多关于
-            a(href=personalities.typeLink)= personalities.typeName
-    .author-content-item.myphoto
-        img.author-content-img(src=personalities.myphoto, alt="自拍")
+if personalities
+    .author-content
+        .author-content-item.personalities
+            .author-content-item-tips= personalities.tips
+            span.author-content-item-title= personalities.title
+            .title2(style=`color:${personalities.color}`)= personalities.type
+            .image
+                img(src=personalities.image)
+            .post-tips
+                | 在
+                a(href="https://www.16personalities.com/")= personalities.linkText
+                | 了解更多关于
+                a(href=personalities.typeLink)= personalities.typeName
+        .author-content-item.myphoto
+            img.author-content-img(src=personalities.myphoto, alt="自拍")

package/layout/includes/widgets/page/about/skillsinfo.pug

@@ -1,39 +1,40 @@
 - var skills = site.data.about.skills
 - var careers = site.data.about.careers
 
-.author-content
-    .author-content-item.skills
-        .card-content
-            .author-content-item-tips= skills.title
-            span.author-content-item-title= skills.subtitle
-            .skills-style-group
-                .tags-group-all
-                    .tags-group-wrapper
-                        each i in [1,2]
-                            - var pair = []
-                            each tag, index in skills.tags
-                                - pair.push(tag)
-                                if pair.length === 2 || index === skills.tags.length - 1
-                                    .tags-group-icon-pair
-                                        each item in pair
-                                            .tags-group-icon(style=`background:${item.color}`)
-                                                img(src=item.icon, title=item.title)
-                                    - pair = []
-                .skills-list
-                    each tag in skills.tags
-                        .skill-info
-                            .skill-icon(style=`background:${tag.color}`)
-                                img(src=tag.icon, title=tag.title)
-                            .skill-name
-                                span= tag.title
-                    .etc ...
-    .author-content-item.careers
-        .card-content
-            .author-content-item-tips= careers.title
-            span.author-content-item-title= careers.subtitle
-            .careers-group
-                each item in careers.items
-                    .careers-item
-                        .circle(style=`background:${item.color}`)
-                        .name= `${item.school}, ${item.major}`
-            img.author-content-img(src=careers.image, alt=careers.title)
+if skills || caches
+    .author-content
+        .author-content-item.skills
+            .card-content
+                .author-content-item-tips= skills.title
+                span.author-content-item-title= skills.subtitle
+                .skills-style-group
+                    .tags-group-all
+                        .tags-group-wrapper
+                            each i in [1,2]
+                                - var pair = []
+                                each tag, index in skills.tags
+                                    - pair.push(tag)
+                                    if pair.length === 2 || index === skills.tags.length - 1
+                                        .tags-group-icon-pair
+                                            each item in pair
+                                                .tags-group-icon(style=`background:${item.color}`)
+                                                    img(src=item.icon, title=item.title)
+                                        - pair = []
+                    .skills-list
+                        each tag in skills.tags
+                            .skill-info
+                                .skill-icon(style=`background:${tag.color}`)
+                                    img(src=tag.icon, title=tag.title)
+                                .skill-name
+                                    span= tag.title
+                        .etc ...
+        .author-content-item.careers
+            .card-content
+                .author-content-item-tips= careers.title
+                span.author-content-item-title= careers.subtitle
+                .careers-group
+                    each item in careers.items
+                        .careers-item
+                            .circle(style=`background:${item.color}`)
+                            .name= `${item.school}, ${item.major}`
+                img.author-content-img(src=careers.image, alt=careers.title)

package/layout/includes/widgets/page/banner.pug

@@ -9,6 +9,12 @@
                 .tips!= page.rightend
         if page.rightbtn
             .banner-button-group
-                a.banner-button(onclick="pjax.loadUrl(\"" + page.rightbtnlink + "\")")
-                    i.scoicon.sco-right-btn-fill
-                    span.banner-button-text= page.rightbtn
+                case page.rightbtnlink.startsWith('/')
+                    when true
+                        a.banner-button(onclick="pjax.loadUrl(\"" + page.rightbtnlink + "\")")
+                            i.scoicon.sco-right-btn-fill
+                            span.banner-button-text= page.rightbtn
+                    when false
+                        a.banner-button(href=page.rightbtnlink, target="_blank")
+                            i.scoicon.sco-right-btn-fill
+                            span.banner-button-text= page.rightbtn

package/layout/includes/widgets/page/links/banner.pug

@@ -13,16 +13,18 @@
 
 .tags-group-all.nowrapMove
     .tags-group-wrapper
-        - const data = site.data.links.banners
-        - var pairs = []
+        - const data = site.data.links.links
         - for (let i = 0; i < 2; i++)
-            each y, index in data
-                if (index % 2 === 0)
-                    - pairs.push([y])
-                else
-                    - pairs[pairs.length - 1].push(y)
-            each pair in pairs
-                .tags-group-icon-pair
-                    each y in pair
-                        a.tags-group-icon(href=url_for(y.link), title=y.name)
-                            img(src=y.avatar, title=y.name)
+        each x in data
+            if x.type === "item"
+                - var pairs = []
+                each y, index in x.link_list
+                    if (index % 2 === 0)
+                        - pairs.push([y])
+                    else
+                        - pairs[pairs.length - 1].push(y)
+                each pair in pairs
+                    .tags-group-icon-pair
+                        each y in pair
+                            a.tags-group-icon(href=url_for(y.link), title=y.name)
+                                img(src=y.avatar + (site.data.links.banner_suffix || ''), title=y.name)

package/layout/includes/widgets/page/links/linksCard.pug

@@ -2,16 +2,14 @@
     each item in data.link_list
         .site-card
             if item.tag
-                if item.vip
-                    span.site-card-tag.vip= item.tag
-                else
-                    span.site-card-tag= item.tag
+                span.site-card-tag(class=item.color)= item.tag
+                    i.light
             a.img(title=item.name, href=url_for(item.link))
-                img.flink-avatar(src=item.topimg, alt=item.name)
+                img.flink-avatar(src=item.topimg + (data.topimg_suffix || ''), alt=item.name)
                 .img-alt.is-center= item.name
             a.info.cf-friends-link(title=item.name, href=url_for(item.link))
                 .site-card-avatar
-                    img.flink-avatar.cf-friends-avatar(src=item.avatar, alt=item.name)
+                    img.flink-avatar.cf-friends-avatar(src=item.avatar + (data.suffix || ''), alt=item.name)
                     .img-alt.is-center= item.name
                 .site-card-text
                     span.title.cf-friends-name= item.name

package/layout/includes/widgets/page/links/linksDiscn.pug

@@ -0,0 +1,8 @@
+.flink-list.cf-friends-lost-contact.mini
+    each item in data.link_list
+        .flink-list-item
+            a.cf-friends-link(href="javascript:void(0);", title=item.name)
+                img.flink-avatar.cf-friends-avatar(alt=item.name, src=item.avatar + (data.suffix || ''))
+                .flink-item-info
+                    span.flink-item-name.cf-friends-name= item.name
+                    span.flink-item-desc(title=item.descr)= item.descr

package/layout/includes/widgets/page/links/linksItem.pug

@@ -1,13 +1,11 @@
 .flink-list
     each item in data.link_list
         .flink-list-item
+            if item.tag
+                span.site-card-tag(class=item.color)= item.tag
+                    i.light
             a.cf-friends-link(href=url_for(item.link), title=item.name)
-                if item.tag
-                    if item.vip
-                        span.site-card-tag.vip= item.tag
-                    else
-                        span.site-card-tag= item.tag
-                img.flink-avatar.cf-friends-avatar(alt=item.name, src=item.avatar)
+                img.flink-avatar.cf-friends-avatar(alt=item.name, src=item.avatar + (data.suffix || ''))
                 .flink-item-info
                     span.flink-item-name.cf-friends-name= item.name
                     span.flink-item-desc(title=item.descr)= item.descr

package/layout/includes/widgets/page/says/json.pug

@@ -0,0 +1,80 @@
+case theme.says.style
+    when 1
+        script.
+            !async function () {
+                let say_strip = !{theme.says.strip}
+                await fetch('!{url_for(theme.says.mode_link)}')
+                    .then(res => res.json())
+                    .then(res => {
+                        let list = say_strip === -1 || say_strip >= res.length ? res : res.slice(0, say_strip)
+                        let aplayer = null
+                        let video = null
+                        let imageBox = null
+
+                        document.querySelector('#waterfall').innerHTML = list.map(item => {
+                            aplayer = item.aplayer ? `<div class="bber-music"><meting-js server="${item.aplayer.server}" type="song" id="${item.aplayer.id}" mutex="true" preload="none" theme="var(--sco-main)" data-lrctype="0"></meting-js></div>` : null
+                            video = item.player ? `<div class="bber-video"><video src="${item.player}" controls="controls" style="objectfit: cover;"></video></div>` : item.bilibili ? `<div class="bber-video"><iframe src="//player.bilibili.com/player.html?autop-lay=0&bvid=${item.bilibili}" scrolling="no" border="0" frameborder="no" framespacing="0" allowfullscreen="true"></iframe></div>` : null
+                            imageBox = item.images ? `<div class="bber-content-img">${item.images.map(img => `<img src="${img}" title="即刻短文配图" />`).join('')}</div>` : null
+                            return `<li class="item">
+                                        <div id="bber-content">
+                                            <p class="datacont">${item.content || ''}</p>
+                                            ${imageBox || ''}
+                                        </div>
+                                        ${video || ''}
+                                        ${aplayer || ''}
+                                        <hr>
+                                        <div class="bber-bottom">
+                                            <div class="bber-info">
+                                                <div class="bber-info-time">
+                                                    <i class="scoicon sco-calendar-todo-fill"></i>
+                                                    <time class="datetime" datetime="${item.create_time}"></time>
+                                                </div>
+                                                ${item.link ? `<a class="bber-content-link" href="${item.link}" title="跳转到短文指引的链接"><i class="scoicon sco-link-m-line"></i>链接</a>` : ''}
+                                            </div>
+                                            ${item.content ? `<a class="bber-reply goComment" onclick="sco.toTalk('${item.content}')"><i class="scoicon sco-chat-fill" style="font-size: 1rem;"></i></a>` : ''}
+                                        </div>
+                            </li>`
+                        }).join('')
+                    })
+                GLOBAL_CONFIG.lazyload.enable && utils.lazyloadImg()
+                GLOBAL_CONFIG.lightbox && utils.lightbox(document.querySelectorAll(".bber-content-img img"));
+                changeTimeFormat()
+            }()
+    when 2
+        script.
+            !async function () {
+                let say_strip = !{theme.says.strip}
+                await fetch('!{url_for(theme.says.mode_link)}')
+                    .then(res => res.json())
+                    .then(res => {
+                        let list = say_strip === -1 || say_strip >= res.length ? res : res.slice(0, say_strip)
+                        let aplayer = null
+                        let video = null
+                        let imageBox = null
+
+                        document.querySelector('#waterfall').innerHTML = list.map(item => {
+                            aplayer = item.aplayer ? `<div class="bber-music"><meting-js server="${item.aplayer.server}" type="song" id="${item.aplayer.id}" mutex="true" preload="none" theme="var(--sco-main)" data-lrctype="0"></meting-js></div>` : null
+                            video = item.player ? `<div class="bber-video"><video src="${item.player}" controls="controls" style="object-fit: cover;"></video></div>` : item.bilibili ? `<div class="bber-video"><iframe src="//player.bilibili.com/player.html?autoplay=0&bvid=${item.bilibili}" scrolling="no" border="0" frameborder="no" framespacing="0" allowfullscreen="true"></iframe></div>` : null
+                            imageBox = item.images ? `<div class="bber-content-img">${item.images.map(img => `<img src="${img}" title="即刻短文配图" />`).join('')}</div>` : null
+                            return `<li class="item">
+                                        <div class="meta">
+                                            <img class="no-lightbox no-lazyload avatar" src="!{theme.aside.card.author.img}">
+                                            <div class="info">
+                                                <span class="bber_nick">#{config.author}</span>
+                                                <time class="datetime bber_date" datetime="${item.create_time}"></time>
+                                            </div>
+                                            ${item.content ? `<a class="bber-reply goComment" onclick="sco.toTalk('${item.content}')"><i class="scoicon sco-chat-fill" style="font-size: 1rem;"></i></a>` : ''}
+                                        </div>
+                                        <div id="bber-content">
+                                            <p class="datacont">${item.content || ''}</p>
+                                            ${imageBox || ''}
+                                        </div>
+                                        ${video || ''}
+                                        ${aplayer || ''}
+                            </li>`
+                        }).join('')
+                        GLOBAL_CONFIG.lazyload.enable && utils.lazyloadImg()
+                        GLOBAL_CONFIG.lightbox && utils.lightbox(document.querySelectorAll(".bber-content-img img"));
+                        changeTimeFormat()
+                    })
+            }()

package/layout/includes/widgets/page/says/local.pug

@@ -0,0 +1,48 @@
+if theme.says.strip === -1
+    - var limitedList = site.data.essay.essay_list
+else
+    - var limitedList = site.data.essay.essay_list.slice(0, theme.says.strip)
+each item in limitedList
+    li.item
+        if theme.says.style === 2
+            .meta
+                img.avatar(src=theme.aside.card.author.img)
+                .info
+                    span.bber_nick= config.author
+                    time.datetime.bber_date(datetime=moment(item.date).format())
+                if item.content
+                    a.bber-reply.goComment(onclick=`sco.toTalk('${item.content}')`)
+                        i.scoicon.sco-chat-fill
+
+        #bber-content
+            p.datacont= item.content
+            if item.image
+                .bber-content-img
+                    each img in item.image
+                        img(src=img title="即刻短文配图")
+
+        if item.aplayer
+            .bber-music
+                meting-js(server=item.aplayer.server type="song" id=item.aplayer.id mutex="true" preload="none" theme="var(--sco-main)" data-lrctype="0")
+
+        if item.video
+            .bber-video
+                if item.video.player
+                    video(src=item.video.player controls="controls" style="object-fit: cover;")
+                if item.video.bilibili
+                    iframe(src='//player.bilibili.com/player.html?autop-lay=0&bvid=' + item.video.bilibili scrolling="no" border="0" frameborder="no" framespacing="0" allowfullscreen="true")
+
+        if theme.says.style === 1
+            hr
+            .bber-bottom
+                .bber-info
+                    .bber-info-time
+                        i.scoicon.sco-calendar-todo-fill
+                        time.datetime(datetime=moment(item.date).format())
+                    if item.link
+                        a.bber-content-link(href=url_for(item.link) title="跳转到短文指引的链接")
+                            i.scoicon.sco-link-m-line
+                            | 链接
+                if item.content
+                    a.bber-reply(onclick=`sco.toTalk('${item.content}')`)
+                        i.scoicon.sco-chat-fill(style="font-size: 1rem;")