From 930801f1cad1f7ed53f19f366a3e7acfcb71630a Mon Sep 17 00:00:00 2001
From: Ghost_chu <ghostchu@111.com>
Date: Thu, 19 Dec 2024 04:58:33 +0800
Subject: [PATCH] fix navbar

---
 pom.xml                                       |  6 ++
 .../templates/components/common.html          | 71 +++++++++++--------
 src/main/resources/templates/index.html       | 63 +---------------
 .../templates/modules/userapp/create.html     |  4 +-
 .../templates/modules/userapp/created.html    |  4 +-
 .../templates/modules/userapp/index.html      |  4 +-
 .../templates/oauth/req_github_failed.html    |  4 +-
 .../resources/templates/user/profile.html     |  4 +-
 8 files changed, 59 insertions(+), 101 deletions(-)

diff --git a/pom.xml b/pom.xml
index f553b42..d87e283 100644
--- a/pom.xml
+++ b/pom.xml
@@ -274,6 +274,12 @@
             <artifactId>protobuf-java-util</artifactId>
             <version>4.29.1</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.thymeleaf.extras/thymeleaf-extras-java8time -->
+        <dependency>
+            <groupId>org.thymeleaf.extras</groupId>
+            <artifactId>thymeleaf-extras-java8time</artifactId>
+            <version>3.0.4.RELEASE</version>
+        </dependency>
     </dependencies>
     <dependencyManagement>
         <dependencies>
diff --git a/src/main/resources/templates/components/common.html b/src/main/resources/templates/components/common.html
index 8f67336..71ad9f3 100644
--- a/src/main/resources/templates/components/common.html
+++ b/src/main/resources/templates/components/common.html
@@ -11,37 +11,48 @@
 </head>
 
 <nav th:fragment="navbar" class="navbar navbar-expand-lg bg-body-tertiary">
-<div class="container-fluid">
-    <a class="navbar-brand" href="#">Sparkle</a>
-    <button class="navbar-toggler" type="button"
-            data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent"
-            aria-controls="navbarSupportedContent" aria-expanded="false"
-            aria-label="切换导航栏">
-        <span class="navbar-toggler-icon"></span>
-    </button>
-    <div class="collapse navbar-collapse" id="navbarSupportedContent">
-        <ul class="navbar-nav me-auto mb-2 mb-lg-0">
-            <li class="nav-item">
-                <a class="nav-link" th:href="@{/}">首页</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" th:href="@{/userapp/}">用户应用程序</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link disabled" aria-disabled="true" href="#">封禁记录</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link disabled" aria-disabled="true" href="#">提交记录</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link disabled" aria-disabled="true" href="#">特征发现</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link disabled" aria-disabled="true">Tracker</a>
-            </li>
-        </ul>
+    <div class="container-fluid">
+        <a class="navbar-brand" href="#">Sparkle</a>
+        <button class="navbar-toggler" type="button"
+                data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent"
+                aria-controls="navbarSupportedContent" aria-expanded="false"
+                aria-label="切换导航栏">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+        <div class="collapse navbar-collapse" id="navbarSupportedContent">
+            <ul class="navbar-nav me-auto mb-2 mb-lg-0">
+                <li class="nav-item">
+                    <a class="nav-link" th:href="@{/}">首页</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" th:href="@{/userapp/}">用户应用程序</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link disabled" aria-disabled="true" href="#">封禁记录</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link disabled" aria-disabled="true" href="#">提交记录</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link disabled" aria-disabled="true">特征发现</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link disabled" aria-disabled="true">Tracker</a>
+                </li>
+            </ul>
+            <!-- 添加头像和昵称 -->
+            <ul class="navbar-nav ms-auto">
+                <li class="nav-item d-flex align-items-center">
+                    <a class="nav-link" th:href="@{/user/profile}">
+                        <!--/*@thymesVar id="user" type="com.ghostchu.btn.sparkle.module.user.UserDto"*/-->
+                        <img th:src="${user.getAvatar()}" alt="头像" class="rounded-circle"
+                             style="width: 32px; height: 32px; object-fit: cover; margin-right: 8px;">
+                        <span th:text="${user.getNickname()}">昵称</span>
+                    </a>
+                </li>
+            </ul>
+        </div>
     </div>
-</div>
 </nav>
 <div th:fragment="footer">
 <p style="text-align: center; color: gray; font-size: 10px">这是一个页脚，以后也许能放点东西</p>
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index e3780da..79731c1 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
-<div th:insert="~{components/common::header}"></div>
+<div th:replace="~{components/common::header}"></div>
 <body>
-<div th:insert="~{components/common::navbar}"></div>
+<div th:replace="~{components/common::navbar}"></div>
 
 <div class="alert alert-warning" role="alert">
     <b><i class="fa-solid fa-road-barrier"></i> 改版装修中</b> BTN 2.0 正在加紧施工中。由于缺乏前端人手，目前前端仅基本功能可用，不影响后端运行和上报收集等功能。
@@ -20,65 +20,6 @@ <h1 class="display-4">Sparkle - BTN Instance</h1>
     <p>连接到 BTN 网络，共享威胁情报，获取云端规则。</p>
     <a class="btn btn-primary btn-lg" th:href="@{/userapp/}" role="button">创建用户应用程序</a>
 </div>
-<!--<div class="container" style="margin: 10px auto; text-align: center">-->
-<!--    <p class="h1">BTN 网络数据</p>-->
-<!--</div>-->
-<!--<div class="container">-->
-<!--    <div class="row">-->
-<!--        <div class="col-sm">-->
-<!--            <p class="h2">封禁统计</p>-->
-<!--            <p>网络上的客户端共封禁 <span th:text="${btnMetrics.allTimeBans()}">123</span> 次 Peers。</p>-->
-<!--            <p>最近 <span th:text="${btnMetrics.rangeInterval()}">14</span> 天，共封禁 <span-->
-<!--                    th:text="${btnMetrics.rangeBans()}">456</span>-->
-<!--                次 Peers。</p>-->
-<!--        </div>-->
-<!--        <div class="col-sm">-->
-<!--            <p class="h2">提交数据</p>-->
-<!--            <p>网络上的客户端共提交 <span th:text="${btnMetrics.allTimeSubmits()}">123</span> 个 Peers。</p>-->
-<!--            <p>最近 <span th:text="${btnMetrics.rangeInterval()}">14</span> 天，共提交 <span-->
-<!--                    th:text="${btnMetrics.rangeSubmits()}">456</span> 个 Peers。</p>-->
-<!--        </div>-->
-<!--        <div class="col-sm">-->
-<!--            <p class="h2">特征发现</p>-->
-<!--            <p>共发现 <span th:text="${btnMetrics.allTimeClientDiscovery()}">123</span> 个不同客户端特征。</p>-->
-<!--            <p>最近 <span th:text="${btnMetrics.rangeInterval()}">14</span> 天，共发现<span-->
-<!--                    th:text="${btnMetrics.rangeClientDiscovery()}">456</span> 个不同客户端特征。</p>-->
-<!--        </div>-->
-<!--    </div>-->
-<!--</div>-->
-<!--<div class="container" style="margin: 10px auto; text-align: center">-->
-<!--    <p class="h1">公共 Tracker 服务</p>-->
-<!--</div>-->
-<!--<div class="container">-->
-<!--    <div class="row">-->
-<!--        <div class="col-sm">-->
-<!--            <p class="h2">追踪 Torrents</p>-->
-<!--            <p th:text="${trackerMetrics.torrents()}"></p>-->
-<!--        </div>-->
-<!--        <div class="col-sm">-->
-<!--            <p class="h2">当前在线</p>-->
-<!--            <p th:text="${trackerMetrics.peers()}"></p>-->
-<!--        </div>-->
-<!--        <div class="col-sm">-->
-<!--            <p class="h2">做种中</p>-->
-<!--            <p th:text="${trackerMetrics.seeders()}"></p>-->
-<!--        </div>-->
-<!--        <div class="col-sm">-->
-<!--            <p class="h2">下载中</p>-->
-<!--            <p th:text="${trackerMetrics.leechers()}"></p>-->
-<!--        </div>-->
-<!--    </div>-->
-<!--    <div class="row">-->
-<!--        <div class="col-sm">-->
-<!--            <p class="h2">有上传的 Peers 数量</p>-->
-<!--            <p th:text="${trackerMetrics.haveUploadPeers()}"></p>-->
-<!--        </div>-->
-<!--        <div class="col-sm">-->
-<!--            <p class="h2">无上传的 Peers 数量</p>-->
-<!--            <p th:text="${trackerMetrics.noUploadPeers()}"></p>-->
-<!--        </div>-->
-<!--    </div>-->
-<!--</div>-->
 <div th:replace="~{components/common::footer}"></div>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/userapp/create.html b/src/main/resources/templates/modules/userapp/create.html
index b36285c..dfbc8da 100644
--- a/src/main/resources/templates/modules/userapp/create.html
+++ b/src/main/resources/templates/modules/userapp/create.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
-<div th:insert="~{components/common::header}"></div>
+<div th:replace="~{components/common::header}"></div>
 <body>
-<div th:insert="~{components/common::navbar}"></div>
+<div th:replace="~{components/common::navbar}"></div>
 
 <div class="container">
     <h1>创建新的用户应用程序</h1>
diff --git a/src/main/resources/templates/modules/userapp/created.html b/src/main/resources/templates/modules/userapp/created.html
index 33dc237..9509ea1 100644
--- a/src/main/resources/templates/modules/userapp/created.html
+++ b/src/main/resources/templates/modules/userapp/created.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
-<div th:insert="~{components/common::header}"></div>
+<div th:replace="~{components/common::header}"></div>
 <body>
-<div th:insert="~{components/common::navbar}"></div>
+<div th:replace="~{components/common::navbar}"></div>
 <div class="container">
     <h1>用户应用程序创建成功</h1>
     <p>请妥善保存下面的凭据信息，这些信息只会显示一次！</p>
diff --git a/src/main/resources/templates/modules/userapp/index.html b/src/main/resources/templates/modules/userapp/index.html
index 346ea7e..93a7d60 100644
--- a/src/main/resources/templates/modules/userapp/index.html
+++ b/src/main/resources/templates/modules/userapp/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
-<div th:insert="~{components/common::header}"></div>
+<div th:replace="~{components/common::header}"></div>
 <body>
-<div th:insert="~{components/common::navbar}"></div>
+<div th:replace="~{components/common::navbar}"></div>
 
 
 <div class="container">
diff --git a/src/main/resources/templates/oauth/req_github_failed.html b/src/main/resources/templates/oauth/req_github_failed.html
index 3eb817b..856f69f 100644
--- a/src/main/resources/templates/oauth/req_github_failed.html
+++ b/src/main/resources/templates/oauth/req_github_failed.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
-<div th:insert="~{components/common::header}"></div>
+<div th:replace="~{components/common::header}"></div>
 <body>
-<div th:insert="~{components/common::navbar}"></div>
+<div th:replace="~{components/common::navbar}"></div>
 
 <div class="container">
     <h1>Github OAuth 登录过程失败</h1>
diff --git a/src/main/resources/templates/user/profile.html b/src/main/resources/templates/user/profile.html
index 1be8ba3..666374d 100644
--- a/src/main/resources/templates/user/profile.html
+++ b/src/main/resources/templates/user/profile.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
-<div th:insert="~{components/common::header}"></div>
+<div th:replace="~{components/common::header}"></div>
 <body>
-<div th:insert="~{components/common::navbar}"></div>
+<div th:replace="~{components/common::navbar}"></div>
 
 
 <div class="container">