From 2445f2c3b219030a4ba19ad7e75fd6960b9b21c5 Mon Sep 17 00:00:00 2001
From: teegoood <teegooodgood@gmail.com>
Date: Sun, 14 Jul 2024 17:46:52 +0700
Subject: [PATCH 01/22] fix

---
 src/app/page.tsx            | 2 +-
 src/context/AuthContext.tsx | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/page.tsx b/src/app/page.tsx
index 0a7ff976..a390e589 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -62,7 +62,7 @@ function Login() {
     let newPath;
 
     if (isStaff) {
-      newPath = isRegistered ? '/staff/home' : '/staff/register';
+      newPath = isRegistered ? '/firstdate/staff/home' : '/staff/register';
     } else {
       newPath = isRegistered ? '/home' : '/register';
     }
diff --git a/src/context/AuthContext.tsx b/src/context/AuthContext.tsx
index 8a8acc27..845f65ca 100644
--- a/src/context/AuthContext.tsx
+++ b/src/context/AuthContext.tsx
@@ -34,6 +34,8 @@ const AuthProvider: React.FC<{ children: ReactNode }> = ({
   const path = usePathname();
   const router = useRouter();
   const [isReady, setisReady] = useState(false);
+  console.log(user);
+  console.log(isReady);
 
   const resetContext = useCallback(async () => {
     const userData = await getUser();
@@ -109,7 +111,7 @@ const AuthProvider: React.FC<{ children: ReactNode }> = ({
 
     setisReady(true);
   }, [router, path]);
-
+  console.log((user || path == '/') && isReady);
   return (
     <AuthContext.Provider value={{ user, resetContext, logout }}>
       {(user || path == '/') && isReady ? (

From 5f26700aacb033c3a5d9b6a9e4270ea2832281e9 Mon Sep 17 00:00:00 2001
From: teegoood <teegooodgood@gmail.com>
Date: Sun, 14 Jul 2024 17:47:11 +0700
Subject: [PATCH 02/22] delete console.log

---
 src/context/AuthContext.tsx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/context/AuthContext.tsx b/src/context/AuthContext.tsx
index 845f65ca..ade6eb7a 100644
--- a/src/context/AuthContext.tsx
+++ b/src/context/AuthContext.tsx
@@ -34,8 +34,6 @@ const AuthProvider: React.FC<{ children: ReactNode }> = ({
   const path = usePathname();
   const router = useRouter();
   const [isReady, setisReady] = useState(false);
-  console.log(user);
-  console.log(isReady);
 
   const resetContext = useCallback(async () => {
     const userData = await getUser();
@@ -111,7 +109,6 @@ const AuthProvider: React.FC<{ children: ReactNode }> = ({
 
     setisReady(true);
   }, [router, path]);
-  console.log((user || path == '/') && isReady);
   return (
     <AuthContext.Provider value={{ user, resetContext, logout }}>
       {(user || path == '/') && isReady ? (

From 70edd7ff888a3bfa374413ddf1c9d711b836d59f Mon Sep 17 00:00:00 2001
From: teegoood <teegooodgood@gmail.com>
Date: Sun, 14 Jul 2024 19:16:36 +0700
Subject: [PATCH 03/22] refactor: title

---
 src/app/(main)/edit/page.tsx           | 3 +--
 src/app/(main)/register/page.tsx       | 3 +--
 src/app/(main)/staff/edit/page.tsx     | 3 +--
 src/app/(main)/staff/register/page.tsx | 3 +--
 src/context/AuthContext.tsx            | 2 +-
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/app/(main)/edit/page.tsx b/src/app/(main)/edit/page.tsx
index e3128861..2fe908be 100644
--- a/src/app/(main)/edit/page.tsx
+++ b/src/app/(main)/edit/page.tsx
@@ -157,8 +157,7 @@ export default function Edit() {
                 <option value="นาย">นาย</option>
                 <option value="นาง">นาง</option>
                 <option value="นางสาว">นางสาว</option>
-                <option value="เด็กชาย">เด็กชาย</option>
-                <option value="เด็กหญิง">เด็กหญิง</option>
+                <option value="อื่นๆ">อื่นๆ</option>
               </StyledSelect>
             </label>
 
diff --git a/src/app/(main)/register/page.tsx b/src/app/(main)/register/page.tsx
index c4e83fd9..fe582687 100644
--- a/src/app/(main)/register/page.tsx
+++ b/src/app/(main)/register/page.tsx
@@ -184,8 +184,7 @@ export default function Register() {
                 <option value="นาย">นาย</option>
                 <option value="นาง">นาง</option>
                 <option value="นางสาว">นางสาว</option>
-                <option value="เด็กชาย">เด็กชาย</option>
-                <option value="เด็กหญิง">เด็กหญิง</option>
+                <option value="อื่นๆ">อื่นๆ</option>
               </StyledSelect>
             </label>
             <label>
diff --git a/src/app/(main)/staff/edit/page.tsx b/src/app/(main)/staff/edit/page.tsx
index eb011675..3055da9a 100644
--- a/src/app/(main)/staff/edit/page.tsx
+++ b/src/app/(main)/staff/edit/page.tsx
@@ -140,8 +140,7 @@ export default function Edit() {
                 <option value="นาย">นาย</option>
                 <option value="นาง">นาง</option>
                 <option value="นางสาว">นางสาว</option>
-                <option value="เด็กชาย">เด็กชาย</option>
-                <option value="เด็กหญิง">เด็กหญิง</option>
+                <option value="อื่นๆ">อื่นๆ</option>
               </StyledSelect>
             </label>
 
diff --git a/src/app/(main)/staff/register/page.tsx b/src/app/(main)/staff/register/page.tsx
index aa57cf63..8ca99587 100644
--- a/src/app/(main)/staff/register/page.tsx
+++ b/src/app/(main)/staff/register/page.tsx
@@ -154,8 +154,7 @@ export default function Register() {
                 <option value="นาย">นาย</option>
                 <option value="นาง">นาง</option>
                 <option value="นางสาว">นางสาว</option>
-                <option value="เด็กชาย">เด็กชาย</option>
-                <option value="เด็กหญิง">เด็กหญิง</option>
+                <option value="อื่นๆ">อื่นๆ</option>
               </StyledSelect>
             </label>
             <label>
diff --git a/src/context/AuthContext.tsx b/src/context/AuthContext.tsx
index ade6eb7a..1afa43c2 100644
--- a/src/context/AuthContext.tsx
+++ b/src/context/AuthContext.tsx
@@ -62,7 +62,7 @@ const AuthProvider: React.FC<{ children: ReactNode }> = ({
     const userObj: User = JSON.parse(userStr);
     setUser(userObj);
 
-    const isStaff = userObj.role == 'staff';
+    const isStaff = userObj.role !== 'staff';
     const isStaffPage = path.includes('/staff');
     const isRegistered = isUserRegistered(userObj);
 

From 20af2f31e9d105ad6916f7eb58a36f2e95980868 Mon Sep 17 00:00:00 2001
From: teegoood <teegooodgood@gmail.com>
Date: Sun, 14 Jul 2024 19:19:56 +0700
Subject: [PATCH 04/22] refactor: swap user and staff

---
 src/context/AuthContext.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/context/AuthContext.tsx b/src/context/AuthContext.tsx
index 1afa43c2..ade6eb7a 100644
--- a/src/context/AuthContext.tsx
+++ b/src/context/AuthContext.tsx
@@ -62,7 +62,7 @@ const AuthProvider: React.FC<{ children: ReactNode }> = ({
     const userObj: User = JSON.parse(userStr);
     setUser(userObj);
 
-    const isStaff = userObj.role !== 'staff';
+    const isStaff = userObj.role == 'staff';
     const isStaffPage = path.includes('/staff');
     const isRegistered = isUserRegistered(userObj);
 

From 7ead035eb6bfd07909db6cb677ff6186d08387fc Mon Sep 17 00:00:00 2001
From: teegoood <teegooodgood@gmail.com>
Date: Sun, 14 Jul 2024 20:42:53 +0700
Subject: [PATCH 05/22] fix

---
 src/app/(main)/staff/register/page.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/(main)/staff/register/page.tsx b/src/app/(main)/staff/register/page.tsx
index 8ca99587..986b6132 100644
--- a/src/app/(main)/staff/register/page.tsx
+++ b/src/app/(main)/staff/register/page.tsx
@@ -115,7 +115,7 @@ export default function Register() {
         toast.success('ลงทะเบียนสำเร็จ');
 
         const isStaff = user.role == 'staff';
-        const newPath = isStaff ? '/staff/home' : '/registered';
+        const newPath = isStaff ? '/firstdate/staff/home' : '/register-done';
 
         await resetContext();
         router.push(newPath);

From 8431d13622b147bfce7aa43ab2fec38e423f463a Mon Sep 17 00:00:00 2001
From: teegoood <teegooodgood@gmail.com>
Date: Sun, 14 Jul 2024 21:41:12 +0700
Subject: [PATCH 06/22] add: remove refresh button from landmark pin

---
 .../firstdate/staff/home/otp/utils/Pin.tsx           | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/firstdate/staff/home/otp/utils/Pin.tsx b/src/components/firstdate/staff/home/otp/utils/Pin.tsx
index cf0565fa..b2a17fce 100644
--- a/src/components/firstdate/staff/home/otp/utils/Pin.tsx
+++ b/src/components/firstdate/staff/home/otp/utils/Pin.tsx
@@ -18,11 +18,13 @@ export default function Pin(props: PinProps) {
         </h1>
       </div>
       <div>
-        <Icon
-          icon="tabler:reload"
-          className="w-6 h-6 text-black"
-          onClick={() => handleClick(index)}
-        />
+        {index < 5 && (
+          <Icon
+            icon="tabler:reload"
+            className="w-6 h-6 text-black"
+            onClick={() => handleClick(index)}
+          />
+        )}
       </div>
     </section>
   );

From 7081a125f1cd3424987a6304fb5e0a02ccaa685a Mon Sep 17 00:00:00 2001
From: teegoood <teegooodgood@gmail.com>
Date: Sun, 14 Jul 2024 21:45:51 +0700
Subject: [PATCH 07/22] =?UTF-8?q?add:=20=E0=B9=84=E0=B8=A1=E0=B9=88?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B8=9A=E0=B8=B8=20title?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/(main)/edit/page.tsx           | 2 +-
 src/app/(main)/register/page.tsx       | 2 +-
 src/app/(main)/staff/edit/page.tsx     | 2 +-
 src/app/(main)/staff/register/page.tsx | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/(main)/edit/page.tsx b/src/app/(main)/edit/page.tsx
index 2fe908be..4471ab3e 100644
--- a/src/app/(main)/edit/page.tsx
+++ b/src/app/(main)/edit/page.tsx
@@ -157,7 +157,7 @@ export default function Edit() {
                 <option value="นาย">นาย</option>
                 <option value="นาง">นาง</option>
                 <option value="นางสาว">นางสาว</option>
-                <option value="อื่นๆ">อื่นๆ</option>
+                <option value="ไม่ระบุ">ไม่ระบุ</option>
               </StyledSelect>
             </label>
 
diff --git a/src/app/(main)/register/page.tsx b/src/app/(main)/register/page.tsx
index fe582687..0cb299e2 100644
--- a/src/app/(main)/register/page.tsx
+++ b/src/app/(main)/register/page.tsx
@@ -184,7 +184,7 @@ export default function Register() {
                 <option value="นาย">นาย</option>
                 <option value="นาง">นาง</option>
                 <option value="นางสาว">นางสาว</option>
-                <option value="อื่นๆ">อื่นๆ</option>
+                <option value="ไม่ระบุ">ไม่ระบุ</option>
               </StyledSelect>
             </label>
             <label>
diff --git a/src/app/(main)/staff/edit/page.tsx b/src/app/(main)/staff/edit/page.tsx
index 3055da9a..81f58e9f 100644
--- a/src/app/(main)/staff/edit/page.tsx
+++ b/src/app/(main)/staff/edit/page.tsx
@@ -140,7 +140,7 @@ export default function Edit() {
                 <option value="นาย">นาย</option>
                 <option value="นาง">นาง</option>
                 <option value="นางสาว">นางสาว</option>
-                <option value="อื่นๆ">อื่นๆ</option>
+                <option value="ไม่ระบุ">ไม่ระบุ</option>
               </StyledSelect>
             </label>
 
diff --git a/src/app/(main)/staff/register/page.tsx b/src/app/(main)/staff/register/page.tsx
index 986b6132..5e62ced5 100644
--- a/src/app/(main)/staff/register/page.tsx
+++ b/src/app/(main)/staff/register/page.tsx
@@ -154,7 +154,7 @@ export default function Register() {
                 <option value="นาย">นาย</option>
                 <option value="นาง">นาง</option>
                 <option value="นางสาว">นางสาว</option>
-                <option value="อื่นๆ">อื่นๆ</option>
+                <option value="ไม่ระบุ">ไม่ระบุ</option>
               </StyledSelect>
             </label>
             <label>

From 25ee6c04f6f3b78964b342935f0c0bb1fb1ed700 Mon Sep 17 00:00:00 2001
From: teegoood <teegooodgood@gmail.com>
Date: Sun, 14 Jul 2024 21:52:46 +0700
Subject: [PATCH 08/22] change: year input

---
 src/app/(main)/edit/page.tsx           | 2 +-
 src/app/(main)/register/page.tsx       | 3 +--
 src/app/(main)/staff/edit/page.tsx     | 4 ++++
 src/app/(main)/staff/register/page.tsx | 4 ++++
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/app/(main)/edit/page.tsx b/src/app/(main)/edit/page.tsx
index 4471ab3e..f1f3e045 100644
--- a/src/app/(main)/edit/page.tsx
+++ b/src/app/(main)/edit/page.tsx
@@ -46,7 +46,7 @@ export default function Edit() {
     lastname: user?.lastname || '',
     nickname: user?.nickname || '',
     faculty: user?.faculty || '',
-    year: user?.year || 0,
+    year: user?.year || 1,
     tel: user?.tel || '',
     parent_tel: user?.parentTel || '',
     parent: user?.parent || '',
diff --git a/src/app/(main)/register/page.tsx b/src/app/(main)/register/page.tsx
index 0cb299e2..13f570eb 100644
--- a/src/app/(main)/register/page.tsx
+++ b/src/app/(main)/register/page.tsx
@@ -45,7 +45,7 @@ export default function Register() {
     lastname: '',
     nickname: '',
     faculty: '',
-    year: 0,
+    year: 1,
     tel: '',
     parent_tel: '',
     parent: '',
@@ -263,7 +263,6 @@ export default function Register() {
                     ชั้นปี
                   </option>
                   <option value={1}>1</option>
-                  <option value={2}>2</option>
                 </StyledSelect>
               </label>
             </div>
diff --git a/src/app/(main)/staff/edit/page.tsx b/src/app/(main)/staff/edit/page.tsx
index 81f58e9f..72ab7d11 100644
--- a/src/app/(main)/staff/edit/page.tsx
+++ b/src/app/(main)/staff/edit/page.tsx
@@ -222,6 +222,10 @@ export default function Edit() {
                   </option>
                   <option value={1}>1</option>
                   <option value={2}>2</option>
+                  <option value={3}>3</option>
+                  <option value={4}>4</option>
+                  <option value={5}>5</option>
+                  <option value={6}>6</option>
                 </StyledSelect>
               </label>
             </div>
diff --git a/src/app/(main)/staff/register/page.tsx b/src/app/(main)/staff/register/page.tsx
index 5e62ced5..d90a8e4d 100644
--- a/src/app/(main)/staff/register/page.tsx
+++ b/src/app/(main)/staff/register/page.tsx
@@ -235,6 +235,10 @@ export default function Register() {
                   </option>
                   <option value={1}>1</option>
                   <option value={2}>2</option>
+                  <option value={3}>3</option>
+                  <option value={4}>4</option>
+                  <option value={5}>5</option>
+                  <option value={6}>6</option>
                 </StyledSelect>
               </label>
             </div>

From b4326ef4e92e5697f3c9ad6e0f629b725fef23dc Mon Sep 17 00:00:00 2001
From: teegoood <teegooodgood@gmail.com>
Date: Sun, 14 Jul 2024 21:57:49 +0700
Subject: [PATCH 09/22] add: medical label

---
 src/app/(main)/edit/page.tsx | 62 ++++++++++++++++++++++--------------
 1 file changed, 38 insertions(+), 24 deletions(-)

diff --git a/src/app/(main)/edit/page.tsx b/src/app/(main)/edit/page.tsx
index f1f3e045..d60b5f69 100644
--- a/src/app/(main)/edit/page.tsx
+++ b/src/app/(main)/edit/page.tsx
@@ -300,30 +300,44 @@ export default function Edit() {
             <h3 className="text-xl font-semibold text-center">
               ข้อมูลด้านสุขภาพ
             </h3>
-            <StyledInput
-              type="text"
-              name="food_allergy"
-              placeholder="อาหารที่แพ้"
-              value={formData.food_allergy}
-              onChange={handleInputChange}
-              error={errors.includes('food_allergy')}
-            />
-            <StyledInput
-              type="text"
-              name="drug_allergy"
-              placeholder="ยาที่แพ้"
-              value={formData.drug_allergy}
-              onChange={handleInputChange}
-              error={errors.includes('drug_allergy')}
-            />
-            <StyledInput
-              type="text"
-              name="illness"
-              placeholder="โรคประจำตัว"
-              value={formData.illness}
-              onChange={handleInputChange}
-              error={errors.includes('illness')}
-            />
+
+            <div className='flex flex-col gap-2'>
+              <label>
+                <span>อาหารที่แพ้</span>
+                <StyledInput
+                  type="text"
+                  name="food_allergy"
+                  placeholder="อาหารที่แพ้"
+                  value={formData.food_allergy}
+                  onChange={handleInputChange}
+                  error={errors.includes('food_allergy')}
+                />
+              </label>
+
+              <label>
+                <span>ยาที่แพ้</span>
+                <StyledInput
+                  type="text"
+                  name="drug_allergy"
+                  placeholder="ยาที่แพ้"
+                  value={formData.drug_allergy}
+                  onChange={handleInputChange}
+                  error={errors.includes('drug_allergy')}
+                />
+              </label>
+
+              <label>
+                <span>โรคประจำตัว</span>
+                <StyledInput
+                  type="text"
+                  name="illness"
+                  placeholder="โรคประจำตัว"
+                  value={formData.illness}
+                  onChange={handleInputChange}
+                  error={errors.includes('illness')}
+                />
+              </label>
+            </div>
           </div>
           <div className="flex flex-col items-center gap-4 mt-6">
             <Image

From 5d19726812bde238c9e687f644113fd5e2fb5494 Mon Sep 17 00:00:00 2001
From: teegoood <teegooodgood@gmail.com>
Date: Sun, 14 Jul 2024 23:14:27 +0700
Subject: [PATCH 10/22] refactor:

---
 src/app/(main)/edit/page.tsx           | 13 ++++++++++---
 src/app/(main)/register/page.tsx       | 11 +++++++++--
 src/app/(main)/staff/edit/page.tsx     | 11 +++++++++--
 src/app/(main)/staff/register/page.tsx | 11 +++++++++--
 4 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/src/app/(main)/edit/page.tsx b/src/app/(main)/edit/page.tsx
index d60b5f69..c8f74745 100644
--- a/src/app/(main)/edit/page.tsx
+++ b/src/app/(main)/edit/page.tsx
@@ -59,10 +59,17 @@ export default function Edit() {
   const handleInputChange = (
     e: ChangeEvent<HTMLInputElement | HTMLSelectElement>
   ) => {
+    let value: string = e.target.value;
+    if (['tel', 'parent_tel'].includes(e.target.name)) {
+      value =
+        '0123456789'.includes(value.at(-1) || '') && value.length <= 10
+          ? value
+          : value.slice(0, -1);
+    }
+
     setFormData({
       ...formData,
-      [e.target.name]:
-        e.target.name === 'year' ? +e.target.value : e.target.value,
+      [e.target.name]: e.target.name === 'year' ? +value : value,
     });
   };
 
@@ -301,7 +308,7 @@ export default function Edit() {
               ข้อมูลด้านสุขภาพ
             </h3>
 
-            <div className='flex flex-col gap-2'>
+            <div className="flex flex-col gap-2">
               <label>
                 <span>อาหารที่แพ้</span>
                 <StyledInput
diff --git a/src/app/(main)/register/page.tsx b/src/app/(main)/register/page.tsx
index 13f570eb..cff12786 100644
--- a/src/app/(main)/register/page.tsx
+++ b/src/app/(main)/register/page.tsx
@@ -63,10 +63,17 @@ export default function Register() {
   const handleInputChange = (
     e: ChangeEvent<HTMLInputElement | HTMLSelectElement>
   ) => {
+    let value: string = e.target.value;
+    if (['tel', 'parent_tel'].includes(e.target.name)) {
+      value =
+        '0123456789'.includes(value.at(-1) || '') && value.length <= 10
+          ? value
+          : value.slice(0, -1);
+    }
+
     setFormData({
       ...formData,
-      [e.target.name]:
-        e.target.name === 'year' ? +e.target.value : e.target.value,
+      [e.target.name]: e.target.name === 'year' ? +value : value,
     });
   };
 
diff --git a/src/app/(main)/staff/edit/page.tsx b/src/app/(main)/staff/edit/page.tsx
index 72ab7d11..5e07c0d3 100644
--- a/src/app/(main)/staff/edit/page.tsx
+++ b/src/app/(main)/staff/edit/page.tsx
@@ -43,10 +43,17 @@ export default function Edit() {
   const handleInputChange = (
     e: ChangeEvent<HTMLInputElement | HTMLSelectElement>
   ) => {
+    let value: string = e.target.value;
+    if (['tel', 'parent_tel'].includes(e.target.name)) {
+      value =
+        '0123456789'.includes(value.at(-1) || '') && value.length <= 10
+          ? value
+          : value.slice(0, -1);
+    }
+
     setFormData({
       ...formData,
-      [e.target.name]:
-        e.target.name === 'year' ? +e.target.value : e.target.value,
+      [e.target.name]: e.target.name === 'year' ? +value : value,
     });
   };
 
diff --git a/src/app/(main)/staff/register/page.tsx b/src/app/(main)/staff/register/page.tsx
index d90a8e4d..49802ab5 100644
--- a/src/app/(main)/staff/register/page.tsx
+++ b/src/app/(main)/staff/register/page.tsx
@@ -46,10 +46,17 @@ export default function Register() {
   const handleInputChange = (
     e: ChangeEvent<HTMLInputElement | HTMLSelectElement>
   ) => {
+    let value: string = e.target.value;
+    if (['tel', 'parent_tel'].includes(e.target.name)) {
+      value =
+        '0123456789'.includes(value.at(-1) || '') && value.length <= 10
+          ? value
+          : value.slice(0, -1);
+    }
+
     setFormData({
       ...formData,
-      [e.target.name]:
-        e.target.name === 'year' ? +e.target.value : e.target.value,
+      [e.target.name]: e.target.name === 'year' ? +value : value,
     });
   };
 

From c163fc739df58d74cd42b9368ec1449785723cb8 Mon Sep 17 00:00:00 2001
From: teegoood <teegooodgood@gmail.com>
Date: Sun, 14 Jul 2024 23:17:55 +0700
Subject: [PATCH 11/22] refactor: tel input

---
 src/app/(main)/edit/page.tsx           | 4 ++--
 src/app/(main)/register/page.tsx       | 4 ++--
 src/app/(main)/staff/edit/page.tsx     | 2 +-
 src/app/(main)/staff/register/page.tsx | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/app/(main)/edit/page.tsx b/src/app/(main)/edit/page.tsx
index c8f74745..b4a76a01 100644
--- a/src/app/(main)/edit/page.tsx
+++ b/src/app/(main)/edit/page.tsx
@@ -81,8 +81,8 @@ export default function Edit() {
     if (!formData.nickname) formErrors.push('nickname');
     if (!formData.faculty) formErrors.push('faculty');
     if (!formData.year) formErrors.push('year');
-    if (!formData.tel) formErrors.push('tel');
-    if (!formData.parent_tel) formErrors.push('parent_tel');
+    if (formData.tel.length != 10) formErrors.push('tel');
+    if (formData.parent_tel.length != 10) formErrors.push('parent_tel');
     if (!formData.parent) formErrors.push('parent');
     setErrors(formErrors);
 
diff --git a/src/app/(main)/register/page.tsx b/src/app/(main)/register/page.tsx
index cff12786..54b007c3 100644
--- a/src/app/(main)/register/page.tsx
+++ b/src/app/(main)/register/page.tsx
@@ -92,8 +92,8 @@ export default function Register() {
         if (!formData.year) stepErrors.push('year');
         break;
       case 2:
-        if (!formData.tel) stepErrors.push('tel');
-        if (!formData.parent_tel) stepErrors.push('parent_tel');
+        if (formData.tel.length != 10) stepErrors.push('tel');
+        if (formData.parent_tel.length != 10) stepErrors.push('parent_tel');
         if (!formData.parent) stepErrors.push('parent');
         break;
       case 3:
diff --git a/src/app/(main)/staff/edit/page.tsx b/src/app/(main)/staff/edit/page.tsx
index 5e07c0d3..dbe87a57 100644
--- a/src/app/(main)/staff/edit/page.tsx
+++ b/src/app/(main)/staff/edit/page.tsx
@@ -65,7 +65,7 @@ export default function Edit() {
     if (!formData.nickname) formErrors.push('nickname');
     if (!formData.faculty) formErrors.push('faculty');
     if (!formData.year) formErrors.push('year');
-    if (!formData.tel) formErrors.push('tel');
+    if (formData.tel.length != 10) formErrors.push('tel');
     setErrors(formErrors);
 
     const isError = formErrors.length !== 0;
diff --git a/src/app/(main)/staff/register/page.tsx b/src/app/(main)/staff/register/page.tsx
index 49802ab5..d7872f35 100644
--- a/src/app/(main)/staff/register/page.tsx
+++ b/src/app/(main)/staff/register/page.tsx
@@ -73,7 +73,7 @@ export default function Register() {
         if (!formData.nickname) stepErrors.push('nickname');
         if (!formData.faculty) stepErrors.push('faculty');
         if (!formData.year) stepErrors.push('year');
-        if (!formData.tel) stepErrors.push('tel');
+        if (formData.tel.length != 10) stepErrors.push('tel');
         break;
     }
 

From c1ec4fe292ead119afbb2ecc7160a026a23b3e48 Mon Sep 17 00:00:00 2001
From: teegoood <teegooodgood@gmail.com>
Date: Sun, 14 Jul 2024 23:39:51 +0700
Subject: [PATCH 12/22] add: text modal validate

---
 src/components/firstdate/home/modal/FavoriteClubModal.tsx | 4 ++++
 src/components/firstdate/home/modal/OpinionModal.tsx      | 4 ++++
 src/components/firstdate/home/modal/TextModal.tsx         | 6 ++----
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/components/firstdate/home/modal/FavoriteClubModal.tsx b/src/components/firstdate/home/modal/FavoriteClubModal.tsx
index b28ccc85..32758b65 100644
--- a/src/components/firstdate/home/modal/FavoriteClubModal.tsx
+++ b/src/components/firstdate/home/modal/FavoriteClubModal.tsx
@@ -1,5 +1,6 @@
 import React, { useState } from 'react';
 import TextModal from '@/components/firstdate/home/modal/TextModal';
+import toast from 'react-hot-toast';
 
 interface FavoriteClubModalProps {
   activityId: string;
@@ -19,6 +20,9 @@ const FavoriteClubModal: React.FC<FavoriteClubModalProps> = ({
   };
 
   const handleConfirm = () => {
+    if(inputValue.length < 1){
+      return toast.error('กรุณากรอกข้อมูล')
+    }
     onSubmit(activityId, inputValue);
     onClose();
   };
diff --git a/src/components/firstdate/home/modal/OpinionModal.tsx b/src/components/firstdate/home/modal/OpinionModal.tsx
index f0ea7c4c..0e220871 100644
--- a/src/components/firstdate/home/modal/OpinionModal.tsx
+++ b/src/components/firstdate/home/modal/OpinionModal.tsx
@@ -1,5 +1,6 @@
 import React, { useState } from 'react';
 import TextModal from '@/components/firstdate/home/modal/TextModal';
+import toast from 'react-hot-toast';
 
 interface OpinionModalProps {
   activityId: string;
@@ -19,6 +20,9 @@ const OpinionModal: React.FC<OpinionModalProps> = ({
   };
 
   const handleConfirm = () => {
+    if (inputValue.length < 1) {
+      return toast.error('กรุณากรอกข้อมูล');
+    }
     onSubmit(activityId, inputValue);
     onClose();
   };
diff --git a/src/components/firstdate/home/modal/TextModal.tsx b/src/components/firstdate/home/modal/TextModal.tsx
index c2ab8a3b..f7ca5958 100644
--- a/src/components/firstdate/home/modal/TextModal.tsx
+++ b/src/components/firstdate/home/modal/TextModal.tsx
@@ -8,7 +8,7 @@ import Image from 'next/image';
 interface ModalProps {
   title: string;
   placeholder: string;
-  onClose: () => void;
+  onClose?: () => void;
   value?: string;
   onChange?: (e: React.ChangeEvent<HTMLInputElement>) => void;
   onClick?: () => void;
@@ -18,14 +18,13 @@ interface ModalProps {
 const Modal: React.FC<ModalProps> = ({
   title,
   placeholder,
-  onClose,
   value,
   onChange,
   onClick,
   children,
 }) => {
   return (
-    <div className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50">
+    <div className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50 px-[5%]">
       <div className="flex flex-col items-center justify-center bg-white p-6 space-y-6 rounded-3xl shadow-lg max-w-md w-full">
         <div className="flex justify-between items-center w-full mb-4">
           <Image
@@ -51,7 +50,6 @@ const Modal: React.FC<ModalProps> = ({
         <button
           onClick={() => {
             onClick && onClick();
-            onClose();
           }}
           className="text-black px-10 py-2 rounded-xl max-w-lg text-xl font-normal bg-project-pink"
         >

From f700e1c64d708f705628b3ffb1956b64a3f27d0e Mon Sep 17 00:00:00 2001
From: teegoood <teegooodgood@gmail.com>
Date: Sun, 14 Jul 2024 23:40:17 +0700
Subject: [PATCH 13/22] add: shadow to menu icon

---
 src/components/firstdate/MenuIcon.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/firstdate/MenuIcon.tsx b/src/components/firstdate/MenuIcon.tsx
index 83379d8b..563d6286 100644
--- a/src/components/firstdate/MenuIcon.tsx
+++ b/src/components/firstdate/MenuIcon.tsx
@@ -13,7 +13,7 @@ const MenuIcon = (props: MenuIconProps) => {
   const { isActive, handleOnClick, name, iconify } = props;
 
   return (
-    <div className="flex flex-col items-center justify-center">
+    <div className="flex flex-col items-center justify-center drop-shadow-md">
       <Icon
         icon={iconify}
         className={cn('w-11 h-11 p-3 rounded-full cursor-pointer', {

From 642c689f4242e6a71d59169af3ade948e23be207 Mon Sep 17 00:00:00 2001
From: teegoood <teegooodgood@gmail.com>
Date: Sun, 14 Jul 2024 23:53:23 +0700
Subject: [PATCH 14/22] fix: reward logic

---
 src/components/firstdate/MenuList.tsx | 21 ++++++++++++++++-----
 src/utils/reward.ts                   | 11 +++++++++--
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/components/firstdate/MenuList.tsx b/src/components/firstdate/MenuList.tsx
index d26c41fc..3ebce507 100644
--- a/src/components/firstdate/MenuList.tsx
+++ b/src/components/firstdate/MenuList.tsx
@@ -14,9 +14,9 @@ interface TwoCircleMenuProps {
 export default function MenuList({ isRewardPage }: TwoCircleMenuProps) {
   const { user } = useAuth();
   const router = useRouter();
-  const currentPath = usePathname().split('/').at(-1);
-  const [isCongratOpen, setIsCongratOpen] = useState(false);
   const pathname = usePathname();
+  const currentPath = pathname.split('/').at(-1);
+  const [isCongratOpen, setIsCongratOpen] = useState(false);
 
   const handleNavigate = useCallback(
     (path: string): void => {
@@ -40,13 +40,24 @@ export default function MenuList({ isRewardPage }: TwoCircleMenuProps) {
     }
   }, [user]);
 
+  const isShowReward = useMemo(() => {
+    return (
+      giftCondition &&
+      giftCondition.status != 'isStaff' &&
+      giftCondition.status != 'recieved' &&
+      !isRewardPage
+    );
+  }, [giftCondition, isRewardPage]);
+
+  console.log(giftCondition)
+
   return (
     <div>
-      {giftCondition && (
+      {giftCondition && isShowReward && (
         <CongratsModal
           isOpen={isCongratOpen}
           onOpenChange={setIsCongratOpen}
-          score={giftCondition?.score}
+          score={giftCondition.status == 'ready' ? giftCondition?.score : 0}
         />
       )}
       {user && (
@@ -58,7 +69,7 @@ export default function MenuList({ isRewardPage }: TwoCircleMenuProps) {
               handleOnClick={() => handleNavigate('profile')}
               iconify="icon-park-solid:people"
             />
-            {!isRewardPage && giftCondition?.status != 'recieved' && (
+            {giftCondition && isShowReward && (
               <div className="relative">
                 <MenuIcon
                   name="รางวัล"
diff --git a/src/utils/reward.ts b/src/utils/reward.ts
index 8835f69c..5eabd2db 100644
--- a/src/utils/reward.ts
+++ b/src/utils/reward.ts
@@ -1,6 +1,6 @@
 import { User } from '@/types/user';
 
-export type Status = 'ready' | 'not-ready' | 'recieved';
+export type Status = 'ready' | 'not-ready' | 'recieved' | 'isStaff';
 
 export const getReceiveGiftCondition = (
   user: User
@@ -9,6 +9,13 @@ export const getReceiveGiftCondition = (
     throw new Error('there is no user');
   }
 
+  if (user.role == 'staff') {
+    return {
+      score: 0,
+      status: 'isStaff',
+    };
+  }
+
   let workshop = 0;
   let landmark = 0;
   let club = 0;
@@ -24,7 +31,7 @@ export const getReceiveGiftCondition = (
   });
 
   const score = workshop + club + landmark;
-  const isReceivedGift = user.receiveGift >= 0;
+  const isReceivedGift = user.receiveGift > 0;
   const isValidPoint = !!workshop && !!club && !!landmark && score >= 6;
 
   let status: Status;

From 04bb7c1112e735b634395307db4d7cfcdbe6cff2 Mon Sep 17 00:00:00 2001
From: teegoood <teegooodgood@gmail.com>
Date: Mon, 15 Jul 2024 00:11:24 +0700
Subject: [PATCH 15/22] lint fix

---
 src/components/firstdate/MenuList.tsx                     | 2 +-
 src/components/firstdate/home/modal/FavoriteClubModal.tsx | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/firstdate/MenuList.tsx b/src/components/firstdate/MenuList.tsx
index 3ebce507..89153edc 100644
--- a/src/components/firstdate/MenuList.tsx
+++ b/src/components/firstdate/MenuList.tsx
@@ -49,7 +49,7 @@ export default function MenuList({ isRewardPage }: TwoCircleMenuProps) {
     );
   }, [giftCondition, isRewardPage]);
 
-  console.log(giftCondition)
+  console.log(giftCondition);
 
   return (
     <div>
diff --git a/src/components/firstdate/home/modal/FavoriteClubModal.tsx b/src/components/firstdate/home/modal/FavoriteClubModal.tsx
index 32758b65..2eb1abe9 100644
--- a/src/components/firstdate/home/modal/FavoriteClubModal.tsx
+++ b/src/components/firstdate/home/modal/FavoriteClubModal.tsx
@@ -20,8 +20,8 @@ const FavoriteClubModal: React.FC<FavoriteClubModalProps> = ({
   };
 
   const handleConfirm = () => {
-    if(inputValue.length < 1){
-      return toast.error('กรุณากรอกข้อมูล')
+    if (inputValue.length < 1) {
+      return toast.error('กรุณากรอกข้อมูล');
     }
     onSubmit(activityId, inputValue);
     onClose();

From 97b2f761e01e0e74c5e17594c3ee06cbda48e704 Mon Sep 17 00:00:00 2001
From: teegoood <teegooodgood@gmail.com>
Date: Mon, 15 Jul 2024 00:27:55 +0700
Subject: [PATCH 16/22] fix: auth

---
 src/context/AuthContext.tsx | 6 ++++--
 src/utils/user.ts           | 4 ----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/context/AuthContext.tsx b/src/context/AuthContext.tsx
index ade6eb7a..e4b3cff7 100644
--- a/src/context/AuthContext.tsx
+++ b/src/context/AuthContext.tsx
@@ -65,9 +65,10 @@ const AuthProvider: React.FC<{ children: ReactNode }> = ({
     const isStaff = userObj.role == 'staff';
     const isStaffPage = path.includes('/staff');
     const isRegistered = isUserRegistered(userObj);
+    const isRegisterPage = path.includes('register');
 
     if (isStaff) {
-      if (!isRegistered) {
+      if (!isRegistered && !isRegisterPage) {
         return router.push('/staff/register');
       }
 
@@ -75,7 +76,7 @@ const AuthProvider: React.FC<{ children: ReactNode }> = ({
         return router.push('/firstdate/staff/home');
       }
     } else {
-      if (!isRegistered) {
+      if (!isRegistered && !isRegisterPage) {
         return router.push('/register');
       }
 
@@ -109,6 +110,7 @@ const AuthProvider: React.FC<{ children: ReactNode }> = ({
 
     setisReady(true);
   }, [router, path]);
+
   return (
     <AuthContext.Provider value={{ user, resetContext, logout }}>
       {(user || path == '/') && isReady ? (
diff --git a/src/utils/user.ts b/src/utils/user.ts
index b069bb9c..aef49486 100644
--- a/src/utils/user.ts
+++ b/src/utils/user.ts
@@ -55,12 +55,8 @@ export const patchReward = async (): Promise<boolean | null> => {
 
 export const isUserRegistered = (user: User): boolean => {
   return (
-    !!user.faculty &&
     !!user.firstname &&
     !!user.lastname &&
-    !!user.nickname &&
-    !!user.parent &&
-    !!user.parentTel &&
     !!user.tel &&
     !!user.title &&
     !!user.year

From e6bdb9d3f8f4bda69bbb417518863c02c5755318 Mon Sep 17 00:00:00 2001
From: teegoood <teegooodgood@gmail.com>
Date: Mon, 15 Jul 2024 00:41:28 +0700
Subject: [PATCH 17/22] change: staff edit page

---
 src/app/(main)/staff/edit/page.tsx       | 4 ++--
 src/app/firstdate/staff/profile/page.tsx | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/app/(main)/staff/edit/page.tsx b/src/app/(main)/staff/edit/page.tsx
index dbe87a57..d8137fb8 100644
--- a/src/app/(main)/staff/edit/page.tsx
+++ b/src/app/(main)/staff/edit/page.tsx
@@ -97,7 +97,7 @@ export default function Edit() {
         setUpload(true);
         toast.success('เเก้ไขข้อมูลสำเร็จ');
         await resetContext();
-        router.push('/home');
+        router.push('/firstdate/staff/profile');
       });
     }
   };
@@ -266,7 +266,7 @@ export default function Edit() {
             </Button>
             <Button
               variant="white"
-              onClick={() => router.push('/staff/home')}
+              onClick={() => router.push('/firstdate/staff/profile')}
             >
               ยกเลิก
             </Button>
diff --git a/src/app/firstdate/staff/profile/page.tsx b/src/app/firstdate/staff/profile/page.tsx
index ef619ee5..b812c1ec 100644
--- a/src/app/firstdate/staff/profile/page.tsx
+++ b/src/app/firstdate/staff/profile/page.tsx
@@ -8,6 +8,7 @@ import { useAuth } from '@/context/AuthContext';
 import Border from '@/components/firstdate/Border';
 import MenuList from '@/components/firstdate/MenuList';
 import { getMajorNameById } from '@/utils/register';
+import Link from 'next/link';
 
 export default function AdminInfo() {
   const { user, logout } = useAuth();
@@ -34,6 +35,12 @@ export default function AdminInfo() {
         <div className="flex justify-center items-center text-2xl gap-2 font-semibold mt-4">
           <div>{user?.firstname}</div>
           <div>#{user?.year}</div>
+          <Link href={'/staff/edit'}>
+            <Icon
+              icon="humbleicons:pencil"
+              className="cursor-pointer w-8 h-8 p-1 rounded-full bg-white text-black shadow-lg"
+            />
+          </Link>
         </div>
         <div>{user && getMajorNameById(user?.faculty)}</div>
         <div className="text-lg mt-2 text-gray-500">

From 95ba99438535b8df76fc1157b0e2e4d325f1b4e6 Mon Sep 17 00:00:00 2001
From: teegoood <teegooodgood@gmail.com>
Date: Mon, 15 Jul 2024 13:28:02 +0700
Subject: [PATCH 18/22] fix: pdpa style

---
 src/components/(main)/pdpa/index.tsx | 108 ++++++++++++++-------------
 1 file changed, 55 insertions(+), 53 deletions(-)

diff --git a/src/components/(main)/pdpa/index.tsx b/src/components/(main)/pdpa/index.tsx
index 21e49ec8..bca527da 100644
--- a/src/components/(main)/pdpa/index.tsx
+++ b/src/components/(main)/pdpa/index.tsx
@@ -68,63 +68,65 @@ export default function Pdpa(props: PdpaProps) {
             </svg>
           </button>
         </div>
-        <h1 className="mt-[400px] font-semibold text-5xl">PDPA</h1>
-        <div className="my-8 border border-black h-[1px] w-[95%]"></div>
-        <h2 className="text-center text-xl font-semibold">
-          {titles.map((title, index) => (
-            <p key={index}>{title}</p>
-          ))}
-        </h2>
-        <article className="mt-5 p-2 max-w-sm text-base">
-          {description.map((section, index) => (
-            <p
-              key={index}
-              className="mb-4"
-            >
-              {section}
-            </p>
-          ))}
-        </article>
-        <div className="flex justify-center items-center gap-4">
-          <div
-            className={`relative min-w-8 h-8 rounded-full 
-                        ${isChecked ? 'bg-project-fuchsia' : 'bg-white border border-black'} `}
-          >
-            <input
-              id="accept"
-              type="checkbox"
-              className="absolute h-8 w-8 opacity-0"
-              checked={isChecked}
-              onChange={() => setIsChecked(!isChecked)}
-            />
-            {isChecked && (
-              <svg
-                className="pointer-events-none absolute inset-0 m-auto h-5 w-5 fill-current text-white"
-                viewBox="0 0 20 20"
+        <div className='absolute top-8 flex flex-col items-center pb-8 px-2'>
+          <h1 className="font-semibold text-5xl">PDPA</h1>
+          <div className="my-8 border border-black h-[1px] w-[95%]"></div>
+          <h2 className="text-center text-xl font-semibold">
+            {titles.map((title, index) => (
+              <p key={index}>{title}</p>
+            ))}
+          </h2>
+          <article className="mt-5 p-2 max-w-sm text-base">
+            {description.map((section, index) => (
+              <p
+                key={index}
+                className="mb-4"
               >
-                <path
-                  d="M16.7,5.3c-0.4-0.4-1-0.4-1.4,0L7.4,13.2L4.7,10.6c-0.4-0.4-1-0.4-1.4,0s-0.4,1,0,1.4l3.3,3.3c0.2,0.2,0.4,0.3,0.7,0.3
-                    s0.5-0.1,0.7-0.3l8.7-8.7C17.1,6.3,17.1,5.7,16.7,5.3z"
-                />
-              </svg>
-            )}
+                {section}
+              </p>
+            ))}
+          </article>
+          <div className="flex justify-center items-center gap-4">
+            <div
+              className={`relative min-w-8 h-8 rounded-full
+                          ${isChecked ? 'bg-project-fuchsia' : 'bg-white border border-black'} `}
+            >
+              <input
+                id="accept"
+                type="checkbox"
+                className="absolute h-8 w-8 opacity-0"
+                checked={isChecked}
+                onChange={() => setIsChecked(!isChecked)}
+              />
+              {isChecked && (
+                <svg
+                  className="pointer-events-none absolute inset-0 m-auto h-5 w-5 fill-current text-white"
+                  viewBox="0 0 20 20"
+                >
+                  <path
+                    d="M16.7,5.3c-0.4-0.4-1-0.4-1.4,0L7.4,13.2L4.7,10.6c-0.4-0.4-1-0.4-1.4,0s-0.4,1,0,1.4l3.3,3.3c0.2,0.2,0.4,0.3,0.7,0.3
+                      s0.5-0.1,0.7-0.3l8.7-8.7C17.1,6.3,17.1,5.7,16.7,5.3z"
+                  />
+                </svg>
+              )}
+            </div>
+            <label
+              htmlFor="accept"
+              className="font-medium text-base"
+            >
+              ฉันยอมรับเงื่อนไขและยินยอมให้เปิดเผยข้อมูลส่วนบุคคล
+            </label>
           </div>
-          <label
-            htmlFor="accept"
-            className="font-medium text-base"
+          <button
+            className={`mt-4 px-[10%] py-2 h-12 font-medium text-white text-xl rounded-lg bg-project-fuchsia
+                  ${isChecked ? 'opacity-100' : 'opacity-50'}`}
+            disabled={!isChecked}
+            onClick={handleOnSuccess}
           >
-            ฉันยอมรับเงื่อนไขและยินยอมให้เปิดเผยข้อมูลส่วนบุคคล
-          </label>
+            รับทราบและยินยอม
+          </button>
+                </div>
         </div>
-        <button
-          className={`mt-4 px-[10%] py-2 h-12 font-medium text-white text-xl rounded-lg bg-project-fuchsia
-                ${isChecked ? 'opacity-100' : 'opacity-50'}`}
-          disabled={!isChecked}
-          onClick={handleOnSuccess}
-        >
-          รับทราบและยินยอม
-        </button>
-      </div>
     </div>
   );
 }

From 7c43ab73a9b1dabb98c2fe022bce5ec715ea6e6f Mon Sep 17 00:00:00 2001
From: teegoood <teegooodgood@gmail.com>
Date: Mon, 15 Jul 2024 13:37:47 +0700
Subject: [PATCH 19/22] refactor: type and remove dev page

---
 src/app/dev/page.tsx        | 31 -------------------------------
 src/app/rpkm/page.tsx       | 14 ++++++++++++++
 src/components/UserCard.tsx |  6 +++---
 3 files changed, 17 insertions(+), 34 deletions(-)
 delete mode 100644 src/app/dev/page.tsx
 create mode 100644 src/app/rpkm/page.tsx

diff --git a/src/app/dev/page.tsx b/src/app/dev/page.tsx
deleted file mode 100644
index 7aeb2c12..00000000
--- a/src/app/dev/page.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-'use client';
-
-import Border from '@/components/Border';
-import { Suspense } from 'react';
-import UserCard from '@/components/UserCard';
-
-// For dev (delete soon)
-export default function page() {
-  return (
-    <Suspense>
-      <Login />
-    </Suspense>
-  );
-}
-
-function Login() {
-  return (
-    <Border variant="dark-pink">
-      <UserCard />
-
-      <div className="w-4/5 h-4/5 ">
-        <UserCard />
-      </div>
-
-      {/* Break if the size is too small because the texts' sizes */}
-      <div className="w-1/2 h-1/2">
-        <UserCard />
-      </div>
-    </Border>
-  );
-}
diff --git a/src/app/rpkm/page.tsx b/src/app/rpkm/page.tsx
new file mode 100644
index 00000000..3be41cbb
--- /dev/null
+++ b/src/app/rpkm/page.tsx
@@ -0,0 +1,14 @@
+'use client'
+
+import UserCard from '@/components/UserCard'
+import React from 'react'
+
+const page = () => {
+  return (
+    <div>
+        <UserCard />
+    </div>
+  )
+}
+
+export default page
\ No newline at end of file
diff --git a/src/components/UserCard.tsx b/src/components/UserCard.tsx
index e0726aa7..b2e86fc9 100644
--- a/src/components/UserCard.tsx
+++ b/src/components/UserCard.tsx
@@ -10,7 +10,7 @@ const UserCard = () => {
   const { user } = useAuth();
   const name = `${user?.firstname} ${user?.lastname}`;
   const studentId = user?.email.split('@')[0];
-  const photo_url = user?.photo_url;
+  const photoUrl = user?.photoUrl;
 
   return (
     <div className="relative w-full h-full flex justify-center items-center p-4">
@@ -21,9 +21,9 @@ const UserCard = () => {
       />
       <div className="absolute top-[15%] left-[9%] w-[65%] h-[65%] flex flex-col items-center justify-center p-4 bg-blue-900 rounded-lg">
         <div className="w-[35%] h-[50%] overflow-hidden rounded-full">
-          {photo_url && (
+          {photoUrl && (
             <img
-              src={photo_url}
+              src={photoUrl}
               alt="user-picture"
               className="w-full h-full object-cover"
             />

From 0432784ffe1b1baf0d64c036948cc263bc0e88cc Mon Sep 17 00:00:00 2001
From: teegoood <teegooodgood@gmail.com>
Date: Mon, 15 Jul 2024 13:38:48 +0700
Subject: [PATCH 20/22] chore: lint fix

---
 src/app/rpkm/page.tsx                | 14 +++++++-------
 src/components/(main)/pdpa/index.tsx |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/app/rpkm/page.tsx b/src/app/rpkm/page.tsx
index 3be41cbb..b6650cb9 100644
--- a/src/app/rpkm/page.tsx
+++ b/src/app/rpkm/page.tsx
@@ -1,14 +1,14 @@
-'use client'
+'use client';
 
-import UserCard from '@/components/UserCard'
-import React from 'react'
+import UserCard from '@/components/UserCard';
+import React from 'react';
 
 const page = () => {
   return (
     <div>
-        <UserCard />
+      <UserCard />
     </div>
-  )
-}
+  );
+};
 
-export default page
\ No newline at end of file
+export default page;
diff --git a/src/components/(main)/pdpa/index.tsx b/src/components/(main)/pdpa/index.tsx
index bca527da..4c227235 100644
--- a/src/components/(main)/pdpa/index.tsx
+++ b/src/components/(main)/pdpa/index.tsx
@@ -68,7 +68,7 @@ export default function Pdpa(props: PdpaProps) {
             </svg>
           </button>
         </div>
-        <div className='absolute top-8 flex flex-col items-center pb-8 px-2'>
+        <div className="absolute top-8 flex flex-col items-center pb-8 px-2">
           <h1 className="font-semibold text-5xl">PDPA</h1>
           <div className="my-8 border border-black h-[1px] w-[95%]"></div>
           <h2 className="text-center text-xl font-semibold">
@@ -125,8 +125,8 @@ export default function Pdpa(props: PdpaProps) {
           >
             รับทราบและยินยอม
           </button>
-                </div>
         </div>
+      </div>
     </div>
   );
 }

From 00e1a9e4cdc854dd1c271476e56a1e839c0b695e Mon Sep 17 00:00:00 2001
From: teegoood <teegooodgood@gmail.com>
Date: Mon, 15 Jul 2024 16:56:18 +0700
Subject: [PATCH 21/22] add: folder

---
 src/app/rpkm/activities/[category]/page.tsx   | 9 +++++++++
 src/app/rpkm/activities/details/[id]/page.tsx | 9 +++++++++
 src/app/rpkm/activities/home/page.tsx         | 9 +++++++++
 src/app/rpkm/activities/map/page.tsx          | 9 +++++++++
 src/app/rpkm/baan/baan-select/page.tsx        | 9 +++++++++
 src/app/rpkm/baan/home/page.tsx               | 9 +++++++++
 6 files changed, 54 insertions(+)
 create mode 100644 src/app/rpkm/activities/[category]/page.tsx
 create mode 100644 src/app/rpkm/activities/details/[id]/page.tsx
 create mode 100644 src/app/rpkm/activities/home/page.tsx
 create mode 100644 src/app/rpkm/activities/map/page.tsx
 create mode 100644 src/app/rpkm/baan/baan-select/page.tsx
 create mode 100644 src/app/rpkm/baan/home/page.tsx

diff --git a/src/app/rpkm/activities/[category]/page.tsx b/src/app/rpkm/activities/[category]/page.tsx
new file mode 100644
index 00000000..983ebb85
--- /dev/null
+++ b/src/app/rpkm/activities/[category]/page.tsx
@@ -0,0 +1,9 @@
+import React from 'react'
+
+const page = () => {
+  return (
+    <div>page</div>
+  )
+}
+
+export default page
\ No newline at end of file
diff --git a/src/app/rpkm/activities/details/[id]/page.tsx b/src/app/rpkm/activities/details/[id]/page.tsx
new file mode 100644
index 00000000..983ebb85
--- /dev/null
+++ b/src/app/rpkm/activities/details/[id]/page.tsx
@@ -0,0 +1,9 @@
+import React from 'react'
+
+const page = () => {
+  return (
+    <div>page</div>
+  )
+}
+
+export default page
\ No newline at end of file
diff --git a/src/app/rpkm/activities/home/page.tsx b/src/app/rpkm/activities/home/page.tsx
new file mode 100644
index 00000000..983ebb85
--- /dev/null
+++ b/src/app/rpkm/activities/home/page.tsx
@@ -0,0 +1,9 @@
+import React from 'react'
+
+const page = () => {
+  return (
+    <div>page</div>
+  )
+}
+
+export default page
\ No newline at end of file
diff --git a/src/app/rpkm/activities/map/page.tsx b/src/app/rpkm/activities/map/page.tsx
new file mode 100644
index 00000000..983ebb85
--- /dev/null
+++ b/src/app/rpkm/activities/map/page.tsx
@@ -0,0 +1,9 @@
+import React from 'react'
+
+const page = () => {
+  return (
+    <div>page</div>
+  )
+}
+
+export default page
\ No newline at end of file
diff --git a/src/app/rpkm/baan/baan-select/page.tsx b/src/app/rpkm/baan/baan-select/page.tsx
new file mode 100644
index 00000000..983ebb85
--- /dev/null
+++ b/src/app/rpkm/baan/baan-select/page.tsx
@@ -0,0 +1,9 @@
+import React from 'react'
+
+const page = () => {
+  return (
+    <div>page</div>
+  )
+}
+
+export default page
\ No newline at end of file
diff --git a/src/app/rpkm/baan/home/page.tsx b/src/app/rpkm/baan/home/page.tsx
new file mode 100644
index 00000000..983ebb85
--- /dev/null
+++ b/src/app/rpkm/baan/home/page.tsx
@@ -0,0 +1,9 @@
+import React from 'react'
+
+const page = () => {
+  return (
+    <div>page</div>
+  )
+}
+
+export default page
\ No newline at end of file

From 7136b1c833e0701695f93aa83285eb7c995dfc3c Mon Sep 17 00:00:00 2001
From: teegoood <teegooodgood@gmail.com>
Date: Mon, 15 Jul 2024 16:59:05 +0700
Subject: [PATCH 22/22] chore: lint fix

---
 src/app/rpkm/activities/[category]/page.tsx   | 10 ++++------
 src/app/rpkm/activities/details/[id]/page.tsx | 10 ++++------
 src/app/rpkm/activities/home/page.tsx         | 10 ++++------
 src/app/rpkm/activities/map/page.tsx          | 10 ++++------
 src/app/rpkm/baan/baan-select/page.tsx        | 10 ++++------
 src/app/rpkm/baan/home/page.tsx               | 10 ++++------
 src/components/(main)/pdpa/index.tsx          |  4 ++--
 7 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/src/app/rpkm/activities/[category]/page.tsx b/src/app/rpkm/activities/[category]/page.tsx
index 983ebb85..420e11cc 100644
--- a/src/app/rpkm/activities/[category]/page.tsx
+++ b/src/app/rpkm/activities/[category]/page.tsx
@@ -1,9 +1,7 @@
-import React from 'react'
+import React from 'react';
 
 const page = () => {
-  return (
-    <div>page</div>
-  )
-}
+  return <div>page</div>;
+};
 
-export default page
\ No newline at end of file
+export default page;
diff --git a/src/app/rpkm/activities/details/[id]/page.tsx b/src/app/rpkm/activities/details/[id]/page.tsx
index 983ebb85..420e11cc 100644
--- a/src/app/rpkm/activities/details/[id]/page.tsx
+++ b/src/app/rpkm/activities/details/[id]/page.tsx
@@ -1,9 +1,7 @@
-import React from 'react'
+import React from 'react';
 
 const page = () => {
-  return (
-    <div>page</div>
-  )
-}
+  return <div>page</div>;
+};
 
-export default page
\ No newline at end of file
+export default page;
diff --git a/src/app/rpkm/activities/home/page.tsx b/src/app/rpkm/activities/home/page.tsx
index 983ebb85..420e11cc 100644
--- a/src/app/rpkm/activities/home/page.tsx
+++ b/src/app/rpkm/activities/home/page.tsx
@@ -1,9 +1,7 @@
-import React from 'react'
+import React from 'react';
 
 const page = () => {
-  return (
-    <div>page</div>
-  )
-}
+  return <div>page</div>;
+};
 
-export default page
\ No newline at end of file
+export default page;
diff --git a/src/app/rpkm/activities/map/page.tsx b/src/app/rpkm/activities/map/page.tsx
index 983ebb85..420e11cc 100644
--- a/src/app/rpkm/activities/map/page.tsx
+++ b/src/app/rpkm/activities/map/page.tsx
@@ -1,9 +1,7 @@
-import React from 'react'
+import React from 'react';
 
 const page = () => {
-  return (
-    <div>page</div>
-  )
-}
+  return <div>page</div>;
+};
 
-export default page
\ No newline at end of file
+export default page;
diff --git a/src/app/rpkm/baan/baan-select/page.tsx b/src/app/rpkm/baan/baan-select/page.tsx
index 983ebb85..420e11cc 100644
--- a/src/app/rpkm/baan/baan-select/page.tsx
+++ b/src/app/rpkm/baan/baan-select/page.tsx
@@ -1,9 +1,7 @@
-import React from 'react'
+import React from 'react';
 
 const page = () => {
-  return (
-    <div>page</div>
-  )
-}
+  return <div>page</div>;
+};
 
-export default page
\ No newline at end of file
+export default page;
diff --git a/src/app/rpkm/baan/home/page.tsx b/src/app/rpkm/baan/home/page.tsx
index 983ebb85..420e11cc 100644
--- a/src/app/rpkm/baan/home/page.tsx
+++ b/src/app/rpkm/baan/home/page.tsx
@@ -1,9 +1,7 @@
-import React from 'react'
+import React from 'react';
 
 const page = () => {
-  return (
-    <div>page</div>
-  )
-}
+  return <div>page</div>;
+};
 
-export default page
\ No newline at end of file
+export default page;
diff --git a/src/components/(main)/pdpa/index.tsx b/src/components/(main)/pdpa/index.tsx
index bca527da..4c227235 100644
--- a/src/components/(main)/pdpa/index.tsx
+++ b/src/components/(main)/pdpa/index.tsx
@@ -68,7 +68,7 @@ export default function Pdpa(props: PdpaProps) {
             </svg>
           </button>
         </div>
-        <div className='absolute top-8 flex flex-col items-center pb-8 px-2'>
+        <div className="absolute top-8 flex flex-col items-center pb-8 px-2">
           <h1 className="font-semibold text-5xl">PDPA</h1>
           <div className="my-8 border border-black h-[1px] w-[95%]"></div>
           <h2 className="text-center text-xl font-semibold">
@@ -125,8 +125,8 @@ export default function Pdpa(props: PdpaProps) {
           >
             รับทราบและยินยอม
           </button>
-                </div>
         </div>
+      </div>
     </div>
   );
 }