fix: toc缓存异常

D-Sketon · Dec 31, 2023 · c6cec1a · c6cec1a
1 parent 00df45d
commit c6cec1a
Show file tree

Hide file tree

Showing 11 changed files with 48 additions and 82 deletions.
diff --git a/_config.yml b/_config.yml
@@ -64,6 +64,7 @@ social:
   # dribbble: https://dribbble.com/yourname
   # behance: https://www.behance.net/yourname
   # bilibili: https://space.bilibili.com/yourname
+  # netease: https://music.163.com/#/user/home?id=yourname
   # weibo: https://weibo.com/yourname
   # zhihu: https://www.zhihu.com/people/yourname
   # douban: https://www.douban.com/people/yourname

diff --git a/layout/_partial/after-footer.ejs b/layout/_partial/after-footer.ejs
@@ -19,7 +19,7 @@
 <% } %>
 
 <%- js('js/script') %>
-<%- partial('gauges-analytics') %>
+<%- partial('analytics/gauges-analytics') %>
 
 <% if(theme.valine.enable && theme.valine.appId && theme.valine.appKey){ %>
     <%- js(theme.vendor.js.valine) %>

diff --git a/layout/_partial/baidu-analytics.ejs → ...ut/_partial/analytics/baidu-analytics.ejs b/layout/_partial/baidu-analytics.ejs → ...ut/_partial/analytics/baidu-analytics.ejs
diff --git a/layout/_partial/gauges-analytics.ejs → ...t/_partial/analytics/gauges-analytics.ejs b/layout/_partial/gauges-analytics.ejs → ...t/_partial/analytics/gauges-analytics.ejs
diff --git a/layout/_partial/google-analytics.ejs → ...t/_partial/analytics/google-analytics.ejs b/layout/_partial/google-analytics.ejs → ...t/_partial/analytics/google-analytics.ejs
diff --git a/layout/_partial/head.ejs b/layout/_partial/head.ejs
@@ -1,7 +1,7 @@
 <head>
     <meta charset="utf-8">
-    <%- partial('google-analytics') %>
-    <%- partial('baidu-analytics') %>
+    <%- partial('analytics/google-analytics') %>
+    <%- partial('analytics/baidu-analytics') %>
     <%
     var title = page.title;
 

diff --git a/layout/_partial/mobile-nav.ejs b/layout/_partial/mobile-nav.ejs
@@ -1,46 +1,9 @@
 <nav id="mobile-nav">
     <div class="sidebar-wrap">
         <% if (is_post()) { %>
-            <div class="sidebar-toc">
-                <h3 class="toc-title"><%= __('toc') %></h3>
-                <div class="sidebar-toc-wrapper"><%- toc(page.content) %></div>
-            </div>
+            <%- partial('sidebar/toc-sidebar') %>
         <% } else { %>
-            <div class="sidebar-author">
-                <img data-src="/avatar/<%= theme.avatar%>" data-sizes="auto" alt="<%= config.author %>" class="lazyload">
-                <div class="sidebar-author-name"><%= config.author %></div>
-                <div class="sidebar-description"><%= config.description%></div>
-            </div>
-            <div class="sidebar-state">
-                <div class="sidebar-state-article">
-                    <div><%= __("sidebar.post") %></div>
-                    <div class="sidebar-state-number"><%= site.posts.length %></div>
-                </div>
-                <div class="sidebar-state-category">
-                    <div><%= __("sidebar.category") %></div>
-                    <div class="sidebar-state-number"><%= site.categories.length %></div>
-                </div>
-                <div class="sidebar-state-tag">
-                    <div><%= __("sidebar.tag") %></div>
-                    <div class="sidebar-state-number"><%= site.tags.length %></div>
-                </div>
-            </div>
-            <div class="sidebar-social">
-                <% for (var i in theme.social){ %>
-                    <div class=<%= 'icon-' + i %>>
-                        <a href=<%= theme.social[i] %> itemprop="url" target="_blank"></a>
-                    </div>
-                <% } %>
-            </div>
-            <div class="sidebar-menu">
-                <% for (var i in theme.menu){ %>
-                    <div class="sidebar-menu-link-wrap">
-                        <a class="sidebar-menu-link-dummy" href="<%- url_for(theme.menu[i]) %>"></a>
-                        <span class="sidebar-menu-icon"></span>
-                        <div class="sidebar-menu-link"><%= __(i) %></div>
-                    </div>
-                <% } %>
-            </div>
+            <%- partial('sidebar/common-sidebar') %>
         <% } %>
     </div>
 </nav>
diff --git a/layout/_partial/sidebar.ejs b/layout/_partial/sidebar.ejs
@@ -1,46 +1,9 @@
 <aside id="sidebar">
     <div class="sidebar-wrap wow fadeInRight <% if (is_post()) { %>wrap-sticky<% } %>">
         <% if (is_post()) { %>
-            <div class="sidebar-toc">
-                <h3 class="toc-title"><%= __('toc') %></h3>
-                <div class="sidebar-toc-wrapper"><%- toc(page.content) %></div>
-            </div>
+            <%- partial('sidebar/toc-sidebar') %>
         <% } else { %>
-            <div class="sidebar-author">
-                <img data-src="/avatar/<%= theme.avatar%>" data-sizes="auto" alt="<%= config.author %>" class="lazyload">
-                <div class="sidebar-author-name"><%= config.author %></div>
-                <div class="sidebar-description"><%= config.description%></div>
-            </div>
-            <div class="sidebar-state">
-                <div class="sidebar-state-article">
-                    <div><%= __("sidebar.post") %></div>
-                    <div class="sidebar-state-number"><%= site.posts.length %></div>
-                </div>
-                <div class="sidebar-state-category">
-                    <div><%= __("sidebar.category") %></div>
-                    <div class="sidebar-state-number"><%= site.categories.length %></div>
-                </div>
-                <div class="sidebar-state-tag">
-                    <div><%= __("sidebar.tag") %></div>
-                    <div class="sidebar-state-number"><%= site.tags.length %></div>
-                </div>
-            </div>
-            <div class="sidebar-social">
-                <% for (var i in theme.social){ %>
-                    <div class=<%= 'icon-' + i %>>
-                        <a href=<%= theme.social[i] %> itemprop="url" target="_blank"></a>
-                    </div>
-                <% } %>
-            </div>
-            <div class="sidebar-menu">
-                <% for (var i in theme.menu){ %>
-                    <div class="sidebar-menu-link-wrap">
-                        <a class="sidebar-menu-link-dummy" href="<%- url_for(theme.menu[i]) %>"></a>
-                        <span class="sidebar-menu-icon"></span>
-                        <div class="sidebar-menu-link"><%= __(i) %></div>
-                    </div>
-                <% } %>
-            </div>
+            <%- partial('sidebar/common-sidebar') %>
         <% } %>
     </div>
     <% if (!is_post()) { %>

diff --git a/layout/_partial/sidebar/common-sidebar.ejs b/layout/_partial/sidebar/common-sidebar.ejs
@@ -0,0 +1,35 @@
+<div class="sidebar-author">
+    <img data-src="/avatar/<%= theme.avatar%>" data-sizes="auto" alt="<%= config.author %>" class="lazyload">
+    <div class="sidebar-author-name"><%= config.author %></div>
+    <div class="sidebar-description"><%= config.description%></div>
+</div>
+<div class="sidebar-state">
+    <div class="sidebar-state-article">
+        <div><%= __("sidebar.post") %></div>
+        <div class="sidebar-state-number"><%= site.posts.length %></div>
+    </div>
+    <div class="sidebar-state-category">
+        <div><%= __("sidebar.category") %></div>
+        <div class="sidebar-state-number"><%= site.categories.length %></div>
+    </div>
+    <div class="sidebar-state-tag">
+        <div><%= __("sidebar.tag") %></div>
+        <div class="sidebar-state-number"><%= site.tags.length %></div>
+    </div>
+</div>
+<div class="sidebar-social">
+  <% for (var i in theme.social){ %>
+      <div class=<%= 'icon-' + i %>>
+          <a href=<%= theme.social[i] %> itemprop="url" target="_blank"></a>
+      </div>
+  <% } %>
+</div>
+<div class="sidebar-menu">
+  <% for (var i in theme.menu){ %>
+      <div class="sidebar-menu-link-wrap">
+          <a class="sidebar-menu-link-dummy" href="<%- url_for(theme.menu[i]) %>"></a>
+          <span class="sidebar-menu-icon"></span>
+          <div class="sidebar-menu-link"><%= __(i) %></div>
+      </div>
+  <% } %>
+</div>
diff --git a/layout/_partial/sidebar/toc-sidebar.ejs b/layout/_partial/sidebar/toc-sidebar.ejs
@@ -0,0 +1,4 @@
+<div class="sidebar-toc">
+    <h3 class="toc-title"><%= __('toc') %></h3>
+    <div class="sidebar-toc-wrapper"><%- toc(page.content) %></div>
+</div>
diff --git a/layout/layout.ejs b/layout/layout.ejs
@@ -23,7 +23,7 @@
             <div class="sidebar-top"></div>
             <div id="mask"></div>
         </div>
-        <%- partial('_partial/mobile-nav', null, {cache: !config.relative_link}) %>
+        <%- partial('_partial/mobile-nav', null, {cache: false}) %>
         <%- partial('_partial/after-footer') %>
     </div>
     <div class="site-search">