From 53a4c92176ca4fd00c1b943ed23de91c55b4b4e0 Mon Sep 17 00:00:00 2001 From: ryan Date: Sun, 7 Jun 2026 23:39:25 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=95=8C=E9=9D=A2=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/app/(main)/admin/settings/page.tsx | 8 + frontend/app/(main)/settings/page.tsx | 30 +- .../app/(main)/settings/security/page.tsx | 4 +- .../common/admin/task-executions.tsx | 5 +- frontend/components/common/admin/tasks.tsx | 3 - frontend/components/common/home/home-main.tsx | 32 +- frontend/components/common/settings/files.tsx | 31 +- .../components/common/settings/security.tsx | 361 +++++++++--------- frontend/components/home/footer-section.tsx | 6 +- frontend/components/layout/sidebar.tsx | 32 +- frontend/lib/utils/search-data.ts | 17 +- 11 files changed, 217 insertions(+), 312 deletions(-) create mode 100644 frontend/app/(main)/admin/settings/page.tsx diff --git a/frontend/app/(main)/admin/settings/page.tsx b/frontend/app/(main)/admin/settings/page.tsx new file mode 100644 index 00000000..481bd97d --- /dev/null +++ b/frontend/app/(main)/admin/settings/page.tsx @@ -0,0 +1,8 @@ +"use client" + +import {SecurityMain} from "@/components/common/settings/security" + +/* 系统设置页面 */ +export default function AdminSettingsPage() { + return +} diff --git a/frontend/app/(main)/settings/page.tsx b/frontend/app/(main)/settings/page.tsx index 2e7353ce..04113036 100644 --- a/frontend/app/(main)/settings/page.tsx +++ b/frontend/app/(main)/settings/page.tsx @@ -2,8 +2,7 @@ import Link from "next/link" import {Card, CardContent, CardDescription, CardTitle} from "@/components/ui/card" -import {Bell, Key, Loader2, Palette, Shield, UserRound} from "lucide-react" -import {useAuth} from "@/components/providers/auth-provider" +import {Bell, Key, Palette, UserRound} from "lucide-react" /* 设置项 */ const settingsItems = [ @@ -28,13 +27,6 @@ const settingsItems = [ href: "/settings/notifications", category: "账户设置", }, - { - title: "安全设置", - description: "管理您的账户安全", - icon: Shield, - href: "/settings/security", - category: "账户设置", - }, { title: "外观设置", description: "自定义界面主题 and 显示", @@ -45,25 +37,7 @@ const settingsItems = [ ] export default function SettingsPage() { - const { user, loading } = useAuth() - - if (loading) { - return ( -
- -
- ) - } - - // 非管理员过滤掉安全设置 - const filteredItems = settingsItems.filter((item) => { - if (item.href === "/settings/security") { - return !!user?.is_admin - } - return true - }) - - const groupedSettings = filteredItems.reduce((acc, item) => { + const groupedSettings = settingsItems.reduce((acc, item) => { if (!acc[item.category]) { acc[item.category] = [] } diff --git a/frontend/app/(main)/settings/security/page.tsx b/frontend/app/(main)/settings/security/page.tsx index 7df792b8..32a0047b 100644 --- a/frontend/app/(main)/settings/security/page.tsx +++ b/frontend/app/(main)/settings/security/page.tsx @@ -1,5 +1,5 @@ -import { SecurityMain } from "@/components/common/settings/security" +import {redirect} from "next/navigation" export default function SecurityPage() { - return + redirect("/admin/settings") } diff --git a/frontend/components/common/admin/task-executions.tsx b/frontend/components/common/admin/task-executions.tsx index 0656e982..a7e5597e 100644 --- a/frontend/components/common/admin/task-executions.tsx +++ b/frontend/components/common/admin/task-executions.tsx @@ -4,7 +4,7 @@ import {useCallback, useEffect, useState} from "react" import Link from "next/link" import {toast} from "sonner" import {format} from "date-fns" -import {Activity, ChevronLeft, ChevronRight, Layers, RefreshCw, RotateCcw} from "lucide-react" +import {Activity, ChevronLeft, ChevronRight, RefreshCw, RotateCcw} from "lucide-react" import {AdminService, TaskExecution, TaskExecutionStatus, TaskMeta} from "@/lib/services" import {ErrorInline} from "@/components/layout/error" @@ -160,8 +160,7 @@ export function TaskExecutionsManager() {