chore: tidy up (#264)

theme-nexmoe · Mar 18, 2023 · b0f4d37 · b0f4d37
2 parents 98a8b98 + f5a39b8
commit b0f4d37
Show file tree

Hide file tree

Showing 17 changed files with 2,695 additions and 122 deletions.
diff --git a/README_ZH.md b/README_ZH.md
diff --git a/layout/_index/list.ejs b/layout/_index/list.ejs
@@ -0,0 +1,23 @@
+<% page.posts.each(function (page) { %>
+    <div class="nexmoe-post">
+        <a href="<%- url_for(page.path) %>">
+            <% if (page.cover){ %>
+                <div class="nexmoe-post-cover mdui-ripple absolute" style="padding-top: <%- page.coverHeight/page.coverWidth*100 %>%;"> 
+                    <img src="<%- page.cover %>" alt="<%= page.title %>" loading="lazy">
+                    <h1><%= page.title %></h1>
+                </div>
+            <%}  else{ %>
+                <div class="nexmoe-post-cover mdui-ripple"> 
+                    <img src="<%- theme.background.path %>" alt="<%= page.title %>" loading="lazy">
+                    <h1><%= page.title %></h1>
+                </div>
+            <% } %>
+        </a>
+
+        <%- partial('_partial/_post/meta', {page: page}) %>
+
+        <article>
+            <%- page.excerpt %>
+        </article>
+    </div>
+<% }) %>
diff --git a/layout/_layout/single/content.ejs b/layout/_layout/single/content.ejs
@@ -0,0 +1,3 @@
+<div class="nexmoe-primary">
+    <%- body %>
+</div>
diff --git a/layout/_partial/header.ejs → layout/_layout/single/header.ejs b/layout/_partial/header.ejs → layout/_layout/single/header.ejs
@@ -19,7 +19,12 @@
         </a>
         <% } %>
     </div>
-    <%- partial('_partial/sidebar') %>
+    <aside id="nexmoe-sidebar">
+        <% theme.widgets.forEach(function(widget){ %>
+            <% if(widget.enable){ %>
+            <%- partial('_widget/' + widget.name, {options: widget.options}) %>
+        <% }}) %>
+    </aside>
     <div class="nexmoe-copyright">
         &copy; <%= date(new Date(), 'YYYY') %> <%= config.author || config.title %>
         <%= __('Powered by') %> <a href="http://hexo.io/" target="_blank">Hexo</a>

diff --git a/layout/_partial/copyright.ejs → layout/_partial/_post/copyright.ejs b/layout/_partial/copyright.ejs → layout/_partial/_post/copyright.ejs
diff --git a/layout/_partial/after-footer.ejs b/layout/_partial/after-footer.ejs
diff --git a/layout/_partial/head.ejs b/layout/_partial/head.ejs
@@ -0,0 +1,55 @@
+<head>
+    <%
+    var title = page.title;
+
+    if (is_archive()){
+        title = __('archive');
+
+        if (is_month()){
+            title += '：' + page.year + '/' + page.month;
+        } else if (is_year()){
+            title += '：' + page.year;
+        }
+    } else if (is_category()){
+        title = __('count.categories') + '：' + page.category;
+    } else if (is_tag()){
+        title = __('count.tags') + '：' + page.tag;
+    }
+    %>
+    <title><% if (title){ %><%= title %> - <% } %><%= config.title %></title>
+    <meta charset="UTF-8">
+    <meta name="keywords" content="<%= config.keywords %>">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=5">
+
+    <link rel="shortcut icon" href="<%= theme.favicon.href %>" type="<%= theme.favicon.type %>" />
+    <%- open_graph({twitter_id: theme.twitter, google_plus: theme.google_plus, fb_admins: theme.fb_admins, fb_app_id: theme.fb_app_id}) %>
+    <%- css([
+        'lib/fancybox/fancybox.css', 
+        'lib/mdui_043tiny/mdui.css'
+    ]) %>
+
+    <%- css_auto_version('lib/iconfont/iconfont.css') %>
+    <% if (theme.iconlib) { %>
+        <link rel="stylesheet" href="<%= theme.iconlib %>">
+    <% } %>
+    <%- css_auto_version('css/style') %>
+
+    <% if (theme.customStyles) { %>
+        <% theme.customStyles.forEach(function(custom){ %>
+            <%- css_auto_version('custom.css') %>
+        <% }) %>
+    <% } %>
+
+    <%- js([
+        { src:'lib/mdui_043tiny/mdui.js' , async: true}, 
+        { src:'lib/fancybox/fancybox.umd.js' , async: true}
+    ]) %>
+
+    <%- js_auto_version('js/app') %>
+
+    <% if (theme.copyText) { %>
+        <script>var copyTip = "<%- theme.copyText %>"</script>
+    <% } %> 
+
+    <%- theme.slotHead %>
+</head>
diff --git a/layout/_partial/paginator.ejs b/layout/_partial/paginator.ejs
@@ -6,4 +6,4 @@
             escape: false
         }) %>
     </nav>
-  <% } %>
+<% } %>
diff --git a/layout/_partial/sidebar.ejs b/layout/_partial/sidebar.ejs
diff --git a/layout/index.ejs b/layout/index.ejs
@@ -1,26 +1,4 @@
 <section class="nexmoe-posts">
-    <% page.posts.each(function (page) { %>
-    <div class="nexmoe-post">
-        <a href="<%- url_for(page.path) %>">
-            <% if (page.cover){ %>
-                <div class="nexmoe-post-cover mdui-ripple absolute" style="padding-top: <%- page.coverHeight/page.coverWidth*100 %>%;"> 
-                    <img src="<%- page.cover %>" alt="<%= page.title %>" loading="lazy">
-                    <h1><%= page.title %></h1>
-                </div>
-            <%}  else{ %>
-                <div class="nexmoe-post-cover mdui-ripple"> 
-                    <img src="<%- theme.background.path %>" alt="<%= page.title %>" loading="lazy">
-                    <h1><%= page.title %></h1>
-                </div>
-            <% } %>
-        </a>
-
-        <%- partial('_partial/_post/meta', {page: page}) %>
-
-        <article>
-            <%- page.excerpt %>
-        </article>
-    </div>
-    <% }) %>
+    <%- partial('_index/list') %>
 </section>
 <%- partial('_partial/paginator') %>
diff --git a/layout/layout.ejs b/layout/layout.ejs
@@ -2,52 +2,13 @@
 
 <html <% if (config.language) { %>lang="<%- config.language %>"<% } %>>
 
-<head>
-    <%
-    var title = page.title;
-
-    if (is_archive()){
-        title = __('archive');
-
-        if (is_month()){
-            title += '：' + page.year + '/' + page.month;
-        } else if (is_year()){
-            title += '：' + page.year;
-        }
-    } else if (is_category()){
-        title = __('count.categories') + '：' + page.category;
-    } else if (is_tag()){
-        title = __('count.tags') + '：' + page.tag;
-    }
-    %>
-    <title><% if (title){ %><%= title %> - <% } %><%= config.title %></title>
-    <meta charset="UTF-8">
-    <meta name="keywords" content="<%= config.keywords %>">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=5">
-    <%- theme.slotHead %>
-    <link rel="shortcut icon" href="<%= theme.favicon.href %>" type="<%= theme.favicon.type %>" />
-    <%- open_graph({twitter_id: theme.twitter, google_plus: theme.google_plus, fb_admins: theme.fb_admins, fb_app_id: theme.fb_app_id}) %>
-    <%- css([
-        'lib/fancybox/fancybox.css', 
-        'lib/mdui_043tiny/mdui.css'
-    ]) %>
-
-    <%- css_auto_version('lib/iconfont/iconfont.css') %>
-    <% if (theme.iconlib) { %>
-        <link rel="stylesheet" href="<%= theme.iconlib %>">
-    <% } %>
-    <%- css_auto_version('css/style') %>
-
-    <% if (theme.customStyles) { %>
-        <% theme.customStyles.forEach(function(custom){ %>
-            <%- css_auto_version('custom.css') %>
-        <% }) %>
-    <% } %>
-</head>
+<%- partial('_partial/head') %>
 
 <body class="mdui-drawer-body-left">
     <div id="nexmoe-background">
-        <div class="nexmoe-bg" style="background-image: url(<%= theme.background.path %>)"></div>
+        <div class="nexmoe-bg" 
+            <%- `style="background-image: url(${theme.background.path})"` %>
+        ></div>
         <div class="mdui-appbar mdui-shadow-0">
             <div class="mdui-toolbar">
                 <a mdui-drawer="{target: '#drawer', swipe: true}" title="menu" class="mdui-btn mdui-btn-icon mdui-ripple"><i class="mdui-icon nexmoefont icon-menu"></i></a>
@@ -58,12 +19,11 @@
         </div>
     </div>
     <div id="nexmoe-header">
-        <%- partial('_partial/header') %>
+        <%- partial('_layout/single/header') %>
     </div>
     <div id="nexmoe-content">
-        <div class="nexmoe-primary">
-            <%- body %>
-            <div class="nexmoe-post-right">
+        <%- partial('_layout/single/content') %>
+        <div class="nexmoe-post-right">
               <div class="nexmoe-fixed">
                   <div class="nexmoe-tool"> 
 
@@ -85,10 +45,10 @@
                   </div>
               </div>
             </div>
-        </div>
     </div>
     <%- partial('_partial/searchbox') %>
-    <%- partial('_partial/after-footer') %>
+
+    <%- theme.slotFooter %>
 </body>
 
 </html>
diff --git a/layout/plain.ejs b/layout/plain.ejs
diff --git a/layout/post.ejs b/layout/post.ejs
@@ -1,5 +1,4 @@
 <div class="nexmoe-post">
-
   <article>
     <% if (page.cover){ %>
         <div class="nexmoe-post-cover absolute" style="padding-top: <%- page.coverHeight/page.coverWidth*100 %>%;"> 
@@ -20,7 +19,7 @@
   </article>
 
   <% if (!page.reprint){ %>
-      <%- partial('_partial/copyright') %>
+      <%- partial('_partial/_post/copyright') %>
   <% } %>
 
   <%- partial('_partial/_post/tag') %>

diff --git a/package.json b/package.json
@@ -25,7 +25,9 @@
 	"homepage": "https://docs.nexmoe.com/",
 	"devDependencies": {
 		"cz-conventional-changelog": "3.3.0",
-		"eslint": "8.15.0"
+		"eslint": "8.15.0",
+		"eslint-config-hexo": "^5.0.0",
+		"eslint-plugin-json": "^3.1.0"
 	},
 	"dependencies": {
 		"hexo-generator-json-content": "^4.2.3"