fix: proxy provider style

Zephyruso · Feb 20, 2025 · ebeb17e · ebeb17e
1 parent dcdd87f
commit ebeb17e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/src/components/proxies/ProxyGroup.vue b/src/components/proxies/ProxyGroup.vue
@@ -119,10 +119,12 @@ const availableProxies = computed(() => {
 })
 
 const proxiesCount = computed(() => {
-  if (availableProxies.value < renderProxies.value.length) {
-    return `${availableProxies.value}/${renderProxies.value.length}`
+  const all = proxyGroup.value.all?.length ?? 0
+
+  if (availableProxies.value < all) {
+    return `${availableProxies.value}/${all}`
   }
-  return renderProxies.value.length
+  return all
 })
 
 const isLatencyTesting = ref(false)

diff --git a/src/components/proxies/ProxyProvider.vue b/src/components/proxies/ProxyProvider.vue
@@ -4,10 +4,10 @@
       <div class="flex items-center gap-2">
         <div class="text-lg font-medium sm:text-xl">
           {{ proxyProvider.name }}
-          <span class="text-sm"> ({{ proxiesCount }}) </span>
-          <span class="ml-1 text-sm text-base-content/60"
-            >{{ $t('updated') }} {{ fromNow(proxyProvider.updatedAt) }}</span
-          >
+          <span class="text-sm font-normal text-base-content/60"> ({{ proxiesCount }}) </span>
+          <span class="text-sm font-normal text-base-content/60">
+            {{ $t('updated') }} {{ fromNow(proxyProvider.updatedAt) }}
+          </span>
         </div>
         <div class="flex-1" />
         <div class="flex gap-2">
@@ -43,8 +43,9 @@
         class="flex justify-between text-sm text-base-content/60"
       >
         <div>
-          {{ subscriptionInfo.used }} / {{ subscriptionInfo.total }} (
-          {{ subscriptionInfo.percentage }}% )
+          {{ subscriptionInfo.used }} / {{ subscriptionInfo.total }} ({{
+            subscriptionInfo.percentage
+          }}%)
         </div>
         <div>{{ subscriptionInfo.expirePrefix() }}: {{ subscriptionInfo.expireStr() }}</div>
       </div>
@@ -131,10 +132,12 @@ const availableProxies = computed(() => {
   return renderProxies.value.filter((proxy) => getLatencyByName(proxy) !== NOT_CONNECTED).length
 })
 const proxiesCount = computed(() => {
-  if (availableProxies.value < renderProxies.value.length) {
-    return `${availableProxies.value}/${renderProxies.value.length}`
+  const all = proxyProvider.value.proxies?.length ?? 0
+
+  if (availableProxies.value < all) {
+    return `${availableProxies.value}/${all}`
   }
-  return renderProxies.value.length
+  return all
 })
 
 const subscriptionInfo = computed(() => {