learn more page added

src/Routers.jsx

@@ -69,6 +69,7 @@ import FamilyActivitiesPage from "./views/FamilyActivitiesPage";
 import FamGamesPage from "./views/FamGamesPage";
 import FamilyRoutesPage from "./views/FamilyRoutesPage";
 import PromoPage from "./views/PromoPage";
+import LearnMorePage from "./views/LearnMorePage";
 
 export default function Routers() {
   return (
@@ -203,6 +204,7 @@ export default function Routers() {
           <Route exact path="/sell" element={<SellPage />} />
           <Route exact path="/saved" element={<SavedPage />} />
           <Route exact path="/history" element={<HistoryPage />} />
+          <Route exact path="/learnmore" element={<LearnMorePage />} />
           {/*<Route exact path="/upload-product" element={<UploadProductPage />} />*/}
           <Route exact path="/my-uploads" element={<UploadProductPage />} />
           <Route exact path="/profile" element={<AuthProfilePage />} />

src/components/Contexts/SocketIOContext.js

@@ -85,6 +85,7 @@ export default function SocketIOContextProvider({children}) {
             }
             console.log('data', data)
         });
+        // dispatch(tableReload({ type: "HOMEBANNERS" })); // RELOADS HOME BANNERS
 
     }, [socket]);
 

src/components/Dashboards/AccountDashboard.jsx

@@ -9,7 +9,7 @@ const AccountDashboard = ({ className, bannerList, offersList, imageServer }) =>
 
   let [offerPopout, setOfferPopout] = useState({ show: false, data: {} }); // STATE TO HOLD THE VALUE OF THE ALERT DETAILS AND DETERMINE WHEN TO SHOW
 
-  let offersListLength = offersList?.length
+  let offersListLength = offersList?.length > 2 ? 2 : offersList?.length
 
   // getting the upper three banners for the home layout
   const getUpperBanner = bannerList?.filter((value, idx) => idx <= 2 - offersListLength);
@@ -31,8 +31,8 @@ const AccountDashboard = ({ className, bannerList, offersList, imageServer }) =>
         }`}
       >
 
+        {/* for normal banner section */}
         <div className="w-full grid xxs:grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 items-center justify-center gap-2 md:gap-4">
-
           {/* OFFER LIST DISPLAY */}
           <>
             {(offersList && offersList?.length > 0) &&
@@ -44,11 +44,13 @@ const AccountDashboard = ({ className, bannerList, offersList, imageServer }) =>
                 );
               
                 let image = `${imageServer}${localStorage.getItem("session_token")}/job/${item.job_uid}`
-                return (
-                  <div key={item.id}>
-                    <NewOfferCard datas={item} image={image} price={thePrice} setOfferPopout={setOfferPopout} />
-                  </div>
-                )
+                if(index < offersListLength){
+                  return (
+                    <div key={item.offer_uid}>
+                        <NewOfferCard datas={item} image={image} price={thePrice} setOfferPopout={setOfferPopout} />
+                    </div>
+                  )
+                }
             })}
           </>
 
@@ -71,7 +73,30 @@ const AccountDashboard = ({ className, bannerList, offersList, imageServer }) =>
             );
           })}
         </div>
-        <div className="w-full grid-cols-1 md:grid-cols-2 2xl::grid-cols-3 grid items-center justify-center gap-2 md:gap-4">
+
+
+        {/* for flat banner section */}
+        <div className="w-full grid-cols-1 md:grid-cols-2 2xl:grid-cols-3 grid items-center justify-center gap-2 md:gap-4">    
+          {/* OFFER LIST DISPLAY */}
+          {/* <>
+            {(offersList && offersList?.length > 0) &&
+              offersList.map((item, index) => {
+                let thePrice = PriceFormatter(
+                  item?.price * 0.01,
+                  item?.currency_code,
+                  item?.currency
+                );
+              
+                let image = `${imageServer}${localStorage.getItem("session_token")}/job/${item.job_uid}`
+                if(index >= 3) {
+                    return(
+                    <div key={item.offer_uid}>
+                        <NewOfferCardFlat datas={item} image={image} price={thePrice} setOfferPopout={setOfferPopout} />
+                    </div>
+                    )
+                }
+            })}
+          </> */}
           {getLowerBanner?.map((props, idx) => {
             let image = getImage(props);
 
@@ -160,9 +185,16 @@ const NewOfferCard = ({ datas, hidden = false, price, setOfferPopout, image }) =
         <div
           className="thumbnail w-full h-full rounded-xl overflow-hidden px-4 pt-4"
           style={{
-            background: `url(${image}) center / contain no-repeat`,
+            // background: `url(${image}) center / contain no-repeat`,
           }}
         >
+          {/* <img src={image} className='' /> */}
+          <div
+          className="thumbnail w-full h-full rounded-xl overflow-hidden"
+          style={{
+            background: `url(${image}) center / contain no-repeat`,
+          }}
+        ></div>
           {hidden && <div className="flex justify-center"></div>}
         </div>
         }
@@ -172,9 +204,6 @@ const NewOfferCard = ({ datas, hidden = false, price, setOfferPopout, image }) =
           <h1 className="font-bold text-lg line-clamp-1 text-center">
             {datas?.title}
           </h1>
-          {/* <Link to={link_path} className="text-sm">
-            {desc}
-          </Link> */}
           <div className="card-buttons flex justify-center items-center space-x-2">
             <button
               type="button"
@@ -205,6 +234,62 @@ const NewOfferCard = ({ datas, hidden = false, price, setOfferPopout, image }) =
   );
 };
 
+const NewOfferCardFlat = ({ datas, hidden = false, price, setOfferPopout, image }) => {
+  return (
+    <div className="flex flex-col shadow-md bg-red-50 dark:bg-dark-white rounded-xl dark:border-[#5356fb29] overflow-hidden">
+      <div className="w-full xxs:flex justify-between items-center border-b border-slate-300 p-2">
+        <div className="min-h-[130px] sm:min-h-[100px] flex justify-between items-center">
+          <div className="px-2 flex flex-col gap-2 dark:text-white">
+            <h1 className="font-bold text-lg line-clamp-1 text-center">
+              {datas?.title}
+            </h1>
+            <div className="card-buttons flex items-center space-x-2">
+              <button
+                type="button"
+                onClick={() =>
+                  setOfferPopout({ show: true, data: { ...datas, image } })
+                }
+                className="btn-shine w-28 h-[40px] text-white rounded-full text-sm bg-pink flex justify-center items-center"
+              >
+                Start Now
+              </button>
+            </div>
+          </div>
+        </div>
+        <div className='w-[150px] h-[100px]'>
+          {datas.job_type == "MEDIA" ?
+          <Suspense fallback={<p>Loading...</p>}>
+            <VideoElement videoId={datas?.media_uid} />
+          </Suspense>
+          :
+          <div
+            className="thumbnail w-full h-full rounded-xl overflow-hidden px-4 pt-4"
+            style={{
+              background: `url(${image}) center / contain no-repeat`,
+            }}
+          >
+            {hidden && <div className="flex justify-center"></div>}
+          </div>
+          }
+        </div>
+      </div>
+      <div className="flex justify-between w-full p-1 items-center">
+        <div className="flex gap-1 items-center">
+          <p className="text-[12px] text-red-500 tracking-wide">Expires</p>
+          <p className="text-[12px] font-semibold tracking-wide text-dark-gray dark:text-white">
+            <CountDown lastDate={datas.expire} />
+          </p>
+        </div>
+        <button className="flex items-center justify-center gap-2">
+          <div className="w-[4px] h-[4px] bg-slate-400 rounded-full"></div>
+          <div className="w-[4px] h-[4px] bg-slate-400 rounded-full"></div>
+          <div className="w-[4px] h-[4px] bg-slate-400 rounded-full"></div>
+        </button>
+      </div>
+    </div>
+  );
+};
+
 const LowerBanner = ({ image, title = "", desc = "", btn, link_path, card_type, blog_id, key }) => {
   const newLinkPath = card_type == 'BLOG' ? `${link_path}?blog_id=${blog_id}` : link_path
 

src/components/FamilyAcc/FamilyTableNew.jsx

@@ -20,6 +20,9 @@ export default function FamilyTableNew() {
 
   let { pathname } = useLocation();
 
+  const queryParams = new URLSearchParams(location?.search);
+  const preSelectedTab = queryParams.get("tab");
+
   // Initial state for family details
   const initialDetailState = {
     loading: false,
@@ -55,9 +58,9 @@ export default function FamilyTableNew() {
 
   // Array of tab names
   const tabs = [
-    { id: 1, name: "Tasks" },
-    { id: 2, name: "Waiting" },
-    { id: 3, name: "Pending" },
+    { id: 1, name: "tasks" },
+    { id: 2, name: "waiting" },
+    { id: 3, name: "pending" },
   ];
 
   // State for the currently selected tab
@@ -94,6 +97,14 @@ export default function FamilyTableNew() {
   // Selected tab component based on the current 'tab'
   const selectedTabComponent = tabComponents[tab] || defaultTabComponent;
 
+  useEffect(()=>{ // EFFECT TO CHECK FOR PRE SELECTED TAB AND DEFAULT TO IT OR TO DEFAULT IF NOT AVALIABLE
+    if(preSelectedTab && tabs.map(item => item.name.toLowerCase()).includes(preSelectedTab.toLowerCase())){
+      setTab(preSelectedTab)
+    }else{
+      setTab(tabs[0].name)
+    }
+  },[])
+
 
   // Effect to manage active family task details
   useEffect(() => {

src/components/LearnMore/LearnMore.jsx

@@ -0,0 +1,152 @@
+import React, {useState, useEffect} from "react";
+import Layout from "../Partials/Layout";
+
+import usersService from "../../services/UsersService";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
+
+import TabButton from "../customTabs/TabButton";
+
+export default function LearnMore() {
+
+    const apiCall = new usersService()
+
+    const [selectedTab, setSelectedTab] = useState("topic 1");
+
+    const [tabs, setTabs] = useState(
+        [  //STATE FOR SWITCHING BETWEEN TABS
+            {
+                id: 1,
+                title: "topic 1",
+                iconName: "history",
+              },
+              {
+                id: 2,
+                title: "topic 2",
+                iconName: "history",
+              },
+              {
+                id: 3,
+                title: "topic 3",
+                iconName: "history",
+              },
+              {
+                id: 4,
+                title: "topic 4",
+                iconName: "history",
+              },
+        ]
+    )
+
+    // const tabs = [  //STATE FOR SWITCHING BETWEEN TABS
+    //     {
+    //         id: 1,
+    //         title: "topic 1",
+    //         iconName: "history",
+    //       },
+    //       {
+    //         id: 2,
+    //         title: "topic 2",
+    //         iconName: "history",
+    //       },
+    //       {
+    //         id: 3,
+    //         title: "topic 3",
+    //         iconName: "history",
+    //       },
+    //       {
+    //         id: 4,
+    //         title: "topic 4",
+    //         iconName: "history",
+    //       },
+    // ]
+
+    let [topics, setTopics] = useState({ // FOR PAYMENT HISTORY
+        loading: true,
+        data: [],
+    })
+
+    //FUNCTION TO GET LEARN MORE TOPIC
+  
+  useEffect(()=>{
+    apiCall.getLearnmoreTopics().then((res)=>{
+        if(res.data.internal_return < 0){ // success but no data
+            setTopics(prev => ({...prev, loading: false}))
+            return
+        }
+        const resData = res?.data?.result_list
+        setTopics(prev => ({...prev, loading: false, data: resData}))
+        setTabs(prev => {
+           return prev.map((item, index) => ({...item, title:resData[index].topic}))
+        })
+        setSelectedTab(resData[0].topic)
+        // console.log('RES', resData)
+    }).catch((error)=>{
+        setTopics(prev => ({...prev, loading: false}))
+    })
+  }, [])
+
+
+  return (
+    <>
+      <Layout>
+        <div className="history-wrapper w-full mb-10">
+            <div className="w-full">
+                <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">
+
+                    Learn More
+
+                        </h1>
+                    </div>
+                    <div className="slider-btns flex space-x-4">
+
+                    </div>
+                </div>
+                <div className="w-full h-full p-4 bg-white dark:bg-dark-white rounded-2xl section-shadow lg:flex lg:px-10 px-4 justify-between">
+                    <div className="content-tab-items lg:w-[230px] w-full mr-2">
+                        <div className='overflow-hidden mb-5 lg:mb-0 py-2 lg:py-8'>
+                            {(!topics.loading  && topics?.data?.length > 0) && tabs.map((item) => (
+                                <div key={item.id} className='w-full'>
+                                    <TabButton 
+                                        key={item.id}
+                                        item={item.title}
+                                        iconName={item.iconName}
+                                        selectedTab={selectedTab}
+                                        setSelectedTab={setSelectedTab}
+                                    />
+                                </div>
+                            ))}
+                        </div>
+                    </div>
+                    <div className="w-[1px] bg-[#E3E4FE] dark:bg-[#a7a9b533]  mr-10"></div>
+                    <div className="flex-1 overflow-y-auto min-h-[520px]">
+                        <>
+                            {/* TOPICS SECTION */}
+                            <div className="w-full py-2 lg:py-8">
+                                {topics.loading ? 
+                                <LoadingSpinner size='16' color='sky-blue' height='h-[500px]' />
+                                :
+                                <>
+                                    {(topics?.data && topics?.data?.length > 0) ?
+                                    <div dangerouslySetInnerHTML={{
+                                        __html: topics?.data?.filter(item => item.topic == selectedTab)[0]?.contents,
+                                      }} className='prose dark:text-white dark:bg-dark-white'
+                                    >
+                                        {/* {topics?.data?.filter(item => item.topic == selectedTab)[0]?.contents} */}
+                                    </div>
+                                    :
+                                    <p className='p-2 text-slate-500 flex flex-col grow justify-center items-center'>No Topics found</p>}
+                                </>
+                                }
+                            </div>
+                            {/* END OF TOPICS SECTION */}
+                        </>
+                    </div>
+                </div>
+            </div>
+        </div>
+      </Layout>
+    </>
+  );
+}

src/components/customTabs/TabButton.jsx

@@ -15,7 +15,7 @@ export default function TabButton({ item='', iconName='', selectedTab='', setSel
         <Icons name={iconName} />
       </div>
       <div>
-        <p className="text-18 tracking-wide">{item[0].toUpperCase() + item.slice(1)}</p>
+        <p className="text-18 tracking-wide">{item[0]?.toUpperCase() + item?.slice(1)}</p>
       </div>
     </button>
   )

src/components/jobPopout/OfferJobPopout.jsx

@@ -78,6 +78,7 @@ function OfferJobPopout({ details, onClose, situation }) {
         setTimeout(() => {
           onClose();
           dispatch(tableReload({ type: "MYTASKTABLE" }));
+          dispatch(tableReload({ type: "HOMEBANNERS" }));
           navigate("/mytask", { replace: true });
           setRequestStatus({
             loading: false,
@@ -176,19 +177,31 @@ function OfferJobPopout({ details, onClose, situation }) {
               </div>
             </div>
 
-            <p className="text-lg my-5 font-semibold text-slate-900 dark:text-white tracking-wide line-clamp-1">
+            <p className="text-lg my-2 font-semibold text-slate-900 dark:text-white tracking-wide max-h-[200px] overflow-y-auto">
               {details.title}
             </p>
 
             <div className="my-2 md:flex">
-              <Detail label="Description" value={details.description} />
+              <label className='job-label w-full md:w-[150px]'>Description</label>
+              <p className={`p-1 w-full md:w-3/4 text-sm text-slate-900 dark:text-white max-h-[200px] overflow-y-auto`}>{details.description}</p>
+              {/* <Detail label="Description" value={details.description} /> */}
             </div>
 
 
 
-            <div className="my-2 md:flex">
-              <label className='job-label w-full md:w-[150px]'>Detail</label>
-              <p className={`p-1 w-full md:w-3/4 text-sm text-slate-900 dark:text-white min-h-[100px] max-h-[200px] overflow-y-auto border boder-2 rounded-md`}>{details.job_description || details.job_detail}</p>
+            <div className="my-2 md:flx">
+              {/* <label className='job-label w-full md:w-[150px]'>Detail</label>
+              <p className={`p-1 w-full md:w-3/4 text-sm text-slate-900 dark:text-white min-h-[100px] max-h-[200px] overflow-y-auto border-2 rounded-md`}>{details.job_description || details.job_detail}</p> */}
+              <label className="w-full text-slate-900 dark:text-white tracking-wide font-semibold">
+                Delivery Detail
+              </label>
+              <textarea
+                className={`p-2 w-full text-sm text-slate-900 dark:text-white bg-transparent outline-none border border-slate-300 rounded-md`}
+                rows="5"
+                style={{ resize: "none" }}
+                value={details.job_description || details.job_detail}
+                readOnly
+              />
             </div>
           </div>
 

src/middleware/AuthRoute.jsx

@@ -27,7 +27,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
   const [loadProfileDetails, setLoadProfileDetails] = useState([]);
   const navigate = useNavigate();
 
-  const { jobListTable, marketTableList, walletTable, familyBannersListTable } = useSelector(
+  const { jobListTable, marketTableList, walletTable, familyBannersListTable, homeBanners } = useSelector(
     (state) => state.tableReload
   );
 
@@ -247,7 +247,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
         .catch((error) => {
           console.log("ERROR ", error);
         });
-  }, [isLogin.status]);
+  }, [isLogin.status, homeBanners]);
 
   //FUNCTION TO GET COMMON HEAD DATA
   // useEffect(() => {

src/services/UsersService.js

@@ -1502,14 +1502,25 @@ class usersService {
     return this.postAuxEnd("/promoverify", postData);
   }
 
-    // API FUNCTION TO LOGIN USER THROUGH PROMO LINK
-    loginPromo(reqData) {
-      var postData = {
-        action: apiConst.WRENCHBOARD_LOGIN_PROMO,
-        ...reqData
-      };
-      return this.postAuxEnd("/loginpromo", postData);
-    }
+  // API FUNCTION TO LOGIN USER THROUGH PROMO LINK
+  loginPromo(reqData) {
+    var postData = {
+      action: apiConst.WRENCHBOARD_LOGIN_PROMO,
+      ...reqData
+    };
+    return this.postAuxEnd("/loginpromo", postData);
+  }
+
+  // API FUNCTION TO GET LEARN MORE TOPICS
+  getLearnmoreTopics() {
+    var postData = {
+      member_uid: localStorage.getItem("uid"),
+      member_id: localStorage.getItem("member_id"),
+      sessionid: localStorage.getItem("session_token"),
+      // action: apiConst.WRENCHBOARD_LOGIN_PROMO,
+    };
+    return this.postAuxEnd("/learnmore", postData);
+  }
 
   /*
     - 20:27:30.118 FLOG_MAX [757411]: 	REQ_STRING(username)

src/store/TableReloads.js

@@ -14,6 +14,7 @@ const initialState = {
   familyOfferList: false,
   parentFamilyTaskList: false,
   offerInterestListReload: false,
+  homeBanners: false,
 };
 
 export const tableReloadSlice = createSlice({
@@ -61,6 +62,9 @@ export const tableReloadSlice = createSlice({
         case "OFFERINTERESTLISTRELOAD": // to reload offer interest list of owner when a worker sends interest in a job
           state.offerInterestListReload = !state.offerInterestListReload;
           return;
+        case "HOMEBANNERS": // to reload offer interest list of owner when a worker sends interest in a job
+          state.homeBanners = !state.homeBanners;
+          return;
         default:
           return state;
       }

src/views/HomePages.jsx

@@ -1,15 +1,23 @@
+import {useState, useEffect} from 'react'
 import { useSelector } from "react-redux";
 import Home from "../components/Home";
 
 export default function HomePages() {
   const { commonHeadBanner } = useSelector((state) => state.commonHeadBanner);
 
-  const bannerOptions = {
-    bannerList: commonHeadBanner?.result_list,
-    dashTypes: commonHeadBanner?.home_dash_type,
-    offersList: commonHeadBanner?.offers_list,
-    imageServer: commonHeadBanner?.session_image_server
-  };
+  const [bannerOptions, setBannerOptions] = useState({})
+
+
+
+  useEffect(()=>{
+    const bannerOptions = {
+      bannerList: commonHeadBanner?.result_list,
+      dashTypes: commonHeadBanner?.home_dash_type,
+      offersList: commonHeadBanner?.offers_list,
+      imageServer: commonHeadBanner?.session_image_server
+    };
+    setBannerOptions(bannerOptions)
+  },[commonHeadBanner])
 
   return (
     <>

src/views/LearnMorePage.jsx

@@ -0,0 +1,10 @@
+import React from "react";
+import LearnMore from "../components/LearnMore/LearnMore";
+
+export default function LearnMorePage() {
+  return (
+    <>
+      <LearnMore />
+    </>
+  );
+}