Merge pull request #9 from youyou-sudo/Youyou-git-dataunion

feat: 更新组件以使用 @nextui-org/react，添加 ProgressBarProvider 组件
youyou-sudo · Dec 26, 2024 · ba690e9 · ba690e9
2 parents c9fc58b + c9106a4
commit ba690e9
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 43 deletions.
diff --git a/app/(components)/gamelist.tsx b/app/(components)/gamelist.tsx
@@ -1,3 +1,4 @@
+"use client";
 import { Image, Card, CardBody } from "@nextui-org/react";
 import Link from "next/link";
 import { env } from "next-runtime-env";

diff --git a/app/[vnid]/(components)/ContentCard.tsx b/app/[vnid]/(components)/ContentCard.tsx
@@ -10,8 +10,8 @@ import {
   Divider,
   Radio,
   RadioGroup,
-  Skeleton,
   Switch,
+  Skeleton,
   Tooltip,
   Image,
 } from "@nextui-org/react";
@@ -203,6 +203,7 @@ export function ContentCard({ data, fullsereenfill }: ContentCardProps) {
               <Accordion isCompact>
                 <AccordionItem key="1" aria-label="TAG" title="TAG">
                   <div className="flex">
+                    {" "}
                     <Switch
                       defaultSelected
                       isSelected={isSelected}
@@ -212,7 +213,7 @@ export function ContentCard({ data, fullsereenfill }: ContentCardProps) {
                       startContent={<div>简</div>}
                       endContent={<div>全</div>}
                     />
-                    <Divider orientation="vertical" />
+                    <Divider className="ml-1" orientation="vertical" />
                     <RadioGroup
                       color="default"
                       orientation="horizontal"

diff --git a/app/[vnid]/(components)/Datalistview.jsx → app/[vnid]/(components)/Datalistview.tsx b/app/[vnid]/(components)/Datalistview.jsx → app/[vnid]/(components)/Datalistview.tsx
diff --git a/app/providers.tsx b/app/providers.tsx
@@ -1,21 +1,18 @@
 "use client";
 
 import * as React from "react";
-import { NextUIProvider } from "@nextui-org/system";
-import { useRouter } from "next/navigation";
+import { NextUIProvider } from "@nextui-org/react";
 import { ThemeProvider as NextThemesProvider } from "next-themes";
-import { ThemeProviderProps } from "next-themes/dist/types";
+import type { ThemeProviderProps } from "next-themes/dist/types";
 
 export interface ProvidersProps {
   children: React.ReactNode;
   themeProps?: ThemeProviderProps;
 }
 
 export function Providers({ children, themeProps }: ProvidersProps) {
-  const router = useRouter();
-
   return (
-    <NextUIProvider navigate={router.push}>
+    <NextUIProvider>
       <NextThemesProvider {...themeProps}>{children}</NextThemesProvider>
     </NextUIProvider>
   );

diff --git a/app/tag/[gid]/page.tsx b/app/tag/[gid]/page.tsx
@@ -1,4 +1,3 @@
-import React from "react";
 import type { Metadata } from "next";
 import { tagsvndbInfo } from "./(action)/Tagvndb";
 import TagsContentCard from "./(components)/TagsContentCard";
@@ -21,7 +20,7 @@ export default async function page({
   params: { gid: string };
 }) {
   const { gid } = await params;
-  const id = await gid;
+  const id = gid;
   const { pages } = await searchParams;
   const pagess = parseInt(pages) || 1;
   const data = await tagsvndbInfo({ id, pagess });

diff --git a/bun.lockb b/bun.lockb
diff --git a/components/ProgressBarProvider.jsx → components/ProgressBarProvider.tsx b/components/ProgressBarProvider.jsx → components/ProgressBarProvider.tsx
diff --git a/components/theme-switch.tsx b/components/theme-switch.tsx
@@ -41,14 +41,14 @@ export const ThemeSwitch: FC<ThemeSwitchProps> = () => {
           )}
         </Button>
       </DropdownTrigger>
-      <DropdownMenu aria-label="Static Actions">
-        <DropdownItem key="new" onClick={() => setTheme("system")}>
+      <DropdownMenu aria-label="Theme Actions">
+        <DropdownItem key="system" onPress={() => setTheme("system")}>
           跟随系统
         </DropdownItem>
-        <DropdownItem key="copy" onClick={() => setTheme("light")}>
+        <DropdownItem key="light" onPress={() => setTheme("light")}>
           浅色模式
         </DropdownItem>
-        <DropdownItem key="edit" onClick={() => setTheme("dark")}>
+        <DropdownItem key="dark" onPress={() => setTheme("dark")}>
           深色模式
         </DropdownItem>
       </DropdownMenu>

diff --git a/package.json b/package.json
@@ -9,32 +9,34 @@
     "lint": "eslint . --ext .ts,.tsx -c .eslintrc.json --fix"
   },
   "dependencies": {
-    "@auth/prisma-adapter": "^2.7.2",
-    "@bbob/preset-react": "^4.1.1",
-    "@bbob/react": "^4.1.1",
-    "@nextui-org/navbar": "2.2.5",
-    "@nextui-org/react": "^2.6.8",
+    "@auth/prisma-adapter": "^2.7.4",
+    "@bbob/preset-react": "^4.2.0",
+    "@bbob/react": "^4.2.0",
+    "@nextui-org/navbar": "2.2.7",
+    "@nextui-org/react": "^2.6.10",
     "@nextui-org/system": "2.4.0",
-    "@nextui-org/theme": "2.4.0",
+    "@nextui-org/theme": "^2.4.4",
     "@prisma/client": "^6.1.0",
-    "@radix-ui/react-icons": "^1.3.0",
-    "@radix-ui/react-select": "^2.1.2",
-    "@radix-ui/react-separator": "^1.1.0",
-    "@radix-ui/react-slot": "^1.1.0",
-    "@radix-ui/react-toast": "^1.2.2",
+    "@radix-ui/react-icons": "^1.3.2",
+    "@radix-ui/react-label": "^2.1.1",
+    "@radix-ui/react-select": "^2.1.4",
+    "@radix-ui/react-separator": "^1.1.1",
+    "@radix-ui/react-slot": "^1.1.1",
+    "@radix-ui/react-switch": "^1.1.2",
+    "@radix-ui/react-toast": "^1.2.4",
     "@react-aria/ssr": "3.9.4",
     "@react-aria/visually-hidden": "3.8.12",
     "@types/bcryptjs": "^2.4.6",
     "bcryptjs": "^2.4.3",
-    "class-variance-authority": "^0.7.0",
+    "class-variance-authority": "^0.7.1",
     "clsx": "2.1.1",
     "dayjs": "^1.11.13",
     "emblor": "^1.4.7",
-    "flatted": "^3.3.1",
+    "flatted": "^3.3.2",
     "framer-motion": "^11.15.0",
     "grommet-icons": "^4.12.1",
-    "intl-messageformat": "^10.5.0",
-    "ioredis": "^5.4.1",
+    "intl-messageformat": "^10.7.10",
+    "ioredis": "^5.4.2",
     "lucide-react": "^0.452.0",
     "motion": "12.0.0-alpha.2",
     "next": "^15.1.2",
@@ -43,40 +45,40 @@
     "next-runtime-env": "^3.2.2",
     "next-themes": "^0.2.1",
     "nuqs": "^2.2.3",
-    "pinyin-pro": "^3.25.0",
+    "pinyin-pro": "^3.26.0",
     "postcss": "8.4.38",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "react-icons": "^5.3.0",
-    "tailwind-merge": "^2.5.3",
+    "react-icons": "^5.4.0",
+    "tailwind-merge": "^2.6.0",
     "tailwind-variants": "0.1.20",
     "tailwindcss": "3.4.3",
     "tailwindcss-animate": "^1.0.7",
     "typescript": "5.0.4",
     "wanakana": "^5.3.1",
-    "zod": "^3.23.8"
+    "zod": "^3.24.1"
   },
   "devDependencies": {
     "@types/bcrypt": "^5.0.2",
-    "@types/bun": "^1.1.13",
+    "@types/bun": "^1.1.14",
     "@types/node": "20.5.7",
     "@types/react": "18.3.3",
     "@types/react-dom": "18.3.0",
     "@typescript-eslint/eslint-plugin": "7.2.0",
     "@typescript-eslint/parser": "7.2.0",
     "autoprefixer": "10.4.19",
-    "eslint": "^8.57.0",
+    "eslint": "^8.57.1",
     "eslint-config-next": "14.2.1",
-    "eslint-config-prettier": "^8.2.0",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jsx-a11y": "^6.4.1",
+    "eslint-config-prettier": "^8.10.0",
+    "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-jsx-a11y": "^6.10.2",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-react": "^7.23.2",
-    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-prettier": "^5.2.1",
+    "eslint-plugin-react": "^7.37.3",
+    "eslint-plugin-react-hooks": "^4.6.2",
     "eslint-plugin-unused-imports": "^3.2.0",
     "prisma": "^6.1.0",
-    "webpack": "^5.96.1",
+    "webpack": "^5.97.1",
     "webpack-cli": "^5.1.4"
   }
 }
diff --git a/tailwind.config.js b/tailwind.config.js
@@ -1,4 +1,4 @@
-const { nextui } = require("@nextui-org/theme");
+const { nextui } = require("@nextui-org/react");
 const tailwindcssAnimate = require("tailwindcss-animate");
 
 /** @type {import('tailwindcss').Config} */