From a0d78d19a700df152dd835eea7e79f6e9370b24b Mon Sep 17 00:00:00 2001
From: deatil <2217957370@qq.com>
Date: Mon, 3 Jun 2024 23:52:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/admin/art.go                   |  2 +-
 app/controller/admin/attach.go                |  2 +-
 app/controller/admin/cate.go                  |  2 +-
 app/controller/admin/page.go                  |  2 +-
 app/controller/admin/tag.go                   |  4 +--
 app/controller/admin/user.go                  |  2 +-
 pkg/page/page.go                              | 15 ++++++++---
 resources/views/admin/art/index.jet.html      |  1 +
 resources/views/admin/attach/index.jet.html   |  1 +
 resources/views/admin/cate/index.jet.html     |  1 +
 resources/views/admin/common/sidebar.jet.html | 26 ++++++++++++++++---
 resources/views/admin/common/topnav.jet.html  |  9 ++-----
 resources/views/admin/page/index.jet.html     |  1 +
 resources/views/admin/setting/index.jet.html  |  4 ++-
 resources/views/admin/tag/index.jet.html      |  1 +
 resources/views/admin/user/add.jet.html       |  4 ++-
 resources/views/admin/user/edit.jet.html      |  4 ++-
 resources/views/admin/user/index.jet.html     |  7 +++--
 18 files changed, 62 insertions(+), 26 deletions(-)

diff --git a/app/controller/admin/art.go b/app/controller/admin/art.go
index 93b2f42..426063b 100644
--- a/app/controller/admin/art.go
+++ b/app/controller/admin/art.go
@@ -136,7 +136,7 @@ func (this *Art) Index(ctx *fiber.Ctx) error {
     // url 链接信息
     uri := ctx.Request().URI()
     parameters, _ := url.ParseQuery(uri.QueryArgs().String())
-    pageHtml := page.New().
+    pageHtml := page.
         Paginate(listRows, int(total), string(uri.Path()), parameters).
         PageHtml
 
diff --git a/app/controller/admin/attach.go b/app/controller/admin/attach.go
index 0562287..6970bdb 100644
--- a/app/controller/admin/attach.go
+++ b/app/controller/admin/attach.go
@@ -67,7 +67,7 @@ func (this *Attach) Index(ctx *fiber.Ctx) error {
     // url 链接信息
     uri := ctx.Request().URI()
     parameters, _ := gourl.ParseQuery(uri.QueryArgs().String())
-    pageHtml := page.New().
+    pageHtml := page.
         Paginate(listRows, int(total), string(uri.Path()), parameters).
         PageHtml
 
diff --git a/app/controller/admin/cate.go b/app/controller/admin/cate.go
index 78fae0e..9637c25 100644
--- a/app/controller/admin/cate.go
+++ b/app/controller/admin/cate.go
@@ -68,7 +68,7 @@ func (this *Cate) Index(ctx *fiber.Ctx) error {
     // url 链接信息
     uri := ctx.Request().URI()
     parameters, _ := url.ParseQuery(uri.QueryArgs().String())
-    pageHtml := page.New().
+    pageHtml := page.
         Paginate(listRows, int(total), string(uri.Path()), parameters).
         PageHtml
 
diff --git a/app/controller/admin/page.go b/app/controller/admin/page.go
index 067f3ef..9595a41 100644
--- a/app/controller/admin/page.go
+++ b/app/controller/admin/page.go
@@ -73,7 +73,7 @@ func (this *Page) Index(ctx *fiber.Ctx) error {
     // url 链接信息
     uri := ctx.Request().URI()
     parameters, _ := url.ParseQuery(uri.QueryArgs().String())
-    pageHtml := page.New().
+    pageHtml := page.
         Paginate(listRows, int(total), string(uri.Path()), parameters).
         PageHtml
 
diff --git a/app/controller/admin/tag.go b/app/controller/admin/tag.go
index 86186f7..837a7ed 100644
--- a/app/controller/admin/tag.go
+++ b/app/controller/admin/tag.go
@@ -34,7 +34,7 @@ func (this *Tag) Index(ctx *fiber.Ctx) error {
     }
 
     // 每页数量
-    listRows := 5
+    listRows := 10
     start := (currentPage - 1) * listRows
 
     // 搜索关键字
@@ -68,7 +68,7 @@ func (this *Tag) Index(ctx *fiber.Ctx) error {
     // url 链接信息
     uri := ctx.Request().URI()
     parameters, _ := url.ParseQuery(uri.QueryArgs().String())
-    pageHtml := page.New().
+    pageHtml := page.
         Paginate(listRows, int(total), string(uri.Path()), parameters).
         PageHtml
 
diff --git a/app/controller/admin/user.go b/app/controller/admin/user.go
index 2af927b..3dfb5af 100644
--- a/app/controller/admin/user.go
+++ b/app/controller/admin/user.go
@@ -69,7 +69,7 @@ func (this *User) Index(ctx *fiber.Ctx) error {
     // url 链接信息
     uri := ctx.Request().URI()
     parameters, _ := url.ParseQuery(uri.QueryArgs().String())
-    pageHtml := page.New().
+    pageHtml := page.
         Paginate(listRows, int(total), string(uri.Path()), parameters).
         PageHtml
 
diff --git a/pkg/page/page.go b/pkg/page/page.go
index af5861e..874e282 100644
--- a/pkg/page/page.go
+++ b/pkg/page/page.go
@@ -8,9 +8,13 @@ import (
     "net/url"
 )
 
-// 构造函数
-func New() *Pagination {
-    return &Pagination{}
+func Paginate(
+    listRows int,
+    total int,
+    urlPath string,
+    parameters url.Values,
+) *Pagination {
+    return New().Paginate(listRows, total, urlPath, parameters)
 }
 
 // 分页
@@ -35,6 +39,11 @@ type Pagination struct {
     PageHtml string
 }
 
+// 构造函数
+func New() *Pagination {
+    return &Pagination{}
+}
+
 // 每页数量
 // listRows 每页数量
 // total    总数量,
diff --git a/resources/views/admin/art/index.jet.html b/resources/views/admin/art/index.jet.html
index 6fcbf3c..f0ad9ec 100644
--- a/resources/views/admin/art/index.jet.html
+++ b/resources/views/admin/art/index.jet.html
@@ -266,6 +266,7 @@ <h6 class="mb-4">
         var url = $(this).data('url');
         
         layer.confirm('您确定要删除该文章吗？', {
+            title: '提示',
             offset: 'c',
             btn: ['确定', '取消']
         }, function(index){
diff --git a/resources/views/admin/attach/index.jet.html b/resources/views/admin/attach/index.jet.html
index 2ff3c62..727e005 100644
--- a/resources/views/admin/attach/index.jet.html
+++ b/resources/views/admin/attach/index.jet.html
@@ -188,6 +188,7 @@ <h6 class="mb-4">
         var url = $(this).data('url');
         
         layer.confirm('您确定要删除该附件吗？', {
+            title: '提示',
             offset: 'c',
             btn: ['确定', '取消']
         }, function(index){
diff --git a/resources/views/admin/cate/index.jet.html b/resources/views/admin/cate/index.jet.html
index 04d3cd6..f6b1330 100644
--- a/resources/views/admin/cate/index.jet.html
+++ b/resources/views/admin/cate/index.jet.html
@@ -168,6 +168,7 @@ <h6 class="mb-4">
         var url = $(this).data('url');
         
         layer.confirm('您确定要删除该分类吗？', {
+            title: '提示',
             offset: 'c',
             btn: ['确定', '取消']
         }, function(index){
diff --git a/resources/views/admin/common/sidebar.jet.html b/resources/views/admin/common/sidebar.jet.html
index b48450b..c1c3302 100644
--- a/resources/views/admin/common/sidebar.jet.html
+++ b/resources/views/admin/common/sidebar.jet.html
@@ -28,14 +28,32 @@ <h3 class="text-primary">DoakCMS</h3>
                 <i class="fa fa-pager me-2"></i>
                 单页管理
             </a>
-            <a href='{{ adminUrl("user") }}' class="nav-item nav-link sidebar-user-index">
-                <i class="fa fa-user me-2"></i>
-                账号管理
-            </a>
             <a href='{{ adminUrl("attach") }}' class="nav-item nav-link sidebar-attach-index">
                 <i class="fa fa-file me-2"></i>
                 附件管理
             </a>
+            
+            <div class="nav-item dropdown">
+                <a href="#" class="nav-link dropdown-toggle sidebar-system" 
+                    data-bs-toggle="dropdown" 
+                    aria-expanded="true"
+                >
+                    <i class="fa fa-cog me-2"></i>
+                    系统设置
+                </a>
+                <div class="dropdown-menu bg-transparent border-0 sidebar-system-menu" 
+                    data-bs-popper="none"
+                >
+                    <a href='{{ adminUrl("user") }}' class="dropdown-item sidebar-system-user">
+                        <i class="fa fa-user me-2"></i>
+                        账号管理
+                    </a>
+                    <a href='{{ adminUrl("setting") }}' class="dropdown-item sidebar-system-setting">
+                        <i class="fa fa-cog me-1"></i>
+                        网站设置
+                    </a>
+                </div>
+            </div>
             {{end}}
         
         </div>
diff --git a/resources/views/admin/common/topnav.jet.html b/resources/views/admin/common/topnav.jet.html
index 72dbc25..3bfb26e 100644
--- a/resources/views/admin/common/topnav.jet.html
+++ b/resources/views/admin/common/topnav.jet.html
@@ -31,15 +31,10 @@ <h2 class="text-primary mb-0"><i class="fa fa-hashtag"></i></h2>
                     我的信息
                 </a>
                 <a href='{{ adminUrl("profile/password") }}' class="dropdown-item">
-                    <i class="fa fa-star me-1"></i>
+                    <i class="fa fa-star me-0"></i>
                     更改密码
                 </a>
-                {{if isAdmin}}
-                <a href='{{ adminUrl("setting") }}' class="dropdown-item">
-                    <i class="fa fa-cog me-1"></i>
-                    网站设置
-                </a>
-                {{end}}
+
                 <a href="javascript:;" 
                     class="dropdown-item js-logout-btn"
                     data-url='{{ adminUrl("logout") }}'
diff --git a/resources/views/admin/page/index.jet.html b/resources/views/admin/page/index.jet.html
index 8a99c28..6c00462 100644
--- a/resources/views/admin/page/index.jet.html
+++ b/resources/views/admin/page/index.jet.html
@@ -172,6 +172,7 @@ <h6 class="mb-4">
         var url = $(this).data('url');
         
         layer.confirm('您确定要删除该单页吗？', {
+            title: '提示',
             offset: 'c',
             btn: ['确定', '取消']
         }, function(index){
diff --git a/resources/views/admin/setting/index.jet.html b/resources/views/admin/setting/index.jet.html
index d77bc3a..b9df66d 100644
--- a/resources/views/admin/setting/index.jet.html
+++ b/resources/views/admin/setting/index.jet.html
@@ -172,7 +172,9 @@ <h6 class="mb-4">网站设置</h6>
 (function($) {
     "use strict";
     
-    $(".sidebar-doak-index").addClass("active");
+    $(".sidebar-system").addClass("active show");
+    $(".sidebar-system-menu").addClass("show");
+    $(".sidebar-system-setting").addClass("active");
     
     // 保存
     $(".js-save-button").click(function(e) {
diff --git a/resources/views/admin/tag/index.jet.html b/resources/views/admin/tag/index.jet.html
index 69c5d92..f4e24f0 100644
--- a/resources/views/admin/tag/index.jet.html
+++ b/resources/views/admin/tag/index.jet.html
@@ -172,6 +172,7 @@ <h6 class="mb-4">
         var url = $(this).data('url');
         
         layer.confirm('您确定要删除该标签吗？', {
+            title: '提示',
             offset: 'c',
             btn: ['确定', '取消']
         }, function(index){
diff --git a/resources/views/admin/user/add.jet.html b/resources/views/admin/user/add.jet.html
index 9fc8fcb..cb392c9 100644
--- a/resources/views/admin/user/add.jet.html
+++ b/resources/views/admin/user/add.jet.html
@@ -71,7 +71,9 @@ <h6 class="mb-4">
 (function($) {
     "use strict";
     
-    $(".sidebar-user-index").addClass("active");
+    $(".sidebar-system").addClass("active show");
+    $(".sidebar-system-menu").addClass("show");
+    $(".sidebar-system-user").addClass("active");
     
     // 保存
     $(".js-save-button").click(function(e) {
diff --git a/resources/views/admin/user/edit.jet.html b/resources/views/admin/user/edit.jet.html
index 765da38..64a5c90 100644
--- a/resources/views/admin/user/edit.jet.html
+++ b/resources/views/admin/user/edit.jet.html
@@ -134,7 +134,9 @@ <h6 class="mb-4">
 (function($) {
     "use strict";
     
-    $(".sidebar-user-index").addClass("active");
+    $(".sidebar-system").addClass("active show");
+    $(".sidebar-system-menu").addClass("show");
+    $(".sidebar-system-user").addClass("active");
     
     // 保存
     $(".js-save-button").click(function(e) {
diff --git a/resources/views/admin/user/index.jet.html b/resources/views/admin/user/index.jet.html
index 8f97766..a63f265 100644
--- a/resources/views/admin/user/index.jet.html
+++ b/resources/views/admin/user/index.jet.html
@@ -157,13 +157,16 @@ <h6 class="mb-4">
 (function($) {
     "use strict";
     
-    $(".sidebar-user-index").addClass("active");
-    
+    $(".sidebar-system").addClass("active show");
+    $(".sidebar-system-menu").addClass("show");
+    $(".sidebar-system-user").addClass("active");
+
     // 删除
     $('.js-delete-btn').click(function() {
         var url = $(this).data('url');
         
         layer.confirm('您确定要删除该账号吗？', {
+            title: '提示',
             offset: 'c',
             btn: ['确定', '取消']
         }, function(index){