tedt

frontend/src/components/shared/ClientForm.jsx

@@ -56,20 +56,23 @@ export default function ClientForm() {
               let data = {};
 
               const fetchData = async () => {
-                axios.get(`${api_url}/api/job-submissions?filters[Email][$eq]=${values.email}`)
+                axios.get(`${api_url}/api/client-submissions?filters[Email][$eq]=${values.email}`)
                   .then((res) => {
                    data = res.data.data[0];
-                   console.log(data);
+                   if (typeof data == 'undefined') {
+                    
+                   }
                    const submitDate = new Date(data.attributes.SubmitDate);
                    const now = new Date();
                    if ((now.getMonth() - submitDate.getMonth()) < 1)
                    {
                     setErrorMsg('You Already sent an email');
+                    //console.log('email already sent');
                     return false;
                    }
                   else {
                     
-                 fetch(`${api_url}/api/job-submissions/${data.id}`, {
+                 fetch(`${api_url}/api/client-submissions/${data.id}`, {
                     method: "PUT",
                     headers: {
                         "Content-type": "application/json; charset=UTF-8",
@@ -80,44 +83,49 @@ export default function ClientForm() {
                     }
                     })
                 }).then(r => r.json()).then(d => {
-                    setErrorMsg('');
-                    return true
+              
+                      setErrorMsg('');
+                      const val = {
+                        Tag: values.tag,
+                        Subject: values.subject,
+                        Email: values.email,
+                        Firstname: values.firstName,
+                        Lastname: values.lastName,
+                        Description: values.description,
+                    }
+      
+        
+                   //   emailjs
+                        // .send(
+                        //   process.env.REACT_APP_SERVICE_ID,
+                        //   process.env.REACT_APP_CLIENT_TEMPLATE_ID,
+                        //   val,
+                        //   process.env.REACT_APP_USER_ID,
+                        // )
+                        // .then(
+                        //   result => {
+                        //     console.log(result.text);
+                        //     setSucMsg(true);
+                        //   },
+                        //   error => {
+                        //     console.log(error.text);
+                        //   },
+                        // );
+                    
                 }).catch(err => {
                   console.log(err)
                   return false
                 });          
-                  }
-                  });
-              };
+                  
+                   }
+              })
+            }
+            fetchData();
+          }}
+
 
-              if (fetchData()){
-                const val = {
-                  Tag: values.tag,
-                  Subject: values.subject,
-                  Email: values.email,
-                  Firstname: values.firstName,
-                  Lastname: values.lastName,
-                  Description: values.description,
-              };
-  
-                emailjs
-                  .send(
-                    process.env.REACT_APP_SERVICE_ID,
-                    process.env.REACT_APP_CLIENT_TEMPLATE_ID,
-                    val,
-                    process.env.REACT_APP_USER_ID,
-                  )
-                  .then(
-                    result => {
-                      console.log(result.text);
-                      setSucMsg(true);
-                    },
-                    error => {
-                      console.log(error.text);
-                    },
-                  );
-              }}
-              }
+              
+              
               
           >
             {props => (
@@ -256,6 +264,9 @@ export default function ClientForm() {
             {sucMsg && <div className={'text-sm text-right text-dg-primary-900'}>
                                 Submission Succesful! Thank you!
                         </div> }
+                        {errorMsg !== '' && <div className={'text-sm text-right text-red-700'}>
+                                {errorMsg}
+                        </div> }
                         
                       </div>
 

frontend/src/components/shared/JobForm.jsx

@@ -85,6 +85,8 @@ export default function JobForm(props) {
             onChange={changeFormHandler}
             onSubmit={values => {
 
+              setSucMsg(false);
+
               //prep file
               const prepFile = async file => {
                 if (file.size >= 2000000) {
@@ -151,7 +153,7 @@ export default function JobForm(props) {
                   });
               };
 
-              
+              console.log(fetchData());
 
               if (jobForm.file === '') {
                 setErrorMsg('CV is Required');
@@ -170,23 +172,24 @@ export default function JobForm(props) {
                     Link: values.link,
                     File: res,
                   };
+
                 
-                  emailjs
-                    .send(
-                      process.env.REACT_APP_SERVICE_ID,
-                      process.env.REACT_APP_JOB_TEMPLATE_ID,
-                      newtemplateParams,
-                      process.env.REACT_APP_USER_ID,
-                    )
-                    .then(
-                      result => {
-                        console.log(result.text);
-                        setSucMsg(true);
-                      },
-                      error => {
-                        console.log(error.text);
-                      },
-                    );
+                  // emailjs
+                  //   .send(
+                  //     process.env.REACT_APP_SERVICE_ID,
+                  //     process.env.REACT_APP_JOB_TEMPLATE_ID,
+                  //     newtemplateParams,
+                  //     process.env.REACT_APP_USER_ID,
+                  //   )
+                  //   .then(
+                  //     result => {
+                  //       console.log(result.text);
+                  //       setSucMsg(true);
+                  //     },
+                  //     error => {
+                  //       console.log(error.text);
+                  //     },
+                  //   );
                 });
                 }