diff --git a/public/logo_rounded.png b/public/logo_rounded.png new file mode 100644 index 0000000..d0318f1 Binary files /dev/null and b/public/logo_rounded.png differ diff --git a/public/logo_square.png b/public/logo_square.png new file mode 100644 index 0000000..1235fb9 Binary files /dev/null and b/public/logo_square.png differ diff --git a/src/app/(main)/users/layout.tsx b/src/app/(main)/users/layout.tsx index fe428e9..80eea61 100644 --- a/src/app/(main)/users/layout.tsx +++ b/src/app/(main)/users/layout.tsx @@ -10,7 +10,7 @@ import { import { ToolButton } from "@/components/window/ToolButton" import { cn } from "@heroui/react" import { - AssemblyLine, SettingConfig, + AssemblyLine, HardDisk, SettingConfig, UploadOne } from "@icon-park/react" import { usePathname, useRouter } from "next/navigation" @@ -24,7 +24,7 @@ export default function PreferenceLayout({ return (
- + {/* 云同步 - {/* + 保存 - */} + {children} - + */} {/* Steam用户区域 */}
diff --git a/src/components/cstb/SteamUsers.tsx b/src/components/cstb/SteamUsers.tsx index 286b37f..421b72f 100644 --- a/src/components/cstb/SteamUsers.tsx +++ b/src/components/cstb/SteamUsers.tsx @@ -1,10 +1,13 @@ import { User } from "@icon-park/react" import { Card, CardBody, CardHeader, CardIcon } from "../window/Card" -import { cn } from "@heroui/react" +import { Button, Chip, cn, Code } from "@heroui/react" +import { useSteamStore } from "@/store/steam" + +const SteamUsers = ({ className }: { className?: string }) => { + const steam = useSteamStore() -const SteamUsers = ({className}: {className?: string}) => { return ( - + Steam用户 @@ -12,13 +15,40 @@ const SteamUsers = ({className}: {className?: string}) => {
    -
  • Rop紫
  • -
  • 载物
  • -
  • 宫监
  • + {steam.state.users.map((user) => ( +
  • + avatar +
    +

    {user.personaName}

    +
    + + {user.accountName} + + + {user.steamID32} + + + {user.steamID64} + +
    +
    +
    + + +
    +
  • + ))}
) } -export default SteamUsers \ No newline at end of file +export default SteamUsers diff --git a/src/components/window/Header.tsx b/src/components/window/Header.tsx index fccdb28..7549f97 100644 --- a/src/components/window/Header.tsx +++ b/src/components/window/Header.tsx @@ -1,11 +1,15 @@ +import { useSteamStore } from "@/store/steam" + const Header = () => { + const steam = useSteamStore() + return (

- Faze.Rop紫本人 + {steam.currentUser().personaName || 'CS工具箱'}

- 本周使用CS工具箱 114 小时 + {steam.currentUser().accountName || '本周使用CS工具箱 114 小时'}

) diff --git a/src/components/window/SideBar.tsx b/src/components/window/SideBar.tsx index 0fb7013..9ee7140 100644 --- a/src/components/window/SideBar.tsx +++ b/src/components/window/SideBar.tsx @@ -50,16 +50,16 @@ const Avatar = () => { const path = usePathname() return ( - + onClick={() => router.push("/users")} + /> ) } diff --git a/src/store/steam.ts b/src/store/steam.ts index b242982..0476705 100644 --- a/src/store/steam.ts +++ b/src/store/steam.ts @@ -15,8 +15,8 @@ const defaultValue = { users: [ { steamID64: "76561198052315353", - steamID32: "STEAM_0:0:46157676", - accountName: "wrr", + steamID32: "46157676", + accountName: "wrr_account", personaName: "wrr", recent: 0, avatar: "",