Merge branch 'enable-and-active-jobs' of WrenchBoard/Users-Wrench into master

src/components/AuthPages/AuthLayout.jsx

@@ -4,7 +4,7 @@ import { Link } from "react-router-dom";
 export default function LoginLayout({ slogan, children }) {
   return (
     <div className={`layout-wrapper login`}>
-      <div className={`main-wrapper login-wrapper w-full h-screen overflow-y-auto sm:p-20 p-10`}>
+      <div className={`main-wrapper login-wrapper w-full h-screen overflow-y-auto p-2 sm:p-20`}>
         <div className="w-full h-full">
           <div className="flex-1 flex justify-center items-center">
             {children && children}

src/components/AuthPages/Login/index.jsx

@@ -187,7 +187,7 @@ export default function Login() {
                     <div className="input-item mb-5">
                       <InputCom
                         labelClass="tracking-wider"
-                        fieldClass="px-6"
+                        fieldClass="sm:px-6 px-2"
                         value={email}
                         inputHandler={handleEmail}
                         placeholder="support@mermsemr.com"
@@ -201,7 +201,7 @@ export default function Login() {
                     <div className="input-item mb-5">
                       <InputCom
                         labelClass="tracking-wider"
-                        fieldClass="px-6"
+                        fieldClass="sm:px-6 px-2"
                         value={password}
                         inputHandler={handlePassword}
                         placeholder="● ● ● ● ● ●"

src/components/MyJobs/StartJob.jsx

@@ -15,10 +15,6 @@ export default function StartJob(props) {
     const navigate = useNavigate()
 
     let [request, setRequest] = useState({loading: false, status: false, message: ''})
-    const [selectTab, setValue] = useState("today");
-    const filterHandler = (value) => {
-        setValue(value);
-    };
 
     const handleOnclick = () => {
         setRequest({loading: true, status: false, message: ''})
@@ -42,25 +38,6 @@ export default function StartJob(props) {
             {/*<CommonHead />*/}
             <div className="notification-page w-full mb-10">
                 <div className="notification-wrapper w-full">
-                    {/* heading */}
-                    {/* <div className="sm:flex justify-between items-center mb-6">
-                        <div className="mb-5 sm:mb-0">
-                            <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
-                <span
-                    className={`${selectTab === "today" ? "block" : "hidden"}`}
-                >
-                  Additional Terms for Jobs Posting.
-                </span>
-
-                            </h1>
-                        </div>
-                        <div className="slider-btns flex space-x-4">
-                            <div onClick={() => filterHandler("today")} className="relative">
-
-                            </div>
-                        </div>
-                    </div> */}
-
                     <div
                         className={`update-table w-full p-8 bg-white dark:bg-dark-white   overflow-hidden rounded-2xl section-shadow min-h-[520px]`}
                     >

src/components/Partials/Sidebar.jsx

@@ -12,7 +12,7 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
   const darkMode = useContext(DarkModeContext);
 
   let { userDetails } = useSelector((state) => state.userDetails);
-  console.log(userDetails);
+  console.log('user-details for job',userDetails);
   //const jobLists =  getJobList(); // pass from upper - we need in a lot of places
   let { jobLists } = useSelector((state) => state.jobLists);
   const marketData = jobLists?.result_list;
@@ -29,7 +29,7 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
         elm.classList.remove("active");
       });
     }
-  });
+  }, [jobLists]);
   return (
     <div className="w-full h-full">
       {/* logo-area */}
@@ -167,15 +167,6 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
                     sidebar ? "mb-14" : "rounded-none p-0"
                   }`}
                 >
-                  {/* <div className="setting-item">
-                <div className="top-platform bg-pink dark:bg-dark-white rounded-2xl p-16 2xl:w-[180px] w-full 2xl:mb-10 2xl:border-none border">
-                  <NavLink to="/start-job">
-                    <span className="item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium active flex-1">
-                      Enable Job Post
-                    </span>
-                  </NavLink>
-                </div>
-              </div> */}
                   <div className="items">
                     <div className="heading mb-5">
                       <h1 className="title text-xl font-bold text-purple">

src/middleware/AuthRoute.jsx

@@ -77,7 +77,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
     // Getting market data
     const getMarketActiveJobList = async () => {
       try {
-        const res = await apiCall.getActiveJobList();
+        const res = await apiCall.getMyJobList();
         dispatch(updateJobs(res.data));
       } catch (error) {
         console.log("Error getting mode");

src/services/UsersService.js

@@ -97,7 +97,7 @@ class usersService {
      */
   getActiveJobList() {
     var postData = {
-      uuid: localStorage.getItem("uid"),
+      uid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
       page: 0,