diff --git a/.env b/.env
index 59844c6..03444e5 100644
--- a/.env
+++ b/.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_USERS_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_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"
diff --git a/src/Routers.jsx b/src/Routers.jsx
index 8ad67c0..e6cdc54 100644
--- a/src/Routers.jsx
+++ b/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() {
} />
} />
} />
- } />
+ } />
- My Tasks
+ My Jobs
diff --git a/src/components/Partials/MobileSideBar.jsx b/src/components/Partials/MobileSideBar.jsx
index 87a8c09..ab0de74 100644
--- a/src/components/Partials/MobileSideBar.jsx
+++ b/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 logo3 from "../../assets/images/myfit-logo-2.png"; //logo-3.svg";
+import logo from "../../assets/images/wrenchboard.png"; //logo-2.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 }) {
- Reminders
+ Market
0
@@ -104,28 +104,41 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
- Tracking
+ My Task(s)
- Calendar
+ Messages
+
+
+
+
+
+
+
+
+
+ My Wallet
@@ -160,33 +173,33 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
-
Settings
+ My Jobs
-
- My Profile
+ My Jobs
-
- Settings
+ Active Jobs
diff --git a/src/views/MyJobsList.jsx b/src/views/MyJobsList.jsx
deleted file mode 100644
index d839d7a..0000000
--- a/src/views/MyJobsList.jsx
+++ /dev/null
@@ -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 (
- <>
-
- >
- );
-}
diff --git a/src/views/MyJobsPage.jsx b/src/views/MyJobsPage.jsx
new file mode 100644
index 0000000..9b484f5
--- /dev/null
+++ b/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 (
+ <>
+
+ >
+ );
+}