From fb1e620c304d5ddd3a44d19ffb8c7594fd236a68 Mon Sep 17 00:00:00 2001
From: shalluv <leon555thai@gmail.com>
Date: Thu, 7 Nov 2024 17:25:25 +0700
Subject: [PATCH] refactor: refactoring project

---
 .prettierrc                                   |   2 +
 pnpm-lock.yaml                                |   4 +-
 public/next.svg                               |   1 -
 public/vercel.svg                             |   1 -
 src/app/favicon.ico                           | Bin 25931 -> 2955 bytes
 src/app/form/[id]/done/page.tsx               |  15 +++
 src/app/form/[id]/layout.tsx                  |  23 +++-
 src/app/form/[id]/page.tsx                    |  35 +++--
 src/app/form/api/route.ts                     |   4 +-
 src/app/form/done/page.tsx                    |  15 ---
 src/app/layout.tsx                            |   4 +-
 src/app/page.tsx                              |   6 +-
 src/components/box.tsx                        |  11 ++
 src/components/checkbox.tsx                   |  32 +++++
 .../form/{form-question.tsx => field.tsx}     |   8 +-
 src/components/form/form-component.tsx        | 123 ++----------------
 src/components/form/form-container.tsx        |  20 ---
 src/components/form/form-header.tsx           |  15 ---
 src/components/form/index.ts                  |   2 +
 src/components/index.ts                       |   6 +
 src/components/single-select.tsx              |  37 ++++++
 src/components/textarea.tsx                   |  28 ++++
 src/lib/fetcher.ts                            |  50 -------
 src/lib/form/check-form.ts                    |   6 +-
 src/lib/form/get-column-detail.ts             |  19 ++-
 src/lib/form/get-form-ids.ts                  |  26 ++++
 src/lib/form/get-form-schema.ts               |  20 +--
 src/lib/form/get-nocoID.ts                    |  50 -------
 ...-provider.tsx => form-schema-provider.tsx} |  35 ++---
 src/types/form-column.ts                      |  11 ++
 src/types/form.d.ts                           |  17 ---
 src/types/form.ts                             |   7 +
 src/types/index.ts                            |   3 +
 33 files changed, 274 insertions(+), 362 deletions(-)
 delete mode 100644 public/next.svg
 delete mode 100644 public/vercel.svg
 create mode 100644 src/app/form/[id]/done/page.tsx
 delete mode 100644 src/app/form/done/page.tsx
 create mode 100644 src/components/box.tsx
 create mode 100644 src/components/checkbox.tsx
 rename src/components/form/{form-question.tsx => field.tsx} (67%)
 delete mode 100644 src/components/form/form-container.tsx
 delete mode 100644 src/components/form/form-header.tsx
 create mode 100644 src/components/form/index.ts
 create mode 100644 src/components/index.ts
 create mode 100644 src/components/single-select.tsx
 create mode 100644 src/components/textarea.tsx
 delete mode 100644 src/lib/fetcher.ts
 create mode 100644 src/lib/form/get-form-ids.ts
 delete mode 100644 src/lib/form/get-nocoID.ts
 rename src/providers/{form-provider.tsx => form-schema-provider.tsx} (57%)
 create mode 100644 src/types/form-column.ts
 delete mode 100644 src/types/form.d.ts
 create mode 100644 src/types/form.ts
 create mode 100644 src/types/index.ts

diff --git a/.prettierrc b/.prettierrc
index ab57dca..f9e575c 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -11,7 +11,9 @@
   "arrowParens": "always",
   "importOrder": [
     "^@/components(.*)$",
+    "^@/types(.*)$",
     "^@/lib(.*)$",
+    "^@/providers(.*)$",
     "^@/styles(.*)$",
     "^[./]"
   ],
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c05e736..98ca98f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4489,7 +4489,7 @@ snapshots:
       debug: 4.3.6
       enhanced-resolve: 5.17.1
       eslint: 8.57.0
-      eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0)
+      eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0)
       eslint-plugin-import: 2.29.1(@typescript-eslint/parser@8.0.1(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)
       fast-glob: 3.3.2
       get-tsconfig: 4.7.6
@@ -4501,7 +4501,7 @@ snapshots:
       - eslint-import-resolver-webpack
       - supports-color
 
-  eslint-module-utils@2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0):
+  eslint-module-utils@2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0):
     dependencies:
       debug: 3.2.7
     optionalDependencies:
diff --git a/public/next.svg b/public/next.svg
deleted file mode 100644
index 5174b28..0000000
--- a/public/next.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 394 80"><path fill="#000" d="M262 0h68.5v12.7h-27.2v66.6h-13.6V12.7H262V0ZM149 0v12.7H94v20.4h44.3v12.6H94v21h55v12.6H80.5V0h68.7zm34.3 0h-17.8l63.8 79.4h17.9l-32-39.7 32-39.6h-17.9l-23 28.6-23-28.6zm18.3 56.7-9-11-27.1 33.7h17.8l18.3-22.7z"/><path fill="#000" d="M81 79.3 17 0H0v79.3h13.6V17l50.2 62.3H81Zm252.6-.4c-1 0-1.8-.4-2.5-1s-1.1-1.6-1.1-2.6.3-1.8 1-2.5 1.6-1 2.6-1 1.8.3 2.5 1a3.4 3.4 0 0 1 .6 4.3 3.7 3.7 0 0 1-3 1.8zm23.2-33.5h6v23.3c0 2.1-.4 4-1.3 5.5a9.1 9.1 0 0 1-3.8 3.5c-1.6.8-3.5 1.3-5.7 1.3-2 0-3.7-.4-5.3-1s-2.8-1.8-3.7-3.2c-.9-1.3-1.4-3-1.4-5h6c.1.8.3 1.6.7 2.2s1 1.2 1.6 1.5c.7.4 1.5.5 2.4.5 1 0 1.8-.2 2.4-.6a4 4 0 0 0 1.6-1.8c.3-.8.5-1.8.5-3V45.5zm30.9 9.1a4.4 4.4 0 0 0-2-3.3 7.5 7.5 0 0 0-4.3-1.1c-1.3 0-2.4.2-3.3.5-.9.4-1.6 1-2 1.6a3.5 3.5 0 0 0-.3 4c.3.5.7.9 1.3 1.2l1.8 1 2 .5 3.2.8c1.3.3 2.5.7 3.7 1.2a13 13 0 0 1 3.2 1.8 8.1 8.1 0 0 1 3 6.5c0 2-.5 3.7-1.5 5.1a10 10 0 0 1-4.4 3.5c-1.8.8-4.1 1.2-6.8 1.2-2.6 0-4.9-.4-6.8-1.2-2-.8-3.4-2-4.5-3.5a10 10 0 0 1-1.7-5.6h6a5 5 0 0 0 3.5 4.6c1 .4 2.2.6 3.4.6 1.3 0 2.5-.2 3.5-.6 1-.4 1.8-1 2.4-1.7a4 4 0 0 0 .8-2.4c0-.9-.2-1.6-.7-2.2a11 11 0 0 0-2.1-1.4l-3.2-1-3.8-1c-2.8-.7-5-1.7-6.6-3.2a7.2 7.2 0 0 1-2.4-5.7 8 8 0 0 1 1.7-5 10 10 0 0 1 4.3-3.5c2-.8 4-1.2 6.4-1.2 2.3 0 4.4.4 6.2 1.2 1.8.8 3.2 2 4.3 3.4 1 1.4 1.5 3 1.5 5h-5.8z"/></svg>
\ No newline at end of file
diff --git a/public/vercel.svg b/public/vercel.svg
deleted file mode 100644
index d2f8422..0000000
--- a/public/vercel.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 283 64"><path fill="black" d="M141 16c-11 0-19 7-19 18s9 18 20 18c7 0 13-3 16-7l-7-5c-2 3-6 4-9 4-5 0-9-3-10-7h28v-3c0-11-8-18-19-18zm-9 15c1-4 4-7 9-7s8 3 9 7h-18zm117-15c-11 0-19 7-19 18s9 18 20 18c6 0 12-3 16-7l-8-5c-2 3-5 4-8 4-5 0-9-3-11-7h28l1-3c0-11-8-18-19-18zm-10 15c2-4 5-7 10-7s8 3 9 7h-19zm-39 3c0 6 4 10 10 10 4 0 7-2 9-5l8 5c-3 5-9 8-17 8-11 0-19-7-19-18s8-18 19-18c8 0 14 3 17 8l-8 5c-2-3-5-5-9-5-6 0-10 4-10 10zm83-29v46h-9V5h9zM37 0l37 64H0L37 0zm92 5-27 48L74 5h10l18 30 17-30h10zm59 12v10l-3-1c-6 0-10 4-10 10v15h-9V17h9v9c0-5 6-9 13-9z"/></svg>
\ No newline at end of file
diff --git a/src/app/favicon.ico b/src/app/favicon.ico
index 718d6fea4835ec2d246af9800eddb7ffb276240c..e20a7a8c0ff1079dc5a729b2866f0690798f6972 100644
GIT binary patch
literal 2955
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
Ts?*5-T>}ticBUogykq|d`WLx7

literal 25931
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
LrJugUA?W`A8`#=m

diff --git a/src/app/form/[id]/done/page.tsx b/src/app/form/[id]/done/page.tsx
new file mode 100644
index 0000000..c87c00c
--- /dev/null
+++ b/src/app/form/[id]/done/page.tsx
@@ -0,0 +1,15 @@
+import { Box } from '@/components'
+
+export default function Page() {
+  return (
+    <div className='mt-8 flex w-full items-center justify-center'>
+      <Box>
+        <h1 className='text-header-1 font-bold text-neutral-900'>
+          คำตอบของคุณถูกบันทึกแล้ว
+        </h1>
+        <hr />
+        <h2 className='text-subtitle text-neutral-500'>ขอบคุณสำหรับคำตอบ</h2>
+      </Box>
+    </div>
+  )
+}
diff --git a/src/app/form/[id]/layout.tsx b/src/app/form/[id]/layout.tsx
index fbf0c86..43c9f7f 100644
--- a/src/app/form/[id]/layout.tsx
+++ b/src/app/form/[id]/layout.tsx
@@ -1,14 +1,23 @@
-import FormProvider from '@/providers/form-provider'
+import { getFormSchema } from '@/lib/form/get-form-schema'
+
+import { FormSchemaProvider } from '@/providers/form-schema-provider'
+
+export async function generateMetadata({
+  params: { id },
+}: {
+  params: { id: string }
+}) {
+  const form = await getFormSchema(id)
+
+  return {
+    title: form.heading,
+  }
+}
 
 export default async function FormLayout({
   children,
 }: Readonly<{
   children: React.ReactNode
 }>) {
-  return <FormProvider>{children}</FormProvider>
-  return (
-    <div className='flex size-full flex-col items-center justify-start gap-8 px-5 py-8'>
-      <FormProvider>{children}</FormProvider>
-    </div>
-  )
+  return <FormSchemaProvider>{children}</FormSchemaProvider>
 }
diff --git a/src/app/form/[id]/page.tsx b/src/app/form/[id]/page.tsx
index a3d6dd8..622c98b 100644
--- a/src/app/form/[id]/page.tsx
+++ b/src/app/form/[id]/page.tsx
@@ -1,19 +1,21 @@
 'use client'
 
-import { useForm } from '@/providers/form-provider'
+import { useRouter } from 'next/navigation'
 import { useEffect } from 'react'
 import { Toaster, toast } from 'react-hot-toast'
 
-import { FormContainer } from '@/components/form/form-container'
-import { FormHeader } from '@/components/form/form-header'
-import { FormQuestion } from '@/components/form/form-question'
+import { Box } from '@/components'
+import { Field } from '@/components/form/field'
+
+import { useFormSchema } from '@/providers/form-schema-provider'
 
 interface PageProps {
   params: { id: string }
 }
 
 export default function Page({ params: { id } }: PageProps) {
-  const { form, setID } = useForm()
+  const { formSchema, setID } = useFormSchema()
+  const router = useRouter()
 
   useEffect(() => {
     setID(id)
@@ -37,7 +39,8 @@ export default function Page({ params: { id } }: PageProps) {
       toast.error(errorData.error)
       return
     }
-    window.location.href = `${process.env.NEXT_PUBLIC_BASE_URL}/form/done`
+
+    router.push(`/form/${id}/done`)
   }
 
   const handleReset = (e: React.FormEvent<HTMLFormElement>) => {
@@ -47,19 +50,27 @@ export default function Page({ params: { id } }: PageProps) {
   return (
     <div className='flex w-full flex-col items-center justify-center space-y-4 px-5 pb-6'>
       <Toaster position='top-center' reverseOrder={false} />
-      <FormHeader form={form} />
-      <FormContainer>
+      <Box>
+        <h1 className='text-header-1 font-bold text-neutral-900'>
+          {formSchema.heading}
+        </h1>
+        <hr />
+        <h2 className='text-subtitle text-neutral-500'>
+          {formSchema.subheading}
+        </h2>
+      </Box>
+      <Box>
         <form
           onSubmit={handleSubmit}
           onReset={handleReset}
           className='flex flex-col gap-14'
         >
-          {form.columns.map((column) => (
+          {formSchema.columns.map((column) => (
             <div
-              key={column.order}
+              key={column.id}
               className='flex w-full flex-col items-start gap-2.5'
             >
-              <FormQuestion column={column} />
+              <Field column={column} />
             </div>
           ))}
           <div className='flex w-full flex-col gap-5'>
@@ -77,7 +88,7 @@ export default function Page({ params: { id } }: PageProps) {
             </div>
           </div>
         </form>
-      </FormContainer>
+      </Box>
     </div>
   )
 }
diff --git a/src/app/form/api/route.ts b/src/app/form/api/route.ts
index d9e04f5..2b58bec 100644
--- a/src/app/form/api/route.ts
+++ b/src/app/form/api/route.ts
@@ -1,6 +1,6 @@
 import { checkIdParams } from '@/lib/form/check-form'
+import { getFormIds } from '@/lib/form/get-form-ids'
 import { getFormSchema } from '@/lib/form/get-form-schema'
-import { getNocoID } from '@/lib/form/get-nocoID'
 
 export async function GET(request: Request) {
   // checking id
@@ -23,7 +23,7 @@ export async function POST(request: Request) {
 
   const body = await request.json()
 
-  const tableIdResponse = await getNocoID(id)
+  const tableIdResponse = await getFormIds(id)
   if (tableIdResponse === null) {
     return Response.json({ error: 'No matching form name' }, { status: 400 })
   }
diff --git a/src/app/form/done/page.tsx b/src/app/form/done/page.tsx
deleted file mode 100644
index 6ca7e22..0000000
--- a/src/app/form/done/page.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import { FormHeader } from '@/components/form/form-header'
-
-export default function Page() {
-  return (
-    <div className='mt-8 flex w-full items-center justify-center'>
-      <FormHeader
-        form={{
-          heading: 'คำตอบของคุณถูกบันทึกแล้ว',
-          subheading: 'ขอบคุณสำหรับคำตอบ สามารถปิดหน้าต่างนี้ได้',
-          columns: [],
-        }}
-      />
-    </div>
-  )
-}
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 5b80db8..6d1d642 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -16,8 +16,8 @@ const ibmPlexSansThai = IBM_Plex_Sans_Thai({
 
 // TODO: Add your own metadata
 export const metadata: Metadata = {
-  title: 'Create Next App',
-  description: 'Generated by create next app',
+  title: 'Intania Form',
+  description: 'Form wrapper for Chula Intania',
 }
 
 export default function RootLayout({
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 2315334..80ba33b 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,7 +1,3 @@
 export default function Home() {
-  return (
-    <main>
-      <h1>Hello World!</h1>
-    </main>
-  )
+  return <main>Unauthorized</main>
 }
diff --git a/src/components/box.tsx b/src/components/box.tsx
new file mode 100644
index 0000000..9378f3e
--- /dev/null
+++ b/src/components/box.tsx
@@ -0,0 +1,11 @@
+interface BoxProps {
+  children: React.ReactNode
+}
+
+export const Box = ({ children }: BoxProps): JSX.Element => {
+  return (
+    <div className='flex w-full max-w-3xl flex-col gap-5 rounded-box border-default bg-white p-10 shadow-default'>
+      {children}
+    </div>
+  )
+}
diff --git a/src/components/checkbox.tsx b/src/components/checkbox.tsx
new file mode 100644
index 0000000..e17d242
--- /dev/null
+++ b/src/components/checkbox.tsx
@@ -0,0 +1,32 @@
+'use client'
+
+import toast from 'react-hot-toast'
+
+import type { FormColumn } from '@/types'
+
+interface CheckboxProps {
+  column: FormColumn
+}
+
+export const Checkbox = ({ column }: CheckboxProps): JSX.Element => {
+  return (
+    <div className='flex w-full flex-col items-start justify-start'>
+      <label className='relative flex w-full cursor-pointer select-none flex-row-reverse items-center justify-end'>
+        <p className='ml-2 text-body-1 text-black'>{column.name}</p>
+        <input
+          type='checkbox'
+          name={column.name}
+          required={column.required}
+          className='size-4 rounded-md'
+          onInvalid={(e) => {
+            e.preventDefault()
+            toast.error('กรุณายอมรับข้อตกลง', { id: 'invalid' })
+          }}
+        />
+        <p className='absolute -bottom-10 my-2 hidden w-full text-body-2 italic text-red-600'>
+          จำเป็นต้องยอมรับ
+        </p>
+      </label>
+    </div>
+  )
+}
diff --git a/src/components/form/form-question.tsx b/src/components/form/field.tsx
similarity index 67%
rename from src/components/form/form-question.tsx
rename to src/components/form/field.tsx
index 60a0273..03e831c 100644
--- a/src/components/form/form-question.tsx
+++ b/src/components/form/field.tsx
@@ -1,8 +1,8 @@
-import { FormColumn } from '@/types/form'
+import { FormComponent } from '@/components/form/form-component'
 
-import { getFormComponent } from '@/components/form/form-component'
+import type { FormColumn } from '@/types'
 
-export function FormQuestion({ column }: { column: FormColumn }) {
+export function Field({ column }: { column: FormColumn }) {
   return (
     <div className='flex w-full flex-col items-start justify-start gap-2.5'>
       <div className='flex flex-col'>
@@ -14,7 +14,7 @@ export function FormQuestion({ column }: { column: FormColumn }) {
           {column.description}
         </p>
       </div>
-      {getFormComponent(column)}
+      {FormComponent(column)}
     </div>
   )
 }
diff --git a/src/components/form/form-component.tsx b/src/components/form/form-component.tsx
index fa00227..bd59266 100644
--- a/src/components/form/form-component.tsx
+++ b/src/components/form/form-component.tsx
@@ -1,133 +1,30 @@
-import { FormColumn } from '@/types/form'
-import { UIDataType } from '@/types/ui-data'
-import React from 'react'
-import { toast } from 'react-hot-toast'
+import { Checkbox, Input, SingleSelect, Textarea } from '@/components'
 
-import { Input } from '@/components/input'
+import type { FormColumn } from '@/types'
 
-export const getFormComponent = (column: FormColumn): React.ReactNode => {
-  if (!Object.values(UIDataType).includes(column.uidt)) {
-    return (
-      <p className='text-body-2 font-light italic text-red-600'>
-        This system does not support {column.uidt}.
-      </p>
-    )
-  }
+export const FormComponent = (column: FormColumn): React.ReactNode => {
   switch (column.uidt) {
     case 'SingleLineText':
-      return (
-        <Input
-          type='text'
-          name={column.columnName}
-          required={column.required}
-        />
-      )
+      return <Input type='text' name={column.name} required={column.required} />
     case 'PhoneNumber':
       return (
         <Input
           type='tel'
-          id={column.columnName}
-          name={column.columnName}
+          id={column.name}
+          name={column.name}
           required={column.required}
         />
       )
     case 'Number':
       return (
-        <Input
-          type='number'
-          name={column.columnName}
-          required={column.required}
-        />
+        <Input type='number' name={column.name} required={column.required} />
       )
     case 'Checkbox':
-      return (
-        <div className='flex w-full flex-col items-start justify-start'>
-          <label className='relative flex w-full cursor-pointer select-none flex-row-reverse items-center justify-end'>
-            <p className='ml-2 text-body-1 text-black'>ยอมรับ</p>
-            <input
-              type='checkbox'
-              name={column.columnName}
-              required={column.required}
-              className='size-4 rounded-md'
-              onInvalid={(e) => {
-                e.preventDefault()
-                ;(
-                  e.target as HTMLInputElement
-                ).nextElementSibling?.classList.remove('hidden')
-                toast.error('กรุณากรอกคำตอบให้ครบ', { id: 'invalid' })
-              }}
-              onInput={(e) => {
-                ;(
-                  e.target as HTMLInputElement
-                ).nextElementSibling?.classList.add('hidden')
-              }}
-            />
-            <p className='absolute -bottom-10 my-2 hidden w-full text-body-2 italic text-red-600'>
-              จำเป็นต้องยอมรับ
-            </p>
-          </label>
-        </div>
-      )
+      return <Checkbox column={column} />
     case 'SingleSelect':
-      return (
-        <div className='relative flex w-full'>
-          <select
-            name={column.columnName}
-            required={column.required}
-            className='flex h-10 w-full rounded-md border border-neutral-200 px-2 py-1 text-body-1'
-            defaultValue=''
-            onInvalid={(e) => {
-              e.preventDefault()
-              ;(
-                e.target as HTMLInputElement
-              ).nextElementSibling?.classList.remove('hidden')
-              toast.error('กรุณากรอกคำตอบให้ครบ', { id: 'invalid' })
-            }}
-            onInput={(e) => {
-              ;(e.target as HTMLInputElement).nextElementSibling?.classList.add(
-                'hidden'
-              )
-            }}
-          >
-            <option disabled value=''>
-              -- select an option --
-            </option>
-            {column.colOptions?.map((option) => (
-              <option key={option} value={option}>
-                {option}
-              </option>
-            ))}
-          </select>
-          <p className='absolute -bottom-10 my-2 hidden w-full text-body-2 italic text-red-600'>
-            จำเป็นต้องเลือก
-          </p>
-        </div>
-      )
+      return <SingleSelect column={column} />
     case 'LongText':
-      return (
-        <div className='flex w-full flex-col'>
-          <textarea
-            name={column.columnName}
-            required={column.required}
-            className='flex h-20 w-full resize-none overflow-y-scroll rounded-md border border-neutral-200 px-2 py-1 text-body-1'
-            onInvalid={(e) => {
-              e.preventDefault()
-              ;(
-                e.target as HTMLInputElement
-              ).nextElementSibling?.classList.remove('hidden')
-              toast.error('กรุณากรอกคำตอบให้ครบ', { id: 'invalid' })
-            }}
-            onInput={(e) => {
-              ;(e.target as HTMLInputElement).nextElementSibling?.classList.add(
-                'hidden'
-              )
-            }}
-          />
-          <p className='my-2 hidden w-full text-sm italic text-red-600'>
-            จำเป็นต้องตอบคำถามนี้
-          </p>
-        </div>
-      )
+      return <Textarea column={column} />
     default:
       return (
         <p className='text-body-2 font-light italic text-red-600'>
diff --git a/src/components/form/form-container.tsx b/src/components/form/form-container.tsx
deleted file mode 100644
index a55d2b8..0000000
--- a/src/components/form/form-container.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import { cn } from '@/lib/utils'
-
-export function FormContainer({
-  children,
-  className,
-}: {
-  children: React.ReactNode
-  className?: string
-}) {
-  return (
-    <div
-      className={cn(
-        'flex w-full max-w-3xl flex-col gap-5 rounded-box border-default bg-white p-10 shadow-default',
-        className
-      )}
-    >
-      {children}
-    </div>
-  )
-}
diff --git a/src/components/form/form-header.tsx b/src/components/form/form-header.tsx
deleted file mode 100644
index 1109077..0000000
--- a/src/components/form/form-header.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Form } from '@/types/form'
-
-import { FormContainer } from './form-container'
-
-export function FormHeader({ form }: { form: Form }) {
-  return (
-    <FormContainer>
-      <h1 className='text-header-1 font-bold text-neutral-900'>
-        {form.heading}
-      </h1>
-      <hr />
-      <h2 className='text-subtitle text-neutral-500'>{form.subheading}</h2>
-    </FormContainer>
-  )
-}
diff --git a/src/components/form/index.ts b/src/components/form/index.ts
new file mode 100644
index 0000000..4b5722a
--- /dev/null
+++ b/src/components/form/index.ts
@@ -0,0 +1,2 @@
+export * from './form-component'
+export * from './field'
diff --git a/src/components/index.ts b/src/components/index.ts
new file mode 100644
index 0000000..4158a0d
--- /dev/null
+++ b/src/components/index.ts
@@ -0,0 +1,6 @@
+export * from './box'
+export * from './form'
+export * from './checkbox'
+export * from './input'
+export * from './single-select'
+export * from './textarea'
diff --git a/src/components/single-select.tsx b/src/components/single-select.tsx
new file mode 100644
index 0000000..bf78180
--- /dev/null
+++ b/src/components/single-select.tsx
@@ -0,0 +1,37 @@
+import toast from 'react-hot-toast'
+
+import type { FormColumn } from '@/types'
+
+interface SingleSelectProps {
+  column: FormColumn
+}
+
+export const SingleSelect = ({ column }: SingleSelectProps): JSX.Element => {
+  return (
+    <div className='relative flex w-full'>
+      <select
+        name={column.name}
+        required={column.required}
+        className='flex h-10 w-full rounded-md border border-neutral-200 px-2 py-1 text-body-1'
+        defaultValue=''
+        onInvalid={(e) => {
+          e.preventDefault()
+
+          toast.error('กรุณากรอกคำตอบให้ครบ', { id: 'invalid' })
+        }}
+      >
+        <option disabled value=''>
+          -- select an option --
+        </option>
+        {column.options?.map((option) => (
+          <option key={option.id} value={option.title}>
+            {option.title}
+          </option>
+        ))}
+      </select>
+      <p className='absolute -bottom-10 my-2 hidden w-full text-body-2 italic text-red-600'>
+        จำเป็นต้องเลือก
+      </p>
+    </div>
+  )
+}
diff --git a/src/components/textarea.tsx b/src/components/textarea.tsx
new file mode 100644
index 0000000..f2fdf0c
--- /dev/null
+++ b/src/components/textarea.tsx
@@ -0,0 +1,28 @@
+'use client'
+
+import toast from 'react-hot-toast'
+
+import type { FormColumn } from '@/types'
+
+interface TextareaProps {
+  column: FormColumn
+}
+
+export const Textarea = ({ column }: TextareaProps) => {
+  return (
+    <div className='flex w-full flex-col'>
+      <textarea
+        name={column.name}
+        required={column.required}
+        className='flex h-20 w-full resize-none overflow-y-scroll rounded-md border border-neutral-200 px-2 py-1 text-body-1'
+        onInvalid={(e) => {
+          e.preventDefault()
+          toast.error('กรุณากรอกคำตอบให้ครบ', { id: 'invalid' })
+        }}
+      />
+      <p className='my-2 hidden w-full text-sm italic text-red-600'>
+        จำเป็นต้องตอบคำถามนี้
+      </p>
+    </div>
+  )
+}
diff --git a/src/lib/fetcher.ts b/src/lib/fetcher.ts
deleted file mode 100644
index 868d442..0000000
--- a/src/lib/fetcher.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-interface IDMappingResponse {
-  Id: number
-  FormViewID: string
-  TableID: string
-}
-
-export const getNocoID = async (
-  name: string
-): Promise<IDMappingResponse | null> => {
-  const id = await getIdByFormName(name)
-  if (id === null) {
-    return null
-  }
-
-  const response = await fetch(
-    `${process.env.NOCODB_BASE_URL}/api/v2/tables/${process.env.ID_MAPPING_TABLE_ID}/records/${id}`,
-    {
-      headers: {
-        'xc-token': process.env.NOCODB_XC_TOKEN ?? '',
-      },
-      next: { revalidate: 60 },
-    }
-  )
-  const data = await response.json()
-  return data
-}
-
-const getIdByFormName = async (name: string) => {
-  const response = await fetch(
-    `${process.env.NOCODB_BASE_URL}/api/v2/tables/${process.env.ID_MAPPING_TABLE_ID}/records/`,
-    {
-      headers: {
-        'xc-token': process.env.NOCODB_XC_TOKEN ?? '',
-      },
-      next: { revalidate: 60 },
-    }
-  )
-  const allForm = (await response.json()).list
-
-  const formIdData = allForm.find((item: { CustomId: string }) => {
-    if (item.CustomId === name) {
-      return true
-    }
-  })
-
-  if (formIdData === undefined) {
-    return null
-  }
-  return formIdData.Id
-}
diff --git a/src/lib/form/check-form.ts b/src/lib/form/check-form.ts
index f8801e9..3875aab 100644
--- a/src/lib/form/check-form.ts
+++ b/src/lib/form/check-form.ts
@@ -1,8 +1,4 @@
 export const checkIdParams = (request: Request) => {
   const { searchParams } = new URL(request.url)
-  const id = searchParams.get('id')
-  if (!id) {
-    return null
-  }
-  return id
+  return searchParams.get('id')
 }
diff --git a/src/lib/form/get-column-detail.ts b/src/lib/form/get-column-detail.ts
index c7ccabb..5e876f3 100644
--- a/src/lib/form/get-column-detail.ts
+++ b/src/lib/form/get-column-detail.ts
@@ -1,13 +1,8 @@
-import { UIDataType } from '@/types/ui-data'
+import type { FormColumn } from '@/types'
 
 export const getColumnDetail = async (
   columnID: string
-): Promise<{
-  label: string
-  uidt: keyof typeof UIDataType
-  columnName: string
-  colOptions?: string[]
-}> => {
+): Promise<Omit<FormColumn, 'description' | 'order' | 'required'>> => {
   const response = await fetch(
     `${process.env.NOCODB_BASE_URL}/api/v2/meta/columns/${columnID}`,
     {
@@ -20,11 +15,15 @@ export const getColumnDetail = async (
   const data = await response.json()
 
   return {
+    id: data.id,
     label: data.title,
     uidt: data.uidt,
-    columnName: data.column_name,
-    colOptions: data.colOptions?.options.map(
-      (option: { title: string }) => option.title
+    name: data.column_name,
+    options: data.colOptions?.options.map(
+      (option: { id: string; title: string }) => ({
+        id: option.id,
+        title: option.title,
+      })
     ),
   }
 }
diff --git a/src/lib/form/get-form-ids.ts b/src/lib/form/get-form-ids.ts
new file mode 100644
index 0000000..469ad6a
--- /dev/null
+++ b/src/lib/form/get-form-ids.ts
@@ -0,0 +1,26 @@
+interface FormIds {
+  Id: string
+  CustomId: string
+  TableID: string
+  FormViewID: string
+}
+
+export const getFormIds = async (CustomId: string): Promise<FormIds | null> => {
+  const response = await fetch(
+    `${process.env.NOCODB_BASE_URL}/api/v2/tables/${process.env.ID_MAPPING_TABLE_ID}/records`,
+    {
+      headers: {
+        'xc-token': process.env.NOCODB_XC_TOKEN ?? '',
+      },
+      next: { revalidate: 60 },
+    }
+  )
+  const data = await response.json()
+  const allForm = data.list as FormIds[]
+
+  const formIdData = allForm.find(
+    (item: { CustomId: string }) => item.CustomId === CustomId
+  )
+
+  return formIdData ?? null
+}
diff --git a/src/lib/form/get-form-schema.ts b/src/lib/form/get-form-schema.ts
index 5c8f702..2b3a085 100644
--- a/src/lib/form/get-form-schema.ts
+++ b/src/lib/form/get-form-schema.ts
@@ -1,12 +1,12 @@
-import { Form, FormColumn } from '@/types/form'
+import type { Form } from '@/types/form'
 
 import { getColumnDetail } from './get-column-detail'
-import { getNocoID } from './get-nocoID'
+import { getFormIds } from './get-form-ids'
 
-export const getFormSchema = async (id: string): Promise<Form | Response> => {
-  const tableIdResponse = await getNocoID(id)
+export const getFormSchema = async (customId: string): Promise<Form> => {
+  const tableIdResponse = await getFormIds(customId)
   if (tableIdResponse == null) {
-    return Response.json({ error: 'No form in this name' }, { status: 400 })
+    throw new Error('No form in this name')
   }
   const viewID = tableIdResponse.FormViewID
 
@@ -45,15 +45,7 @@ export const getFormSchema = async (id: string): Promise<Form | Response> => {
   const form: Form = {
     heading: data.heading,
     subheading: data.subheading,
-    columns: data.columns.map((column: FormColumn) => ({
-      label: column.label,
-      description: column.description,
-      uidt: column.uidt,
-      order: column.order,
-      required: column.required,
-      colOptions: column.colOptions,
-      columnName: column.columnName,
-    })),
+    columns: data.columns,
   }
 
   return form
diff --git a/src/lib/form/get-nocoID.ts b/src/lib/form/get-nocoID.ts
deleted file mode 100644
index 81034cb..0000000
--- a/src/lib/form/get-nocoID.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-interface IDMappingResponse {
-  Id: number
-  FormViewID: string
-  TableID: string
-}
-
-export const getNocoID = async (
-  name: string
-): Promise<IDMappingResponse | null> => {
-  const id = await getIdByFormName(name)
-  if (id === null) {
-    return null
-  }
-
-  const response = await fetch(
-    `${process.env.NOCODB_BASE_URL}/api/v2/tables/${process.env.ID_MAPPING_TABLE_ID}/records/${id}`,
-    {
-      headers: {
-        'xc-token': process.env.NOCODB_XC_TOKEN ?? '',
-      },
-      next: { revalidate: 60 },
-    }
-  )
-  const data = await response.json()
-  return data
-}
-
-const getIdByFormName = async (name: string) => {
-  const response = await fetch(
-    `${process.env.NOCODB_BASE_URL}/api/v2/tables/${process.env.ID_MAPPING_TABLE_ID}/records/`,
-    {
-      headers: {
-        'xc-token': process.env.NOCODB_XC_TOKEN ?? '',
-      },
-      next: { revalidate: 60 },
-    }
-  )
-  const allForm = (await response.json()).list
-
-  const formIdData = allForm.find((item: { CustomId: string }) => {
-    if (item.CustomId === name) {
-      return true
-    }
-  })
-
-  if (formIdData === undefined) {
-    return null
-  }
-  return formIdData.Id
-}
diff --git a/src/providers/form-provider.tsx b/src/providers/form-schema-provider.tsx
similarity index 57%
rename from src/providers/form-provider.tsx
rename to src/providers/form-schema-provider.tsx
index bb77e63..f62926e 100644
--- a/src/providers/form-provider.tsx
+++ b/src/providers/form-schema-provider.tsx
@@ -1,15 +1,16 @@
 'use client'
 
-import type { Form } from '@/types/form'
 import { createContext, useContext, useEffect, useState } from 'react'
 
-interface FormContextType {
-  form: Form
+import type { Form } from '@/types/form'
+
+interface FormSchemaContextType {
+  formSchema: Form
   setID: (id: string) => void
 }
 
-export const FormContext = createContext<FormContextType>({
-  form: {
+export const FormSchemaContext = createContext<FormSchemaContextType>({
+  formSchema: {
     heading: '',
     subheading: '',
     columns: [],
@@ -17,12 +18,12 @@ export const FormContext = createContext<FormContextType>({
   setID: () => {},
 })
 
-export default function FormProvider({
+export function FormSchemaProvider({
   children,
 }: {
   children: React.ReactNode
 }) {
-  const [form, setForm] = useState<Form>({
+  const [formSchema, setFormSchema] = useState<Form>({
     heading: '',
     subheading: '',
     columns: [],
@@ -30,7 +31,7 @@ export default function FormProvider({
   const [id, setID] = useState('')
   useEffect(() => {
     if (!id) return
-    const getForm = async (id: string) => {
+    const getFormSchema = async (id: string) => {
       const response = await fetch(
         `${process.env.NEXT_PUBLIC_BASE_URL}/form/api?id=${id}`,
         {
@@ -39,27 +40,27 @@ export default function FormProvider({
       )
 
       const data = await response.json()
-      setForm(data)
+      setFormSchema(data)
     }
 
-    void getForm(id)
-  }, [id, setForm])
+    void getFormSchema(id)
+  }, [id, setFormSchema])
 
   return (
-    <FormContext.Provider
+    <FormSchemaContext.Provider
       value={{
-        form,
+        formSchema: formSchema,
         setID: (newId: string) => {
           if (newId !== id) setID(newId)
         },
       }}
     >
       {children}
-    </FormContext.Provider>
+    </FormSchemaContext.Provider>
   )
 }
 
-export const useForm = () => {
-  const { form, setID } = useContext(FormContext)
-  return { form, setID }
+export const useFormSchema = () => {
+  const { formSchema, setID } = useContext(FormSchemaContext)
+  return { formSchema, setID }
 }
diff --git a/src/types/form-column.ts b/src/types/form-column.ts
new file mode 100644
index 0000000..b3b083f
--- /dev/null
+++ b/src/types/form-column.ts
@@ -0,0 +1,11 @@
+import type { UIDataTypeKeys } from '.'
+
+export interface FormColumn {
+  id: string
+  name: string
+  label: string
+  description: string
+  uidt: UIDataTypeKeys
+  required: boolean
+  options?: { id: string; title: string }[]
+}
diff --git a/src/types/form.d.ts b/src/types/form.d.ts
deleted file mode 100644
index bc50f95..0000000
--- a/src/types/form.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import type { UIDataTypeKeys } from './ui-data'
-
-export interface FormColumn {
-  columnName: string
-  label: string
-  description: string
-  uidt: UIDataTypeKeys
-  order: number
-  required: boolean
-  colOptions?: string[]
-}
-
-export interface Form {
-  heading: string
-  subheading: string
-  columns: FormColumn[]
-}
diff --git a/src/types/form.ts b/src/types/form.ts
new file mode 100644
index 0000000..1637db7
--- /dev/null
+++ b/src/types/form.ts
@@ -0,0 +1,7 @@
+import type { FormColumn } from '.'
+
+export interface Form {
+  heading: string
+  subheading: string
+  columns: FormColumn[]
+}
diff --git a/src/types/index.ts b/src/types/index.ts
new file mode 100644
index 0000000..c261960
--- /dev/null
+++ b/src/types/index.ts
@@ -0,0 +1,3 @@
+export * from './form'
+export * from './form-column'
+export * from './ui-data'