Merge branch 'MetaCubeX:main' into main

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.90.0](https://github.com/MetaCubeX/metacubexd/compare/v1.89.0...v1.90.0) (2023-09-13)
+
+
+### Features
+
+* **connections:** shorten the tab names ([1a37a10](https://github.com/MetaCubeX/metacubexd/commit/1a37a106f8c421829854ffcb75b64b7885b00005))
+
 ## [1.89.0](https://github.com/MetaCubeX/metacubexd/compare/v1.88.1...v1.89.0) (2023-09-12)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "metacubexd",
-  "version": "1.89.0",
+  "version": "1.90.0",
   "description": "Clash.Meta Dashboard, The Official One, XD",
   "license": "MIT",
   "type": "module",

src/components/ConnectionsTableDetailsModal.tsx

@@ -5,7 +5,10 @@ export const ConnectionsTableDetailsModal: Component<{
   selectedConnectionID?: string
 }> = (props) => {
   return (
-    <dialog id="connections-table-details-modal" class="modal">
+    <dialog
+      id="connections-table-details-modal"
+      class="modal modal-bottom sm:modal-middle"
+    >
       <div class="modal-box">
         <Show when={props.selectedConnectionID}>
           <pre>

src/components/ConnectionsTableOrderingModal.tsx

@@ -95,8 +95,11 @@ export const ConnectionsTableOrderingModal = (props: {
   }
 
   return (
-    <dialog id="connections-table-ordering-modal" class="modal">
+    <dialog
-      <div class="modal-box w-80" onContextMenu={(e) => e.preventDefault()}>
+      id="connections-table-ordering-modal"
+      class="modal modal-bottom sm:modal-middle"
+    >
+      <div class="modal-box" onContextMenu={(e) => e.preventDefault()}>
         <DragDropProvider
           onDragStart={onDragStart}
           onDragEnd={onDragEnd as DragEventHandler}
@@ -115,15 +118,17 @@ export const ConnectionsTableOrderingModal = (props: {
           </DragOverlay>
         </DragDropProvider>
 
-        <Button
+        <div class="modal-action">
-          class="btn-neutral btn-sm ml-auto mt-4 block"
+          <Button
-          onClick={() => {
+            class="btn-neutral btn-sm ml-auto mt-4 block"
-            props.onOrderChange(CONNECTIONS_TABLE_INITIAL_COLUMN_ORDER)
+            onClick={() => {
-            props.onVisibleChange(CONNECTIONS_TABLE_INITIAL_COLUMN_VISIBILITY)
+              props.onOrderChange(CONNECTIONS_TABLE_INITIAL_COLUMN_ORDER)
-          }}
+              props.onVisibleChange(CONNECTIONS_TABLE_INITIAL_COLUMN_VISIBILITY)
-        >
+            }}
-          {t('reset')}
+          >
-        </Button>
+            {t('reset')}
+          </Button>
+        </div>
       </div>
 
       <form method="dialog" class="modal-backdrop">

src/i18n/en.ts

@@ -69,7 +69,6 @@ export default {
   switchEndpoint: 'Switch Endpoint',
   switchLanguage: 'Switch Language',
   latencyTestTimeoutDuration: 'Latency Test Timeout Duration',
-  closedConnections: 'Closed Connections',
   all: 'All',
   sequence: 'Sequence',
   payload: 'Payload',
@@ -79,4 +78,6 @@ export default {
   global: 'Global',
   rule: 'Rule',
   direct: 'Direct',
+  active: 'Active',
+  closed: 'Closed',
 }

src/i18n/zh.ts

@@ -69,7 +69,6 @@ export default {
   switchEndpoint: '切换后端',
   switchLanguage: '切换语言',
   latencyTestTimeoutDuration: '测速超时时间',
-  closedConnections: '已关闭连接',
   all: '全部',
   sequence: '序列号',
   payload: '内容',
@@ -79,4 +78,6 @@ export default {
   global: '全局',
   rule: '规则',
   direct: '直连',
+  active: '活动',
+  closed: '已关闭',
 }

src/pages/Connections.tsx

@@ -2,13 +2,13 @@ import { writeClipboard } from '@solid-primitives/clipboard'
 import { useI18n } from '@solid-primitives/i18n'
 import { makePersisted } from '@solid-primitives/storage'
 import {
-  IconCircleX,
+  IconInfoSmall,
-  IconInfoCircle,
   IconPlayerPause,
   IconPlayerPlay,
   IconSettings,
   IconSortAscending,
   IconSortDescending,
+  IconX,
   IconZoomInFilled,
   IconZoomOutFilled,
 } from '@tabler/icons-solidjs'
@@ -113,7 +113,7 @@ export default () => {
               modal?.showModal()
             }}
           >
-            <IconInfoCircle size="16" />
+            <IconInfoSmall size="16" />
           </Button>
         </div>
       ),
@@ -131,7 +131,7 @@ export default () => {
             class="btn-circle btn-xs"
             onClick={() => closeSingleConnectionAPI(row.original.id)}
           >
-            <IconCircleX size="16" />
+            <IconX size="16" />
           </Button>
         </div>
       ),
@@ -293,12 +293,12 @@ export default () => {
   const tabs = createMemo(() => [
     {
       type: ActiveTab.activeConnections,
-      name: t('activeConnections'),
+      name: t('active'),
       count: activeConnections().length,
     },
     {
       type: ActiveTab.closedConnections,
-      name: t('closedConnections'),
+      name: t('closed'),
       count: closedConnections().length,
     },
   ])
@@ -350,7 +350,7 @@ export default () => {
               }
             }}
           >
-            <IconCircleX />
+            <IconX />
           </Button>
 
           <Button