offer interest message list API added

src/components/MyJobs/index.jsx

@@ -1,11 +1,13 @@
 import React, { useState } from "react";
+import { useLocation } from "react-router-dom";
 import Layout from "../Partials/Layout";
 import MyJobTable from "./MyJobTable";
 import CommonHead from "../UserHeader/CommonHead";
 import AddJobPage from "../../views/AddJobPage";
 
 export default function MyJobs(props) {
-  const [popUp, setPopUp] = useState(false);
+  let { state } = useLocation();
+  const [popUp, setPopUp] = useState(state?.popup ? true : false);
   const popUpHandler = () => {
     setPopUp((prev) => !prev);
   };

src/components/OffersInterest/ManageInterestOffer.jsx

@@ -4,8 +4,6 @@ import Layout from "../Partials/Layout";
 import CommonHead from "../UserHeader/CommonHead";
 
 import usersService from "../../services/UsersService";
-// import { handlePagingFunc } from "../Pagination/HandlePagination";
-// import PaginatedList from "../Pagination/PaginatedList";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
 import OthersInterestedTable from "./OthersInterestedTable";
 
@@ -23,15 +21,7 @@ export default function ManageInterestOffer(props) {
 
     let [messageListReload, setMessageListReload] = useState(false) // STATE TO DETERMINE WHEN MESSAGE LIST WILL RELOAD
 
-    const [messageList, setMessageList] = useState({loading: true, data: [1,2,3,4,5,6,7,8,95,6,7,8,9]}) // TO BE REMOVED AND REPLACE WITH REAL MESSAGE FROM API CALL
-    // const [currentPage, setCurrentPage] = useState(0);
-    // const indexOfFirstItem = Number(currentPage);
-    // const indexOfLastItem = Number(indexOfFirstItem) + Number(process.env.REACT_APP_ITEM_PER_PAGE);
-    // const currentMessageList = messageList?.data?.slice(indexOfFirstItem, indexOfLastItem);
-
-    // const handlePagination = (e) => {
-    //     handlePagingFunc(e, setCurrentPage);
-    // };
+    const [messageList, setMessageList] = useState({loading: true, data: []}) // TO BE REMOVED AND REPLACE WITH REAL MESSAGE FROM API CALL
 
     const [selectTab, setValue] = useState("today");
     const filterHandler = (value) => {
@@ -112,14 +102,17 @@ export default function ManageInterestOffer(props) {
         })
     }
 
-    useEffect(()=>{
-        // run API to get message to replace message array above, add reload variable as dependence array. CODE IS DUMMY FOR NOW
-        setMessageList({loading: true, data: []})
-        apiCall.offerInterestMsg().then(res=>{
-            console.log('Data', res.data)
-            setMessageList({loading: false, data:[1,2,3,6,7,8,9]})
+    useEffect(()=>{ //API to get Offer Interest message list
+        let reqData = { // API PAYLOADS
+            msg_type: 'MRKTINT',
+            offer_uid: props.offerDetails.offer_uid,
+            interest_uid: props.offerDetails.interest_uid
+        }
+        setMessageList(prev => ({...prev, loading: true}))
+        apiCall.offerInterestListMsg(reqData).then(res=>{
+            setMessageList({loading: false, data:res?.data?.result_list})
         }).catch(err => {
-            setMessageList({loading: false, data:[1,2,3,6,7,8,9]})
+            setMessageList(prev => ({...prev, loading: false}))
             console.log('Failed', err)
         })
     },[messageListReload])
@@ -288,36 +281,14 @@ export default function ManageInterestOffer(props) {
                                         <div className="my-1 min-h-[100px] max-h-[200px] border-t overflow-y-scroll">
                                         { messageList.loading ?
                                         <LoadingSpinner color='sky-blue' size='16' />
-                                        : messageList.data.map((item, index)=>(
+                                        : messageList?.data?.map((item, index)=>(
                                             <div key={index} className="my-2 w-full flex items-center gap-1">
-                                                <p className="text-base font-bold text-dark-gray dark:text-white tracking-wide">2023-04-06-from { }<span className="font-normal">Dummy name</span></p>
-                                                <p className="text-base font-bold text-dark-gray dark:text-white tracking-wide">I am testing message</p>
+                                                <p className="text-base font-bold text-dark-gray dark:text-white tracking-wide">{item.added.split(' ')[0]}-from { }<span className="font-normal">{item.sender || 'Dummy name'}</span></p>
+                                                <p className="text-base font-bold text-dark-gray dark:text-white tracking-wide">{item.msg}</p>
                                             </div>
                                             ))
                                         }
-                                        {/* {messageList.data.map((item, index)=>(
-                                            <div key={index} className="my-2 w-full flex items-center gap-1">
-                                                <p className="text-base font-bold text-dark-gray dark:text-white tracking-wide">2023-04-06-from { }<span className="font-normal">Dummy name</span></p>
-                                                <p className="text-base font-bold text-dark-gray dark:text-white tracking-wide">I am testing message</p>
-                                            </div>
-                                        ))} */}
                                         </div>
-
-                                        {/* PAGINATION BUTTON */}
-                                        {/* <PaginatedList
-                                            onClick={handlePagination}
-                                            prev={currentPage == 0 ? true : false}
-                                            next={
-                                                currentPage + Number(process.env.REACT_APP_ITEM_PER_PAGE) >=
-                                                messageList?.data?.length
-                                                    ? true
-                                                    : false
-                                            }
-                                            data={messageList?.data}
-                                            start={indexOfFirstItem}
-                                            stop={indexOfLastItem}
-                                        /> */}
-                                        {/* END OF PAGINATION BUTTON */}
                                     </div>
                                     }
                                 </div>

src/components/Partials/MobileSideBar.jsx

@@ -225,9 +225,10 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler, myJ
                   <ul className="flex flex-col space-y-6">
                     <ListItem
                       title="Add Job"
-                      route="/add-job"
+                      route="/myjobs"
                       iconName="people-two"
                       sidebar={sidebar}
+                      state={"Add Job"}
                     />
                   </ul>
                 </div>
@@ -301,11 +302,12 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler, myJ
   );
 }
 
-const ListItem = ({ sidebar, route, title, bubble }) => {
+const ListItem = ({ sidebar, route, title, bubble, state }) => {
   return (
     <li className="item group">
       <NavLink
         to={route}
+        state={state && {popup: true}}
         className={`nav-item flex items-center  ${
           ((navData) => (navData.isActive ? "active" : ""),
           sidebar ? "justify-start space-x-3.5" : "justify-center")

src/components/Partials/Sidebar.jsx

@@ -249,9 +249,10 @@ export default function Sidebar({ sidebar, action, logoutModalHandler, myJobList
                   <ul className="flex flex-col space-y-6">
                     <ListItem
                       title="Add Job"
-                      route="/add-job"
+                      route="/myjobs"
                       iconName="people-two"
                       sidebar={sidebar}
+                      state={"Add Job"}
                     />
                   </ul>
                 </div>
@@ -325,11 +326,12 @@ export default function Sidebar({ sidebar, action, logoutModalHandler, myJobList
   );
 }
 
-const ListItem = ({ sidebar, route, title, bubble, iconName }) => {
+const ListItem = ({ sidebar, route, title, bubble, iconName, state }) => {
   return (
     <li className={`item group`}>
       <NavLink
         to={route}
+        state={state && {popup: true}}
         className={`nav-item flex items-center  ${
           ((navData) => (navData.isActive ? "active" : ""),
           sidebar ? "justify-start space-x-3.5" : "justify-center")

src/services/UsersService.js

@@ -730,7 +730,7 @@ class usersService {
     return this.postAuxEnd("/paylistcard", postData);
   }
 
-    // END POINT TO SEND AND GET OFFER INTEREST MESSAGE
+    // END POINT TO SEND OFFER INTEREST MESSAGE
     offerInterestMsg(reqData) {
       var postData = {
         uid: localStorage.getItem("uid"),
@@ -741,6 +741,18 @@ class usersService {
       };
       return this.postAuxEnd("/offerinterestmsg", postData);
     }
+
+    // END POINT TO GET OFFER INTEREST MESSAGE
+    offerInterestListMsg(reqData) {
+      var postData = {
+        uid: localStorage.getItem("uid"),
+        member_id: localStorage.getItem("member_id"),
+        sessionid: localStorage.getItem("session_token"),
+        action: 13037,
+        ...reqData
+      };
+      return this.postAuxEnd("/offerinterestlistmsg", postData);
+    }
   /*
     - 20:27:30.118 FLOG_MAX [757411]: 	REQ_STRING(username)
     - 20:27:30.118 FLOG_MAX [757411]: 	REQ_STRING(password)