Merge branch 'main' of https://github.com/WebmasterCamp/ywc20-hackathon-ada

Author: Vinniel5403

src/app/camps/[slug]/page.tsx

@@ -33,6 +33,9 @@ const formSchema = z.object({
     nickname: z.string().min(1, "กรุณากรอกชื่อเล่น"),
     gender: z.string().min(1, "กรุณาเลือกเพศ"),
     birth_date: z.string().min(1, "กรุณาเลือกวันเกิด"),
+    email: z.string().refine((email) => email.includes('@') && email.includes('.'), {
+        message: "กรุณากรอกอีเมลให้ถูกต้อง"
+    }),
     question1: z.string().min(1, "กรุณาตอบคำถาม"),
     question2: z.string().min(1, "กรุณาตอบคำถาม"),
     question3: z.string().min(1, "กรุณาตอบคำถาม"),
@@ -88,6 +91,7 @@ export default function CampPage({ params }: { params: Promise<{ slug: string }>
             nickname: "",
             gender: "",
             birth_date: "",
+            email: "",
             question1: "",
             question2: "",
             question3: "",
@@ -127,6 +131,7 @@ export default function CampPage({ params }: { params: Promise<{ slug: string }>
                         nickname: profileData.nickname || "",
                         gender: profileData.gender || "",
                         birth_date: profileData.birth_date || "",
+                        email: profileData.email || "",
                         question1: "",
                         question2: "",
                         question3: "",
@@ -452,6 +457,19 @@ export default function CampPage({ params }: { params: Promise<{ slug: string }>
                                                 </FormItem>
                                             )}
                                         />
+                                        <FormField
+                                            control={form.control}
+                                            name="email"
+                                            render={({ field }) => (
+                                                <FormItem>
+                                                    <FormLabel>อีเมล</FormLabel>
+                                                    <FormControl>
+                                                        <Input type="text" placeholder="[email protected]" {...field} />
+                                                    </FormControl>
+                                                    <FormMessage />
+                                                </FormItem>
+                                            )}
+                                        />
                                         <FormField
                                             control={form.control}
                                             name="gender"