Movie
;
+ return Movie
}
diff --git a/src/app/(main)/preference/general/page.tsx b/src/app/(main)/preference/general/page.tsx
index 733783e..8f7bc65 100644
--- a/src/app/(main)/preference/general/page.tsx
+++ b/src/app/(main)/preference/general/page.tsx
@@ -1,8 +1,10 @@
"use client"
-import useAppStore from "@/store/app"
+import { appStore } from "@/store/app"
+import { useSnapshot } from "valtio"
export default function Page() {
- const app = useAppStore()
+ void appStore.start()
+ const app = useSnapshot(appStore.state)
return (
diff --git a/src/app/(main)/preference/layout.tsx b/src/app/(main)/preference/layout.tsx
index d4e3453..7e9958f 100644
--- a/src/app/(main)/preference/layout.tsx
+++ b/src/app/(main)/preference/layout.tsx
@@ -1,12 +1,26 @@
"use client"
-import { Card, CardHeader, CardIcon, CardTool, CardBody } from "@/components/window/Card"
+import {
+ Card,
+ CardBody,
+ CardHeader,
+ CardIcon,
+ CardTool,
+} from "@/components/window/Card"
import { ToolButton } from "@/components/window/ToolButton"
-import { SettingConfig, UploadOne, HardDisk, AssemblyLine, Videocamera } from "@icon-park/react"
-import clsx from "clsx"
+import { cn } from "@heroui/react"
+import {
+ AssemblyLine,
+ HardDisk,
+ SettingConfig,
+ UploadOne,
+ Videocamera,
+} from "@icon-park/react"
import { usePathname, useRouter } from "next/navigation"
// import { platform } from "@tauri-apps/plugin-os"
-export default function PreferenceLayout({ children }: { children: React.ReactNode }) {
+export default function PreferenceLayout({
+ children,
+}: { children: React.ReactNode }) {
const router = useRouter()
const pathname = usePathname()
@@ -16,21 +30,21 @@ export default function PreferenceLayout({ children }: { children: React.ReactNo
router.push("/preference/general")}
- className={clsx(pathname === "/preference/general" && "bg-white/60")}
+ className={cn(pathname === "/preference/general" && "bg-black/5")}
>
router.push("/preference/path")}
- className={clsx(pathname === "/preference/path" && "bg-white/60")}
+ className={cn(pathname === "/preference/path" && "bg-black/5")}
>
router.push("/preference/replay")}
- className={clsx(pathname === "/preference/replay" && "bg-white/60")}
+ className={cn(pathname === "/preference/replay" && "bg-black/5")}
>
diff --git a/src/app/(main)/preference/path/page.tsx b/src/app/(main)/preference/path/page.tsx
index de889b4..3af57bb 100644
--- a/src/app/(main)/preference/path/page.tsx
+++ b/src/app/(main)/preference/path/page.tsx
@@ -1,8 +1,10 @@
"use client"
-import SteamStore from "@/store/steam"
+import { currentUser, steamStore } from "@/store/steam"
+import { useSnapshot } from "valtio"
export default function Page() {
- const steam = SteamStore()
+ void steamStore.start()
+ const steam = useSnapshot(steamStore.state)
return (
{children}
+
)
}
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 6d995d1..7771e75 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,20 +1,46 @@
-"use client";
+"use client"
-import { useRouter } from "next/navigation";
+import { open } from "@tauri-apps/plugin-dialog"
+import { useRouter } from "next/navigation"
+import React from "react"
const Home = () => {
- const router = useRouter();
+ const router = useRouter()
+ const [file, setFile] = React.useState("")
+
+ const openFile = async () => {
+ const filePath = await open({
+ multiple: true,
+ directory: false,
+ })
+
+ setFile(filePath?.join("\n") || " ")
+ }
return (
-
)
-};
+}
-export default Home;
+export default Home
diff --git a/src/app/prepare/layout.tsx b/src/app/prepare/layout.tsx
index c94cc93..caeaf30 100644
--- a/src/app/prepare/layout.tsx
+++ b/src/app/prepare/layout.tsx
@@ -1,6 +1,8 @@
import Nav from "@/components/window/Nav"
-export default function BaseLayout({ children }: { children: React.ReactNode }) {
+export default function BaseLayout({
+ children,
+}: { children: React.ReactNode }) {
return (
@@ -10,7 +12,7 @@ export default function Page() {
)
}
diff --git a/src/app/(main)/tool/page.tsx b/src/app/(main)/tool/page.tsx
index 4048311..92e52d0 100644
--- a/src/app/(main)/tool/page.tsx
+++ b/src/app/(main)/tool/page.tsx
@@ -1,3 +1,3 @@
export default function Page() {
- return 游戏路径：{steam.csDir}
Steam路径有效：{steam.isDirValid ? "是" : "否"}
游戏路径有效：{steam.isCsDirValid ? "是" : "否"}
-Steam账号：{steam.currentUser().accountName}
+Steam账号：{currentUser().accountName}
Tool
;
+ return Tool
}
diff --git a/src/app/_app.tsx b/src/app/_app.tsx
deleted file mode 100644
index e5db131..0000000
--- a/src/app/_app.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import "@/styles/globals.css"
-import type { AppProps } from "next/app"
-
-function MyApp({ Component, pageProps }: AppProps) {
- return CS 工具箱
-
diff --git a/src/app/prepare/page.tsx b/src/app/prepare/page.tsx
index 2f56abc..e854e17 100644
--- a/src/app/prepare/page.tsx
+++ b/src/app/prepare/page.tsx
@@ -1,25 +1,29 @@
"use client"
-import useSteamStore from "@/store/steam"
+import { currentUser, setCsDir, setDir, steamStore } from "@/store/steam"
+import { useSnapshot } from "valtio"
export default function Page() {
- const { dir, setDir, csDir, setCsDir, currentUser } = useSteamStore()
+ void steamStore.start()
+ const steam = useSnapshot(steamStore.state)
return (
@@ -13,26 +22,28 @@ const FastLaunch = () => {
-
- );
-};
+ )
+}
-export default CommonDir;
+export default CommonDir
diff --git a/src/components/cstb/FastLaunch.tsx b/src/components/cstb/FastLaunch.tsx
index f808ae0..21b1a40 100644
--- a/src/components/cstb/FastLaunch.tsx
+++ b/src/components/cstb/FastLaunch.tsx
@@ -1,8 +1,17 @@
-import { TakeOff } from "@icon-park/react";
-import { Card, CardHeader, CardIcon, CardBody } from "../window/Card";
+import { steamStore } from "@/store/steam"
+import { toolStore } from "@/store/tool"
+import { TakeOff } from "@icon-park/react"
import { invoke } from "@tauri-apps/api/core"
+import { useSnapshot } from "valtio"
+import { Card, CardBody, CardHeader, CardIcon } from "../window/Card"
+// import { addToast } from "@heroui/react"
const FastLaunch = () => {
+ void toolStore.start()
+ void steamStore.start()
+ const { launchOptions, launchIndex } = useSnapshot(toolStore.state)
+ const { dir } = useSnapshot(steamStore.state)
+
return (
CS工具箱
++ CS工具箱 +
准备环节
setDir(e.target.value)}
/>
setCsDir(e.target.value)}
/>
diff --git a/src/app/providers.tsx b/src/app/providers.tsx
new file mode 100644
index 0000000..46eb2b3
--- /dev/null
+++ b/src/app/providers.tsx
@@ -0,0 +1,15 @@
+"use client"
+import { HeroUIProvider } from "@heroui/react"
+import { ToastProvider } from "@heroui/toast"
+import { ThemeProvider as NextThemesProvider } from "next-themes"
+
+export default function Providers({ children }: { children: React.ReactNode }) {
+ return (
+
+
+
+
+ )
+}
diff --git a/src/app/test/page.tsx b/src/app/test/page.tsx
index f1fc0ce..f2b8534 100644
--- a/src/app/test/page.tsx
+++ b/src/app/test/page.tsx
@@ -1,27 +1,27 @@
"use client"
-import { CardButton } from "@/components/test/CardButton";
-import { useGlobalShortcut } from "@/hooks/tauri/shortcuts";
-import { invoke } from "@tauri-apps/api/core";
-import { useCallback, useState } from "react";
+import { CardButton } from "@/components/test/CardButton"
+import { useGlobalShortcut } from "@/hooks/tauri/shortcuts"
+import { invoke } from "@tauri-apps/api/core"
+import { useCallback, useState } from "react"
export default function Page() {
const [buttonDesc, setButtonDesc] = useState(
- "Waiting to be clicked. This calls 'on_button_clicked' from Rust."
- );
+ "Waiting to be clicked. This calls 'on_button_clicked' from Rust.",
+ )
const onButtonClick = () => {
invoke("on_button_clicked")
.then((value) => {
- setButtonDesc(value);
+ setButtonDesc(value)
})
.catch(() => {
- setButtonDesc("Failed to invoke Rust command 'on_button_clicked'");
- });
- };
+ setButtonDesc("Failed to invoke Rust command 'on_button_clicked'")
+ })
+ }
const shortcutHandler = useCallback(() => {
- console.log("Ctrl+P was pressed!");
- }, []);
- useGlobalShortcut("CommandOrControl+P", shortcutHandler);
+ console.log("Ctrl+P was pressed!")
+ }, [])
+ useGlobalShortcut("CommandOrControl+P", shortcutHandler)
return (
- );
+ )
}
diff --git a/src/components/cstb/CommonDir.tsx b/src/components/cstb/CommonDir.tsx
index 6e010aa..e37f379 100644
--- a/src/components/cstb/CommonDir.tsx
+++ b/src/components/cstb/CommonDir.tsx
@@ -1,17 +1,20 @@
-import { FolderFocusOne } from "@icon-park/react";
-import { Card, CardHeader, CardIcon, CardBody } from "../window/Card";
+import { FolderFocusOne } from "@icon-park/react"
+import { Card, CardBody, CardHeader, CardIcon } from "../window/Card"
interface RoundedButtonProps {
- children?: React.ReactNode;
+ children?: React.ReactNode
}
const RoundedButton = ({ children }: RoundedButtonProps) => {
return (
-
@@ -54,5 +54,5 @@ export default function Page() {
@@ -40,6 +51,6 @@ const FastLaunch = () => {
)
-};
+}
-export default FastLaunch;
+export default FastLaunch
diff --git a/src/components/cstb/ForceQuit.tsx b/src/components/cstb/ForceQuit.tsx
index f4d634b..55cc4ae 100644
--- a/src/components/cstb/ForceQuit.tsx
+++ b/src/components/cstb/ForceQuit.tsx
@@ -1,6 +1,6 @@
-import { Power } from "@icon-park/react";
-import { Card, CardHeader, CardIcon, CardBody } from "../window/Card";
-import { invoke } from "@tauri-apps/api/core";
+import { Power } from "@icon-park/react"
+import { invoke } from "@tauri-apps/api/core"
+import { Card, CardBody, CardHeader, CardIcon } from "../window/Card"
const ForceQuit = () => {
return (
@@ -12,12 +12,24 @@ const ForceQuit = () => {
- );
-};
+ )
+}
-export default ForceQuit;
+export default ForceQuit
diff --git a/src/components/cstb/LaunchOption.tsx b/src/components/cstb/LaunchOption.tsx
index c118f91..ca294a5 100644
--- a/src/components/cstb/LaunchOption.tsx
+++ b/src/components/cstb/LaunchOption.tsx
@@ -1,10 +1,12 @@
-import { Plus, SettingConfig, Switch } from "@icon-park/react";
-import { Card, CardHeader, CardIcon, CardTool, CardBody } from "../window/Card";
-import { ToolButton } from "../window/ToolButton";
-import useToolStore from "@/store/tool";
+import { setLaunchIndex, setLaunchOption, toolStore } from "@/store/tool"
+import { Plus, SettingConfig, Switch } from "@icon-park/react"
+import { useSnapshot } from "valtio"
+import { Card, CardBody, CardHeader, CardIcon, CardTool } from "../window/Card"
+import { ToolButton } from "../window/ToolButton"
const LaunchOption = () => {
- const { launchOptions, setLaunchOption, launchIndex, setLaunchIndex } = useToolStore()
+ void toolStore.start()
+ const { launchOptions, launchIndex } = useSnapshot(toolStore.state)
return (
@@ -29,13 +31,15 @@ const LaunchOption = () => {
-
-
+
+