fix: 部分页面优化以及问题修复

Author: john1298308460

README.md

@@ -5,17 +5,8 @@
 基于 [LoveIt](https://github.com/dillonzq/LoveIt) Hugo 主题模版进行开发
 
 初始化设置步骤如下：
-
-- [x] 安装主题后，需要在 Halo 的管理后台（Console 端）设置，在「菜单」—「主菜单」中，依次设置四个菜单项：
-- 【菜单1】**名称**：所有文章；**类型**：自定义链接；**链接地址**：/archives；其他为默认
-- 【菜单2】**名称**：标签；**类型**：自定义链接；**链接地址**：/tags；其他为默认
-- 【菜单3】**名称**：分类；**类型**：自定义链接；**链接地址**：/categories；其他为默认
-- 【菜单4】**类型**：自定义页面；**自定义页面**：选择「关于」页面；其他为默认
-
-  上述设置完成后，提交并保存，并且重载主题配置刷新。
-
-
 - [x] 如果需要展示博客内容，需要在 Console 端添加 **文章 / 标签 / 分类**，然后将文章在设置里划分到对应的标签和分类中
+- [x] 该主题需要配合 Halo 官方的评论组件、搜索组件的插件使用
 
 注：如果主题的部分样式丢失，可在 Console 端的主题 tag 菜单底部点击保存并再次刷新主题页面查看效果
 

settings.yaml

@@ -89,18 +89,6 @@ spec:
               name: svg
               label: 自定义 svg 图标（无对应 icon 时可选）
               value:
-    - group: system
-      label: 主题参数
-      formSchema:
-        - $formkit: attachment
-          name: svgFavicon
-          label: 站点图标
-          help: "支持 png、ico、svg 格式"
-          accepts:
-            - "image/png"
-            - "image/ico"
-            - "image/svg"
-          value: /themes/theme-clear/assets/img/avatar.png
     - group: bottombar
       label: 底部
       formSchema:
@@ -116,59 +104,3 @@ spec:
           name: icp
           label: icp 备案号
           value: 123456
-    - group: about
-      label: 关于
-      formSchema:
-        - $formkit: repeater
-          name: top_desc
-          id: top_desc
-          key: top_desc
-          label: 顶部描述
-          value:
-            - desc: 这是一段描述1
-            - desc: 这是一段描述2
-          children:
-            - $formkit: text
-              name: desc
-              label: 顶部描述内容
-              value:
-        - $formkit: repeater
-          name: content
-          label: 内容描述
-          value:
-            - h2_desc: 这是一段描述1
-              items:
-                - desc: 描述1下子列表1
-                - desc: 描述1下子列表2
-                - desc: 描述1下子列表3
-            - h2_desc: 这是一段描述2
-              items:
-                - desc: 描述2下子列表2
-                - desc: 描述2下子列表2
-                - desc: 描述2下子列表2
-          children:
-            - $formkit: text
-              name: h2_desc
-              label: h2 标题描述
-              value:
-            - $formkit: repeater
-              name: items
-              label: 描述下子列表
-              value: [ ]
-              children:
-                - $formkit: text
-                  name: desc
-                  label: 列表单行描述
-                  value: ""
-        - $formkit: text
-          name: themeName
-          label: 主题名称
-          value: Clear
-        - $formkit: attachment
-          name: themeImg
-          label: 主题预览图
-          value: /themes/theme-clear/assets/img/Apple-Devices-Preview.png
-        - $formkit: text
-          name: imgDesc
-          label: 主题预览图描述
-          value: Halo 主题 Clear

templates/about.html

@@ -1,18 +1,6 @@
 <footer class=footer>
   <div class=footer-container>
-    <div class=footer-line>
-      由
-      <a href=https://halo.run/ target=_blank rel="noopener noreffer" title="Halo 2.11.0">
-        Halo
-      </a>
-      强力驱动 | 来源主题 -
-      <a href=https://github.com/dillonzq/LoveIt target=_blank rel="noopener noreffer"
-         title="LoveIt 0.2.11">
-        <i class="far fa-kiss-wink-heart fa-fw" aria-hidden=true>
-        </i>
-        LoveIt
-      </a>
-    </div>
+
     <div class=footer-line itemscope itemtype=http://schema.org/CreativeWork>
       <i class="far fa-copyright fa-fw" aria-hidden=true>
       </i>
@@ -34,5 +22,15 @@
       <span class="icp-splitter">&nbsp;|&nbsp;</span><br class="icp-br"/>ICP 备
       <span class="icp" th:text="${theme.config.bottombar.icp}"></span> 号
     </div>
+    <div class=footer-line>
+      Powered By
+      <a href=https://halo.run/ target=_blank rel="noopener noreffer" title="Halo 2.11.0">
+        Halo
+      </a>
+    </div>
+
+    <footer>
+      <halo:footer/>
+    </footer>
   </div>
 </footer>

templates/assets/js/beacon.min.js

@@ -1,27 +1,16 @@
-<th:block th:if="${theme.config.system.svgFavicon != ''}">
-  <link rel="icon" th:href="@{${theme.config.system.svgFavicon}}">
-</th:block>
-<th:block th:if="${theme.config.system.svgFavicon == ''}">
-  <link rel="shortcut icon" type="image/x-icon" th:href="@{/assets/img/favicon.ico}"/>
-  <link rel="icon" type="image/png" sizes="32x32" th:href="@{/assets/img/favicon-32x32.png}">
-  <link rel="icon" type="image/png" sizes="16x16" th:href="@{/assets/img/favicon-16x16.png}">
-  <link rel="apple-touch-icon" sizes="180x180" th:href="@{/assets/img/apple-touch-icon.png}">
-</th:block>
-
 <link rel=mask-icon th:href="@{/assets/img/safari-pinned-tab.svg}" color=#5bbad5>
 <link rel=manifest th:href="@{/assets/img/site.webmanifest}">
-<link rel=canonical href=https://hugoloveit.com/zh-cn/>
 <link rel=stylesheet th:href="@{/assets/css/style.min.css}">
 
-<link rel=preload href=https://cdn.jsdelivr.net/npm/@fortawesome/[email protected]/css/all.min.css as=style
+<link rel=preload th:href="@{/assets/css/all.min.css}" as=style
       onload='this.onload=null; this.rel="stylesheet"'>
 <noscript>
-  <link rel=stylesheet href=https://cdn.jsdelivr.net/npm/@fortawesome/[email protected]/css/all.min.css>
+  <link rel=stylesheet th:href="@{/assets/css/all.min.css}">
 </noscript>
-<link rel=preload href=https://cdn.jsdelivr.net/npm/animate.css@4.1.1/animate.min.css as=style
+<link rel=preload th:href="@{/assets/css/animate.min.css}" as=style
       onload='this.onload=null; this.rel="stylesheet"'>
 <noscript>
-  <link rel=stylesheet href=https://cdn.jsdelivr.net/npm/animate.css@4.1.1/animate.min.css>
+  <link rel=stylesheet th:href="@{/assets/css/animate.min.css}">
 </noscript>
 
 <link rel=stylesheet th:href="@{/assets/css/cookieconsent.min.css}">

templates/assets/webfonts/fa-brands-400.ttf

@@ -1,13 +1,12 @@
 <!DOCTYPE html>
 <html lang="en" th:fragment="html (content)" xmlns:th="https://www.thymeleaf.org">
   <head>
-    <meta charset="UTF-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta charset="UTF-8"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
     <title th:text="${site.title}"></title>
-    <th:block th:replace="~{modules/head/meta.html}" />
-    <th:block th:replace="~{modules/head/link.html}" />
-    <th:block th:replace="~{modules/head/seo.html}" />
+    <th:block th:replace="~{modules/head/meta.html}"/>
+    <th:block th:replace="~{modules/head/link.html}"/>
   </head>
   <body data-header-desktop=fixed data-header-mobile=auto>
     <script type="text/javascript">
@@ -42,10 +41,7 @@
     <script type=text/javascript th:src="@{/assets/js/clipboard.min.js}"></script>
     <script type=text/javascript th:src="@{/assets/js/sharer.min.js}"></script>
     <script type=text/javascript th:src="@{/assets/js/index.umd.js}"></script>
-    <script defer
-            src="https://static.cloudflareinsights.com/beacon.min.js/v84a3a4012de94ce1a686ba8c167c359c1696973893317"
-            crossorigin="anonymous">
-    </script>
+    <script defer th:src="@{/assets/js/beacon.min.js}" crossorigin="anonymous"></script>
     <script type=text/javascript th:src="@{/assets/js/theme.min.js}"></script>
   </body>
 </html>

templates/assets/webfonts/fa-brands-400.woff2

@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html xmlns:th="https://www.thymeleaf.org" xmlns:halo="http://java.sun.com/xml/ns/javaee"
+      th:replace="~{modules/layout :: html(title = ${singlePage.spec.title} + ' - ' + ${site.title}, content = ~{::content})}"
+>
+<th:block th:fragment="content">
+
+  <div class="page single special">
+    <h1 class="single-title animate__animated animate__pulse animate__faster">
+      <th:block th:text="${singlePage.spec.title}"></th:block>
+    </h1>
+    <div class=content id=content>
+      <figure th:if="${not #strings.isEmpty(singlePage.spec.cover)}">
+        <img class=lazyload th:src="${singlePage.spec.cover}"
+             data-sizes=auto th:alt="${singlePage.spec.cover}" width=3200 height=2048>
+      </figure>
+      <article>
+        <div th:utext="${singlePage.content.content}"></div>
+      </article>
+    </div>
+    <!-- 后续做评论组件 -->
+    <div id=comments class=comment>
+      <halo:comment
+        group="content.halo.run"
+        kind="SinglePage"
+        th:attr="name=${singlePage.metadata.name}"
+        colorScheme="'light'"
+      />
+    </div>
+  </div>
+
+</th:block>
+</html>
+
+<script type=text/javascript>
+  window.config = {
+    data: {},
+  }
+</script>

templates/assets/webfonts/fa-regular-400.ttf

@@ -7,17 +7,17 @@ spec:
   author:
     name: Halo
     website: https://www.halo.run
-  description: A development starter theme with Vite Ecosystem for Halo
+  description: A simple, elegant and efficient Halo theme
   logo: https://www.halo.run/logo
   website: https://github.com/f2ccloud/theme-clear
   repo: https://github.com/f2ccloud/theme-clear.git
   settingName: "theme-clear-setting"
   configMapName: "theme-clear-configMap"
   version: 1.0.0
   require: ">=2.0.0"
-  customTemplates:
-    page:
-      - name: 关于
-        description: 关于
-        screenshot:
-        file: about.html
+#  customTemplates:
+#    page:
+#      - name: 关于
+#        description: 关于
+#        screenshot:
+#        file: about.html