Merge pull request #142 from besscroft/v2

fix: 修复一些问题
besscroft · Nov 11, 2024 · c7ae993 · c7ae993
2 parents 6da3a06 + bcc6137
commit c7ae993
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 367 deletions.
diff --git a/app/admin/settings/storages/page.tsx b/app/admin/settings/storages/page.tsx
@@ -1,38 +1,35 @@
 'use client'
 
-import { Tabs } from '~/components/aceternity/tabs'
 import AListTabs from '~/components/admin/settings/storages/AListTabs'
 import S3Tabs from '~/components/admin/settings/storages/S3Tabs'
 import R2Tabs from '~/components/admin/settings/storages/R2Tabs'
+import {
+  Tabs,
+  TabsContent,
+  TabsList,
+  TabsTrigger,
+} from '~/components/ui/tabs'
 
 export default function Storages() {
-  const tabs = [
-    {
-      title: "S3 API",
-      value: "s3",
-      content: (
-        <S3Tabs />
-      ),
-    },
-    {
-      title: "Cloudflare R2",
-      value: "r2",
-      content: (
-        <R2Tabs />
-      ),
-    },
-    {
-      title: "AList API",
-      value: "alist",
-      content: (
-        <AListTabs />
-      ),
-    },
-  ];
 
   return (
     <div className="flex flex-col space-y-2 h-full flex-1">
-      <Tabs tabs={tabs} />
+      <Tabs defaultValue="s3">
+        <TabsList className="grid w-full grid-cols-3">
+          <TabsTrigger value="s3">S3 API</TabsTrigger>
+          <TabsTrigger value="r2">Cloudflare R2</TabsTrigger>
+          <TabsTrigger value="alist">AList API</TabsTrigger>
+        </TabsList>
+        <TabsContent value="s3">
+          <S3Tabs />
+        </TabsContent>
+        <TabsContent value="r2">
+          <R2Tabs />
+        </TabsContent>
+        <TabsContent value="alist">
+          <AListTabs />
+        </TabsContent>
+      </Tabs>
     </div>
   )
 }
diff --git a/components/aceternity/tabs.tsx b/components/aceternity/tabs.tsx
diff --git a/components/admin/settings/storages/AListTabs.tsx b/components/admin/settings/storages/AListTabs.tsx
@@ -35,7 +35,7 @@ export default function AListTabs() {
         <div className="flex justify-between p-2">
           <div className="flex gap-5">
             <div className="flex flex-col gap-1 items-start justify-center">
-              <h4 className="text-small font-semibold leading-none text-default-600">AList 配置信息</h4>
+              <h4 className="text-small font-semibold leading-none text-default-600">AList 配置</h4>
             </div>
           </div>
           <div className="flex items-center space-x-2">

diff --git a/components/admin/settings/storages/R2Tabs.tsx b/components/admin/settings/storages/R2Tabs.tsx
@@ -35,7 +35,7 @@ export default function R2Tabs() {
         <div className="flex justify-between p-2">
           <div className="flex gap-5">
             <div className="flex flex-col gap-1 items-start justify-center">
-              <h4 className="text-small font-semibold leading-none text-default-600">Cloudflare R2 配置信息</h4>
+              <h4 className="text-small font-semibold leading-none text-default-600">Cloudflare R2 配置</h4>
             </div>
           </div>
           <div className="flex items-center space-x-2">

diff --git a/components/admin/settings/storages/S3Tabs.tsx b/components/admin/settings/storages/S3Tabs.tsx
@@ -35,7 +35,7 @@ export default function S3Tabs() {
         <div className="flex justify-between p-2">
           <div className="flex gap-5">
             <div className="flex flex-col gap-1 items-start justify-center">
-              <h4 className="text-small font-semibold leading-none text-default-600">S3 配置信息</h4>
+              <h4 className="text-small font-semibold leading-none text-default-600">S3 配置</h4>
             </div>
           </div>
           <div className="flex items-center space-x-2">