Merge branch 'memberpage' of WrenchBoard/Users-Wrench into master

src/components/YourPage/LoadedPage.jsx

@@ -2,9 +2,8 @@ import React from "react";
 import GetMyPageLoad from "./getMyPageLoad";
 
 
-const LoadedPage = () => {
+const LoadedPage = ({reloader}) => {
-  const { loading, data, error } = GetMyPageLoad();
+  const { loading, data, error } = GetMyPageLoad(reloader);
-  
 
   return (
     <div className="w-full border border-gray-400 rounded-md p-4 flex flex-col h-72 gap-2 overflow-y-auto">

src/components/YourPage/UpdateButton.jsx

@@ -1,13 +1,19 @@
 import LoadingSpinner from "../Spinners/LoadingSpinner";
 
-const UpdateButton = ({ onClick, loading }) => (
+const UpdateButton = ({ onClick, loading, msg }) => (
   <button
     type="submit"
     onClick={onClick}
     disabled={loading}
     className="text-lg text-white bg-sky-blue px-4 py-2 hover:opacity-90 rounded-full"
   >
-    {loading ? <LoadingSpinner size="6" color="sky-blue" /> : "Update"}
+    {loading ? (
+      <LoadingSpinner size="6" color="sky-blue" />
+    ) : msg !== "" ? (
+      msg
+    ) : (
+      "Update"
+    )}
   </button>
 );
 

src/components/YourPage/YourPageForm.jsx

@@ -1,7 +1,7 @@
 import InputCom from "../Helpers/Inputs/InputCom/index";
 import UpdateButton from "./UpdateButton";
 
-const YourPageForm = ({ values, onChange, onSubmit, loading }) => (
+const YourPageForm = ({ values, onChange, onSubmit, loading, msg }) => (
   <div className="ml-16 my-2 flex flex-col gap-3">
     <div className="field w-full">
       <InputCom
@@ -33,7 +33,7 @@ const YourPageForm = ({ values, onChange, onSubmit, loading }) => (
       />
     </div>
     <div className="w-full flex justify-end mb-2">
-      <UpdateButton onClick={onSubmit} loading={loading} />
+      <UpdateButton onClick={onSubmit} loading={loading} msg={msg} />
     </div>
     <hr />
   </div>

src/components/YourPage/getMyPageLoad.js

@@ -1,10 +1,9 @@
 import { useEffect, useState } from "react";
 import usersService from "../../services/UsersService";
-import { useSelector } from "react-redux";
 
 
-const GetMyPageLoad = () => {
+const GetMyPageLoad = (reloader) => {
-  const { yourPageTable } = useSelector((state) => state.tableReload);
+  const api = new usersService();
 
     const [response, setResponse] = useState({
       loading: true,
@@ -14,20 +13,17 @@ const GetMyPageLoad = () => {
   
     useEffect(() => {
       const fetchData = async () => {
-        let api = new usersService();
         try {
           const res = await api.MyPageLoad();
 
           setResponse({ loading: false, data: res.data, error: null });
-
-          console.log(response.data)
         } catch (error) {
           setResponse({ loading: false, data: null, error: error.message });
         }
       };
   
       fetchData();
-    }, [yourPageTable]);
+    }, [reloader]);
   
     return response;
   };

src/components/YourPage/index.jsx

@@ -1,60 +1,24 @@
 import React, { useState } from "react";
-import Layout from "../Partials/Layout";
 import usersService from "../../services/UsersService";
-import YourPageForm from "./YourPageForm";
+import Layout from "../Partials/Layout";
 import LoadedPage from "./LoadedPage";
-import { useDispatch } from "react-redux";
+import YourPageForm from "./YourPageForm";
-import { tableReload } from "../../store/TableReloads";
+// import { updateYourPage } from "./updateYourPage";
 
 const YourPage = () => {
-  const dispatch = useDispatch;
+  const [pageValues, setPageValues] = useState(pageInitialValues);
-  const [pageValues, setPageValues] = useState({
+  const [response, setResponse] = useState(responseInitialValues);
-    intro: "",
+  const [reloader, setReloader] = useState(false);
-    description: "",
-  });
 
-  const [response, setResponse] = useState({
+  const handleChange = ({ target: { name, value } }) =>
-    loading: false,
-    data: {},
-    error: "",
-    msg: "",
-  });
-
-  const handleChange = (event) => {
-    let { name, value } = event.target;
     setPageValues((prev) => ({ ...prev, [name]: value }));
-  };
 
-  const updateYourPageDetails = async () => {
+  const updateYourPageDetails = updateYourPage(
-    if (!pageValues.intro || !pageValues.description) return;
+    pageValues,
-    
+    setResponse,
-    try {
+    setPageValues,
-      setResponse({ loading: true, error: "", msg: "" });
+    setReloader
-
+  );
-      let api = new usersService();
-      const res = await api.MyPageIntro(pageValues);
-
-      setTimeout(() => {
-        setResponse({
-          loading: false,
-          data: res.data,
-          msg: "Page updated successfully",
-        });
-
-        dispatch(tableReload({ type: "YourPageTable" }));
-
-        // Clear form after successful update
-        setPageValues({ intro: "", description: "" });
-      }, 2000);
-    } catch (error) {
-      setResponse({
-        loading: false,
-        data: {},
-        error: "Error updating page",
-        msg: "",
-      });
-    }
-  };
 
   return (
     <Layout>
@@ -70,8 +34,9 @@ const YourPage = () => {
               onChange={handleChange}
               onSubmit={updateYourPageDetails}
               loading={response.loading}
+              msg={response.msg}
             />
-            <LoadedPage />
+            <LoadedPage reloader={reloader} />
           </div>
         </div>
       </div>
@@ -80,3 +45,51 @@ const YourPage = () => {
 };
 
 export default YourPage;
+
+const pageInitialValues = {
+  intro: "",
+  description: "",
+};
+
+const responseInitialValues = {
+  loading: false,
+  data: {},
+  error: "",
+  msg: "",
+};
+
+function updateYourPage(pageValues, setResponse, setPageValues, setReloader) {
+  return async () => {
+    if (!pageValues.intro || !pageValues.description) return;
+
+    try {
+      setResponse({ loading: true, error: "", msg: "" });
+
+      let api = new usersService();
+      const res = await api.MyPageIntro(pageValues);
+
+      setTimeout(() => {
+        setResponse({
+          loading: false,
+          data: res.data,
+          msg: "Update Complete",
+        });
+
+        setReloader((prev) => !prev);
+      }, 1000);
+
+      setTimeout(() => {
+        setResponse({ msg: "" });
+        // Clear form after successful update
+        setPageValues({ intro: "", description: "" });
+      }, 3000);
+    } catch (error) {
+      return setResponse({
+        loading: false,
+        data: {},
+        error: "Error updating page",
+        msg: "",
+      });
+    }
+  };
+}

src/components/jobPopout/EditJobPopout.jsx

@@ -208,12 +208,6 @@ const EditJobPopOut = ({
     }
   };
 
-  // Check if the user is using iOS
-  const isIOS = /MacIntel|MacPPC/.test(navigator.platform) && !window.MSStream;
-
-  // Check if the user is using Windows
-  const isWindows = /Windows/.test(navigator.userAgent);
-
   return (
     <ModalCom action={onClose} situation={situation}>
       <div className="logout-modal-wrapper w-11/12 lg:w-[600px] bg-white dark:bg-dark-white lg:rounded-2xl">

src/store/TableReloads.js

@@ -8,7 +8,6 @@ const initialState = {
   couponTable: false,
   walletTable: false,
   uploadsTable: false,
-  yourPageTable: false,
 };
 
 export const tableReloadSlice = createSlice({
@@ -38,9 +37,6 @@ export const tableReloadSlice = createSlice({
         case "UPLOADSTABLE":
           state.uploadsTable = !state.uploadsTable;
           return;
-        case "YourPageTable":
-          state.yourPageTable = !state.yourPageTable;
-          return;
         default:
           return state;
       }