From 50e8d6077317bc9204f0684d758bd6c8b50f7283 Mon Sep 17 00:00:00 2001
From: Khaing Myel Khant <khaingmyelkhant@ucsm.edu.mm>
Date: Mon, 10 Oct 2022 18:24:57 +0630
Subject: [PATCH 1/2] fix interest form reloads when press enter

---
 client/modals/builder/sections/InterestModal.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/modals/builder/sections/InterestModal.tsx b/client/modals/builder/sections/InterestModal.tsx
index 5cdaa6e0e..6d053a72e 100644
--- a/client/modals/builder/sections/InterestModal.tsx
+++ b/client/modals/builder/sections/InterestModal.tsx
@@ -84,7 +84,7 @@ const InterestModal: React.FC = () => {
       heading={isEditMode ? editText : addText}
       footerChildren={<Button onClick={handleSubmit(onSubmit)}>{isEditMode ? editText : addText}</Button>}
     >
-      <form className="my-2 grid grid-cols-2 gap-4">
+      <form className="my-2 grid grid-cols-2 gap-4" onSubmit={handleSubmit(onSubmit)}>
         <Controller
           name="name"
           control={control}

From ff03d41d9725ee1b4f79b3e3eb724da1719fd890 Mon Sep 17 00:00:00 2001
From: Khaing Myel Khant <khaingmyelkhant@ucsm.edu.mm>
Date: Thu, 13 Oct 2022 20:40:51 +0630
Subject: [PATCH 2/2] feat:add pressing return(enter) to submit modal

---
 client/modals/builder/sections/AwardModal.tsx       | 3 ++-
 client/modals/builder/sections/CertificateModal.tsx | 3 ++-
 client/modals/builder/sections/CustomModal.tsx      | 3 ++-
 client/modals/builder/sections/EducationModal.tsx   | 3 ++-
 client/modals/builder/sections/InterestModal.tsx    | 1 +
 client/modals/builder/sections/LanguageModal.tsx    | 3 ++-
 client/modals/builder/sections/ProfileModal.tsx     | 3 ++-
 client/modals/builder/sections/ProjectModal.tsx     | 3 ++-
 client/modals/builder/sections/PublicationModal.tsx | 3 ++-
 client/modals/builder/sections/ReferenceModal.tsx   | 3 ++-
 client/modals/builder/sections/SkillModal.tsx       | 4 +++-
 client/modals/builder/sections/VolunteerModal.tsx   | 3 ++-
 client/modals/builder/sections/WorkModal.tsx        | 3 ++-
 13 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/client/modals/builder/sections/AwardModal.tsx b/client/modals/builder/sections/AwardModal.tsx
index cb7338f1e..f4792f6c0 100644
--- a/client/modals/builder/sections/AwardModal.tsx
+++ b/client/modals/builder/sections/AwardModal.tsx
@@ -93,7 +93,7 @@ const AwardModal: React.FC = () => {
       heading={isEditMode ? editText : addText}
       footerChildren={<Button onClick={handleSubmit(onSubmit)}>{isEditMode ? editText : addText}</Button>}
     >
-      <form className="my-2 grid grid-cols-2 gap-4">
+      <form className="my-2 grid grid-cols-2 gap-4" onSubmit={handleSubmit(onSubmit)}>
         <Controller
           name="title"
           control={control}
@@ -177,6 +177,7 @@ const AwardModal: React.FC = () => {
             />
           )}
         />
+        <input type="submit" style={{ display: 'none' }} />
       </form>
     </BaseModal>
   );
diff --git a/client/modals/builder/sections/CertificateModal.tsx b/client/modals/builder/sections/CertificateModal.tsx
index 21c998656..44fb57b4c 100644
--- a/client/modals/builder/sections/CertificateModal.tsx
+++ b/client/modals/builder/sections/CertificateModal.tsx
@@ -93,7 +93,7 @@ const CertificateModal: React.FC = () => {
       heading={isEditMode ? editText : addText}
       footerChildren={<Button onClick={handleSubmit(onSubmit)}>{isEditMode ? editText : addText}</Button>}
     >
-      <form className="my-2 grid grid-cols-2 gap-4">
+      <form className="my-2 grid grid-cols-2 gap-4" onSubmit={handleSubmit(onSubmit)}>
         <Controller
           name="name"
           control={control}
@@ -177,6 +177,7 @@ const CertificateModal: React.FC = () => {
             />
           )}
         />
+        <input type="submit" style={{ display: 'none' }} />
       </form>
     </BaseModal>
   );
diff --git a/client/modals/builder/sections/CustomModal.tsx b/client/modals/builder/sections/CustomModal.tsx
index 101da99e6..20436aee0 100644
--- a/client/modals/builder/sections/CustomModal.tsx
+++ b/client/modals/builder/sections/CustomModal.tsx
@@ -110,7 +110,7 @@ const CustomModal: React.FC = () => {
       heading={isEditMode ? editText : addText}
       footerChildren={<Button onClick={handleSubmit(onSubmit)}>{isEditMode ? editText : addText}</Button>}
     >
-      <form className="my-2 grid grid-cols-2 gap-4">
+      <form className="my-2 grid grid-cols-2 gap-4" onSubmit={handleSubmit(onSubmit)}>
         <Controller
           name="title"
           control={control}
@@ -282,6 +282,7 @@ const CustomModal: React.FC = () => {
             />
           )}
         />
+        <input type="submit" style={{ display: 'none' }} />
       </form>
     </BaseModal>
   );
diff --git a/client/modals/builder/sections/EducationModal.tsx b/client/modals/builder/sections/EducationModal.tsx
index 0183e638d..279b9c273 100644
--- a/client/modals/builder/sections/EducationModal.tsx
+++ b/client/modals/builder/sections/EducationModal.tsx
@@ -106,7 +106,7 @@ const EducationModal: React.FC = () => {
       heading={isEditMode ? editText : addText}
       footerChildren={<Button onClick={handleSubmit(onSubmit)}>{isEditMode ? editText : addText}</Button>}
     >
-      <form className="my-2 grid grid-cols-2 gap-4">
+      <form className="my-2 grid grid-cols-2 gap-4" onSubmit={handleSubmit(onSubmit)}>
         <Controller
           name="institution"
           control={control}
@@ -255,6 +255,7 @@ const EducationModal: React.FC = () => {
             />
           )}
         />
+        <input type="submit" style={{ display: 'none' }} />
       </form>
     </BaseModal>
   );
diff --git a/client/modals/builder/sections/InterestModal.tsx b/client/modals/builder/sections/InterestModal.tsx
index 6d053a72e..7b4263bc8 100644
--- a/client/modals/builder/sections/InterestModal.tsx
+++ b/client/modals/builder/sections/InterestModal.tsx
@@ -114,6 +114,7 @@ const InterestModal: React.FC = () => {
             />
           )}
         />
+        <input type="submit" style={{ display: 'none' }} />
       </form>
     </BaseModal>
   );
diff --git a/client/modals/builder/sections/LanguageModal.tsx b/client/modals/builder/sections/LanguageModal.tsx
index ac9846c0e..e62210651 100644
--- a/client/modals/builder/sections/LanguageModal.tsx
+++ b/client/modals/builder/sections/LanguageModal.tsx
@@ -85,7 +85,7 @@ const LanguageModal: React.FC = () => {
       heading={isEditMode ? editText : addText}
       footerChildren={<Button onClick={handleSubmit(onSubmit)}>{isEditMode ? editText : addText}</Button>}
     >
-      <form className="my-2 grid grid-cols-2 gap-4">
+      <form className="my-2 grid grid-cols-2 gap-4" onSubmit={handleSubmit(onSubmit)}>
         <Controller
           name="name"
           control={control}
@@ -150,6 +150,7 @@ const LanguageModal: React.FC = () => {
             </div>
           )}
         />
+        <input type="submit" style={{ display: 'none' }} />
       </form>
     </BaseModal>
   );
diff --git a/client/modals/builder/sections/ProfileModal.tsx b/client/modals/builder/sections/ProfileModal.tsx
index 7fe3b3163..8c602b492 100644
--- a/client/modals/builder/sections/ProfileModal.tsx
+++ b/client/modals/builder/sections/ProfileModal.tsx
@@ -89,7 +89,7 @@ const ProfileModal: React.FC = () => {
       handleClose={handleClose}
       footerChildren={<Button onClick={handleSubmit(onSubmit)}>{isEditMode ? editText : addText}</Button>}
     >
-      <form className="my-2 grid grid-cols-2 gap-4">
+      <form className="my-2 grid grid-cols-2 gap-4" onSubmit={handleSubmit(onSubmit)}>
         <Controller
           name="network"
           control={control}
@@ -136,6 +136,7 @@ const ProfileModal: React.FC = () => {
             />
           )}
         />
+        <input type="submit" style={{ display: 'none' }} />
       </form>
     </BaseModal>
   );
diff --git a/client/modals/builder/sections/ProjectModal.tsx b/client/modals/builder/sections/ProjectModal.tsx
index 600522999..8679dd11e 100644
--- a/client/modals/builder/sections/ProjectModal.tsx
+++ b/client/modals/builder/sections/ProjectModal.tsx
@@ -102,7 +102,7 @@ const ProjectModal: React.FC = () => {
       heading={isEditMode ? editText : addText}
       footerChildren={<Button onClick={handleSubmit(onSubmit)}>{isEditMode ? editText : addText}</Button>}
     >
-      <form className="my-2 grid grid-cols-2 gap-4">
+      <form className="my-2 grid grid-cols-2 gap-4" onSubmit={handleSubmit(onSubmit)}>
         <Controller
           name="name"
           control={control}
@@ -225,6 +225,7 @@ const ProjectModal: React.FC = () => {
             />
           )}
         />
+        <input type="submit" style={{ display: 'none' }} />
       </form>
     </BaseModal>
   );
diff --git a/client/modals/builder/sections/PublicationModal.tsx b/client/modals/builder/sections/PublicationModal.tsx
index 2c5a85da6..e2ecb3202 100644
--- a/client/modals/builder/sections/PublicationModal.tsx
+++ b/client/modals/builder/sections/PublicationModal.tsx
@@ -93,7 +93,7 @@ const PublicationModal: React.FC = () => {
       heading={isEditMode ? editText : addText}
       footerChildren={<Button onClick={handleSubmit(onSubmit)}>{isEditMode ? editText : addText}</Button>}
     >
-      <form className="my-2 grid grid-cols-2 gap-4">
+      <form className="my-2 grid grid-cols-2 gap-4" onSubmit={handleSubmit(onSubmit)}>
         <Controller
           name="name"
           control={control}
@@ -177,6 +177,7 @@ const PublicationModal: React.FC = () => {
             />
           )}
         />
+        <input type="submit" style={{ display: 'none' }} />
       </form>
     </BaseModal>
   );
diff --git a/client/modals/builder/sections/ReferenceModal.tsx b/client/modals/builder/sections/ReferenceModal.tsx
index 4df581f25..3a8c99a70 100644
--- a/client/modals/builder/sections/ReferenceModal.tsx
+++ b/client/modals/builder/sections/ReferenceModal.tsx
@@ -90,7 +90,7 @@ const ReferenceModal: React.FC = () => {
       heading={isEditMode ? editText : addText}
       footerChildren={<Button onClick={handleSubmit(onSubmit)}>{isEditMode ? editText : addText}</Button>}
     >
-      <form className="my-2 grid grid-cols-2 gap-4">
+      <form className="my-2 grid grid-cols-2 gap-4" onSubmit={handleSubmit(onSubmit)}>
         <Controller
           name="name"
           control={control}
@@ -162,6 +162,7 @@ const ReferenceModal: React.FC = () => {
             />
           )}
         />
+        <input type="submit" style={{ display: 'none' }} />
       </form>
     </BaseModal>
   );
diff --git a/client/modals/builder/sections/SkillModal.tsx b/client/modals/builder/sections/SkillModal.tsx
index e695ca135..fd5f888ee 100644
--- a/client/modals/builder/sections/SkillModal.tsx
+++ b/client/modals/builder/sections/SkillModal.tsx
@@ -88,7 +88,7 @@ const SkillModal: React.FC = () => {
       heading={isEditMode ? editText : addText}
       footerChildren={<Button onClick={handleSubmit(onSubmit)}>{isEditMode ? editText : addText}</Button>}
     >
-      <form className="my-2 grid grid-cols-2 gap-4">
+      <form className="my-2 grid grid-cols-2 gap-4" onSubmit={handleSubmit(onSubmit)}>
         <Controller
           name="name"
           control={control}
@@ -166,6 +166,8 @@ const SkillModal: React.FC = () => {
             />
           )}
         />
+
+        <input type="submit" style={{ display: 'none' }} />
       </form>
     </BaseModal>
   );
diff --git a/client/modals/builder/sections/VolunteerModal.tsx b/client/modals/builder/sections/VolunteerModal.tsx
index 48d0473bd..22dc41a4f 100644
--- a/client/modals/builder/sections/VolunteerModal.tsx
+++ b/client/modals/builder/sections/VolunteerModal.tsx
@@ -99,7 +99,7 @@ const VolunteerModal: React.FC = () => {
       heading={isEditMode ? editText : addText}
       footerChildren={<Button onClick={handleSubmit(onSubmit)}>{isEditMode ? editText : addText}</Button>}
     >
-      <form className="my-2 grid grid-cols-2 gap-4">
+      <form className="my-2 grid grid-cols-2 gap-4" onSubmit={handleSubmit(onSubmit)}>
         <Controller
           name="organization"
           control={control}
@@ -208,6 +208,7 @@ const VolunteerModal: React.FC = () => {
             />
           )}
         />
+        <input type="submit" style={{ display: 'none' }} />
       </form>
     </BaseModal>
   );
diff --git a/client/modals/builder/sections/WorkModal.tsx b/client/modals/builder/sections/WorkModal.tsx
index 489630127..22cb940f5 100644
--- a/client/modals/builder/sections/WorkModal.tsx
+++ b/client/modals/builder/sections/WorkModal.tsx
@@ -99,7 +99,7 @@ const WorkModal: React.FC = () => {
       heading={isEditMode ? editText : addText}
       footerChildren={<Button onClick={handleSubmit(onSubmit)}>{isEditMode ? editText : addText}</Button>}
     >
-      <form className="my-2 grid grid-cols-2 gap-4">
+      <form className="my-2 grid grid-cols-2 gap-4" onSubmit={handleSubmit(onSubmit)}>
         <Controller
           name="name"
           control={control}
@@ -208,6 +208,7 @@ const WorkModal: React.FC = () => {
             />
           )}
         />
+        <input type="submit" style={{ display: 'none' }} />
       </form>
     </BaseModal>
   );