check for all necessary variables from API to determine verify link success

# Conflicts:
#	src/components/MyCoupons/MyCoupons.jsx

.env

@@ -9,15 +9,15 @@ 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"
+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"
 
-REACT_APP_SESSION_EXPIRE_MINUTES=300000
+REACT_APP_SESSION_EXPIRE_MINUTES=600000
 REACT_APP_SESSION_EXPIRE_MINUTES_FAMILY=600000
 REACT_APP_SESSION_EXPIRE_CHECKER=60000
 

.env.development

@@ -9,15 +9,15 @@ 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"
+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"
 
-REACT_APP_SESSION_EXPIRE_MINUTES=300000
+REACT_APP_SESSION_EXPIRE_MINUTES=600000
 REACT_APP_SESSION_EXPIRE_MINUTES_FAMILY=600000
 REACT_APP_SESSION_EXPIRE_CHECKER=60000
 

.env.production

@@ -9,15 +9,15 @@ 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.orion.g1.wrenchboard.com/svs/user"
-REACT_APP_USERS_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/svs/user"
+#REACT_APP_AUX_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/svs/user"
+#REACT_APP_USERS_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/svs/user"
 
-#REACT_APP_AUX_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/en/wrench/api/v1"
-#REACT_APP_USERS_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/en/wrench/api/v1"
+REACT_APP_AUX_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/en/wrench/api/v1"
+REACT_APP_USERS_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/en/wrench/api/v1"
 
 #"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
 
-REACT_APP_SESSION_EXPIRE_MINUTES=300000
+REACT_APP_SESSION_EXPIRE_MINUTES=600000
 REACT_APP_SESSION_EXPIRE_MINUTES_FAMILY=600000
 REACT_APP_SESSION_EXPIRE_CHECKER=60000
 

src/Routers.jsx

@@ -44,6 +44,9 @@ import MyPastDueJobsPage from "./views/MyPastDueJobsPage";
 import BlogPage from "./views/BlogPage";
 import MyReviewDueJobsPage from "./views/MyReviewDueJobsPage";
 import OffersInterestPage from "./views/OffersInterestPage";
+import ManageInterestOfferPage from './views/ManageInterestOfferPage'
+import MyWaitingJobsPage from "./views/MyWaitingJobsPage";
+import FamilyMarketPage from "./views/FamilyMarketPage";
 
 export default function Routers() {
   return (
@@ -85,13 +88,15 @@ export default function Routers() {
           <Route exact path="/notification" element={<Notification />} />
           <Route exact path="/market-place" element={<MarketPlacePage />} />
           <Route exact path="/market" element={<MarketPlacePage />} />
+          <Route exact path="/familymarket" element={<FamilyMarketPage />} />
           <Route exact path="/notification" element={<Notification />} />
           <Route exact path="/mytask" element={<MyTaskPage />} />
           <Route exact path="/myjobs" element={<MyJobsPage />} />
-          <Route exact path="/add-job" element={<AddJobPage />} />
+          {/* <Route exact path="/add-job" element={<AddJobPage />} /> */}
           <Route exact path="/my-active-jobs"  element={<MyActiveJobsPage />} />
           <Route exact path="/my-pastdue-jobs"  element={<MyPastDueJobsPage />} />
           <Route exact path="/my-pending-jobs"  element={<MyPendingJobsPage />} />
+          <Route exact path="/pend-interest"  element={<MyWaitingJobsPage />} />
           <Route exact path="/my-review-jobs"  element={<MyReviewDueJobsPage />} />
           <Route exact path="/acc-family"  element={<FamilyAccPage />} />
           <Route exact path="/manage-family"  element={<FamilyManagePage />} />
@@ -99,6 +104,7 @@ export default function Routers() {
           <Route exact path="/manage-active-job"  element={<ManageActiveJobs />} />
           <Route exact path="/blog-page"  element={<BlogPage />} />
           <Route exact path="/offer-interest"  element={<OffersInterestPage />} />
+          <Route exact path="/manage-offer"  element={<ManageInterestOfferPage />} />
 
 
           <Route

src/assets/images/card.svg

@@ -0,0 +1,9 @@
+<svg width="905" height="575" viewBox="0 0 905 575" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<rect width="905" height="575" fill="url(#pattern0)"/>
+<defs>
+<pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
+<use xlink:href="#image0_201_3" transform="matrix(0.00849979 0 0 0.0131639 -0.0662984 -0.354783)"/>
+</pattern>
+<image id="image0_201_3" width="130" height="130" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIIAAACCCAMAAAC93eDPAAAApVBMVEX///82OzgAAAAuMi81OjdVXVfqpQCzs7NCSUSwsbAaIBslKyjk5OQuNDAhJiLZ2tpJT0opNTkvNzloVy31rAC1hRtPV1HNzc34+PgaLztBQUHLkg9UVFTw8PDGxsaioqKampp/f39sbGyIiIgaGho9Qj5MTExeXl5fUi+9vb03Nzd2dnYjIyORkZFjZWMNFQ9CQTWYcyLAjBSsfx12XytSSjEQEBBeBsYmAAAEiklEQVR4nO3a7XaqOBQG4BjoQXRraKc1GUoSPgQaETszZ473f2kTqm0VsKLLYs80b3+UhQgPOwlBESETExMTExMTExMTExMTk/9HQDk9xHUdcgiwmk7HPWQ0Gj0HrQiaWvagh9iWztSiTQH3rD4AW4I19nmDUI77EWwJ1ihpENJeWuGdYE0afXHSN2EMdUI/fXGHMK0Piv6rcJhg39VyadpRwt3g6Y+9PNl3/RLsvx7va3kcXLYOxwh/Ptz/qOX+79t+CY91wY8fD4ZgCIbwvQn/NAT3P/sl3P3bENz/uuwkcXSaun162M/PX5ctQofJ+u62lgtPlL/HLYshGIIhfDGC3chZ65ur7c6EYSN2+/r0wPYvn4/ttH19B4Lt3TRSGexZc316YP3LgZrrZ9sqTK5PsK7fEMcJn90d7eOEz84XIEyuT7CuTrCvT5hcn2BdnWBfnbAj+CaEtyvizrXROpfQOu0fAwyGnucN9X89XeiltPrebnIuwU5nO+n2dbmdbqfH1B6+Le02w4mEvYnX60J4PW61/fukb51PGO4SulWheRehMecTTu8LbTc+NzMvPZ9wctrupW505+yR0NYOelR41yVUgq5VaLnjOvmy0GyIStC5L6RH0okwbBN4g06ExpubFe00JPbKMNsIOl4XWofT6YTB4HU/3mDWLjjpc8RevE4APSF4VSFmQ31VTl8AqdWZcInuuEFUHWczLdgDuw7o637BnjSP/AHh8o9KPwR8fhXslsrXCfUHxpd8bH7k9LdpPDZHyajL+y6XUdQggD/uUzAeNNoBIWpN+xNMJy0/JNF1mD2Pespz0FKDDcJxe4k6BDAxMTExMTH5kunjZ8cfB+Gr53sTluE7YQ0gBSGrBEgEROIcCA0oVnEEkFfbCp44ZUYDAhLjiGAKCiugmASlXAGMa/teEBCLHCCSYZmEofBlqUIcACQ44r4PoJbVZnOk3ghzFPlMujyEbIViH8es4C6LSAKuAP16gaqlAlwomY9DVrCElSjhCVfSAYe6NYLPSq6oCFmohFIhl64kLqYkZEuFogzlqMSZEPo2nr4TijVLQk1YBihYa0IGigMNeZRF+vUcFTiGkiqxTpa45BIWUjIfQs4dh8KiXmGfBZQSqc9EACExsBcCuDHyKXd8hLmu9GY8wvKVADHnKJZIBIis8AoByTnoc4k2Z6hPeYlUKIRUfkXgcxxpQskBqTlhywYh3xB8DkRvByysCE6McghptiGwjYG+EgLMSigkwQHS5xTzAGdQIk2QVUP4q5BlnOVC5PqVqgq+cF+qkCCV64odICCMqEBLvadwW4UYCcj3quC/E1BElS5wjlaLqiFwwHUPAf2ho1jhGCUso2jh8IgFVV9ACSpRxBO2Ig4oShuEgju6ZJrgKraEgEmilrovaHKk/wKUbPsCmb+OCJphEReioDTRG+JAl9tXa7mKiZLSxWtJEpyo+ZwKx8eFwEoPG71XLLKo9Cmtd4aFomrp616gB1Xhrp0sSiQlmSBx4uLqKHK+GRHibUR8mCQ4tsW5mUrcjfD5+QKE/wC0yMO17JCUyAAAAABJRU5ErkJggg=="/>
+</defs>
+</svg>

src/assets/images/grid-view.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" ?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg fill="#000000" width="800px" height="800px" viewBox="0 0 52 52" data-name="Layer 1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"><path d="M14,16H2a2,2,0,0,1-2-2V2A2,2,0,0,1,2,0H14a2,2,0,0,1,2,2V14A2,2,0,0,1,14,16ZM4,12h8V4H4Z"/><path d="M14,34H2a2,2,0,0,1-2-2V20a2,2,0,0,1,2-2H14a2,2,0,0,1,2,2V32A2,2,0,0,1,14,34ZM4,30h8V22H4Z"/><path d="M14,52H2a2,2,0,0,1-2-2V38a2,2,0,0,1,2-2H14a2,2,0,0,1,2,2V50A2,2,0,0,1,14,52ZM4,48h8V40H4Z"/><path d="M32,16H20a2,2,0,0,1-2-2V2a2,2,0,0,1,2-2H32a2,2,0,0,1,2,2V14A2,2,0,0,1,32,16ZM22,12h8V4H22Z"/><path d="M32,34H20a2,2,0,0,1-2-2V20a2,2,0,0,1,2-2H32a2,2,0,0,1,2,2V32A2,2,0,0,1,32,34ZM22,30h8V22H22Z"/><path d="M32,52H20a2,2,0,0,1-2-2V38a2,2,0,0,1,2-2H32a2,2,0,0,1,2,2V50A2,2,0,0,1,32,52ZM22,48h8V40H22Z"/><path d="M50,16H38a2,2,0,0,1-2-2V2a2,2,0,0,1,2-2H50a2,2,0,0,1,2,2V14A2,2,0,0,1,50,16ZM40,12h8V4H40Z"/><path d="M50,34H38a2,2,0,0,1-2-2V20a2,2,0,0,1,2-2H50a2,2,0,0,1,2,2V32A2,2,0,0,1,50,34ZM40,30h8V22H40Z"/><path d="M50,52H38a2,2,0,0,1-2-2V38a2,2,0,0,1,2-2H50a2,2,0,0,1,2,2V50A2,2,0,0,1,50,52ZM40,48h8V40H40Z"/></svg>

src/assets/images/icon-delete.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" id="delete"><g color="#000"><path fill="#ee4c45" style="line-height:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;block-progression:tb;white-space:normal;isolation:auto;mix-blend-mode:normal;solid-color:#000;solid-opacity:1" d="M12 1028.362c-6.626 0-12 5.374-12 12s5.374 12 12 12 12-5.374 12-12-5.374-12-12-12z" font-family="sans-serif" font-weight="400" overflow="visible" transform="translate(0 -1028.362)"></path><path fill="#fff" style="isolation:auto;mix-blend-mode:normal;solid-color:#000;solid-opacity:1" d="M10.5 1034.362v1h-3v1h9v-1h-3v-1h-3zm-2 3v9h7v-9h-7zm1 1h1v7h-1v-7zm2 0h1v7h-1v-7zm2 0h1v7h-1v-7z" overflow="visible" transform="translate(0 -1028.362)"></path></g></svg>

src/assets/images/icon-edit.svg

@@ -0,0 +1,19 @@
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 60 60" viewBox="0 0 60 60" id="edit"><path fill="#3B4652" d="M52.9687347,19.3099976l-2.7999878-2.7999878c-0.9099731-0.9100342-2.3899536-0.9100342-3.2999878,0
+		l-1.4129639,1.4129639c0.0185547,0.017395,0.0423584,0.0234985,0.0601196,0.0422974l5.7765503,6.1199341
+		c0.0361328,0.038269,0.0506592,0.0881348,0.0813599,0.1296997l1.5949097-1.5949097
+		C53.8787689,21.7099609,53.8787689,20.2199707,52.9687347,19.3099976z"></path><path fill="#2B79C2" d="M10.8887787,25.5499878H34.998764l7.5900269-7.5900269l1.7599487-1.75V9c0-1.6500244-1.3499756-3-3-3h-32
+		c-1.6599731,0-3,1.3499756-3,3v42c0,1.6499634,1.3400269,3,3,3h32c1.6500244,0,3-1.3500366,3-3V34.0700073l-5.8899536,5.8800049
+		c-0.3099976,0.3199463-0.7000122,0.5599976-1.1199951,0.7099609l-7.2200317,2.5200195
+		c-0.3099976,0.1099854-0.6500244,0.1699829-0.9899902,0.1699829c-0.7800293,0-1.5200195-0.2999878-2.0900269-0.8399658
+		c-0.3399658-0.3400269-0.5799561-0.7400513-0.7299805-1.1600342H10.8887787c-0.5599976,0-1-0.4500122-1-1s0.4400024-1,1-1
+		h15.4199829v-0.0100098l1.7000122-4.8899536H10.8887787c-0.5599976,0-1-0.4500122-1-1c0-0.5500488,0.4400024-1,1-1H28.708786
+		l0.0999756-0.3000488c0.1699829-0.4699707,0.4400024-0.8800049,0.789978-1.1900024l3.4000244-3.4099731H10.8887787
+		c-0.5599976,0-1-0.4500122-1-1S10.3287811,25.5499878,10.8887787,25.5499878z M10.8887787,46.25h24.9099731
+		c0.5599976,0,1,0.4500122,1,1s-0.4400024,1-1,1H10.8887787c-0.5599976,0-1-0.4500122-1-1S10.3287811,46.25,10.8887787,46.25z
+		 M10.8887787,11.75h24.9099731c0.5599976,0,1,0.4500122,1,1s-0.4400024,1-1,1H10.8887787c-0.5599976,0-1-0.4500122-1-1
+		S10.3287811,11.75,10.8887787,11.75z M10.8887787,18.6499634h24.9099731c0.5599976,0,1,0.4500122,1,1c0,0.5500488-0.4400024,1-1,1
+		H10.8887787c-0.5599976,0-1-0.4499512-1-1C9.8887787,19.0999756,10.3287811,18.6499634,10.8887787,18.6499634z"></path><path fill="#3B4652" d="M30.9387665,32.4400024c-0.1099854,0.0999756-0.1900024,0.2299805-0.2399902,0.3699951
+		l-2.5100098,7.2099609c-0.1300049,0.3600464-0.039978,0.7700195,0.2299805,1.0400391
+		c0.2000122,0.1900024,0.4500122,0.289978,0.710022,0.289978c0.1099854,0,0.2199707-0.0200195,0.3300171-0.0599976
+		l7.2099609-2.5100098c0.1400146-0.0499878,0.2700195-0.1300049,0.3800049-0.2399902l12.5599976-12.5599976l-5.9299927-6.2799683
+		L30.9387665,32.4400024z"></path></svg>

src/assets/images/icons/account.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 66 66" id="Account"><path fill="#4687ba" d="M19 36.5c-5.8 0-10.6 4.7-10.6 10.6S13.1 57.6 19 57.6 29.5 52.9 29.5 47 24.8 36.5 19 36.5zm0 19.6c-5 0-9.1-4.1-9.1-9.1s4.1-9 9.1-9 9 4 9 9-4 9.1-9 9.1z" class="color000100 svgShape"></path><path fill="#4687ba" d="M65.7 49.6l-.9-5.4c-1.2-8-7.4-14.3-15.1-15.9 1.3-1.6 2.7-3.9 3.3-7.1.5-.8 2.1-3.5 1.5-5.3-.1-.3-.3-.6-.6-.9.7-2 2.3-9-4.8-12.6C38-3.9 28.7 4.7 30.8 14.6c-.2.3-.5.6-.6 1.1-.3 1.3.1 3 1.3 4.9.2.8 1.5 5 3.9 7.9-3.2.8-6 2.4-8.4 4.6-1.2-.7-2.5-1.2-3.8-1.6l-.8-3.3h-6.8l-.8 3.3c-1.3.4-2.6.9-3.8 1.6l-2.8-1.8-4.8 4.8L5.1 39c-.7 1.2-1.2 2.5-1.6 3.8l-3.3.8v6.8l3.3.8c.4 1.3.9 2.6 1.6 3.8l-1.8 2.9 4.8 4.8 2.8-1.8c1.2.7 2.5 1.2 3.8 1.6l.8 3.3h6.8l.8-3.3c1.3-.4 2.6-.9 3.8-1.6l2.8 1.8 4.8-4.8-.3-.5H59c2 0 3.8-.9 5.1-2.4 1.3-1.4 1.9-3.4 1.6-5.4zM32.9 20.1l-.1-.2c-1.7-2.8-1.3-4.2-.8-4.5l.5-.3c-1.8-6 1.4-11.4 5.6-12.9C43.4.5 57 4.1 52 15.9c.3.1 1 .3 1 .6.3 1-.9 3.3-1.5 4.3-1.1 5.3-4.3 9.7-9.2 9.8-5.1 0-8.1-5.5-9.4-10.5zm-3.3 40.7L27 59.2c-1.1.7-2.4 1.5-5.1 2.1l-.7 3h-4.4l-.7-3c-2.3-.5-3.4-1.1-5.1-2.1l-2.6 1.6-3.1-3.1 1.6-2.6C5.7 53.2 5.2 52 4.7 50l-3-.7v-4.4l3-.7c.3-1.4.7-2.9 2.1-5.2l-1.6-2.6 3.1-3.1 2.6 1.6c1.1-.7 2.4-1.5 5.1-2.1l.7-3h4.4l.7 3c2.3.5 3.4 1.1 5.1 2.1l2.6-1.6 3.1 3.1-1.5 2.6c1.2 1.9 1.6 3.1 2.1 5.1l3 .7v4.4l-3 .7c-.3 1.2-.6 2.8-2.1 5.1l1.6 2.6-3.1 3.2zM63 54.1c-1 1.2-2.4 1.8-4 1.8H33.4l-.5-.9c.7-1.2 1.2-2.5 1.6-3.8l3.3-.8v-6.8l-3.3-.8c-.4-1.3-.9-2.6-1.6-3.8l1.8-2.8-4-4c1.8-1.1 3.8-1.9 6-2.4 1.7 1.5 3.8 2.4 6.2 2.2 2.7-.2 4.4-1.2 5.7-2.4 7.6 1.1 13.7 7.1 14.9 14.8l.8 5.4c.2 1.6-.3 3.1-1.3 4.3z" class="color000100 svgShape"></path></svg>

src/assets/images/icons/dashboard.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" id="dashboard"><path fill="none" d="M0 0h24v24H0V0z"></path><path d="M4 13h6c.55 0 1-.45 1-1V4c0-.55-.45-1-1-1H4c-.55 0-1 .45-1 1v8c0 .55.45 1 1 1zm0 8h6c.55 0 1-.45 1-1v-4c0-.55-.45-1-1-1H4c-.55 0-1 .45-1 1v4c0 .55.45 1 1 1zm10 0h6c.55 0 1-.45 1-1v-8c0-.55-.45-1-1-1h-6c-.55 0-1 .45-1 1v8c0 .55.45 1 1 1zM13 4v4c0 .55.45 1 1 1h6c.55 0 1-.45 1-1V4c0-.55-.45-1-1-1h-6c-.55 0-1 .45-1 1z" fill="#4687ba" class="color000000 svgShape"></path></svg>

src/assets/images/icons/family-id.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" id="identificationcard"><path fill="#4687ba" d="M0 6v13c0 1.103.897 2 2 2h20c1.103 0 2-.897 2-2V6" class="color2d98d4 svgShape"></path><path fill="#ff6699" d="M22 3H2a2 2 0 0 0-2 2v2h24V5a2 2 0 0 0-2-2z" class="color0377be svgShape"></path><path fill="#e6e7f9" d="M22 3H2C.897 3 0 3.897 0 5v.25c0-1.103.897-2 2-2h20c1.103 0 2 .897 2 2V5c0-1.103-.897-2-2-2z" opacity=".2" class="colorffffff svgShape"></path><path fill="#4687ba" d="M22 20.75H2c-1.103 0-2-.897-2-2V19c0 1.103.897 2 2 2h20c1.103 0 2-.897 2-2v-.25c0 1.103-.897 2-2 2z" opacity=".1" class="color010101 svgShape"></path><path fill="#e6e7f9" d="M13 17h8v1h-8zM13 14h8v1h-8zM13 11h8v1h-8z" class="colorffffff svgShape"></path><circle cx="7" cy="12" r="2" fill="#e6e7f9" class="colorffffff svgShape"></circle><path fill="#e6e7f9" d="M9.987 15.237C9.288 14.9 8.203 14.5 7 14.5s-2.288.4-2.987.737c-.625.3-1.013.9-1.013 1.566V18h8v-1.197c0-.665-.388-1.265-1.013-1.566z" class="colorffffff svgShape"></path><circle cx="17" cy="5" r="1" fill="#ff6699" class="color0a70b9 svgShape"></circle><path fill="#4687ba" d="M17 4.25a.99.99 0 0 1 .975.875C17.98 5.082 18 5.045 18 5a1 1 0 0 0-2 0c0 .044.02.082.025.125A.99.99 0 0 1 17 4.25z" opacity=".1" class="color010101 svgShape"></path><linearGradient id="a" x1="6.973" x2="21.55" y1="1.973" y2="16.55" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#010101" stop-opacity=".1" class="stopColor010101 svgShape"></stop><stop offset="1" stop-color="#010101" stop-opacity="0" class="stopColor010101 svgShape"></stop></linearGradient><path fill="url(#a)" d="M22 21c1.103 0 2-.897 2-2V7H0l14 14h8z"></path><circle cx="7" cy="5" r="1" fill="#ff6699" class="color0a70b9 svgShape"></circle><path fill="#4687ba" d="M7 4.25a.99.99 0 0 1 .975.875C7.98 5.082 8 5.045 8 5a1 1 0 0 0-2 0c0 .044.02.082.025.125A.99.99 0 0 1 7 4.25z" opacity=".1" class="color010101 svgShape"></path><linearGradient id="b" x1="-.708" x2="24.708" y1="6.074" y2="17.925" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffffff" stop-opacity=".2" class="stopColorffffff svgShape"></stop><stop offset="1" stop-color="#ffffff" stop-opacity="0" class="stopColorffffff svgShape"></stop></linearGradient><path fill="url(#b)" d="M22 3H2a2 2 0 0 0-2 2v14c0 1.103.897 2 2 2h20c1.103 0 2-.897 2-2V5a2 2 0 0 0-2-2z"></path></svg>

src/assets/images/icons/family-pin.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 128 128" viewBox="0 0 128 128" id="Pin"><path fill="#4687ba" d="M106,13.8L91.7,4.6C86.2,1,78.9,2,74.5,7L41.9,46.9c-9.1,0.4-17.9,3.3-25.4,8.7c-0.7,0.5-0.7,1.6,0.1,2.1
+				l10.2,6.6l0,0L46.4,77l-24,41.4c-1.2,2.1-0.7,4.9,1.4,6.3c2.2,1.6,5.2,1.1,6.7-1.1l28-38.8L78,97.5l0,0l10.2,6.6
+				c0.7,0.5,1.7,0.1,1.9-0.8c1.8-9,0.9-18.3-2.5-26.8l23.1-46C113.6,24.5,111.5,17.4,106,13.8z" class="color2d3e50 svgShape"></path></svg>

src/assets/images/icons/family.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" data-name="Layer 1" viewBox="0 0 32 32" id="Family"><path d="M26.305 22.723a4.972 4.972 0 0 0-3.176-8.71 9.917 9.917 0 0 0-3.438-2.292 6 6 0 1 0-7.382 0 9.917 9.917 0 0 0-3.438 2.292 4.972 4.972 0 0 0-3.171 8.71A8.005 8.005 0 0 0 1 30a1 1 0 0 0 2 0 6 6 0 0 1 12 0 1 1 0 0 0 2 0 6 6 0 0 1 12 0 1 1 0 0 0 2 0 8.005 8.005 0 0 0-4.695-7.277ZM26 19a3 3 0 1 1-3-3 3 3 0 0 1 3 3ZM12 7a4 4 0 1 1 4 4 4 4 0 0 1-4-4ZM6 19a3 3 0 1 1 3 3 3 3 0 0 1-3-3Zm10 7.136a8.04 8.04 0 0 0-3.695-3.413 4.949 4.949 0 0 0-1.05-8.16 7.984 7.984 0 0 1 9.49 0 4.949 4.949 0 0 0-1.05 8.16A8.04 8.04 0 0 0 16 26.136Z" fill="#4687ba" class="color000000 svgShape"></path></svg>

src/assets/images/icons/logout.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" id="Logout"><path d="M4,12a1,1,0,0,0,1,1h7.59l-2.3,2.29a1,1,0,0,0,0,1.42,1,1,0,0,0,1.42,0l4-4a1,1,0,0,0,.21-.33,1,1,0,0,0,0-.76,1,1,0,0,0-.21-.33l-4-4a1,1,0,1,0-1.42,1.42L12.59,11H5A1,1,0,0,0,4,12ZM17,2H7A3,3,0,0,0,4,5V8A1,1,0,0,0,6,8V5A1,1,0,0,1,7,4H17a1,1,0,0,1,1,1V19a1,1,0,0,1-1,1H7a1,1,0,0,1-1-1V16a1,1,0,0,0-2,0v3a3,3,0,0,0,3,3H17a3,3,0,0,0,3-3V5A3,3,0,0,0,17,2Z" fill="#e07c8a" class="color000000 svgShape"></path></svg>

src/assets/images/icons/market.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" data-name="Layer 1" viewBox="0 0 512 512" id="FindJobs"><path d="M499.22 437.51 433.68 372a23.19 23.19 0 0 0-26.63-4.41l-22.18-22.18A214.71 214.71 0 0 0 62.78 62.78a214.72 214.72 0 0 0 282.6 322.09l22.18 22.18a23.19 23.19 0 0 0 4.44 26.63l65.54 65.54a43.64 43.64 0 0 0 61.71-61.71ZM341.29 369l-.2.18A199.71 199.71 0 0 1 73.39 73.39a199.71 199.71 0 0 1 295.76 267.67l-.22.26q-6.18 7.5-13.14 14.47T341.29 369Zm15.71 6.26c3.21-2.86 6.36-5.8 9.42-8.86s6-6.21 8.86-9.42l20.29 20.3-18.27 18.27Zm131.61 113.35a28.65 28.65 0 0 1-40.49 0l-65.54-65.54a8.22 8.22 0 0 1 0-11.61l28.88-28.88a8.22 8.22 0 0 1 11.61 0l65.54 65.54a28.65 28.65 0 0 1 0 40.49ZM296.08 161h-31v-11.53A21.13 21.13 0 0 0 244 128.36h-58.8a21.13 21.13 0 0 0-21.11 21.11V161h-31a19.82 19.82 0 0 0-19.81 19.81V281a19.83 19.83 0 0 0 19.81 19.82h163A19.84 19.84 0 0 0 315.9 281V180.81A19.83 19.83 0 0 0 296.08 161Zm-117-11.53a6.12 6.12 0 0 1 6.11-6.11H244a6.12 6.12 0 0 1 6.11 6.11V161h-71ZM300.9 281a4.82 4.82 0 0 1-4.82 4.82h-163a4.82 4.82 0 0 1-4.81-4.82v-63.6l63.8 27.77v4.88a14.52 14.52 0 0 0 14.5 14.5h16a14.52 14.52 0 0 0 14.5-14.5v-4.88l63.83-27.77Zm-93.81-31.45v-15h15v15ZM300.9 201l-64.67 28.14a14.5 14.5 0 0 0-13.64-9.63h-16a14.52 14.52 0 0 0-13.59 9.67L128.29 201v-20.19a4.82 4.82 0 0 1 4.81-4.81h163a4.82 4.82 0 0 1 4.82 4.81Zm36.89-109.61c-67.93-67.93-178.47-67.93-246.4 0a174.23 174.23 0 0 0 246.4 246.4 174.23 174.23 0 0 0 0-246.4Zm-10.6 235.8a159.25 159.25 0 1 1 46.63-112.6 158.76 158.76 0 0 1-46.63 112.6Z" fill="#4687ba" class="color000000 svgShape"></path></svg>

src/assets/images/icons/my-task.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" viewBox="0 0 9362 9362" id="jobsact"><path d="M8967 8103l-423 0 0 -856 423 0c181,0 329,193 329,428l0 0c0,235 -148,428 -329,428zm-4636 0l4066 0 0 -856 -4066 0 0 856zm-139 0l-738 -327 -268 0c-43,0 -138,-45 -138,-101 0,-56 95,-101 138,-101l268 0 738 -327 0 428 0 428zm-3982 -8103l6388 0 210 0 0 210 0 809 -420 0 0 -600 -5969 0 0 8523 5969 0 0 -551 420 0 0 761 0 210 -210 0 -6388 0 -210 0 0 -210 0 -8942 0 -210 210 0zm6598 6523l0 436 -420 0 0 -436 420 0zm2554 -3158l0 2557c0,175 -143,317 -317,317l-5224 0c-174,0 -317,-142 -317,-317l0 -2557 2486 0 0 491c0,244 199,443 443,443 244,0 443,-199 443,-443l0 -491 2486 0zm-3843 -2062l1827 0c121,0 219,98 219,219l0 626 -340 0 0 -506 -1585 0 0 506 -340 0 0 -626c0,-121 99,-219 219,-219zm-1698 1011l5224 0c174,0 317,143 317,317l0 568 -2650 0 0 657c0,154 -126,279 -279,279l0 0c-154,0 -280,-125 -280,-279l0 -657 -2649 0 0 -568c0,-174 143,-317 317,-317zm2612 1387c74,0 134,60 134,134 0,74 -60,134 -134,134 -74,0 -134,-60 -134,-134 0,-74 60,-134 134,-134zm-4430 -2741l2801 0 0 420 -2801 0 0 -420zm-806 4786l2023 0 0 176c0,87 19,170 52,244l-2075 0 0 -420zm0 -3657l2366 0c-167,80 -292,235 -330,421l-2036 0 0 -421zm0 914l2023 0 0 421 -2023 0 0 -421zm0 914l2023 0 0 421 -2023 0 0 -421zm0 915l2023 0 0 420 -2023 0 0 -420zm0 1828l1371 0 0 421 -1371 0 0 -421z" fill="#4687ba" class="color000000 svgShape"></path></svg>

src/assets/images/icons/profile.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" id="Profile"><path fill="#ffffff" d="M108 124H20c-8.8 0-16-7.2-16-16V20c0-8.8 7.2-16 16-16h88c8.8 0 16 7.2 16 16v88c0 8.8-7.2 16-16 16z" class="colorffffff svgShape"></path><path fill="#d2d4d6" d="M4 18.1v21.2h120V18.1c0-7.8-6.3-14.1-14.1-14.1H18.1C10.3 4 4 10.3 4 18.1z" class="colord2d5d6 svgShape"></path><circle cx="20.5" cy="21.1" r="7.1" fill="#7bbaec" class="colorec7bb0 svgShape"></circle><circle cx="59.5" cy="21.1" r="7.1" fill="#4687ba" class="color82cfcd svgShape"></circle><path fill="#57636d" d="M59.5 29.1c-4.4 0-8.1-3.6-8.1-8.1 0-4.4 3.6-8.1 8.1-8.1 4.4 0 8.1 3.6 8.1 8.1-.1 4.5-3.7 8.1-8.1 8.1zm0-14.1c-3.3 0-6.1 2.7-6.1 6.1s2.7 6.1 6.1 6.1 6.1-2.7 6.1-6.1-2.8-6.1-6.1-6.1z" class="color6a576d svgShape"></path><circle cx="40" cy="21.1" r="7.1" fill="#7bbdf1" class="colorf1ed7b svgShape"></circle><path fill="#57636d" d="M20.5 29.1c-4.4 0-8.1-3.6-8.1-8.1 0-4.4 3.6-8.1 8.1-8.1 4.4 0 8.1 3.6 8.1 8.1s-3.6 8.1-8.1 8.1zm0-14.1c-3.3 0-6.1 2.7-6.1 6.1s2.7 6.1 6.1 6.1 6.1-2.7 6.1-6.1-2.7-6.1-6.1-6.1zm39 14.1c-4.4 0-8.1-3.6-8.1-8.1 0-4.4 3.6-8.1 8.1-8.1 4.4 0 8.1 3.6 8.1 8.1-.1 4.5-3.7 8.1-8.1 8.1zm0-14.1c-3.3 0-6.1 2.7-6.1 6.1s2.7 6.1 6.1 6.1 6.1-2.7 6.1-6.1-2.8-6.1-6.1-6.1zM40 29.1c-4.4 0-8.1-3.6-8.1-8.1 0-4.4 3.6-8.1 8.1-8.1s8.1 3.6 8.1 8.1-3.7 8.1-8.1 8.1zM40 15c-3.3 0-6.1 2.7-6.1 6.1s2.7 6.1 6.1 6.1 6.1-2.7 6.1-6.1S43.3 15 40 15zM4 38.3h120v2H4zM108 104.3H20c-.6 0-1-.4-1-1s.4-1 1-1h88c.6 0 1 .4 1 1s-.4 1-1 1zm-48-48H20c-.6 0-1-.4-1-1s.4-1 1-1h40c.6 0 1 .4 1 1s-.4 1-1 1zm0 16H20c-.6 0-1-.4-1-1s.4-1 1-1h40c.6 0 1 .4 1 1s-.4 1-1 1zm0 16H20c-.6 0-1-.4-1-1s.4-1 1-1h40c.6 0 1 .4 1 1s-.4 1-1 1z" class="color6a576d svgShape"></path><path fill="#57636d" d="M108 125H20c-9.4 0-17-7.6-17-17V20c0-9.4 7.6-17 17-17h88c9.4 0 17 7.6 17 17v88c0 9.4-7.6 17-17 17zM20 5C11.7 5 5 11.7 5 20v88c0 8.3 6.7 15 15 15h88c8.3 0 15-6.7 15-15V20c0-8.3-6.7-15-15-15H20z" class="color6a576d svgShape"></path><path fill="#ffffff" d="M108.9 28.1H79.6c-3.9 0-7.1-3.2-7.1-7.1 0-3.9 3.2-7.1 7.1-7.1h29.3c3.9 0 7.1 3.2 7.1 7.1 0 4-3.2 7.1-7.1 7.1z" class="colorffffff svgShape"></path><path fill="#57636d" d="M108.9 29.1H79.6c-4.4 0-8.1-3.6-8.1-8.1 0-4.4 3.6-8.1 8.1-8.1h29.3c4.4 0 8.1 3.6 8.1 8.1s-3.6 8.1-8.1 8.1zM79.6 15c-3.3 0-6.1 2.7-6.1 6.1s2.7 6.1 6.1 6.1h29.3c3.3 0 6.1-2.7 6.1-6.1s-2.7-6.1-6.1-6.1H79.6z" class="color6a576d svgShape"></path><path fill="#5587af" d="M76 55.3h32v32H76z" class="coloraf5655 svgShape"></path><path fill="#57636d" d="M104.8 88.3H79.2c-2.3 0-4.2-1.9-4.2-4.2V58.5c0-2.3 1.9-4.2 4.2-4.2h25.6c2.3 0 4.2 1.9 4.2 4.2v25.6c0 2.3-1.9 4.2-4.2 4.2zm-25.6-32c-1.2 0-2.2 1-2.2 2.2v25.6c0 1.2 1 2.2 2.2 2.2h25.6c1.2 0 2.2-1 2.2-2.2V58.5c0-1.2-1-2.2-2.2-2.2H79.2z" class="color6a576d svgShape"></path></svg>

src/components/AddJob/AddJob.jsx

@@ -1,67 +1,66 @@
-import React, { useState, useEffect } from "react";
-import { Link, useNavigate } from "react-router-dom";
+import { Field, Form, Formik } from "formik";
+import React, { useEffect, useState } from "react";
+import { useDispatch } from "react-redux";
+import * as Yup from "yup";
+import usersService from "../../services/UsersService";
+import { tableReload } from "../../store/TableReloads";
 import InputCom from "../Helpers/Inputs/InputCom";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
-import usersService from "../../services/UsersService";
-
-import { useSelector, useDispatch } from "react-redux";
-
-import { tableReload } from '../../store/TableReloads'
-
-import { Field, Form, Formik } from "formik";
-import * as Yup from "yup";
 
 const validationSchema = Yup.object().shape({
   country: Yup.string()
     .min(1, "Minimum 3 characters")
     .max(25, "Maximum 25 characters")
     .required("Country is required"),
-  price: Yup.number()
-    .typeError("you must specify a number")
+  price: Yup.string()
+    .typeError("Invalid number")
     .min(1, "Price must be greater than 0")
+    .test("no-e", "Invalid number", (value) => {
+      if (value && /\d+e/.test(value)) {
+        return false;
+      }
+      return true;
+    })
     .required("Price is required"),
   title: Yup.string()
-    .min(3, "Minimum 3 characters")
-    .max(100, "Maximum 25 characters")
+    .min(5, "Minimum 5 characters")
+    .max(149, "Maximum 149 characters")
     .required("Title is required"),
   description: Yup.string()
-    .min(3, "Minimum 3 characters")
-    .max(250, "Maximum 250 characters")
+    .min(5, "Minimum 5 characters")
+    .max(299, "Maximum 299 characters")
     .required("Description is required"),
   job_detail: Yup.string()
     .min(3, "Minimum 3 characters")
-    .max(250, "Maximum 250 characters")
+    .max(1440, "Maximum 1440 characters")
     .required("Details is required"),
   timeline_days: Yup.number()
     .typeError("you must specify a number")
     .min(1, "Price must be greater than 0")
     .required("Timeline is required"),
+  category: Yup.array().min(1, "Select at least one checkbox"),
 });
 
-function AddJob() {
+function AddJob({ popUpHandler, categories }) {
   const ApiCall = new usersService();
-  const navigate = useNavigate();
 
-  let dispatch = useDispatch()
+  let dispatch = useDispatch();
 
-  let { userDetails } = useSelector((state) => state.userDetails);
-
-  let [pageLoading, setPageLoading] = useState(true); // State used for knowing when the page is mounting
-
-  let [country, setCountry] = useState({
+  let [currency, setCurrency] = useState({
     loading: true,
     status: false,
-    data: [],
-  }); // To Hold the array of country getUserCountry returns
+    data: null,
+  }); // To Hold the array of currency getUserCurrency returns
 
   let initialValues = {
     // initial values for formik
-    country: userDetails.country,
+    country: "",
     price: "",
     title: "",
     description: "",
     job_detail: "",
     timeline_days: "",
+    category: [],
   };
 
   let [requestStatus, setRequestStatus] = useState({
@@ -70,30 +69,41 @@ function AddJob() {
     message: "",
   }); // Holds state when submit button is pressed
 
-  // FUNCTION TO GET COUNTRY
-  const getUserCountry = () => {
-    setCountry((prev) => ({ ...prev, loading: true }));
-    ApiCall.getSignupCountryData()
+  // FUNCTION TO GET Currency
+  const getUserCurrency = () => {
+    setCurrency((prev) => ({ ...prev, loading: true }));
+    ApiCall.getUserWallets()
       .then((res) => {
-        if (res.data.internal_return < 1) {
-          setCountry({ loading: false, status: true, data: [] });
+        if (res.data.internal_return < 0) {
+          setCurrency({ loading: false, status: true, data: [] });
           return;
         }
-        setCountry({
+
+        setCurrency({
           loading: false,
           status: true,
-          data: res.data.signup_country,
+          data: res.data.result_list,
         });
       })
       .catch((err) => {
-        setCountry({ loading: false, status: false, data: [] });
+        setCurrency({ loading: false, status: false, data: [] });
       });
   };
 
   // FUNCTION TO HANDLE ADD JOB FORM
   const handleAddJob = (values, helpers) => {
+    let reqData = {
+      country: values?.country,
+      price: Number(values.price) * 100,
+      title: values?.title,
+      description: values?.description,
+      job_detail: values?.job_detail,
+      timeline_days: values?.timeline_days,
+      category: values.category?.join("@"),
+    };
+
     setRequestStatus({ loading: true, status: false, message: "" });
-    ApiCall.jobManagerCreateJob(values)
+    ApiCall.jobManagerCreateJob(reqData)
       .then((res) => {
         if (res.data.internal_return < 1) {
           setRequestStatus({
@@ -101,6 +111,9 @@ function AddJob() {
             status: false,
             message: "Could not complete your request at the moment",
           });
+          setTimeout(() => {
+            popUpHandler();
+          }, 1500);
           return;
         }
         setRequestStatus({
@@ -109,15 +122,15 @@ function AddJob() {
           message: "Job Added Successfully",
         });
         setTimeout(() => {
-          dispatch(tableReload({type:'JOBTABLE'}))
-          navigate("/myjobs", { replace: true });
+          dispatch(tableReload({ type: "JOBTABLE" }));
+          popUpHandler();
         }, 1000);
       })
       .catch((err) => {
         setRequestStatus({
           loading: false,
           status: false,
-          message: "Opps! soemthing went wrong. Try Again",
+          message: "Opps! something went wrong. Try Again",
         });
       })
       .finally(() => {
@@ -128,17 +141,10 @@ function AddJob() {
   };
 
   useEffect(() => {
-    getUserCountry();
-    setPageLoading(false);
+    getUserCurrency();
   }, []);
 
-  return pageLoading.loading ? (
-    <div className="personal-info-tab w-full flex flex-col justify-between">
-      <div className="p-3">
-        <LoadingSpinner size="32" color="sky-blue" />
-      </div>
-    </div>
-  ) : (
+  return (
     <div className="add-job p-5 w-full bg-white rounded-md flex flex-col justify-between">
       <Formik
         initialValues={initialValues}
@@ -148,64 +154,44 @@ function AddJob() {
         {(props) => {
           return (
             <Form>
-              <h1 className="py-2 my-4 text-lg md:text-xl font-bold tracking-wide">
-                Create New Job
-              </h1>
               <div className="flex flex-col-reverse sm:flex-row">
                 <div className="fields w-full">
                   {/* inputs starts here */}
-                  {/* country */}
-                  <div className="xl:flex xl:space-x-7 mb-6">
+                  <div className="xl:flex xl:space-x-7 mb-[5px]">
                     <div className="field w-full mb-6 xl:mb-0">
-                      {/* <InputCom
-                          fieldClass="px-6 cursor-not-allowed"
-                          label="Country"
-                          labelClass='tracking-wide'
-                          inputBg = 'bg-slate-100'
-                          type="text"
-                          name="country"
-                          disable={true}
-                          value={country.loading ? 'loading' : country.data ? country.data : 'no country found!'}
-                          inputHandler={(e)=> setCountry((prev) => ({...prev, data:e.target.value}))}
-
-                      /> */}
                       <label
                         htmlFor="country"
-                        className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold block"
+                        className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold flex item-center gap-1"
                       >
-                        Country
+                        Currency
+                        {props.errors.country && props.touched.country && <span className="text-[12px] text-red-500">{props.errors.country}</span>}
                       </label>
                       <select
                         id="country"
                         name="country"
-                        disabled
                         value={props.values.country}
                         className={`input-field p-2 mt-3 rounded-md placeholder:text-base text-dark-gray dark:text-white w-full h-10 bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-none`}
                         onChange={props.handleChange}
                         onBlur={props.handleBlur}
                       >
-                        {country.loading ? (
+                        {currency.loading ? (
                           <option className="text-slate-500 text-lg" value="">
                             Loading...
                           </option>
-                        ) : country.data.length ? (
+                        ) : currency.data.length ? (
                           <>
                             <option className="text-slate-500 text-lg" value="">
-                              Select...
+                              Select a currency
                             </option>
-                            {country.data.map((item, index) => {
-                              if (item[0] == userDetails.country) {
-                                return (
-                                  <option
-                                    key={index}
-                                    className="text-slate-500 text-lg"
-                                    value={item[0]}
-                                  >
-                                    {item[1]}
-                                  </option>
-                                );
-                              }
-                            })}
+                            {currency.data?.map((item, index) => (
+                              <option
+                                key={index}
+                                className="text-slate-500 text-lg"
+                                value={item?.country}
+                              >
+                                {item?.description}
+                              </option>
+                            ))}
                           </>
                         ) : (
                           <option className="text-slate-500 text-lg" value="">
@@ -213,11 +199,6 @@ function AddJob() {
                           </option>
                         )}
                       </select>
-                      {props.errors.country && props.touched.country && (
-                        <p className="text-sm text-red-500">
-                          {props.errors.country}
-                        </p>
-                      )}
                     </div>
 
                     {/* Price */}
@@ -233,18 +214,13 @@ function AddJob() {
                         value={props.values.price}
                         inputHandler={props.handleChange}
                         blurHandler={props.handleBlur}
+                        error={props.errors.price && props.touched.price && props.errors.price}
                       />
-                      {props.errors.price && props.touched.price && (
-                        <p className="text-sm text-red-500">
-                          {props.errors.price}
-                        </p>
-                      )}
                     </div>
                   </div>
 
                   {/* Title  */}
-
-                  <div className="field w-full mb-6">
+                  <div className="field w-full mb-[5px]">
                     <InputCom
                       fieldClass="px-6"
                       label="Title"
@@ -252,20 +228,15 @@ function AddJob() {
                       inputBg="bg-slate-100"
                       type="text"
                       name="title"
-                      // placeholder="Enter Job Title"
                       value={props.values.title}
                       inputHandler={props.handleChange}
                       blurHandler={props.handleBlur}
+                      error={props.errors.title && props.touched.title && props.errors.title}
                     />
-                    {props.errors.title && props.touched.title && (
-                      <p className="text-sm text-red-500">
-                        {props.errors.title}
-                      </p>
-                    )}
                   </div>
 
                   {/* Description  */}
-                  <div className="field w-full mb-6">
+                  <div className="field w-full mb-[5px]">
                     <InputCom
                       fieldClass="px-6"
                       label="Description"
@@ -273,44 +244,71 @@ function AddJob() {
                       inputBg="bg-slate-100"
                       type="text"
                       name="description"
-                      // placeholder="Enter a description"
                       value={props.values.description}
                       inputHandler={props.handleChange}
                       blurHandler={props.handleBlur}
+                      error={props.errors.description && props.touched.description && props.errors.description}
                     />
-                    {props.errors.description && props.touched.description && (
-                      <p className="text-sm text-red-500">
-                        {props.errors.description}
-                      </p>
-                    )}
                   </div>
 
                   {/* Details */}
-                  <div className="field w-full mb-6">
-                    <label
-                      htmlFor="Job Delivery Details"
-                      className='className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold block"'
-                    >
-                      Job Delivery Details
-                    </label>
-                    <textarea
-                      id="Job Delivery Details"
-                      rows="7"
-                      className={`input-field p-6 mt-3 rounded-md placeholder:text-base text-dark-gray dark:text-white w-full h-full bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-none`}
-                      style={{ resize: "none" }}
-                      name="job_detail"
-                      value={props.values.job_detail}
-                      onChange={props.handleChange}
-                      onBlur={props.handleBlur}
-                    />
-                    {props.errors.job_detail && props.touched.job_detail && (
-                      <p className="text-sm text-red-500">
-                        {props.errors.job_detail}
-                      </p>
-                    )}
+                  <div className="field flex flex-col sm:flex-row w-full mb-[5px] gap-2">
+                    <div className="sm:w-[60%] w-full">
+                      <label
+                        htmlFor="Job Delivery Details"
+                        className='className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold flex items-center gap-1'
+                      >
+                        Job Delivery Details
+                        {props.errors.job_detail && props.touched.job_detail && <span className="text-[12px] text-red-500">{props.errors.job_detail}</span>}
+                      </label>
+                      <textarea
+                        id="Job Delivery Details"
+                        rows="5"
+                        className={`input-field px-3 py-2 placeholder:text-base text-dark-gray dark:text-white w-full h-[100px] bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-[#dce4e9] rounded-[10px]`}
+                        style={{ resize: "none" }}
+                        name="job_detail"
+                        value={props.values.job_detail}
+                        onChange={props.handleChange}
+                        onBlur={props.handleBlur}
+                      />
+                    </div>
+
+                    <div className="sm:w-[35%] w-full">
+                      <div
+                        htmlFor="Job Categories"
+                        className='className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold block"'
+                        id="checked-group"
+                      >
+                        Categories
+                      </div>
+                      <div
+                        className="sm:flex-col flex flex-wrap px-3 mt-3"
+                        role="group"
+                        aria-labelledby="checked-group"
+                      >
+                        {Object?.entries(categories).map(([key, value]) => (
+                          <label
+                            key={key}
+                            className="flex gap-1 w-full items-center"
+                          >
+                            <Field
+                              type="checkbox"
+                              name="category"
+                              value={key}
+                            />
+                            <span className="text-[13.975px]">{value}</span>
+                          </label>
+                        ))}
+                        <span className="h-5 text-sm italic text-[#cf3917]">
+                          {props.errors.category &&
+                            props.touched.category &&
+                            "please select a category"}
+                        </span>
+                      </div>
+                    </div>
                   </div>
 
-                  <div className="field w-full mb-6">
+                  <div className="field w-full mb-[5px]">
                     <div className={`flex items-center justify-between mb-2.5`}>
                       <label
                         className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold block"
@@ -326,7 +324,12 @@ function AddJob() {
                     <Field
                       component="select"
                       name="timeline_days"
-                      className="input-field p-2 mt-3 rounded-md placeholder:text-base text-dark-gray dark:text-white w-full h-10 bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-none"
+                      className={`input-field p-2 mt-3 rounded-md placeholder:text-base text-dark-gray dark:text-white w-full h-10 bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-none ${
+                        props.errors.timeline_days &&
+                        props.touched.timeline_days
+                          ? "border-[#ff0a0a63] shadow-red-500 border-[0.5px] animate-shake"
+                          : "border border-[#f5f8fa] dark:border-[#5e6278]"
+                      }`}
                       value={props.values.timeline_days}
                     >
                       <option value="">Select Duration</option>
@@ -339,12 +342,6 @@ function AddJob() {
                         </option>
                       ))}
                     </Field>
-                    {props.errors.timeline_days &&
-                      props.touched.timeline_days && (
-                        <p className="text-sm text-red-500">
-                          {props.errors.timeline_days}
-                        </p>
-                      )}
                   </div>
                   {/* inputs ends here */}
                 </div>
@@ -371,17 +368,20 @@ function AddJob() {
                   ))}
                 {/* End of error or success display */}
 
-                <div className="w-full h-[120px] border-t border-light-purple dark:border-[#5356fb29]  flex justify-end items-center">
+                <div className="w-full h-[70px] border-t border-light-purple dark:border-[#5356fb29]  flex justify-end items-center">
                   <div className="flex items-center space-x-4 mr-9">
-                    <Link
-                      to="/myjobs"
+                    <button
+                      type="button"
                       className="text-18 text-light-red tracking-wide "
                     >
-                      <span className="border-b dark:border-[#5356fb29]  border-light-red">
+                      <span
+                        className="border-b dark:border-[#5356fb29]  border-light-red"
+                        onClick={popUpHandler}
+                      >
                         {" "}
                         Cancel
                       </span>
-                    </Link>
+                    </button>
 
                     {requestStatus.loading ? (
                       <LoadingSpinner size="8" color="sky-blue" />

src/components/AuthPages/AuthLayout.jsx

@@ -4,12 +4,12 @@ import { Link } from "react-router-dom";
 export default function LoginLayout({ slogan, children }) {
   return (
     <div className={`layout-wrapper login`}>
-      <div className={`main-wrapper login-wrapper w-full h-screen overflow-y-auto p-2 sm:p-20`}>
+      <div className={`main-wrapper login-wrapper w-full h-screen overflow-y-auto p-2 sm:px-20 sm:py-5`}>
         <div className="w-full h-full">
           <div className="flex-1 flex justify-center items-center">
             {children && children}
           </div>
-          <div className="flex-1 flex justify-center items-center p-10">
+          <div className="flex-1 flex justify-center items-center px-10 pt-10">
             <div className="flex items-center">
             <a
                   href="https://www.wrenchboard.com/about-us"
@@ -37,9 +37,9 @@ export default function LoginLayout({ slogan, children }) {
                 </a>
             </div>
           </div>
-          <div className="flex-1 flex justify-center items-center p-10">
-            <p className="text-black text-[15px] px-2 font-medium flex items-center">
-             <span className="text-3xl mt-2 mr-1">©</span>  2023 - {" "}
+          <div className="flex-1 flex justify-center items-center px-10 py-1">
+            <p className="text-black text-[15px] px-2 font-medium flex items-center gap-1">
+              <span className="">&copy; {new Date().getFullYear()} -</span>
               <Link to="/" className="text-[#009ef7] ml-1">
                 WrenchBoard
               </Link>{" "}

src/components/AuthPages/AuthProfile/CollectionTab.jsx

@@ -43,7 +43,7 @@ export default function CollectionTab({ className, products }) {
               <DataIteration
                 datas={products}
                 startLength={process.env.REACT_APP_ZERO_STATE}
-                endLength={products.length}
+                endLength={products?.length}
               >
                 {({ datas }) => (
                   <CollectionCard key={datas.uniqKey} collectionData={datas} />

src/components/AuthPages/AuthProfile/CreateSaleSlider.jsx

@@ -42,7 +42,9 @@ export default function CreateSaleSlider({
       {/* heading */}
       <div className="flex justify-between items-center mb-6">
         <div>
-          <h1 className="text-26 font-bold   text-dark-gray dark:text-white">Create for Sell</h1>
+          <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
+            Create for Sell
+          </h1>
         </div>
         <div className="slider-btns flex space-x-4">
           <button onClick={nextHandler} type="button">
@@ -89,7 +91,7 @@ export default function CreateSaleSlider({
       <div className="trending-products relative w-full">
         <SliderCom selector={trendingSlider} settings={settings}>
           {products &&
-            products.length > 0 &&
+            products?.length > 0 &&
             products.map((item) => (
               <ProductCardStyleTwo
                 key={item.id}

src/components/AuthPages/AuthProfile/CreatedBidsSlider.jsx

@@ -49,7 +49,9 @@ export default function CreatedBidsSlider({
       {/* heading */}
       <div className="flex justify-between items-center mb-6">
         <div>
-          <h1 className="text-26 font-bold   text-dark-gray dark:text-white">Create for Bits</h1>
+          <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
+            Create for Bits
+          </h1>
         </div>
         <div className="slider-btns flex space-x-4">
           <button onClick={nextHandler} type="button">
@@ -96,7 +98,7 @@ export default function CreatedBidsSlider({
       <div className="trending-products relative w-full">
         <SliderCom selector={trendingSlider} settings={settings}>
           {products &&
-            products.length > 0 &&
+            products?.length > 0 &&
             products.map((item) => (
               <ProductCardStyleOne
                 key={item.id}

src/components/AuthPages/AuthProfile/OnSaleTab.jsx

@@ -43,7 +43,7 @@ export default function OnSaleTab({ className, products }) {
               <DataIteration
                 datas={products}
                 startLength={process.env.REACT_APP_ZERO_STATE}
-                endLength={products.length}
+                endLength={products?.length}
               >
                 {({ datas }) => (
                   <ProductCardStyleTwo key={datas.id} datas={datas} />

src/components/AuthPages/AuthProfile/OwnTab.jsx

@@ -43,7 +43,7 @@ export default function OwnTab({ className, products }) {
               <DataIteration
                 datas={products}
                 startLength={process.env.REACT_APP_ZERO_STATE}
-                endLength={products.length}
+                endLength={products?.length}
               >
                 {({ datas }) => (
                   <ProductCardStyleOne key={datas.id} datas={datas} />

src/components/AuthPages/AuthRedirect/Redirect.jsx

@@ -1,9 +1,11 @@
-import React, {useState, useEffect} from 'react'
-import { useLocation, useNavigate } from 'react-router-dom'
+import React, { useEffect } from 'react';
+import { useLocation, useNavigate } from 'react-router-dom';
+import usersService from '../../../services/UsersService';
 
 function Redirect() {
     const location = useLocation();
     const navigate = useNavigate();
+    const userApi = new usersService();
 
     const queryParams = new URLSearchParams(location?.search);
     const codeResponse = queryParams.get("code");
@@ -13,11 +15,40 @@ function Redirect() {
             navigate('/login', {replace: true})
             return
         }
-        console.log(codeResponse)
+        console.log(codeResponse);
+        /*
+        POST /token HTTP/1.1
+        Host: oauth2.googleapis.com
+        Content-Type: application/x-www-form-urlencoded
+
+        code=4/P7q7W91a-oMsCeLvIaQm6bTrgtp7&
+        client_id=your_client_id&
+        client_secret=your_client_secret&
+        redirect_uri=https%3A//oauth2.example.com/code&
+        grant_type=authorization_code
+        */
+        var reqData = {
+          auth_type: "GOOGLE",
+          code: codeResponse,
+          redirect_uri: process.env.REACT_APP_GOOGLE_REDIRECT_URL,
+        };
+        userApi
+          .authStart(reqData)
+          .then((res) => {
+            console.log(res.data);
+            if (res.status != 200 || res.internal_return < 0) {
+              return;
+            }
+            // "{"message":"Endpoint not found.","URI":"http:\/\/localhost:9083\/index.php\/en\/wrench\/api\/v1\/authstart"}[]"
+	    alert(JSON.stringify(res.data));
+          })
+          .catch((error) => {
+            console.log(error);
+          });
     },[])
   return (
     <div>Redirecting ... </div>
   )
 }
 
-export default Redirect
+export default Redirect

src/components/AuthPages/Login/index.jsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useLayoutEffect, useState } from "react";
 import { Link, useNavigate } from "react-router-dom";
 import linkedInLogo from "../../../assets/images/Linkedin.png";
 import appleLogo from "../../../assets/images/apple-black.svg";
@@ -17,11 +17,13 @@ import { updateUserDetails } from "../../../store/UserDetails";
 export default function Login() {
   const dispatch = useDispatch();
 
-  let [loginType, setLoginType] = useState({ full: true, family: false });
+  let [loginType, setLoginType] = useState('');
 
   const [checked, setValue] = useState(false);
   const [loginLoading, setLoginLoading] = useState(false);
 
+  const [showPassword, setShowPassword] = useState(false);
+
   //login error state
   const [loginError, setLoginError] = useState(false);
   // for the catch error
@@ -31,13 +33,19 @@ export default function Login() {
     setValue(!checked);
   };
 
+   // To Show and Hide Password
+   const togglePasswordVisibility = () => {
+    setShowPassword(!showPassword);
+  };
+
   //FUNCTION TO DETERMINE/CHANGE LOGIN COMPONENT
   const handleLoginType = ({ target: { name } }) => {
-    if (name == "full") {
-      setLoginType({ [name]: true, family: false });
-    } else if ((name = "family")) {
-      setLoginType({ [name]: false, family: true });
-    }
+    setLoginType(name);
+    let currentDate = new Date();
+    let expirationDate = new Date(currentDate.getTime() + (24 * 60 * 60 * 1000));
+    // Convert the expiration date to the appropriate format
+    let expirationDateString = expirationDate.toUTCString();
+    document.cookie = `loginType=${name}; expires=${expirationDateString}; path=/;`;
   };
 
   // email
@@ -68,7 +76,7 @@ export default function Login() {
       return;
     }
 
-    if (name == "loginfull") {
+    if (name == "full") {
       // Post Data Info for normal Login
       postData = {
         username: email,
@@ -77,7 +85,7 @@ export default function Login() {
         login_mode: 1100,
         action: 11025,
       };
-    } else if (name == "loginfamily") {
+    } else if (name == "family") {
       // Post Data Info for family Login
       postData = {
         username: email,
@@ -107,7 +115,7 @@ export default function Login() {
         localStorage.setItem("uid", `${res.data.uid}`);
         localStorage.setItem("session_token", `${res.data.session}`);
         // localStorage.setItem("session", `${res.data.session}`);
-        dispatch(updateUserDetails(res.data));
+        dispatch(updateUserDetails({...res.data, loggedIn:true}));
         setTimeout(() => {
           navigate("/", { replace: true });
           setLoginLoading(false);
@@ -127,25 +135,59 @@ export default function Login() {
   };
 
   const googleLogin = useGoogleLogin({
-    flow: 'auth-code',
-    ux_mode:'redirect',
+    flow: "auth-code",
+    ux_mode: "redirect",
     redirect_uri: process.env.REACT_APP_GOOGLE_REDIRECT_URL,
     onSuccess: async (codeResponse) => {
-      console.log(codeResponse);
+      console.log("GOOGLE LOGIN GOOD --- ", codeResponse);
     },
     onError: (errorResponse) => console.log(errorResponse),
   });
 
+  // In order to update the selected login type whenever the component renders
+  // useEffect(() => {
+      // Clear the loginType cookie if the user switches to loginfull
+      // document.cookie ="loginType=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;";
+  // }, []);
+
+  useLayoutEffect(()=>{ // checks the cookie in order to set the login type before components mounts
+    // if(document.cookie.includes("loginType=family")){
+    //   setLoginType('family')
+    // }else if(document.cookie.includes("loginType=full")){
+    //   setLoginType('full')
+    // }else{
+    //   setLoginType('full')
+    // }
+    function readCookie(cname) { // checks the cookie in order to set the login type before components mounts
+      let name = cname + "=";
+      let decoded_cookie = decodeURIComponent(document.cookie);
+      let carr = decoded_cookie.split(';');
+      for(let i=0; i<carr.length;i++){
+        let c = carr[i];
+        while(c.charAt(0)==' '){
+            c=c.substring(1);
+        }
+        if(c.indexOf(name) == 0) {
+            return c.substring(name.length, c.length);
+        }
+      }
+      return 'full'
+    }
+    let loginValue = readCookie('loginType')
+    setLoginType(loginValue)
+  },[])
+  
+
   useEffect(() => {
     setMail("");
     setPassword("");
-  }, [loginType.full, loginType.family]);
+  }, [loginType]);
 
   return (
     <>
       <AuthLayout slogan="Welcome to WrenchBoard">
         <div className="w-full">
-          <div className="mb-12">
+          <div className="mb-5">
             <Link to="#">
               <img
                 src={WrenchBoard}
@@ -154,7 +196,7 @@ export default function Login() {
               />
             </Link>
           </div>
-          <div className="content-wrapper login shadow-md w-full lg:max-w-[500px] mx-auto flex justify-center items-center xl:bg-white dark:bg-dark-white 2xl:w-[828px]  rounded-[0.475rem] sm:p-7 p-5">
+          <div className="content-wrapper login shadow-md w-full lg:max-w-[530px] mx-auto flex justify-center items-center xl:bg-white dark:bg-dark-white 2xl:w-[828px]  rounded-[0.475rem] sm:p-7 p-5">
             <div className="w-full">
               <div className="title-area flex flex-col justify-center items-center relative text-center mb-7">
                 {/* <h1 className="text-[#181c32] font-semibold dark:text-white mb-3 leading-[27.3px] text-[22.75px]">
@@ -172,11 +214,11 @@ export default function Login() {
               </div>
 
               {/* switch login component */}
-              <div className="flex justify-start items-end">
+              <div className="ml-7 flex justify-start items-center gap-3">
                 <button
                   name="full"
-                  className={`px-2 py-1 w-[100px] text-left h-[40px] text-lg font-bold text-[#4687ba] hover:text-[#009ef7] tracking-wide transition outline-none border-2 border-b-0 border-r-0 border-[#4687ba] ${
-                    loginType.full && "border-r-2 h-[45px]"
+                  className={`login-type-btn px-4 py-1 rounded-t-2xl ${
+                    loginType=='full' ? "bg-[#4687ba] border-[2px] border-[#4687ba] text-white" : "bg-white text-[#000] border-t-[2px]"
                   }`}
                   onClick={handleLoginType}
                 >
@@ -184,12 +226,12 @@ export default function Login() {
                 </button>
                 <button
                   name="family"
-                  className={`px-2 py-1 w-[100px] text-left h-[40px] text-lg font-bold text-[#4687ba] hover:text-[#009ef7] tracking-wide transition outline-none border-2 border-b-0 border-l-0 border-[#4687ba] ${
-                    loginType.family && "border-l-2 h-[45px]"
+                  className={`login-type-btn px-4 py-1 rounded-t-2xl ${
+                    loginType=='family' ? "bg-[#4687ba] border-[2px] border-[#4687ba] text-white" : "bg-white text-[#000] border-t-[2px]"
                   }`}
                   onClick={handleLoginType}
                 >
-                  Family
+                  Family Account
                 </button>
               </div>
 
@@ -197,16 +239,16 @@ export default function Login() {
 
               {/* for login component */}
               {
-                loginType.full ? (
+                loginType == 'full' ? (
                   //user login component
-                  <div className="p-2 input-area border-2 border-[#4687ba]">
+                  <div className="p-6 input-area login-area border-2 border-[#4687ba] rounded-2xl">
                     <div className="input-item mb-5">
                       <InputCom
                         labelClass="tracking-wider"
                         fieldClass="sm:px-6 px-2"
                         value={email}
                         inputHandler={handleEmail}
-                        placeholder="support@mermsemr.com"
+                        placeholder="Your Email"
                         label="Email"
                         name="email"
                         type="email"
@@ -223,8 +265,9 @@ export default function Login() {
                         placeholder="● ● ● ● ● ●"
                         label="Password"
                         name="password"
-                        type="password"
-                        iconName="password"
+                        type={showPassword ? "text" : "password"}
+                        onClick={togglePasswordVisibility}
+                        passIcon={showPassword ? "password" : "password"}
                         forgotPassword
                       />
                     </div>
@@ -248,7 +291,7 @@ export default function Login() {
                     <div className="signin-area mb-3.5">
                       <div className="flex justify-center">
                         <button
-                          name="loginfull"
+                          name="full"
                           onClick={doLogin}
                           type="button"
                           disabled={loginLoading}
@@ -287,18 +330,18 @@ export default function Login() {
                 ) : (
                   // END of user login compoenent
                   // family login compoenent
-                  <div className="p-2 input-area border-2 border-[#4687ba]">
+                  <div className="p-6 input-area login-area border-2 border-[#4687ba] rounded-2xl">
                     <div className="input-item mb-5">
                       <InputCom
                         labelClass="tracking-wider"
                         fieldClass="px-6"
                         value={email}
                         inputHandler={handleEmail}
-                        placeholder="support@mermsemr.com"
+                        placeholder="Account ID"
                         label="Username"
                         name="email"
                         type="email"
-                        iconName="message"
+                        iconName="family-id"
                       />
                     </div>
 
@@ -311,9 +354,9 @@ export default function Login() {
                         placeholder="● ● ● ● ● ●"
                         label="Pin"
                         name="password"
-                        type="password"
-                        iconName="password"
-                        // forgotPassword
+                        type={showPassword ? "text" : "password"}
+                        onClick={togglePasswordVisibility}
+                        passIcon={showPassword ? "family-pin" : "family-pin"}
                       />
                     </div>
                     {loginError && (
@@ -336,7 +379,7 @@ export default function Login() {
                     <div className="signin-area mb-1.5">
                       <div className="flex justify-center">
                         <button
-                          name="loginfamily"
+                          name="family"
                           onClick={doLogin}
                           disabled={loginLoading}
                           type="button"

src/components/AuthPages/SignUp/index.jsx

@@ -4,6 +4,7 @@ import facebookLogo from "../../../assets/images/facebook-4.svg";
 import WrenchBoard from "../../../assets/images/wrenchboard.png";
 import usersService from "../../../services/UsersService";
 import InputCom from "../../Helpers/Inputs/InputCom";
+import AuthLayout from "../AuthLayout";
 
 export default function SignUp() {
   const [signUpLoading, setSignUpLoading] = useState(false);
@@ -64,6 +65,19 @@ export default function SignUp() {
         last_name !== "" &&
         country !== ""
       ) {
+        //checks if email is a valid email address
+        let regEx = /^[^0-9][a-zA-Z0-9._%+-]+@[a-zA-Z]+(\.[a-zA-Z]+)+$/;
+        if (regEx.test(email) == false) {
+          setMsgError("Invalid Email");
+          return setTimeout(()=>{setMsgError("");},3000)
+        }
+
+        //checks if terms and condition is checked
+        if (!checked) {
+          setMsgError("Terms and condition required");
+          return setTimeout(()=>{setMsgError("");},3000)
+        }
+
         setSignUpLoading(true);
         const reqData = {
           country: country,
@@ -80,8 +94,8 @@ export default function SignUp() {
 
         if (res.status === 200) {
           const { data } = res;
-          if (data.status === -1 && data.acc === "DULPICATE") {
-            setMsgError("This account has been already created");
+          if (data && data.acc === "DULPICATE") {
+            setMsgError("Unable to use this username. Please try another username.");
             setSignUpLoading(false);
           }
           if (data && data.status === "1") {
@@ -108,216 +122,163 @@ export default function SignUp() {
 
   useEffect(() => {
     getCountryList();
-  });
+  }, []);
 
   return (
     <>
-      <div className="layout-wrapper login">
-        <div className="main-wrapper w-full xl:h-screen h-full xl:py-10 py-12 overflow-y-auto">
-          <div className=" h-full">
-            <div className="flex-1 flex justify-center items-center">
-              <div className="w-full">
-                <div className="mb-12">
-                  <Link to="#">
-                    <img
-                      src={WrenchBoard}
-                      alt="wrenchboard"
-                      className="h-10 mx-auto"
-                    />
+      <AuthLayout slogan="Welcome to WrenchBoard">
+        <div className="w-full">
+          <div className="mb-5">
+            <Link to="#">
+              <img
+                src={WrenchBoard}
+                alt="wrenchboard"
+                className="h-10 mx-auto"
+              />
+            </Link>
+          </div>
+          <div className="content-wrapper login relative shadow-md w-full lg:max-w-[530px] mx-auto flex justify-center items-center xl:bg-white dark:bg-dark-white 2xl:w-[828px]  rounded-[0.475rem] sm:p-7 p-5 mb-0">
+            <div>
+              <div className="title-area flex flex-col justify-center items-center relative text-center mb-7">
+                <h1 className="text-[#181c32] font-semibold dark:text-white mb-3 leading-[27.3px] text-[22.75px]">
+                  Create Account
+                </h1>
+                <span className="text-gray-400 font-medium text-[16.25px] leading-[24.375px]">
+                  Already have an account?{" "}
+                  <Link
+                    to="/login"
+                    className="font-semibold text-[#4687ba] hover:text-[#009ef7] transition"
+                  >
+                    Sign in here
                   </Link>
+                </span>
+              </div>
+              <div className="w-full flex items-center gap-2">
+                <div className="border-b border-[#eff2f5] max-w-[50%] w-full"></div>
+                <span className="text-[#b5b5c3] font-medium text-[0.7rem] w-[2%]">
+                  OR
+                </span>
+                <div className="border-b border-[#eff2f5] max-w-[50%] w-full"></div>
+              </div>
+              <div className="input-area">
+                <SelectOption
+                  label="Country"
+                  data={countries}
+                  name="country"
+                  value={formData.country}
+                  inputHandler={handleInputChange}
+                />
+                <div className="input-fl-name mb-5 sm:flex w-full sm:space-x-6 ">
+                  <div className="input-item sm:w-1/2 w-full mb-5 sm:mb-0">
+                    <InputCom
+                      fieldClass="px-6"
+                      placeholder="Firstname"
+                      label="First Name"
+                      name="first_name"
+                      type="text"
+                      value={formData.first_name}
+                      inputHandler={handleInputChange}
+                    />
+                  </div>
+                  <div className="input-item flex-1">
+                    <InputCom
+                      fieldClass="px-6"
+                      placeholder="Lastname"
+                      label="Last Name"
+                      name="last_name"
+                      type="text"
+                      value={formData.last_name}
+                      inputHandler={handleInputChange}
+                    />
+                  </div>
                 </div>
-                <div className="content-wrapper login shadow-md w-full lg:max-w-[600px] mx-auto flex justify-center items-center xl:bg-white dark:bg-dark-white 2xl:w-[828px]  rounded-[0.475rem] sm:p-7 p-5 mb-7">
-                  <div>
-                    <div className="title-area flex flex-col justify-center items-center relative text-center mb-7">
-                      <h1 className="text-[#181c32] font-semibold dark:text-white mb-3 leading-[27.3px] text-[22.75px]">
-                        Create Account
-                      </h1>
-                      <span className="text-gray-400 font-medium text-[16.25px] leading-[24.375px]">
-                        Already have an account?{" "}
-                        <Link
-                          to="/login"
-                          className="font-semibold text-[#4687ba] hover:text-[#009ef7] transition"
+                <div className="input-item mb-5">
+                  <InputCom
+                    fieldClass="px-6"
+                    placeholder="support@mermsemr.com"
+                    label="Email"
+                    name="email"
+                    type="email"
+                    value={formData.email}
+                    inputHandler={handleInputChange}
+                  />
+                </div>
+                <div className="input-item mb-5">
+                  <InputCom
+                    fieldClass="px-6"
+                    placeholder="● ● ● ● ● ●"
+                    label="Password"
+                    name="password"
+                    type={showPassword ? "text" : "password"}
+                    onClick={togglePasswordVisibility}
+                    passIcon={
+                      showPassword ? "show-password" : "hide-password"
+                    }
+                    value={formData.password}
+                    inputHandler={handleInputChange}
+                  />
+                </div>
+                {msgError && (
+                  <div className="p-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px]">
+                    {msgError}
+                  </div>
+                )}
+                <div className="forgot-password-area flex justify-between items-center mb-6">
+                  <div className="remember-checkbox flex items-center space-x-2.5">
+                    <button
+                      onClick={rememberMe}
+                      type="button"
+                      className="w-6 h-6 bg-[#4687ba] text-white flex justify-center items-center border border-light-gray rounded-[.45em]"
+                    >
+                      {checked && (
+                        <svg
+                          xmlns="http://www.w3.org/2000/svg"
+                          className="h-5 w-5"
+                          viewBox="0 0 20 20"
+                          fill="currentColor"
                         >
-                          Sign in here
-                        </Link>
-                      </span>
-                    </div>
+                          <path
+                            fillRule="evenodd"
+                            d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z"
+                            clipRule="evenodd"
+                          />
+                        </svg>
+                      )}
+                    </button>
+                    <span
+                      onClick={rememberMe}
+                      className="cursor-default text-dark-gray dark:text-white text-[15px]"
+                    >
+                      I agree with all
+                      <Link
+                        href="#"
+                        className="text-base text-[#4687ba] hover:text-[#009ef7] mx-1 inline-block"
+                      >
+                        terms and condition
+                      </Link>
+                    </span>
+                  </div>
+                </div>
+                <div className="signin-area mb-1">
+                  <div className="flex justify-center">
                     <button
                       type="button"
-                      className={`rounded-[0.475rem] w-full mb-6 text-[15px] h-[42px] font-semibold text-[#009ef7] hover:text-white flex justify-center bg-[#f1faff] hover:bg-[#009ef7] transition-all duration-300 items-center py-[0.8875rem] px-[1.8125rem]`}
+                      onClick={handleSignUp}
+                      className={`rounded-[0.475rem] mb-6 text-white flex justify-center bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center h-[42px] py-[0.8875rem] px-[1.81rem] text-[14.95px] btn-login`}
                     >
-                      <img
-                        className="mr-3 h-6"
-                        src={facebookLogo}
-                        alt="logo-icon(s)"
-                      />
-                      Sign in with Facebook
-                    </button>
-                    <div className="w-full flex items-center gap-2">
-                      <div className="border-b border-[#eff2f5] max-w-[50%] w-full"></div>
-                      <span className="text-[#b5b5c3] font-medium text-[0.7rem] w-[2%]">
-                        OR
-                      </span>
-                      <div className="border-b border-[#eff2f5] max-w-[50%] w-full"></div>
-                    </div>
-                    <div className="input-area">
-                      <SelectOption
-                        label="Country"
-                        data={countries}
-                        name="country"
-                        value={formData.country}
-                        inputHandler={handleInputChange}
-                      />
-                      <div className="input-fl-name mb-5 sm:flex w-full sm:space-x-6 ">
-                        <div className="input-item sm:w-1/2 w-full mb-5 sm:mb-0">
-                          <InputCom
-                            fieldClass="px-6"
-                            placeholder="Firstname"
-                            label="First Name"
-                            name="first_name"
-                            type="text"
-                            value={formData.first_name}
-                            inputHandler={handleInputChange}
-                          />
-                        </div>
-                        <div className="input-item flex-1">
-                          <InputCom
-                            fieldClass="px-6"
-                            placeholder="Lastname"
-                            label="Last Name"
-                            name="last_name"
-                            type="text"
-                            value={formData.last_name}
-                            inputHandler={handleInputChange}
-                          />
-                        </div>
-                      </div>
-                      <div className="input-item mb-5">
-                        <InputCom
-                          fieldClass="px-6"
-                          placeholder="support@mermsemr.com"
-                          label="Email"
-                          name="email"
-                          type="email"
-                          value={formData.email}
-                          inputHandler={handleInputChange}
-                        />
-                      </div>
-                      <div className="input-item mb-5">
-                        <InputCom
-                          fieldClass="px-6"
-                          placeholder="● ● ● ● ● ●"
-                          label="Password"
-                          name="password"
-                          type={showPassword ? "text" : "password"}
-                          onClick={togglePasswordVisibility}
-                          passIcon={
-                            showPassword ? "show-password" : "hide-password"
-                          }
-                          value={formData.password}
-                          inputHandler={handleInputChange}
-                        />
-                      </div>
-                      {msgError && (
-                        <div className="relative p-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px]">
-                          {msgError}
-                        </div>
+                      {signUpLoading ? (
+                        <div className="signup btn-loader"></div>
+                      ) : (
+                        <span>Sign Up</span>
                       )}
-                      <div className="forgot-password-area flex justify-between items-center mb-6">
-                        <div className="remember-checkbox flex items-center space-x-2.5">
-                          <button
-                            onClick={rememberMe}
-                            type="button"
-                            className="w-6 h-6 bg-[#4687ba] text-white flex justify-center items-center border border-light-gray rounded-[.45em]"
-                          >
-                            {checked && (
-                              <svg
-                                xmlns="http://www.w3.org/2000/svg"
-                                className="h-5 w-5"
-                                viewBox="0 0 20 20"
-                                fill="currentColor"
-                              >
-                                <path
-                                  fillRule="evenodd"
-                                  d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z"
-                                  clipRule="evenodd"
-                                />
-                              </svg>
-                            )}
-                          </button>
-                          <span
-                            onClick={rememberMe}
-                            className="cursor-default text-dark-gray dark:text-white text-[15px]"
-                          >
-                            I agree with all
-                            <Link
-                              href="#"
-                              className="text-base text-[#4687ba] hover:text-[#009ef7] mx-1 inline-block"
-                            >
-                              terms and condition
-                            </Link>
-                          </span>
-                        </div>
-                      </div>
-                      <div className="signin-area mb-1">
-                        <div className="flex justify-center">
-                          <button
-                            type="button"
-                            onClick={handleSignUp}
-                            className={`rounded-[0.475rem] mb-6 text-white flex justify-center bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center h-[42px] py-[0.8875rem] px-[1.81rem] text-[14.95px] btn-login`}
-                          >
-                            {signUpLoading ? (
-                              <div className="signup btn-loader"></div>
-                            ) : (
-                              <span>Sign Up</span>
-                            )}
-                          </button>
-                        </div>
-                      </div>
-                    </div>
+                    </button>
                   </div>
                 </div>
               </div>
             </div>
-            <div className="flex-1 flex justify-center items-center p-10">
-              <div className="flex items-center">
-                <a
-                  href="https://www.wrenchboard.com/about-us"
-                  className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]"
-                  target="_blank"
-                  rel="noreferrer"
-                >
-                  About
-                </a>
-                <a
-                  href="https://www.wrenchboard.com/service"
-                  className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]"
-                  target="_blank"
-                  rel="noreferrer"
-                >
-                  Services
-                </a>
-                <a
-                  href="https://www.wrenchboard.com/contact"
-                  className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]"
-                  target="_blank"
-                  rel="noreferrer"
-                >
-                  Contact Us
-                </a>
-              </div>
-            </div>
-            <div className="flex-1 flex justify-center items-center p-10">
-              <p className="text-black text-[15px] px-2 font-medium flex items-center">
-                <span className="text-3xl mt-2 mr-1">©</span> 2023 -{" "}
-                <Link to="/" className="text-[#009ef7] ml-1">
-                  WrenchBoard
-                </Link>{" "}
-              </p>
-            </div>
           </div>
         </div>
-      </div>
+      </AuthLayout>
     </>
   );
 }
@@ -343,7 +304,7 @@ const SelectOption = ({
         <select
           name={name}
           id={name}
-          className="input-wrapper border border-[#f5f8fa]] dark:border-[#5e6278] w-full rounded-[0.475rem] h-[42px] overflow-hidden relative font-medium leading-6 bg-clip-padding text-[#5e6278] dark:text-gray-100 bg-[#f5f8fa] dark:bg-[#5e6278] text-base focus-visible:border-transparent focus-visible:outline-0 focus-visible:ring-transparent "
+          className="input-wrapper border border-[#f5f8fa] dark:border-[#5e6278] w-full rounded-full h-[42px] overflow-hidden relative font-medium leading-6 bg-clip-padding text-[#5e6278] dark:text-gray-100 bg-[#f5f8fa] dark:bg-[#5e6278] text-base focus-visible:border-transparent focus-visible:outline-0 focus-visible:ring-transparent "
           onChange={inputHandler}
           value={value}
         >

src/components/AuthPages/UserProfile/CollectionTab.jsx

@@ -43,7 +43,7 @@ export default function CollectionTab({ className, products }) {
               <DataIteration
                 datas={products}
                 startLength={process.env.REACT_APP_ZERO_STATE}
-                endLength={products.length}
+                endLength={products?.length}
               >
                 {({ datas }) => (
                   <CollectionCard key={datas.uniqKey} collectionData={datas} />

src/components/AuthPages/UserProfile/CreateSaleSlider.jsx

@@ -42,7 +42,9 @@ export default function CreateSaleSlider({
       {/* heading */}
       <div className="flex justify-between items-center mb-6">
         <div>
-          <h1 className="text-26 font-bold   text-dark-gray dark:text-white">Create for Sell</h1>
+          <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
+            Create for Sell
+          </h1>
         </div>
         <div className="slider-btns flex space-x-4">
           <button onClick={nextHandler} type="button">
@@ -89,7 +91,7 @@ export default function CreateSaleSlider({
       <div className="trending-products relative w-full">
         <SliderCom selector={trendingSlider} settings={settings}>
           {products &&
-            products.length > 0 &&
+            products?.length > 0 &&
             products.map((item) => (
               <ProductCardStyleTwo
                 key={item.id}

src/components/AuthPages/UserProfile/CreatedBidsSlider.jsx

@@ -49,7 +49,9 @@ export default function CreatedBidsSlider({
       {/* heading */}
       <div className="flex justify-between items-center mb-6">
         <div>
-          <h1 className="text-26 font-bold   text-dark-gray dark:text-white">Create for Bits</h1>
+          <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
+            Create for Bits
+          </h1>
         </div>
         <div className="slider-btns flex space-x-4">
           <button onClick={nextHandler} type="button">
@@ -96,7 +98,7 @@ export default function CreatedBidsSlider({
       <div className="trending-products relative w-full">
         <SliderCom selector={trendingSlider} settings={settings}>
           {products &&
-            products.length > 0 &&
+            products?.length > 0 &&
             products.map((item) => (
               <ProductCardStyleOne
                 key={item.id}

src/components/AuthPages/UserProfile/OnSaleTab.jsx

@@ -43,7 +43,7 @@ export default function OnSaleTab({ className, products }) {
               <DataIteration
                 datas={products}
                 startLength={process.env.REACT_APP_ZERO_STATE}
-                endLength={products.length}
+                endLength={products?.length}
               >
                 {({ datas }) => (
                   <ProductCardStyleTwo key={datas.id} datas={datas} />

src/components/AuthPages/UserProfile/OwnTab.jsx

@@ -43,7 +43,7 @@ export default function OwnTab({ className, products }) {
               <DataIteration
                 datas={products}
                 startLength={process.env.REACT_APP_ZERO_STATE}
-                endLength={products.length}
+                endLength={products?.length}
               >
                 {({ datas }) => (
                   <ProductCardStyleOne key={datas.id} datas={datas} />

src/components/AuthPages/VerifyLink/index.jsx

@@ -86,11 +86,15 @@ export default function VerifyLink() {
       const verifyRes = await userApi.verifyEmail(code);
       if (verifyRes.status === 200) {
         let { data } = verifyRes;
-
+        console.log('TESTING VERIFY',data)
         if (
           data &&
-          data.internal_return >= 0 &&
-          data.status_text === "Link Verfied"
+          data.internal_return >= 0 && 
+          data.status == 0 && 
+          data.pending_id != '' && 
+          data.pending_uid != '' && 
+          data.username != '' &&
+          data.status_text === "Link Verified"
         ) {
           setPageLoader(false);
         } else {

src/components/Cards/AvailableJobsCard.jsx

@@ -1,152 +1,213 @@
-import React, { useCallback, useEffect, useMemo, useState } from "react";
-import { Link, useNavigate,  } from "react-router-dom";
-import { toast } from "react-toastify";
-import localImgLoad from "../../lib/localImgLoad";
-import Icons from "../Helpers/Icons";
+import { useCallback, useEffect, useMemo, useState } from "react";
+import { Link, useNavigate } from "react-router-dom";
 import MarketPopUp from "../MarketPlace/PopUp/MarketPopUp";
 import usersService from "../../services/UsersService";
+import { PriceFormatter } from "../Helpers/PriceFormatter";
+import dataImage2 from "../../assets/images/data-table-user-2.png";
 
 export default function AvailableJobsCard({
   className,
   datas,
   hidden = false,
+  contentDisplay,
 }) {
   //debugger;
-  const [addFavorite, setValue] = useState(datas.whishlisted);
   const [marketPopUp, setMarketPopUp] = useState({ show: false, data: {} });
-  const [manageInt, setManageInt] = useState(null)
+  const [imageUrl, setImageUrl] = useState("");
 
-  const navigate = useNavigate();
-  const apiCall = useMemo(() => new usersService(), []);
-
-
-  const favoriteHandler = () => {
-    if (!addFavorite) {
-      setValue(true);
-      toast.success("Added to Favorite List");
-    } else {
-      setValue(false);
-      toast.warn("Remove to Favorite List");
-    }
-  };
-
-  const marketInterestData = useCallback(async() => {
-    let { offer_code } = datas;
-    let reqData = { offer_code };
-
-    try {
-      const manageInt = await apiCall.MarketInterest(reqData);
-      const manageIntRes = await manageInt?.data;
-      setManageInt(manageIntRes)
-    } catch (error) {
-      throw new Error(error)
-    }
-
-  }, [])
+  let thePrice = PriceFormatter(
+    datas?.price * 0.01,
+    datas?.currency_code,
+    datas?.currency
+  );
 
   useEffect(() => {
-    if (!datas) {
-      navigate("/market", { replace: true });
-    }
-    marketInterestData()
-  }, [marketInterestData, datas])
+    const imagePath = require(`../../assets/images/${datas.thumbnil}`); // Replace with your directory path for local images
+    setImageUrl(imagePath);
+  }, []);
   return (
     <>
-      <div
-        className={`card-style-two w-full h-[426px] p-[20px] bg-white dark:bg-dark-white   rounded-2xl section-shadow ${
-          className || ""
-        }`}
-      >
-        <div className="flex flex-col justify-between w-full h-full">
-          <Link to="/shop-details" className="mb-2.5">
+      {contentDisplay == "grid" ? (
+        <div
+          className={`card-style-two w-full h-[426px] p-[20px] bg-white dark:bg-dark-white   rounded-2xl section-shadow ${
+            className || ""
+          }`}
+        >
+          <div
+            onClick={() => {
+              setMarketPopUp({ show: true, data: datas });
+            }}
+            className="flex flex-col justify-between w-full h-full"
+          >
             <h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
               {datas.title}
             </h1>
-          </Link>
 
-          <div className="card-two-info flex justify-between items-center">
-            <div className="owned-by flex space-x-2 items-center">
-              <div>
-                <p className="text-thin-light-gray text-sm leading-3">Added</p>
-                <p className="text-base   text-dark-gray dark:text-white">
-                  {datas.offer_added}
-                </p>
-              </div>
-            </div>
-            <div className="w-[1px] bg-light-purple dark:bg-dark-light-purple  h-7"></div>
-            <div className="created-by flex space-x-2 items-center flex-row-reverse">
-              <div>
-                <p className="text-thin-light-gray text-sm leading-3 text-right">
-                  Expires
-                </p>
-                <p className="text-base text-dark-gray dark:text-white text-right">
-                  {datas.expire}
-                </p>
-              </div>
-            </div>
-          </div>
-          <div className="thumbnail-area w-full">
-            <div
-              className="w-full h-[236px] p-6  rounded-xl overflow-hidden"
-              style={{
-                background: `url(${localImgLoad(
-                  `images/${datas.thumbnil}`
-                )}) 0% 0% / cover no-repeat`,
-              }}
-            >
-              <div className="flex justify-center">{datas.description}</div>
-            </div>
-          </div>
-          <div className="details-area">
-            <div className="product-two-options flex justify-between mb-5 relative">
-              {/*      <div className="status">*/}
-              {/*          {datas.isActive && (*/}
-              {/*              <span className="text-xs px-3 py-1.5 tracking-wide rounded-full bg-gold text-white">*/}
-              {/*  Active*/}
-              {/*</span>*/}
-              {/*          )}*/}
-              {/*      </div>*/}
-
-              {/*<div className=" review flex space-x-2">*/}
-              {/*    <button*/}
-              {/*        onClick={favoriteHandler}*/}
-              {/*        type="button"*/}
-              {/*        className={`w-7 h-7 bg-white    rounded-full flex justify-center items-center  ${*/}
-              {/*            addFavorite ? "text-red-500" : "text-thin-light-gray"*/}
-              {/*        }`}*/}
-              {/*    >*/}
-              {/*        <Icons name="star" />*/}
-              {/*    </button>*/}
-              {/*</div>*/}
-            </div>
-
-            <div className="flex justify-between">
-              <div className="flex items-center space-x-2">
+            <div className="card-two-info flex justify-between items-center">
+              <div className="owned-by flex space-x-2 items-center">
                 <div>
-                  <p className="font-bold text-xl tracking-wide line-clamp-1   text-dark-gray dark:text-white">
-                    {datas.price * 0.01}
-                    {datas.currency} | {datas.timeline_days} day(s)
+                  <p className="text-thin-light-gray text-sm leading-3">
+                    Added
                   </p>
-                  <p className="text-sm text-lighter-gray">
-                    ( {datas.offer_code})
+                  <p className="text-base   text-dark-gray dark:text-white">
+                    {datas.offer_added}
                   </p>
                 </div>
               </div>
-              <div>
-                <button
-                  type="button"
-                  className="px-4 py-2.5 text-white text-sm bg-pink rounded-full tracking-wide"
-                  onClick={() => {
-                    setMarketPopUp({show: true, data: datas})
-                  }}
-                >
-                  View
-                </button>
+              <div className="w-[1px] bg-light-purple dark:bg-dark-light-purple  h-7"></div>
+              <div className="created-by flex space-x-2 items-center flex-row-reverse">
+                <div>
+                  <p className="text-thin-light-gray text-sm leading-3 text-right">
+                    Expires
+                  </p>
+                  <p className="text-base text-dark-gray dark:text-white text-right">
+                    {datas.expire}
+                  </p>
+                </div>
+              </div>
+            </div>
+            <div className="thumbnail-area w-full">
+              <div
+                className="w-full h-[236px] p-6  rounded-xl overflow-hidden bg-center bg-cover bg-no-repeat"
+                style={{
+                  backgroundImage: `url('${imageUrl}')`,
+                }}
+              >
+                <div className="flex justify-center">{datas.description}</div>
+              </div>
+            </div>
+            <div className="details-area">
+              <div className="product-two-options flex justify-between mb-5 relative">
+                {/*      <div className="status">*/}
+                {/*          {datas.isActive && (*/}
+                {/*              <span className="text-xs px-3 py-1.5 tracking-wide rounded-full bg-gold text-white">*/}
+                {/*  Active*/}
+                {/*</span>*/}
+                {/*          )}*/}
+                {/*      </div>*/}
+
+                {/*<div className=" review flex space-x-2">*/}
+                {/*    <button*/}
+                {/*        onClick={favoriteHandler}*/}
+                {/*        type="button"*/}
+                {/*        className={`w-7 h-7 bg-white    rounded-full flex justify-center items-center  ${*/}
+                {/*            addFavorite ? "text-red-500" : "text-thin-light-gray"*/}
+                {/*        }`}*/}
+                {/*    >*/}
+                {/*        <Icons name="star" />*/}
+                {/*    </button>*/}
+                {/*</div>*/}
+              </div>
+
+              <div className="flex justify-between">
+                <div className="flex items-center space-x-2">
+                  <div>
+                    <p className="font-bold text-xl tracking-wide line-clamp-1   text-dark-gray dark:text-white">
+                      {/* {thePrice} | {datas.timeline_days} day(s) */}
+                      {thePrice}
+                    </p>
+                    <p className="text-sm text-lighter-gray">
+                      ( {datas.offer_code}) |
+                      <span className="italic ml-1">
+                        {datas.timeline_days} day(s)
+                      </span>
+                    </p>
+                  </div>
+                </div>
+                <div>
+                  <button
+                    type="button"
+                    className="px-4 py-2.5 text-white text-sm bg-pink rounded-full tracking-wide"
+                    onClick={() => {
+                      setMarketPopUp({ show: true, data: datas });
+                    }}
+                  >
+                    View
+                  </button>
+                </div>
               </div>
             </div>
           </div>
         </div>
-      </div>
+      ) : (
+        <div className="card-style-two w-full p-8 my-2 flex items-center gap-4 bg-white dark:bg-dark-white rounded-2xl section-shadow">
+          <div className="flex gap-5 items-center w-full">
+            <div className="w-full h-[60px] rounded-full overflow-hidden flex justify-center items-center flex-[0.1] min-w-[60px] max-w-[60px]">
+              <img src={dataImage2} alt="data" className="w-full h-full" />
+            </div>
+            <div className="flex flex-col flex-[0.9]">
+              <h1
+                onClick={() => {
+                  setMarketPopUp({ show: true, data: datas });
+                }}
+                className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize"
+              >
+                {datas?.title}
+              </h1>
+
+              <div
+                onClick={() => {
+                  setMarketPopUp({ show: true, data: datas });
+                }}
+                className="my-2"
+              >
+                <p className="text-dark-gray dark:text-white">
+                  {datas?.description}
+                </p>
+              </div>
+
+              {/* <div className="card-two-info flex gap-2 items-center">
+              <div className="owned-by flex space-x-2 items-center">
+                <div>
+                  <p className="text-thin-light-gray text-sm leading-3">Added</p>
+                  <p className="text-base   text-dark-gray dark:text-white">
+                    {datas.offer_added}
+                  </p>
+                </div>
+              </div>
+              <div className="w-[1px] bg-light-purple dark:bg-dark-light-purple  h-7"></div>
+              <div className="created-by flex space-x-2 items-center flex-row-reverse">
+                <div>
+                  <p className="text-thin-light-gray text-sm leading-3 text-right">
+                    Expires
+                  </p>
+                  <p className="text-base text-dark-gray dark:text-white text-right">
+                    {datas.expire}
+                  </p>
+                </div>
+              </div>
+            </div> */}
+              <div className="block sm:flex flex-wrap gap-4">
+                <p className="text-sm text-thin-light-gray flex flext-start gap-1">
+                  Price: <span className="text-purple">{thePrice}</span>
+                </p>
+                <p className="text-sm text-thin-light-gray">
+                  Duration:{" "}
+                  <span className="text-purple italic">
+                    {" "}
+                    {datas?.timeline_days} day(s)
+                  </span>
+                </p>
+                <p className="text-sm text-thin-light-gray">
+                  Code:{" "}
+                  <span className="text-purple"> {datas?.offer_code}</span>
+                </p>
+              </div>
+            </div>
+          </div>
+          <div className="">
+            <button
+              type="button"
+              className="px-4 py-2.5 text-white text-sm bg-pink rounded-full tracking-wide"
+              onClick={() => {
+                setMarketPopUp({ show: true, data: datas });
+              }}
+            >
+              View
+            </button>
+          </div>
+        </div>
+      )}
       {marketPopUp.show && (
         <MarketPopUp
           details={datas}
@@ -154,7 +215,6 @@ export default function AvailableJobsCard({
             setMarketPopUp({ show: false, data: {} });
           }}
           situation={marketPopUp.show}
-          marketInt={manageInt}
         />
       )}
     </>

src/components/Cards/FamilyActiveJobsCard.jsx

@@ -0,0 +1,119 @@
+import { useState } from "react";
+import { Link, useLocation } from "react-router-dom";
+import { toast } from "react-toastify";
+import localImgLoad from "../../lib/localImgLoad";
+import CountDown from "../Helpers/CountDown";
+import Icons from "../Helpers/Icons";
+
+export default function FamilyActiveJobsCard({ datas, hidden = false }) {
+
+    let { pathname } = useLocation();
+
+    const [imageUrl, setImageUrl] = useState("");
+    const [addFavorite, setValue] = useState(false);
+    const [options, setOption] = useState(false);
+    const favoriteHandler = () => {
+        if (!addFavorite) {
+            setValue(true);
+            toast.success("Added to Favorite List");
+        } else {
+            setValue(false);
+            toast.warn("Remove to Favorite List");
+        }
+    };
+
+    return (
+        <div className="card-style-one flex flex-col justify-between w-full h-[387px] bg-white dark:bg-dark-white   p-3 pb rounded-2xl">
+            <div className="content">
+                {/* thumbnail */}
+                <div className="w-full h-40">
+                    {/* thumbnail image */}
+                    <div
+                        className="thumbnail w-full h-full rounded-xl overflow-hidden px-4 pt-4"
+                        style={{
+                            background: `url(${localImgLoad(
+                                `images/taskbanners/${datas.banner}`
+                            )}) center / contain no-repeat`,
+                        }}
+                    >
+              {/*          <div className="product-options flex justify-between relative">*/}
+              {/*<span*/}
+              {/*    onClick={favoriteHandler}*/}
+              {/*    className={`w-7 h-7 bg-white   rounded-full flex justify-center items-center  cursor-pointer ${*/}
+              {/*        addFavorite ? "text-pink" : "  text-dark-gray"*/}
+              {/*    }`}*/}
+              {/*>*/}
+              {/*  <Icons name="love" />*/}
+              {/*</span>*/}
+              {/*              <span*/}
+              {/*                  onClick={() => setOption(!options)}*/}
+              {/*                  className="w-7 h-7 flex justify-center items-center bg-white  rounded-full cursor-pointer"*/}
+              {/*              >*/}
+              {/*  <Icons name="dots" />*/}
+              {/*</span>*/}
+              {/*              {options && (*/}
+              {/*                  <div*/}
+              {/*                      onClick={() => setOption(!options)}*/}
+              {/*                      className="w-full h-screen fixed top-0 left-0 z-10"*/}
+              {/*                  ></div>*/}
+              {/*              )}*/}
+              {/*              <div*/}
+              {/*                  style={{ boxShadow: "0px 4px 87px 0px #0000002B" }}*/}
+              {/*                  className={`drop-down-content w-[80px] bg-white dark:bg-dark-white   rounded-[4px] p-2.5 absolute right-0 top-[100%] z-20 ${*/}
+              {/*                      options ? "active" : ""*/}
+              {/*                  }`}*/}
+              {/*              >*/}
+
+              {/*              </div>*/}
+              {/*          </div>*/}
+                        {hidden && (
+                            <div className="flex justify-center">
+
+                            </div>
+                        )}
+                    </div>
+                </div>
+                {/* details */}
+                <div className="details">
+                    {/* product title */}
+                    <Link
+                        to="/manage-active-job"
+                        state={{ ...datas, pathname }}
+                        className="text-xl font-bold text-dark-gray dark:text-white mb-2 capitalize line-clamp-1"
+                    >
+                        {datas.title}
+                    </Link>
+                    {/* countdown */}
+                    <div className="w-full h-[54px] flex justify-evenly items-center p-2 rounded-lg border border-[#E3E4FE] dark:border-[#a7a9b533] ">
+                        <div className="flex flex-col justify-between">
+                            <p className="text-sm text-thin-light-gray dark:text-white tracking-wide">
+                                Task Code
+                            </p>
+                            <p className="text-base font-bold tracking-wide   text-dark-gray dark:text-white">
+                                {datas.contract}
+                            </p>
+                        </div>
+                        <div className="w-[1px] h-full bg-[#E3E4FE] dark:bg-[#a7a9b533] "></div>
+                        <div className="flex flex-col justify-between">
+                            <p className="text-sm text-thin-light-gray dark:text-white tracking-wide">
+                                Remaining Time
+                            </p>
+                            <p className="text-base font-bold tracking-wide   text-dark-gray dark:text-white">
+                                <CountDown lastDate={datas.delivery_date} />
+                            </p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div className="card-buttons flex justify-end items-center space-x-2">
+                <Link
+                    to="/manage-active-job"
+                    state={{ ...datas, pathname }}
+                    className="btn-shine w-[98px] h-[33px] text-white rounded-full text-sm bg-pink flex justify-center items-center"
+                >
+                    View
+                </Link>
+            </div>
+        </div>
+    );
+}

src/components/Cards/FamilyMarketCard.jsx

@@ -0,0 +1,78 @@
+import { useState } from "react";
+import SuggestTask from "../FamilyPopup/SuggestTask";
+
+export default function FamilyMarketCard({ className, datas, hidden = false }) {
+  // debugger;
+  const [popUp, setPopUp] = useState(false);
+  const popUpHandler = () => {
+    setPopUp((prev) => !prev);
+  };
+  //   Image
+  let selectedImage = require(`../../assets/images/family/${
+    datas.banner || "default.jpg"
+  }`);
+
+  return (
+    <>
+      <div
+        className={`card-style-two w-full h-[336px] p-[20px] bg-white dark:bg-dark-white   rounded-2xl section-shadow ${
+          className || ""
+        }`}
+        key={datas?.uid}
+      >
+        <div className="flex flex-col justify-between w-full h-full">
+          <div className="thumbnail-area w-full">
+            <div
+              className="w-full h-[236px] p-6  rounded-xl overflow-hidden"
+              onClick={popUpHandler}
+              style={{
+                // background: `url(${selectedImage}) 0% 0% / cover no-repeat`,
+                background: `url(${selectedImage}) center / contain no-repeat`,
+              }}
+            >
+              <div className="product-two-options flex justify-between mb-5 relative">
+                <div className="status">
+                  {/* <span className="text-xs px-3 py-1.5 tracking-wide rounded-full bg-gold text-white">
+                    Active
+                  </span> */}
+                </div>
+              </div>
+              {hidden && <div className="flex justify-center"></div>}
+            </div>
+          </div>
+          <div className="details-area mt-12 flex justify-between items-center gap-2">
+            {/* title */}
+            <button onClick={popUpHandler}>
+              <h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
+                {datas?.title}
+              </h1>
+            </button>
+            <div className="flex justify-between">
+              {/* <div className="flex items-center space-x-2">
+                <p className="italic text-gray-400">
+                  {getTimeAgo(datas?.added)}
+                </p>
+              </div> */}
+              <div>
+                <button
+                  type="button"
+                  onClick={popUpHandler}
+                  className="px-4 py-2.5 text-white text-sm bg-pink rounded-full tracking-wide"
+                >
+                  View
+                </button>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      {popUp && (
+        <SuggestTask
+          onClose={popUpHandler}
+          situation={popUp}
+          details={{ ...datas, selectedImage }}
+        />
+      )}
+    </>
+  );
+}

src/components/Cards/HomeBannerOffersCard.jsx

@@ -1,7 +1,5 @@
 import React, { useEffect, useState } from "react";
 import { Link } from "react-router-dom";
-import localImgLoad from "../../lib/localImgLoad";
-import bannerImage from "../../assets/images/banner-coupons.jpg";
 
 export default function HomeBannerOffersCard(props) {
   const [imageUrl, setImageUrl] = useState("");
@@ -11,7 +9,6 @@ export default function HomeBannerOffersCard(props) {
     let { banner, banner_location } = props?.itemData;
     if (banner_location === "LOCAL") {
       const imagePath = require(`../../assets/images/${banner}`); // Replace with your directory path for local images
-      console.log("This is local");
       setImageUrl(imagePath);
     } else if (banner_location === "URL") setImageUrl(banner);
     else return null;
@@ -26,21 +23,20 @@ export default function HomeBannerOffersCard(props) {
       }}
     >
       <div className="flex flex-col justify-between h-full">
-        <div className="content flex justify-between items-center mb-5">
+        <div className="content flex justify-between items-center">
           <div className="siderCardHeader">
             <h1 className="text-2xl font-bold text-dark-gray dark:text-white tracking-wide">
-              <>{props.itemData.title}</>
+              <span className="heroSilderTitle">{props.itemData.title}</span>
             </h1>
           </div>
-          {/*<SelectBox datas={filterDatas} action={dataSetHandler} />*/}
         </div>
-        <div className="h-[233px]">
+        <div className="flex flex-col justify-around items-center flex-1">
           <div className="siderCardDescription">
             {props.itemData.description}
           </div>
-          <div className="siderCardButton">
-            [ {props.itemData.button_text} ]
-          </div>
+          <button className="w-[150px] h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
+             {props.itemData.button_text}
+          </button>
         </div>
       </div>
     </Link>

src/components/Cards/OfferCard.jsx

@@ -0,0 +1,108 @@
+import localImgLoad from "../../lib/localImgLoad";
+import CountDown from "../Helpers/CountDown";
+import { PriceFormatter } from "../Helpers/PriceFormatter";
+
+export default function OfferCard({ datas, hidden = false, setOfferPopout }) {
+  let thePrice = PriceFormatter(
+    datas?.price * 0.01,
+    datas?.currency_code,
+    datas?.currency
+  );
+
+  return (
+    <div className="card-style-one flex flex-col justify-between w-full h-[387px] bg-white dark:bg-dark-white   p-3 pb rounded-2xl">
+      <div className="content">
+        {/* thumbnail */}
+        <div className="w-full h-40">
+          {/* thumbnail image */}
+          <div
+            className="thumbnail w-full h-full rounded-xl overflow-hidden px-4 pt-4"
+            style={{
+              background: `url(${localImgLoad(
+                `images/taskbanners/${datas.banner}`
+              )}) center / contain no-repeat`,
+            }}
+          >
+            {hidden && <div className="flex justify-center"></div>}
+          </div>
+        </div>
+        {/* details */}
+        <div className="details">
+          <h1 className="text-xl font-bold text-dark-gray dark:text-white mb-2 capitalize line-clamp-1">
+            {datas.title}
+          </h1>
+          {/* countdown */}
+          {/* <div className="w-full h-[54px] flex justify-evenly items-center p-2 rounded-lg border border-[#E3E4FE] dark:border-[#a7a9b533] ">
+                        <div className="flex flex-col justify-between">
+                            <p className="text-sm text-thin-light-gray dark:text-white tracking-wide">
+                                Task Code
+                            </p>
+                            <p className="text-base font-bold tracking-wide   text-dark-gray dark:text-white">
+                                {datas.contract}
+                            </p>
+                        </div>
+                        <div className="w-[1px] h-full bg-[#E3E4FE] dark:bg-[#a7a9b533] "></div>
+                        <div className="flex flex-col justify-between">
+                            <p className="text-sm text-thin-light-gray dark:text-white tracking-wide">
+                                Remaining Time
+                            </p>
+                            <p className="text-base font-bold tracking-wide   text-dark-gray dark:text-white">
+                                <CountDown lastDate={datas.expire} />
+                            </p>
+                        </div>
+                    </div> */}
+          <div className="w-full p-2 rounded-lg border border-[#E3E4FE] dark:border-[#a7a9b533] ">
+            <div className="grid grid-cols-2 gap-2">
+              <div className="flex flex-col justify-between items-center border-r-2">
+                <p className="text-sm text-thin-light-gray dark:text-white tracking-wide">
+                  Task Code
+                </p>
+                <p className="text-base font-bold tracking-wide   text-dark-gray dark:text-white">
+                  {datas.contract}
+                </p>
+              </div>
+              <div className="flex flex-col justify-between items-center">
+                <p className="text-sm text-red-500 tracking-wide">Expires</p>
+                <p className="text-base font-bold tracking-wide   text-dark-gray dark:text-white">
+                  <CountDown lastDate={datas.expire} />
+                </p>
+              </div>
+            </div>
+
+            <hr className="my-2" />
+
+            <div className="grid grid-cols-2 gap-2">
+              <div className="flex flex-col justify-between items-center border-r-2">
+                <p className="text-sm text-thin-light-gray dark:text-white tracking-wide">
+                  Reward
+                </p>
+                <p className="text-base font-bold tracking-wide   text-dark-gray dark:text-white">
+                  {thePrice}
+                </p>
+              </div>
+              <div className="flex flex-col justify-between items-center">
+                <p className="text-sm text-thin-light-gray dark:text-white tracking-wide">
+                  Timeline
+                </p>
+                <p className="text-base font-bold tracking-wide   text-dark-gray dark:text-white">
+                  {`${datas.timeline_days} day(s)`}
+                </p>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div className="card-buttons flex justify-end items-center space-x-2">
+        <button
+          type="button"
+          onClick={() =>
+            setOfferPopout({ show: true, data: { ...datas, thePrice } })
+          }
+          className="btn-shine w-[98px] h-[33px] text-white rounded-full text-sm bg-pink flex justify-center items-center"
+        >
+          Start Task
+        </button>
+      </div>
+    </div>
+  );
+}

src/components/Cards/ProductCardStyleOne.jsx

@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import { useState } from "react";
 import { Link } from "react-router-dom";
 import { toast } from "react-toastify";
 import localImgLoad from "../../lib/localImgLoad";
@@ -6,6 +6,7 @@ import CountDown from "../Helpers/CountDown";
 import Icons from "../Helpers/Icons";
 
 export default function ProductCardStyleOne({ datas, hidden = false }) {
+  const [imageUrl, setImageUrl] = useState("");
   const [addFavorite, setValue] = useState(false);
   const [options, setOption] = useState(false);
   const favoriteHandler = () => {
@@ -17,6 +18,8 @@ export default function ProductCardStyleOne({ datas, hidden = false }) {
       toast.warn("Remove to Favorite List");
     }
   };
+
+
   return (
     <div className="card-style-one flex flex-col justify-between w-full h-[387px] bg-white dark:bg-dark-white   p-3 pb rounded-2xl">
       <div className="content">

src/components/Cards/ResourceBlogCard.jsx

@@ -0,0 +1,75 @@
+import React, { useState } from "react";
+import { Link } from "react-router-dom";
+import { toast } from "react-toastify";
+
+export default function ProductCardStyleTwo({
+  className,
+  datas,
+  hidden = false,
+  bg
+}) {
+  // debugger;
+  const [addFavorite, setValue] = useState(datas.whishlisted);
+  const [options, setOption] = useState(false);
+  const favoriteHandler = () => {
+    if (!addFavorite) {
+      setValue(true);
+      toast.success("Added to Favorite List");
+    } else {
+      setValue(false);
+      toast.warn("Remove to Favorite List");
+    }
+  };
+  
+  return (
+    <div
+      className={`card-style-two w-full h-[336px] p-[20px] bg-white dark:bg-dark-white   rounded-2xl section-shadow ${
+        className || ""
+      }`}
+    >
+      <div className="flex flex-col justify-between w-full h-full">
+        <div className="thumbnail-area w-full">
+          <div
+            className="w-full h-[236px] p-6  rounded-xl overflow-hidden"
+            style={{
+              // background: `url(${`https://blog.wrenchboard.com/wp-content/uploads/${datas.meta_value}`}) 0% 0% / cover no-repeat`,
+            background: `url(${`${bg}${datas.meta_value}`}) 0% 0% / cover no-repeat`,
+            }}
+          >
+            <div className="product-two-options flex justify-between mb-5 relative">
+              <div className="status">
+                {datas?.isActive && (
+                  <span className="text-xs px-3 py-1.5 tracking-wide rounded-full bg-gold text-white">
+                    Active
+                  </span>
+                )}
+              </div>
+            </div>
+            {hidden && <div className="flex justify-center"></div>}
+          </div>
+        </div>
+        <div className="details-area">
+          {/* title */}
+          <a href={datas.guid} target="_blank" className="mb-2.5" rel="noreferrer">
+            <h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
+              {datas.post_title || "dummy title..."}
+            </h1>
+          </a>
+          <div className="flex justify-between">
+            <div className="flex items-center space-x-2"></div>
+            <div className="my-1">
+              <a
+                href={datas.guid}
+                target="_blank"
+                className="px-4 py-2.5 text-white text-sm bg-pink rounded-full tracking-wide"
+                rel="noreferrer"
+              >
+                View
+              </a>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}

src/components/FamilyAcc/FamilyManage.jsx

@@ -1,8 +1,8 @@
-import React, { useState, useEffect } from "react";
-import Layout from "../Partials/Layout";
-import FamilyManageTabs from "./Tabs/FamilyManageTabs";
+import React, { useEffect, useState } from "react";
 import { useLocation, useNavigate } from "react-router-dom";
+import Layout from "../Partials/Layout";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
+import FamilyManageTabs from "./FamilyManageTabs";
 
 export default function FamilyManage() {
   const [selectTab, setValue] = useState("today");
@@ -11,6 +11,7 @@ export default function FamilyManage() {
   let location = useLocation();
   let navigate = useNavigate();
   let accountDetails = location?.state;
+
   //   tab handler
   const filterHandler = (value) => {
     setValue(value);

src/components/FamilyAcc/FamilyManageTabs.jsx

@@ -0,0 +1,264 @@
+import React, {
+  Suspense,
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
+import { useReactToPrint } from "react-to-print";
+import profile from "../../assets/images/profile-info-profile.png";
+import usersService from "../../services/UsersService";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
+import AssignTaskPopout from "./FamilyPopout/AssignTaskPopout";
+import {
+  FamilyWaitlist,
+  FamilyAccount,
+  FamilyProfile,
+  FamilyTasks,
+  ProfileInfo,
+  FamilyPending,
+} from "./Tabs";
+import localImgLoad from "../../lib/localImgLoad";
+
+export default function FamilyManageTabs({
+  className,
+  accountDetails,
+  listReload,
+  loader,
+}) {
+  const [details, setDetails] = useState({
+    familyDetails: { loading: false, data: null },
+    familyTasks: { loading: false, data: null },
+    familyWaitList: { loading: false, data: null },
+    familyPending: { loading: false, data: null },
+  });
+  const [errMsg, setErrMsg] = useState("");
+  const [familyTaskPopout, setFamilyTaskPopout] = useState(false);
+
+  const familyPopUpHandler = () => {
+    setFamilyTaskPopout((prev) => !prev);
+  };
+
+  const [profileImg, setProfileImg] = useState(profile);
+  const profileImgInput = useRef(null);
+
+  const browseProfileImg = () => {
+    profileImgInput.current.click();
+  };
+
+  const profileImgChangeHandler = (e) => {
+    if (e.target.value !== "") {
+      const imgReader = new FileReader();
+      imgReader.onload = (event) => {
+        setProfileImg(event.target.result);
+      };
+      imgReader.readAsDataURL(e.target.files[0]);
+    }
+  };
+
+  const apiCall = useMemo(() => new usersService(), []);
+
+  const manageFamily = useCallback(async () => {
+    try {
+      setDetails({
+        familyDetails: { loading: true },
+        familyTasks: { loading: true },
+        familyWaitList: { loading: true },
+        familyPending: { loading: true },
+      });
+
+      const { family_uid } = accountDetails;
+      const reqData = { family_uid };
+
+      const [familyRes, tasksRes, familyWaitRes, familyPending] =
+        await Promise.all([
+          apiCall.ManageFamily(reqData),
+          apiCall.ManageTasks(reqData),
+          apiCall.ManageFamilyWaitlist(),
+          apiCall.ManageFamilyPending(),
+        ]);
+
+      const familyData = familyRes.data;
+      const tasksData = tasksRes.data;
+      const familyWaitData = familyWaitRes.data;
+      const familyPendingData = familyPending.data;
+
+      if (
+        familyData?.internal_return < 0 ||
+        tasksData?.internal_return < 0 ||
+        familyWaitData?.internal_return < 0 ||
+        familyPendingData?.internal_return < 0
+      )
+        return;
+
+      setDetails({
+        familyDetails: { loading: false, data: familyData },
+        familyTasks: { loading: false, data: tasksData },
+        familyWaitList: { loading: false, data: familyWaitData },
+        familyPending: { loading: false, data: familyPendingData },
+      });
+    } catch (error) {
+      setDetails({
+        familyDetails: { loading: false },
+        familyTasks: { loading: false },
+        familyWaitList: { loading: false },
+        familyPending: { loading: false },
+      });
+      setErrMsg("An error occurred");
+      throw new Error(error);
+    }
+  }, [apiCall, accountDetails]);
+
+  const accountRef = useRef();
+
+  const useHandlePrint = useReactToPrint({
+    content: () => accountRef.current,
+  });
+
+  const tabs = [
+    { id: 1, name: "Tasks" },
+    { id: 2, name: "Waiting" },
+    { id: 3, name: "Pending" }
+  ];
+
+  const [tab, setTab] = useState(tabs[0].name);
+
+  const tabHandler = (value) => {
+    setTab(value);
+  };
+
+  const tabComponents = {
+    Tasks: (
+      <FamilyTasks
+        className={className}
+        loader={details.familyTasks.loading}
+        familyData={details.familyTasks.data}
+        accountDetails={accountDetails}
+      />
+    ),
+    Waiting: (
+      <FamilyWaitlist
+        familyData={details.familyWaitList.data}
+        accountDetails={accountDetails}
+        loader={details.familyWaitList.loading}
+      />
+    ),
+    Pending: (
+      <FamilyPending
+        familyData={details.familyPending.data}
+        accountDetails={accountDetails}
+        loader={details.familyWaitList.loading}
+      />
+    ),
+    Account: (
+      <FamilyAccount
+        familyData={details.familyDetails.data}
+        myRef={accountRef}
+        loader={details.familyDetails.loading}
+        handlePrint={useHandlePrint}
+      />
+    ),
+    Profile: <FamilyProfile />,
+  };
+
+  const defaultTabComponent = (
+    <FamilyTasks
+      className={className}
+      loader={details.familyTasks.loading}
+      familyData={details.familyTasks.data}
+      accountDetails={accountDetails}
+    />
+  );
+
+  const selectedTabComponent = tabComponents[tab] || defaultTabComponent;
+
+  useEffect(() => {
+    manageFamily();
+  }, [tab, manageFamily]);
+
+  return (
+    <div
+      className={`w-full bg-white dark:bg-dark-white overflow-y-auto rounded-2xl section-shadow min-h-[520px] max-h-[600px] ${
+        className || ""
+      }`}
+    >
+      <div className="relative w-full overflow-x-auto sm:rounded-lg">
+        <Suspense
+          fallback={
+            <div className="h-full min-h-[500px] w-full overflow-hidden flex justify-center items-center">
+              <LoadingSpinner size="16" color="sky-blue" />
+            </div>
+          }
+        >
+          <div className="w-full h-full text-sm text-left text-gray-500 dark:text-gray-400 relative grid grid-cols-4 min-h-[520px]">
+            <div className="border-r border-[#E3E4FE] dark:border-[#a7a9b533] p-6 h-full flex flex-col justify-between">
+              <ProfileInfo
+                profileImg={profileImg}
+                profileImgInput={profileImgInput}
+                profileImgChangeHandler={profileImgChangeHandler}
+                browseProfileImg={browseProfileImg}
+                accountDetails={accountDetails}
+              />
+              <div className="mt-4 flex justify-center items-center gap-2">
+                <button
+                  onClick={() => tabHandler('Account')} 
+                  className="family-icon p-2 border-2 border-sky-blue rounded-2xl flex flex-col justify-between items-center">
+                  <img src={localImgLoad('images/icons/account.svg')} className="w-[70px] h-[70px]" alt='Settings-Icon' />
+                  <p className="mt-2 text-lg text-sky-blue">Account</p>
+                </button>
+                <button
+                  onClick={() => tabHandler('Profile')} 
+                  className="family-icon p-2 border-2 border-sky-blue rounded-2xl flex flex-col justify-between items-center">
+                  <img src={localImgLoad('images/icons/profile.svg')} className="w-[70px] h-[70px]" alt='Settings-Icon' />
+                  <p className="mt-2 text-lg text-sky-blue">Profile</p>
+                </button>
+              </div>
+            </div>
+            <div className="col-span-3 justify-self-end h-full w-full">
+              <div className="flex flex-col w-full">
+                <div className="w-full pr-8 flex items-center gap-1">
+                  <ul className="flex gap-2 items-center border-b border-b-[#FAFAF] w-full">
+                    {tabs.map(({ name, id }) => (
+                      <li
+                        onClick={() => tabHandler(name)}
+                        className={`p-4 flex hover:text-purple transition-all ease-in-out items-center cursor-pointer overflow-hidden text-xl relative top-[2px] ${
+                          tab === name
+                            ? "text-purple border-r"
+                            : "text-thin-light-gray"
+                        }`}
+                        key={id}
+                      >
+                        <h1>{name}</h1>
+                      </li>
+                    ))}
+                  </ul>
+                  <button
+                    type="button"
+                    onClick={familyPopUpHandler}
+                    className="p-1 my-1 w-[100px] flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                  >
+                    Add task
+                  </button>
+                </div>
+                <div className="flex-[0.9] lg:min-h-[450px] h-full">
+                  <div className="h-full p-4 border border-[#dbd9d9] relative overflow-y-auto">
+                    {selectedTabComponent}
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </Suspense>
+      </div>
+
+      {familyTaskPopout && (
+        <AssignTaskPopout
+          action={familyPopUpHandler}
+          situation={familyTaskPopout}
+          familyDetails={details.familyDetails.data}
+        />
+      )}
+    </div>
+  );
+}

src/components/FamilyAcc/FamilyMarket.jsx

@@ -0,0 +1,95 @@
+import React, { useCallback, useEffect, useMemo, useState } from "react";
+import Layout from "../Partials/Layout";
+import SearchCom from "../Helpers/SearchCom";
+import FamilyMarketCard from "../Cards/FamilyMarketCard";
+import usersService from "../../services/UsersService";
+import SuggestTask from "../FamilyPopup/SuggestTask";
+
+export default function FamilyMarket() {
+  const [popUp, setPopUp] = useState(false);
+  const [searchQuery, setSearchQuery] = useState("");
+  const [myFamilySampleTasks, setMyFamilySampleTasks] = useState({
+    loading: true,
+    status: false,
+    data: [],
+  });
+
+  const apiCall = useMemo(() => new usersService(), []);
+
+  const getMyFamilySampleTasks = useCallback(async () => {
+    try {
+      setMyFamilySampleTasks({ loading: true, status: false, data: [] });
+      const res = await apiCall.getFamilySampleTasks();
+      setMyFamilySampleTasks({
+        loading: false,
+        status: true,
+        data: res.data.result_list,
+      });
+    } catch (error) {
+      setMyFamilySampleTasks({ loading: false, status: false, data: [] });
+      console.log("Error getting tasks:", error);
+    }
+  }, [apiCall]);
+
+  useEffect(() => {
+    getMyFamilySampleTasks();
+  }, [getMyFamilySampleTasks]);
+
+  const handleSearch = (event) => {
+    setSearchQuery(event.target.value);
+  };
+
+  const filteredTasks =
+    myFamilySampleTasks.data?.filter((task) =>
+      task.title.toLowerCase().includes(searchQuery.toLowerCase())
+    ) || [];
+
+  const popUpHandler = () => {
+    setPopUp((prev) => !prev);
+  };
+
+  return (
+    <Layout>
+      <div className="notification-page w-full mb-10">
+        <div className="notification-wrapper w-full">
+          {/* heading */}
+          <div className="sm:flex justify-between items-center mb-6">
+            <div className="mb-5 sm:mb-0">
+              <h1 className="text-26 font-bold inline-flex gap-3 text-dark-gray dark:text-white items-center">
+                <span>Suggest Task to the Parents</span>
+              </h1>
+            </div>
+          </div>
+          {/* Body */}
+          <div className="filter-section w-full items-center sm:flex justify-between mb-6">
+            {/* filter-search */}
+            <div className="sm:w-1/2 w-full sm:pr-20 pr-0 mb-5 sm:mb-0">
+              <SearchCom
+                placeholder="Search for tasks..."
+                handleSearch={handleSearch}
+                value={searchQuery}
+              />
+            </div>
+            {/* filer-dropdown */}
+            <div className="flex-1 flex sm:justify-end">
+              <button
+                onClick={popUpHandler}
+                className="btn-gradient lg:flex hidden w-[153px] h-[46px] rounded-full text-white justify-center items-center"
+              >
+                Any Other Task
+              </button>
+            </div>
+          </div>
+          <div className="content-section w-full-width">
+            <div className="grid lg:grid-cols-3 sm:grid-cols-2 grid-cols-1 gap-[30px]">
+              {filteredTasks.map((task) => (
+                <FamilyMarketCard key={task.id} datas={task} />
+              ))}
+            </div>
+          </div>
+        </div>
+      </div>
+      {popUp && <SuggestTask onClose={popUpHandler} situation={popUp} />}
+    </Layout>
+  );
+}

src/components/FamilyAcc/FamilyPopout/AssignTaskPopout.jsx

@@ -0,0 +1,433 @@
+import React, { useState, useEffect } from "react";
+import ModalCom from "../../Helpers/ModalCom";
+import Detail from "../../jobPopout/popoutcomponent/Detail";
+import usersService from "../../../services/UsersService";
+import LoadingSpinner from "../../Spinners/LoadingSpinner";
+import { PriceFormatter } from "../../Helpers/PriceFormatter";
+import { NewTasks } from "./forms";
+
+function AssignTaskPopout({ action, details, situation, familyDetails }) {
+  const apiCall = new usersService();
+
+  let [requestStatus, setRequestStatus] = useState({
+    loading: false,
+    status: false,
+    message: "",
+  }); // HOLDS RESPONSE FOR SENDING API REQUEST
+
+  let [familyTask, setFamilyTask] = useState({ loading: true, data: [] });
+
+  let [taskType, setTaskType] = useState(details ? "new" : "select"); // SWITCHES BTW SELECT TASK AND NEW TASK
+
+  let [activeTask, setActiveTask] = useState({ id: 0, data: {} }); // HOLDS SELECTED TASK
+
+  const switchTaskType = ({ target: { value } }) => {
+    // FUNCTION TO CHANGE SELECTED ACTIVE TASK
+    setTaskType(value);
+  };
+
+  const handleActiveTask = (id = 0, data = {}) => {
+    // FUNCTION TO CHANGE SELECTED ACTIVE TASK
+    setActiveTask({ id, data });
+  };
+
+  // New Task
+  const [formState, setFormState] = useState({
+    // Initialize form state with desired fields
+    banner: details?.banner || "default.jpg",
+    country: details?.country || "",
+    price: details?.price || "",
+    title: details?.title || "",
+    description: details?.description || "",
+    job_detail: details?.job_detail || "",
+    timeline_days: details?.timeline_days || "",
+    category: details?.category || "",
+  });
+
+  const assignFamilyTask = () => {
+    setRequestStatus({ loading: true, status: false, message: "" });
+    let reqData = {};
+    if (taskType == "select") {
+      // RUNS HERE IF TASK TYPE IS SELECT
+      if (!Object.keys(activeTask.data).length) {
+        setRequestStatus({
+          loading: false,
+          status: false,
+          message: "No Task is seleted",
+        });
+        return setTimeout(() => {
+          setRequestStatus({ loading: false, status: false, message: "" });
+        }, 3000);
+      }
+      reqData = {
+        // API PAYLOADS
+        job_id: activeTask.data?.job_id,
+        job_uid: activeTask.data?.job_uid,
+        family_uid: familyDetails.uid,
+        job_description: activeTask.data?.description,
+        assign_mode: 110011,
+      };
+    }
+
+    if (taskType === "new") {
+      const {
+        banner,
+        category,
+        country,
+        description,
+        job_detail,
+        price,
+        timeline_days,
+        title,
+      } = formState;
+
+      const requiredFields = {
+        banner,
+        // category,
+        country,
+        description,
+        job_detail,
+        price,
+        timeline_days,
+        title,
+      };
+
+      for (let field in requiredFields) {
+        if (requiredFields[field] == "") {
+          // let currencyErrMsg = field == "country" && "currency"
+          setRequestStatus({
+            loading: false,
+            status: false,
+            message: `${field} is empty`,
+          });
+          return setTimeout(() => {
+            setRequestStatus({ loading: false, status: false, message: "" });
+          }, 3000);
+        }
+      }
+
+      reqData = {
+        banner,
+        category,
+        country,
+        description,
+        job_detail,
+        price: price * 100,
+        timeline_days,
+        title,
+        assign_mode: 110055,
+        family_uid: details?.family_uid || familyDetails?.uid,
+      };
+    }
+
+    apiCall
+      .assignFamilyTask(reqData)
+      .then((res) => {
+        if (res.status != 200 || res.data.internal_return < 0) {
+          setRequestStatus({
+            loading: false,
+            status: false,
+            message: "failed to assign task",
+          });
+          return setTimeout(() => {
+            setRequestStatus({ loading: false, status: false, message: "" });
+          }, 5000);
+        }
+        setRequestStatus({
+          loading: false,
+          status: true,
+          message: "action successful",
+        });
+        setTimeout(() => {
+          setRequestStatus({ loading: false, status: false, message: "" });
+          action(); // FUNCTION THAT CLOSES THE MODAL BOX
+        }, 5000);
+      })
+      .catch((err) => {
+        setRequestStatus({
+          loading: false,
+          status: false,
+          message: "An Error occured, try again",
+        });
+        setTimeout(() => {
+          setRequestStatus({ loading: false, status: false, message: "" });
+        }, 5000);
+      });
+  };
+
+  useEffect(() => {
+    const reqData = {
+      limit: 30,
+      offset: 0,
+      job_type: "FAMILY",
+      action: 13005,
+    };
+    apiCall
+      .getMyJobList(reqData)
+      .then((res) => {
+        setFamilyTask({ loading: false, data: res?.data?.result_list });
+        if (res?.data?.result_list?.length) {
+          setActiveTask((prev) => ({
+            ...prev,
+            data: res?.data?.result_list[0],
+          }));
+        }
+      })
+      .catch((err) => {
+        setFamilyTask({ loading: false, data: [] });
+        console.log("Error", err);
+      });
+  }, []);
+
+  return (
+    <>
+      <ModalCom
+        action={action}
+        situation={situation}
+        className="assign-task-popup"
+      >
+        <div className="w-full h-full lg:w-[700px] lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl">
+          <div className="w-full flex items-center justify-between lg:px-10 lg:py-8 px-[30px] py-[23px] border-b dark:border-[#5356fb29]  border-light-purple">
+            <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
+              Assign task to {familyDetails?.firstname || details.firstName}
+            </h1>
+            <button
+              type="button"
+              className="text-[#374557] dark:text-red-500"
+              onClick={action}
+            >
+              <svg
+                width="36"
+                height="36"
+                viewBox="0 0 36 36"
+                fill="none"
+                className="fill-current"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M36 16.16C36 17.4399 36 18.7199 36 20.0001C35.7911 20.0709 35.8636 20.2554 35.8385 20.4001C34.5321 27.9453 30.246 32.9248 22.9603 35.2822C21.9006 35.6251 20.7753 35.7657 19.6802 35.9997C18.4003 35.9997 17.1204 35.9997 15.8401 35.9997C15.5896 35.7086 15.2189 35.7732 14.9034 35.7093C7.77231 34.2621 3.08728 30.0725 0.769671 23.187C0.435002 22.1926 0.445997 21.1199 0 20.1599C0 18.7198 0 17.2798 0 15.8398C0.291376 15.6195 0.214408 15.2656 0.270759 14.9808C1.71321 7.69774 6.02611 2.99691 13.0428 0.700951C14.0118 0.383805 15.0509 0.386897 15.9999 0C17.2265 0 18.4532 0 19.6799 0C19.7156 0.124041 19.8125 0.136067 19.9225 0.146719C27.3 0.868973 33.5322 6.21922 35.3801 13.427C35.6121 14.3313 35.7945 15.2484 36 16.16ZM33.011 18.0787C33.0433 9.77105 26.3423 3.00309 18.077 2.9945C9.78479 2.98626 3.00344 9.658 2.98523 17.8426C2.96667 26.1633 9.58859 32.9601 17.7602 33.0079C26.197 33.0577 32.9787 26.4186 33.011 18.0787Z"
+                  fill=""
+                  fillOpacity="0.6"
+                />
+                <path
+                  d="M15.9309 18.023C13.9329 16.037 12.007 14.1207 10.0787 12.2072C9.60071 11.733 9.26398 11.2162 9.51996 10.506C9.945 9.32677 11.1954 9.0811 12.1437 10.0174C13.9067 11.7585 15.6766 13.494 17.385 15.2879C17.9108 15.8401 18.1633 15.7487 18.6375 15.258C20.3586 13.4761 22.1199 11.7327 23.8822 9.99096C24.8175 9.06632 26.1095 9.33639 26.4967 10.517C26.7286 11.2241 26.3919 11.7413 25.9133 12.2178C24.1757 13.9472 22.4477 15.6855 20.7104 17.4148C20.5228 17.6018 20.2964 17.7495 20.0466 17.9485C22.0831 19.974 24.0372 21.8992 25.9689 23.8468C26.9262 24.8119 26.6489 26.1101 25.4336 26.4987C24.712 26.7292 24.2131 26.3441 23.7455 25.8757C21.9945 24.1227 20.2232 22.3892 18.5045 20.6049C18.0698 20.1534 17.8716 20.2269 17.4802 20.6282C15.732 22.4215 13.9493 24.1807 12.1777 25.951C11.7022 26.4262 11.193 26.7471 10.4738 26.4537C9.31345 25.9798 9.06881 24.8398 9.98589 23.8952C11.285 22.5576 12.6138 21.2484 13.9387 19.9355C14.5792 19.3005 15.2399 18.6852 15.9309 18.023Z"
+                  fill="#"
+                  fillOpacity="0.6"
+                />
+              </svg>
+            </button>
+          </div>
+          {familyTask.loading ? (
+            <div className="h-[100px] w-full flex justify-center items-center">
+              <LoadingSpinner color="sky-blue" size="16" />
+            </div>
+          ) : (
+            <>
+              <div
+                className={`job-action-modal-body w-full md:grid ${
+                  taskType !== "new" ? "md:grid-cols-2" : "md:grid-cols-1"
+                }`}
+              >
+                <div className="p-4">
+                  <div className="mb-2 w-full flex items-center gap-4">
+                    <div className="flex items-center gap-2 text-sky-blue text-base">
+                      <input
+                        type="radio"
+                        name="task-type"
+                        value="select"
+                        className="w-[20px] h-[20px] cursor-pointer"
+                        checked={taskType == "select"}
+                        onChange={switchTaskType}
+                      />
+                      <span>Select Task</span>
+                    </div>
+                    <div className="flex items-center gap-2 text-sky-blue text-base">
+                      <input
+                        type="radio"
+                        name="task-type"
+                        value="new"
+                        className="w-[20px] h-[20px] cursor-pointer"
+                        checked={taskType == "new"}
+                        onChange={switchTaskType}
+                      />
+                      <span>New Task</span>
+                    </div>
+                  </div>
+                  {/* Task Type === select */}
+                  {taskType == "select" && (
+                    <div className="p-4 w-full h-[400px] overflow-y-auto bg-slate-100">
+                      {familyTask?.data?.length ? (
+                        familyTask?.data?.map((item, index) => (
+                          <div
+                            key={item.job_uid}
+                            className="mb-2 flex justify-start items-center gap-2 text-sky-blue text-base cursor-pointer"
+                            onClick={() => handleActiveTask(item.job_uid, item)}
+                          >
+                            <input
+                              type="radio"
+                              name="task-list"
+                              checked={
+                                activeTask.id == item.job_uid ||
+                                (activeTask.id == index && true)
+                              }
+                              onChange={() =>
+                                handleActiveTask(item.job_uid, item)
+                              }
+                              className="w-[15px] h-[15px] cursor-pointer"
+                            />
+                            <p className="w-full text-dark-gray tracking-wide">
+                              {item?.title}
+                            </p>
+                          </div>
+                        ))
+                      ) : (
+                        <p className="p-8 text-lg text-dark-gray dark:text-white tracking-wide text-center cursor-default">
+                          No Task found!
+                        </p>
+                      )}
+                    </div>
+                  )}
+                  {taskType == "new" && (
+                    <div className="p-4 w-full h-[400px]">
+                      <NewTasks
+                        formState={formState}
+                        setFormState={setFormState}
+                      />
+                    </div>
+                  )}
+                </div>
+
+                {/*Right Hand Side for details && Task Type === select */}
+                {taskType == "select" && (
+                  <>
+                    {familyTask?.data?.length > 0 ? (
+                      <div className="p-4">
+                        <div className="w-full">
+                          <p className="text-lg font-bold text-dark-gray dark:text-white tracking-wide border-b-2">
+                            {activeTask?.data?.title}
+                          </p>
+                          <div className="my-3">
+                            <Detail
+                              label="Description"
+                              value={activeTask?.data?.description}
+                            />
+                          </div>
+                          <div className="flex items-center">
+                            <div className="my-3 w-full flex items-center gap-1">
+                              <label className="text-slate-900 dark:text-white tracking-wide font-semibold">
+                                Price
+                              </label>
+                              <p className="p-1 text-sm text-slate-900 dark:text-white">
+                                {PriceFormatter(
+                                  activeTask?.data?.price * 0.01,
+                                  activeTask?.data?.currency,
+                                  activeTask?.data?.curreny_code
+                                )}
+                              </p>
+                            </div>
+
+                            <div className="my-3 w-full flex items-center gap-1">
+                              <label className="text-slate-900 dark:text-white tracking-wide font-semibold">
+                                Timeline
+                              </label>
+                              <p className="p-1 text-sm text-slate-900 dark:text-white">{`${activeTask?.data?.timeline_days} day(s)`}</p>
+                            </div>
+                          </div>
+
+                          <div className="my-3 sm:flex items-center">
+                            <Detail
+                              label="Created"
+                              value={`Dummy, no value found for created!`}
+                            />
+                          </div>
+
+                          <div className="my-3">
+                            <label className="w-full text-slate-900 dark:text-white tracking-wide font-semibold">
+                              Delivery Detail
+                            </label>
+                            <textarea
+                              className={`p-1 w-full text-sm text-slate-900 outline-none border border-slate-300 rounded-md`}
+                              rows="5"
+                              style={{ resize: "none" }}
+                              value={activeTask?.data?.job_detail}
+                              readOnly
+                              // onChange={handleInputChange}
+                            />
+                          </div>
+                        </div>
+                      </div>
+                    ) : (
+                      <></>
+                    )}
+                  </>
+                )}
+              </div>
+
+              {/* BTN */}
+              <div className="py-2 px-4 border-t-2 flex justify-between items-center">
+                {/* error or success display */}
+                <div className="w-auto h-auto flex items-center">
+                  {requestStatus.message != "" &&
+                    (!requestStatus.status ? (
+                      <div
+                        className={`relative p-2 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px] self-start`}
+                      >
+                        {requestStatus.message}
+                      </div>
+                    ) : (
+                      requestStatus.status && (
+                        <div
+                          className={`relative p-2 text-green-700 bg-slate-200 border-slate-800 mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+                        >
+                          {requestStatus.message}
+                        </div>
+                      )
+                    ))}
+                </div>
+
+                {/* End of error or success display */}
+                <div className="w-auto h-auto flex items-center gap-3">
+                  <button
+                    disabled={requestStatus.loading}
+                    onClick={action}
+                    type="button"
+                    className="w-20 h-11 flex justify-center items-center border-gradient text-base rounded-full text-white cursor-pointer"
+                  >
+                    <span className="text-gradient">Close</span>
+                  </button>
+                  <div className="">
+                    {requestStatus.loading ? (
+                      <LoadingSpinner color="sky-blue" size="8" />
+                    ) : taskType == "select" ? (
+                      <button
+                        type="button"
+                        disabled={requestStatus.loading}
+                        onClick={assignFamilyTask}
+                        className="px-1 w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white cursor-pointer"
+                      >
+                        Assign
+                      </button>
+                    ) : (
+                      <button
+                        type="button"
+                        disabled={requestStatus.loading}
+                        onClick={assignFamilyTask}
+                        className="px-1 w-40 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white cursor-pointer"
+                      >
+                        {`Assign to ${
+                          familyDetails?.firstname || details?.firstName
+                        }`}
+                      </button>
+                    )}
+                  </div>
+                </div>
+              </div>
+            </>
+          )}
+        </div>
+      </ModalCom>
+    </>
+  );
+}
+
+export default AssignTaskPopout;

src/components/FamilyAcc/FamilyPopout/forms/NewTasks.jsx

@@ -0,0 +1,233 @@
+import React, { useEffect, useState } from "react";
+import usersService from "../../../../services/UsersService";
+import InputCom from "../../../Helpers/Inputs/InputCom";
+
+// const DEFAULT_IMAGE =
+export default function NewTasks({ formState, setFormState }) {
+  let [currency, setCurrency] = useState({
+    loading: true,
+    status: false,
+    data: null,
+  });
+
+  const selectImage = require(`../../../../assets/images/taskbanners/${
+    formState.banner || "default.jpg"
+  }`);
+  const ApiCall = new usersService();
+
+  // FUNCTION TO GET Currency
+  const getUserCurrency = () => {
+    setCurrency((prev) => ({ ...prev, loading: true }));
+    ApiCall.getUserWallets()
+      .then((res) => {
+        if (res.data.internal_return < 0) {
+          setCurrency({ loading: false, status: true, data: [] });
+          return;
+        }
+
+        setCurrency({
+          loading: false,
+          status: true,
+          data: res.data.result_list,
+        });
+      })
+      .catch((err) => {
+        setCurrency({ loading: false, status: false, data: [] });
+      });
+  };
+
+  const handleInputChange = (event) => {
+    const { name, value } = event.target;
+    setFormState((prevState) => ({
+      ...prevState,
+      [name]: value,
+    }));
+  };
+
+  useEffect(() => {
+    getUserCurrency();
+  }, []);
+
+  return (
+    <form className="w-full flex justify-between items-start">
+      <div className="flex flex-col gap-3 max-w-[77%]">
+        {/* inputs starts here */}
+        <div className="grid md:grid-cols-3 grid-cols-1 gap-6 mb-[5px]">
+          {/* Currency */}
+          <div className="field w-full mb-6 xl:mb-0">
+            <label
+              htmlFor="country"
+              className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold flex item-center gap-1"
+            >
+              Currency
+              {/* {props.errors.country && props.touched.country && <span className="text-[12px] text-red-500">{props.errors.country}</span>} */}
+            </label>
+            <select
+              id="country"
+              name="country"
+              value={formState.country}
+              className={`input-field p-2 mt-3 rounded-md placeholder:text-base text-dark-gray dark:text-white w-full h-10 bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-none`}
+              onChange={handleInputChange}
+              // onBlur={props.handleBlur}
+            >
+              {currency.loading ? (
+                <option className="text-slate-500 text-[13.975px]" value="">
+                  Loading...
+                </option>
+              ) : currency.data.length ? (
+                <>
+                  <option className="text-slate-500 text-[13.975px]" value="">
+                    Currency
+                  </option>
+                  {currency.data?.map((item, index) => (
+                    <option
+                      key={index}
+                      className="text-slate-500 text-lg"
+                      value={item?.country}
+                    >
+                      {item?.description}
+                    </option>
+                  ))}
+                </>
+              ) : (
+                <option className="text-slate-500 text-lg" value="">
+                  No Options Found! Try Again
+                </option>
+              )}
+            </select>
+          </div>
+
+          {/* Price */}
+          <div className="field w-full">
+            <InputCom
+              fieldClass="px-6 text-right"
+              label="Price"
+              labelClass="tracking-wide"
+              inputBg="bg-slate-100"
+              type="number"
+              name="price"
+              placeholder="0"
+              value={formState.price}
+              inputHandler={handleInputChange}
+              // blurHandler={props.handleBlur}
+              // error={props.errors.price && props.touched.price && props.errors.price}
+            />
+          </div>
+
+          {/* Duration */}
+          <div className="field w-full mb-6 xl:mb-0">
+            <label
+              htmlFor="timeline_days"
+              className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold flex item-center gap-1"
+            >
+              Timeline
+              {/* {props.errors.country && props.touched.country && <span className="text-[12px] text-red-500">{props.errors.country}</span>} */}
+            </label>
+            <select
+              id="timeline_days"
+              name="timeline_days"
+              value={formState.timeline_days}
+              className={`input-field p-2 mt-3 rounded-md placeholder:text-base text-dark-gray dark:text-white w-full h-10 bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-none`}
+              onChange={handleInputChange}
+              // onBlur={props.handleBlur}
+            >
+              {publicArray.length && (
+                <>
+                  <option className="text-slate-500 text-[13.975px]" value="">
+                    Duration
+                  </option>
+                  {publicArray.map(({ name, duration }, idx) => (
+                    <option
+                      className="text-slate-500 text-[13.975px]"
+                      value={duration}
+                    >
+                      {name}
+                    </option>
+                  ))}
+                </>
+              )}
+            </select>
+          </div>
+        </div>
+
+        {/* Title  */}
+        <div className="field w-full mb-[5px]">
+          <InputCom
+            fieldClass="px-6"
+            label="Title"
+            labelClass="tracking-wide"
+            inputBg="bg-slate-100"
+            type="text"
+            name="title"
+            value={formState.title}
+            inputHandler={handleInputChange}
+            //   blurHandler={props.handleBlur}
+            //   error={props.errors.title && props.touched.title && props.errors.title}
+          />
+        </div>
+
+        {/* Description  */}
+        <div className="field w-full mb-[5px]">
+          <InputCom
+            fieldClass="px-6"
+            label="Description"
+            labelClass="tracking-wide"
+            inputBg="bg-slate-100"
+            type="text"
+            name="description"
+            value={formState.description}
+            inputHandler={handleInputChange}
+            //   blurHandler={props.handleBlur}
+            //   error={props.errors.description && props.touched.description && props.errors.description}
+          />
+        </div>
+
+        {/* Details */}
+        <div className="field flex flex-col sm:flex-row w-full mb-[5px] gap-2">
+          <div className="w-full">
+            <label
+              htmlFor="Job Delivery Details"
+              className='className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold flex items-center gap-1'
+            >
+              Job Delivery Details
+              {/* {props.errors.job_detail && props.touched.job_detail && <span className="text-[12px] text-red-500">{props.errors.job_detail}</span>} */}
+            </label>
+            <textarea
+              id="Job Delivery Details"
+              rows="5"
+              className={`input-field px-3 py-2 placeholder:text-base text-dark-gray dark:text-white w-full h-[100px] bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-[#dce4e9] rounded-[10px]`}
+              style={{ resize: "none" }}
+              name="job_detail"
+              value={formState.job_detail}
+              onChange={handleInputChange}
+              // onBlur={props.handleBlur}
+            />
+          </div>
+        </div>
+      </div>
+      {/* Banner Image */}
+      <div className="max-w-[20%] w-full">
+        <div className="h-32 w-full">
+          <img
+            src={selectImage}
+            alt="task_banner_img"
+            className="w-full h-full object-contain"
+          />
+        </div>
+      </div>
+    </form>
+  );
+}
+
+const publicArray = [
+  { duration: 1, name: "1 day" },
+  { duration: 2, name: "2 days" },
+  { duration: 3, name: "3 days" },
+  { duration: 4, name: "4 days" },
+  { duration: 5, name: "5 days" },
+  { duration: 6, name: "6 days" },
+  { duration: 7, name: "1 week" },
+  { duration: 14, name: "2 weeks" },
+  { duration: 21, name: "3 weeks" },
+  { duration: 28, name: "4 weeks" },
+];

src/components/FamilyAcc/FamilyPopout/forms/index.js

@@ -0,0 +1,3 @@
+import NewTasks from "./NewTasks";
+
+export {NewTasks}

src/components/FamilyAcc/FamilyTable.jsx

@@ -135,7 +135,7 @@ export default function FamilyTable({ className, familyList, loader, popUpHandle
               </button>
             </div>
             <div className="p-2 w-full md:w-1/2">
-              <img className='w-full' src={familyImage} alt="A Family" />
+              <img className='w-full' src={familyImage} alt="Add Family" />
             </div>
           </div>
           )

src/components/FamilyAcc/Tabs/FamilyAccount.jsx

@@ -0,0 +1,56 @@
+import { forwardRef } from 'react'
+import QRCode from 'react-qr-code';
+
+const FamilyAccount = forwardRef(({ familyData, myRef, handlePrint }, ref) => {
+    return (
+      <div
+        className="w-full lg:min-h-[500px] h-full flex flex-col items-center justify-center"
+        ref={myRef}
+      >
+        <div className="update-table w-full lg:min-h-[450px] h-full p-8 bg-white dark:bg-dark-white overflow-hidden rounded-2xl section-shadow ">
+          <div className="flex items-center justify-around h-[380px]">
+            <div className="flex flex-col">
+              <h2 className="font-bold text-lg tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
+                Username:{" "}
+                <span className="ml-2 normal-case">
+                  {familyData?.username ? familyData?.username : "please wait..."}
+                </span>
+              </h2>
+              <h2 className="font-bold text-lg tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
+                Pin:{" "}
+                <span className="ml-2 normal-case">
+                  {familyData?.pin ? familyData?.pin : "please wait..."}
+                </span>
+              </h2>
+            </div>
+  
+            <span className="text-5xl text-gray-400 opacity-20 font-bold">
+              or
+            </span>
+  
+            <div className="max-w-[200px]">
+              <p className="text-xl tracking-wide mb-[15px] text-center font-bold text-dark-gray dark:text-white">
+                Scan the code from mobile app
+              </p>
+              <QRCode
+                size={256}
+                style={{ height: "auto", maxWidth: "100%", width: "100%" }}
+                value={`https://www.google.com`}
+                viewBox={`0 0 256 256`}
+              />
+            </div>
+          </div>
+          <div className="h-[50px] w-full flex justify-center items-center">
+            <button
+              className="btn-shine w-[116px] h-[46px] text-white rounded-full text-base bg-pink flex justify-center items-center"
+              onClick={handlePrint}
+            >
+              Print
+            </button>
+          </div>
+        </div>
+      </div>
+    );
+  });
+
+export default FamilyAccount

src/components/FamilyAcc/Tabs/FamilyManageTabs.jsx

@@ -1,312 +0,0 @@
-import React, {
-  Suspense,
-  forwardRef,
-  useCallback,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-} from "react";
-import QRCode from "react-qr-code";
-import { useReactToPrint } from "react-to-print";
-import usersService from "../../../services/UsersService";
-import LoadingSpinner from "../../Spinners/LoadingSpinner";
-import profile from "../../../assets/images/profile-info-profile.png";
-import FamilyTasks from "./FamilyTasks";
-
-export default function FamilyManageTabs({
-  className,
-  accountDetails,
-  listReload,
-  loader,
-}) {
-  const [details, setDetails] = useState({
-    familyDetails: {
-      loading: false,
-      data: null,
-    },
-    familyTasks: {
-      loading: false,
-      data: null,
-    },
-  });
-  const [errMsg, setErrMsg] = useState("");
-  // List of tabs
-  const tabs = [
-    {
-      id: 1,
-      name: "Tasks",
-    },
-    {
-      id: 2,
-      name: "Account",
-    },
-    {
-      id: 3,
-      name: "Profile",
-    },
-  ];
-  const [tab, setTab] = useState(tabs[0].name);
-  const tabHandler = (value) => {
-    setTab(value);
-  };
-  //   For profile uploads
-  const [profileImg, setProfileImg] = useState(profile);
-  // profile img
-  const profileImgInput = useRef(null);
-  const browseProfileImg = () => {
-    profileImgInput.current.click();
-  };
-  const profileImgChangHandler = (e) => {
-    if (e.target.value !== "") {
-      const imgReader = new FileReader();
-      imgReader.onload = (event) => {
-        setProfileImg(event.target.result);
-      };
-      imgReader.readAsDataURL(e.target.files[0]);
-    }
-  };
-
-  //   Api call
-  const apiCall = useMemo(() => new usersService(), []);
-  // function for manage family
-  const manageFamily = useCallback(async () => {
-    try {
-      setDetails({
-        familyDetails: { loading: true },
-        familyTasks: { loading: true },
-      });
-      let { family_uid } = accountDetails;
-      let reqData = { family_uid };
-
-      // the family response
-      const familyRes = await apiCall.ManageFamily(reqData);
-      const familyData = familyRes.data;
-
-      // the tasks response
-      const tasksRes = await apiCall.ManageTasks(reqData);
-      const tasksData = tasksRes.data;
-
-      // checking the internal return
-      if (familyData?.internal_return < 0 || tasksData?.internal_return < 0)
-        return;
-
-      setDetails({
-        familyDetails: { loading: false, data: familyData },
-        familyTasks: { loading: false, data: tasksData },
-      });
-    } catch (error) {
-      setDetails({
-        familyDetails: { loading: false },
-        familyTasks: { loading: false },
-      });
-      setErrMsg("An error occurred");
-      throw new Error(error);
-    }
-  }, [apiCall, accountDetails]);
-
-  useEffect(() => {
-    manageFamily();
-  }, [tab, manageFamily]);
-
-  const accountRef = useRef();
-  // to handle printing
-  const useHandlePrint = useReactToPrint({
-    content: () => accountRef.current,
-  });
-
-  return (
-    <div
-      className={`update-table w-full bg-white dark:bg-dark-white overflow-y-auto rounded-2xl section-shadow min-h-[520px] max-h-[600px] ${
-        className || ""
-      }`}
-    >
-      <div className="relative w-full overflow-x-auto sm:rounded-lg">
-        <Suspense
-          fallback={
-            <div className="h-full min-h-[500px] w-full overflow-hidden flex justify-center items-center">
-              <LoadingSpinner size="16" color="sky-blue" />
-            </div>
-          }
-        >
-          <div className="w-full h-full text-sm text-left text-gray-500 dark:text-gray-400 relative grid grid-cols-4 min-h-[520px]">
-            <div className="border-r border-[#E3E4FE] dark:border-[#a7a9b533] p-6 h-full">
-              <ProfileInfo
-                profileImg={profileImg}
-                profileImgInput={profileImgInput}
-                profileImgChangHandler={profileImgChangHandler}
-                browseProfileImg={browseProfileImg}
-                accountDetails={accountDetails}
-              />
-            </div>
-            <div className="col-span-3 justify-self-end h-full w-full">
-              <div className="flex flex-col w-full">
-                <ul className="flex-[0.1] flex gap-2 items-center border-b border-b-[#FAFAF] w-full">
-                  {tabs.map(({ name, id }) => (
-                    <li
-                      onClick={() => tabHandler(name)}
-                      className={`p-4 flex hover:text-purple transition-all ease-in-out items-center cursor-pointer overflow-hidden text-xl ${
-                        tab === name
-                          ? "text-purple border-r"
-                          : " text-thin-light-gray"
-                      }`}
-                      key={id}
-                    >
-                      <h1>{name}</h1>
-                    </li>
-                  ))}
-                </ul>
-                <div className="flex-[0.9] lg:min-h-[450px] h-full">
-                  {/* Your content here */}
-                  {tabs.map(({ name, id }) => {
-                    return (
-                      <div
-                        className={`${
-                          tab === name ? "block" : "hidden"
-                        } h-full p-4 border border-[#dbd9d9] relative overflow-y-auto`}
-                        key={id}
-                      >
-                        {name === "Tasks" && (
-                          <FamilyTasks
-                            className={className}
-                            loader={details.familyTasks.loading}
-                            familyData={details.familyTasks.data}
-                          />
-                        )}
-                        {name === "Account" && (
-                          <Account
-                            familyData={details.familyDetails.data}
-                            myRef={accountRef}
-                            loader={details.familyDetails.loading}
-                            handlePrint={useHandlePrint}
-                          />
-                        )}
-                        {name === "Profile" && <Profile />}
-                      </div>
-                    );
-                  })}
-                </div>
-              </div>
-            </div>
-          </div>
-        </Suspense>
-      </div>
-    </div>
-  );
-}
-
-function ProfileInfo({
-  profileImg,
-  profileImgInput,
-  profileImgChangHandler,
-  browseProfileImg,
-  accountDetails,
-}) {
-  return (
-    <div className="flex flex-col items-center gap-6">
-      <div className="flex justify-center">
-        <div className="w-full relative">
-          <img
-            src={profileImg}
-            alt=""
-            className="sm:w-[198px] sm:h-[198px] w-[120px] h-[120px] rounded-full overflow-hidden object-cover"
-          />
-          <input
-            ref={profileImgInput}
-            onChange={(e) => profileImgChangHandler(e)}
-            type="file"
-            className="hidden"
-          />
-          <div
-            onClick={browseProfileImg}
-            className="w-[32px] h-[32px] absolute bottom-7 sm:right-2 right-[105px]  hover:bg-pink bg-dark-gray rounded-full cursor-pointer"
-          >
-            <svg
-              width="32"
-              height="32"
-              viewBox="0 0 32 32"
-              fill="none"
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <path
-                d="M16.5147 11.5C17.7284 12.7137 18.9234 13.9087 20.1296 15.115C19.9798 15.2611 19.8187 15.4109 19.6651 15.5683C17.4699 17.7635 15.271 19.9587 13.0758 22.1539C12.9334 22.2962 12.7948 22.4386 12.6524 22.5735C12.6187 22.6034 12.5663 22.6296 12.5213 22.6296C11.3788 22.6334 10.2362 22.6297 9.09365 22.6334C9.01498 22.6334 9 22.6034 9 22.536C9 21.4009 9 20.2621 9.00375 19.1271C9.00375 19.0746 9.02997 19.0109 9.06368 18.9772C10.4123 17.6249 11.7609 16.2763 13.1095 14.9277C14.2295 13.8076 15.3459 12.6913 16.466 11.5712C16.4884 11.5487 16.4997 11.5187 16.5147 11.5Z"
-                fill="white"
-              />
-              <path
-                d="M20.9499 14.2904C19.7436 13.0842 18.5449 11.8854 17.3499 10.6904C17.5634 10.4694 17.7844 10.2446 18.0054 10.0199C18.2639 9.76139 18.5261 9.50291 18.7884 9.24443C19.118 8.91852 19.5713 8.91852 19.8972 9.24443C20.7251 10.0611 21.5492 10.8815 22.3771 11.6981C22.6993 12.0165 22.7105 12.4698 22.3996 12.792C21.9238 13.2865 21.4443 13.7772 20.9686 14.2717C20.9648 14.2792 20.9536 14.2867 20.9499 14.2904Z"
-                fill="white"
-              />
-            </svg>
-          </div>
-        </div>
-      </div>
-      <div className="flex flex-col justify-center gap-3 items-center">
-        <h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
-          {accountDetails?.firstname}
-        </h1>
-        <h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
-          {accountDetails?.lastname}
-        </h1>
-        <h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
-          {accountDetails?.age}
-        </h1>
-      </div>
-    </div>
-  );
-}
-
-const Account = forwardRef(({ familyData, myRef, handlePrint }, ref) => {
-  return (
-    <div
-      className="w-full lg:min-h-[500px] h-full flex flex-col items-center justify-center"
-      ref={myRef}
-    >
-      <div className="update-table w-full lg:min-h-[450px] h-full p-8 bg-white dark:bg-dark-white overflow-hidden rounded-2xl section-shadow ">
-        <div className="flex items-center justify-around h-[380px]">
-          <div className="flex flex-col">
-            <h2 className="font-bold text-lg tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
-              Username:{" "}
-              <span className="ml-2 normal-case">
-                {familyData?.username ? familyData?.username : "please wait..."}
-              </span>
-            </h2>
-            <h2 className="font-bold text-lg tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
-              Pin:{" "}
-              <span className="ml-2 normal-case">
-                {familyData?.pin ? familyData?.pin : "please wait..."}
-              </span>
-            </h2>
-          </div>
-
-          <span className="text-5xl text-gray-400 opacity-20 font-bold">
-            or
-          </span>
-
-          <div className="max-w-[200px]">
-            <p className="text-xl tracking-wide mb-[15px] text-center font-bold text-dark-gray dark:text-white">
-              Scan the code from mobile app
-            </p>
-            <QRCode
-              size={256}
-              style={{ height: "auto", maxWidth: "100%", width: "100%" }}
-              value={`https://www.google.com`}
-              viewBox={`0 0 256 256`}
-            />
-          </div>
-        </div>
-        <div className="h-[50px] w-full flex justify-center items-center">
-          <button
-            className="btn-shine w-[116px] h-[46px] text-white rounded-full text-base bg-pink flex justify-center items-center"
-            onClick={handlePrint}
-          >
-            Print
-          </button>
-        </div>
-      </div>
-    </div>
-  );
-});
-
-function Profile() {
-  return <>Profile</>;
-}

src/components/FamilyAcc/Tabs/FamilyPending.jsx

@@ -0,0 +1,156 @@
+import { useState } from "react";
+import { PaginatedList, handlePagingFunc } from "../../Pagination";
+import { PriceFormatter } from "../../Helpers/PriceFormatter";
+import dataImage2 from "../../../assets/images/data-table-user-2.png";
+import PendingJobsPopout from "../../jobPopout/PendingJobsPopout";
+import localImgLoad from "../../../lib/localImgLoad";
+
+export default function FamilyPending({
+  familyData,
+  className,
+  accountDetails,
+  loader,
+}) {
+  let [jobPopout, setJobPopout] = useState({ show: false, data: {} }); // STATE TO HOLD THE VALUE OF THE ALERT DETAILS AND DETERMINE WHEN TO SHOW
+
+  let filteredFamilyData = familyData?.result_list?.filter(
+    (data) => data?.family_uid === accountDetails?.family_uid
+  );
+
+  const [currentPage, setCurrentPage] = useState(0);
+  const itemsPerPage = Number(process.env.REACT_APP_ITEM_PER_PAGE);
+  const indexOfFirstItem = Number(currentPage);
+  const indexOfLastItem =
+    Number(indexOfFirstItem) + Number(process.env.REACT_APP_ITEM_PER_PAGE);
+  const currentPendingTasks = filteredFamilyData?.slice(
+    indexOfFirstItem,
+    indexOfLastItem
+  );
+
+  const handlePagination = (e) => {
+    handlePagingFunc(e, setCurrentPage);
+  };
+
+  return (
+    <div
+      className={`update-table w-full p-8 bg-white dark:bg-dark-white overflow-hidden rounded-2xl section-shadow min-h-[520px] ${
+        className || ""
+      }`}
+    >
+      {filteredFamilyData && (
+        <div className="relative w-full overflow-x-auto sm:rounded-lg flex flex-col justify-between h-full">
+          <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
+            <tbody>
+              {
+                <>
+                  {currentPendingTasks.length > 0 ? (
+                    currentPendingTasks.map((value, index) => {
+                      let deliveryDate = value?.expire?.split(" ")[0];
+                      let thePrice = PriceFormatter(
+                        value?.price * 0.01,
+                        value?.currency_code,
+                        value?.currency
+                      );
+                      let image = value.banner ? value.banner : 'default.jpg'
+                      return (
+                        <tr
+                          key={index}
+                          className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50"
+                        >
+                          <td className=" py-4">
+                            <div className="flex space-x-2 items-center w-full">
+                              <div className="w-[60px] h-[60px] p-2 bg-alice-blue rounded-full overflow-hidden flex justify-center items-center">
+                                <img
+                                  src={localImgLoad(`images/taskbanners/${image}`)}
+                                  alt="data"
+                                  className="w-full h-full rounded-full"
+                                />
+                              </div>
+                              <div className="flex flex-col flex-[0.9]">
+                                <h1 className="font-bold text-xl text-dark-gray dark:text-white">
+                                  {value.title}
+                                </h1>
+                                <div>{value.description}</div>
+                                <span className="text-sm text-thin-light-gray flex items-start gap-1">
+                                  Price:{" "}
+                                  <span className="text-purple">
+                                    {thePrice}
+                                  </span>
+                                </span>
+                                <div className="flex items-center gap-4">
+                                  <span className="text-sm text-thin-light-gray">
+                                    Duration:{" "}
+                                    <span className="text-purple">
+                                      {" "}
+                                      {value.timeline_days} day(s)
+                                    </span>
+                                  </span>
+                                  <span className="text-sm text-thin-light-gray">
+                                    Expire:{" "}
+                                    <span className="text-purple">
+                                      {" "}
+                                      {deliveryDate}
+                                    </span>
+                                  </span>
+                                  <span className="text-sm text-thin-light-gray">
+                                    Sent to:{" "}
+                                    <span className="text-purple">
+                                      {" "}
+                                      {value.job_to}
+                                    </span>
+                                  </span>
+                                </div>
+                              </div>
+                            </div>
+                          </td>
+
+                          <td className="text-right py-4 px-2">
+                            <button
+                              type="button"
+                              onClick={() => {
+                                setJobPopout({ show: true, data: value });
+                              }}
+                              className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                            >
+                              View
+                            </button>
+                          </td>
+                        </tr>
+                      );
+                    })
+                  ) : (
+                    <tr className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
+                      <td className="p-2">No Pending Task!</td>
+                    </tr>
+                  )}
+                </>
+              }
+            </tbody>
+          </table>
+          {/* PAGINATION BUTTON */}
+          <PaginatedList
+            onClick={handlePagination}
+            prev={currentPage == 0}
+            next={currentPage + itemsPerPage >= filteredFamilyData.length}
+            data={filteredFamilyData}
+            start={indexOfFirstItem}
+            stop={indexOfLastItem}
+          />
+          {/* END OF PAGINATION BUTTON */}
+        </div>
+      )}
+
+      {/* Active Job Popout */}
+      {jobPopout.show && (
+        <PendingJobsPopout
+          details={jobPopout.data}
+          onClose={() => {
+            setJobPopout({ show: false, data: {} });
+          }}
+          situation={jobPopout.show}
+        />
+      )}
+      {/* End of Active Job Popout */}
+    </div>
+  );
+}

src/components/FamilyAcc/Tabs/FamilyProfile.jsx

@@ -0,0 +1,3 @@
+export default function FamilyProfile() {
+    return <>Profile</>;
+}

src/components/FamilyAcc/Tabs/FamilyTasks.jsx

@@ -5,16 +5,16 @@ import { handlePagingFunc } from "../../Pagination/HandlePagination";
 import PaginatedList from "../../Pagination/PaginatedList";
 import LoadingSpinner from "../../Spinners/LoadingSpinner";
 import Icons from "../../Helpers/Icons";
+import { PriceFormatter } from "../../Helpers/PriceFormatter";
+import ModalCom from "../../Helpers/ModalCom";
+import Detail from "../../jobPopout/popoutcomponent/Detail";
+import localImgLoad from "../../../lib/localImgLoad";
 
-export default function FamilyTasks({ familyData, className, loader }) {
-  const filterCategories = ["All Categories", "Explore", "Featured"];
-  const [selectedCategory, setCategory] = useState(filterCategories[0]);
 
+export default function FamilyTasks({ familyData, className, loader, accountDetails }) {
   let navigate = useNavigate();
   let { pathname } = useLocation();
 
-  let data = ["1", "2", "3", "4", "5", "6"]; // to be replaced later by result from API CALL
-
   const [currentPage, setCurrentPage] = useState(0);
   const indexOfFirstItem = Number(currentPage);
   const indexOfLastItem =
@@ -24,10 +24,7 @@ export default function FamilyTasks({ familyData, className, loader }) {
     indexOfLastItem
   );
 
-
-  const handlePagination = (e) => {
-    handlePagingFunc(e, setCurrentPage);
-  };
+  const handlePagination = (e) => handlePagingFunc(e, setCurrentPage);
 
   return (
     <div
@@ -41,7 +38,6 @@ export default function FamilyTasks({ familyData, className, loader }) {
         </div>
       ) : (
         <>
-          {" "}
           {familyData && familyData?.result_list && (
             <div className="relative w-full overflow-x-auto sm:rounded-lg flex flex-col justify-between h-full">
               <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
@@ -52,8 +48,15 @@ export default function FamilyTasks({ familyData, className, loader }) {
                         familyData?.result_list &&
                         familyData.result_list.length > 0 &&
                         currentTask.map((value, index) => {
-  // find due date
-  const dueDate = value?.delivery_date.split(" ")[0]
+                          // find due date
+                          const dueDate = value?.delivery_date.split(" ")[0];
+                          // the price
+                          let thePrice = PriceFormatter(
+                            value?.price * 0.01,
+                            value?.currency_code,
+                            value?.currency
+                          );
+                          let image = value.banner ? value.banner : 'default.jpg'
                           return (
                             <tr
                               key={index}
@@ -61,11 +64,11 @@ export default function FamilyTasks({ familyData, className, loader }) {
                             >
                               <td className=" py-4">
                                 <div className="flex space-x-2 items-center w-full">
-                                  <div className="w-full h-[60px] rounded-full overflow-hidden flex justify-center items-center flex-[0.1] max-w-[60px] min-w-[60px]">
+                                  <div className="w-[60px] h-[60px] p-2 bg-alice-blue rounded-full overflow-hidden flex justify-center items-center">
                                     <img
-                                      src={dataImage2}
+                                      src={localImgLoad(`images/taskbanners/${image}`)}
                                       alt="data"
-                                      className="w-full h-full"
+                                      className="w-full h-full rounded-full"
                                     />
                                   </div>
                                   <div className="flex flex-col flex-[0.9]">
@@ -73,37 +76,41 @@ export default function FamilyTasks({ familyData, className, loader }) {
                                       {value.title}
                                     </h1>
                                     <div className="flex gap-4 items-center">
-                                    <span className="text-sm text-thin-light-gray">
-                                      Price:{" "}
-                                      <span className="text-purple">
-                                        {value.price * 0.01}
+                                      <span className="text-sm text-thin-light-gray flex flex-start gap-1">
+                                        Price:{" "}
+                                        <span className="text-purple">
+                                          {thePrice}
+                                        </span>
                                       </span>
-                                    </span>
-                                    <span className="text-sm text-thin-light-gray">
-                                      Duration:{" "}
-                                      <span className="text-purple">
-                                        {" "}
-                                        {value.timeline_days} day(s)
+                                      <span className="text-sm text-thin-light-gray">
+                                        Duration:{" "}
+                                        <span className="text-purple">
+                                          {" "}
+                                          {value.timeline_days} day(s)
+                                        </span>
                                       </span>
-                                    </span>
-                                    <span className="text-sm text-thin-light-gray">
-                                      Due Date:{" "}
-                                      <span className="text-purple">
-                                        {" "}
-                                        {dueDate}
+                                      <span className="text-sm text-thin-light-gray">
+                                        Due Date:{" "}
+                                        <span className="text-purple">
+                                          {" "}
+                                          {dueDate}
+                                        </span>
                                       </span>
-                                    </span>
                                     </div>
                                   </div>
                                 </div>
                               </td>
-  
+
                               <td className="text-right py-4 px-2">
                                 <button
                                   type="button"
                                   onClick={() => {
                                     navigate("/manage-active-job", {
-                                      state: { ...value, pathname },
+                                      state: {
+                                        ...value,
+                                        pathname,
+                                        accountDetails
+                                      }
                                     });
                                   }}
                                   className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
@@ -112,7 +119,7 @@ export default function FamilyTasks({ familyData, className, loader }) {
                                 </button>
                               </td>
                             </tr>
-                          )
+                          );
                         })}
                     </>
                   }

src/components/FamilyAcc/Tabs/FamilyWaitlist.jsx

@@ -0,0 +1,141 @@
+import { useState } from "react";
+import { handlePagingFunc, PaginatedList } from "../../Pagination";
+import LoadingSpinner from "../../Spinners/LoadingSpinner";
+import SuggestTask from "../../FamilyPopup/SuggestTask";
+import AssignTaskPopout from "../FamilyPopout/AssignTaskPopout";
+
+const FamilyWaitlist = ({ familyData, className, accountDetails, loader }) => {
+  const [popUp, setPopUp] = useState({ show: false, data: {} });
+  const [continueTaskPopup, setContinueTaskPopup] = useState({
+    show: false,
+    data: {},
+  });
+
+  let filteredFamilyData = familyData?.result_list?.filter(
+    (data) => data?.family_uid === accountDetails?.family_uid
+  );
+
+  const [currentPage, setCurrentPage] = useState(0);
+  const itemsPerPage = Number(process.env.REACT_APP_ITEM_PER_PAGE);
+  const indexOfFirstItem = currentPage;
+  const indexOfLastItem = currentPage + itemsPerPage;
+  const currentTask = filteredFamilyData?.slice(
+    indexOfFirstItem,
+    indexOfLastItem
+  );
+
+  const handlePagination = (e) => handlePagingFunc(e, setCurrentPage);
+
+  return (
+    <div
+      className={`update-table w-full bg-white dark:bg-dark-white h-full lg:min-h-[450px] overflow-hidden rounded-2xl section-shadow ${
+        className || ""
+      }`}
+    >
+      {loader ? (
+        <div className="w-full h-full flex justify-center items-center lg:min-h-[470px]">
+          <LoadingSpinner size={16} color="sky-blue" />
+        </div>
+      ) : (
+        <>
+          {filteredFamilyData && (
+            <div className="relative w-full overflow-x-auto sm:rounded-lg flex flex-col justify-between h-full">
+              <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
+                <tbody>
+                  {currentTask.map((value) => {
+                    const addedDate = value?.added.split(" ")[0];
+                    const selectedImage = require(`../../../assets/images/family/${
+                      value?.banner || "default.jpg"
+                    }`);
+                    return (
+                      <tr
+                        className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] hover:bg-gray-50"
+                        key={value.uid}
+                      >
+                        <td className="py-4">
+                          <div className="w-full flex justify-between items-center">
+                            <div className="account-name flex space-x-4 items-center">
+                              <div className="icon w-14 h-14 flex justify-center items-center">
+                                <img
+                                  src={selectedImage}
+                                  alt="task_img"
+                                  className="w-full object-cover"
+                                />
+                              </div>
+                              <div className="">
+                                <p className="text-xl font-bold text-dark-gray dark:text-white mb-2 capitalize line-clamp-1">
+                                  {value.title}
+                                </p>
+                                <p className="text-sm text-thin-light-gray font-medium">
+                                  {value.description}
+                                </p>
+                              </div>
+                            </div>
+                            <div className="px-2 flex flex-col items-center justify-center">
+                              <p className="text-sm font-bold text-dark-gray dark:text-white">
+                                {addedDate}
+                              </p>
+                              <p className="text-xs py-1.5 w-[70px] cursor-default tracking-wide rounded-full bg-gold text-white flex justify-center items-center">
+                                {value.status_text}
+                              </p>
+                            </div>
+                          </div>
+                        </td>
+                        <td className="text-right py-4 px-2">
+                          <button
+                            onClick={() =>
+                              setPopUp({
+                                show: true,
+                                data: { ...value, selectedImage },
+                              })
+                            }
+                            className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                          >
+                            View
+                          </button>
+                        </td>
+                      </tr>
+                    );
+                  })}
+                </tbody>
+              </table>
+              <PaginatedList
+                onClick={handlePagination}
+                prev={currentPage === 0}
+                next={currentPage + itemsPerPage >= filteredFamilyData?.length}
+                data={filteredFamilyData}
+                start={indexOfFirstItem}
+                stop={indexOfLastItem}
+              />
+            </div>
+          )}
+        </>
+      )}
+      {popUp.show && (
+        <SuggestTask
+          details={popUp.data}
+          onClose={() => {
+            setPopUp({ show: false, data: {} });
+          }}
+          continuePopupData={(value) =>
+            setContinueTaskPopup({ show: true, data: { ...value } })
+          }
+          situation={popUp.show}
+        />
+      )}
+
+      {/* Continue Task */}
+      {continueTaskPopup.show && (
+        <AssignTaskPopout
+          details={continueTaskPopup.data}
+          action={() => {
+            setContinueTaskPopup({ show: false, data: {} });
+          }}
+          situation={continueTaskPopup.show}
+        />
+      )}
+    </div>
+  );
+};
+
+export default FamilyWaitlist;

src/components/FamilyAcc/Tabs/ProfileInfo.jsx

@@ -0,0 +1,61 @@
+import React from "react";
+
+export default function ProfileInfo({
+  profileImg,
+  profileImgInput,
+  profileImgChangHandler,
+  browseProfileImg,
+  accountDetails,
+}) {
+  return (
+    <div className="flex flex-col items-center gap-6">
+      <div className="flex justify-center">
+        <div className="w-full relative">
+          <img
+            src={profileImg}
+            alt=""
+            className="sm:w-[198px] sm:h-[198px] w-[120px] h-[120px] rounded-full overflow-hidden object-cover"
+          />
+          <input
+            ref={profileImgInput}
+            onChange={(e) => profileImgChangHandler(e)}
+            type="file"
+            className="hidden"
+          />
+          <div
+            onClick={browseProfileImg}
+            className="w-[32px] h-[32px] absolute bottom-7 sm:right-2 right-[105px]  hover:bg-pink bg-dark-gray rounded-full cursor-pointer"
+          >
+            <svg
+              width="32"
+              height="32"
+              viewBox="0 0 32 32"
+              fill="none"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M16.5147 11.5C17.7284 12.7137 18.9234 13.9087 20.1296 15.115C19.9798 15.2611 19.8187 15.4109 19.6651 15.5683C17.4699 17.7635 15.271 19.9587 13.0758 22.1539C12.9334 22.2962 12.7948 22.4386 12.6524 22.5735C12.6187 22.6034 12.5663 22.6296 12.5213 22.6296C11.3788 22.6334 10.2362 22.6297 9.09365 22.6334C9.01498 22.6334 9 22.6034 9 22.536C9 21.4009 9 20.2621 9.00375 19.1271C9.00375 19.0746 9.02997 19.0109 9.06368 18.9772C10.4123 17.6249 11.7609 16.2763 13.1095 14.9277C14.2295 13.8076 15.3459 12.6913 16.466 11.5712C16.4884 11.5487 16.4997 11.5187 16.5147 11.5Z"
+                fill="white"
+              />
+              <path
+                d="M20.9499 14.2904C19.7436 13.0842 18.5449 11.8854 17.3499 10.6904C17.5634 10.4694 17.7844 10.2446 18.0054 10.0199C18.2639 9.76139 18.5261 9.50291 18.7884 9.24443C19.118 8.91852 19.5713 8.91852 19.8972 9.24443C20.7251 10.0611 21.5492 10.8815 22.3771 11.6981C22.6993 12.0165 22.7105 12.4698 22.3996 12.792C21.9238 13.2865 21.4443 13.7772 20.9686 14.2717C20.9648 14.2792 20.9536 14.2867 20.9499 14.2904Z"
+                fill="white"
+              />
+            </svg>
+          </div>
+        </div>
+      </div>
+      <div className="flex flex-col justify-center gap-3 items-center">
+        <h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
+          {accountDetails?.firstname}
+        </h1>
+        <h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
+          {accountDetails?.lastname}
+        </h1>
+        <h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
+          {accountDetails?.age}
+        </h1>
+      </div>
+    </div>
+  );
+}

src/components/FamilyAcc/Tabs/index.js

@@ -0,0 +1,15 @@
+import FamilyAccount from "./FamilyAccount";
+import FamilyProfile from "./FamilyProfile";
+import FamilyTasks from "./FamilyTasks";
+import FamilyWaitlist from "./FamilyWaitlist";
+import FamilyPending from "./FamilyPending";
+import ProfileInfo from "./ProfileInfo";
+
+export {
+  FamilyAccount,
+  FamilyProfile,
+  FamilyTasks,
+  FamilyWaitlist,
+  FamilyPending,
+  ProfileInfo,
+};

src/components/FamilyPopup/SuggestTask.jsx

@@ -0,0 +1,277 @@
+import { useState } from "react";
+import { useLocation } from "react-router-dom";
+import ModalCom from "../Helpers/ModalCom";
+import { Form, Formik } from "formik";
+import InputCom from "../Helpers/Inputs/InputCom";
+import usersService from "../../services/UsersService";
+import Icons from "../Helpers/Icons";
+
+const DEFAULT_IMAGE = require("../../assets/images/family/default.jpg");
+const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {
+  const { pathname, state } = useLocation();
+  const [submitTask, setSubmitTask] = useState({
+    loading: false,
+    msg: "",
+    state: "",
+  });
+  const [suggestedNextStep, setSuggestedNextStep] = useState("Send Task");
+
+  const switchNextStep = ({ target: value }) => {
+    setSuggestedNextStep(value);
+  };
+
+  const selectedImage = details?.selectedImage || DEFAULT_IMAGE;
+  const initialValues = {
+    title: details?.title || "",
+    description: details?.description || "",
+    banner: details?.banner,
+  };
+
+  const apiCall = new usersService();
+
+  const handleSuggestedTask = async (values) => {
+    if (!values.title && !values.description) return;
+    try {
+      setSubmitTask({ loading: true });
+      const reqData = { ...values };
+      const res = await apiCall.sendFamilySuggestedTasks(reqData);
+      if (res.internal_return < 0) {
+        setSubmitTask({ loading: false, msg: res.status, state: "bad" });
+        return;
+      }
+      setSubmitTask({ loading: false, msg: res.status, state: "success" });
+      setTimeout(() => {
+        onClose();
+      }, 2000);
+    } catch (error) {
+      setSubmitTask({ loading: false, msg: error, state: "bad" });
+      throw new Error("Error Occurred", error);
+    }
+  };
+
+  const handleParentSuggestion = (values) => {
+    if (suggestedNextStep == "Send Task") {
+      let firstName = state?.firstname;
+      let family_uid = state?.family_uid;
+      continuePopupData({ ...details, firstName, family_uid });
+    }
+    onClose();
+  };
+
+  return (
+    <ModalCom action={onClose} situation={situation}>
+      <div className="logout-modal-wrapper lw-[90%] md:w-[768px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
+        <div className="logout-modal-header w-full flex items-center justify-between lg:p-6 px-[30px] py-[23px] border-b dark:border-[#5356fb29]  border-light-purple">
+          <h1 className="text-base md:text-lg font-bold text-dark-gray dark:text-white tracking-wide">
+            {pathname === "/manage-family"
+              ? `${state?.firstname}'s Suggested Task`
+              : "Suggest to Parent"}
+          </h1>
+          <button
+            type="button"
+            className="text-[#374557] dark:text-red-500"
+            onClick={onClose}
+          >
+            <svg
+              width="36"
+              height="36"
+              viewBox="0 0 36 36"
+              fill="none"
+              className="fill-current"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M36 16.16C36 17.4399 36 18.7199 36 20.0001C35.7911 20.0709 35.8636 20.2554 35.8385 20.4001C34.5321 27.9453 30.246 32.9248 22.9603 35.2822C21.9006 35.6251 20.7753 35.7657 19.6802 35.9997C18.4003 35.9997 17.1204 35.9997 15.8401 35.9997C15.5896 35.7086 15.2189 35.7732 14.9034 35.7093C7.77231 34.2621 3.08728 30.0725 0.769671 23.187C0.435002 22.1926 0.445997 21.1199 0 20.1599C0 18.7198 0 17.2798 0 15.8398C0.291376 15.6195 0.214408 15.2656 0.270759 14.9808C1.71321 7.69774 6.02611 2.99691 13.0428 0.700951C14.0118 0.383805 15.0509 0.386897 15.9999 0C17.2265 0 18.4532 0 19.6799 0C19.7156 0.124041 19.8125 0.136067 19.9225 0.146719C27.3 0.868973 33.5322 6.21922 35.3801 13.427C35.6121 14.3313 35.7945 15.2484 36 16.16ZM33.011 18.0787C33.0433 9.77105 26.3423 3.00309 18.077 2.9945C9.78479 2.98626 3.00344 9.658 2.98523 17.8426C2.96667 26.1633 9.58859 32.9601 17.7602 33.0079C26.197 33.0577 32.9787 26.4186 33.011 18.0787Z"
+                fill=""
+                fillOpacity="0.6"
+              />
+              <path
+                d="M15.9309 18.023C13.9329 16.037 12.007 14.1207 10.0787 12.2072C9.60071 11.733 9.26398 11.2162 9.51996 10.506C9.945 9.32677 11.1954 9.0811 12.1437 10.0174C13.9067 11.7585 15.6766 13.494 17.385 15.2879C17.9108 15.8401 18.1633 15.7487 18.6375 15.258C20.3586 13.4761 22.1199 11.7327 23.8822 9.99096C24.8175 9.06632 26.1095 9.33639 26.4967 10.517C26.7286 11.2241 26.3919 11.7413 25.9133 12.2178C24.1757 13.9472 22.4477 15.6855 20.7104 17.4148C20.5228 17.6018 20.2964 17.7495 20.0466 17.9485C22.0831 19.974 24.0372 21.8992 25.9689 23.8468C26.9262 24.8119 26.6489 26.1101 25.4336 26.4987C24.712 26.7292 24.2131 26.3441 23.7455 25.8757C21.9945 24.1227 20.2232 22.3892 18.5045 20.6049C18.0698 20.1534 17.8716 20.2269 17.4802 20.6282C15.732 22.4215 13.9493 24.1807 12.1777 25.951C11.7022 26.4262 11.193 26.7471 10.4738 26.4537C9.31345 25.9798 9.06881 24.8398 9.98589 23.8952C11.285 22.5576 12.6138 21.2484 13.9387 19.9355C14.5792 19.3005 15.2399 18.6852 15.9309 18.023Z"
+                fill="#"
+                fillOpacity="0.6"
+              />
+            </svg>
+          </button>
+        </div>
+        <Formik
+          initialValues={initialValues}
+          onSubmit={
+            pathname !== "/manage-family"
+              ? handleSuggestedTask
+              : handleParentSuggestion
+          }
+        >
+          {(props) => {
+            return (
+              <Form>
+                <div className="p-5 w-full bg-white rounded-md flex justify-between">
+                  {/* Image Section */}
+                  <div className="p-4 w-full md:w-2/4 md:border-r-2">
+                    <div
+                      className="w-full h-[236px] p-6 bg-gray-400 rounded-xl overflow-hidden"
+                      style={{
+                        background: `url(${selectedImage}) center / contain no-repeat`,
+                      }}
+                    ></div>
+                  </div>
+
+                  {/* ACTION SECTION */}
+                  <div className="p-4 w-full md:w-2/4 h-full">
+                    {/* Title */}
+                    <div className="field w-full mb-[15px]">
+                      <InputCom
+                        fieldClass={
+                          pathname === "/manage-family" ? "px-2" : "px-6"
+                        }
+                        label="Title"
+                        labelClass="tracking-wide"
+                        inputBg={
+                          pathname === "/manage-family"
+                            ? "bg-white"
+                            : "bg-slate-100"
+                        }
+                        inputClass="disabled:cursor-default"
+                        type="text"
+                        name="title"
+                        disable={details?.title}
+                        value={props.values.title}
+                        inputHandler={props.handleChange}
+                        blurHandler={props.handleBlur}
+                        error={
+                          props.errors.title &&
+                          props.touched.title &&
+                          props.errors.title
+                        }
+                      />
+                    </div>
+
+                    {/* Description */}
+                    <div className="field w-full mb-[5px]">
+                      <label
+                        htmlFor="description"
+                        className='className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold flex items-center gap-1'
+                      >
+                        Description
+                        {props.errors.description &&
+                          props.touched.description && (
+                            <span className="text-[12px] text-red-500">
+                              {props.errors.description}
+                            </span>
+                          )}
+                      </label>
+                      <textarea
+                        id="description"
+                        rows="5"
+                        className={`input-field pt-2 placeholder:text-base text-dark-gray dark:text-white w-full ${
+                          pathname === "/manage-family"
+                            ? "px-2 h-[110px]"
+                            : "bg-slate-100 px-3 dark:bg-[#11131F] focus:ring-0 focus:outline-[#dce4e9] rounded-[10px] h-[130px]"
+                        }`}
+                        style={{ resize: "none" }}
+                        name="description"
+                        value={props.values.description}
+                        onChange={props.handleChange}
+                        onBlur={props.handleBlur}
+                      />
+                    </div>
+
+                    {/* Radio buttons for family */}
+                    {pathname === "/manage-family" ? (
+                      <div className="h-[20px] w-full border-t dark:border-[#5356fb29] border-light-purple relative">
+                        <div id="my-radio-group" className="sr-only">
+                          Parent suggested next step
+                        </div>
+                        <div
+                          role="group"
+                          className="flex items-center justify-between py-2"
+                          aria-labelledby="parent-suggested-radio-group"
+                        >
+                          {[
+                            { title: "Send Task" },
+                            { title: "Duplicate" },
+                            { title: "Not Now" },
+                          ].map(({ title }, idx) => (
+                            <label
+                              role="group"
+                              key={idx}
+                              htmlFor={`parent-suggested-${idx}`}
+                              className={`transition duration-150 ease-in-out parent-suggest`}
+                            >
+                              <input
+                                type="radio"
+                                name="parent-suggested"
+                                value={title}
+                                checked={suggestedNextStep === title}
+                                onChange={switchNextStep}
+                                className={`transition duration-150 ease-in-out parent-suggest`}
+                              />
+                              <span
+                                onClick={() => setSuggestedNextStep(title)}
+                                id={`parent-suggested-${idx}`}
+                                name="parent-suggested"
+                                className={`ml-1 ${
+                                  title == "Not Now"
+                                    ? "text-red-500"
+                                    : title == "Duplicate"
+                                    ? "text-purple"
+                                    : "text-black"
+                                } font-semibold`}
+                              >
+                                {title}
+                              </span>
+                            </label>
+                          ))}
+                        </div>
+                      </div>
+                    ) : null}
+                  </div>
+                </div>
+
+                <div className="w-full h-[70px] border-t border-light-purple dark:border-[#5356fb29]  flex justify-end items-center">
+                  <div className="flex items-center space-x-4 mr-9">
+                    <button
+                      type="button"
+                      className=" border-gradient text-18 tracking-wide px-4 py-3 rounded-full"
+                      onClick={onClose}
+                    >
+                      <span className="text-gradient"> Cancel</span>
+                    </button>
+                    <button
+                      type="submit"
+                      disabled={props.isSubmitting}
+                      className="text-white primary-gradient text-18 tracking-wide px-4 py-3 rounded-full transition duration-150 ease-in-out flex items-center"
+                    >
+                      {pathname !== "/manage-family" ? (
+                        <>
+                          {submitTask.loading
+                            ? "Submitting Task"
+                            : submitTask.state == "success"
+                            ? "Task Submitted"
+                            : submitTask.state == "bad"
+                            ? "An Error Occurred"
+                            : "Send to Parents"}
+                        </>
+                      ) : (
+                        <>
+                          {suggestedNextStep == "Send Task" ? (
+                            <>
+                              Continue <Icons name="chevron-right" />
+                            </>
+                          ) : (
+                            "Complete"
+                          )}
+                        </>
+                      )}
+                    </button>
+                  </div>
+                </div>
+              </Form>
+            );
+          }}
+        </Formik>
+      </div>
+    </ModalCom>
+  );
+};
+
+export default SuggestTask;

src/components/Helpers/Accordion.jsx

@@ -10,7 +10,7 @@ export default function Accordion({ datas }) {
     <>
       <div className="accordion-item overflow-hidden relative z-[1]">
         <div
-          className="accordion-title-bar flex items-center space-x-3 py-5 border-b  border-light-purple dark:border-[#5356fb29] "
+          className="accordion-title-bar flex items-center space-x-3 py-5 border-b  border-light-purple dark:border-[#5356fb29] cursor-pointer"
           onClick={accordionHandler}
         >
           <div className="accordion-title-icon relative">
@@ -36,7 +36,7 @@ export default function Accordion({ datas }) {
             <div className="w-[3px] h-auto bg-purple rounded-[28px]"></div>
             <div className="flex-1">
               <p className="text-base text-thin-light-gray tracking-wide">
-                {datas.content}
+                {datas.msg}
               </p>
             </div>
           </div>

src/components/Helpers/CountDown.jsx

@@ -1,59 +1,64 @@
-/* eslint-disable no-underscore-dangle */
-import React, { useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 
 function CountDown({ lastDate = "" }) {
-  //   const [showDate, setDate] = useState(0);
-  const [showHour, setHour] = useState(0);
-  const [showMinute, setMinute] = useState(0);
-  const [showSecound, setDateSecound] = useState(0);
-  // count Down
-  const provideDate = new Date(lastDate);
-  // format date
-  const year = provideDate.getFullYear();
-  const month = provideDate.getMonth();
-  //   console.log(month);
-  const date = provideDate.getDate();
-  //   console.log(date);
-  const hours = provideDate.getHours();
-  //   console.log(hours);
-  const minutes = provideDate.getMinutes();
-  //   console.log(minutes);
-  const seconds = provideDate.getSeconds();
-  //   console.log(seconds);
-
-  // date calculation logic
-  const _seconds = 1000;
-  const _minutes = _seconds * 60;
-  const _hours = _minutes * 60;
-  const _date = _hours * 24;
-
-  // interval function
-  const startInterval = () => {
-    const timer = setInterval(() => {
-      const now = new Date();
-      const distance =
-        new Date(year, month, date, hours, minutes, seconds).getTime() -
-        now.getTime();
-      if (distance < 0) {
-        clearInterval(timer);
-        return;
-      }
-      //   setDate(Math.floor(distance / _date));
-      setMinute(Math.floor((distance % _hours) / _minutes));
-      setHour(Math.floor((distance % _date) / _hours));
-      setDateSecound(Math.floor((distance % _minutes) / _seconds));
-    }, 1000);
-  };
-
-  // effect
-  useEffect(() => {
-    if (lastDate !== "") {
-      startInterval();
-    }
+  // State to store the countdown values
+  const [countdownValues, setCountdownValues] = useState({
+    showHour: 0,
+    showMinute: 0,
+    showSecond: 0,
   });
+
+  useEffect(() => {
+    if (lastDate) {
+      // Interval function to update countdown values
+      const intervalId = setInterval(() => {
+        const now = new Date().getTime();
+        const targetDate = new Date(lastDate).getTime();
+        const distance = targetDate - now;
+
+        if (distance < 0) {
+          // If the countdown has reached zero or gone past the target date, clear the interval
+          clearInterval(intervalId);
+          setCountdownValues({
+            showHour: 0,
+            showMinute: 0,
+            showSecond: 0,
+          });
+          return;
+        }
+
+        // Calculate the countdown values (days, hours, minutes, seconds)
+        const days = Math.floor(distance / (1000 * 60 * 60 * 24));
+        const hours = Math.floor(
+          (distance % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60)
+        );
+        const minutes = Math.floor((distance % (1000 * 60 * 60)) / (1000 * 60));
+        const seconds = Math.floor((distance % (1000 * 60)) / 1000);
+
+        // since we don't have a slot for days...
+        const totalHours = days * 24 + hours;
+
+        // Update the countdown values in the state
+        setCountdownValues({
+          showHour: totalHours,
+          showMinute: minutes,
+          showSecond: seconds,
+        });
+      }, 1000);
+
+      // Clean up the interval on component unmount or when the lastDate prop changes
+      return () => clearInterval(intervalId);
+    }
+  }, [lastDate]);
+
+  // Destructure the countdown values from the state
+  const { showHour, showMinute, showSecond } = countdownValues;
+
   return (
     <span>
-      {showHour} : {showMinute} : {showSecound}
+      {showHour < 10 ? "0" + showHour : showHour} :{" "}
+      {showMinute < 10 ? "0" + showMinute : showMinute} :{" "}
+      {showSecond < 10 ? "0" + showSecond : showSecond}
     </span>
   );
 }

src/components/Helpers/Icons.jsx

@@ -1,4 +1,9 @@
 import React from "react";
+import localImgLoad from "../../lib/localImgLoad";
+
+import ATMCard from "../../assets/images/card.svg";
+import VisaCard from "../../assets/images/visa.svg";
+import MasterCard from "../../assets/images/master.svg";
 
 export default function Icons({ name }) {
   return (
@@ -468,6 +473,21 @@ export default function Icons({ name }) {
         >
           <rect y="0.823242" width="20" height="2.35294" rx="1.17647" />
         </svg>
+      ) : name === "chevron-right" ? (
+        <svg
+          xmlns="http://www.w3.org/2000/svg"
+          fill="none"
+          viewBox="0 0 24 24"
+          stroke-width="1.5"
+          stroke="currentColor"
+          className="w-4 h-4"
+        >
+          <path
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            d="M8.25 4.5l7.5 7.5-7.5 7.5"
+          />
+        </svg>
       ) : name === "right-arrow" ? (
         <svg
           width="24"
@@ -483,7 +503,27 @@ export default function Icons({ name }) {
       c0.3,0,0.5-0.1,0.7-0.3l5.7-5.7c0,0,0,0,0,0C15.9,12.3,15.9,11.7,15.5,11.3z"
           ></path>
         </svg>
-      ) : (
+      ) : name === "atm-card" ? (
+        <img className="w-[20px]" src={ATMCard} alt="card" />
+      ) : name === "visa-card" ? (
+        <img className="w-[20px]" src={VisaCard} alt="card" />
+      ) : name === "master-card" ? (
+        <img className="w-[20px]" src={MasterCard} alt="card" />
+      ) : name === "new-dashboard" ? (
+        <img className="w-[17px] h-[17px]" src={localImgLoad('images/icons/dashboard.svg')} alt="dashboard" />
+      ) : name === "new-family" ? (
+        <img className="w-[17px] h-[17px]" src={localImgLoad('images/icons/family.svg')} alt="family" />
+      ) : name === "new-logout" ? (
+        <img className="w-[45px] rounded-full bg-white p-1" src={localImgLoad('images/icons/logout.svg')} alt="logout" />
+      ) : name === "new-market" ? (
+        <img className="w-[17px] h-[17px]" src={localImgLoad('images/icons/market.svg')} alt="market" />
+      ) : name === "new-mytask" ? (
+        <img className="w-[17px] h-[17px]" src={localImgLoad('images/icons/my-task.svg')} alt="task" />
+      ) : name === "family-id" ? (
+        <img className="w-[20px] h-[20px]" src={localImgLoad('images/icons/family-id.svg')} alt="family-id" />
+      ) : name === "family-pin" ? (
+        <img className="w-[20px] h-[20px]" src={localImgLoad('images/icons/family-pin.svg')} alt="family-pin" />
+      ): (
         ""
       )}
     </>

src/components/Helpers/Inputs/InputCom/index.jsx

@@ -1,6 +1,6 @@
 import React, { useRef } from "react";
-import Icons from "../../Icons";
 import { Link } from "react-router-dom";
+import Icons from "../../Icons";
 
 export default function InputCom({
   label,
@@ -21,7 +21,8 @@ export default function InputCom({
   blurHandler,
   spanTag,
   inputBg,
-  direction
+  direction,
+  error,
 }) {
   const inputRef = useRef(null);
   // Entry Validation
@@ -40,22 +41,29 @@ export default function InputCom({
   // for Patterns
   const inputPatterns = () => {
     const inputConfig = inputConfigs[inputRef?.current?.name]?.pattern;
-    return inputConfig || ""
-  }
+    return inputConfig || "";
+  };
   return (
     <div className={`input-com ${parentClass}`}>
       <div className={`flex items-center justify-between mb-2.5 ${labelClass}`}>
         {label && (
           <label
-            className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold block"
+            className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold flex items-center gap-1"
             htmlFor={name}
           >
             {label}
-            {spanTag && (
+            {spanTag && spanTag == "*" ? (
+              <span className="text-red-700 text-sm tracking-wide">
+                {" "}
+                {spanTag}
+              </span>
+            ) : (
               <span className="text-green-700 text-sm tracking-wide">
                 {spanTag}
               </span>
             )}
+            {/* displays error is any */}
+            {error && <span className="text-[12px] text-red-500">{error}</span>} 
           </label>
         )}
         {forgotPassword && (
@@ -68,13 +76,13 @@ export default function InputCom({
         )}
       </div>
       <div
-        className={`input-wrapper border border-[#f5f8fa] dark:border-[#5e6278] w-full rounded-[0.475rem] h-[42px] overflow-hidden relative font-medium leading-6 bg-clip-padding text-[#5e6278] dark:text-gray-100 bg-[#f5f8fa] dark:bg-[#5e6278] text-base ${inputClass}`}
+        className={`input-wrapper w-full rounded-full h-[42px] overflow-hidden relative font-medium leading-6 bg-clip-padding text-base ${inputClass ? inputClass : "text-[#5e6278] dark:text-gray-100 bg-[#f5f8fa] dark:bg-[#5e6278] border"}`}
       >
         <input
           placeholder={placeholder}
           value={value}
           onChange={inputHandler}
-          className={`input-field placeholder:text-base text-dark-gray w-full h-full ${
+          className={`input-field placeholder:text-base text-dark-gray w-full h-full tracking-wide ${
             inputBg ? inputBg : "bg-[#FAFAFA]"
           } dark:bg-[#11131F] focus:ring-0 focus:outline-none ${fieldClass}`}
           type={type}
@@ -89,8 +97,10 @@ export default function InputCom({
           dir={direction}
         />
         {iconName && (
-          <div className="absolute right-6 bottom-[10px] z-10">
-            <Icons name={iconName} />
+          <div className="absolute right-6 bottom-[10px] z-10 flex gap-2">
+            {iconName.split(" ").map((item, index) => (
+              <Icons key={index} name={item} />
+            ))}
           </div>
         )}
         {passIcon && (
@@ -116,6 +126,9 @@ const inputConfigs = {
   province: { minLength: 3, maxLength: 25, pattern: "[a-zA-Z]+" },
   city: { minLength: 3, maxLength: 25, pattern: "[a-zA-Z]+" },
   amount: { minLength: 1, maxLength: 9, pattern: "[0-9]+" },
+  description: { minLength: 5, maxLength: 299 },
+  title: { minLength: 5, maxLength: 149 },
+  job_detail: { minLength: 4, maxLength: 1440 }
 };
 
 /* Numbers Only: <input type="text" pattern="[0-9]*" /> strictly numbers

src/components/Helpers/PriceFormatter.jsx

@@ -0,0 +1,51 @@
+import React from "react";
+
+// export const PriceFormatter = (price, currency, currencyName) => {
+//   const supportedCurrencies = ["USD", "EUR", "GBP"];
+//   const symbolFormatter = supportedCurrencies.includes(currency)
+//     ? currency
+//     : undefined;
+
+//   const formatter = new Intl.NumberFormat("en", {
+//     style: symbolFormatter,
+//     currencyDisplay: "symbol",
+//     minimumFractionDigits: 2,
+//   });
+
+//   const displayCurrencyName = symbolFormatter ? "" : currencyName;
+
+//   return `${formatter.format(price)} ${displayCurrencyName}`;
+// };
+
+export const PriceFormatter = (
+  price = "00",
+  currency = "",
+  currencyName = ""
+) => {
+  // Convert the number to a string
+  let numStr = String(price);
+
+  // Split the string into integer and decimal parts
+  let parts = numStr.split(".");
+  let integerPart = parts[0] || "";
+  let decimalPart = parts[1] || "";
+
+  // Add thousands separators to the integer part
+  // let formattedInteger = integerPart.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+  let formattedInteger = integerPart;
+
+  // Truncate or pad the decimal part to two decimal points
+  let formattedDecimal = decimalPart.slice(0, 2).padEnd(2, "0");
+
+  // Combine the formatted integer and decimal parts
+  // let formattedNumber = formattedInteger + '.' + formattedDecimal;
+
+  // return formattedNumber;
+  return (
+    <span className="text-sm flex items-center">
+      <sup>{currency || currencyName || ""}</sup>
+      <span className="px-1 font-bold text-lg">{formattedInteger || ""}</span>
+      <sup>{formattedDecimal || ""}</sup>
+    </span>
+  );
+};

src/components/Helpers/SearchCom.jsx

@@ -1,7 +1,13 @@
-import React from "react";
+import React, { useState } from "react";
 import Icons from "./Icons";
 
-export default function SearchCom({ className, inputClasses }) {
+export default function SearchCom({
+  className,
+  inputClasses,
+  placeholder,
+  handleSearch,
+  value,
+}) {
   return (
     <div
       className={`w-full h-[48px]  pl-8 flex rounded-full overflow-hidden bg-white dark:bg-dark-white   ${
@@ -17,7 +23,9 @@ export default function SearchCom({ className, inputClasses }) {
             inputClasses || ""
           }`}
           type="text"
-          placeholder="Search items, collections..."
+          onInput={handleSearch}
+          value={value}
+          placeholder={placeholder || "Search items, collections..."}
         />
       </div>
     </div>

src/components/Helpers/SelectBox/index.jsx

@@ -1,7 +1,7 @@
 import React, { useState } from "react";
 import useToggle from "../../../hooks/useToggle";
 
-function SelectBox({ datas = [], className, action, contentBodyClasses }) {
+function SelectBox({ datas = [], className, action, contentBodyClasses, position }) {
   const [item, setItem] = useState(datas[0]);
   // custom hook
   const [toggle, setToggle] = useToggle(false);
@@ -49,7 +49,7 @@ function SelectBox({ datas = [], className, action, contentBodyClasses }) {
 
           <div
             style={{ boxShadow: "0px 4px 87px 0px #0000002B" }}
-            className={`drop-down-content w-[120px] bg-white dark:bg-dark-white   rounded-[4px] p-3 absolute right-0 top-[100%] z-20 ${
+            className={`drop-down-content w-[120px] bg-white dark:bg-dark-white   rounded-[4px] p-3 absolute ${position =='left' ? 'left-0' : 'right-0'} top-[100%] z-20 ${
               toggle ? "active" : ""
             } ${contentBodyClasses || ""}`}
           >

src/components/History/index.jsx

@@ -13,7 +13,9 @@ import LoadingSpinner from "../Spinners/LoadingSpinner";
 
 export default function History() {
 
-  const apiCall = new usersService()
+    const apiCall = new usersService()
+
+    let [tab, setTab] = useState("purchases"); //STATE FOR SWITCHING BETWEEN TABS
 
     let [paymentHistory, setPaymentHistory] = useState({ // FOR PAYMENT HISTORY
         loading: true,
@@ -63,7 +65,7 @@ export default function History() {
     <>
       <Layout>
         <div className="history-wrapper w-full mb-10">
-          <div className="main-wrapper w-full">
+          <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">
@@ -213,35 +215,59 @@ export default function History() {
             {/*</div>*/}
             {/*<MarketHistorySection />*/}
             {/* <TopHxBox className="mb-11" /> */}
-            <div className='w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin'>
-                {/* PURCHASE SECTION */}
-                <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
-                    <div className="wallet w-full md:p-8 p-4 h-full max-h-[700px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
-                        <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">Purchases</h1>
-                        {purchaseHistory.loading ? 
-                        <LoadingSpinner size='16' color='sky-blue' />
-                        :
-                        <PurchasesTable purchase={purchaseHistory} />
-                        }
-                    </div>
+            <div className='w-full p-4 md:p-8 bg-white dark:bg-dark-white rounded-2xl shadow bottomMargin'>
+                {/* switch button */}
+                <div className="my-1 flex items-center border-b border-slate-300">
+                    <button
+                    name="purchases"
+                    onClick={(e) => setTab(e.target.name)}
+                    className={`p-2 text-lg font-bold text-slate-600 dark:text-white border ${
+                        tab == "purchases" ? "border-sky-blue" : "border-slate-300"
+                    } tracking-wide transition duration-200`}
+                    >
+                    Purchases
+                    </button>
+                    <button
+                    name="recent"
+                    onClick={(e) => setTab(e.target.name)}
+                    className={`p-2 text-lg font-bold text-slate-600 dark:text-white border ${
+                        tab == "recent" ? "border-sky-blue" : "border-slate-300"
+                    }  tracking-wide transition duration-200`}
+                    >
+                    Recent Activity
+                    </button>
                 </div>
-                {/* END OF PURCHASE SECTION */}
-
-                {/* RECENT ACTIVITY SECTION */}
-                <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
-                    <div className="wallet w-full md:p-8 p-4 h-full max-h-[700px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
-                        <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">Recent Activity</h1>
-                        {/* <p className='text-base text-slate-500 dark:text-white'>Activity Report</p> */}
-                        {paymentHistory.loading ? 
-                        <LoadingSpinner size='16' color='sky-blue' />
-                        :
-                        <RecentActivityTable payment={paymentHistory} />
+                {/* END OF switch button */}
+                <div className="history-tables w-full">
+                    {/* PURCHASE SECTION */}
+                    {tab == 'purchases' &&
+                        <div className="wallet w-full border-t">
+                            <h1 className="p-2 text-xl font-bold text-dark-gray dark:text-white tracking-wide">Purchases</h1>
+                            {purchaseHistory.loading ? 
+                            <LoadingSpinner size='16' color='sky-blue' />
+                            :
+                            <PurchasesTable purchase={purchaseHistory} />
+                            }
+                        </div>
                     }
-                    </div>
+                    {/* END OF PURCHASE SECTION */}
+                    
+                    {/* RECENT ACTIVITY SECTION */}
+                    {tab == 'recent' &&
+                        <div className="wallet w-full border-t">
+                            <h1 className="p-2 text-xl font-bold text-dark-gray dark:text-white tracking-wide">Recent Activity</h1>
+                            {/* <p className='text-base text-slate-500 dark:text-white'>Activity Report</p> */}
+                            {paymentHistory.loading ? 
+                            <LoadingSpinner size='16' color='sky-blue' />
+                            :
+                            <RecentActivityTable payment={paymentHistory} />
+                        }
+                        </div>
+                    }
+                    {/* END OF RECENT ACTIVITY SECTION */}
                 </div>
-                {/* END OF RECENT ACTIVITY SECTION */}
             </div>
-            <HistoryTable />
+            {/*<HistoryTable />*/}
           </div>
         </div>
       </Layout>

src/components/Home/FamilyActiveLSlde.jsx

@@ -1,20 +1,22 @@
 import React, { useRef } from "react";
-import ProductCardStyleOne from "../Cards/ProductCardStyleOne";
+//import ProductCardStyleOne from "../Cards/ProductCardStyleOne";
 import Icons from "../Helpers/Icons";
 import SliderCom from "../Helpers/SliderCom";
+import FamilyActiveJobsCard from "../Cards/FamilyActiveJobsCard";
 
 export default function FamilyActiveLSlde({ className, trending }) {
     const settings = {
         arrows: false,
-        slidesToShow: 4,
-        slidesToScroll: 4,
-        infinite: true,
+        slidesToShow: 3,
+        slidesToScroll: 3,
+        infinite: trending?.length > 3,
         responsive: [
             {
                 breakpoint: 1025,
                 settings: {
                     slidesToShow: 3,
                     slidesToScroll: 3,
+                    infinite: trending?.length > 3,
                 },
             },
             {
@@ -22,6 +24,7 @@ export default function FamilyActiveLSlde({ className, trending }) {
                 settings: {
                     slidesToShow: 2,
                     slidesToScroll: 2,
+                    infinite: trending?.length > 2,
                 },
             },
             {
@@ -29,6 +32,7 @@ export default function FamilyActiveLSlde({ className, trending }) {
                 settings: {
                     slidesToShow: 1,
                     slidesToScroll: 1,
+                    infinite: trending?.length > 1,
                 },
             },
         ],
@@ -89,12 +93,12 @@ export default function FamilyActiveLSlde({ className, trending }) {
                 </div>
             </div>
             {/* trending products */}
-            <div className="trending-products relative w-full">
+            <div className="trending-products slider-left relative w-full rounded-2xl p-[10px] bg-alice-blue">
                 <SliderCom selector={trendingSlider} settings={settings}>
                     {trending &&
                         trending.length > 0 &&
                         trending.map((item) => (
-                            <ProductCardStyleOne key={item.id} datas={item} />
+                            <FamilyActiveJobsCard key={item.id} datas={item} />
                         ))}
                 </SliderCom>
             </div>

src/components/Home/FamilyDash.jsx

@@ -3,23 +3,27 @@ import datas from "../../data/product_data.json";
 import TopSellerTopBuyerSliderSection from "./TopSellerTopBuyerSliderSection";
 import CommonHead from "../UserHeader/CommonHead";
 import FamilyActiveLSlde from "./FamilyActiveLSlde";
+import ParentWaiting from "../MyPendingJobs/ParentWaiting";
+import MyOffersFamilyTable from "../MyTasks/MyOffersFamilyTable";
 
+export default function FamilyDash({familyOffers, MyActiveJobList}) {
+  console.log("PROPS IN FAMILY DASH->", familyOffers);
 
-
-export default function FamilyDash(props) {
-
-    console.log("PROPS IN FAMILY DASH->",props);
-
-    const trending = datas.datas;
-    return (
-        <div>
-            <div className="home-page-wrapper">
-                <CommonHead
-                    commonHeadData={props.commonHeadData}
-                />
-                <FamilyActiveLSlde trending={trending} className="mb-10" />
-                <TopSellerTopBuyerSliderSection className="mb-10" />
-            </div>
-        </div>
-    );
-}
+  const trending = MyActiveJobList;
+  return (
+    <div>
+      <div className="home-page-wrapper">
+        {/* <CommonHead commonHeadData={props.commonHeadData} /> */}
+        {familyOffers && familyOffers.length > 0 &&
+        <MyOffersFamilyTable familyOffers={familyOffers} className="mb-10" />
+        }
+        {trending && trending.length > 0 &&
+        <FamilyActiveLSlde trending={trending} className="mb-10" />
+        }
+        
+        {/*<TopSellerTopBuyerSliderSection className="mb-10" />*/}
+        <ParentWaiting className="mb-10" />
+      </div>
+    </div>
+  );
+}

src/components/Home/Hero.jsx

@@ -3,11 +3,7 @@ import { Link } from "react-router-dom";
 import { toast } from "react-toastify";
 import heroBg from "../../assets/images/hero-bg.svg";
 import heroUser from "../../assets/images/hero-user.png";
-import slider1 from "../../assets/images/slider-1.jpg";
-import slider2 from "../../assets/images/slider-2.jpg";
-import slider3 from "../../assets/images/slider-3.jpg";
 import CountDown from "../Helpers/CountDown";
-import SliderCom from "../Helpers/SliderCom";
 import HomeSliders from "./HomeSliders";
 import { useSelector } from "react-redux";
 
@@ -20,18 +16,7 @@ export default function Hero({ className, bannerList, nextDueTask }) {
     swipe: true,
   };
   const sildeData = null;
-  const [addFavorite, setValue] = useState(false);
-
   const { userDetails } = useSelector((state) => state?.userDetails);
-  const favoriteHandler = () => {
-    if (!addFavorite) {
-      setValue(true);
-      toast.success("Added to Favorite List");
-    } else {
-      setValue(false);
-      toast.warn("Remove to Favorite List");
-    }
-  };
 
   let loginDate = userDetails?.last_login.split(" ")[0];
   let { firstname, lastname, email, profile_pic } = userDetails;
@@ -71,15 +56,15 @@ export default function Hero({ className, bannerList, nextDueTask }) {
           </div>
         </div>
         {/* countdown */}
-        {nextDueTask?.next_due && Object.keys(nextDueTask.next_due)?.length && (
+        {nextDueTask?.next_due && Object.keys(nextDueTask.next_due)?.length != 0 && (
           <div className="w-full h-32 flex justify-evenly items-center sm:p-6 p-1 rounded-2xl border border-white-opacity">
             <div className="flex flex-col justify-between">
               <p className="text-base text-white tracking-wide">Current Task</p>
               <p className="lg:text-2xl text-lg font-bold tracking-wide text-white">
-                {nextDueTask.next_due.item_code}
+                {(nextDueTask.next_due.item_code).substr(0,4)+'...'}
               </p>
               <p className="text-base text-white tracking-wide">
-                {nextDueTask.next_due.price} Naira
+                {nextDueTask.next_due.price * 0.01} Naira
               </p>
             </div>
             <div className="w-[1px] h-full bg-white-opacity"></div>

src/components/Home/HomeSliders.jsx

@@ -1,19 +1,24 @@
 import SliderCom from "../Helpers/SliderCom";
+import slider2 from "../../assets/images/slider-2.jpg";
 import HomeBannerOffersCard from "../Cards/HomeBannerOffersCard";
 
 export default function HomeSliders(props) {
-  console.log("BANNER LIST IN HomeSliders->", props.bannerList);
   // debugger;
   return (
     <>
-      <div className="hero-slider relative 2xl:w-[600px] xl:w-[500px] lg:w-[420px] w-full mb-2 lg:mb-0 ">
+      <div className="hero-slider relative 2xl:w-[600px] xl:w-[400px] lg:w-[420px] w-full mb-2 lg:mb-0 ">
         <div className="w-full">
           <SliderCom settings={props.settings}>
-            {props.bannerList?.length &&
+            {props.bannerList?.length <= 0 && (
+              <div className="item w-full h-full bg-white dark:bg-dark-white max-h-80 rounded-2xl overflow-hidden">
+                <img src={slider2} alt="slider" className="w-full h-full" />
+              </div>
+            )}
+            {props.bannerList?.length > 0 &&
               props.bannerList.map((item, index) => (
                 <div
                   key={index}
-                  className="item w-full h-full bg-white dark:bg-dark-white rounded-2xl overflow-hidden"
+                  className="item w-full h-full bg-white dark:bg-dark-white   rounded-2xl overflow-hidden"
                 >
                   <HomeBannerOffersCard itemData={item} />
                 </div>

src/components/Home/index.jsx

@@ -8,14 +8,26 @@ import FullAccountDash from "./FullAccountDash";
 
 export default function Home(props) {
   console.log("PROPS IN HOME->", props);
+  const userApi = new usersService();
+  const { commonHeadBanner } = useSelector((state) => state.commonHeadBanner);
 
   let [nextDueTask, setNextDueTask] = useState({});
-
-  const userApi = new usersService();
+  const [MyOffersList, setMyOffersList] = useState([]);
 
   const { userDetails } = useSelector((state) => state?.userDetails);
 
-  const { commonHeadBanner } = useSelector((state) => state.commonHeadBanner);
+  const [MyActiveJobList, setMyActiveJobList] = useState([]); // STATE TO HOLD ACTIVE/CURRENT TASKS
+
+  const getMyActiveJobList = async () => { // FUNCTION TO POPULATE ACTIVE/CURRENT TASK LIST
+    try {
+      const res = await userApi.getMyActiveTaskList();
+      setMyActiveJobList(res?.data?.result_list);
+    } catch (error) {
+      setMyActiveJobList([]);
+      console.log("Error getting tasks");
+    }
+  };
+
 
   // FUNCTION TO GET DASH DATA TO DETERMINE CURRENT TASK DUE TIME
   const getHomeDate = () => {
@@ -32,21 +44,46 @@ export default function Home(props) {
       });
   };
 
+  const getMyOffersList = async () => {
+    try {
+      const res = await userApi.getOffersList();
+      setMyOffersList(res.data?.result_list);
+    } catch (error) {
+      console.log("Error getting offers", error);
+    }
+  };
+
   useEffect(() => {
-    getHomeDate();
+    const fetchData = async () => {
+      await Promise.all([getHomeDate(), getMyOffersList()]);
+    };
+
+    fetchData();
+  }, []);
+
+  useEffect(() => {
+    getMyActiveJobList();
   }, []);
 
   return (
     <Layout>
       <div className="home-page-wrapper">
-        {userDetails && userDetails?.account_type == "FAMILY" && (
-          <FamilyDash commonHeadData={props.bannerList} />
-        )}
-        {userDetails && userDetails?.account_type == "FULL" && (
+        {userDetails && userDetails?.account_type == "FAMILY" ? (
+          <FamilyDash
+            account={userDetails}
+            commonHeadData={props.bannerList}
+            familyOffers={MyOffersList}
+            MyActiveJobList={MyActiveJobList}
+          />
+        ) : userDetails && userDetails?.account_type == "FULL" ? (
           <FullAccountDash
             nextDueTask={nextDueTask}
             bannerList={props.bannerList}
           />
+        ) : (
+          <div>
+            You are not logged in or your account type is not supported.
+          </div>
         )}
       </div>
     </Layout>

src/components/MarketPlace/MainSection.jsx

@@ -1,106 +1,118 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useMemo, useState } from "react";
 import DataIteration from "../Helpers/DataIteration";
 import AvailableJobsCard from "../Cards/AvailableJobsCard";
+import ListView from "../../assets/images/list-view.png";
+import GridView from "../../assets/images/grid-view.svg";
+import SelectBox from "../Helpers/SelectBox";
 
-export default function MainSection({ className, marketPlaceProduct }) {
-  const [tab, setTab] = useState("all");
-  const [products, setProducts] = useState(marketPlaceProduct);
+export default function MainSection({
+  className,
+  marketPlaceProduct,
+  categories,
+}) {
+  // Creating All cart..
+  let marketCategories = useMemo(
+    () => ({ All: "All Categories", ...categories }),
+    [categories]
+  );
+  const [tab, setTab] = useState(Object.keys(marketCategories)[0]);
+
+  let [contentDisplay, setContentDisplay] = useState("grid"); // STATE TO HOLD LIST VIEW STYLE
+
+  // Convert to array in order to map
+  const mappedArray = Object.entries(marketCategories).map(([key, value]) => {
+    return { key, value };
+  });
+
+  const [products, setProducts] = useState([]);
   const tabHandler = (value) => {
     setTab(value);
   };
-  useEffect(() => {
-    if (tab === "artist") {
-      setProducts(marketPlaceProduct?.slice(0, 3));
-    } else if (tab === "market") {
-      setProducts(marketPlaceProduct?.slice(0, 6));
-    } else if (tab === "shop") {
-      setProducts(marketPlaceProduct?.slice(6, 9));
-    } else if (tab === "assets") {
-      setProducts(marketPlaceProduct?.slice(3, 6));
-    } else {
-      setProducts(marketPlaceProduct);
+
+  // Handles the category selection on mobile view
+  const handleSetCategory = (value) => {
+    for (let i in marketCategories) {
+      if (marketCategories[i] == value) {
+        setTab(i);
+      }
     }
-  }, [tab, marketPlaceProduct]);
+  };
+
+  useEffect(() => {
+    if (tab === "All") {
+      setProducts(marketPlaceProduct);
+    } else {
+      const filteredProducts = marketPlaceProduct.filter((product) =>
+        product.category.includes(tab)
+      );
+      setProducts(filteredProducts);
+    }
+  }, [tab, marketPlaceProduct, categories, marketCategories]);
 
   return (
     <div className={`market-place-section w-full ${className || ""}`}>
       <div className="market-place-wrapper w-full">
-        <div className="filter-navigate-area lg:flex justify-between mb-8 items-center">
-          <div className="tab-item lg:mb-0 mb-5">
-            <div className="md:flex md:space-x-8 space-x-2">
-              <span
-                onClick={() => tabHandler("all")}
-                className={`md:text-[18px] text-md  text-dark-gray dark:text-white hover:text-pink border-b hover:border-pink font-medium cursor-pointer ${
-                  tab === "all"
-                    ? "text-pink border-pink"
-                    : " border-transparent"
-                }`}
-              >
-                All
-              </span>
-
-
-              <span
-                onClick={() => tabHandler("artist")}
-                className={`md:text-[18px] text-md  text-dark-gray dark:text-white hover:text-pink border-b hover:border-pink font-medium cursor-pointer ${
-                  tab === "artist"
-                    ? "text-pink border-pink"
-                    : " border-transparent"
-                }`}
-              >
-                Featured Artist
-              </span>
-              <span
-                onClick={() => tabHandler("market")}
-                className={`md:text-[18px] text-md  text-dark-gray dark:text-white hover:text-pink border-b hover:border-pink font-medium cursor-pointer ${
-                  tab === "market"
-                    ? "text-pink border-pink"
-                    : " border-transparent"
-                }`}
-              >
-                Open Market
-              </span>
-              <span
-                onClick={() => tabHandler("shop")}
-                className={`md:text-[18px] text-md  text-dark-gray dark:text-white hover:text-pink border-b hover:border-pink font-medium cursor-pointer ${
-                  tab === "shop"
-                    ? "text-pink border-pink"
-                    : " border-transparent"
-                }`}
-              >
-                Partner Shops
-              </span>
-              <span
-                onClick={() => tabHandler("assets")}
-                className={`md:text-[18px] text-md  text-dark-gray dark:text-white hover:text-pink border-b hover:border-pink font-medium cursor-pointer ${
-                  tab === "assets"
-                    ? "text-pink border-pink"
-                    : " border-transparent"
-                }`}
-              >
-                Game Assets
-              </span>
-
-
+        <div className="filter-navigate-area flex justify-between items-center mb-8">
+          <div className="tab-item w-full flex items-center">
+            <div className="hidden lg:flex md:space-x-8 space-x-2">
+              {mappedArray.map(({ key, value }) => (
+                <span
+                  key={key}
+                  onClick={() => tabHandler(key)}
+                  className={`md:text-[18px] text-md  text-dark-gray dark:text-white hover:text-pink border-b hover:border-pink font-medium cursor-pointer ${
+                    tab === key
+                      ? "text-pink border-pink"
+                      : " border-transparent"
+                  }`}
+                >
+                  {value}
+                </span>
+              ))}
+            </div>
+            {/* market categories on screen smaller than large screen */}
+            <div className="w-[80%] lg:hidden">
+              <SelectBox
+                action={handleSetCategory}
+                datas={Object.values(marketCategories)}
+                className="Update-table-dropdown"
+                contentBodyClasses="w-auto min-w-max"
+                position="left"
+              />
             </div>
           </div>
-
-          {/*<div className="search-item flex lg:flex-none justify-end">*/}
-          {/*  <SearchCom*/}
-          {/*    className="lg:bg-transparent"*/}
-          {/*    inputClasses="lg:bg-transparent"*/}
-          {/*  />*/}
-          {/*</div>*/}
+          {/* contentDisplay toggler */}
+          <div className="p-2 w-[35px] h-[35px] bg-white dark:bg-slate-200 rounded-lg">
+            <img
+              title={contentDisplay == "grid" ? "list view" : "grid view"}
+              onClick={() =>
+                setContentDisplay((prev) => (prev == "grid" ? "list" : "grid"))
+              }
+              src={contentDisplay == "grid" ? ListView : GridView}
+              className="w-full h-full cursor-pointer"
+              alt="view"
+            />
+          </div>
+          {/* end of contentDisplay toggler */}
         </div>
         <div className="filter-navigate-content w-full min-h-screen">
-          <div className="grid lg:grid-cols-3 sm:grid-cols-2 gap-[30px]">
+          <div
+            className={
+              contentDisplay == "grid"
+                ? "grid lg:grid-cols-3 sm:grid-cols-2 gap-[30px]"
+                : "w-full"
+            }
+          >
             <DataIteration
               datas={products}
               startLength={process.env.REACT_APP_ZERO_STATE}
               endLength={products?.length}
             >
               {({ datas }) => (
-                <AvailableJobsCard key={datas.id} datas={datas} />
+                <AvailableJobsCard
+                  contentDisplay={contentDisplay}
+                  key={datas.id}
+                  datas={datas}
+                />
               )}
             </DataIteration>
           </div>

src/components/MarketPlace/PopUp/Detail.jsx

@@ -0,0 +1,12 @@
+import React from 'react'
+
+function Detail({label, value, bg,}) {
+  return (
+    <>
+        <label className='w-full md:w-1/4 text-slate-900 tracking-wide font-semibold'>{label}</label>
+        <p className={`p-1 w-full md:w-3/4 text-sm text-slate-900 ${bg ? bg : null}`}>{value}</p>
+    </>
+  )
+}
+
+export default Detail

src/components/MarketPlace/PopUp/MarketPopUp.jsx

@@ -1,22 +1,98 @@
-import React, { useCallback, useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
 import ModalCom from "../../Helpers/ModalCom";
 import { toast } from "react-toastify";
-import { Form, Formik } from "formik";
 import usersService from "../../../services/UsersService";
 import LoadingSpinner from "../../Spinners/LoadingSpinner";
+import { PriceFormatter } from "../../Helpers/PriceFormatter";
 
 const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
-  const [marketMsg, setMarketMsg] = useState({
-    loading: false,
-    data: {},
-    state: undefined,
-  });
-  const [manageInt, setManageInt] = useState({
-    loading: false,
-    data: {},
-    state: undefined,
-    msg: "",
-  });
+  const MarketCalls = (details) => {
+    const [marketMsg, setMarketMsg] = useState({
+      loading: false,
+      data: {},
+      state: undefined,
+    });
+    const [manageInt, setManageInt] = useState({
+      loading: false,
+      data: {},
+      state: undefined,
+      msg: "",
+    });
+
+    const { offer_code } = details;
+    const reqData = { offer_code };
+
+    const MarketDetail = async () => {
+      try {
+        setMarketMsg({ loading: true });
+        if (!textValue) return;
+
+        reqData.yourmessage = textValue;
+
+        const marketMessage = await apiCall.MarketMessage(reqData);
+        const marketMessageRes = marketMessage?.data;
+
+        if (marketMessageRes?.internal_return < 0) {
+          toast.warn("Something wrong happened", {
+            autoClose: 2000,
+            hideProgressBar: true,
+          });
+          onClose();
+          return;
+        }
+
+        toast.success("Message sent", {
+          autoClose: 2500,
+          hideProgressBar: true,
+        });
+
+        setMarketMsg({ data: marketMessageRes, state: true });
+        setTimeout(() => onClose(), 2000);
+      } catch (error) {
+        throw new Error(error);
+      } finally {
+        setTimeout(() => {
+          setTextValue("");
+          setMarketMsg({ loading: false });
+        }, 2000);
+      }
+    };
+
+    const ManageInterest = async () => {
+      try {
+        setManageInt({ loading: true });
+
+        const manageInt = await apiCall.MarketInterest(reqData);
+        const manageIntRes = manageInt?.data;
+
+        if (manageIntRes?.internal_return < 0) {
+          setManageInt({
+            loading: false,
+            msg: manageIntRes?.status,
+            data: manageIntRes,
+            state: false,
+          });
+        } else {
+          setManageInt({
+            loading: false,
+            msg: manageIntRes?.status,
+            data: manageIntRes,
+            state: true,
+          });
+        }
+
+        setTimeout(() => setManageInt({ msg: "" }), 3000);
+      } catch (error) {
+        throw new Error(error);
+      }
+    };
+
+    // useEffect(() => {
+    //   ManageInterest();
+    // }, []);
+
+    return { MarketDetail, ManageInterest, manageInt, marketMsg };
+  };
 
   const [textValue, setTextValue] = useState("");
 
@@ -26,84 +102,26 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
 
   const apiCall = useMemo(() => new usersService(), []);
 
-  const marketCalls = useCallback(
-    async (e) => {
-      try {
-        const nameOfCall = e?.target?.name;
-        const { offer_code } = details;
-        const reqData = { offer_code };
+  let { manageInt, ManageInterest, MarketDetail, marketMsg } = MarketCalls(details);
 
-        if (nameOfCall === "market-message") {
-          setMarketMsg({ loading: true });
-          if (!textValue) return;
-
-          reqData.yourmessage = textValue;
-
-          const marketMessage = await apiCall.MarketMessage(reqData);
-          const marketMessageRes = marketMessage?.data;
-
-          if (marketMessageRes?.internal_return < 0) {
-            toast.warn("Something wrong happened", {
-              autoClose: 2000,
-              hideProgressBar: true,
-            });
-            onClose();
-            return;
-          }
-
-          toast.success("Message sent", {
-            autoClose: 2500,
-            hideProgressBar: true,
-          });
-
-          setMarketMsg({ data: marketMessageRes, state: true });
-          setTimeout(() => onClose(), 2000);
-        } else {
-          setManageInt({ loading: true });
-
-          const manageInt = await apiCall.MarketInterest(reqData);
-          const manageIntRes = manageInt?.data;
-
-          if (manageIntRes?.internal_return < 0) {
-            setManageInt({
-              loading: false,
-              msg: `Error - ${manageIntRes?.status}`,
-              data: manageIntRes,
-              state: false,
-            });
-          } else {
-            setManageInt({
-              loading: false,
-              msg: manageIntRes?.status,
-              data: manageIntRes,
-              state: true,
-            });
-          }
-
-          setTimeout(() => setManageInt({ msg: "" }), 3000);
-
-          return;
-        }
-      } catch (error) {
-        throw new Error(error);
-      } finally {
-        setTimeout(() => {
-          setTextValue("");
-          setMarketMsg({ loading: false });
-        }, 2000);
-      }
-    },
-    [apiCall, details, onClose, textValue]
+  let thePrice = PriceFormatter(
+    details?.price * 0.01,
+    details?.currency_code,
+    details?.currency
   );
 
-  console.log('Checking my mangeInt',manageInt)
-
   // let addedIntDate = marketInt?.added?.split(" ")[0];
-  let expireIntDate = marketInt?.expire?.split(" ")[0];
+  // let expireIntDate = marketInt?.expire?.split(" ")[0];
+
+  let cleanedText = details?.job_description
+    ?.replace(/&lt;/g, "<")
+    .replace(/&gt;/g, ">")
+    .replace(/&quot;/g, '"')
+    .replace(/&amp;/g, "&");
 
   return (
     <ModalCom action={onClose} situation={situation} className="edit-popup">
-      <div className="logout-modal-wrapper md:w-[750px] md:h-[700px] h-full bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
+      <div className="logout-modal-wrapper md:w-[750px] md:h-[660px] h-full bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
         <div className="logout-modal-header w-full flex items-center justify-between lg:p-6 px-[30px] py-[23px]">
           <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
             {details.offer_code}
@@ -112,8 +130,8 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
         </div>
 
         <div className="md:flex bg-white rounded-lg">
-          <div className="p-4 w-full md:w-3/4 md:border-r-1">
-            <div className="min-h-[290px]">
+          <div className="p-4 w-full md:w-[75%] md:border-r-1">
+            <div className="min-h-[263px]">
               <h2 className="font-semibold text-slate-900 dark:text-black tracking-wide">
                 {details?.title}
               </h2>
@@ -128,17 +146,17 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
                   name: "",
                   content: {
                     text: `Timeline: ${details.timeline_days} day(s) -- `,
-                    bold: `Budget: ${details.price} naira`,
+                    bold: `Budget: ${thePrice}`,
                   },
                 },
                 {
                   name: "Delivery Detail",
-                  content: details.job_description,
+                  content: cleanedText,
                   danger: true,
                 },
               ].map(({ name, content, danger }, idx) => (
                 <div className={`my-3 md:flex items-center`} key={idx}>
-                  <label className="w-full md:w-1/4 text-slate-900 tracking-wide font-semibold">
+                  <label className="w-full md:w-[19%] text-slate-900 tracking-wide font-semibold whitespace-pre-wrap">
                     {name}
                   </label>
                   <div
@@ -152,19 +170,23 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
                       <p
                         className={``}
                         dangerouslySetInnerHTML={{
-                          __html: danger && content?.replace(/"/g, ""),
+                          __html: danger && content,
                         }}
                       />
                     ) : (
-                      <p className={`w-full md:w-3/4 text-slate-900`}>
+                      <p className={`w-full text-slate-900`}>
                         {name !== "Delivery Detail" ? (
                           <>
                             {typeof content !== "object" ? content : null}
                             {typeof content === "object" && (
-                              <span className="flex items-center gap-2">
-                                {content?.text}
-                                <strong>{content?.bold}</strong>
-                              </span>
+                              <>
+                                <hr className="mb-1" />
+                                <span className="flex items-center gap-2">
+                                  {content?.text}
+                                  <strong>{thePrice}</strong>
+                                </span>
+                                <hr className="mt-1" />
+                              </>
                             )}
                           </>
                         ) : (
@@ -194,7 +216,7 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
               <button
                 className="self-end w-[150px] h-[52px] rounded-md text-base bg-yellow-500 text-white"
                 name="market-message"
-                onClick={marketCalls}
+                onClick={MarketDetail}
               >
                 {marketMsg.loading ? (
                   <LoadingSpinner size={5} color="white" />
@@ -207,17 +229,17 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
             </div>
           </div>
 
-          <div className="w-full md:w-1/4 h-full ">
-            <div className="w-[90%] mx-auto bg-[#f1f8ff] p-4 rounded-md md:min-h-[550px] flex flex-col justify-between">
+          <div className="w-full md:w-[23%] h-full ">
+            <div className="mx-auto bg-[#f1f8ff] p-4 rounded-md md:min-h-[498px] flex flex-col justify-between">
               <div className="w-full flex flex-col justify-center py-4 gap-2">
                 <p className="w-full text-slate-900 tracking-wide my-1">
                   Interested in the task?
                 </p>
                 <hr />
                 <button
-                  className="bg-[#57cd89] text-center text-lg font-semibold text-white py-2 px-4 rounded-md inline-flex flex-col items-center justify-center"
+                  className="bg-[#57cd89] text-center text-lg font-semibold text-white py-2 px-4 rounded-md inline-flex sm:flex-col flex-row sm:gap-0 gap-1 items-center justify-center"
                   name="market-interest"
-                  onClick={marketCalls}
+                  onClick={ManageInterest}
                 >
                   {" "}
                   <span>Send</span>
@@ -248,9 +270,18 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
                   Interest: <b className="ml-1">{details.interest_count}</b>
                 </p>
                 <hr />
-                <p className="my-1">Expire: {expireIntDate}</p>
+                <p className="my-1">
+                  Expire: {details.expire}
+                </p>
               </div>
             </div>
+            <button
+              className="self-end w-[150px] mt-2 h-[52px] rounded-md text-base bg-transparent border border-red-500 text-red-500 mx-auto"
+              name="cancel"
+              onClick={onClose}
+            >
+              Cancel
+            </button>
           </div>
           {/* END OF ACTION SECTION */}
         </div>

src/components/MarketPlace/index.jsx

@@ -1,22 +1,23 @@
-import React from "react";
-// import products from "../../data/marketplace_data.json";
-//import CreateNft from "../Home/CreateNft";
 import Layout from "../Partials/Layout";
 import MainSection from "./MainSection";
 import CommonHead from "../UserHeader/CommonHead";
 import { useSelector } from "react-redux";
 
-export default function MarketPlace({commonHeadData}) {
+export default function MarketPlace({ commonHeadData }) {
   let { jobLists } = useSelector((state) => state.jobLists);
   const marketData = jobLists?.result_list;
+  const categories = jobLists?.categories;
 
-  // const marketProduct = products.data;
   return (
     <>
       <Layout>
-        <CommonHead  commonHeadData={commonHeadData} />
-        <MainSection marketPlaceProduct={marketData} className="mb-10" />
+        <CommonHead commonHeadData={commonHeadData} />
+        <MainSection
+          marketPlaceProduct={marketData}
+          categories={categories}
+          className="mb-10"
+        />
       </Layout>
     </>
   );
-}
+}