Merge pull request #74 from isd-sgcu/dev

update main
isd-sgcu · Jul 15, 2024 · 07d6a0e · 07d6a0e
2 parents 12ad28a + 9eefd7e
commit 07d6a0e
Show file tree

Hide file tree

Showing 25 changed files with 264 additions and 162 deletions.
diff --git 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 || '',
@@ -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,
     });
   };
 
@@ -74,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);
 
@@ -157,8 +164,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>
 
@@ -301,30 +307,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

diff --git 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: '',
@@ -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,
     });
   };
 
@@ -85,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:
@@ -184,8 +191,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>
@@ -264,7 +270,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
@@ -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,
     });
   };
 
@@ -58,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;
@@ -90,7 +97,7 @@ export default function Edit() {
         setUpload(true);
         toast.success('เเก้ไขข้อมูลสำเร็จ');
         await resetContext();
-        router.push('/home');
+        router.push('/firstdate/staff/profile');
       });
     }
   };
@@ -140,8 +147,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>
 
@@ -223,6 +229,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>
@@ -256,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/(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,
     });
   };
 
@@ -66,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;
     }
 
@@ -115,7 +122,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);
@@ -154,8 +161,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>
@@ -236,6 +242,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>

diff --git a/src/app/dev/page.tsx b/src/app/dev/page.tsx
diff --git 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">

diff --git 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/app/rpkm/activities/[category]/page.tsx b/src/app/rpkm/activities/[category]/page.tsx
@@ -0,0 +1,7 @@
+import React from 'react';
+
+const page = () => {
+  return <div>page</div>;
+};
+
+export default page;
diff --git a/src/app/rpkm/activities/details/[id]/page.tsx b/src/app/rpkm/activities/details/[id]/page.tsx
@@ -0,0 +1,7 @@
+import React from 'react';
+
+const page = () => {
+  return <div>page</div>;
+};
+
+export default page;
diff --git a/src/app/rpkm/activities/home/page.tsx b/src/app/rpkm/activities/home/page.tsx
@@ -0,0 +1,7 @@
+import React from 'react';
+
+const page = () => {
+  return <div>page</div>;
+};
+
+export default page;
diff --git a/src/app/rpkm/activities/map/page.tsx b/src/app/rpkm/activities/map/page.tsx
@@ -0,0 +1,7 @@
+import React from 'react';
+
+const page = () => {
+  return <div>page</div>;
+};
+
+export default page;