From 97b18d8c5cc60e8ba27bc520c90c2948d849d207 Mon Sep 17 00:00:00 2001 From: TaurusXin Date: Thu, 25 Jul 2024 09:37:18 +0800 Subject: [PATCH] feat: UI --- frontend/package.json | 1 + frontend/package.json.md5 | 2 +- frontend/pnpm-lock.yaml | 25 ++++++++++++++++++++ frontend/src/components/ui/separator.tsx | 29 ++++++++++++++++++++++++ frontend/src/pages/Panel.tsx | 2 ++ main.go | 4 ++-- 6 files changed, 60 insertions(+), 3 deletions(-) create mode 100644 frontend/src/components/ui/separator.tsx diff --git a/frontend/package.json b/frontend/package.json index e24c405..2dd0c35 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -13,6 +13,7 @@ "@radix-ui/react-checkbox": "^1.1.1", "@radix-ui/react-dialog": "^1.1.1", "@radix-ui/react-progress": "^1.1.0", + "@radix-ui/react-separator": "^1.1.0", "@radix-ui/react-slot": "^1.1.0", "@radix-ui/react-toast": "^1.2.1", "class-variance-authority": "^0.7.0", diff --git a/frontend/package.json.md5 b/frontend/package.json.md5 index 0ac0d32..b1a8aa1 100644 --- a/frontend/package.json.md5 +++ b/frontend/package.json.md5 @@ -1 +1 @@ -50363c2ee2f3f6316fa41844894a6d9c \ No newline at end of file +8857565900ea1a36112664798db58d03 \ No newline at end of file diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index 85d7dd9..69b55b2 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -20,6 +20,9 @@ importers: '@radix-ui/react-progress': specifier: ^1.1.0 version: 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-separator': + specifier: ^1.1.0 + version: 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-slot': specifier: ^1.1.0 version: 1.1.0(@types/react@18.3.3)(react@18.3.1) @@ -436,6 +439,19 @@ packages: '@types/react-dom': optional: true + '@radix-ui/react-separator@1.1.0': + resolution: {integrity: sha512-3uBAs+egzvJBDZAzvb/n4NxxOYpnspmWxO2u5NbZ8Y6FM/NdrGSF9bop3Cf6F6C71z1rTSn8KV0Fo2ZVd79lGA==} + peerDependencies: + '@types/react': '*' + '@types/react-dom': '*' + react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc + react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc + peerDependenciesMeta: + '@types/react': + optional: true + '@types/react-dom': + optional: true + '@radix-ui/react-slot@1.1.0': resolution: {integrity: sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==} peerDependencies: @@ -1714,6 +1730,15 @@ snapshots: '@types/react': 18.3.3 '@types/react-dom': 18.3.0 + '@radix-ui/react-separator@1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + dependencies: + '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) + optionalDependencies: + '@types/react': 18.3.3 + '@types/react-dom': 18.3.0 + '@radix-ui/react-slot@1.1.0(@types/react@18.3.3)(react@18.3.1)': dependencies: '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.3)(react@18.3.1) diff --git a/frontend/src/components/ui/separator.tsx b/frontend/src/components/ui/separator.tsx new file mode 100644 index 0000000..6d7f122 --- /dev/null +++ b/frontend/src/components/ui/separator.tsx @@ -0,0 +1,29 @@ +import * as React from "react" +import * as SeparatorPrimitive from "@radix-ui/react-separator" + +import { cn } from "@/lib/utils" + +const Separator = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>( + ( + { className, orientation = "horizontal", decorative = true, ...props }, + ref + ) => ( + + ) +) +Separator.displayName = SeparatorPrimitive.Root.displayName + +export { Separator } diff --git a/frontend/src/pages/Panel.tsx b/frontend/src/pages/Panel.tsx index 01b74ae..10a22e2 100644 --- a/frontend/src/pages/Panel.tsx +++ b/frontend/src/pages/Panel.tsx @@ -26,6 +26,7 @@ import { } from '@/components/ui/alert-dialog' import Download from './Download' +import { Separator } from '@/components/ui/separator' const Panel: React.FC = () => { const [macInputDisabled, setMacInputDisabled] = useState(false) @@ -176,6 +177,7 @@ const Panel: React.FC = () => { +
diff --git a/main.go b/main.go index 05a7137..147b2f1 100644 --- a/main.go +++ b/main.go @@ -25,8 +25,8 @@ func main() { // Create application with options err := wails.Run(&options.App{ Title: "MacFastLookup", - Width: 450, - Height: 350, + Width: 540, + Height: 375, AssetServer: &assetserver.Options{ Assets: assets, },