Merge branch 'manage-active-job-delivery-date' of WrenchBoard/Users-Wrench into master

src/components/AddJob/AddJob.jsx

@@ -93,10 +93,18 @@ function AddJob({ popUpHandler, categories }) {
 
   // FUNCTION TO HANDLE ADD JOB FORM
   const handleAddJob = (values, helpers) => {
-    values.category = values.category?.join("@");
-    values.price = Number(values.price) * 100;
+    let reqData = {
+      country: values?.country,
+      price: Number(values.price) * 100,
+      title: values?.title,
+      description: values?.description,
+      job_detail: values?.job_detail,
+      timeline_days: values?.timeline_days,
+      category: values.category?.join("@"),
+    };
+
     setRequestStatus({ loading: true, status: false, message: "" });
-    ApiCall.jobManagerCreateJob(values)
+    ApiCall.jobManagerCreateJob(reqData)
       .then((res) => {
         if (res.data.internal_return < 1) {
           setRequestStatus({
@@ -164,7 +172,7 @@ function AddJob({ popUpHandler, categories }) {
                         value={props.values.country}
                         className={`input-field p-2 mt-3 rounded-md placeholder:text-base text-dark-gray dark:text-white w-full h-10 bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-none ${
                           props.errors.country && props.touched.country
-                            ? "border-[#ff0a0a63] shadow-red-500 border-[2px] animate-shake"
+                            ? "border-[#ff0a0a63] shadow-red-500 border-[0.5px] animate-shake"
                             : "border border-[#f5f8fa] dark:border-[#5e6278]"
                         }`}
                         onChange={props.handleChange}
@@ -264,7 +272,7 @@ function AddJob({ popUpHandler, categories }) {
                         rows="5"
                         className={`input-field px-3 py-2 placeholder:text-base text-dark-gray dark:text-white w-full h-[100px] bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-[#dce4e9] ${
                           props.errors.job_detail && props.touched.job_detail
-                            ? "border-[#ff0a0a63] shadow-red-500 border-[2px] animate-shake"
+                            ? "border-[#ff0a0a63] shadow-red-500 border-[0.5px] animate-shake"
                             : "border border-[#f5f8fa] dark:border-[#5e6278]"
                         } rounded-[10px]`}
                         style={{ resize: "none" }}
@@ -329,7 +337,7 @@ function AddJob({ popUpHandler, categories }) {
                       className={`input-field p-2 mt-3 rounded-md placeholder:text-base text-dark-gray dark:text-white w-full h-10 bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-none ${
                         props.errors.timeline_days &&
                         props.touched.timeline_days
-                          ? "border-[#ff0a0a63] shadow-red-500 border-[2px] animate-shake"
+                          ? "border-[#ff0a0a63] shadow-red-500 border-[0.5px] animate-shake"
                           : "border border-[#f5f8fa] dark:border-[#5e6278]"
                       }`}
                       value={props.values.timeline_days}

src/components/Helpers/Inputs/InputCom/index.jsx

@@ -76,7 +76,7 @@ export default function InputCom({
       <div
         className={`input-wrapper border ${
           errorBorder
-            ? "border-[#ff0a0a63] border-[2px] shadow-red-500 animate-shake"
+            ? "border-[#ff0a0a63] border-[0.5px] shadow-red-500 animate-shake"
             : "border border-[#f5f8fa] dark:border-[#5e6278]"
         } w-full rounded-full h-[42px] overflow-hidden relative font-medium leading-6 bg-clip-padding text-[#5e6278] dark:text-gray-100 bg-[#f5f8fa] dark:bg-[#5e6278] text-base ${inputClass}`}
       >

src/components/MyJobs/index.jsx

@@ -9,12 +9,11 @@ export default function MyJobs(props) {
   let { state } = useLocation();
   const navigate = useNavigate();
   const [popUp, setPopUp] = useState(false);
-
-  console.log(state)
   const popUpHandler = () => {
     setPopUp((prev) => !prev);
 
-    if (state?.popup) navigate("/", { replace: true });
+    if (state?.popup) navigate("/", { replace: true })
+    else return
   };
 
   const categoryOptions = props.MyJobList?.data?.categories;

src/components/jobPopout/EditJobPopout.jsx

@@ -1,13 +1,13 @@
-import React, { useCallback, useMemo, useState } from "react";
-import ModalCom from "../Helpers/ModalCom";
 import { Field, Form, Formik } from "formik";
-import * as Yup from "yup";
-import InputCom from "../Helpers/Inputs/InputCom";
-import LoadingSpinner from "../Spinners/LoadingSpinner";
-import usersService from "../../services/UsersService";
-import { useNavigate } from "react-router-dom";
-import { tableReload } from "../../store/TableReloads";
+import React, { useCallback, useMemo, useState } from "react";
 import { useDispatch } from "react-redux";
+import { useNavigate } from "react-router-dom";
+import * as Yup from "yup";
+import usersService from "../../services/UsersService";
+import { tableReload } from "../../store/TableReloads";
+import InputCom from "../Helpers/Inputs/InputCom";
+import ModalCom from "../Helpers/ModalCom";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
 
 const validationSchema = Yup.object().shape({
   country: Yup.string()
@@ -74,14 +74,18 @@ const EditJobPopOut = ({
 
   const handleEditJob = useCallback(
     async (values) => {
-      values.category = values.category?.join("@");
-      values.price = Number(values.price) * 100;
-      setRequestStatus({ loading: true, message: "" });
       let reqData = {
+        country: values?.country,
+        price: Number(values.price) * 100,
+        title: values?.title,
+        description: values?.description,
+        job_detail: values?.job_detail,
+        timeline_days: values?.timeline_days,
+        category: values.category?.join("@"),
         job_id: details.job_id,
         job_uid: details.job_uid,
-        ...values,
       };
+      setRequestStatus({ loading: true, message: "" });
 
       try {
         let res = await jobApi.jobManagerUpdateJob(reqData);
@@ -230,7 +234,7 @@ const EditJobPopOut = ({
                           rows="5"
                           className={`input-field px-6 py-2 placeholder:text-base text-dark-gray dark:text-white w-full h-[100px] bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-[#dce4e9] ${
                             props.errors.job_detail && props.touched.job_detail
-                              ? "border-[#ff0a0a63] shadow-red-500 border-[2px] animate-shake"
+                              ? "border-[#ff0a0a63] shadow-red-500 border-[0.5px] animate-shake"
                               : "border border-[#f5f8fa] dark:border-[#5e6278]"
                           } rounded-[10px]`}
                           style={{ resize: "none" }}
@@ -297,7 +301,7 @@ const EditJobPopOut = ({
                         className={`input-field p-2 mt-3 rounded-md placeholder:text-base text-dark-gray dark:text-white w-full h-10 bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-none ${
                           props.errors.timeline_days &&
                           props.touched.timeline_days
-                            ? "border-[#ff0a0a63] shadow-red-500 border-[2px] animate-shake"
+                            ? "border-[#ff0a0a63] shadow-red-500 border-[0.5px] animate-shake"
                             : "border border-[#f5f8fa] dark:border-[#5e6278]"
                         }`}
                         value={props.values.timeline_days}