From eb36d0a43f7ea5e986bd46d81fc3597235a440ec Mon Sep 17 00:00:00 2001
From: TeeGooodGood <122004889+TeeGoood@users.noreply.github.com>
Date: Thu, 30 Jan 2025 22:08:18 +0700
Subject: [PATCH 1/3] add: auto field not speicfied

---
 src/app/(user)/edit/_components/form.tsx             |  2 ++
 src/app/(user)/register/_components/subpages/two.tsx | 11 ++++++++++-
 src/const/educations.ts                              |  4 +++-
 src/const/universities.ts                            |  1 +
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/app/(user)/edit/_components/form.tsx b/src/app/(user)/edit/_components/form.tsx
index 9e86560..5a2473c 100644
--- a/src/app/(user)/edit/_components/form.tsx
+++ b/src/app/(user)/edit/_components/form.tsx
@@ -57,6 +57,8 @@ export default function Form() {
   }, [defaultUser, reset]);
 
   const user = watch();
+  console.log('watch', user);
+  console.log('default', defaultUser);
 
   const onSubmit: SubmitHandler<EditForm> = async data => {
     const context = client?.getContext();
diff --git a/src/app/(user)/register/_components/subpages/two.tsx b/src/app/(user)/register/_components/subpages/two.tsx
index c564f0d..0133a20 100644
--- a/src/app/(user)/register/_components/subpages/two.tsx
+++ b/src/app/(user)/register/_components/subpages/two.tsx
@@ -73,6 +73,15 @@ export default function Two({ setStep, form }: TwoProps) {
   useEffect(() => {
     let status: RegisterForm['status'];
 
+    // not specified
+    if (user.education == 'notSpecified') {
+      setValue('graduatedYear', '9999');
+      setValue('faculty', 'ไม่ระบุ');
+      setValue('status', 'general_public');
+      setValue('university', 'ไม่ประสงค์เเจ้ง');
+      return;
+    }
+
     // set default value
     if (
       !!user.education &&
@@ -152,7 +161,7 @@ export default function Two({ setStep, form }: TwoProps) {
         </div>
 
         {/* university */}
-        {user.education && (
+        {user.education && user.education != 'notSpecified' && (
           <div className="relative space-y-1">
             <Label isRequired>
               {user.education == 'studying'
diff --git a/src/const/educations.ts b/src/const/educations.ts
index f64caa4..4c06d82 100644
--- a/src/const/educations.ts
+++ b/src/const/educations.ts
@@ -1,12 +1,14 @@
-export const educations = ['studying', 'graduated'] as const;
+export const educations = ['studying', 'graduated', 'notSpecified'] as const;
 export type Education = (typeof educations)[number];
 
 export const educationsMap = {
   studying: 'กำลังศึกษา',
   graduated: 'จบการศึกษา',
+  notSpecified: 'ไม่ประสงค์เเจ้ง',
 };
 
 export const educationsMapReverse: { [key: string]: Education } = {
   กำลังศึกษา: 'studying',
   จบการศึกษา: 'graduated',
+  ไม่ประสงค์เเจ้ง: 'notSpecified',
 };
diff --git a/src/const/universities.ts b/src/const/universities.ts
index 2ebe045..c81e9a0 100644
--- a/src/const/universities.ts
+++ b/src/const/universities.ts
@@ -1,4 +1,5 @@
 export const universities = [
+  'ไม่ประสงค์เเจ้ง',
   'จุฬาลงกรณ์มหาวิทยาลัย',
   'มหาวิทยาลัยเกษตรศาสตร์',
   'มหาวิทยาลัยเกษตรศาสตร์ วิทยาเขตกำแพงแสน',

From b5c4c56b89db4dc694fe1f7016ba9ee4a4d95a71 Mon Sep 17 00:00:00 2001
From: TeeGooodGood <122004889+TeeGoood@users.noreply.github.com>
Date: Fri, 31 Jan 2025 13:02:27 +0700
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20dropdown=20=E0=B9=80=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=A3=E0=B9=88=E0=B8=AD=20set=20empty=20value=20=E0=B9=80?=
 =?UTF-8?q?=E0=B8=82=E0=B9=89=E0=B8=B2=20state?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/(user)/edit/_components/form.tsx | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/app/(user)/edit/_components/form.tsx b/src/app/(user)/edit/_components/form.tsx
index 5a2473c..b13e4ee 100644
--- a/src/app/(user)/edit/_components/form.tsx
+++ b/src/app/(user)/edit/_components/form.tsx
@@ -11,7 +11,7 @@ import { ErrorMsg, ErrorMsgFloat } from '../../register/_components/errorMsg';
 import Image from 'next/image';
 
 import { zodResolver } from '@hookform/resolvers/zod';
-import { sizeJersey } from '@/const/size';
+import { SizeJersey, sizeJersey } from '@/const/size';
 import { faculties } from '@/const/faculties';
 import { EditForm, EditSchema } from '@/schema/edit';
 import { educationsMap, educationsMapReverse } from '@/const/educations';
@@ -57,8 +57,6 @@ export default function Form() {
   }, [defaultUser, reset]);
 
   const user = watch();
-  console.log('watch', user);
-  console.log('default', defaultUser);
 
   const onSubmit: SubmitHandler<EditForm> = async data => {
     const context = client?.getContext();
@@ -151,10 +149,7 @@ export default function Form() {
           <DropdownInput
             value={educationsMap[user.education]}
             setValue={val =>
-              setValue(
-                'education',
-                educationsMapReverse[val as 'กำลังศึกษา' | 'จบการศึกษา'],
-              )
+              val && setValue('education', educationsMapReverse[val])
             }
             placeholder="กำลังศึกษาอยู่"
             choices={Object.keys(educationsMapReverse).map(key => key)}
@@ -237,7 +232,9 @@ export default function Form() {
           <Label isRequired>ขนาดเสื้อ</Label>
           <DropdownInput
             value={user.sizeJersey}
-            setValue={updateField('sizeJersey')}
+            setValue={(val: string) =>
+              val && setValue('sizeJersey', val as SizeJersey)
+            }
             placeholder="กรุณาเลือก"
             choices={[...sizeJersey]}
           />

From 47de056422fc384094736b09e08eeb449a5c1828 Mon Sep 17 00:00:00 2001
From: TeeGooodGood <122004889+TeeGoood@users.noreply.github.com>
Date: Fri, 31 Jan 2025 13:42:33 +0700
Subject: [PATCH 3/3] change: validate phone field

---
 src/app/(user)/register/_components/subpages/two.tsx | 8 ++++++++
 src/schema/edit.ts                                   | 2 +-
 src/schema/register.ts                               | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/app/(user)/register/_components/subpages/two.tsx b/src/app/(user)/register/_components/subpages/two.tsx
index 0133a20..9f04712 100644
--- a/src/app/(user)/register/_components/subpages/two.tsx
+++ b/src/app/(user)/register/_components/subpages/two.tsx
@@ -23,6 +23,7 @@ import { universities } from '@/const/universities';
 import { faculties } from '@/const/faculties';
 import { sizeJersey } from '@/const/size';
 import { statusMap } from '@/const/status';
+// import Consent from '../policy/consent';
 
 interface TwoProps {
   setStep: (value: number) => void;
@@ -254,6 +255,13 @@ export default function Two({ setStep, form }: TwoProps) {
         <div className="relative space-y-1">
           <Label>โรคประจำตัว</Label>
           <TextInput {...register('chronicDisease')} />
+          {/* <div className='pt-0.5'></div>
+          <Consent
+            value={true}
+            setValue={(val: boolean) => {}}
+            label="คุณกลัวความสูงหรือไม่"
+            isRequired={false}
+          /> */}
           <ErrorMsgFloat>{errors.chronicDisease?.message}</ErrorMsgFloat>
         </div>
 
diff --git a/src/schema/edit.ts b/src/schema/edit.ts
index 0f919a5..04a6730 100644
--- a/src/schema/edit.ts
+++ b/src/schema/edit.ts
@@ -9,7 +9,7 @@ import { faculties } from '@/const/faculties';
 export const EditSchema = z.object({
   name: z.string().min(1, 'กรุณากรอกชื่อ-นามสกุล'),
   email: z.string().email('กรุณากรอกอีเมล'),
-  phone: z.string().regex(/^\d+$/, 'กรุณากรอกเลข 0-9 เท่านั้น'),
+  phone: z.string().regex(/^\d.{10}$/, 'กรุณากรอกเลขเบอร์ 10 หลัก'),
   age: z
     .string({
       message: 'กรุณากรอกอายุ',
diff --git a/src/schema/register.ts b/src/schema/register.ts
index 357df9b..8bd8c34 100644
--- a/src/schema/register.ts
+++ b/src/schema/register.ts
@@ -8,7 +8,7 @@ import { faculties } from '@/const/faculties';
 export const RegisterSchema = z.object({
   name: z.string().min(1, 'กรุณากรอกชื่อ-นามสกุล'),
   email: z.string().email('กรุณากรอกอีเมล'),
-  phone: z.string().regex(/^\d+$/, 'กรุณากรอกเลข 0-9 เท่านั้น'),
+  phone: z.string().regex(/^\d.{10}$/, 'กรุณากรอกเลขเบอร์ 10 หลัก'),
   age: z
     .string({
       message: 'กรุณากรอกอายุ',