From 5933394cda671ef57a6ccd3560d6c567b2dc731d Mon Sep 17 00:00:00 2001
From: luorijun <luorijun@outlook.com>
Date: Thu, 20 Nov 2025 18:32:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8E=E5=8F=B0=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E6=A0=B7=E5=BC=8F=E4=B8=8E=E5=BC=B9=E7=AA=97=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/admin/_client/layout.tsx              |  8 +++---
 src/app/admin/_client/navbar.tsx              |  8 +++---
 .../admin/_client/passwordSetupWrapper.tsx    | 21 ---------------
 src/app/admin/layout.tsx                      | 27 +++++++++----------
 4 files changed, 20 insertions(+), 44 deletions(-)
 delete mode 100644 src/app/admin/_client/passwordSetupWrapper.tsx

diff --git a/src/app/admin/_client/layout.tsx b/src/app/admin/_client/layout.tsx
index f1e33d1..f5e1285 100644
--- a/src/app/admin/_client/layout.tsx
+++ b/src/app/admin/_client/layout.tsx
@@ -6,7 +6,7 @@ import {merge} from '@/lib/utils'
 type AdminLayoutProps = {
   navbar: ReactNode
   header: ReactNode
-  content: ReactNode
+  children: ReactNode
 }
 
 export default function Layout(props: AdminLayoutProps) {
@@ -70,11 +70,11 @@ export default function Layout(props: AdminLayoutProps) {
         className={merge(
           `transition-[margin] duration-300 ease-in-out`,
           `absolute inset-0 overflow-hidden`,
-          `mt-[64px]`,
-          `md:ml-[64px]`,
+          `mt-16`,
+          `md:ml-16`,
           `lg:data-[expand=true]:ml-[200px]`,
         )}>
-        {props.content}
+        {props.children}
       </div>
     </div>
   )
diff --git a/src/app/admin/_client/navbar.tsx b/src/app/admin/_client/navbar.tsx
index 3373eae..1c928c6 100644
--- a/src/app/admin/_client/navbar.tsx
+++ b/src/app/admin/_client/navbar.tsx
@@ -36,7 +36,7 @@ export default function Navbar(props: NavbarProps) {
       <Link
         href="/"
         className={merge(
-          `flex-none h-[64px] flex items-center justify-center`,
+          `flex-none h-16 flex items-center justify-center`,
         )}>
         <Image src={logoAvatar} alt="logo" className="w-10 h-10 object-contain"/>
         <Image
@@ -89,13 +89,13 @@ function NavTitle(props: {
       `group-data-[expand=false]:h-4`,
     )}>
       <span className={merge(
-        `transition-[opacity] duration-200 ease-in-out absolute mx-4`,
+        `transition-opacity duration-200 ease-in-out absolute mx-4`,
         `group-data-[expand=true]:delay-100 group-data-[expand=true]:opacity-100 group-data-[expand=false]:opacity-0`,
       )}>
         {props.label}
       </span>
       <span className={merge(
-        `transition-[opacity] duration-200 ease-in-out absolute w-full border-b block`,
+        `transition-opacity duration-200 ease-in-out absolute w-full border-b block`,
         `group-data-[expand=false]:delay-100 group-data-[expand=false]:opacity-100 group-data-[expand=true]:opacity-0`,
       )}>
       </span>
@@ -129,7 +129,7 @@ function NavItem(props: {
       <TooltipTrigger asChild>
         <Link
           className={merge(
-            `transition-[padding] duration-300 ease-in-out`,
+            `transition-[padding,background] duration-300 ease-in-out`,
             `flex items-center rounded-md gap-2 whitespace-nowrap`,
             `hover:bg-gray-100`,
             `group-data-[expand=true]:px-4`,
diff --git a/src/app/admin/_client/passwordSetupWrapper.tsx b/src/app/admin/_client/passwordSetupWrapper.tsx
deleted file mode 100644
index 2abe7b0..0000000
--- a/src/app/admin/_client/passwordSetupWrapper.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-'use client'
-import {ChangePasswordDialog} from '@/components/composites/dialogs/change-password-dialog'
-import {RealnameAuthDialog} from '@/components/composites/dialogs/realname-auth-dialog'
-import {User} from '@/lib/models'
-
-export function PasswordSetupWrapper({profile}: {profile: User}) {
-  return (
-    <>
-      <RealnameAuthDialog
-        hasAuthenticated={!!profile.id_token}
-        triggerClassName="hidden"
-        defaultOpen={!profile.id_token}
-      />
-
-      <ChangePasswordDialog
-        triggerClassName="hidden"
-        defaultOpen={profile.has_password}
-      />
-    </>
-  )
-}
diff --git a/src/app/admin/layout.tsx b/src/app/admin/layout.tsx
index 3278f33..9471e81 100644
--- a/src/app/admin/layout.tsx
+++ b/src/app/admin/layout.tsx
@@ -23,20 +23,17 @@ export default async function AdminLayout(props: AdminLayoutProps) {
     <Layout
       navbar={<Navbar/>}
       header={<Header profile={profile}/>}
-      content={(
-        <>
-          {props.children}
-          <RealnameAuthDialog
-            hasAuthenticated={!!profile.id_token}
-            triggerClassName="hidden"
-            defaultOpen={!profile.id_token}
-          />
-          <ChangePasswordDialog
-            triggerClassName="hidden"
-            defaultOpen={profile.has_password}
-          />
-        </>
-      )}
-    />
+    >
+      {props.children}
+      <RealnameAuthDialog
+        hasAuthenticated={!!profile.id_token}
+        triggerClassName="hidden"
+        defaultOpen={!profile.id_token}
+      />
+      <ChangePasswordDialog
+        triggerClassName="hidden"
+        defaultOpen={!profile.has_password}
+      />
+    </Layout>
   )
 }