From 17c065ae79e911843b37a47ae9c55808a57546be Mon Sep 17 00:00:00 2001
From: tone <3341154833@qq.com>
Date: Sat, 10 May 2025 19:13:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=A1=B9=E7=9B=AE=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=E6=90=AD=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{page.tsx => (with-menu)/layout.tsx}      |  31 ++--
 .../app/console/(with-menu)/page.tsx          |   3 +
 .../app/console/(with-menu)/storage/page.tsx  |   5 +
 .../app/console/(with-menu)/user/page.tsx     |   5 +
 .../console/(with-menu)/user/role/page.tsx    |   5 +
 .../app/console/(with-menu)/vserver/page.tsx  |   5 +
 .../app/console/(with-menu)/vspace/page.tsx   |   5 +
 .../app/console/(with-menu)/web/blog/page.tsx |   7 +
 .../console/(with-menu)/web/resource/page.tsx |   7 +
 tone-page-web/components/app-sidebar.tsx      | 158 ++++++------------
 tone-page-web/components/nav-main.tsx         |  73 ++++----
 tone-page-web/components/nav-projects.tsx     |  89 ----------
 tone-page-web/components/team-switcher.tsx    |  91 ----------
 tone-page-web/next.config.ts                  |   4 +
 14 files changed, 151 insertions(+), 337 deletions(-)
 rename tone-page-web/app/console/{page.tsx => (with-menu)/layout.tsx} (50%)
 create mode 100644 tone-page-web/app/console/(with-menu)/page.tsx
 create mode 100644 tone-page-web/app/console/(with-menu)/storage/page.tsx
 create mode 100644 tone-page-web/app/console/(with-menu)/user/page.tsx
 create mode 100644 tone-page-web/app/console/(with-menu)/user/role/page.tsx
 create mode 100644 tone-page-web/app/console/(with-menu)/vserver/page.tsx
 create mode 100644 tone-page-web/app/console/(with-menu)/vspace/page.tsx
 create mode 100644 tone-page-web/app/console/(with-menu)/web/blog/page.tsx
 create mode 100644 tone-page-web/app/console/(with-menu)/web/resource/page.tsx
 delete mode 100644 tone-page-web/components/nav-projects.tsx
 delete mode 100644 tone-page-web/components/team-switcher.tsx

diff --git a/tone-page-web/app/console/page.tsx b/tone-page-web/app/console/(with-menu)/layout.tsx
similarity index 50%
rename from tone-page-web/app/console/page.tsx
rename to tone-page-web/app/console/(with-menu)/layout.tsx
index 240524a..83eb31c 100644
--- a/tone-page-web/app/console/page.tsx
+++ b/tone-page-web/app/console/(with-menu)/layout.tsx
@@ -2,19 +2,20 @@ import { AppSidebar } from "@/components/app-sidebar"
 import {
     Breadcrumb,
     BreadcrumbItem,
-    BreadcrumbLink,
     BreadcrumbList,
     BreadcrumbPage,
-    BreadcrumbSeparator,
 } from "@/components/ui/breadcrumb"
-import { Separator } from "@/components/ui/separator"
 import {
     SidebarInset,
     SidebarProvider,
     SidebarTrigger,
 } from "@/components/ui/sidebar"
 
-export default function Page() {
+export default function ConsoleMenuLayout({
+    children,
+}: {
+    children: React.ReactNode
+}) {
     return (
         <SidebarProvider>
             <AppSidebar />
@@ -22,29 +23,23 @@ export default function Page() {
                 <header className="flex h-16 shrink-0 items-center gap-2 transition-[width,height] ease-linear group-has-[[data-collapsible=icon]]/sidebar-wrapper:h-12">
                     <div className="flex items-center gap-2 px-4">
                         <SidebarTrigger className="-ml-1" />
-                        <Separator orientation="vertical" className="mr-2 h-4" />
+                        <div className="w-[1px] h-4 mr-2 bg-zinc-300"></div>
                         <Breadcrumb>
                             <BreadcrumbList>
-                                <BreadcrumbItem className="hidden md:block">
-                                    <BreadcrumbLink href="#">
-                                        Building Your Application
-                                    </BreadcrumbLink>
-                                </BreadcrumbItem>
-                                <BreadcrumbSeparator className="hidden md:block" />
                                 <BreadcrumbItem>
-                                    <BreadcrumbPage>Data Fetching</BreadcrumbPage>
+                                    <BreadcrumbPage>
+                                        {new Intl.DateTimeFormat('en-US', {
+                                            year: 'numeric',
+                                            month: 'long'
+                                        }).format(new Date())}
+                                    </BreadcrumbPage>
                                 </BreadcrumbItem>
                             </BreadcrumbList>
                         </Breadcrumb>
                     </div>
                 </header>
                 <div className="flex flex-1 flex-col gap-4 p-4 pt-0">
-                    <div className="grid auto-rows-min gap-4 md:grid-cols-3">
-                        <div className="aspect-video rounded-xl bg-muted/50" />
-                        <div className="aspect-video rounded-xl bg-muted/50" />
-                        <div className="aspect-video rounded-xl bg-muted/50" />
-                    </div>
-                    <div className="min-h-[100vh] flex-1 rounded-xl bg-muted/50 md:min-h-min" />
+                    {children}
                 </div>
             </SidebarInset>
         </SidebarProvider>
diff --git a/tone-page-web/app/console/(with-menu)/page.tsx b/tone-page-web/app/console/(with-menu)/page.tsx
new file mode 100644
index 0000000..136b4fe
--- /dev/null
+++ b/tone-page-web/app/console/(with-menu)/page.tsx
@@ -0,0 +1,3 @@
+export default function Page() {
+    return <div>console</div>
+}
\ No newline at end of file
diff --git a/tone-page-web/app/console/(with-menu)/storage/page.tsx b/tone-page-web/app/console/(with-menu)/storage/page.tsx
new file mode 100644
index 0000000..fd727f1
--- /dev/null
+++ b/tone-page-web/app/console/(with-menu)/storage/page.tsx
@@ -0,0 +1,5 @@
+export default function Page() {
+    return (
+        <div>storage</div>
+    )
+}
\ No newline at end of file
diff --git a/tone-page-web/app/console/(with-menu)/user/page.tsx b/tone-page-web/app/console/(with-menu)/user/page.tsx
new file mode 100644
index 0000000..3995d69
--- /dev/null
+++ b/tone-page-web/app/console/(with-menu)/user/page.tsx
@@ -0,0 +1,5 @@
+export default function Page() {
+    return (
+        <div>user</div>
+    )
+}
\ No newline at end of file
diff --git a/tone-page-web/app/console/(with-menu)/user/role/page.tsx b/tone-page-web/app/console/(with-menu)/user/role/page.tsx
new file mode 100644
index 0000000..3ab9dc7
--- /dev/null
+++ b/tone-page-web/app/console/(with-menu)/user/role/page.tsx
@@ -0,0 +1,5 @@
+export default function Page() {
+    return (
+        <div>role</div>
+    )
+}
\ No newline at end of file
diff --git a/tone-page-web/app/console/(with-menu)/vserver/page.tsx b/tone-page-web/app/console/(with-menu)/vserver/page.tsx
new file mode 100644
index 0000000..c3ab1cc
--- /dev/null
+++ b/tone-page-web/app/console/(with-menu)/vserver/page.tsx
@@ -0,0 +1,5 @@
+export default function Page() {
+    return (
+        <div>vserver</div>
+    )
+}
\ No newline at end of file
diff --git a/tone-page-web/app/console/(with-menu)/vspace/page.tsx b/tone-page-web/app/console/(with-menu)/vspace/page.tsx
new file mode 100644
index 0000000..07c8007
--- /dev/null
+++ b/tone-page-web/app/console/(with-menu)/vspace/page.tsx
@@ -0,0 +1,5 @@
+export default function Page() {
+    return (
+        <div>vspace</div>
+    )
+}
\ No newline at end of file
diff --git a/tone-page-web/app/console/(with-menu)/web/blog/page.tsx b/tone-page-web/app/console/(with-menu)/web/blog/page.tsx
new file mode 100644
index 0000000..3279ab0
--- /dev/null
+++ b/tone-page-web/app/console/(with-menu)/web/blog/page.tsx
@@ -0,0 +1,7 @@
+export default function Page() {
+    return (
+        <>
+            Blog
+        </>
+    )
+}
\ No newline at end of file
diff --git a/tone-page-web/app/console/(with-menu)/web/resource/page.tsx b/tone-page-web/app/console/(with-menu)/web/resource/page.tsx
new file mode 100644
index 0000000..ecc0b0a
--- /dev/null
+++ b/tone-page-web/app/console/(with-menu)/web/resource/page.tsx
@@ -0,0 +1,7 @@
+export default function Page() {
+    return (
+        <>
+            resource
+        </>
+    )
+}
\ No newline at end of file
diff --git a/tone-page-web/components/app-sidebar.tsx b/tone-page-web/components/app-sidebar.tsx
index 94ad3a0..70a7080 100644
--- a/tone-page-web/components/app-sidebar.tsx
+++ b/tone-page-web/components/app-sidebar.tsx
@@ -2,30 +2,27 @@
 
 import * as React from "react"
 import {
-  AudioWaveform,
-  BookOpen,
-  Bot,
-  Command,
-  Frame,
-  GalleryVerticalEnd,
-  Map,
-  PieChart,
-  Settings2,
+  CloudUpload,
+  Inbox,
+  Server,
   SquareTerminal,
+  UsersRound,
 } from "lucide-react"
 
 import { NavMain } from "@/components/nav-main"
-import { NavProjects } from "@/components/nav-projects"
 import { NavUser } from "@/components/nav-user"
-import { TeamSwitcher } from "@/components/team-switcher"
 import {
   Sidebar,
   SidebarContent,
   SidebarFooter,
   SidebarHeader,
+  SidebarMenu,
+  SidebarMenuButton,
+  SidebarMenuItem,
   SidebarRail,
 } from "@/components/ui/sidebar"
-
+import { useRouter } from "next/navigation"
+import Link from "next/link"
 // This is sample data.
 const data = {
   user: {
@@ -33,125 +30,51 @@ const data = {
     email: "m@example.com",
     avatar: "/avatars/shadcn.jpg",
   },
-  teams: [
-    {
-      name: "Acme Inc",
-      logo: GalleryVerticalEnd,
-      plan: "Enterprise",
-    },
-    {
-      name: "Acme Corp.",
-      logo: AudioWaveform,
-      plan: "Startup",
-    },
-    {
-      name: "Evil Corp.",
-      logo: Command,
-      plan: "Free",
-    },
-  ],
   navMain: [
     {
-      title: "Playground",
-      url: "#",
+      title: "网站管理",
+      url: "/console/web",
       icon: SquareTerminal,
-      isActive: true,
       items: [
         {
-          title: "History",
-          url: "#",
+          title: "资源",
+          url: "/console/web/resource",
         },
         {
-          title: "Starred",
-          url: "#",
-        },
-        {
-          title: "Settings",
-          url: "#",
+          title: "博客",
+          url: "/console/web/blog",
         },
       ],
     },
     {
-      title: "Models",
-      url: "#",
-      icon: Bot,
+      title: "用户管理",
+      url: "/console/user",
+      icon: UsersRound,
       items: [
         {
-          title: "Genesis",
-          url: "#",
+          title: "用户",
+          url: "/console/user",
         },
         {
-          title: "Explorer",
-          url: "#",
-        },
-        {
-          title: "Quantum",
-          url: "#",
+          title: "角色/权限",
+          url: "/console/user/role",
         },
       ],
     },
     {
-      title: "Documentation",
-      url: "#",
-      icon: BookOpen,
-      items: [
-        {
-          title: "Introduction",
-          url: "#",
-        },
-        {
-          title: "Get Started",
-          url: "#",
-        },
-        {
-          title: "Tutorials",
-          url: "#",
-        },
-        {
-          title: "Changelog",
-          url: "#",
-        },
-      ],
+      title: "文件存储",
+      url: "/console/storage",
+      icon: CloudUpload,
     },
     {
-      title: "Settings",
-      url: "#",
-      icon: Settings2,
-      items: [
-        {
-          title: "General",
-          url: "#",
-        },
-        {
-          title: "Team",
-          url: "#",
-        },
-        {
-          title: "Billing",
-          url: "#",
-        },
-        {
-          title: "Limits",
-          url: "#",
-        },
-      ],
-    },
-  ],
-  projects: [
-    {
-      name: "Design Engineering",
-      url: "#",
-      icon: Frame,
+      title: "虚拟云空间",
+      url: "/console/vspace",
+      icon: Inbox,
     },
     {
-      name: "Sales & Marketing",
-      url: "#",
-      icon: PieChart,
-    },
-    {
-      name: "Travel",
-      url: "#",
-      icon: Map,
+      title: "虚拟主机",
+      url: "/console/vserver",
+      icon: Server,
     },
   ],
 }
@@ -160,11 +83,26 @@ export function AppSidebar({ ...props }: React.ComponentProps<typeof Sidebar>) {
   return (
     <Sidebar collapsible="icon" {...props}>
       <SidebarHeader>
-        <TeamSwitcher teams={data.teams} />
+        <SidebarMenu>
+          <SidebarMenuItem>
+            <Link href="/console">
+              <SidebarMenuButton size="lg" asChild>
+                <div className="cursor-pointer">
+                  <div className="flex aspect-square size-8 items-center justify-center rounded-lg bg-sidebar-primary text-sidebar-primary-foreground">
+                    <SquareTerminal className="size-5" />
+                  </div>
+                  <div className="flex flex-col gap-0.5 leading-none">
+                    <span className="font-semibold">特恩的日志 - 控制台</span>
+                    <span className="">v1.0.0</span>
+                  </div>
+                </div>
+              </SidebarMenuButton>
+            </Link>
+          </SidebarMenuItem>
+        </SidebarMenu>
       </SidebarHeader>
       <SidebarContent>
         <NavMain items={data.navMain} />
-        <NavProjects projects={data.projects} />
       </SidebarContent>
       <SidebarFooter>
         <NavUser user={data.user} />
diff --git a/tone-page-web/components/nav-main.tsx b/tone-page-web/components/nav-main.tsx
index 1d71af1..dd5e19d 100644
--- a/tone-page-web/components/nav-main.tsx
+++ b/tone-page-web/components/nav-main.tsx
@@ -17,6 +17,9 @@ import {
   SidebarMenuSubButton,
   SidebarMenuSubItem,
 } from "@/components/ui/sidebar"
+import Link from "next/link"
+import { usePathname } from "next/navigation"
+import { useState, useEffect } from "react"
 
 export function NavMain({
   items,
@@ -34,38 +37,50 @@ export function NavMain({
 }) {
   return (
     <SidebarGroup>
-      <SidebarGroupLabel>Platform</SidebarGroupLabel>
+      <SidebarGroupLabel>菜单</SidebarGroupLabel>
       <SidebarMenu>
         {items.map((item) => (
-          <Collapsible
-            key={item.title}
-            asChild
-            defaultOpen={item.isActive}
-            className="group/collapsible"
-          >
-            <SidebarMenuItem>
-              <CollapsibleTrigger asChild>
-                <SidebarMenuButton tooltip={item.title}>
-                  {item.icon && <item.icon />}
-                  <span>{item.title}</span>
-                  <ChevronRight className="ml-auto transition-transform duration-200 group-data-[state=open]/collapsible:rotate-90" />
+          (item.items && item.items.length > 0)
+            ? (
+              <Collapsible
+                key={item.title}
+                asChild
+                defaultOpen={item.isActive}
+                className="group/collapsible"
+              >
+                <SidebarMenuItem>
+                  <CollapsibleTrigger asChild>
+                    <SidebarMenuButton tooltip={item.title}>
+                      {item.icon && <item.icon />}
+                      <span>{item.title}</span>
+                      <ChevronRight className="ml-auto transition-transform duration-200 group-data-[state=open]/collapsible:rotate-90" />
+                    </SidebarMenuButton>
+                  </CollapsibleTrigger>
+                  <CollapsibleContent>
+                    <SidebarMenuSub>
+                      {item.items?.map((subItem) => (
+                        <SidebarMenuSubItem key={subItem.title}>
+                          <SidebarMenuSubButton asChild>
+                            <Link href={subItem.url}>
+                              <span>{subItem.title}</span>
+                            </Link>
+                          </SidebarMenuSubButton>
+                        </SidebarMenuSubItem>
+                      ))}
+                    </SidebarMenuSub>
+                  </CollapsibleContent>
+                </SidebarMenuItem>
+              </Collapsible>
+            ) : (
+              <SidebarMenuItem key={item.title}>
+                <SidebarMenuButton tooltip={item.title} asChild>
+                  <Link href={item.url}>
+                    {item.icon && <item.icon />}
+                    <span>{item.title}</span>
+                  </Link>
                 </SidebarMenuButton>
-              </CollapsibleTrigger>
-              <CollapsibleContent>
-                <SidebarMenuSub>
-                  {item.items?.map((subItem) => (
-                    <SidebarMenuSubItem key={subItem.title}>
-                      <SidebarMenuSubButton asChild>
-                        <a href={subItem.url}>
-                          <span>{subItem.title}</span>
-                        </a>
-                      </SidebarMenuSubButton>
-                    </SidebarMenuSubItem>
-                  ))}
-                </SidebarMenuSub>
-              </CollapsibleContent>
-            </SidebarMenuItem>
-          </Collapsible>
+              </SidebarMenuItem>
+            )
         ))}
       </SidebarMenu>
     </SidebarGroup>
diff --git a/tone-page-web/components/nav-projects.tsx b/tone-page-web/components/nav-projects.tsx
deleted file mode 100644
index f50b20d..0000000
--- a/tone-page-web/components/nav-projects.tsx
+++ /dev/null
@@ -1,89 +0,0 @@
-"use client"
-
-import {
-  Folder,
-  Forward,
-  MoreHorizontal,
-  Trash2,
-  type LucideIcon,
-} from "lucide-react"
-
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuSeparator,
-  DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu"
-import {
-  SidebarGroup,
-  SidebarGroupLabel,
-  SidebarMenu,
-  SidebarMenuAction,
-  SidebarMenuButton,
-  SidebarMenuItem,
-  useSidebar,
-} from "@/components/ui/sidebar"
-
-export function NavProjects({
-  projects,
-}: {
-  projects: {
-    name: string
-    url: string
-    icon: LucideIcon
-  }[]
-}) {
-  const { isMobile } = useSidebar()
-
-  return (
-    <SidebarGroup className="group-data-[collapsible=icon]:hidden">
-      <SidebarGroupLabel>Projects</SidebarGroupLabel>
-      <SidebarMenu>
-        {projects.map((item) => (
-          <SidebarMenuItem key={item.name}>
-            <SidebarMenuButton asChild>
-              <a href={item.url}>
-                <item.icon />
-                <span>{item.name}</span>
-              </a>
-            </SidebarMenuButton>
-            <DropdownMenu>
-              <DropdownMenuTrigger asChild>
-                <SidebarMenuAction showOnHover>
-                  <MoreHorizontal />
-                  <span className="sr-only">More</span>
-                </SidebarMenuAction>
-              </DropdownMenuTrigger>
-              <DropdownMenuContent
-                className="w-48 rounded-lg"
-                side={isMobile ? "bottom" : "right"}
-                align={isMobile ? "end" : "start"}
-              >
-                <DropdownMenuItem>
-                  <Folder className="text-muted-foreground" />
-                  <span>View Project</span>
-                </DropdownMenuItem>
-                <DropdownMenuItem>
-                  <Forward className="text-muted-foreground" />
-                  <span>Share Project</span>
-                </DropdownMenuItem>
-                <DropdownMenuSeparator />
-                <DropdownMenuItem>
-                  <Trash2 className="text-muted-foreground" />
-                  <span>Delete Project</span>
-                </DropdownMenuItem>
-              </DropdownMenuContent>
-            </DropdownMenu>
-          </SidebarMenuItem>
-        ))}
-        <SidebarMenuItem>
-          <SidebarMenuButton className="text-sidebar-foreground/70">
-            <MoreHorizontal className="text-sidebar-foreground/70" />
-            <span>More</span>
-          </SidebarMenuButton>
-        </SidebarMenuItem>
-      </SidebarMenu>
-    </SidebarGroup>
-  )
-}
diff --git a/tone-page-web/components/team-switcher.tsx b/tone-page-web/components/team-switcher.tsx
deleted file mode 100644
index 083e9ec..0000000
--- a/tone-page-web/components/team-switcher.tsx
+++ /dev/null
@@ -1,91 +0,0 @@
-"use client"
-
-import * as React from "react"
-import { ChevronsUpDown, Plus } from "lucide-react"
-
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuLabel,
-  DropdownMenuSeparator,
-  DropdownMenuShortcut,
-  DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu"
-import {
-  SidebarMenu,
-  SidebarMenuButton,
-  SidebarMenuItem,
-  useSidebar,
-} from "@/components/ui/sidebar"
-
-export function TeamSwitcher({
-  teams,
-}: {
-  teams: {
-    name: string
-    logo: React.ElementType
-    plan: string
-  }[]
-}) {
-  const { isMobile } = useSidebar()
-  const [activeTeam, setActiveTeam] = React.useState(teams[0])
-
-  if (!activeTeam) {
-    return null
-  }
-
-  return (
-    <SidebarMenu>
-      <SidebarMenuItem>
-        <DropdownMenu>
-          <DropdownMenuTrigger asChild>
-            <SidebarMenuButton
-              size="lg"
-              className="data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground"
-            >
-              <div className="bg-sidebar-primary text-sidebar-primary-foreground flex aspect-square size-8 items-center justify-center rounded-lg">
-                <activeTeam.logo className="size-4" />
-              </div>
-              <div className="grid flex-1 text-left text-sm leading-tight">
-                <span className="truncate font-medium">{activeTeam.name}</span>
-                <span className="truncate text-xs">{activeTeam.plan}</span>
-              </div>
-              <ChevronsUpDown className="ml-auto" />
-            </SidebarMenuButton>
-          </DropdownMenuTrigger>
-          <DropdownMenuContent
-            className="w-(--radix-dropdown-menu-trigger-width) min-w-56 rounded-lg"
-            align="start"
-            side={isMobile ? "bottom" : "right"}
-            sideOffset={4}
-          >
-            <DropdownMenuLabel className="text-muted-foreground text-xs">
-              Teams
-            </DropdownMenuLabel>
-            {teams.map((team, index) => (
-              <DropdownMenuItem
-                key={team.name}
-                onClick={() => setActiveTeam(team)}
-                className="gap-2 p-2"
-              >
-                <div className="flex size-6 items-center justify-center rounded-md border">
-                  <team.logo className="size-3.5 shrink-0" />
-                </div>
-                {team.name}
-                <DropdownMenuShortcut>⌘{index + 1}</DropdownMenuShortcut>
-              </DropdownMenuItem>
-            ))}
-            <DropdownMenuSeparator />
-            <DropdownMenuItem className="gap-2 p-2">
-              <div className="flex size-6 items-center justify-center rounded-md border bg-transparent">
-                <Plus className="size-4" />
-              </div>
-              <div className="text-muted-foreground font-medium">Add team</div>
-            </DropdownMenuItem>
-          </DropdownMenuContent>
-        </DropdownMenu>
-      </SidebarMenuItem>
-    </SidebarMenu>
-  )
-}
diff --git a/tone-page-web/next.config.ts b/tone-page-web/next.config.ts
index 34b5c62..5c971d2 100644
--- a/tone-page-web/next.config.ts
+++ b/tone-page-web/next.config.ts
@@ -2,6 +2,10 @@ import type { NextConfig } from "next";
 
 const nextConfig: NextConfig = {
   /* config options here */
+  reactStrictMode: true,
+  devIndicators: {
+    position: 'bottom-right',
+  },
   async rewrites() {
     return [
       {