validated email

Merge branch 'google-login-fix' of WrenchBoard/Users-Wrench into master
google login fix
2023-07-10 13:48:23 +01:00 · 2023-07-10 11:22:19 +00:00 · 2023-07-10 12:18:43 +01:00 · 2023-07-10 08:46:47 +00:00 · 2023-07-10 09:14:54 +01:00 · 2023-07-10 09:14:30 +01:00
47 changed files with 1204 additions and 607 deletions
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -38,8 +38,8 @@ export default function LoginLayout({ slogan, children }) {
            </div>
          </div>
          <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">
-             <span className="text-3xl mt-2 mr-1">©</span>  2023 - {" "}
+            <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>{" "}
@@ -1,23 +1,64 @@
-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';
+import {updateUserDetails} from "../../../store/UserDetails";
+import { useDispatch } from "react-redux";
+import AuthLayout from "../AuthLayout";

 function Redirect() {
    const location = useLocation();
    const navigate = useNavigate();
+    const userApi = new usersService();
+    const dispatch = useDispatch()

    const queryParams = new URLSearchParams(location?.search);
    const codeResponse = queryParams.get("code");

    useEffect(()=>{
-        if(!codeResponse){
-            navigate('/login', {replace: true})
+      if(!codeResponse){
+        navigate('/login', {state: {error: true}})
+        return
+      }
+      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) => {
+          if (res.status == 200  && res.data.internal_return >= 0 && res.data.member_id && res.data.uid && res.data.session) {
+            localStorage.setItem("member_id", `${res.data.member_id}`);
+            localStorage.setItem("uid", `${res.data.uid}`);
+            localStorage.setItem("session_token", `${res.data.session}`);
+            dispatch(updateUserDetails({...res.data, loggedIn:true}));
+            navigate('/', {replace: true})
            return
-        }
-        console.log(codeResponse)
+          }
+          navigate('/login', {state: {error: true}})
+        })
+        .catch((error) => {
+          navigate('/login', {state: {error: true}})
+          console.log(error);
+        });
    },[])
  return (
-    <div>Redirecting ... </div>
+    <AuthLayout>
+    <div className='min-h-[70vh]'>Redirecting ... </div>
+  </AuthLayout>
  )
 }

-export default Redirect
+export default Redirect
@@ -1,5 +1,5 @@
 import React, { useEffect, useLayoutEffect, useState } from "react";
-import { Link, useNavigate } from "react-router-dom";
+import { Link, useNavigate, useLocation } from "react-router-dom";
 import linkedInLogo from "../../../assets/images/Linkedin.png";
 import appleLogo from "../../../assets/images/apple-black.svg";
 import facebookLogo from "../../../assets/images/facebook-4.svg";
@@ -16,12 +16,15 @@ import { updateUserDetails } from "../../../store/UserDetails";

 export default function Login() {
  const dispatch = useDispatch();
+  const {state} = useLocation()

  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,6 +34,11 @@ 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 } }) => {
    setLoginType(name);
@@ -98,7 +106,7 @@ export default function Login() {
    userApi
      .logInUser(postData)
      .then((res) => {
-        if (res.status != 200 || res.data.internal_return < 0) {
+        if (res.status != 200 || res.data.internal_return < 0 || !res.data.member_id || !res.data.uid || !res.data.session) {
          // setMsgError("Wrong, email/password");
          setLoginError(true);
          setLoginLoading(false);
@@ -168,6 +176,14 @@ export default function Login() {
    }
    let loginValue = readCookie('loginType')
    setLoginType(loginValue)
+
+    if(state?.error){ //check if the login path has an error state indicating any social handle login with error
+      setMsgError("Unexpected Error, Please try again soon.");
+      setTimeout(()=>{
+        setMsgError("");
+        navigate('/login', {replace: true})
+      },4000)
+    }
  },[])
  

@@ -189,7 +205,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]">
@@ -207,11 +223,11 @@ export default function Login() {
              </div>

              {/* switch login component */}
-              <div className="flex justify-start items-center gap-3">
+              <div className="ml-7 flex justify-start items-center gap-3">
                <button
                  name="full"
-                  className={`login-type-btn px-4 py-1 rounded-t-[3px] transition duration-200 ${
-                    loginType=='full' ? "bg-white text-[#000] border-t-[3px] border-[#4687ba]" : "bg-[#4687ba] text-white"
+                  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}
                >
@@ -219,12 +235,12 @@ export default function Login() {
                </button>
                <button
                  name="family"
-                  className={`login-type-btn px-4 py-1 rounded-t-[3px] transition duration-200 ${
-                    loginType=='family' ? "bg-white text-[#000] border-t-[3px] border-[#4687ba]" : "bg-[#4687ba] text-white"
+                  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>

@@ -234,7 +250,7 @@ export default function Login() {
              {
                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"
@@ -258,8 +274,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>
@@ -322,7 +339,7 @@ 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"
@@ -333,7 +350,7 @@ export default function Login() {
                        label="Username"
                        name="email"
                        type="email"
-                        iconName="message"
+                        iconName="family-id"
                      />
                    </div>

@@ -346,9 +363,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 && (
@@ -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,
@@ -81,7 +95,7 @@ export default function SignUp() {
        if (res.status === 200) {
          const { data } = res;
          if (data && data.acc === "DULPICATE") {
-            setMsgError("This account has been already created");
+            setMsgError("Unable to use this username. Please try another username.");
            setSignUpLoading(false);
          }
          if (data && data.status === "1") {
@@ -112,212 +126,159 @@ export default function SignUp() {

  return (
    <>
-      <div className="layout-wrapper login">
-        <div className="main-wrapper login-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}
        >
@@ -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 {
@@ -21,7 +21,8 @@ export default function FamilyActiveJobsCard({ datas, hidden = false }) {
            toast.warn("Remove to Favorite List");
        }
    };
-
+//debugger;
+    const bannerName  =  datas.banner == null ?'default.jpg':datas.banner;
    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">
@@ -32,7 +33,7 @@ export default function FamilyActiveJobsCard({ datas, hidden = false }) {
                        className="thumbnail w-full h-full rounded-xl overflow-hidden px-4 pt-4"
                        style={{
                            background: `url(${localImgLoad(
-                                `images/taskbanners/${datas.banner}`
+                                `images/taskbanners/${bannerName}`
                            )}) center / contain no-repeat`,
                        }}
                    >
@@ -17,21 +17,21 @@ export default function HomeBannerOffersCard(props) {
  return (
    <Link
      to={link_result}
-      className="item w-full block group banner-630-340 bg-cover bg-center"
+      className="item p-2 w-full flex items-center min-h-[340px] bg-alice-blue bg-cover bg-center"
      style={{
        backgroundImage: `url('${imageUrl}')`,
      }}
    >
-      <div className="flex flex-col justify-between h-full">
+      <div className="w-[80%] h-full mx-auto flex flex-col justify-between">
        <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">
+          <div className="mb-2">
+            <h1 className="text-2xl lg:text-4xl font-bold text-dark-gray dark:text-white tracking-wide">
              <span className="heroSilderTitle">{props.itemData.title}</span>
            </h1>
          </div>
        </div>
        <div className="flex flex-col justify-around items-center flex-1">
-          <div className="siderCardDescription">
+          <div className="siderCardDescription mb-2">
            {props.itemData.description}
          </div>
          <button className="w-[150px] h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
@@ -1,24 +1,27 @@
 import React, {
  Suspense,
+  lazy,
  useCallback,
  useEffect,
  useMemo,
  useRef,
  useState,
+  useTransition,
 } 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";
+
+// Lazy Imports for components
+const FamilyWaitlist = lazy(() => import("./Tabs/FamilyWaitlist"));
+const FamilyAccount = lazy(() => import("./Tabs/FamilyAccount"));
+const FamilyProfile = lazy(() => import("./Tabs/FamilyProfile"));
+const FamilyTasks = lazy(() => import("./Tabs/FamilyTasks"));
+const ProfileInfo = lazy(() => import("./Tabs/ProfileInfo"));
+const FamilyPending = lazy(() => import("./Tabs/FamilyPending"));

 export default function FamilyManageTabs({
  className,
@@ -34,14 +37,15 @@ export default function FamilyManageTabs({
  });
  const [errMsg, setErrMsg] = useState("");
  const [familyTaskPopout, setFamilyTaskPopout] = useState(false);
+  const [profileImg, setProfileImg] = useState(profile);
+  const profileImgInput = useRef(null);
+  const [isPending, startTransition] = useTransition();
+  const apiCall = useMemo(() => new usersService(), []);

  const familyPopUpHandler = () => {
    setFamilyTaskPopout((prev) => !prev);
  };

-  const [profileImg, setProfileImg] = useState(profile);
-  const profileImgInput = useRef(null);
-
  const browseProfileImg = () => {
    profileImgInput.current.click();
  };
@@ -56,16 +60,15 @@ export default function FamilyManageTabs({
    }
  };

-  const apiCall = useMemo(() => new usersService(), []);
-
  const manageFamily = useCallback(async () => {
    try {
-      setDetails({
+      setDetails((prevDetails) => ({
+        ...prevDetails,
        familyDetails: { loading: true },
        familyTasks: { loading: true },
        familyWaitList: { loading: true },
        familyPending: { loading: true },
-      });
+      }));

      const { family_uid } = accountDetails;
      const reqData = { family_uid };
@@ -88,22 +91,26 @@ export default function FamilyManageTabs({
        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 },
+      startTransition(() => {
+        setDetails({
+          familyDetails: { loading: false, data: familyData },
+          familyTasks: { loading: false, data: tasksData },
+          familyWaitList: { loading: false, data: familyWaitData },
+          familyPending: { loading: false, data: familyPendingData },
+        });
      });
    } catch (error) {
-      setDetails({
+      setDetails((prevDetails) => ({
+        ...prevDetails,
        familyDetails: { loading: false },
        familyTasks: { loading: false },
        familyWaitList: { loading: false },
        familyPending: { loading: false },
-      });
+      }));
      setErrMsg("An error occurred");
      throw new Error(error);
    }
@@ -119,14 +126,14 @@ export default function FamilyManageTabs({
    { id: 1, name: "Tasks" },
    { id: 2, name: "Waiting" },
    { id: 3, name: "Pending" },
-    { id: 4, name: "Account" },
-    { id: 5, name: "Profile" },
  ];

  const [tab, setTab] = useState(tabs[0].name);

  const tabHandler = (value) => {
-    setTab(value);
+    startTransition(() => {
+      setTab(value);
+    });
  };

  const tabComponents = {
@@ -175,7 +182,13 @@ export default function FamilyManageTabs({
  const selectedTabComponent = tabComponents[tab] || defaultTabComponent;

  useEffect(() => {
-    manageFamily();
+    let __manageFamily = true;
+    if (__manageFamily) {
+      manageFamily();
+    }
+    return () => {
+      __manageFamily = false;
+    };
  }, [tab, manageFamily]);

  return (
@@ -193,7 +206,7 @@ export default function FamilyManageTabs({
          }
        >
          <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">
+            <div className="border-r border-[#E3E4FE] dark:border-[#a7a9b533] p-6 h-full flex flex-col justify-between">
              <ProfileInfo
                profileImg={profileImg}
                profileImgInput={profileImgInput}
@@ -201,6 +214,30 @@ export default function FamilyManageTabs({
                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">
@@ -230,7 +267,11 @@ export default function FamilyManageTabs({
                </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}
+                    <Suspense
+                      fallback={<LoadingSpinner size="16" color="sky-blue" />}
+                    >
+                      {selectedTabComponent}
+                    </Suspense>
                  </div>
                </div>
              </div>
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from "react";
+import React, { useState, useEffect, useTransition } from "react";
 import ModalCom from "../../Helpers/ModalCom";
 import Detail from "../../jobPopout/popoutcomponent/Detail";
 import usersService from "../../../services/UsersService";
@@ -6,7 +6,7 @@ import LoadingSpinner from "../../Spinners/LoadingSpinner";
 import { PriceFormatter } from "../../Helpers/PriceFormatter";
 import { NewTasks } from "./forms";

-function AssignTaskPopout({ action, situation, familyDetails }) {
+const  AssignTaskPopout = React.memo(({ action, details, situation, familyDetails }) => {
  const apiCall = new usersService();

  let [requestStatus, setRequestStatus] = useState({
@@ -15,9 +15,9 @@ function AssignTaskPopout({ action, situation, familyDetails }) {
    message: "",
  }); // HOLDS RESPONSE FOR SENDING API REQUEST

-  let [familyTask, setFamilyTask] = useState({ loading: true, data: [] });
+  let [familyTask, setFamilyTask] = useState({ loading: false, data: [] });

-  let [taskType, setTaskType] = useState("select"); // SWITCHES BTW SELECT TASK AND NEW TASK
+  let [taskType, setTaskType] = useState(details ? "new" : "select"); // SWITCHES BTW SELECT TASK AND NEW TASK

  let [activeTask, setActiveTask] = useState({ id: 0, data: {} }); // HOLDS SELECTED TASK

@@ -31,6 +31,19 @@ function AssignTaskPopout({ action, situation, familyDetails }) {
    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 = {};
@@ -54,86 +67,137 @@ function AssignTaskPopout({ action, situation, familyDetails }) {
        job_description: activeTask.data?.description,
        assign_mode: 110011,
      };
+    }

-      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) => {
+    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: "An Error occured, try again",
+            message: `${field} is empty`,
          });
-          setTimeout(() => {
+          return setTimeout(() => {
            setRequestStatus({ loading: false, status: false, message: "" });
-          }, 5000);
-        });
+          }, 3000);
+        }
+      }
+
+      reqData = {
+        banner,
+        category,
+        country,
+        description,
+        job_detail,
+        price: price * 100,
+        timeline_days,
+        title,
+        assign_mode: 110055,
+        family_uid: details?.family_uid || familyDetails?.uid,
+      };
    }

-    if (taskType == "new") {
-      // RUNS HERE IF TASK TYPE IS NEW TASK
-      console.log("TESTING");
-    }
+    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(() => {
+    let checkFamilyTask = true;
    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],
-          }));
+        if (checkFamilyTask) {
+          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 () => {
+      checkFamilyTask = false;
+    };
  }, []);

-  // New Task 
-  const [newTaskData, setNewTaskData] = useState({})
-  const handleNewTaskData = (data) => {
-    setNewTaskData(data)
-  }
-
-  console.log("Trying to see form data >>", newTaskData)
  return (
    <>
-      <ModalCom action={action} situation={situation}>
+      <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}
+              Assign task to {familyDetails?.firstname || details.firstName}
            </h1>
            <button
              type="button"
@@ -231,9 +295,12 @@ function AssignTaskPopout({ action, situation, familyDetails }) {
                      )}
                    </div>
                  )}
-                  {taskType !== "select" && (
+                  {taskType == "new" && (
                    <div className="p-4 w-full h-[400px]">
-                      <NewTasks onChange={handleNewTaskData} />
+                      <NewTasks
+                        formState={formState}
+                        setFormState={setFormState}
+                      />
                    </div>
                  )}
                </div>
@@ -305,46 +372,62 @@ function AssignTaskPopout({ action, situation, familyDetails }) {
              </div>

              {/* BTN */}
-              <div className="p-2 border-t-2 flex justify-end items-center gap-3">
+              <div className="py-2 px-4 border-t-2 flex justify-between items-center">
                {/* error or success display */}
-                {requestStatus.message != "" &&
-                  (!requestStatus.status ? (
-                    <div
-                      className={`relative p-2 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
-                    >
-                      {requestStatus.message}
-                    </div>
-                  ) : (
-                    requestStatus.status && (
+                <div className="w-auto h-auto flex items-center">
+                  {requestStatus.message != "" &&
+                    (!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]`}
+                        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 */}
-                <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" />
-                  ) : (
-                    <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>
-                  )}
+                <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>
            </>
@@ -353,6 +436,6 @@ function AssignTaskPopout({ action, situation, familyDetails }) {
      </ModalCom>
    </>
  );
-}
+})

-export default AssignTaskPopout;
+export default AssignTaskPopout;
@@ -2,24 +2,16 @@ import React, { useEffect, useState } from "react";
 import usersService from "../../../../services/UsersService";
 import InputCom from "../../../Helpers/Inputs/InputCom";

-export default function NewTasks({ onChange }) {
+export default function NewTasks({ formState, setFormState }) {
  let [currency, setCurrency] = useState({
    loading: true,
    status: false,
    data: null,
  });

-  const [formState, setFormState] = useState({
-    // Initialize form state with desired fields
-    country: "",
-    price: "",
-    title: "",
-    description: "",
-    job_detail: "",
-    timeline_days: "",
-    category: [],
-  });
-
+  const selectImage = require(`../../../../assets/images/taskbanners/${
+    formState.banner || "default.jpg"
+  }`);
  const ApiCall = new usersService();

  // FUNCTION TO GET Currency
@@ -49,7 +41,6 @@ export default function NewTasks({ onChange }) {
      ...prevState,
      [name]: value,
    }));
-    onChange(formState); // Pass the form data to the parent on every change
  };

  useEffect(() => {
@@ -57,8 +48,8 @@ export default function NewTasks({ onChange }) {
  }, []);

  return (
-    <form className="w-full">
-      <div className="flex flex-col gap-3">
+    <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 */}
@@ -79,13 +70,13 @@ export default function NewTasks({ onChange }) {
              // onBlur={props.handleBlur}
            >
              {currency.loading ? (
-                <option className="text-slate-500 text-lg" value="">
+                <option className="text-slate-500 text-[13.975px]" value="">
                  Loading...
                </option>
              ) : currency.data.length ? (
                <>
-                  <option className="text-slate-500 text-lg" value="">
-                    Select a currency
+                  <option className="text-slate-500 text-[13.975px]" value="">
+                    Currency
                  </option>
                  {currency.data?.map((item, index) => (
                    <option
@@ -141,11 +132,14 @@ export default function NewTasks({ onChange }) {
            >
              {publicArray.length && (
                <>
-                  <option className="text-slate-500 text-lg" value="">
-                    Select Duration
+                  <option className="text-slate-500 text-[13.975px]" value="">
+                    Duration
                  </option>
                  {publicArray.map(({ name, duration }, idx) => (
-                    <option className="text-slate-500 text-lg" value={duration}>
+                    <option
+                      className="text-slate-500 text-[13.975px]"
+                      value={duration}
+                    >
                      {name}
                    </option>
                  ))}
@@ -210,6 +204,16 @@ export default function NewTasks({ onChange }) {
          </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>
  );
 }
@@ -8,10 +8,7 @@ import PaginatedList from "../Pagination/PaginatedList";
 import familyImage from '../../assets/images/no-family-side.png'

 export default function FamilyTable({ className, familyList, loader, popUpHandler }) {
-  const filterCategories = ["All Categories", "Explore", "Featured"];
-  const [selectedCategory, setCategory] = useState(filterCategories[0]);
  const navigate = useNavigate();
-  // let location = useLocation();

  const [currentPage, setCurrentPage] = useState(0);
  const indexOfFirstItem = Number(currentPage);
@@ -1,56 +1,56 @@
-import { forwardRef } from 'react'
-import QRCode from 'react-qr-code';
+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>
+  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>
-          <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>
+
+          <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
+export default FamilyAccount;
@@ -1,8 +1,9 @@
-import { useState } from "react";
+import { useMemo, 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,
@@ -12,8 +13,12 @@ export default function FamilyPending({
 }) {
  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
+  let filteredFamilyData = useMemo(
+    () =>
+      familyData?.result_list?.filter(
+        (data) => data?.family_uid === accountDetails?.family_uid
+      ),
+    [accountDetails?.family_uid, familyData?.result_list]
  );

  const [currentPage, setCurrentPage] = useState(0);
@@ -50,6 +55,7 @@ export default function FamilyPending({
                        value?.currency_code,
                        value?.currency
                      );
+                      let image = value.banner ? value.banner : "default.jpg";
                      return (
                        <tr
                          key={index}
@@ -57,11 +63,13 @@ export default function FamilyPending({
                        >
                          <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]">
+                              <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]">
@@ -8,6 +8,7 @@ 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, accountDetails }) {
@@ -55,6 +56,7 @@ export default function FamilyTasks({ familyData, className, loader, accountDeta
                            value?.currency_code,
                            value?.currency
                          );
+                          let image = value.banner ? value.banner : 'default.jpg'
                          return (
                            <tr
                              key={index}
@@ -62,11 +64,11 @@ export default function FamilyTasks({ familyData, className, loader, accountDeta
                            >
                              <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]">
@@ -1,26 +1,50 @@
-import { useState } from "react";
+import { useState, useMemo, memo } 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 FamilyWaitlist = memo(({ familyData, className, accountDetails, loader }) => {
  const [popUp, setPopUp] = useState({ show: false, data: {} });
-
-  let filteredFamilyData = familyData?.result_list?.filter(
-    (data) => data?.family_uid === accountDetails?.family_uid
+  const [continueTaskPopup, setContinueTaskPopup] = useState({
+    show: false,
+    data: {},
+  });
+  const filteredFamilyData = useMemo(
+    () =>
+      familyData?.result_list?.filter(
+        (data) => data?.family_uid === accountDetails?.family_uid
+      ),
+    [familyData, accountDetails]
  );

  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 currentTask = useMemo(
+    () => filteredFamilyData?.slice(indexOfFirstItem, indexOfLastItem),
+    [filteredFamilyData, indexOfFirstItem, indexOfLastItem]
  );

  const handlePagination = (e) => handlePagingFunc(e, setCurrentPage);

+  const openPopUp = (value) => {
+    setPopUp({ show: true, data: { ...value } });
+  };
+
+  const closePopUp = () => {
+    setPopUp({ show: false, data: {} });
+  };
+
+  const openContinueTaskPopup = (value) => {
+    setContinueTaskPopup({ show: true, data: { ...value } });
+  };
+
+  const closeContinueTaskPopup = () => {
+    setContinueTaskPopup({ show: false, data: {} });
+  };
+
  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 ${
@@ -78,12 +102,7 @@ const FamilyWaitlist = ({ familyData, className, accountDetails, loader }) => {
                        </td>
                        <td className="text-right py-4 px-2">
                          <button
-                            onClick={() =>
-                              setPopUp({
-                                show: true,
-                                data: { ...value, selectedImage },
-                              })
-                            }
+                            onClick={() => openPopUp(value)}
                            className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
                          >
                            View
@@ -109,14 +128,21 @@ const FamilyWaitlist = ({ familyData, className, accountDetails, loader }) => {
      {popUp.show && (
        <SuggestTask
          details={popUp.data}
-          onClose={() => {
-            setPopUp({ show: false, data: {} });
-          }}
+          onClose={closePopUp}
+          continuePopupData={openContinueTaskPopup}
          situation={popUp.show}
        />
      )}
+
+      {continueTaskPopup.show && (
+        <AssignTaskPopout
+          details={continueTaskPopup.data}
+          action={closeContinueTaskPopup}
+          situation={continueTaskPopup.show}
+        />
+      )}
    </div>
  );
-};
+});

 export default FamilyWaitlist;
@@ -1,9 +1,16 @@
-import React, { useCallback, useEffect, useMemo, useState } from "react";
+import React, {
+  Suspense,
+  useCallback,
+  useEffect,
+  useMemo,
+  useState,
+} from "react";
 import InputCom from "../Helpers/Inputs/InputCom";
 import Layout from "../Partials/Layout";
 import FamilyTable from "./FamilyTable";
 import SiteService from "../../services/SiteService";
 import ModalCom from "../Helpers/ModalCom";
+import LoadingSpinner from "../Spinners/LoadingSpinner";

 export default function FamilyAcc() {
  const [selectTab, setValue] = useState("today");
@@ -20,60 +27,50 @@ export default function FamilyAcc() {

  const apiCall = useMemo(() => new SiteService(), []);

-  // This is to make sure it's called once and used everywhere
-  let memberId = localStorage.getItem("member_id");
-  let uid = localStorage.getItem("uid");
-  let sessionId = localStorage.getItem("session_token");
-
  const popUpHandler = () => {
    setPopUp((prev) => !prev);
  };

-  //   tab handler
  const filterHandler = (value) => {
    setValue(value);
  };

-  //   For the age drop down
-  let startAge = 5;
-  let endAge = 16;
-  // creates an array of age values ranging from 16 to 70
-  const ageRange = Array.from(
-    { length: endAge - startAge + 1 },
-    (_, index) => startAge + index
-  );
-  // age handler
+  const ageRange = useMemo(() => {
+    const startAge = 5;
+    const endAge = 16;
+    return Array.from(
+      { length: endAge - startAge + 1 },
+      (_, index) => startAge + index
+    );
+  }, []);
+
  const handleAgeSelect = (event) => {
    setSelectedAge(parseInt(event.target.value));
  };
-  //   Input handler
+
  const handleInputChange = (event) => {
    const { name, value } = event?.target;
-    setFormData({ ...formData, [name]: value });
+    setFormData((prevFormData) => ({ ...prevFormData, [name]: value }));
  };

-  //   Add member
  const addMember = async () => {
    const { first_name, last_name } = formData;
    setLoader(true);
    try {
      if (first_name !== "" && last_name !== "") {
-        let reqData = {
-          member_id: memberId,
-          uid: uid,
-          session_id: sessionId,
+        const reqData = {
          firstname: first_name,
          lastname: last_name,
          age: selectedAge,
        };

-        let res = await apiCall.addFamily(reqData);
+        const res = await apiCall.addFamily(reqData);
        const { data } = res;

-        if (data?.internal_return > 0 && data?.status == "OK") {
+        if (data?.internal_return > 0 && data?.status === "OK") {
          setLoader(false);
          setListReload((prev) => !prev);
-          popUpHandler()
+          popUpHandler();
        } else {
          setLoader(false);
          setMsgErr("Sorry, something went wrong");
@@ -94,38 +91,42 @@ export default function FamilyAcc() {
        first_name: "",
        last_name: "",
      });
-      setSelectedAge("")
+      setSelectedAge("");
    }
  };

-  // member listing
  const memberList = useCallback(async () => {
    setLoader(true);
    try {
-      let reqData = {
-        member_id: memberId,
-        uid: uid,
-        session_id: sessionId,
+      const reqData = {
        limit: 20,
        offset: 0,
        action: 22010,
      };

-      let res = await apiCall.familyListings(reqData);
+      const res = await apiCall.familyListings(reqData);
      const { data } = res;
-      if (data?.internal_return >= 0 && data?.status == "OK") {
-        let { result_list } = data;
+      if (data?.internal_return >= 0 && data?.status === "OK") {
+        const { result_list } = data;
        setFamilyList(result_list);
        setLoader(false);
-      } else return;
+      } else {
+        return;
+      }
    } catch (error) {
      setLoader(false);
      throw new Error(error);
    }
-  }, [apiCall, memberId, sessionId, uid]);
+  }, [apiCall]);

  useEffect(() => {
-    memberList();
+    let checkMemberList = true;
+    if (checkMemberList) {
+      memberList();
+    }
+    return () => {
+      checkMemberList = false;
+    };
  }, [listReload, memberList]);

  return (
@@ -158,7 +159,13 @@ export default function FamilyAcc() {
              ></div>
            </div>
          </div>
-          <FamilyTable familyList={familyList} loader={loader} popUpHandler={popUpHandler} />
+          <Suspense fallback={<LoadingSpinner color="sky-blue" size="16" />}>
+            <FamilyTable
+              familyList={familyList}
+              loader={loader}
+              popUpHandler={popUpHandler}
+            />
+          </Suspense>
        </div>
      </div>
      {popUp && (
@@ -7,7 +7,7 @@ import usersService from "../../services/UsersService";
 import Icons from "../Helpers/Icons";

 const DEFAULT_IMAGE = require("../../assets/images/family/default.jpg");
-const SuggestTask = ({ details, onClose, situation }) => {
+const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {
  const { pathname, state } = useLocation();
  const [submitTask, setSubmitTask] = useState({
    loading: false,
@@ -16,7 +16,7 @@ const SuggestTask = ({ details, onClose, situation }) => {
  });
  const [suggestedNextStep, setSuggestedNextStep] = useState("Send Task");

-  const switchNextStep = (value) => {
+  const switchNextStep = ({ target: value }) => {
    setSuggestedNextStep(value);
  };

@@ -29,8 +29,9 @@ const SuggestTask = ({ details, onClose, situation }) => {

  const apiCall = new usersService();

-  const handleSubmit = async (values) => {
+  const handleSuggestedTask = async (values) => {
    if (!values.title && !values.description) return;
+
    try {
      setSubmitTask({ loading: true });
      const reqData = { ...values };
@@ -49,7 +50,15 @@ const SuggestTask = ({ details, onClose, situation }) => {
    }
  };

-  // console.log("state >-->>", state);
+  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">
@@ -87,7 +96,11 @@ const SuggestTask = ({ details, onClose, situation }) => {
        </div>
        <Formik
          initialValues={initialValues}
-          onSubmit={pathname !== "/manage-family" && handleSubmit}
+          onSubmit={
+            pathname !== "/manage-family"
+              ? handleSuggestedTask
+              : handleParentSuggestion
+          }
        >
          {(props) => {
            return (
@@ -164,7 +177,7 @@ const SuggestTask = ({ details, onClose, situation }) => {
                    </div>

                    {/* Radio buttons for family */}
-                    {pathname === "/manage-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
@@ -182,18 +195,22 @@ const SuggestTask = ({ details, onClose, situation }) => {
                            <label
                              role="group"
                              key={idx}
-                              htmlFor="parent-suggested"
+                              htmlFor={`parent-suggested-${idx}`}
+                              className={`transition duration-150 ease-in-out parent-suggest group cursor-pointer`}
+                              onClick={() => setSuggestedNextStep(title)}
                            >
                              <input
                                type="radio"
                                name="parent-suggested"
                                value={title}
-                                checked={title == suggestedNextStep}
+                                checked={suggestedNextStep === title}
                                onChange={switchNextStep}
-                                className={`transition duration-150 ease-in-out parent-suggest`}
+                                className={`transition duration-150 ease-in-out parent-suggest pointer-events-none`}
                              />
                              <span
-                                onClick={switchNextStep}
+                                onClick={() => setSuggestedNextStep(title)}
+                                id={`parent-suggested-${idx}`}
+                                name="parent-suggested"
                                className={`ml-1 ${
                                  title == "Not Now"
                                    ? "text-red-500"
@@ -208,9 +225,10 @@ const SuggestTask = ({ details, onClose, situation }) => {
                          ))}
                        </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
@@ -220,31 +238,33 @@ const SuggestTask = ({ details, onClose, situation }) => {
                    >
                      <span className="text-gradient"> Cancel</span>
                    </button>
-                    {pathname !== "/manage-family" ? (
-                      <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"
-                      >
-                        {submitTask.loading
-                          ? "Submitting Task"
-                          : submitTask.state == "success"
-                          ? "Task Submitted"
-                          : submitTask.state == "bad"
-                          ? "An Error Occurred"
-                          : "Send to Parents"}
-                      </button>
-                    ) : (
-                      <button className="text-white primary-gradient text-18 tracking-wide px-4 py-3 rounded-full flex items-center transition duration-150 ease-in-out">
-                        {suggestedNextStep == "Send Task" ? (
-                          <>
-                            Continue <Icons name="chevron-right" />
-                          </>
-                        ) : (
-                          "Complete"
-                        )}
-                      </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>
@@ -1,4 +1,5 @@
 import React from "react";
+import localImgLoad from "../../lib/localImgLoad";

 import ATMCard from "../../assets/images/card.svg";
 import VisaCard from "../../assets/images/visa.svg";
@@ -508,7 +509,21 @@ export default function Icons({ name }) {
        <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" />
+      ): (
        ""
      )}
    </>
@@ -1,7 +1,7 @@
 import React, { useState } from "react";
 import { Link } from "react-router-dom";
 import { toast } from "react-toastify";
-import heroBg from "../../assets/images/hero-bg.svg";
+import heroBg from "../../assets/images/bg-sky-blue.jpg"; //hero-bg.svg";
 import heroUser from "../../assets/images/hero-user.png";
 import CountDown from "../Helpers/CountDown";
 import HomeSliders from "./HomeSliders";
@@ -24,7 +24,7 @@ export default function Hero({ className, bannerList, nextDueTask }) {

  return (
    <div
-      className={`w-full lg:h-[444px] h-full lg:flex lg:p-8 p-4 justify-between items-center lg:space-x-28 rounded-2xl overflow-hidden ${
+      className={`w-full min-h-[400px] md:grid grid-cols-2 lg:p-8 p-4 justify-between items-center gap-2 rounded-2xl overflow-hidden ${
        className || ""
      }`}
      style={{
@@ -33,7 +33,7 @@ export default function Hero({ className, bannerList, nextDueTask }) {
        backgroundSize: "cover",
      }}
    >
-      <div className="flex-1 h-[330px] lg:h-full flex flex-col justify-between mb-5 lg:mb-0">
+      <div className="h-full flex flex-col justify-between mb-5 lg:mb-0">
        {/* heading */}
        <div>
          <h1 className="lg:text-2xl text-xl font-medium text-white tracking-wide">
@@ -57,7 +57,7 @@ export default function Hero({ className, bannerList, nextDueTask }) {
        </div>
        {/* countdown */}
        {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="w-full h-32 flex justify-evenly items-center sm:p-6 p-1 rounded-2xl border back-dark1 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">
@@ -84,7 +84,7 @@ export default function Hero({ className, bannerList, nextDueTask }) {
        )}
        {/* action */}
        <div className="flex lg:space-x-3 space-x-1 items-center">
-          <Link to="/mytask" className="text-white text-base sm:block hidden">
+          <Link to="/mytask" className="text-white text-base">
            <span className=" border-b dark:border-[#5356fb29]  border-white">
              {" "}
              View All Task(s)
@@ -6,7 +6,7 @@ export default function HomeSliders(props) {
  // debugger;
  return (
    <>
-      <div className="hero-slider relative 2xl:w-[600px] xl:w-[400px] lg:w-[420px] w-full mb-2 lg:mb-0 ">
+      <div className="hero-slider relative h-full w-full mb-2 lg:mb-0">
        <div className="w-full">
          <SliderCom settings={props.settings}>
            {props.bannerList?.length <= 0 && (
@@ -2,7 +2,7 @@ import React from 'react'

 function CurrentJobAction() {
  return (
-    <div className='job-action bg-white dark:bg-black'>
+    <div className='job-action  dark:bg-black'>
      <p className="my-3 py-1 text-base active-owner">
          <table className="w-full text-sm text-left text-gray-500">
              <tbody>
@@ -60,7 +60,7 @@ function CurrentTaskAction({jobDetails}) {
    }

  return (
-    <div className='job-action bg-white dark:bg-black'>
+    <div className='job-action  dark:bg-black'>

          <table className="w-full text-sm text-left text-gray-500 active-worker">
              <tbody>
@@ -101,7 +101,7 @@ function PastDueJobAction({jobDetails}) {
    }

  return (
-    <div className='job-action bg-white dark:bg-black'>
+    <div className='job-action  dark:bg-black'>

        <table className="w-full text-sm text-left text-gray-500 owner-pastdue">
            <tbody>
@@ -2,7 +2,7 @@ import React from 'react'

 function PastDueTaskAction() {
  return (
-    <div className='job-action bg-white dark:bg-black'>
+    <div className='job-action dark:bg-black'>

        <table className="w-full text-sm text-left text-gray-500 worker-pastdue">
            <tbody>
@@ -90,7 +90,7 @@ function ReviewJobAction({jobDetails}) {
        })
    }
  return (
-    <div className='job-action bg-white dark:bg-black'>
+    <div className='job-action  dark:bg-black'>
      <div className="my-3 py-1 text-base">
          <table className="w-full text-sm text-left text-gray-500 review-owner">
              <tbody>
@@ -2,7 +2,7 @@ import React from 'react'

 function ReviewTaskAction() {
  return (
-    <div className='job-action bg-white dark:bg-black'>
+    <div className='job-action  dark:bg-black'>
      <p className="my-3 py-1 text-base text-dark-gray dark:text-white">
        Waiting for the completion message from the client before you can approve. Worker True & Review Job
      </p>
@@ -10,6 +10,7 @@ import AddFund from './AddFund'
 import AddRecipient from './AddRecipient'
 import ConfirmTransfer from './ConfirmTransfer'
 import ConfirmAddFund from './ConfirmAddFund'
+import WalletBox from "./WalletBox";

 function Wallet() {
  return (
@@ -71,7 +72,8 @@ const WalletRoutes = () => {
                <Route path='add-fund' element={<AddFund payment={paymentHistory} />} />
                <Route path='add-fund/confirm-add-fund' element={<ConfirmAddFund payment={paymentHistory} />} />
                <Route path='transfer-fund' element={<TransferFund payment={paymentHistory} wallet={walletList} />} />
-                <Route index element={<Balance wallet={walletList} />} />
+                {/*<Route index element={<Balance wallet={walletList} />} />*/}
+                <Route index element={<WalletBox wallet={walletList} />} />
                <Route path='transfer-fund/add-recipient' element={<AddRecipient />} />
                <Route path='transfer-fund/confirm-transfer' element={<ConfirmTransfer payment={paymentHistory} wallet={walletList} />} />
                <Route path='*' element={<Navigate to='/' />} />
@@ -0,0 +1,273 @@
+import React from "react";
+import bank1 from "../../assets/images/bank-1.png";
+import bank2 from "../../assets/images/bank-2.png";
+import bank3 from "../../assets/images/bank-3.png";
+import bank4 from "../../assets/images/bank-4.png";
+import Layout from "../Partials/Layout";
+import CurrencyStaticsSection from "./CurrencyStaticsSection";
+import CurrentBalanceWidget from "./CurrentBalanceWidget";
+import InvestmentSection from "./InvestmentSection";
+import RecentTransactionWidget from "./RecentTransactionWidget";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
+import WalletItemCard from "./WalletItemCard";
+
+export default function WalletBox({wallet, coupon}) {
+    return (
+        <>
+
+                <div className="my-wallet-wrapper w-full mb-10">
+                    <div className="main-wrapper w-full">
+                        <div className="balance-inquery w-full lg:h-[436px] lg:flex lg:space-x-11 mb-11">
+                            {wallet.loading ?
+                                <LoadingSpinner size='16' color='sky-blue' />
+                                :
+                                wallet.data.length ?
+                                    wallet.data.map((item, index)=> (
+                                        <div className="lg:w-1/2 h-full mb-10 lg:mb-0">
+                                            <WalletItemCard walletItem={item} />
+                                        </div>
+                                )) : ''
+                            }
+
+                            {/*<div className="flex-1">*/}
+                            {/*    <CurrentBalanceWidget />*/}
+                            {/*</div>*/}
+                          {/*  <div className="flex-1">*/}
+                          {/*      <div className="my-wallets w-full h-full bg-white dark:bg-dark-white   rounded-lg p-6">*/}
+                          {/*          <div className="mb-4">*/}
+                          {/*              <h1 className="text-xl font-bold tracking-wide   text-dark-gray dark:text-white">*/}
+                          {/*                  My Wallet*/}
+                          {/*              </h1>*/}
+                          {/*          </div>*/}
+                          {/*          <div className="content-area">*/}
+                          {/*              <div className="flex justify-between items-center mb-6">*/}
+                          {/*                  <div className="flex space-x-5 items-center">*/}
+                          {/*                      <div className="account-name flex space-x-4 items-center">*/}
+                          {/*                          <div className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">*/}
+                          {/*                              <img src={bank1} alt="" />*/}
+                          {/*                          </div>*/}
+                          {/*                          <div className="name">*/}
+                          {/*                              <p className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">*/}
+                          {/*                                  MetaMask*/}
+                          {/*                              </p>*/}
+                          {/*                          </div>*/}
+                          {/*                      </div>*/}
+                          {/*                  </div>*/}
+                          {/*                  <div className="flex space-x-5 items-center">*/}
+                          {/*                      <div>*/}
+                          {/*                          <p className="text-xl font-bold text-dark-gray dark:text-white text-right mb-3">*/}
+                          {/*                              $734.79*/}
+                          {/*                          </p>*/}
+                          {/*                          <p className="text-sm text-thin-light-gray">*/}
+                          {/*                              New Add*/}
+                          {/*                              <span className="text-light-green ml-1">*/}
+                          {/*    +324.75*/}
+                          {/*  </span>*/}
+                          {/*                          </p>*/}
+                          {/*                      </div>*/}
+                          {/*                      <div>*/}
+                          {/*<span className="dark:text-thin-light-gray text-[#374557]">*/}
+                          {/*  <svg*/}
+                          {/*      width="6"*/}
+                          {/*      height="26"*/}
+                          {/*      viewBox="0 0 6 26"*/}
+                          {/*      fill="none"*/}
+                          {/*      className="fill-current"*/}
+                          {/*      xmlns="http://www.w3.org/2000/svg"*/}
+                          {/*  >*/}
+                          {/*    <circle cx="3" cy="3" r="3" fillOpacity="0.6" />*/}
+                          {/*    <circle*/}
+                          {/*        cx="3"*/}
+                          {/*        cy="12.75"*/}
+                          {/*        r="3"*/}
+                          {/*        fillOpacity="0.6"*/}
+                          {/*    />*/}
+                          {/*    <circle*/}
+                          {/*        cx="3"*/}
+                          {/*        cy="22.5"*/}
+                          {/*        r="3"*/}
+                          {/*        fillOpacity="0.6"*/}
+                          {/*    />*/}
+                          {/*  </svg>*/}
+                          {/*</span>*/}
+                          {/*                      </div>*/}
+                          {/*                  </div>*/}
+                          {/*              </div>*/}
+                          {/*              <div className="flex justify-between items-center mb-6">*/}
+                          {/*                  <div className="flex space-x-5 items-center">*/}
+                          {/*                      <div className="account-name flex space-x-4 items-center">*/}
+                          {/*                          <div className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">*/}
+                          {/*                              <img src={bank2} alt="" />*/}
+                          {/*                          </div>*/}
+                          {/*                          <div className="name">*/}
+                          {/*                              <p className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">*/}
+                          {/*                                  Coinbase Wallet*/}
+                          {/*                              </p>*/}
+                          {/*                          </div>*/}
+                          {/*                      </div>*/}
+                          {/*                  </div>*/}
+                          {/*                  <div className="flex space-x-5 items-center">*/}
+                          {/*                      <div>*/}
+                          {/*                          <p className="text-xl font-bold text-dark-gray dark:text-white text-right mb-3">*/}
+                          {/*                              $734.79*/}
+                          {/*                          </p>*/}
+                          {/*                          <p className="text-sm text-thin-light-gray">*/}
+                          {/*                              New Add*/}
+                          {/*                              <span className="text-light-green ml-1">*/}
+                          {/*    +324.75*/}
+                          {/*  </span>*/}
+                          {/*                          </p>*/}
+                          {/*                      </div>*/}
+                          {/*                      <div>*/}
+                          {/*<span className="dark:text-thin-light-gray text-[#374557]">*/}
+                          {/*  <svg*/}
+                          {/*      width="6"*/}
+                          {/*      height="26"*/}
+                          {/*      viewBox="0 0 6 26"*/}
+                          {/*      fill="none"*/}
+                          {/*      className="fill-current"*/}
+                          {/*      xmlns="http://www.w3.org/2000/svg"*/}
+                          {/*  >*/}
+                          {/*    <circle cx="3" cy="3" r="3" fillOpacity="0.6" />*/}
+                          {/*    <circle*/}
+                          {/*        cx="3"*/}
+                          {/*        cy="12.75"*/}
+                          {/*        r="3"*/}
+                          {/*        fillOpacity="0.6"*/}
+                          {/*    />*/}
+                          {/*    <circle*/}
+                          {/*        cx="3"*/}
+                          {/*        cy="22.5"*/}
+                          {/*        r="3"*/}
+                          {/*        fillOpacity="0.6"*/}
+                          {/*    />*/}
+                          {/*  </svg>*/}
+                          {/*</span>*/}
+                          {/*                      </div>*/}
+                          {/*                  </div>*/}
+                          {/*              </div>*/}
+                          {/*              <div className="flex justify-between items-center mb-6">*/}
+                          {/*                  <div className="flex space-x-5 items-center">*/}
+                          {/*                      <div className="account-name flex space-x-4 items-center">*/}
+                          {/*                          <div className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">*/}
+                          {/*                              <img src={bank3} alt="" />*/}
+                          {/*                          </div>*/}
+                          {/*                          <div className="name">*/}
+                          {/*                              <p className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">*/}
+                          {/*                                  Bitski*/}
+                          {/*                              </p>*/}
+                          {/*                          </div>*/}
+                          {/*                      </div>*/}
+                          {/*                  </div>*/}
+                          {/*                  <div className="flex space-x-5 items-center">*/}
+                          {/*                      <div>*/}
+                          {/*                          <p className="text-xl font-bold text-dark-gray dark:text-white text-right mb-3">*/}
+                          {/*                              $734.79*/}
+                          {/*                          </p>*/}
+                          {/*                          <p className="text-sm text-thin-light-gray">*/}
+                          {/*                              New Add*/}
+                          {/*                              <span className="text-light-green ml-1">*/}
+                          {/*    +324.75*/}
+                          {/*  </span>*/}
+                          {/*                          </p>*/}
+                          {/*                      </div>*/}
+                          {/*                      <div>*/}
+                          {/*<span className="dark:text-thin-light-gray text-[#374557]">*/}
+                          {/*  <svg*/}
+                          {/*      width="6"*/}
+                          {/*      height="26"*/}
+                          {/*      viewBox="0 0 6 26"*/}
+                          {/*      fill="none"*/}
+                          {/*      className="fill-current"*/}
+                          {/*      xmlns="http://www.w3.org/2000/svg"*/}
+                          {/*  >*/}
+                          {/*    <circle cx="3" cy="3" r="3" fillOpacity="0.6" />*/}
+                          {/*    <circle*/}
+                          {/*        cx="3"*/}
+                          {/*        cy="12.75"*/}
+                          {/*        r="3"*/}
+                          {/*        fillOpacity="0.6"*/}
+                          {/*    />*/}
+                          {/*    <circle*/}
+                          {/*        cx="3"*/}
+                          {/*        cy="22.5"*/}
+                          {/*        r="3"*/}
+                          {/*        fillOpacity="0.6"*/}
+                          {/*    />*/}
+                          {/*  </svg>*/}
+                          {/*</span>*/}
+                          {/*                      </div>*/}
+                          {/*                  </div>*/}
+                          {/*              </div>*/}
+                          {/*              <div className="flex justify-between items-center mb-6">*/}
+                          {/*                  <div className="flex space-x-5 items-center">*/}
+                          {/*                      <div className="account-name flex space-x-4 items-center">*/}
+                          {/*                          <div className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">*/}
+                          {/*                              <img src={bank4} alt="" />*/}
+                          {/*                          </div>*/}
+                          {/*                          <div className="name">*/}
+                          {/*                              <p className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">*/}
+                          {/*                                  WalletConnect*/}
+                          {/*                              </p>*/}
+                          {/*                          </div>*/}
+                          {/*                      </div>*/}
+                          {/*                  </div>*/}
+                          {/*                  <div className="flex space-x-5 items-center">*/}
+                          {/*                      <div>*/}
+                          {/*                          <p className="text-xl font-bold text-dark-gray dark:text-white text-right mb-3">*/}
+                          {/*                              $734.79*/}
+                          {/*                          </p>*/}
+                          {/*                          <p className="text-sm text-thin-light-gray">*/}
+                          {/*                              New Add*/}
+                          {/*                              <span className="text-light-green ml-1">*/}
+                          {/*    +324.75*/}
+                          {/*  </span>*/}
+                          {/*                          </p>*/}
+                          {/*                      </div>*/}
+                          {/*                      <div>*/}
+                          {/*<span className="dark:text-thin-light-gray text-[#374557]">*/}
+                          {/*  <svg*/}
+                          {/*      width="6"*/}
+                          {/*      height="26"*/}
+                          {/*      viewBox="0 0 6 26"*/}
+                          {/*      fill="none"*/}
+                          {/*      className="fill-current"*/}
+                          {/*      xmlns="http://www.w3.org/2000/svg"*/}
+                          {/*  >*/}
+                          {/*    <circle cx="3" cy="3" r="3" fillOpacity="0.6" />*/}
+                          {/*    <circle*/}
+                          {/*        cx="3"*/}
+                          {/*        cy="12.75"*/}
+                          {/*        r="3"*/}
+                          {/*        fillOpacity="0.6"*/}
+                          {/*    />*/}
+                          {/*    <circle*/}
+                          {/*        cx="3"*/}
+                          {/*        cy="22.5"*/}
+                          {/*        r="3"*/}
+                          {/*        fillOpacity="0.6"*/}
+                          {/*    />*/}
+                          {/*  </svg>*/}
+                          {/*</span>*/}
+                          {/*                      </div>*/}
+                          {/*                  </div>*/}
+                          {/*              </div>*/}
+                          {/*          </div>*/}
+                          {/*      </div>*/}
+                          {/*  </div>*/}
+                        </div>
+                        {/* flex space-x-11 */}
+                        {/*<div className="recent-and-investment grid lg:grid-cols-2 grid-cols-1 2xl:gap-[40px] xl:gap-7 gap-4 lg:h-[416px] w-full  justify-between">*/}
+                        {/*    <div className=" h-full">*/}
+                        {/*        <RecentTransactionWidget />*/}
+                        {/*    </div>*/}
+                        {/*    <div className=" h-full">*/}
+                        {/*        <InvestmentSection />*/}
+                        {/*    </div>*/}
+                        {/*</div>*/}
+                    </div>
+                </div>
+
+        </>
+    );
+}
@@ -0,0 +1,72 @@
+import React, { useState } from "react";
+import background from "../../assets/images/bg-sky-blue.jpg" //shape/balance-bg.svg";
+import {PriceFormatter} from "../Helpers/PriceFormatter";
+import {Link} from "react-router-dom";
+
+export default function WalletItemCard({walletItem}) {
+    const [eth] = useState(90);
+    const [btc] = useState(85);
+    const [ltc] = useState(20);
+    return (
+        <div
+            className="current-balance-widget w-full h-full rounded-2xl overflow-hidden flex flex-col justify-between  px-8 py-9"
+            style={{
+                background: `url(${background}) 0% 0% / cover no-repeat`,
+            }}
+        >
+            <div className="wallet flex justify-between">
+                <div className="w-[100px] h-[100px] rounded-full bg-[#485199] flex justify-center items-center">
+                    <div>
+                        <p className="text-26 font-bold text-white tracking-wide text-center">
+                            .
+                        </p>
+                        <p className="text-lg text-white tracking-wide text-center">
+                            {walletItem.code}
+                        </p>
+                    </div>
+                </div>
+                <div>
+                    {/*<p className="text-26 font-bold tracking-wide text-white text-right">*/}
+                    {/*    6,572.00*/}
+                    {/*</p>*/}
+                    {/*<p className="tracking-wide text-white text-lg opacity-[70%]">*/}
+                    {/*    Total Transactions*/}
+                    {/*</p>*/}
+                </div>
+            </div>
+            <div className="balance">
+                <p className="text-lg text-white opacity-[70%] tracking-wide mb-6">
+                    Current Balance
+                </p>
+                <p className="text-[44px] font-bold text-white tracking-wide leading-10 mb-2">
+                   {walletItem.amount * 0.01} {walletItem.code}
+                </p>
+                <p className="text-lg text-white tracking-wide">
+                   HOLDINGS : {PriceFormatter(walletItem.escrow * 0.01, walletItem.code)}
+                    {/*<span className="text-light-green">(11.5%)</span>*/}
+                </p>
+            </div>
+            <div className="counters flex space-x-16">
+                <div>
+                    {
+                        walletItem.action_type != 'AC_AD_FD_ONLY' ?
+                            <Link to='transfer-fund' className='px-2 py-1 flex items-center gap-2 user-balance cursor-pointer h-[40px] rounded-full relative  bg-purple lg:text-xl text-lg font-bold text-white'>Transfer</Link>:''
+                    }
+                </div>
+                <div>
+                    <Link to='add-fund' state={{currency:walletItem.description}} className='px-2 py-1 flex items-center gap-2 user-balance cursor-pointer h-[40px] rounded-full relative  bg-white lg:text-xl text-lg font-bold'>
+                                        <span className="">
+                                            <svg xmlns="http://www.w3.org/2000/svg" width="38"
+                                                 height="38" viewBox="0 0 42 42" fill="none"><path
+                                                d="M21 0C16.8466 0 12.7865 1.23163 9.33303 3.53914C5.8796 5.84665 3.18798 9.1264 1.59854 12.9636C0.00909901 16.8009 -0.406771 21.0233 0.403518 25.0969C1.21381 29.1705 3.21386 32.9123 6.15077 35.8492C9.08767 38.7861 12.8295 40.7862 16.9031 41.5965C20.9767 42.4068 25.1991 41.9909 29.0364 40.4015C32.8736 38.812 36.1534 36.1204 38.4609 32.667C40.7684 29.2135 42 25.1534 42 21C41.994 15.4323 39.7796 10.0944 35.8426 6.15741C31.9056 2.22045 26.5677 0.00602189 21 0ZM28 22.75H22.75V28C22.75 28.4641 22.5656 28.9092 22.2374 29.2374C21.9093 29.5656 21.4641 29.75 21 29.75C20.5359 29.75 20.0908 29.5656 19.7626 29.2374C19.4344 28.9092 19.25 28.4641 19.25 28V22.75H14C13.5359 22.75 13.0908 22.5656 12.7626 22.2374C12.4344 21.9092 12.25 21.4641 12.25 21C12.25 20.5359 12.4344 20.0907 12.7626 19.7626C13.0908 19.4344 13.5359 19.25 14 19.25H19.25V14C19.25 13.5359 19.4344 13.0908 19.7626 12.7626C20.0908 12.4344 20.5359 12.25 21 12.25C21.4641 12.25 21.9093 12.4344 22.2374 12.7626C22.5656 13.0908 22.75 13.5359 22.75 14V19.25H28C28.4641 19.25 28.9093 19.4344 29.2374 19.7626C29.5656 20.0907 29.75 20.5359 29.75 21C29.75 21.4641 29.5656 21.9092 29.2374 22.2374C28.9093 22.5656 28.4641 22.75 28 22.75Z"
+                                                fill="white"></path>
+                                            </svg>
+                                        </span>
+                        <span className='text-black'>Add Credit</span>
+                    </Link>
+                </div>
+
+            </div>
+        </div>
+    );
+}
@@ -54,7 +54,6 @@ export default function OffersInterestTable({offerInterestList, className}) {
                            </thead>
                            <tbody className="h-full">
                            {currentOfferInterestList?.map((item, index) => {
-                                console.log('TESTING',item)
                                let image = item.banner ? item.banner : 'default.jpg'
                                return (
                                <tr key={index} className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50">
@@ -11,6 +11,11 @@ import ReferralTable from "../MyWallet/WalletComponent/ReferralTable";
 const validationSchema = Yup.object().shape({
  ref_email: Yup.string()
    .email("Wrong email format")
+    .matches(
+      // /^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}$/,
+      /^[^0-9][a-zA-Z0-9._%+-]+@[a-zA-Z]+(\.[a-zA-Z]+)+$/,
+      "Invalid email format"
+    )
    .min(3, "Minimum 3 characters")
    .max(50, "Maximum 50 characters")
    .required("Email is required"),
@@ -14,6 +14,11 @@ import * as Yup from "yup";
 const validationSchema = Yup.object().shape({
  email: Yup.string()
    .email("Wrong email format")
+    .matches(
+      // /^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}$/,
+      /^[^0-9][a-zA-Z0-9._%+-]+@[a-zA-Z]+(\.[a-zA-Z]+)+$/,
+      "Invalid email format"
+    )
    .min(3, "Minimum 3 characters")
    .max(50, "Maximum 50 characters")
    .required("Email is required"),
@@ -96,7 +101,7 @@ export default function PersonalInfoTab({
        // setRequestState({message: 'Profile update successfully', loading: false, status: true})
        toast.success("Update Successful");
        setTimeout(() => {
-          navigate("/", { replace: true });
+          // navigate("/", { replace: true });
          window.location.reload(true);
        }, 1000);
      })
@@ -3,7 +3,9 @@
  font-family: "Product Sans";
  src: url("./assets/fonts/Product Sans Regular.ttf");
 }
-
+.nft-main-container{
+  max-width: 1200px;
+}
 /* Bold Weight */
@font-face {
  font-family: "Product Sans";
@@ -25,14 +27,17 @@
 .heroSilderTitle{
  text-shadow: -1px 0 black, 0 1px black, 1px 0 black, 0 -1px black;
  font-family: sans; color: white;
-  font-size: 42px;
  font-family: Circular, Helvetica Neue, Helvetica, Roboto, Arial, sans-serif;
 }
-
+.back-dark1{
+  background-color: #193F5F;
+  min-width: 280px !important;
+}
 .job-action{
-  background-color: lightgoldenrodyellow;
+  background-color: aliceblue;
  height: 100px;
  border-radius: 15px;
+  padding: 5px;
 }

 .msg_box{
@@ -46,13 +51,7 @@
  color: white;
  font-weight: bold;
 }
-.siderCardHeader{
-  margin: 40px 40px 10px 40px;
-  font-size: 24px;
-  font-weight: bolder;
-}
 .siderCardDescription{
-  margin: 10px 45px 10px 45px;
  background-color: aliceblue;
  padding: 5px;
  border-radius: 5px;
@@ -939,6 +938,6 @@ TODO: Responsive ===========================
  margin: 0;
 }

-.login-type-btn{
-  box-shadow: 0 0 0.8rem #00000080;
+.assign-task-popup{
+  top: 75px;
 }
@@ -1,4 +1,3 @@
-import React from "react";
 import Axios from "axios";

 class usersService {
@@ -11,6 +10,10 @@ class usersService {
    return this.postAuxEnd("/createuser", reqData);
  }

+  CompleteOauthLogin(reqData) {
+    localStorage.setItem("session_token", ``);
+    return this.postAuxEnd("/authlogin", reqData);
+  }
  CompleteSignUp(reqData) {
    localStorage.setItem("session_token", ``);
    return this.postAuxEnd("/completesignuplink", reqData);
@@ -26,10 +29,22 @@ class usersService {
    };
    return this.postAuxEnd("/dashdata", postData);
  }
+
  logInUser(reqData) {
    localStorage.setItem("session_token", ``);
    return this.postAuxEnd("/userlogin", reqData);
  }
+
+  authStart(reqData) {
+    localStorage.setItem("session_token", ``);
+    return this.postAuxEnd("/authstart", reqData);
+  }
+  
+  authLogin(reqData) {
+    localStorage.setItem("session_token", ``);
+    return this.postAuxEnd("/authlogin", reqData);
+  }
+  
  marketJobData(reqData) {
    var postData = {
      uuid: localStorage.getItem("uuid"),
@@ -838,6 +853,27 @@ class usersService {
    return this.postAuxEnd("/offerinterestlistmsg", postData);
  }

+  // TO ADD FAMILY
+  addFamily(reqData) {
+    var postData = {
+      uid: localStorage.getItem("uid"),
+      member_id: localStorage.getItem("member_id"),
+      sessionid: localStorage.getItem("session_token"),
+      ...reqData,
+    };
+    return this.postAuxEnd("/familyadd", postData);
+  }
+
+  familyListings(reqData) {
+    var postData = {
+      uid: localStorage.getItem("uid"),
+      member_id: localStorage.getItem("member_id"),
+      sessionid: localStorage.getItem("session_token"),
+      ...reqData,
+    };
+    return this.postAuxEnd("/familylist", postData);
+  }
+
  // FUNCTION TO ASSIGN TASK TO FAMILY MEMBER
  assignFamilyTask(reqData) {
    var postData = {
@@ -1,9 +1,9 @@
 import FamilyAcc from "../components/FamilyAcc";

 export default function FamilyAccPage() {
-    return (
-        <>
-            <FamilyAcc />
-        </>
-    );
+  return (
+    <>
+      <FamilyAcc />
+    </>
+  );
 }
Author	SHA1	Message	Date
victorAnumudu	ef545c9714	validated email	2023-07-10 13:48:23 +01:00
ameye	029a7327a8	Merge branch 'google-login-fix' of WrenchBoard/Users-Wrench into master	2023-07-10 11:22:19 +00:00
victorAnumudu	5a5d933b24	google login fix	2023-07-10 12:18:43 +01:00
ameye	9f19c930b7	Merge branch 'suggested-task-page' of WrenchBoard/Users-Wrench into master	2023-07-10 08:46:47 +00:00
Ebube	84d7fabae7	Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into suggested-task-page	2023-07-10 09:14:54 +01:00
Ebube	b245f87556	Optimizations and underlying fixes done yesterday	2023-07-10 09:14:30 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	bed5303fa4	wallet	2023-07-09 20:42:00 -04:00
ameye	a5af8ed722	Merge branch 'home-hero-min-height' of WrenchBoard/Users-Wrench into master	2023-07-09 23:26:57 +00:00
victorAnumudu	ec97d118b2	AuthLayout added to redirect page	2023-07-09 23:55:35 +01:00
ameye	85213c31a1	Merge branch 'home-hero-min-height' of WrenchBoard/Users-Wrench into master	2023-07-09 22:55:28 +00:00
victorAnumudu	f9b6c68f99	added min height to home page hero section	2023-07-09 23:34:39 +01:00
ameye	2a4b77c9a0	Merge branch 'home-page-hero-adjustment' of WrenchBoard/Users-Wrench into master	2023-07-09 22:28:43 +00:00
victorAnumudu	97aa5dba21	Merge 'master' into home-page-hero-adjustment	2023-07-09 23:19:30 +01:00
victorAnumudu	58a10ca6be	home page hero section adjusted and google login success redirect implemented	2023-07-09 23:14:07 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	f3edf1d90b	home banner	2023-07-09 17:57:05 -04:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	1f7b310b6f	google login	2023-07-09 15:41:49 -04:00
ameye	aecb06ca96	Merge branch 'verify-link' of WrenchBoard/Users-Wrench into master	2023-07-09 10:54:08 +00:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	d89194f18e	sty	2023-07-09 00:39:38 -04:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	03866d666b	banner bg	2023-07-09 00:17:20 -04:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	4224be46bc	banner issues	2023-07-08 23:19:23 -04:00
victorAnumudu	5dad00096a	check for all necessary variables from API to determine verify link success	2023-07-09 03:42:01 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	72da5c707a	wallet adjust	2023-07-08 21:44:45 -04:00
tolik	625928e34b	Message fix	2023-07-09 09:31:45 +08:00
tolik	6fd92600b4	Specify login channel	2023-07-09 08:47:00 +08:00
tolik	133f500849	Specify login channel	2023-07-09 08:19:17 +08:00
tolik	b1f1b34924	API calls for authstart and authlogin; Call authlogin with code and redirect URI to do the token exchange on the backend	2023-07-09 07:58:31 +08:00
ameye	e80c3528db	Merge branch 'suggested-task-page' of WrenchBoard/Users-Wrench into master	2023-07-08 22:38:35 +00:00
Ebube	3eb6960cc7	Fixed underlying bugs	2023-07-08 23:27:10 +01:00
Ebube	eb01e35c75	Continue Suggested Task	2023-07-08 22:52:36 +01:00
ameye	0cc70d66b3	Merge branch 'family-account-icon' of WrenchBoard/Users-Wrench into master	2023-07-08 18:34:33 +00:00
victorAnumudu	7111e81f11	added family account login input icon	2023-07-08 19:22:00 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	1c64771dcd	Job action area	2023-07-08 11:27:21 -04:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	ac1a4f895a	container max with for 4k screens	2023-07-08 11:05:20 -04:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	22f5bd01d2	log in error	2023-07-08 10:53:58 -04:00
ameye	467528835a	Merge branch 'valid-email-pattern' of WrenchBoard/Users-Wrench into master	2023-07-08 14:36:10 +00:00
victorAnumudu	e74119983f	manage family icon adjusted	2023-07-08 15:33:31 +01:00
victorAnumudu	0be78a2a1b	Merge 'master' into valid-email-pattern branch	2023-07-08 15:30:12 +01:00
ameye	67d5555377	Merge branch 'suggested-task-page' of WrenchBoard/Users-Wrench into master	2023-07-08 13:18:22 +00:00
victorAnumudu	0e65c05505	checks for valid email pattern before signing up an account	2023-07-08 14:13:10 +01:00
Ebube	01d5cdd093	Rearrangement of New Task Layout	2023-07-08 14:02:18 +01:00
ameye	08793ad90d	Merge branch 'login-type-btn' of WrenchBoard/Users-Wrench into master	2023-07-08 10:22:02 +00:00
ameye	e23bdaa0a5	Merge branch 'family-member-panel' of WrenchBoard/Users-Wrench into master	2023-07-08 10:21:50 +00:00
victorAnumudu	9791d66225	family member panel icon added	2023-07-08 07:58:18 +01:00
victorAnumudu	70e6ae20a4	icons added	2023-07-08 06:19:25 +01:00
victorAnumudu	17d1a84792	login type btn amended	2023-07-08 05:30:51 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	f51ed44463	Hide facebook on page	2023-07-07 22:31:10 -04:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	ba45a7bdb9	Link verify	2023-07-07 20:31:21 -04:00
ameye	20909a5b76	Merge branch 'task-banner-family-acct' of WrenchBoard/Users-Wrench into master	2023-07-07 19:51:29 +00:00
victorAnumudu	c1a8fb6cf4	banner added to family corner task	2023-07-07 20:19:44 +01:00
ameye	a2148aaf3e	Merge branch 'banner-missing-pages' of WrenchBoard/Users-Wrench into master	2023-07-07 16:49:19 +00:00
				`@@ -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>
				`@@ -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>`