Merge pull request #322 from everfu/dev

Dev
everfu · Jul 11, 2024 · 03a71aa · 03a71aa
2 parents aa36fc5 + f31093f
commit 03a71aa
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 25 deletions.
diff --git a/layout/includes/console.pug b/layout/includes/console.pug
@@ -17,15 +17,20 @@ div#console
                             if theme.recent_comments.enable
                                 a.recent-comment-more(href=url_for(theme.recent_comments.page) title=_p('console.recent_comment_more'))
                                     i.solitude.st-right-btn-fill
-                    #console_recentcomments
+                    .console_recentcomments
+                        - var sel = '.console-card .console_recentcomments'
                         case use[0]
                             when 'Twikoo'
+                                - var str_name = 'twikoo-recent-comments-console'
                                 include ./widgets/page/recentcomment/twikoo
                             when 'Valine'
+                                - var str_name = 'valine-recent-comments-console'
                                 include ./widgets/page/recentcomment/valine
                             when 'Waline'
+                                - var str_name = 'waline-recent-comments-console'
                                 include ./widgets/page/recentcomment/waline
                             when 'Artalk'
+                                - var str_name = 'artalk-recent-comments-console'
                                 include ./widgets/page/recentcomment/artalk
         if card.tags || card.archive
             div.console-card-group-right

diff --git a/layout/includes/page/recentcomment.pug b/layout/includes/page/recentcomment.pug
@@ -4,13 +4,18 @@
 include ../widgets/page/banner
 
 if enable && use
-    #console_recentcomments
+    .console_recentcomments
+    - var sel = '#page .console_recentcomments'
     case use[0]
         when 'Twikoo'
+            - var str_name = 'twikoo-recent-comments'
             include ../widgets/page/recentcomment/twikoo
         when 'Valine'
+            - var str_name = 'valine-recent-comments'
             include ../widgets/page/recentcomment/valine
         when 'Waline'
+            - var str_name = 'waline-recent-comments'
             include ../widgets/page/recentcomment/waline
         when 'Artalk'
+            - var str_name = 'artalk-recent-comments'
             include ../widgets/page/recentcomment/artalk
diff --git a/layout/includes/widgets/page/recentcomment/artalk.pug b/layout/includes/widgets/page/recentcomment/artalk.pug
@@ -2,11 +2,11 @@
 
 script(pjax).
     (async () => {
-        document.querySelector('#console_recentcomments').textContent = `#{__("loading")}`
+        document.querySelector('!{sel}').textContent = `#{__("loading")}`
         const emojiReg = /<img [^>]+ atk-emoticon="[^"]+">/g
-        let cache = utils.saveToLocal.get('artalk-recent-comments')
+        let cache = utils.saveToLocal.get('!{str_name}')
         if (cache) {
-            setHtml(document.querySelector('#console_recentcomments'), cache)
+            setHtml(document.querySelector('!{sel}'), cache)
             return
         }
         let ls = []
@@ -37,8 +37,8 @@ script(pjax).
                         content: formatContent(i.content)
                     })
                 }
-                setHtml(document.querySelector('#console_recentcomments'), ls)
-                utils.saveToLocal.set('artalk-recent-comments', ls, !{cache})
+                setHtml(document.querySelector('!{sel}'), ls)
+                utils.saveToLocal.set('!{str_name}', ls, !{cache})
             })
 
         function setHtml(el, data) {

diff --git a/layout/includes/widgets/page/recentcomment/twikoo.pug b/layout/includes/widgets/page/recentcomment/twikoo.pug
@@ -2,11 +2,11 @@
 
 script(pjax).
     (async () => {
-        document.querySelector('#console_recentcomments').textContent = `#{__("loading")}`
+        document.querySelector('!{sel}').textContent = `#{__("loading")}`
         const emojiReg = /<img class="tk-owo-emotion" [^>]+>/g
-        let cache = utils.saveToLocal.get('twikoo-recent-comments')
+        let cache = utils.saveToLocal.get('!{str_name}')
         if (cache) {
-            setHtml(document.querySelector('#console_recentcomments'), cache)
+            setHtml(document.querySelector('!{sel}'), cache)
             return
         }
         let ls = []
@@ -44,8 +44,8 @@ script(pjax).
                     time: i.created
                 })
             }
-            setHtml(document.querySelector('#console_recentcomments'), ls)
-            utils.saveToLocal.set('twikoo-recent-comments', ls, !{cache})
+            setHtml(document.querySelector('!{sel}'), ls)
+            utils.saveToLocal.set('!{str_name}', ls, !{cache})
         });
 
         function setHtml(el, data) {

diff --git a/layout/includes/widgets/page/recentcomment/valine.pug b/layout/includes/widgets/page/recentcomment/valine.pug
@@ -2,11 +2,11 @@
 
 script(pjax).
     (async () => {
-        document.querySelector('#console_recentcomments').textContent = `#{__("loading")}`
+        document.querySelector('!{sel}').textContent = `#{__("loading")}`
         const emojiReg = /:[a-z0-9_\u4e00-\u9fa5]+:/g
-        let cache = utils.saveToLocal.get('valine-recent-comments')
+        let cache = utils.saveToLocal.get('!{str_name}')
         if (cache) {
-            setHtml(document.querySelector('#console_recentcomments'), cache)
+            setHtml(document.querySelector('!{sel}'), cache)
             return
         }
         let ls = []
@@ -42,8 +42,8 @@ script(pjax).
                     content: formatContent(i.comment)
                 })
             }
-            setHtml(document.querySelector('#console_recentcomments'), ls)
-            utils.saveToLocal.set('valine-recent-comments', ls, !{cache})
+            setHtml(document.querySelector('!{sel}'), ls)
+            utils.saveToLocal.set('!{str_name}', ls, !{cache})
         })
 
         function setHtml(el, data) {

diff --git a/layout/includes/widgets/page/recentcomment/waline.pug b/layout/includes/widgets/page/recentcomment/waline.pug
@@ -1,10 +1,10 @@
 script(pjax).
     (async () => {
-        document.querySelector('#console_recentcomments').textContent = `#{__("loading")}`
+        document.querySelector('!{sel}').textContent = `#{__("loading")}`
         const emojiReg = /<img [^>]+ class="wl-emoji">/g
-        let cache = utils.saveToLocal.get('waline-recent-comments')
+        let cache = utils.saveToLocal.get('!{str_name}')
         if (cache) {
-            setHtml(document.querySelector('#console_recentcomments'), cache)
+            setHtml(document.querySelector('!{sel}'), cache)
             return
         }
         let ls = []
@@ -34,8 +34,8 @@ script(pjax).
                         content: formatContent(i.comment)
                     })
                 }
-                setHtml(document.querySelector('#console_recentcomments'), ls)
-                utils.saveToLocal.set('waline-recent-comments', ls, !{cache})
+                setHtml(document.querySelector('!{sel}'), ls)
+                utils.saveToLocal.set('!{str_name}', ls, !{cache})
             })
 
         function setHtml(el, data) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "1.13.1",
+  "version": "1.13.2",
   "description": "A beautiful, powerful, and efficient Hexo theme developed by EverFu.",
   "main": "package.json",
   "scripts": {

diff --git a/source/css/_page/recentcomment.styl b/source/css/_page/recentcomment.styl
@@ -1,4 +1,4 @@
-div#console_recentcomments
+div.console_recentcomments
   display flex
   flex-wrap wrap
   gap 12px
@@ -72,7 +72,7 @@ div#console_recentcomments
     font-size 12px
     line-height 12px
 
-#console_recentcomments .comment-info img
+.console_recentcomments .comment-info img
   width 30px
   height 30px
   object-fit cover