diff --git a/src/components/ProxyPreviewBar.tsx b/src/components/ProxyPreviewBar.tsx index 1c9ab25e..5b64e676 100644 --- a/src/components/ProxyPreviewBar.tsx +++ b/src/components/ProxyPreviewBar.tsx @@ -41,7 +41,7 @@ export const ProxyPreviewBar = (props: { ) return ( -
+
+
[ diff --git a/src/components/SubscriptionInfo.tsx b/src/components/SubscriptionInfo.tsx index 51ab758e..6c3f7d4e 100644 --- a/src/components/SubscriptionInfo.tsx +++ b/src/components/SubscriptionInfo.tsx @@ -11,7 +11,7 @@ const getSubscriptionsInfo = (subscriptionInfo: ISubscriptionInfo) => { const used = byteSize(Download + Upload, { units: 'iec', }) - const percentage = toFinite((((Download + Upload) / Total) * 100).toFixed(2)) + const percentage = Math.min(toFinite((((Download + Upload) / Total) * 100).toFixed(1)),999) const expirePrefix = () => { const [t] = useI18n() @@ -49,14 +49,22 @@ export const SubscriptionInfo = (props: { return ( <> - +
+ -
- {`${info.used}`} / {`${info.total}`} ( {info.percentage}% ) +
+ {info.percentage}% +
-
- {info.expirePrefix()}: {info.expireStr()} +
+
+ {`${info.used}`} / {`${info.total}`} +
+ +
+ {info.expirePrefix()}: {info.expireStr()} +
) diff --git a/src/pages/Proxies.tsx b/src/pages/Proxies.tsx index 1d0095a7..04324c11 100644 --- a/src/pages/Proxies.tsx +++ b/src/pages/Proxies.tsx @@ -1,6 +1,7 @@ import { makePersisted } from '@solid-primitives/storage' import { IconBrandSpeedtest, + IconChevronRight, IconReload, IconSettings, } from '@tabler/icons-solidjs' @@ -274,8 +275,8 @@ export default () => { {formatProxyType(proxyGroup.type)} 0}> + -  ::  {proxyGroup.now} @@ -343,12 +344,16 @@ export default () => { const title = ( <>
-
- {proxyProvider.name} +
+ {proxyProvider.name}
{proxyProvider.proxies.length}
+ +
+ {proxyProvider.vehicleType} +
@@ -399,7 +404,7 @@ export default () => { />
- {proxyProvider.vehicleType} :: {t('updated')}{' '} + {t('updated')}{' '} {formatTimeFromNow(proxyProvider.updatedAt)}