hexo-theme-solitude 1.2.6 → 1.3.1

package/layout/includes/widgets/aside/asideHistory.pug

@@ -2,7 +2,7 @@ if theme.aside.history.enable
     .card-widget.card-history
         .item-headline
             i(class=theme.aside.history.icon || 'scoicon sco-clock-fill')
-            span= theme.aside.history.title || '那年今日'
-        #history-baidu(style="height: 100px;overflow: hidden")
+            span= theme.aside.history.title || _p('aside.history')
+        #history-baidu
             #history-container.history_swiper-container(style="width: 100%;height: 100%;margin-top: 6px")
-                #history_container_wrapper.swiper-wrapper(style="height:20px")
+                #history_container_wrapper.swiper-wrapper

package/layout/includes/widgets/aside/asideInfoCard.pug

@@ -2,18 +2,16 @@
     .card-content
         .card-info-avatar.is-center
             .author-info__top-group
-                .author-info__sayhi#author-info__sayhi(onclick="sco.changeSayHelloText()") 一日之计在于晨
+                .author-info__sayhi#author-info__sayhi(onclick="sco.changeSayHelloText()")= _p('sayhello.morning')
         .avatar-img-group
-            img.avatar-img(alt="avatar", src=theme.aside.card.author.img)
+            img.avatar-img(alt=_p('aside.avatar'), src=theme.aside.card.author.img)
             .avatar-sticker
-                svg.avatar-sticker-img(alt="avatar", aria-hidden="true")
-                    use(xlink:href=theme.aside.card.author.state)
-                script(src=url_for(theme.aside.card.author.js))
+                img.avatar-sticker-img(src=theme.aside.card.author.sticker, alt=_p('aside.sticker'))
         .author-info__description_group
             .author-info__description!= theme.aside.card.content
             .author-info__description2!= theme.aside.card.content2
         .author-info__bottom-group
-            a.author-info__bottom-group-left(href=theme.about ? "/about" : "/", data-pjax-state)
+            a.author-info__bottom-group-left(href=theme.about ? "/about" : "/")
                 .author-info__name= config.author
                 .author-info__desc!= config.subtitle
             .card-info-social-icons.is-center

package/layout/includes/widgets/aside/asideNewestPost.pug

@@ -1,7 +1,7 @@
 .card-widget.card-recent-post
     .item-headline
         i.scoicon.sco-map-line
-        span 最近发布
+        span= _p('aside.newpost')
     .aside-list
         - let index = 1
         each post in site.posts.data.sort((a, b) => b.date < a.date ? -1 : 1)

package/layout/includes/widgets/aside/asideSwitch.pug

@@ -1,6 +1,4 @@
 case item
-    when 'power'
-        include ./asidePower.pug
     when 'about'
         include ./asideInfoCard.pug
     when 'flip'
@@ -11,15 +9,6 @@ case item
         include ./asideHistory.pug
     when 'newestPost'
         include ./asideNewestPost.pug
-    when 'tag'
-        .card-widget.card-tags
-            include ./asideTag.pug
-    when 'archive'
-        .card-widget.card-archives
-            include ./asideArchive.pug
-    when 'webInfo'
-        .card-widget.card-webinfo
-            include ./asideWebInfo.pug
     when 'allInfo'
         include ./asideAllInfo.pug
     default

package/layout/includes/widgets/aside/asideTag.pug

@@ -1,9 +1,9 @@
 .card-tag-cloud
     each tag in site.tags.find({ parent: { $exists: false } }).data
-        a(href=url_for(tag.path), style="font-size: 0.8rem;")= tag.name
+        a(href=url_for(tag.path))= tag.name
             sup= tag.length
 if site.tags.length > 50
-    a#more-tags-btn(href="javascript:void(0);", rel="external nofollow", onclick="sco.openAllTags();", data-pjax-state="") 查看全部
+    a#more-tags-btn(href="javascript:void(0);", onclick="sco.openAllTags();")= __('aside.tagmore')
 else
     style.
         .card-tag-cloud::after {

package/layout/includes/widgets/aside/asideToc.pug

@@ -1,5 +1,5 @@
 .card-widget#card-toc
     .item-headline
         i.scoicon.sco-menu-line
-        span 文章目录
+        span= __('aside.toc')
     .toc-content#toc-content!= toc(page.content, { list_number: false })

package/layout/includes/widgets/aside/asideWebInfo.pug

@@ -3,38 +3,38 @@
         .webinfo-item
             .webinfo-item-title
                 i.item-icon.scoicon.sco-folder-fill
-                .item-name 文章总数 :
+                .item-name= __('aside.postcount')
             .item-count= site.posts.length
     if theme.thirdparty.busuanzi
         if theme.aside.siteinfo.pv
             .webinfo-item
                 .webinfo-item-title
                     i.item-icon.scoicon.sco-visitor-line
-                    .item-name 总访问数 :
+                    .item-name= __('aside.pv')
                 span#busuanzi_value_site_pv
                     i.scoicon.sco-loading-line
         if theme.aside.siteinfo.uv
             .webinfo-item
                 .webinfo-item-title
                     i.item-icon.scoicon.sco-team-fill
-                    .item-name 总访客数 :
+                    .item-name= __('aside.uv')
                 span#busuanzi_value_site_uv
                     i.scoicon.sco-loading-line
     if theme.aside.siteinfo.runtimeenable
         .webinfo-item
             .webinfo-item-title
                 i.item-icon.scoicon.sco-calendar-todo-fill
-                .item-name 建站天数 :
+                .item-name= __('aside.runtime')
             .item-count#runtimeshow
     if theme.aside.siteinfo.updatetime
         .webinfo-item
             .webinfo-item-title
                 i.item-icon.scoicon.sco-loop-left-fill
-                .item-name 最后更新 :
+                .item-name= __('aside.updatetime')
             time.item-count(datetime=new Date())
     if theme.thirdparty.wordcount && theme.aside.siteinfo.wordcount
         .webinfo-item
             .webinfo-item-title
                 i.item-icon.scoicon.sco-word-fill
-                .item-name 全站字数 :
+                .item-name= __('aside.wordcount')
             .item-count= totalcount(site)

package/layout/includes/widgets/aside/asideWelcome.pug

@@ -2,7 +2,7 @@ if theme.aside.welcome.enable
     .card-widget.card-welcome
         .item-headline
             i(class=theme.aside.welcome.icon || 'scoicon sco-map-pin-fill')
-            span= theme.aside.welcome.title || '来访者'
+            span= theme.aside.welcome.title || __('aside.welcome')
         #welcome-info
 
     script(data-pjax).

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

@@ -11,6 +11,6 @@ div.tags-group-all
                     each key in pair
                         .tags-group-icon(style=`background: ${theme.hometop.banner.icon[key].color}`)
                             img(src=theme.hometop.banner.icon[key].img, title=key)
-a#banner-hover(onclick="toRandomPost()" data-pjax-state="")
-    span.bannerText 随便逛逛
+a#banner-hover(onclick="toRandomPost()")
+    span.bannerText= _p('home.bannertext')
     i.scoicon.sco-arrow-2-right-line.banner-righticon

package/layout/includes/widgets/home/bbTimeList.pug

@@ -1,8 +1,8 @@
 .bbTimeList.container#bbTimeList
-    i.bber-logo.scoicon.sco-says(onclick="pjax.loadUrl('/essay/')", style="font-size: 1rem;")
+    i.bber-logo.scoicon.sco-bblogo(onclick="pjax.loadUrl('/essay/')")
     .swiper-container.swiper-no-swiping.swiper-container-initialized.swiper-container-vertical.swiper-container-pointer-events#bbtalk(tabindex="-1", onclick="pjax.loadUrl('/essay/')")
         .swiper-wrapper#bber-talk
             each item, i in site.data.essay.essay_list
                 if i < 10
-                    .li-style.swiper-slide= item.image ? item.content + '【图片】' : item.content
-    i.bber-gotobb.scoicon.sco-right-btn-fill(style="font-size: 1rem", title="查看全文", onclick="pjax.loadUrl('/essay/')")
+                    .li-style.swiper-slide= item.image ? item.content + _p('home.bbtime.image') : item.content
+    i.bber-gotobb.scoicon.sco-right-btn-fill(title=_p('home.bbtime.text'), onclick="pjax.loadUrl('/essay/')")

package/layout/includes/widgets/home/categoryBar.pug

@@ -1,10 +1,10 @@
 .category-bar-items#category-bar-items
     .category-bar-item(class=is_home() ? 'select' : '', id="category-bar-home")
-        a(href="/") 首页
+        a(href="/")= __('home.categoryBar.home')
     each item in site.categories.find({ parent: { $exists: false } }).data
         .category-bar-item(class=select ? (select === item.name ? 'select' : '') : '', id=item.name)
             a(href=url_for(item.path))= item.name
-if site.categories.length > 10
+if site.categories.length > 13
     .category-bar-next#category-bar-next(onclick="sco.scrollCategoryBarToRight()")
         i.scoicon.sco-show-right-line
-a.category-bar-more(href="/categories/") 更多
+a.category-bar-more(href="/categories/")= __('home.categoryBar.more')

package/layout/includes/widgets/home/categoryGroup.pug

@@ -1,9 +1,9 @@
 - var groupNames = ['G1', 'G2', 'G3'];
 - var styles = ['--sco-shadow-blue', '--sco-shadow-red', '--sco-shadow-green'];
-- var classes = ['CB1 bikan', 'remen', 'shiyong'];
+- var classes = ['bikan', 'remen', 'shiyong'];
 
 each groupName, index in groupNames
     .categoryItem(style=`box-shadow: var(${styles[index]});`)
         a.categoryButton(class=classes[index], href=url_for(theme.hometop.categoryGroup[groupName].url))
             span.categoryButtonText= theme.hometop.categoryGroup[groupName].name
-            i(class=theme.hometop.categoryGroup[groupName].icon)
+            i(class=theme.hometop.categoryGroup[groupName].icon)

package/layout/includes/widgets/home/hometop.pug

@@ -1,9 +1,9 @@
-div.recent-top-post-group#recent-top-post-group
-    div.recent-post-top#recent-post-top
-        div#bannerGroup
-            div#banners
+.recent-top-post-group#recent-top-post-group
+    .recent-post-top#recent-post-top
+        #bannerGroup
+            #banners
                 include ./banner.pug
-            div.categoryGroup
+            .categoryGroup
                 include ./categoryGroup.pug
-        div.topGroup
-            include ./rencentPost.pug
+        .topGroup
+            include ./topGroup.pug

package/layout/includes/widgets/home/postList.pug

@@ -1,24 +1,28 @@
-div(class="recent-post-item" onclick="pjax.loadUrl('/" + post.path + "')")
-    div.post_cover.left_radius
+div.recent-post-item(onclick="pjax.loadUrl('/" + post.path + "')")
+    div.post_cover
         a(href=url_for(post.path), title=post.title)
-            img(src=url_for(post.cover), alt=post.title, class="post_bg")
+            img.post_bg(src=url_for(post.cover), alt=post.title)
     div.recent-post-info
         div.recent-post-info-top
             div.recent-post-info-top-tips
+                if post.sticky && is_home()
+                    span.article-meta.sticky-warp
+                        i.scoicon.sco-thumbtack-solid.sticky.orange
+                        span.sticky.orange= _p('home.recent-post.sticky')
                 each category in post.categories.data
-                    span(class="original")= category.name
+                    span.original= category.name
 
                 if post.prev == null && is_home()
-                    span(class="original")="最新"
+                    span.original= _p('home.recent-post.new')
 
-                a(class="unvisited-post" href=url_for(post.path), data-pjax-state)= "未读"
+                a.unvisited-post(href=url_for(post.path))= _p('home.recent-post.read')
 
-            a(class="article-title" href=url_for(post.path), data-pjax-state, title=post.title)= post.title
+            a.article-title(href=url_for(post.path), title=post.title)= post.title
 
         div.article-meta-wrap
             span.article-meta.tags
                 each tag in post.tags.data
-                    a(class="article-meta__tags" href=url_for(tag.path), data-pjax-state, onclick="window.event.cancelable=true")
+                    a.article-meta__tags(href=url_for(tag.path), onclick="event.stopPropagation();")
                         span.tags-punctuation=tag.name
 
             span.post-meta-date

package/layout/includes/widgets/home/topGroup.pug

@@ -1,22 +1,14 @@
 - var filteredPosts = site.posts.data.filter(item => item.recommend === true).slice(0,6)
 each post in filteredPosts
     .recent-post-item
-        .post_cover.left_radius
+        .post_cover
             a(href=url_for(post.path), title=post.title)
-                span.recent-post-top-text 荐
-                img.post_bg(alt=post.title, src=post.cover, loading="lazy")
+                span.recent-post-top-text= _p('home.top-group.recommend')
+                img.post_bg(alt=post.title, src=post.cover)
         .recent-post-info
             a.article-title(href=url_for(post.path), title=post.title)= post.title
 
-if theme.hometop.recommendList.url.startsWith('/') && theme.hometop.recommendList.url.endsWith('/')
-    .todayCard#todayCard(onclick=`pjax.loadUrl('${theme.hometop.recommendList.url}')`, style="z-index: 1;")
-else
-    script.
-        function GoTodayCard() {
-            window.open("#{theme.hometop.recommendList.url}", "_blank");
-        }
-    .todayCard#todayCard(onclick="GoTodayCard()", style="z-index: 1;")
-
+mixin todayCardContent
     .todayCard-info
         .todayCard-tips= theme.hometop.recommendList.sup
         .todayCard-title= theme.hometop.recommendList.title
@@ -24,4 +16,16 @@ else
     .banner-button-group
         a.banner-button(onclick="window.event.cancelBubble=true;sco.hideTodayCard();")
             i.scoicon.sco-add-fill
-            span.banner-button-text 更多推荐
+            span.banner-button-text= _p('home.top-group.recommendmore')
+
+case theme.hometop.recommendList.url.startsWith('/')
+    when true
+        .todayCard#todayCard(onclick=`pjax.loadUrl('${theme.hometop.recommendList.url}')`)
+            +todayCardContent()
+    when false
+        script.
+            function GoTodayCard() {
+                window.open("#{theme.hometop.recommendList.url}", "_blank");
+            }
+        .todayCard#todayCard(onclick="GoTodayCard()")
+            +todayCardContent()

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

@@ -1,10 +1,10 @@
-div.back-menu-list-groups
+.back-menu-list-groups
     - var menu = theme.nav && theme.nav.left && theme.nav.left.menu ? theme.nav.left.menu : {}
     each groupData, x in menu
-        div.back-menu-list-group
-            div.back-menu-list-title= x
-            div.back-menu-list
+        .back-menu-list-group
+            .back-menu-list-title= x
+            .back-menu-list
                 each data, y in groupData
-                    a.back-menu-item(href=url_for(data.url), rel="external nofollow", title=y)
-                        img.back-menu-item-icon(src=data.icon, loading="lazy", alt=x)
+                    a.back-menu-item(href=url_for(data.url), title=y)
+                        img.back-menu-item-icon(src=data.icon, alt=x)
                         span.back-menu-item-text= y

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

@@ -1,9 +1,9 @@
-div.menus_items
+.menus_items
     - var menu = theme.nav && theme.nav.menu ? theme.nav.menu : {}
     each value, x in menu
-        div.menus_item
+        .menus_item
             if !value.url
-                a.site-page(href="javascript:void(0);", rel="external nofollow")
+                a.site-page(href="javascript:void(0);")
                     span= x
                 ul.menus_item_child
                     each childValue, y in value.child
@@ -12,5 +12,5 @@ div.menus_items
                                 i(class=childValue.icon)
                                 span= y
             else
-                a.site-page.not-child(href=url_for(value.url), rel="external nofollow")
+                a.site-page.not-child(href=url_for(value.url))
                     span= x

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

@@ -1,23 +1,23 @@
 if theme.nav.right.travellings
-    div.nav-button.only-home#travellings_button
-        a.site-page(traget="_blank", href="https://www.travellings.cn/go.html", rel="noopener noreferrer", title="开往-友链接力", width="120")
-            i.scoicon.sco-train-line(style="font-size: 1rem;")
+    .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
 if theme.nav.right.random
-    div.nav-button#randomPost_button
-        a.site-page(onclick="toRandomPost()", title="随机前往一个文章")
-            i.scoicon.sco-signal-tower-fill(style="font-size: 1rem;")
+    .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
-    div.nav-button#search-button
-        a.site-page.social-icon.search(href="javascript:void(0);", rel= "external nofollow", title="搜索")
-            i.scoicon.sco-search-line(style="font-size: 1rem;")
+    .nav-button#search-button
+        a.site-page.social-icon.search(href="javascript:void(0);", title=_p('nav.search'))
+            i.scoicon.sco-search-line
 if theme.nav.right.console
-    div.nav-button#nav-console
-        a.console_switchbutton(onclick="sco.showConsole()", title="显示中控台", rel="external nofollow", href="javascript:void(0);")
-            i.scoicon.sco-dashboard-fill(style="font-size: 1rem;")
-div.nav-button#nav-totop(onclick="sco.toTop()")
+    .nav-button#nav-console
+        a.console_switchbutton(onclick="sco.showConsole()", title=_p('nav.console'), href="javascript:void(0);")
+            i.scoicon.sco-dashboard-fill
+.nav-button#nav-totop(onclick="sco.toTop()")
     a.totopbtn
         i.scoicon.sco-arrow-up-line
         span#percent= "0"
-div#toggle-menu
+#toggle-menu
     a.site-page
         i.scoicon.sco-menu-line

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

@@ -9,4 +9,4 @@
     .author-tag-right
         each tag in authorinfo.rightTags
             span.author-tag= tag
-.author-title 关于我
+.author-title= authorinfo.title

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

@@ -1,34 +1,36 @@
+- award = site.data.about.award
+
 - var sum = 0
 if site.data.about.rewardList
     .author-content
         .author-content-item.single.reward
-            .author-content-item-tips 致谢
-            span.author-content-item-title 赞赏名单
+            .author-content-item-tips= _p('award.about.tip')
+            span.author-content-item-title= _p('award.about.title')
             .author-content-item-description
-               = "感谢赞赏的人，因为你们，让我感受到写博客这件事情能够给你们创造了价值。这会让我在这条路上走得更远。"
+               = award.description
             .reward-list-all
                 each reward in site.data.about.rewardList
                     - sum += reward.money
                     .reward-list-item
                         .reward-list-item-name= reward.name
                         .reward-list-bottom-group
-                            .reward-list-item-money(style=reward.vip ? "background: var(--sco-vip);" : "") ¥ #{reward.money}
+                            .reward-list-item-money(style=(reward.vip ? "background: var(--sco-vip);" : "")) ¥ #{reward.money}
                             time.datatime.reward-list-item-time(datetime=moment(reward.time).format())
                 if theme.post.award.enable
                     .post-reward
                         .post-reward(onclick="AddRewardMask()")
-                        .reward-button(title="赞赏作者")
+                        .reward-button(title=_p('award.about.tip1'))
                             i.scoicon.sco-hand-heart-fill
-                            = "打赏作者"
+                            = _p('award.about.tip1')
                         .reward-main
                             ul.reward-all
-                                span.reward-title 感谢你赐予我前进的力量
+                                span.reward-title= _p('award.about.tip2')
                                 ul.reward-group
-                                    - var rewards = [{image: theme?.post?.award?.wechat, description: '微信'}, {image: theme?.post?.award?.alipay, description: '支付宝'}]
+                                    - var rewards = [{image: theme.post.award.wechat, description: _p('award.wechat')}, {image: theme.post.award.alipay, description: _p('award.alipay')}]
                                     each reward in rewards
                                         li.reward-item
                                             a(href=reward.image, target="_blank")
                                                 img.post-qr-code-img(alt=reward.description, src=reward.image)
                                             .post-qr-code-desc= reward.description
             .reward-list-tips
-                p 总金额：¥ #{sum}，将全部用于博客的维护
+                p= award.tips.replace('{sum}', sum)

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

@@ -2,17 +2,17 @@
 
 .author-content
     .author-content-item.myInfoAndSayHello
-        .title1 你好，很高兴认识你👋
-        .title2 我叫
+        .title1= _p('about.info.title1')
+        .title2= _p('about.info.title2')
             span.inline-word= contentinfo.name
-        .title1 是一名 #{contentinfo.title}
+        .title1= _p('about.info.title3') + contentinfo.title
     .aboutsiteTips.author-content-item
-        .author-content-item-tips 追求
+        .author-content-item-tips= _p('about.info.tip1')
         h2
-            | 源于
+            = _p('about.info.tip2')
             br
-            | 热爱而去
-            span.inline-word 创造
+            = _p('about.info.tip3')
+            span.inline-word= _p('about.info.tip4')
             .mask
                 span.first-tips(data-show='')= contentinfo.product
                 span= contentinfo.design

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

@@ -28,6 +28,6 @@ if site.data.about.likes
                         .tips= like.subtips
                         if like.button
                             .banner-button-group
-                                a.banner-button(href=like.button_link, target="_blank", rel="noopener nofollow")
+                                a.banner-button(href=like.button_link)
                                     i.scoicon.sco-right-btn-fill
                                     span.banner-button-text= like.button_text

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

@@ -5,13 +5,13 @@
     .author-content-item.maxim
         .author-content-item-tips= motto.title
         span.maxim-title
-            span(style="opacity: 0.6; margin-bottom:8px;")= motto.prefix
+            span= motto.prefix
             span= motto.content
     .author-content-item.buff
         .card-content
             .author-content-item-tips= expertise.title
             span.buff-title
-                span(style="opacity: 0.6; margin-bottom:8px;")
+                span
                     | #{expertise.prefix}
                     span.inline-word= expertise.specialist
                 span

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

@@ -7,31 +7,32 @@
                 #statistic
                 .post-tips
                     | 统计信息来自
-                    a(href="https://invite.51.la/1NzKqTeb?target=V6", target="_blank", rel="noopener nofollow") 51la网站统计
+                    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/');", data-pjax-state="")
+                        a.banner-button(onclick="pjax.loadUrl('/echart/');")
                             i.scoicon.sco-right-btn-fill
                             span.banner-button-text 文章统计
             script.
                 fetch("#{site.data.about.tj.url}")
                     .then(res => res.text())
                     .then(data => {
-                        let title = ["最近活跃", "今日人数", "今日访问", "昨日人数", "昨日访问", "本月访问", "总访问量"];
+                        const title = ["最近活跃", "今日人数", "今日访问", "昨日人数", "昨日访问", "本月访问", "总访问量"];
                         let num = data.match(/(<\/span><span>).*?(\/span><\/p>)/g);
                         num = num.map(el => {
                             let val = el.replace(/(<\/span><span>)/g, "");
-                            let str = val.replace(/(<\/span><\/p>)/g, "");
-                            return str;
+                            return val.replace(/(<\/span><\/p>)/g, "");
                         });
-                        let s = document.getElementById("statistic");
-                        let statistic = [];
+                        const s = document.getElementById("statistic");
+                        let html = '';
                         for (let i = 0; i < num.length; i++) {
-                            if (i == 0 || i == num.length - 1) continue;
-                            s.innerHTML += "<div><span>" + title[i] + "</span><span id=" + title[i] + ">" + num[i] + "</span></div>";
+                            if (i === 0 || i === num.length - 1) continue;
+                            html += `<div><span>${title[i]}</span><span id="${title[i]}">${num[i]}</span></div>`;
                         }
+                        s.innerHTML = html;
                     });
 
+
     if site.data.about.oneself
         style.
             :root {

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

@@ -9,8 +9,8 @@
             img(src=personalities.image)
         .post-tips
             | 在
-            a(href="https://www.16personalities.com/", target="_blank", rel="noopener nofollow")= personalities.linkText
+            a(href="https://www.16personalities.com/")= personalities.linkText
             | 了解更多关于
-            a(target="_blank", rel="noopener external nofollow", href=personalities.typeLink)= personalities.typeName
+            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

@@ -9,18 +9,16 @@
             .skills-style-group
                 .tags-group-all
                     .tags-group-wrapper
-                        .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 = []
+                        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

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

@@ -0,0 +1,48 @@
+- var tenyear = site.data.about.tenyear
+if tenyear
+    .author-content#tenyear
+        .create-site-post.author-content-item.single
+            .author-content-item-tips=tenyear.tips
+            .author-content-item-title=tenyear.title
+            p=tenyear.text
+            .tenyear-timeline
+                .progress
+                .past-time
+                .percentage-label
+            .time-labels
+                .start-time#tenyear-start-time= tenyear.start
+                .end-time#tenyear-end-time= tenyear.end
+
+    script.
+        function parseDateString(e) {
+            return e.replace(/年|月/g, '-').replace(/日/g, '');
+        }
+
+        function tenYear() {
+            let progressElement = document.querySelector(".progress");
+            let pastTimeElement = document.querySelector(".past-time");
+            let percentageLabelElement = document.querySelector(".percentage-label");
+            let startTimeElement = document.getElementById("tenyear-start-time");
+            let endTimeElement = document.getElementById("tenyear-end-time");
+
+            let startTime = new Date(parseDateString(startTimeElement.textContent)).getTime();
+            let endTime = new Date(parseDateString(endTimeElement.textContent)).getTime();
+
+            function updateProgress() {
+                let currentTime = new Date().getTime();
+                let progress = ((currentTime - startTime) / (endTime - startTime) * 100);
+                let progressPercentage = progress <= 100 ? progress + "%" : "100%";
+
+                pastTimeElement.style.setProperty("--past-time-percentage", progress + "%");
+                progressElement.style.setProperty("--progress-percentage", progressPercentage);
+                if(progress > 5){
+                    percentageLabelElement.textContent = `${progress.toFixed(0)}%`;
+                    percentageLabelElement.style.left = `calc(${progress}% - 28px)`;
+                }
+            }
+
+            percentageLabelElement.style.visibility = "visible";
+            updateProgress();
+        }
+
+        document.getElementById("tenyear") && tenYear() && window.Pjax.on('complete', tenYear)