diff --git a/src/renderer/src/App.tsx b/src/renderer/src/App.tsx index da19a739..2357dc25 100644 --- a/src/renderer/src/App.tsx +++ b/src/renderer/src/App.tsx @@ -44,7 +44,7 @@ const App: React.FC = () => { return (
-
+

Mihomo Party

+
+ + + + + + ) +} + +export default ProfileItem diff --git a/src/renderer/src/components/sider/profile-card.tsx b/src/renderer/src/components/sider/profile-card.tsx index 683529c4..039fdf7c 100644 --- a/src/renderer/src/components/sider/profile-card.tsx +++ b/src/renderer/src/components/sider/profile-card.tsx @@ -1,7 +1,7 @@ import { Button, Card, CardBody, CardFooter, Progress } from '@nextui-org/react' import { useProfileConfig } from '@renderer/hooks/use-profile' import { useLocation, useNavigate } from 'react-router-dom' -import { calcTraffic } from '@renderer/utils/calc' +import { calcTraffic, calcPercent } from '@renderer/utils/calc' import { IoMdRefresh } from 'react-icons/io' const ProfileCard: React.FC = () => { @@ -50,14 +50,3 @@ const ProfileCard: React.FC = () => { } export default ProfileCard - -function calcPercent( - upload: number | undefined, - download: number | undefined, - total: number | undefined -): number { - if (upload === undefined || download === undefined || total === undefined) { - return 100 - } - return Math.round(((upload + download) / total) * 100) -} diff --git a/src/renderer/src/pages/profiles.tsx b/src/renderer/src/pages/profiles.tsx index c9e0a751..9c357241 100644 --- a/src/renderer/src/pages/profiles.tsx +++ b/src/renderer/src/pages/profiles.tsx @@ -1,11 +1,13 @@ import { Button, Input } from '@nextui-org/react' import BasePage from '@renderer/components/base/base-page' +import ProfileItem from '@renderer/components/profiles/profile-item' import { useProfileConfig } from '@renderer/hooks/use-profile' import { useState } from 'react' import { MdContentPaste } from 'react-icons/md' const Profiles: React.FC = () => { const { profileConfig, addProfileItem } = useProfileConfig() + const { current, items } = profileConfig || {} const [importing, setImporting] = useState(false) const [url, setUrl] = useState('') @@ -22,7 +24,7 @@ const Profiles: React.FC = () => { return ( -
+
{ 导入
- {JSON.stringify(profileConfig)} +
+ {items?.map((item) => ( + {}} + /> + ))} +
) } diff --git a/src/renderer/src/utils/calc.ts b/src/renderer/src/utils/calc.ts index 132b5457..c170d8e4 100644 --- a/src/renderer/src/utils/calc.ts +++ b/src/renderer/src/utils/calc.ts @@ -17,3 +17,14 @@ export function calcTraffic(bit: number): string { bit /= 1024 return `${bit.toFixed(2)} YB` } + +export function calcPercent( + upload: number | undefined, + download: number | undefined, + total: number | undefined +): number { + if (upload === undefined || download === undefined || total === undefined) { + return 100 + } + return Math.round(((upload + download) / total) * 100) +}