Skip to content

Commit

Permalink
fix navbar
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ghost-chu
Ghost-chu committed Dec 18, 2024
1 parent 8f57ecd commit 930801f
Show file tree
Hide file tree
Showing 8 changed files with 59 additions and 101 deletions.
6 changes: 6 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
71 changes: 41 additions & 30 deletions src/main/resources/templates/components/common.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
63 changes: 2 additions & 61 deletions src/main/resources/templates/index.html
View file
Original file line number Diff line number Diff line change
@@ -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 正在加紧施工中。由于缺乏前端人手，目前前端仅基本功能可用，不影响后端运行和上报收集等功能。
Expand All @@ -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>
4 changes: 2 additions & 2 deletions src/main/resources/templates/modules/userapp/create.html
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/templates/modules/userapp/created.html
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/templates/modules/userapp/index.html
View file
Original file line number Diff line number Diff line change
@@ -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">
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/templates/oauth/req_github_failed.html
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/templates/user/profile.html
View file
Original file line number Diff line number Diff line change
@@ -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">
Expand Down

0 comments on commit 930801f

Please sign in to comment.