From 9f7f8d0161103c222747b4d65f330057edd87d81 Mon Sep 17 00:00:00 2001
From: kunish <kunish.butt@gmail.com>
Date: Fri, 11 Oct 2024 01:38:17 +0800
Subject: [PATCH] feat(proxies): add multi-column render back

---
 src/components/Collapse.tsx      |  2 +-
 src/components/ProxyNodeCard.tsx | 74 ++++++++++++++++----------------
 src/pages/Proxies.tsx            |  4 +-
 tailwind.config.ts               |  8 ++--
 4 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/src/components/Collapse.tsx b/src/components/Collapse.tsx
index 2fd66bf..e406b9d 100644
--- a/src/components/Collapse.tsx
+++ b/src/components/Collapse.tsx
@@ -41,7 +41,7 @@ export const Collapse: ParentComponent<Props> = (props) => {
       <div
         class={twMerge(
           getCollapseContentClassName(),
-          'collapse-content grid grid-cols-1 gap-2 transition-opacity duration-1000 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-5',
+          'collapse-content grid grid-cols-1 gap-2 transition-opacity duration-1000 xl:grid-cols-3 2xl:grid-cols-4',
         )}
       >
         <Show when={props.isOpen}>{children(() => props.children)()}</Show>
diff --git a/src/components/ProxyNodeCard.tsx b/src/components/ProxyNodeCard.tsx
index 37cb074..3e6a736 100644
--- a/src/components/ProxyNodeCard.tsx
+++ b/src/components/ProxyNodeCard.tsx
@@ -43,49 +43,47 @@ export const ProxyNodeCard = (props: {
       onClick={onClick}
     >
       <div class="card-body">
-        <span class="card-title line-clamp-1 text-start text-sm">
-          {proxyName}
-        </span>
+        <div class="card-title flex items-center justify-between gap-2">
+          <span class="line-clamp-1 text-start text-sm">{proxyName}</span>
 
-        <div class="flex items-center justify-between gap-2">
-          <div class="flex items-center gap-2">
-            <div class="badge badge-primary badge-sm font-bold uppercase">
-              {formatProxyType(proxyNode()?.type)}
-            </div>
-
-            <Show when={specialType()}>
-              <div class="badge badge-secondary badge-sm">{specialType()}</div>
-            </Show>
-
-            <Show when={supportIPv6()}>
-              <div class="badge badge-accent badge-sm">IPv6</div>
-            </Show>
+          <div class="badge badge-primary badge-sm font-bold uppercase">
+            {formatProxyType(proxyNode()?.type)}
           </div>
+        </div>
 
-          <div class="flex items-center gap-2">
-            <Latency
-              name={props.proxyName}
-              class={twMerge(isSelected && 'badge')}
-            />
+        <div class="flex flex-wrap items-center gap-2">
+          <Show when={specialType()}>
+            <div class="badge badge-secondary badge-sm">{specialType()}</div>
+          </Show>
 
-            <Button
-              class="btn-square btn-sm"
-              icon={
-                <IconBrandSpeedtest
-                  class={twMerge(
-                    'size-6',
-                    proxyLatencyTestingMap()[proxyName] &&
-                      'animate-pulse text-success',
-                  )}
-                />
-              }
-              onClick={(e) => {
-                e.stopPropagation()
+          <Show when={supportIPv6()}>
+            <div class="badge badge-accent badge-sm">IPv6</div>
+          </Show>
+        </div>
 
-                void proxyLatencyTest(proxyName, proxyNode().provider)
-              }}
-            />
-          </div>
+        <div class="card-actions items-center justify-end">
+          <Latency
+            name={props.proxyName}
+            class={twMerge(isSelected && 'badge')}
+          />
+
+          <Button
+            class="btn-square btn-sm"
+            icon={
+              <IconBrandSpeedtest
+                class={twMerge(
+                  'size-6',
+                  proxyLatencyTestingMap()[proxyName] &&
+                    'animate-pulse text-success',
+                )}
+              />
+            }
+            onClick={(e) => {
+              e.stopPropagation()
+
+              void proxyLatencyTest(proxyName, proxyNode().provider)
+            }}
+          />
         </div>
       </div>
     </div>
diff --git a/src/pages/Proxies.tsx b/src/pages/Proxies.tsx
index cadb547..2a2766f 100644
--- a/src/pages/Proxies.tsx
+++ b/src/pages/Proxies.tsx
@@ -173,7 +173,7 @@ export default () => {
 
         <div class="flex-1 overflow-y-auto">
           <Show when={activeTab() === ActiveTab.proxies}>
-            <div class="flex flex-col gap-2">
+            <div class="grid grid-cols-1 place-items-start gap-2 sm:grid-cols-2">
               <For each={renderProxies()}>
                 {(proxyGroup) => {
                   const sortedProxyNames = createMemo(() =>
@@ -278,7 +278,7 @@ export default () => {
           </Show>
 
           <Show when={activeTab() === ActiveTab.proxyProviders}>
-            <div class="flex flex-col gap-2">
+            <div class="grid grid-cols-1 place-items-start gap-2 sm:grid-cols-2">
               <For each={proxyProviders()}>
                 {(proxyProvider) => {
                   const sortedProxyNames = createMemo(() =>
diff --git a/tailwind.config.ts b/tailwind.config.ts
index 5d38df3..4269336 100644
--- a/tailwind.config.ts
+++ b/tailwind.config.ts
@@ -6,9 +6,11 @@ export default {
   plugins: [daisyui],
   daisyui: { themes: true },
   theme: {
-    fontFamily: {
-      twemoji: ['system-ui', 'Twemoji Mozilla', 'Fira Sans', 'monospace'],
-      'no-twemoji': ['system-ui', 'Fira Sans', 'monospace'],
+    extend: {
+      fontFamily: {
+        twemoji: ['system-ui', 'Twemoji Mozilla', 'Fira Sans', 'monospace'],
+        'no-twemoji': ['system-ui', 'Fira Sans', 'monospace'],
+      },
     },
   },
 } as Config