added new end point

.env

@@ -9,8 +9,11 @@ REACT_APP_APPSITE="https://myfitapp.mermsemr.com"
 
 # REACT_APP_AUX_ENDPOINT="http://10.20.30.32:9083/svs/user"
 # REACT_APP_USERS_ENDPOINT="http://10.20.30.32:9083/svs/user"
-REACT_APP_AUX_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/svs/user"
+# REACT_APP_AUX_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/svs/user"
-REACT_APP_USERS_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/svs/user"
+# REACT_APP_USERS_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/svs/user"
+
+REACT_APP_AUX_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1"
+REACT_APP_USERS_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1"
 
 #"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
 

src/Routers.jsx

@@ -28,7 +28,7 @@ import TrackingPage from "./views/TrackingPage";
 import CalendarPage from "./views/CalendarPage";
 import ResourcePage from "./views/ResourcePage";
 import MyTaskPage from "./views/MyTaskPage";
-import MyJobsList from "./views/MyJobsList";
+import MyJobsPage from "./views/MyJobsPage";
 
 export default function Routers() {
   return (
@@ -68,7 +68,7 @@ export default function Routers() {
           <Route exact path="/market" element={<MarketPlacePage />} />
           <Route exact path="/notification" element={<Notification />} />
           <Route exact path="/mytask" element={<MyTaskPage />} />
-          <Route exact path="/myjobs" element={<MyJobsList />} />
+          <Route exact path="/myjobs" element={<MyJobsPage />} />
           <Route
             exact
             path="/my-collection/collection-item"

src/components/MyJobs/index.jsx

@@ -21,7 +21,7 @@ export default function MyJobs() {
                 <span
                     className={`${selectTab === "today" ? "block" : "hidden"}`}
                 >
-                  My Tasks
+                  My Jobs
                 </span>
 
                             </h1>

src/components/Partials/MobileSideBar.jsx

@@ -1,7 +1,7 @@
 import React, { useContext } from "react";
 import { NavLink } from "react-router-dom";
-import logo from "../../assets/images/myfit-logo-2.png"; //logo-2.svg";
+import logo from "../../assets/images/wrenchboard.png"; //logo-2.svg";
-import logo3 from "../../assets/images/myfit-logo-2.png"; //logo-3.svg";
+import logo3 from "../../assets/images/wrenchboard.png"; //logo-3.svg";
 import DarkModeContext from "../Contexts/DarkModeContext";
 import Icons from "../Helpers/Icons";
 
@@ -88,14 +88,14 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
               </li>
               <li className="item group">
                 <NavLink
-                  to="/reminders"
+                  to="/market"
                   className="nav-item flex items-center justify-start space-x-3.5"
                 >
                   <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full   text-dark-gray dark:text-white">
                     <Icons name="active-bids" />
                   </span>
                   <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">
-                    Reminders
+                    Market
                     <span className="absolute left-24 -top-1 text-sm flex justify-center items-center w-5 h-5 primary-gradient rounded-full text-white">
                       0
                     </span>
@@ -104,28 +104,41 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
               </li>
               <li className="item group">
                 <NavLink
-                  to="/tracking"
+                  to="/mytask"
                   className="nav-item flex items-center justify-start space-x-3.5"
                 >
                   <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full   text-dark-gray dark:text-white">
                     <Icons name="market" />
                   </span>
                   <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">
-                    Tracking
+                    My Task(s)
 
                   </span>
                 </NavLink>
               </li>
               <li className="item group">
                 <NavLink
-                  to="/calendar"
+                  to="/notification"
                   className="nav-item flex items-center justify-start space-x-3.5"
                 >
                   <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full   text-dark-gray dark:text-white">
                     <Icons name="wallet-two" />
                   </span>
                   <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">
-                    Calendar
+                    Messages
+                  </span>
+                </NavLink>
+              </li>
+              <li className="item group">
+                <NavLink
+                    to="/my-wallet"
+                    className="nav-item flex items-center justify-start space-x-3.5"
+                >
+                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full   text-dark-gray dark:text-white">
+                    <Icons name="wallet-two" />
+                  </span>
+                  <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">
+                     My Wallet
                   </span>
                 </NavLink>
               </li>
@@ -160,33 +173,33 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
         </div>
         <div className="setting-item">
           <div className="heading mb-5">
-            <h1 className="title text-xl font-bold text-purple">Settings</h1>
+            <h1 className="title text-xl font-bold text-purple">My Jobs</h1>
           </div>
           <div className="items">
             <ul className="flex flex-col space-y-6">
               <li className="item group">
                 <NavLink
-                  to="/profile"
+                  to="/myjobs"
                   className="nav-item flex items-center justify-start space-x-3.5"
                 >
                   <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full   text-dark-gray dark:text-white">
                     <Icons name="people-two" />
                   </span>
                   <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">
-                    My Profile
+                    My Jobs
                   </span>
                 </NavLink>
               </li>
               <li className="item group">
                 <NavLink
-                  to="/settings"
+                  to="/market"
                   className="nav-item flex items-center justify-start space-x-3.5"
                 >
                   <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full   text-dark-gray dark:text-white">
                     <Icons name="setting" />
                   </span>
                   <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">
-                    Settings
+                    Active Jobs
                   </span>
                 </NavLink>
               </li>

src/views/MyJobsList.jsx

@@ -1,17 +0,0 @@
-import React from "react";
-// import MyTasks from "../components/MyTasks";
-// import UsersService from "../services/UsersService";
-import usersService from "../services/UsersService";
-import MyJobs from "../components/MyJobs";
-
-export default function MyTaskPage() {
-
-    const userApi = new usersService();
-    const activeJobList  = userApi.getMyJobList();
-    debugger;
-    return (
-        <>
-            <MyJobs />
-        </>
-    );
-}

src/views/MyJobsPage.jsx

@@ -0,0 +1,33 @@
+//import React from "react";
+import React, { useContext,useState, useEffect } from "react";
+// import MyTasks from "../components/MyTasks";
+// import UsersService from "../services/UsersService";
+import usersService from "../services/UsersService";
+import MyJobs from "../components/MyJobs";
+
+export default function MyJobsPage() {
+
+    // const userApi = new usersService();
+    // const activeJobList  = userApi.getMyJobList();
+    const [MyJobList, setMyJobList] = useState([]);
+    const api = new usersService();
+
+    const getMyJobList = async () => {
+        try {
+            const res = await api.getMyJobList();
+            setMyJobList(res.data);
+        } catch (error) {
+            console.log("Error getting mode");
+        }
+    };
+    useEffect(() => {
+        getMyJobList();
+    }, []);
+
+    debugger;
+    return (
+        <>
+            <MyJobs />
+        </>
+    );
+}