From 91a003d0164310e95d34269a9568cd2a2bcc6b63 Mon Sep 17 00:00:00 2001
From: Purp1e <47248616+Purple-CSGO@users.noreply.github.com>
Date: Wed, 12 Mar 2025 13:16:25 +0800
Subject: [PATCH] [feat] adapt steam store + adjust dark mode styles

---
 src/app/(main)/preference/general/page.tsx |  8 +++++++-
 src/app/(main)/preference/path/page.tsx    | 13 ++++++++++---
 src/app/prepare/page.tsx                   | 15 +++++++++++----
 src/app/providers.tsx                      |  2 +-
 src/components/cstb/CommonDir.tsx          |  2 +-
 src/components/cstb/Notice.tsx             |  6 ++++++
 src/components/window/Card.tsx             |  2 +-
 src/components/window/Nav.tsx              |  3 ++-
 src/components/window/SideBar.tsx          | 15 ++++++++++++---
 9 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/src/app/(main)/preference/general/page.tsx b/src/app/(main)/preference/general/page.tsx
index aa92dcb..0db2888 100644
--- a/src/app/(main)/preference/general/page.tsx
+++ b/src/app/(main)/preference/general/page.tsx
@@ -1,12 +1,18 @@
 "use client"
 import { appStore } from "@/store/app"
+import { useEffect } from "react"
 import { useSnapshot } from "valtio"
 
 export default function Page() {
+  useEffect(() => {
+    ;async () => {
+      appStore.start()
+    }
+  }, [])
   const app = useSnapshot(appStore.state)
 
   return (
-    <div className="flex flex-col gap-3 items-start pt-2 pb-1">
+    <div className="flex flex-col items-start gap-3 pt-2 pb-1">
       <p>版本号：{app.version}</p>
       <p>是否有更新：{app.hasUpdate ? "有" : "无"}</p>
       <p>初始化：{app.inited ? "是" : "否"}</p>
diff --git a/src/app/(main)/preference/path/page.tsx b/src/app/(main)/preference/path/page.tsx
index de889b4..3df5a18 100644
--- a/src/app/(main)/preference/path/page.tsx
+++ b/src/app/(main)/preference/path/page.tsx
@@ -1,8 +1,15 @@
 "use client"
-import SteamStore from "@/store/steam"
+import { currentUser, steamStore } from "@/store/steam"
+import { useEffect } from "react"
+import { useSnapshot } from "valtio"
 
 export default function Page() {
-  const steam = SteamStore()
+  useEffect(() => {
+    ;async () => {
+      steamStore.start()
+    }
+  }, [])
+  const steam = useSnapshot(steamStore.state)
 
   return (
     <div className="flex flex-col items-start gap-3 pt-2 pb-1">
@@ -10,7 +17,7 @@ export default function Page() {
       <p>游戏路径：{steam.csDir}</p>
       <p>Steam路径有效：{steam.isDirValid ? "是" : "否"}</p>
       <p>游戏路径有效：{steam.isCsDirValid ? "是" : "否"}</p>
-      <p>Steam账号：{steam.currentUser().accountName}</p>
+      <p>Steam账号：{currentUser().accountName}</p>
     </div>
   )
 }
diff --git a/src/app/prepare/page.tsx b/src/app/prepare/page.tsx
index 339b6e0..3c933f8 100644
--- a/src/app/prepare/page.tsx
+++ b/src/app/prepare/page.tsx
@@ -1,8 +1,15 @@
 "use client"
-import useSteamStore from "@/store/steam"
 
+import { steamStore, setDir, setCsDir, currentUser } from "@/store/steam"
+import { useEffect } from "react"
+import { useSnapshot } from "valtio"
 export default function Page() {
-  const { dir, setDir, csDir, setCsDir, currentUser } = useSteamStore()
+  useEffect(() => {
+    ;async () => {
+      steamStore.start()
+    }
+  }, [])
+  const steam = useSnapshot(steamStore.state)
   return (
     <div
       className="flex flex-col items-center justify-center w-full h-screen gap-6"
@@ -16,12 +23,12 @@ export default function Page() {
       <div className="flex flex-col w-full gap-6 p-5 border rounded-lg bg-white/40">
         <input
           className="px-2 py-1 rounded-lg"
-          value={dir}
+          value={steam.dir}
           onChange={(e) => setDir(e.target.value)}
         />
         <input
           className="px-2 py-1 rounded-lg"
-          value={csDir}
+          value={steam.csDir}
           onChange={(e) => setCsDir(e.target.value)}
         />
 
diff --git a/src/app/providers.tsx b/src/app/providers.tsx
index 46eb2b3..df47df3 100644
--- a/src/app/providers.tsx
+++ b/src/app/providers.tsx
@@ -6,7 +6,7 @@ import { ThemeProvider as NextThemesProvider } from "next-themes"
 export default function Providers({ children }: { children: React.ReactNode }) {
   return (
     <HeroUIProvider className="h-full bg-transparent">
-      <NextThemesProvider attribute="class" defaultTheme="light">
+      <NextThemesProvider attribute="class" defaultTheme="light" >
         <ToastProvider toastOffset={10} placement="top-center" />
         {children}
       </NextThemesProvider>
diff --git a/src/components/cstb/CommonDir.tsx b/src/components/cstb/CommonDir.tsx
index 8be9d35..e37f379 100644
--- a/src/components/cstb/CommonDir.tsx
+++ b/src/components/cstb/CommonDir.tsx
@@ -9,7 +9,7 @@ const RoundedButton = ({ children }: RoundedButtonProps) => {
   return (
     <button
       type="button"
-      className="flex items-center justify-center px-3 py-1 transition rounded-full min-w-fit active:scale-95 hover:bg-black/10 text-zinc-700 bg-black/5"
+      className="flex items-center justify-center px-3 py-1 transition rounded-full min-w-fit active:scale-95 hover:bg-black/10 text-zinc-700 dark:text-zinc-100 bg-black/5"
     >
       {children}
     </button>
diff --git a/src/components/cstb/Notice.tsx b/src/components/cstb/Notice.tsx
index 0c8225d..63a812a 100644
--- a/src/components/cstb/Notice.tsx
+++ b/src/components/cstb/Notice.tsx
@@ -3,8 +3,14 @@ import { appStore } from "@/store/app"
 import { Refresh, VolumeNotice } from "@icon-park/react"
 import { ToolButton } from "../window/ToolButton"
 import { useSnapshot } from "valtio"
+import { useEffect } from "react"
 
 const Notice = () => {
+  useEffect(() => {
+    ;async () => {
+      appStore.start()
+    }
+  }, [])
   appStore.start()
   const app = useSnapshot(appStore.state)
 
diff --git a/src/components/window/Card.tsx b/src/components/window/Card.tsx
index e286197..2eaaaac 100644
--- a/src/components/window/Card.tsx
+++ b/src/components/window/Card.tsx
@@ -51,7 +51,7 @@ const CardTool = ({ children }: CardProps) => {
 
 const CardBody = ({ children }: CardProps) => {
   return (
-    <div className="w-full h-full text-sm tracking-wide text-zinc-800">
+    <div className="w-full h-full text-sm tracking-wide text-zinc-800 dark:text-white">
       {children}
     </div>
   )
diff --git a/src/components/window/Nav.tsx b/src/components/window/Nav.tsx
index 33f9a01..4938309 100644
--- a/src/components/window/Nav.tsx
+++ b/src/components/window/Nav.tsx
@@ -50,7 +50,8 @@ const Nav = () => {
           resetToolStore()
           addToast({
             title: "重置成功",
-            description: "已重置所有设置，请重新启动程序",
+            color: 'success'
+            // description: "已重置所有设置",
           })
         }}
       >
diff --git a/src/components/window/SideBar.tsx b/src/components/window/SideBar.tsx
index fb58cf5..78b74c0 100644
--- a/src/components/window/SideBar.tsx
+++ b/src/components/window/SideBar.tsx
@@ -2,7 +2,7 @@
 import { Home, MonitorOne, Movie, Setting, Terminal, Toolkit } from "@icon-park/react"
 import { Button, cn } from "@heroui/react"
 import { usePathname, useRouter } from "next/navigation"
-import type { ReactNode } from "react"
+import { useEffect, type ReactNode } from "react"
 
 // import { platform } from "@tauri-apps/plugin-os"
 import { appStore, setVersion } from "@/store/app"
@@ -63,7 +63,11 @@ const Avatar = () => {
 }
 
 const SideBar = () => {
-  appStore.start()
+  useEffect(() => {
+    ;async () => {
+      appStore.start()
+    }
+  }, [])
   const { version } = useSnapshot(appStore.state)
 
   return (
@@ -104,7 +108,12 @@ const SideBar = () => {
 
       <div className="mx-auto text-sm text-center text-zinc-500" data-tauri-drag-region>
         <p>版本号</p>
-        <Button variant="light" size="sm" className="mt-0.5 text-zinc-600" onPress={() => setVersion("x.y.z")}>
+        <Button
+          variant="light"
+          size="sm"
+          className="mt-0.5 text-zinc-600"
+          onPress={() => setVersion("x.y.z")}
+        >
           {version}
         </Button>
       </div>