From 9e3055ba859d2c3e5e49c8528f075cc5c3834fe7 Mon Sep 17 00:00:00 2001
From: kunish <kunish.butt@gmail.com>
Date: Sat, 2 Sep 2023 13:54:59 +0800
Subject: [PATCH] refactor(config): split config page components

---
 src/i18n/en.ts       |   1 +
 src/i18n/zh.ts       |   1 +
 src/pages/Config.tsx | 166 ++++++++++++++++++++++++-------------------
 src/types.d.ts       |   5 +-
 4 files changed, 96 insertions(+), 77 deletions(-)

diff --git a/src/i18n/en.ts b/src/i18n/en.ts
index 146edde..a2ee778 100644
--- a/src/i18n/en.ts
+++ b/src/i18n/en.ts
@@ -33,4 +33,5 @@ export default {
   destination: 'Destination',
   close: 'Close',
   reset: 'Reset',
+  dnsQuery: 'DNS Query',
 }
diff --git a/src/i18n/zh.ts b/src/i18n/zh.ts
index 90e77ad..5f618ee 100644
--- a/src/i18n/zh.ts
+++ b/src/i18n/zh.ts
@@ -33,4 +33,5 @@ export default {
   destination: '目标地址',
   close: '关闭',
   reset: '重置',
+  dnsQuery: 'DNS 查询',
 }
diff --git a/src/pages/Config.tsx b/src/pages/Config.tsx
index 667838f..fd9813a 100644
--- a/src/pages/Config.tsx
+++ b/src/pages/Config.tsx
@@ -1,11 +1,66 @@
 import { createForm } from '@felte/solid'
 import { validator } from '@felte/validator-zod'
+import { useI18n } from '@solid-primitives/i18n'
+import { makePersisted } from '@solid-primitives/storage'
 import { For, Show, createSignal, onMount } from 'solid-js'
 import { z } from 'zod'
+import { PROXIES_PREVIEW_TYPE } from '~/config/enum'
 import { useRequest } from '~/signals'
 import type { DNSQuery, Config as IConfig } from '~/types'
 
-const schema = z.object({
+const dnsQueryFormSchema = z.object({
+  name: z.string(),
+  type: z.string(),
+})
+
+const DNSQueryForm = () => {
+  const [t] = useI18n()
+  const request = useRequest()
+
+  const { form } = createForm<z.infer<typeof dnsQueryFormSchema>>({
+    extend: validator({ schema: dnsQueryFormSchema }),
+    onSubmit: async (values) => {
+      request
+        .get('dns/query', {
+          searchParams: { name: values.name, type: values.type },
+        })
+        .json<DNSQuery>()
+        .then(({ Answer }) =>
+          setDNSQueryResult(Answer?.map(({ data }) => data) || []),
+        )
+    },
+  })
+
+  const [DNSQueryResult, setDNSQueryResult] = createSignal<string[]>([])
+
+  return (
+    <div class="flex items-center gap-2">
+      <form use:form={form} class="contents">
+        <input name="name" class="input input-bordered flex-1" />
+
+        <select name="type" class="select select-bordered">
+          <option>A</option>
+          <option>AAAA</option>
+          <option>MX</option>
+        </select>
+
+        <button type="submit" class="btn btn-primary">
+          {t('dnsQuery')}
+        </button>
+      </form>
+
+      <Show when={DNSQueryResult().length > 0}>
+        <div class="flex flex-col p-4">
+          <For each={DNSQueryResult()}>
+            {(item) => <div class="py-2">{item}</div>}
+          </For>
+        </div>
+      </Show>
+    </div>
+  )
+}
+
+const configFormSchema = z.object({
   port: z.number(),
   'socks-port': z.number(),
   'redir-port': z.number(),
@@ -13,35 +68,9 @@ const schema = z.object({
   'mixed-port': z.number(),
 })
 
-import { makePersisted } from '@solid-primitives/storage'
-import { PROXIES_PREVIEW_TYPE } from '~/config/enum'
-
-export const [proxiesPreviewType, setProxiesPreviewType] = makePersisted(
-  createSignal(PROXIES_PREVIEW_TYPE.BAR),
-  {
-    name: 'proxiesPreviewType',
-    storage: localStorage,
-  },
-)
-
-export default () => {
+const ConfigForm = () => {
   const request = useRequest()
 
-  const [DNSQueryName, setDNSQueryName] = createSignal('')
-  const [DNSQueryResult, setDNSQueryResult] = createSignal<string[]>([])
-
-  const onDNSQuery = () =>
-    request
-      .get('dns/query', {
-        searchParams: {
-          name: DNSQueryName(),
-        },
-      })
-      .json<DNSQuery>()
-      .then(({ Answer }) => {
-        setDNSQueryResult(Answer.map(({ data }) => data))
-      })
-
   const portsList = [
     {
       label: 'Http Port',
@@ -65,9 +94,9 @@ export default () => {
     },
   ]
 
-  const { form, setInitialValues, reset } = createForm<z.infer<typeof schema>>({
-    extend: validator({ schema }),
-  })
+  const { form, setInitialValues, reset } = createForm<
+    z.infer<typeof configFormSchema>
+  >({ extend: validator({ schema: configFormSchema }) })
 
   onMount(async () => {
     const configs = await request.get('configs').json<IConfig>()
@@ -78,35 +107,42 @@ export default () => {
 
   return (
     <div>
-      <form
-        class="flex items-center gap-2"
-        onSubmit={(e) => {
-          e.preventDefault()
-          onDNSQuery()
-        }}
-      >
-        <input
-          class="input input-bordered flex-1"
-          value={DNSQueryName()}
-          onSubmit={onDNSQuery}
-          onInput={(e) => setDNSQueryName(e.target.value)}
-        />
-
-        <button type="submit" class="btn btn-primary">
-          DNS Query
-        </button>
+      <form class="contents" use:form={form}>
+        <For each={portsList}>
+          {(item) => (
+            <div class="form-control w-64 max-w-xs">
+              <label class="label">
+                <span class="label-text">{item.label}</span>
+              </label>
+              <input
+                name={item.key}
+                type="number"
+                class="input input-bordered"
+                placeholder={item.label}
+              />
+            </div>
+          )}
+        </For>
       </form>
+    </div>
+  )
+}
 
-      <Show when={DNSQueryResult().length > 0}>
-        <div class="flex flex-col p-4">
-          <For each={DNSQueryResult()}>
-            {(item) => <div class="py-2">{item}</div>}
-          </For>
-        </div>
-      </Show>
+export const [proxiesPreviewType, setProxiesPreviewType] = makePersisted(
+  createSignal(PROXIES_PREVIEW_TYPE.BAR),
+  { name: 'proxiesPreviewType', storage: localStorage },
+)
 
-      <div class="mt-4">
+export default () => {
+  return (
+    <div class="flex flex-col gap-4">
+      <DNSQueryForm />
+
+      <ConfigForm />
+
+      <div>
         <div>Proxies preview type:</div>
+
         <div class="join">
           <label class="flex items-center">
             Bar
@@ -132,24 +168,6 @@ export default () => {
           </label>
         </div>
       </div>
-
-      <form class="contents" use:form={form}>
-        <For each={portsList}>
-          {(item) => (
-            <div class="form-control w-64 max-w-xs">
-              <label class="label">
-                <span class="label-text">{item.label}</span>
-              </label>
-              <input
-                name={item.key}
-                type="number"
-                class="input input-bordered"
-                placeholder={item.label}
-              />
-            </div>
-          )}
-        </For>
-      </form>
     </div>
   )
 }
diff --git a/src/types.d.ts b/src/types.d.ts
index f722b6f..2e8d58a 100644
--- a/src/types.d.ts
+++ b/src/types.d.ts
@@ -1,8 +1,7 @@
 declare module 'solid-js' {
   namespace JSX {
     interface Directives {
-      form: {}
-      sortable: {}
+      [name: string]: {}
     }
   }
 }
@@ -157,7 +156,7 @@ export type DNSQuery = {
     Qtype: number
     Qclass: number
   }[]
-  Answer: {
+  Answer?: {
     TTL: number
     data: string
     name: string