From 142dc708803e83d917bc9d966308127f13fd306e Mon Sep 17 00:00:00 2001
From: Muneerat <oladipomunirat@gmail.com>
Date: Fri, 23 Aug 2024 13:15:12 +0100
Subject: [PATCH 01/58] fix: add router for terms and privacy in footer bottom

---
 src/components/layouts/footer/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/layouts/footer/index.tsx b/src/components/layouts/footer/index.tsx
index b5de8c731..7de3e3e8f 100644
--- a/src/components/layouts/footer/index.tsx
+++ b/src/components/layouts/footer/index.tsx
@@ -150,8 +150,8 @@ const Footer = () => {
   ];
 
   const footerBottom = [
-    { route: "privacyPolicy", link: "/" },
-    { route: "termsOfUse", link: "/" },
+    { route: "privacyPolicy", link: "/privacy-policy" },
+    { route: "termsOfUse", link: "/terms-and-conditions" },
   ];
 
   //

From 91bfb32cae8683dcd4009560099f2a876c965a59 Mon Sep 17 00:00:00 2001
From: Mary <101870828+Chioma227@users.noreply.github.com>
Date: Fri, 23 Aug 2024 19:03:15 +0100
Subject: [PATCH 02/58] chore: remove duplicate contactUs from help-center

---
 src/app/(landing-routes)/help-center/page.tsx | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/app/(landing-routes)/help-center/page.tsx b/src/app/(landing-routes)/help-center/page.tsx
index 26ff2313b..768041179 100644
--- a/src/app/(landing-routes)/help-center/page.tsx
+++ b/src/app/(landing-routes)/help-center/page.tsx
@@ -114,17 +114,6 @@ const HelpCenter = () => {
               >
                 Frequently Asked Questions
               </h1>
-
-              <p className="mb-3 text-[18px] text-neutral-600">
-                We couldn&apos;t answer your question?
-              </p>
-
-              <Link
-                href="/contact-us"
-                className="align-center flex w-[150px] justify-center rounded-md border border-[#0A0A0A] bg-[#FFF] py-4 text-[#0F172A] hover:bg-accent hover:text-accent-foreground"
-              >
-                Contact us
-              </Link>
             </div>
 
             <FaqAccordion faqs={faqData} containerClassName="px-0 py-0 " />

From 858c2064e192742cd6d5ef6b596bc899810b55aa Mon Sep 17 00:00:00 2001
From: Mary <101870828+Chioma227@users.noreply.github.com>
Date: Fri, 23 Aug 2024 19:14:02 +0100
Subject: [PATCH 03/58] fix: fix privacy policy and terms of use footer links

---
 src/components/layouts/footer/index.tsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/components/layouts/footer/index.tsx b/src/components/layouts/footer/index.tsx
index 0e4eadca9..ac586c8ee 100644
--- a/src/components/layouts/footer/index.tsx
+++ b/src/components/layouts/footer/index.tsx
@@ -151,12 +151,10 @@ const Footer = () => {
   ];
 
   const footerBottom = [
-    { route: "privacyPolicy", link: "/" },
-    { route: "termsOfUse", link: "/" },
+    { route: "privacyPolicy", link: "/privacy-policy" },
+    { route: "termsOfUse", link: "/terms-and-conditions" },
   ];
 
-  //
-
   return (
     <footer className="bg-background dark:bg-default">
       <div className="px-4">

From 72b61d22472aa3e4643356eb956899c7cf242208 Mon Sep 17 00:00:00 2001
From: Mary <101870828+Chioma227@users.noreply.github.com>
Date: Fri, 23 Aug 2024 21:14:00 +0100
Subject: [PATCH 04/58] chore: remove 'compare all features' text from payment
 info page

---
 .../admin/(settings)/settings/payment-information/page.tsx    | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/app/dashboard/(admin)/admin/(settings)/settings/payment-information/page.tsx b/src/app/dashboard/(admin)/admin/(settings)/settings/payment-information/page.tsx
index bf10a7cec..fa909b5d2 100644
--- a/src/app/dashboard/(admin)/admin/(settings)/settings/payment-information/page.tsx
+++ b/src/app/dashboard/(admin)/admin/(settings)/settings/payment-information/page.tsx
@@ -213,10 +213,6 @@ const PaymentInformation = () => {
           </div>
         </div>
       </div>
-
-      <div className="max-w-[1000px]">
-        <p>Compare all features</p>
-      </div>
     </div>
   );
 };

From e71ab8a4c6bf4afba4bc67e436b24070f09db90a Mon Sep 17 00:00:00 2001
From: Mary <101870828+Chioma227@users.noreply.github.com>
Date: Fri, 23 Aug 2024 22:35:07 +0100
Subject: [PATCH 05/58] fix: fix toggle button to hide/show invite link

---
 .../settings/organization/members/page.tsx    | 34 ++++++++++++-------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/app/dashboard/(admin)/admin/(settings)/settings/organization/members/page.tsx b/src/app/dashboard/(admin)/admin/(settings)/settings/organization/members/page.tsx
index be3a54d02..1a9bf1707 100644
--- a/src/app/dashboard/(admin)/admin/(settings)/settings/organization/members/page.tsx
+++ b/src/app/dashboard/(admin)/admin/(settings)/settings/organization/members/page.tsx
@@ -72,6 +72,11 @@ const Members = () => {
   const [isModalOpen, setIsModalOpen] = useState(false);
   const [exporting, setExporting] = useState(false);
   const [text, setText] = useState("Export CSV");
+  const [isVisible, setIsVisible] = useState<boolean>(false);
+
+  const toggleVisibility = () => {
+    setIsVisible(!isVisible);
+  };
 
   const { toast } = useToast();
   const handleCopy = () => {
@@ -159,25 +164,28 @@ const Members = () => {
               <input
                 type="checkbox"
                 className="peer sr-only"
-                onChange={() => {}}
+                onChange={toggleVisibility}
+                checked={isVisible}
               />
               <div className="peer h-6 w-11 rounded-full bg-gray-200 after:absolute after:left-[2px] after:top-[2px] after:h-5 after:w-5 after:rounded-full after:border after:border-gray-300 after:bg-white after:transition-all after:content-[''] peer-checked:bg-orange-600 peer-checked:after:translate-x-full peer-checked:after:border-white peer-focus:ring-4 peer-focus:ring-orange-300 dark:border-gray-600 dark:bg-gray-700 dark:peer-focus:ring-orange-800"></div>
             </label>
           </div>
         </div>
 
-        <div className="flex w-full justify-between">
-          <CustomButton variant="outline" className="w-full overflow-hidden">
-            https://www.figma.com/design/7hCSTNzQOJLl9aww6wEEd1/Managing-Users----Team-Learn-AI?node-i
-          </CustomButton>
-          <CustomButton
-            variant="primary"
-            className="ml-8 space-x-4"
-            onClick={handleCopy}
-          >
-            Copy link
-          </CustomButton>
-        </div>
+        {isVisible && (
+          <div className="flex w-full justify-between">
+            <CustomButton variant="outline" className="w-full overflow-hidden">
+              https://www.figma.com/design/7hCSTNzQOJLl9aww6wEEd1/Managing-Users----Team-Learn-AI?node-i
+            </CustomButton>
+            <CustomButton
+              variant="primary"
+              className="ml-8 space-x-4"
+              onClick={handleCopy}
+            >
+              Copy link
+            </CustomButton>
+          </div>
+        )}
       </div>
       <div className="w-full space-y-2">
         <h4 className="text-lg font-medium">Manage members</h4>

From 55ec21adbe4337348b81b2e10569402e446313d9 Mon Sep 17 00:00:00 2001
From: Jibola Paul <harjibbolar26@gmail.com>
Date: Fri, 23 Aug 2024 23:45:08 +0100
Subject: [PATCH 06/58] fix: add toggle icon for password visibility and fix
 text

---
 .../account/_component.tsx/password.tsx       | 98 ++++++++++++++-----
 1 file changed, 71 insertions(+), 27 deletions(-)

diff --git a/src/app/dashboard/(admin)/admin/(settings)/settings/account/_component.tsx/password.tsx b/src/app/dashboard/(admin)/admin/(settings)/settings/account/_component.tsx/password.tsx
index c818f5fa5..03577b31e 100644
--- a/src/app/dashboard/(admin)/admin/(settings)/settings/account/_component.tsx/password.tsx
+++ b/src/app/dashboard/(admin)/admin/(settings)/settings/account/_component.tsx/password.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import axios from "axios";
+import { Eye, EyeOff } from "lucide-react";
 import { useSession } from "next-auth/react";
 import { ChangeEvent, useState } from "react";
 
@@ -10,6 +11,8 @@ import CustomInput from "~/components/common/input/input";
 import PasswordSuccessfulModal from "~/components/common/modals/password-successful";
 import { toast } from "~/components/ui/use-toast";
 
+type PasswordField = "current" | "new" | "confirmNew";
+
 const Password = () => {
   const { data } = useSession();
 
@@ -17,6 +20,12 @@ const Password = () => {
 
   const [isPending, setIsPending] = useState(false);
 
+  const [showPassword, setShowPassword] = useState({
+    current: false,
+    new: false,
+    confirmNew: false,
+  });
+
   const [formData, setFormData] = useState({
     oldPassword: "",
     password: "",
@@ -71,6 +80,13 @@ const Password = () => {
     }
   };
 
+  const togglePasswordVisibility = (field: PasswordField) => {
+    setShowPassword((previousState) => ({
+      ...previousState,
+      [field]: !previousState[field],
+    }));
+  };
+
   const disabled =
     !formData.confirmPassword || !formData.oldPassword || !formData.password;
 
@@ -86,33 +102,61 @@ const Password = () => {
       </div>
       <div>
         <div className="mb-6 grid gap-4">
-          <CustomInput
-            placeholder="Enter current password"
-            label="Current Password"
-            className="border-border"
-            type="password"
-            name="oldPassword"
-            value={formData.oldPassword}
-            onChange={formDataHandler}
-          />
-          <CustomInput
-            placeholder="Enter new password"
-            label="New Password"
-            className="border-border"
-            type="password"
-            name="password"
-            value={formData.password}
-            onChange={formDataHandler}
-          />
-          <CustomInput
-            placeholder="Confirm new password"
-            label="Confrim new Password"
-            className="border-border"
-            type="password"
-            name="confirmPassword"
-            value={formData.confirmPassword}
-            onChange={formDataHandler}
-          />
+          <div className="relative">
+            <CustomInput
+              placeholder="Enter current password"
+              label="Current Password"
+              className="border-border"
+              type={`${showPassword.current ? "text" : "password"}`}
+              name="oldPassword"
+              value={formData.oldPassword}
+              onChange={formDataHandler}
+            />
+            <span
+              className="absolute right-2 top-9 cursor-pointer"
+              onClick={() => togglePasswordVisibility("current")}
+            >
+              {showPassword.current ? <EyeOff size={20} /> : <Eye size={20} />}
+            </span>
+          </div>
+          <div className="relative">
+            <CustomInput
+              placeholder="Enter new password"
+              label="New Password"
+              className="border-border"
+              type={`${showPassword.new ? "text" : "password"}`}
+              name="password"
+              value={formData.password}
+              onChange={formDataHandler}
+            />
+            <span
+              className="absolute right-2 top-9 cursor-pointer"
+              onClick={() => togglePasswordVisibility("new")}
+            >
+              {showPassword.new ? <EyeOff size={20} /> : <Eye size={20} />}
+            </span>
+          </div>
+          <div className="relative">
+            <CustomInput
+              placeholder="Confirm new password"
+              label="Confirm new Password"
+              className="border-border"
+              type={`${showPassword.confirmNew ? "text" : "password"}`}
+              name="confirmPassword"
+              value={formData.confirmPassword}
+              onChange={formDataHandler}
+            />
+            <span
+              className="absolute right-2 top-9 cursor-pointer"
+              onClick={() => togglePasswordVisibility("confirmNew")}
+            >
+              {showPassword.confirmNew ? (
+                <EyeOff size={20} />
+              ) : (
+                <Eye size={20} />
+              )}
+            </span>
+          </div>
         </div>
         <div className="flex items-center justify-start gap-6">
           <CustomButton variant="outline" onClick={() => setOpen(false)}>

From a0e0ca66f5a77ba03d328c1a35ed1c42e5e3cbd0 Mon Sep 17 00:00:00 2001
From: Oluwaseyi Tommy <130176232+seshconcept@users.noreply.github.com>
Date: Sat, 24 Aug 2024 00:09:09 +0100
Subject: [PATCH 07/58] Fix: responsiveness and uniform alignment of waitlist
 page.

---
 src/components/waitList/WaitListForm.tsx    | 12 +++++------
 src/components/waitList/WaitlistDialog.tsx  | 22 ++++++++++++---------
 src/components/waitList/WaitlistJoin.tsx    | 10 +++++-----
 src/components/waitList/WaitlistPayment.tsx |  6 ++++--
 4 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/src/components/waitList/WaitListForm.tsx b/src/components/waitList/WaitListForm.tsx
index 549d53c73..f997e6591 100644
--- a/src/components/waitList/WaitListForm.tsx
+++ b/src/components/waitList/WaitListForm.tsx
@@ -122,7 +122,7 @@ const WaitlistForm: React.FC = () => {
   };
 
   return (
-    <div className="mt-20 flex flex-col items-center justify-center text-neutral-dark-2">
+    <div className="mt-20 flex flex-col items-center justify-center text-neutral-dark-2 ">
       <div className="flex flex-col items-center justify-center text-center md:mb-[50px] md:w-[623px]">
         <div className="mb-4 flex items-center justify-center gap-2 md:mb-[18px]">
           <Image
@@ -131,19 +131,19 @@ const WaitlistForm: React.FC = () => {
             src="/images/WaitList/circle 1.svg"
             alt="Circle with Tick"
           />
-          <h3 className="text-[18px] font-normal leading-5 md:text-[24px]">
+          <h3 className="text-sm font-normal leading-5 md:text-[24px]">
             Deployment made easy
           </h3>
         </div>
-        <h1 className="mb-2 w-[320px] text-[24px] font-bold leading-7 md:h-[108px] md:w-[623px] md:text-[36px] md:leading-10">
+        <h1 className="mb-2 w-[320px] text-2xl font-bold leading-8 md:h-[108px] md:w-[623px] md:text-[36px] lg:text-4xl lg:font-semibold lg:leading-10">
           You can level up your SaaS production today
         </h1>
-        <h1 className="text-center text-[16px] font-normal leading-5 md:text-[20px] md:leading-7">
+        <h1 className="text-center text-base font-normal leading-7 md:text-[20px] md:leading-7">
           Join our waitlist and get early access to our boilerplates
         </h1>
       </div>
 
-      <div className="mt-[52px] flex h-auto w-[383.344px] shrink-0 items-start gap-[19.2px] rounded-md border border-gray-300 p-7 md:mt-5 md:w-[510px] md:p-2.5">
+      <div className="mb-24 mt-[52px] flex h-auto w-[383.344px] shrink-0 items-start gap-[19.2px] rounded-md border border-gray-200 p-7 md:mt-5 md:w-[510px] md:p-2.5">
         {isSubmitted ? (
           <div className="flex w-full flex-col items-center justify-center">
             <Image
@@ -162,7 +162,7 @@ const WaitlistForm: React.FC = () => {
               <div className="mb-6 h-[90px]">
                 <label
                   htmlFor="full_name"
-                  className="mb-5 block text-left text-lg font-normal text-neutral-dark-2"
+                  className="mb-5 block text-left text-lg font-normal text-[#0A0A0A]"
                 >
                   Full Name
                 </label>
diff --git a/src/components/waitList/WaitlistDialog.tsx b/src/components/waitList/WaitlistDialog.tsx
index 39dd00a89..ce4c98955 100644
--- a/src/components/waitList/WaitlistDialog.tsx
+++ b/src/components/waitList/WaitlistDialog.tsx
@@ -4,8 +4,8 @@ import React from "react";
 const WaitlistDialog: React.FC = () => {
   return (
     <div className="flex flex-col items-center justify-center">
-      <div className="mt-[20px] flex flex-col items-center justify-center gap-[20px] text-neutral-dark-2 md:mt-[60px] md:flex-row md:gap-[57px]">
-        <div className="flex w-[320px] shrink-0 flex-col items-start rounded-[8px] border-[1px] border-neutral-dark-1 p-[24px] transition-transform duration-300 hover:scale-105 hover:bg-gray-50 hover:shadow-lg">
+      <div className="mt-[20px] grid grid-cols-1 gap-[20px] md:px-2 lg:grid-cols-3 lg:gap-[40px]">
+        <div className="flex shrink-0 flex-col items-start rounded-[8px] border-[1px] border-neutral-300 p-[24px] transition-transform duration-300 hover:scale-105 hover:bg-gray-50 hover:shadow-lg md:w-[500px] lg:w-[300px]">
           <div className="flex h-[53px] w-[53px] shrink-0 items-center justify-center rounded-full bg-primary">
             <Image
               src="/images/WaitList/Vector.svg"
@@ -14,7 +14,7 @@ const WaitlistDialog: React.FC = () => {
               height="25"
             />
           </div>
-          <h1 className="mt-[12px] text-[18px] font-semibold leading-[28px]">
+          <h1 className="mt-[12px] text-xl font-semibold leading-[28px]">
             Easy Customization
           </h1>
           <p className="w-[252px] text-[14px] font-normal leading-[20px]">
@@ -22,7 +22,7 @@ const WaitlistDialog: React.FC = () => {
             maximum results
           </p>
         </div>
-        <div className="flex w-[320px] shrink-0 flex-col items-start rounded-[8px] border-[1px] border-neutral-dark-1 p-[24px] transition-transform duration-300 hover:scale-105 hover:bg-gray-50 hover:shadow-lg">
+        <div className="flex shrink-0 flex-col items-start rounded-[8px] border-[1px] border-neutral-300 p-[24px] transition-transform duration-300 hover:scale-105 hover:bg-gray-50 hover:shadow-lg md:w-[500px] lg:w-[300px]">
           <div className="flex h-[53px] w-[53px] shrink-0 items-center justify-center rounded-full bg-primary">
             <Image
               src="/images/WaitList/pie-chart2.svg"
@@ -31,7 +31,7 @@ const WaitlistDialog: React.FC = () => {
               height="30"
             />
           </div>
-          <h1 className="mt-[12px] text-[18px] font-semibold leading-[28px]">
+          <h1 className="mt-[12px] text-xl font-semibold leading-[28px]">
             Scalable Foundation
           </h1>
           <p className="w-[252px] text-[14px] font-normal leading-[20px]">
@@ -39,7 +39,7 @@ const WaitlistDialog: React.FC = () => {
             product
           </p>
         </div>
-        <div className="flex w-[320px] shrink-0 flex-col items-start rounded-[8px] border-[1px] border-neutral-dark-1 p-[24px] transition-transform duration-300 hover:scale-105 hover:bg-gray-50 hover:shadow-lg">
+        <div className="flex shrink-0 flex-col items-start rounded-[8px] border-[1px] border-neutral-300 p-[24px] transition-transform duration-300 hover:scale-105 hover:bg-gray-50 hover:shadow-lg md:w-[500px] lg:w-[300px]">
           <div className="flex h-[53px] w-[53px] shrink-0 items-center justify-center rounded-full bg-primary">
             <Image
               src="/images/WaitList/activity 2.svg"
@@ -48,7 +48,7 @@ const WaitlistDialog: React.FC = () => {
               height="36"
             />
           </div>
-          <h1 className="mt-[12px] text-[18px] font-semibold leading-[28px]">
+          <h1 className="mt-[12px] text-xl font-semibold leading-[28px]">
             Pre-built Sections
           </h1>
           <p className="w-[252px] text-[14px] font-normal leading-[20px]">
@@ -65,8 +65,12 @@ const WaitlistDialog: React.FC = () => {
           <div className="boorder-white ml-[-16px] h-[40px] w-[40px] rounded-full border-[1px] bg-gray-300"></div>
         </div>
         <div>
-          <p className="text-[12px] text-neutral-dark-1">Resource variety</p>
-          <h1 className="text-[16px] font-bold">150+ Team support</h1>
+          <p className="text-[12px] font-normal leading-4 text-gray-400">
+            Resource variety
+          </p>
+          <h1 className="text-[16px] font-medium leading-5">
+            150+ Team support
+          </h1>
         </div>
       </div>
     </div>
diff --git a/src/components/waitList/WaitlistJoin.tsx b/src/components/waitList/WaitlistJoin.tsx
index bbcdc9239..c2a7f1c06 100644
--- a/src/components/waitList/WaitlistJoin.tsx
+++ b/src/components/waitList/WaitlistJoin.tsx
@@ -14,21 +14,21 @@ const scrollToForm = () => {
 const WaitlistJoin: React.FC = () => {
   return (
     <div className="mt-[10px] flex flex-col items-center justify-center text-neutral-dark-2 md:mt-[10px]">
-      <div className="mb-[10px] rounded-md bg-slate-200 px-3 text-[20px] font-normal">
+      <div className="mb-[10px] rounded-md bg-[#F1F1F1] px-3 text-[20px] font-normal leading-6">
         waitlist
       </div>
-      <div className="mt-[10px] flex h-auto w-[322px] flex-col items-center justify-center text-center md:mt-[25px] md:w-[1104px] md:gap-[15px]">
-        <h1 className="text-[32px] font-bold leading-[38.73px] md:text-[60px] md:leading-[72.61px]">
+      <div className="mt-[10px] flex h-auto w-[322px] flex-col items-center justify-center text-center md:mt-[25px] md:w-[700px] md:gap-[15px] lg:w-[1004px]">
+        <h1 className="text-3xl font-bold leading-normal md:text-3xl md:leading-[72.61px] lg:text-5xl">
           Join the waitlist and get early{" "}
           <span className="text-primary">access!</span>
         </h1>
-        <p className="text-16px leading-bormal mt-[12px] w-[322px] font-normal md:mt-0 md:w-[802px] md:text-[28px]">
+        <p className="mt-[12px] w-[322px] text-lg font-normal leading-6 md:mt-0 md:w-[802px] md:text-2xl md:leading-9 lg:text-2xl">
           Transform your remote work meetings into fun and engaging sessions
           with our innovative game-based platform.
         </p>
       </div>
       <div className="mt-[20px] h-[54px] w-[322px] text-center font-semibold leading-[28px] md:mt-[30px] md:h-[28px] md:w-[584px]">
-        <p className="text-[20px]">
+        <p className="text-lg font-bold leading-6 text-[#525252] md:font-medium md:leading-7">
           Be a part of the first 2300 users for a{" "}
           <span className="text-primary">10% discount</span>{" "}
         </p>
diff --git a/src/components/waitList/WaitlistPayment.tsx b/src/components/waitList/WaitlistPayment.tsx
index 9fa2a9991..947bf9096 100644
--- a/src/components/waitList/WaitlistPayment.tsx
+++ b/src/components/waitList/WaitlistPayment.tsx
@@ -95,8 +95,10 @@ const WaitlistPayment: React.FC = () => {
   return (
     <div className="mt-[60px] flex flex-col items-center justify-center px-3 text-neutral-dark-2 md:mt-[100px] md:flex-col">
       <div className="text-center">
-        <p className="text-[18px] md:text-[24px]">We have got you covered</p>
-        <h1 className="h-[87px] w-[332px] text-[24px] font-bold leading-[29.05px] md:h-[132px] md:w-[669px] md:text-[36px] md:leading-[43.57px]">
+        <p className="text-[18px] font-normal leading-8 md:text-[24px]">
+          We have got you covered
+        </p>
+        <h1 className="mb-6 mt-3 h-[87px] w-[332px] text-[24px] font-bold leading-[29.05px] md:h-[132px] md:w-[632px] md:text-[36px] md:leading-[43.57px] lg:w-[950px]">
           Transform your Deployment the easy and seamless way with our
           boilerplates.
         </h1>

From 7ef2299e8fa309692eea5f720c2f88382bdbfcce Mon Sep 17 00:00:00 2001
From: Jibola Paul <harjibbolar26@gmail.com>
Date: Sat, 24 Aug 2024 00:36:09 +0100
Subject: [PATCH 08/58] fix: boilerplate logo, name and address  in footer to
 match design

---
 src/components/layouts/footer/index.tsx | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/components/layouts/footer/index.tsx b/src/components/layouts/footer/index.tsx
index 0e4eadca9..c72fb5cfd 100644
--- a/src/components/layouts/footer/index.tsx
+++ b/src/components/layouts/footer/index.tsx
@@ -10,6 +10,7 @@ import {
   Youtube,
 } from "lucide-react";
 import { useTranslations } from "next-intl";
+import Image from "next/image";
 import Link from "next/link";
 import { useState } from "react";
 
@@ -163,11 +164,16 @@ const Footer = () => {
         <div className="mx-auto w-full max-w-[1200px] items-start justify-between gap-[60px] pb-[130px] pt-[28px] sm:grid-cols-2 md:gap-4 md:pb-[46px] md:pt-[72px] lg:flex">
           <div className="mb-[100px] lg:mb-0">
             <div className="mb-[47px] flex w-full flex-col items-center justify-center sm:mb-[60px] md:block md:max-w-[254px] lg:mb-0">
-              <h5 className="text-nuetral-dark-2 text-md mb-[34px] text-center font-bold sm:text-left">
-                Boiler plate
+              <h5 className="text-nuetral-dark-2 text-md mb-[18px] text-center font-bold sm:text-left">
+                <Image
+                  src={"/home/HNG Boilerplate-Logo.png"}
+                  alt="hng_logo"
+                  width={180}
+                  height={52}
+                />
               </h5>
               <p className="text-nuetral-dark-2 text-center text-[12px] font-medium sm:text-left">
-                Logo subject details and address
+                10111, Hornchurch, London, United Kingdom
               </p>
             </div>
             <div className="flex flex-col items-center justify-center md:block lg:hidden">

From 6710bbd4b4ff4f5e0ff561bf79aa4b9cce51889b Mon Sep 17 00:00:00 2001
From: JoshuaAkpan <joshuaakpan7@gmail.com>
Date: Sat, 24 Aug 2024 01:02:54 +0100
Subject: [PATCH 09/58] feat: enhance create role form with validation and
 error handling

---
 .../create-role/page.tsx                      | 41 +++++++++++++++----
 src/schemas/index.ts                          | 23 ++++++++---
 2 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/src/app/dashboard/(admin)/admin/(settings)/settings/organization/roles-and-permissions/create-role/page.tsx b/src/app/dashboard/(admin)/admin/(settings)/settings/organization/roles-and-permissions/create-role/page.tsx
index b52da934e..a9644b8ae 100644
--- a/src/app/dashboard/(admin)/admin/(settings)/settings/organization/roles-and-permissions/create-role/page.tsx
+++ b/src/app/dashboard/(admin)/admin/(settings)/settings/organization/roles-and-permissions/create-role/page.tsx
@@ -136,8 +136,9 @@ function CreateNewRolePage() {
     handleSubmit,
     formState: { errors },
     setValue,
+    trigger,
   } = useForm<UseFormInputs>({
-    mode: "onBlur",
+    mode: "onChange",
     resolver: zodResolver(roleSchema),
   });
 
@@ -199,6 +200,10 @@ function CreateNewRolePage() {
     }
   };
 
+  const handleInputChange = (field: keyof UseFormInputs) => {
+    trigger(field);
+  };
+
   return (
     <div className="flex w-full max-w-[682px] flex-col gap-6">
       <div className="flex flex-col gap-2">
@@ -229,17 +234,28 @@ function CreateNewRolePage() {
             <input
               type="text"
               placeholder="e.g: IT Staff"
-              {...register("name")}
-              className="!w-full rounded-md border border-border bg-transparent px-3 py-2 shadow-sm outline-none focus:border-primary focus:ring-ring md:w-56"
+              {...register("name", {
+                onChange: () => handleInputChange("name"),
+              })}
+              className={`!w-full rounded-md border ${
+                errors.name ? "border-red-500" : "border-border"
+              } bg-transparent px-3 py-2 shadow-sm outline-none focus:border-primary focus:ring-ring md:w-56`}
             />
+            {errors.name && (
+              <p className="mt-1 text-sm text-red-500">{errors.name.message}</p>
+            )}
           </div>
+
           <div className="flex w-full max-w-[620px] flex-col gap-2">
             <label className="block text-left text-base font-bold text-neutral-dark-2">
               Permissions
             </label>
             <div className="flex flex-col gap-0.5">
               <Select
-                onValueChange={(value) => setPermissions(JSON.parse(value))}
+                onValueChange={(value) => {
+                  setPermissions(JSON.parse(value));
+                  trigger("permissions");
+                }}
               >
                 <SelectTrigger className="!text-left">
                   <SelectValue
@@ -261,7 +277,9 @@ function CreateNewRolePage() {
                 </SelectContent>
               </Select>
               {errors.permissions && (
-                <p className="text-red-500">Please select valid permissions.</p>
+                <p className="mt-1 text-sm text-red-500">
+                  {errors.permissions.message}
+                </p>
               )}
             </div>
           </div>
@@ -271,9 +289,18 @@ function CreateNewRolePage() {
             </label>
             <textarea
               placeholder="describe role"
-              {...register("description")}
-              className="min-h-20 w-full resize-none rounded-md border border-border bg-transparent px-3 py-2 shadow-sm outline-none focus:border-primary focus:ring-ring"
+              {...register("description", {
+                onChange: () => handleInputChange("description"),
+              })}
+              className={`min-h-20 w-full resize-none rounded-md border ${
+                errors.description ? "border-red-500" : "border-border"
+              } bg-transparent px-3 py-2 shadow-sm outline-none focus:border-primary focus:ring-ring`}
             />
+            {errors.description && (
+              <p className="mt-1 text-sm text-red-500">
+                {errors.description.message}
+              </p>
+            )}
           </div>
         </div>
         <div className="flex gap-x-6">
diff --git a/src/schemas/index.ts b/src/schemas/index.ts
index 734a3fe96..74c9a6868 100644
--- a/src/schemas/index.ts
+++ b/src/schemas/index.ts
@@ -121,14 +121,25 @@ export const permissionsSchema = z.object({
   "Can create users": z.boolean(),
   "Can blacklist/whitelist users": z.boolean(),
 });
+
 export const roleSchema = z.object({
-  name: z.string().min(2, {
-    message: "name is required",
-  }),
+  name: z
+    .string()
+    .min(2, { message: "Name is required" })
+    .max(50, { message: "Name must be 50 characters or less" })
+    .regex(/^[a-zA-Z0-9 .,!?()-]+$/, {
+      message:
+        "Name can only include letters, numbers, spaces, and common punctuation marks",
+    }),
+  description: z
+    .string()
+    .min(10, { message: "Role description must be at least 10 characters" })
+    .max(200, { message: "Role description must be 200 characters or less" })
+    .regex(/^[a-zA-Z0-9 .,!?()-]+$/, {
+      message:
+        "Description can only include letters, numbers, spaces, and common punctuation marks",
+    }),
   permissions: z
     .array(z.string().uuid())
     .nonempty("At least one permission must be selected"),
-  description: z.string().min(2, {
-    message: "Role description must be at least 2 characters.",
-  }),
 });

From 11615816dc94b0def452ca93a64fdcb4e153b336 Mon Sep 17 00:00:00 2001
From: Oluwaseyi Tommy <130176232+seshconcept@users.noreply.github.com>
Date: Sat, 24 Aug 2024 01:06:23 +0100
Subject: [PATCH 10/58] Fix: responsiveness and uniform alignment of waitlist
 page.

---
 src/components/waitList/WaitListForm.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/waitList/WaitListForm.tsx b/src/components/waitList/WaitListForm.tsx
index f997e6591..d3950373b 100644
--- a/src/components/waitList/WaitListForm.tsx
+++ b/src/components/waitList/WaitListForm.tsx
@@ -122,7 +122,7 @@ const WaitlistForm: React.FC = () => {
   };
 
   return (
-    <div className="mt-20 flex flex-col items-center justify-center text-neutral-dark-2 ">
+    <div className="mt-20 flex flex-col items-center justify-center text-neutral-dark-2">
       <div className="flex flex-col items-center justify-center text-center md:mb-[50px] md:w-[623px]">
         <div className="mb-4 flex items-center justify-center gap-2 md:mb-[18px]">
           <Image

From 5aaf8a2445580710d888b67b8d15cad551446988 Mon Sep 17 00:00:00 2001
From: JoshuaAkpan <joshuaakpan7@gmail.com>
Date: Sat, 24 Aug 2024 01:56:10 +0100
Subject: [PATCH 11/58] fix: fix lint error by optimizing regex

---
 src/schemas/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/schemas/index.ts b/src/schemas/index.ts
index 74c9a6868..03bf949cc 100644
--- a/src/schemas/index.ts
+++ b/src/schemas/index.ts
@@ -127,7 +127,7 @@ export const roleSchema = z.object({
     .string()
     .min(2, { message: "Name is required" })
     .max(50, { message: "Name must be 50 characters or less" })
-    .regex(/^[a-zA-Z0-9 .,!?()-]+$/, {
+    .regex(/^[\d !(),.?A-Za-z-]+$/, {
       message:
         "Name can only include letters, numbers, spaces, and common punctuation marks",
     }),
@@ -135,7 +135,7 @@ export const roleSchema = z.object({
     .string()
     .min(10, { message: "Role description must be at least 10 characters" })
     .max(200, { message: "Role description must be 200 characters or less" })
-    .regex(/^[a-zA-Z0-9 .,!?()-]+$/, {
+    .regex(/^[\d !(),.?A-Za-z-]+$/, {
       message:
         "Description can only include letters, numbers, spaces, and common punctuation marks",
     }),

From a02cbfbeb654203e5f1e04f448c1fcefd2274263 Mon Sep 17 00:00:00 2001
From: Jibola Paul <harjibbolar26@gmail.com>
Date: Sat, 24 Aug 2024 02:02:54 +0100
Subject: [PATCH 12/58] fix: implement api integration to fetch and display
 blog posts

---
 src/app/(landing-routes)/blog/page.tsx | 48 ++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/src/app/(landing-routes)/blog/page.tsx b/src/app/(landing-routes)/blog/page.tsx
index 3ec42db7f..646d72f53 100644
--- a/src/app/(landing-routes)/blog/page.tsx
+++ b/src/app/(landing-routes)/blog/page.tsx
@@ -1,14 +1,62 @@
 "use client";
 
+import axios from "axios";
+import { useSession } from "next-auth/react";
 import { useRouter } from "next/navigation";
+import { useEffect, useState } from "react";
 
+import { getApiUrl } from "~/actions/getApiUrl";
 import CustomButton from "~/components/common/common-button/common-button";
 import HeroSection from "~/components/extDynamicPages/blogCollection/BlogPageHero";
 import BlogCard from "~/components/layouts/BlogCards";
+import { useToast } from "~/components/ui/use-toast";
 import { blogPosts } from "./data/mock";
 
 const BlogHome = () => {
   const router = useRouter();
+  const { toast } = useToast();
+  const { data: session } = useSession();
+  const [, setBlogPost] = useState("");
+
+  useEffect(() => {
+    async function fetchBlog() {
+      try {
+        const apiUrl = await getApiUrl();
+        const token = session?.access_token;
+        const response = await axios.get(`${apiUrl}/api/v1/blogs`, {
+          headers: {
+            Authorization: `Bearer: ${token}`,
+          },
+        });
+        const data = response.data;
+        setBlogPost(data);
+        toast({
+          title:
+            Array.isArray(data.data) && data.data.length === 0
+              ? "No Blog Post Available"
+              : "Blog Posts Retrieved",
+          description:
+            Array.isArray(data.data) && data.data.length === 0
+              ? "Blog posts are empty"
+              : "Blog posts retrieved successfully",
+          variant:
+            Array.isArray(data.data) && data.data.length === 0
+              ? "destructive"
+              : "default",
+        });
+      } catch (error) {
+        toast({
+          title: "Error occured",
+          description:
+            error instanceof Error
+              ? error.message
+              : "An unknown error occurred",
+          variant: "destructive",
+        });
+      }
+    }
+    fetchBlog();
+  }, [session?.access_token, toast]);
 
   return (
     <div>

From 6b283065bdace002b789dfac4a406e40a03e71b0 Mon Sep 17 00:00:00 2001
From: Muneerat <oladipomunirat@gmail.com>
Date: Sat, 24 Aug 2024 09:34:42 +0100
Subject: [PATCH 13/58] Fix  update placeholder

---
 src/app/dashboard/(admin)/admin/(settings)/settings/page.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/dashboard/(admin)/admin/(settings)/settings/page.tsx b/src/app/dashboard/(admin)/admin/(settings)/settings/page.tsx
index 909155e7e..0f26d3f06 100644
--- a/src/app/dashboard/(admin)/admin/(settings)/settings/page.tsx
+++ b/src/app/dashboard/(admin)/admin/(settings)/settings/page.tsx
@@ -270,7 +270,7 @@ export default function SettingsPage() {
               onValueChange={(value) => setPronoun(value)}
             >
               <SelectTrigger className="w-full rounded-md border border-slate-300 bg-white text-sm font-medium text-slate-700 focus:border-orange-500 focus:ring-0">
-                <SelectValue placeholder="Select language" />
+                <SelectValue placeholder="Select" />
               </SelectTrigger>
               <SelectContent>
                 {pronouns.map((pronoun) => (

From f08d6aeee85b99c7f6987c12ae50a1c3ae7b7116 Mon Sep 17 00:00:00 2001
From: Muneerat <oladipomunirat@gmail.com>
Date: Sat, 24 Aug 2024 10:01:16 +0100
Subject: [PATCH 14/58] fix/update invite member modal title and dropdown

---
 src/components/common/modals/invite-member/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/common/modals/invite-member/index.tsx b/src/components/common/modals/invite-member/index.tsx
index ce0f294af..ee93cd2b4 100644
--- a/src/components/common/modals/invite-member/index.tsx
+++ b/src/components/common/modals/invite-member/index.tsx
@@ -154,14 +154,14 @@ const InviteMemberModal: React.FC<ModalProperties> = ({ show, onClose }) => {
             </div>
             <div>
               <label className="mb-2 block text-left text-base text-neutral-dark-2">
-                Add to Organization (Optional)
+                Invite as
               </label>
               <Select
                 onOpenChange={handleOrganizationDropdownOpen}
                 onValueChange={handleOrganizationChange}
               >
                 <SelectTrigger className="bg-white">
-                  <SelectValue placeholder="Select Organization" />
+                  <SelectValue placeholder="Select Role" />
                 </SelectTrigger>
                 <SelectContent>
                   <SelectGroup>

From 9b88addaa85e345b41451a35ddcceb63344ed20c Mon Sep 17 00:00:00 2001
From: Muneerat <oladipomunirat@gmail.com>
Date: Sat, 24 Aug 2024 11:34:22 +0100
Subject: [PATCH 15/58] fix/link go to plans

---
 .../(settings)/settings/organization/members/page.tsx      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/app/dashboard/(admin)/admin/(settings)/settings/organization/members/page.tsx b/src/app/dashboard/(admin)/admin/(settings)/settings/organization/members/page.tsx
index be3a54d02..9fa6ea504 100644
--- a/src/app/dashboard/(admin)/admin/(settings)/settings/organization/members/page.tsx
+++ b/src/app/dashboard/(admin)/admin/(settings)/settings/organization/members/page.tsx
@@ -2,6 +2,7 @@
 
 import { AxiosResponse } from "axios";
 import { EllipsisIcon } from "lucide-react";
+import Link from "next/link";
 import { useState } from "react";
 
 import CustomButton from "~/components/common/common-button/common-button";
@@ -184,7 +185,11 @@ const Members = () => {
         <p className="text-sm">
           On the Free plan all members in a workspace are administrators.
           Upgrade to a paid plan to add the ability to assign or remove
-          administrator roles. <span className="text-primary">Go to Plans</span>
+          administrator roles.{" "}
+          <Link href="/dashboard/admin/settings/payment-information">
+            {" "}
+            <span className="text-primary">Go to Plans</span>
+          </Link>
         </p>
       </div>
       <div className="my-8 flex justify-between">

From 96a4fb8a989e59e6966137c491c50c50a09454cf Mon Sep 17 00:00:00 2001
From: Jibola Paul <harjibbolar26@gmail.com>
Date: Sat, 24 Aug 2024 11:48:22 +0100
Subject: [PATCH 16/58] fix: merge conflict

---
 src/components/layouts/footer/index.tsx | 32 ++++++++++++++-----------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/components/layouts/footer/index.tsx b/src/components/layouts/footer/index.tsx
index c72fb5cfd..f9cef3e04 100644
--- a/src/components/layouts/footer/index.tsx
+++ b/src/components/layouts/footer/index.tsx
@@ -131,23 +131,23 @@ const Footer = () => {
   const socialLinks = [
     {
       icon: XIcon,
-      link: "/",
+      link: "https://twitter.com/hnginternship",
     },
     {
       icon: Youtube,
-      link: "/",
+      link: "https://youtube.com",
     },
     {
       icon: Instagram,
-      link: "/",
+      link: "https://instagram.com/hngtech",
     },
     {
       icon: Linkedin,
-      link: "/",
+      link: "https://linkedin.com/company/hng-internship/",
     },
     {
       icon: Facebook,
-      link: "/",
+      link: " https://m.facebook.com/hngtech/",
     },
   ];
 
@@ -162,17 +162,18 @@ const Footer = () => {
     <footer className="bg-background dark:bg-default">
       <div className="px-4">
         <div className="mx-auto w-full max-w-[1200px] items-start justify-between gap-[60px] pb-[130px] pt-[28px] sm:grid-cols-2 md:gap-4 md:pb-[46px] md:pt-[72px] lg:flex">
-          <div className="mb-[100px] lg:mb-0">
+          <div className="mb-[100px] max-w-[272px] shrink-0 px-2.5 lg:mb-0">
             <div className="mb-[47px] flex w-full flex-col items-center justify-center sm:mb-[60px] md:block md:max-w-[254px] lg:mb-0">
-              <h5 className="text-nuetral-dark-2 text-md mb-[18px] text-center font-bold sm:text-left">
+              <h5 className="text-md mb-[18px] flex items-center gap-2.5 text-center font-bold text-neutral-dark-2 sm:text-left">
                 <Image
-                  src={"/home/HNG Boilerplate-Logo.png"}
-                  alt="hng_logo"
-                  width={180}
-                  height={52}
+                  src="/images/logo(large).svg"
+                  width={32}
+                  height={32}
+                  alt=""
                 />
+                <span className="text-2xl font-semibold">HNG Boilerplate</span>
               </h5>
-              <p className="text-nuetral-dark-2 text-center text-[12px] font-medium sm:text-left">
+              <p className="text-nuetral-dark-2 text-center text-sm font-medium sm:text-left">
                 10111, Hornchurch, London, United Kingdom
               </p>
             </div>
@@ -301,12 +302,15 @@ const Footer = () => {
             <div className="flex w-full max-w-[116px] items-center justify-between gap-1 md:max-w-[212px]">
               {socialLinks.map((item, index) => {
                 return (
-                  <div
+                  <Link
                     key={index}
+                    href={item.link}
+                    target="_blank"
+                    rel="noopener noreferrer"
                     className="flex h-5 w-5 cursor-pointer items-center justify-center rounded-full bg-primary p-1 hover:bg-destructive md:h-10 md:w-10"
                   >
                     <item.icon className="h-[10px] w-[10px] text-white md:h-4 md:w-4" />
-                  </div>
+                  </Link>
                 );
               })}
             </div>

From 3ab7afc3cdb52766a9eaa14e24b102825f6f3ad6 Mon Sep 17 00:00:00 2001
From: "Emma F. Mkpurunchi" <mkpurunchiemma@gmail.com>
Date: Sat, 24 Aug 2024 13:30:43 +0100
Subject: [PATCH 17/58] feature:implement product text description area

---
 package.json                                  |   1 +
 pnpm-lock.yaml                                |  15 +
 public/images/user.png                        | Bin 0 -> 3393 bytes
 .../_components/new-product-modal.tsx         |  37 +-
 .../_components/product-detail-modal.tsx      |  14 +-
 .../products/mainproductdetailpage/page.tsx   | 367 ++++++++++++++++++
 src/components/ui/input.tsx                   |   3 +-
 7 files changed, 411 insertions(+), 26 deletions(-)
 create mode 100644 public/images/user.png
 create mode 100644 src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx

diff --git a/package.json b/package.json
index 00d899270..5735255e8 100644
--- a/package.json
+++ b/package.json
@@ -67,6 +67,7 @@
     "react-email": "2.1.5",
     "react-hook-form": "^7.52.2",
     "react-paginate": "^8.2.0",
+    "react-toastify": "^10.0.5",
     "recharts": "^2.12.7",
     "sharp": "^0.33.4",
     "swiper": "^11.1.9",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d7b81ef63..a058996d6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -152,6 +152,9 @@ importers:
       react-paginate:
         specifier: ^8.2.0
         version: 8.2.0(react@18.3.1)
+      react-toastify:
+        specifier: ^10.0.5
+        version: 10.0.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       recharts:
         specifier: ^2.12.7
         version: 2.12.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -4484,6 +4487,12 @@ packages:
       '@types/react':
         optional: true
 
+  react-toastify@10.0.5:
+    resolution: {integrity: sha512-mNKt2jBXJg4O7pSdbNUfDdTsK9FIdikfsIE/yUCxbAEXl4HMyJaivrVFcn3Elvt5xvCQYhUZm+hqTIu1UXM3Pw==}
+    peerDependencies:
+      react: '>=18'
+      react-dom: '>=18'
+
   react-transition-group@4.4.5:
     resolution: {integrity: sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==}
     peerDependencies:
@@ -10020,6 +10029,12 @@ snapshots:
     optionalDependencies:
       '@types/react': 18.3.3
 
+  react-toastify@10.0.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+    dependencies:
+      clsx: 2.1.1
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+
   react-transition-group@4.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
     dependencies:
       '@babel/runtime': 7.25.0
diff --git a/public/images/user.png b/public/images/user.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f728aaa5878673c6b37f5a5e6068a35ea1247e4
GIT binary patch
literal 3393
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
Xgc;LGH7IN;00000NkvXXu0mjfrYB?x

literal 0
HcmV?d00001

diff --git a/src/app/dashboard/(user-dashboard)/products/_components/new-product-modal.tsx b/src/app/dashboard/(user-dashboard)/products/_components/new-product-modal.tsx
index f12531b9f..982d7adc3 100644
--- a/src/app/dashboard/(user-dashboard)/products/_components/new-product-modal.tsx
+++ b/src/app/dashboard/(user-dashboard)/products/_components/new-product-modal.tsx
@@ -1,15 +1,6 @@
 // components/admin/NewProductModal.tsx
-import { zodResolver } from "@hookform/resolvers/zod";
-import { AnimatePresence, motion } from "framer-motion";
-import { Loader, X } from "lucide-react";
-import Image from "next/image";
-import { useState, useTransition } from "react";
-import { useForm } from "react-hook-form";
-import { z } from "zod";
 
-import { createProduct } from "~/actions/product";
-import WordCounter from "~/components/miscellaneous/WordCounter";
-import { Button } from "~/components/ui/button";
+import { AnimatePresence, motion } from "framer-motion";
 import {
   Form,
   FormControl,
@@ -18,8 +9,7 @@ import {
   FormLabel,
   FormMessage,
 } from "~/components/ui/form";
-import { Input } from "~/components/ui/input";
-import { Label } from "~/components/ui/label";
+import { Loader, X } from "lucide-react";
 import {
   Select,
   SelectContent,
@@ -29,15 +19,26 @@ import {
   SelectTrigger,
   SelectValue,
 } from "~/components/ui/select";
+import { useState, useTransition } from "react";
+
+import { Button } from "~/components/ui/button";
+import { CATEGORIES } from "../data/categories.mock";
+import { CloudinaryAsset } from "~/types";
+import Image from "next/image";
+import { Input } from "~/components/ui/input";
+import { Label } from "~/components/ui/label";
+import { MAX_CHAR } from "./schema/schema";
 import { Textarea } from "~/components/ui/textarea";
-import { useToast } from "~/components/ui/use-toast";
-import { useOrgContext } from "~/contexts/orgContext";
-import { useLocalStorage } from "~/hooks/use-local-storage";
+import WordCounter from "~/components/miscellaneous/WordCounter";
 import { cn } from "~/lib/utils";
+import { createProduct } from "~/actions/product";
 import { productSchema } from "~/schemas";
-import { CloudinaryAsset } from "~/types";
-import { CATEGORIES } from "../data/categories.mock";
-import { MAX_CHAR } from "./schema/schema";
+import { useForm } from "react-hook-form";
+import { useLocalStorage } from "~/hooks/use-local-storage";
+import { useOrgContext } from "~/contexts/orgContext";
+import { useToast } from "~/components/ui/use-toast";
+import { z } from "zod";
+import { zodResolver } from "@hookform/resolvers/zod";
 
 const NewProductModal = () => {
   const { setIsNewModal, isNewModal } = useOrgContext();
diff --git a/src/app/dashboard/(user-dashboard)/products/_components/product-detail-modal.tsx b/src/app/dashboard/(user-dashboard)/products/_components/product-detail-modal.tsx
index 0a6edfceb..20b1f69e3 100644
--- a/src/app/dashboard/(user-dashboard)/products/_components/product-detail-modal.tsx
+++ b/src/app/dashboard/(user-dashboard)/products/_components/product-detail-modal.tsx
@@ -1,17 +1,17 @@
+"use client";
+
 import { AnimatePresence, motion } from "framer-motion";
 import { Loader2, X } from "lucide-react";
-import { useRouter } from "next-nprogress-bar";
+import { cn, formatPrice } from "~/lib/utils";
+import { deleteProduct, getProductDetails } from "~/actions/product";
 import { startTransition, useEffect, useState, useTransition } from "react";
 
-import { deleteProduct, getProductDetails } from "~/actions/product";
 import BlurImage from "~/components/miscellaneous/blur-image";
 import { Button } from "~/components/ui/button";
-import { toast } from "~/components/ui/use-toast";
-import { useOrgContext } from "~/contexts/orgContext";
-import { useLocalStorage } from "~/hooks/use-local-storage";
-import useWindowWidth from "~/hooks/use-window-width";
-import { cn, formatPrice } from "~/lib/utils";
 import { Product } from "~/types";
+import { useLocalStorage } from "~/hooks/use-local-storage";
+import { useOrgContext } from "~/contexts/orgContext";
+import { useRouter } from "next-nprogress-bar";
 
 const variantProperties = {
   left: "50%",
diff --git a/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx b/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
new file mode 100644
index 000000000..df820d141
--- /dev/null
+++ b/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
@@ -0,0 +1,367 @@
+"use client";
+
+import { ChangeEvent, FormEvent, useState } from "react";
+
+import Image from "next/image";
+import Link from "next/Link";
+import user from "../../../../../../public/images/user.png";
+
+const ProductDetail = () => {
+  const [textValue, setTextValue] = useState<string>("Product 2");
+  const [messageValue, setmessageValue] = useState<string>(
+    "A fusion of ripe bananas, pure honey, and succulent raspberries with our bread. Crafted to perfection.",
+  );
+  const [image, setImage] = useState<string | undefined>();
+  const [smallQuantity, setSmallQuantity] = useState<number>(0);
+  const [standardQuantity, setStandardQuantity] = useState<number>(24);
+  const [largeQuantity, setLargeQuantity] = useState<number>(0);
+  const [smallPrice, setSmallPrice] = useState<number | string>("$12.00");
+  const [standardPrice, setStandardPrice] = useState<number | string>("$29.00");
+  const [largePrice, setLargePrice] = useState<number | string>("$32.00");
+
+  const handleSubmit = (event: FormEvent<HTMLFormElement>) => {
+    event.preventDefault();
+
+    if (!textValue.trim() || !messageValue.trim() || !smallQuantity || !standardQuantity || !largeQuantity || !smallPrice || !standardPrice || !largePrice || !largePrice || !image) {
+      alert("Please fill in all the necessary fields including your image before submitting.");
+      return;
+    }
+    alert("Details updated");
+    };
+
+    const Discard = ()=> {
+        alert("Changes discard")
+    }
+
+  const handleSmallQty = (event: ChangeEvent<HTMLInputElement>) => {
+    setSmallQuantity(Number(event.target.value));
+  };
+
+  const handleStandardQty = (event: ChangeEvent<HTMLInputElement>) => {
+    setStandardQuantity(Number(event.target.value));
+  };
+
+  const handleLargeQty = (event: ChangeEvent<HTMLInputElement>) => {
+    setLargeQuantity(Number(event.target.value));
+  };
+
+  //upload media section
+  const handleImageChange = (event: ChangeEvent<HTMLInputElement>) => {
+    const file = event.target.files?.[0];
+    if (file) {
+      const reader = new FileReader();
+      reader.onloadend = () => {
+        setImage(reader.result as string);
+      };
+      reader.readAsDataURL(file);
+    }
+  };
+
+    //comment section
+  const [comments, setComments] = useState([
+    {
+      name: "Adetunji Oluwatobi",
+      date: "02 Jan, 2020",
+      time: "Wed 02:30pm",
+      comment: "Living a balanced lifestyle is essential...",
+    },
+    {
+      name: "Afolabi Oyewole",
+      date: "02 Jan, 2020",
+      time: "Wed 02:30pm",
+      comment: "Living a balanced lifestyle is essential...",
+    },
+  ]);
+  const [newComment, setNewComment] = useState("");
+
+  const handleCommentChange = (
+    event: React.ChangeEvent<HTMLTextAreaElement>,
+  ) => {
+    setNewComment(event.target.value);
+  };
+
+  const handleCommentSubmit = () => {
+    if (newComment.trim()) {
+      const currentDate = new Date();
+      const formattedDate = `${currentDate.getDate()} ${currentDate.toLocaleString("default", { month: "short" })}, ${currentDate.getFullYear()}`;
+      const formattedTime = `${currentDate.toLocaleString("default", { weekday: "short" })} ${currentDate.getHours()}:${currentDate.getMinutes() < 10 ? "0" : ""}${currentDate.getMinutes()}pm`;
+
+      const commentToAdd = {
+        name: "New User",
+        date: formattedDate,
+        time: formattedTime,
+        comment: newComment,
+      };
+
+      setComments([...comments, commentToAdd]);
+      setNewComment("");
+    }
+  };
+
+  return (
+    <div className="p-6 pt-16">
+      <form onSubmit={handleSubmit}>
+        <div className="mb-6 w-[240px] rounded-md bg-gray-100 p-2">
+          <div className="list-reset flex text-gray-600">
+            <Link
+              href="/dashboard/products"
+              className="font-semibold text-black"
+            >
+              Products
+            </Link>
+
+            <span className="mx-2">{">"}</span>
+
+            <Link href="" className="text-gray-500">
+              Product Details
+            </Link>
+          </div>
+        </div>
+        <div className="mb-6 flex flex-col items-start justify-between sm:flex-row sm:items-center">
+          <div className="flex items-center">
+            <button className="mr-2 rounded-md border-[1px] px-1 font-[700] text-black">
+              ←
+            </button>
+            <h1 className="mr-2 text-[16px] font-semibold">Product 2</h1>
+            <span className="mr-2 text-green-500">● In stock</span>
+          </div>
+          <div className="mt-5 flex items-center sm:mt-0">
+            <div onClick={Discard} className="mr-2 rounded-md border-[1px] p-2 text-gray-500 disabled">
+              Discard
+            </div>
+            <button
+              type="submit"
+              className="rounded bg-orange-500 px-4 py-2 text-white"
+            >
+              Save changes
+            </button>
+          </div>
+        </div>
+
+        <div className="mb-4 flex flex-col justify-between md:flex-row">
+          <div className="flex flex-col md:basis-[63%]">
+            <div className="mb-6 rounded-md bg-white p-4 shadow-md">
+              <h2 className="text-lg font-semibold">Product Details</h2>
+              <p className="mb-2 text-sm text-gray-500">
+                Make quick changes to your product.
+              </p>
+              <hr className="mb-6" />
+
+              <div className="mb-4">
+                <label className="mb-1 block text-sm font-medium">
+                  Title<small className="text-red-600">*</small>{" "}
+                </label>
+                <input
+                  type="text"
+                  value={textValue}
+                  onChange={(event) => setTextValue(event.target.value)}
+                  placeholder="Product title"
+                  className="w-full rounded-md border border-gray-300 p-2 focus:outline-none"
+                />
+              </div>
+              <div className="">
+                <label className="mb-1 block text-sm font-medium">
+                  Description:
+                </label>
+                <textarea
+                  value={messageValue}
+                  onChange={(event) => setmessageValue(event.target.value)}
+                  className="w-full rounded-md border border-gray-300 p-2 focus:outline-none"
+                  rows={4}
+                  maxLength={170}
+                  placeholder="Product description."
+                ></textarea>
+              </div>
+            </div>
+
+            <div className="mt-4 rounded-lg bg-white p-4 shadow-md">
+              <h2 className="text-lg font-bold">Stock</h2>
+              <p className="leading-2 text-gray-500">Add and remove products</p>
+              <hr className="mb-6" />
+              <table className="w-full rounded-lg border-[1px] text-left">
+                <thead className="bg-[#F1F5F9] p-2">
+                  <tr>
+                    <th className="border-b px-2 py-4">Size</th>
+                    <th className="border-b px-2 py-4">Stock</th>
+                    <th className="border-b px-2 py-4">Price</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  <tr className="w-full p-2">
+                    <td className="pb-2 pl-2 pt-2">Small</td>
+                    <td>
+                      <input
+                        type="number"
+                        className="my-2 w-20 rounded-md border border-gray-300 p-1 outline-none sm:w-32"
+                        value={smallQuantity}
+                        onChange={handleSmallQty}
+                      />
+                    </td>
+                    <td>
+                      <input
+                        type="text"
+                        className="my-2 w-20 rounded-md border border-gray-300 p-1 outline-none sm:w-32"
+                        value={smallPrice}
+                        onChange={(event) => setSmallPrice(event.target.value)}
+                      />
+                    </td>
+                  </tr>
+                  <tr>
+                    <td colSpan={3}>
+                      <div className="w-full border-b"></div>
+                    </td>
+                  </tr>
+                  <tr className="w-full p-2">
+                    <td className="my-2 pb-2 pl-2 pt-2">Standard</td>
+                    <td>
+                      <input
+                        type="number"
+                        className="w-20 rounded-md border border-gray-300 p-1 outline-none sm:w-32"
+                        value={standardQuantity}
+                        onChange={handleStandardQty}
+                      />
+                    </td>
+                    <td>
+                      <input
+                        type="text"
+                        className="my-2 w-20 rounded-md border border-gray-300 p-1 outline-none sm:w-32"
+                        value={standardPrice}
+                        onChange={(event) =>
+                          setStandardPrice(event.target.value)
+                        }
+                      />
+                    </td>
+                  </tr>
+                  <tr>
+                    <td colSpan={3}>
+                      <div className="w-full border-b"></div>
+                    </td>
+                  </tr>
+                  <tr className="w-full p-8">
+                    <td className="my-2 pb-2 pl-2 pt-2">Large</td>
+                    <td>
+                      <input
+                        type="number"
+                        className="my-2 w-20 rounded-md border border-gray-300 p-1 outline-none sm:w-32"
+                        value={largeQuantity}
+                        onChange={handleLargeQty}
+                      />
+                    </td>
+                    <td>
+                      <input
+                        type="text"
+                        className="my-2 w-20 rounded-md border border-gray-300 p-1 outline-none sm:w-32"
+                        value={largePrice}
+                        onChange={(event) => setLargePrice(event.target.value)}
+                      />
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+
+              <div className="w-[140px] cursor-pointer my-2 mt-4 rounded-md border-[1px] bg-white px-4 py-2">
+                Add a Variant
+              </div>
+            </div>
+          </div>
+
+          <div className="mt-6 flex flex-col md:mt-0 md:basis-[33%]">
+            <div className="mb-6 h-[390px] rounded-md bg-white p-4 shadow-md">
+              <h2 className="text-lg font-semibold">Media</h2>
+              <hr className="mb-6" />
+              <p className="mb-2 text-sm text-gray-500">
+                Upload media for your product.
+              </p>
+              <div className="flex justify-between">
+                <div className="flex h-[200px] basis-[80%] items-center justify-center rounded-b-md bg-[#FAFAFA] p-6 text-center outline-none">
+                  {image ? (
+                    <Image
+                      src={image}
+                      alt="Uploaded"
+                      width={100}
+                      height={100}
+                      className="h-full w-full rounded-md object-cover"
+                    />
+                  ) : (
+                    <p className="text-gray-400">Image here</p>
+                  )}
+                </div>
+                <label className="flex h-[200px] basis-[10%] cursor-pointer items-center justify-center rounded-md border-[1px] bg-white px-4 py-2">
+                  <input
+                    type="file"
+                    accept="image/*"
+                                      onChange={handleImageChange}
+
+                    className="hidden"
+                  />
+                  +
+                </label>
+              </div>
+            </div>
+
+            <div className="">
+              <div className="mb-6 rounded-md bg-white p-4 shadow-md">
+                <h2 className="text-lg font-semibold">Status</h2>
+                <p className="mb-2 text-sm text-gray-500">Availability</p>
+                <hr className="my-4" />
+                <select className="mb-4 w-full rounded-md border border-gray-300 p-2 outline-none">
+                  <option>In Stock</option>
+                  <option>Out of Stock</option>
+                  <option>Low in Stock</option>
+                </select>
+              </div>
+              <div className="rounded-md bg-white p-4 shadow-md">
+                <h2 className="mt-2 text-lg font-semibold">Archive</h2>
+                <p className="mb-2 text-sm text-gray-500">Archive a product.</p>
+                <hr className="my-3" />
+                <button className="mb-4 w-full rounded-md bg-gray-200 px-4 py-2">
+                  Archive Product 2
+                </button>
+              </div>
+            </div>
+          </div>
+        </div>
+      </form>
+
+      <div className="mt-8 rounded-md bg-white p-4 shadow-md">
+        <h2 className="mb-4 text-lg font-semibold">Comments</h2>
+        {comments.map((comment, index) => (
+          <div key={index} className="mb-4">
+            <div className="mb-2 flex items-center">
+              <Image
+                src={user}
+                alt="User Avatar"
+                width={40}
+                height={40}
+                className="rounded-full"
+              />
+              <div className="ml-4">
+                <p className="font-semibold">{comment.name}</p>
+                <p className="text-sm text-gray-500">{`${comment.date} ${comment.time}`}</p>
+              </div>
+            </div>
+            <p className="text-sm text-gray-700">{comment.comment}</p>
+          </div>
+        ))}
+        <textarea
+                  className="bg-[#FAFAFA] border-[1px] w-full rounded-md border-orange-500 p-2 focus:outline-none"
+          rows={4}
+          placeholder="Add a comment..."
+          value={newComment}
+          onChange={handleCommentChange}
+        ></textarea>
+        <div className="flex justify-end">
+                  <button
+                      onClick={handleCommentSubmit}
+            type="submit"
+            className="mt-2 rounded-md bg-orange-500 px-4 py-2 text-white"
+          >
+            Reply
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default ProductDetail;
diff --git a/src/components/ui/input.tsx b/src/components/ui/input.tsx
index ed5aa8a33..324697dbb 100644
--- a/src/components/ui/input.tsx
+++ b/src/components/ui/input.tsx
@@ -6,7 +6,7 @@ export interface InputProperties
   extends React.InputHTMLAttributes<HTMLInputElement> {}
 
 const Input = React.forwardRef<HTMLInputElement, InputProperties>(
-  ({ className, type, ...properties }, reference) => {
+  ({ className, type, value, ...properties }, reference) => {
     return (
       <input
         type={type}
@@ -14,6 +14,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProperties>(
           "flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary focus-visible:ring-offset-1 disabled:cursor-not-allowed disabled:opacity-50",
           className,
         )}
+        value={value}
         ref={reference}
         {...properties}
       />

From 1b8118537ef0d5e05a64c6a720058e5e5ed6f296 Mon Sep 17 00:00:00 2001
From: "Emma F. Mkpurunchi" <mkpurunchiemma@gmail.com>
Date: Sat, 24 Aug 2024 13:50:19 +0100
Subject: [PATCH 18/58] feature: implemeted text area description

---
 .../products/_components/product-detail-modal.tsx               | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/app/dashboard/(user-dashboard)/products/_components/product-detail-modal.tsx b/src/app/dashboard/(user-dashboard)/products/_components/product-detail-modal.tsx
index 20b1f69e3..e376eda90 100644
--- a/src/app/dashboard/(user-dashboard)/products/_components/product-detail-modal.tsx
+++ b/src/app/dashboard/(user-dashboard)/products/_components/product-detail-modal.tsx
@@ -9,9 +9,11 @@ import { startTransition, useEffect, useState, useTransition } from "react";
 import BlurImage from "~/components/miscellaneous/blur-image";
 import { Button } from "~/components/ui/button";
 import { Product } from "~/types";
+import { toast } from "~/components/ui/use-toast";
 import { useLocalStorage } from "~/hooks/use-local-storage";
 import { useOrgContext } from "~/contexts/orgContext";
 import { useRouter } from "next-nprogress-bar";
+import useWindowWidth from "~/hooks/use-window-width";
 
 const variantProperties = {
   left: "50%",

From 2fcd1283cd50414babe4ccb9e8f67450f7fa74e2 Mon Sep 17 00:00:00 2001
From: "Emma F. Mkpurunchi" <mkpurunchiemma@gmail.com>
Date: Sat, 24 Aug 2024 14:01:13 +0100
Subject: [PATCH 19/58] feature:implemented product description text area

---
 .../_components/new-product-modal.tsx         | 36 +++++++-------
 .../_components/product-detail-modal.tsx      | 10 ++--
 .../products/mainproductdetailpage/page.tsx   | 49 ++++++++++++-------
 3 files changed, 55 insertions(+), 40 deletions(-)

diff --git a/src/app/dashboard/(user-dashboard)/products/_components/new-product-modal.tsx b/src/app/dashboard/(user-dashboard)/products/_components/new-product-modal.tsx
index 982d7adc3..179d0c0f1 100644
--- a/src/app/dashboard/(user-dashboard)/products/_components/new-product-modal.tsx
+++ b/src/app/dashboard/(user-dashboard)/products/_components/new-product-modal.tsx
@@ -1,6 +1,16 @@
 // components/admin/NewProductModal.tsx
 
+import { zodResolver } from "@hookform/resolvers/zod";
 import { AnimatePresence, motion } from "framer-motion";
+import { Loader, X } from "lucide-react";
+import Image from "next/image";
+import { useState, useTransition } from "react";
+import { useForm } from "react-hook-form";
+import { z } from "zod";
+
+import { createProduct } from "~/actions/product";
+import WordCounter from "~/components/miscellaneous/WordCounter";
+import { Button } from "~/components/ui/button";
 import {
   Form,
   FormControl,
@@ -9,7 +19,8 @@ import {
   FormLabel,
   FormMessage,
 } from "~/components/ui/form";
-import { Loader, X } from "lucide-react";
+import { Input } from "~/components/ui/input";
+import { Label } from "~/components/ui/label";
 import {
   Select,
   SelectContent,
@@ -19,26 +30,15 @@ import {
   SelectTrigger,
   SelectValue,
 } from "~/components/ui/select";
-import { useState, useTransition } from "react";
-
-import { Button } from "~/components/ui/button";
-import { CATEGORIES } from "../data/categories.mock";
-import { CloudinaryAsset } from "~/types";
-import Image from "next/image";
-import { Input } from "~/components/ui/input";
-import { Label } from "~/components/ui/label";
-import { MAX_CHAR } from "./schema/schema";
 import { Textarea } from "~/components/ui/textarea";
-import WordCounter from "~/components/miscellaneous/WordCounter";
+import { useToast } from "~/components/ui/use-toast";
+import { useOrgContext } from "~/contexts/orgContext";
+import { useLocalStorage } from "~/hooks/use-local-storage";
 import { cn } from "~/lib/utils";
-import { createProduct } from "~/actions/product";
 import { productSchema } from "~/schemas";
-import { useForm } from "react-hook-form";
-import { useLocalStorage } from "~/hooks/use-local-storage";
-import { useOrgContext } from "~/contexts/orgContext";
-import { useToast } from "~/components/ui/use-toast";
-import { z } from "zod";
-import { zodResolver } from "@hookform/resolvers/zod";
+import { CloudinaryAsset } from "~/types";
+import { CATEGORIES } from "../data/categories.mock";
+import { MAX_CHAR } from "./schema/schema";
 
 const NewProductModal = () => {
   const { setIsNewModal, isNewModal } = useOrgContext();
diff --git a/src/app/dashboard/(user-dashboard)/products/_components/product-detail-modal.tsx b/src/app/dashboard/(user-dashboard)/products/_components/product-detail-modal.tsx
index e376eda90..36f3da06d 100644
--- a/src/app/dashboard/(user-dashboard)/products/_components/product-detail-modal.tsx
+++ b/src/app/dashboard/(user-dashboard)/products/_components/product-detail-modal.tsx
@@ -2,18 +2,18 @@
 
 import { AnimatePresence, motion } from "framer-motion";
 import { Loader2, X } from "lucide-react";
-import { cn, formatPrice } from "~/lib/utils";
-import { deleteProduct, getProductDetails } from "~/actions/product";
+import { useRouter } from "next-nprogress-bar";
 import { startTransition, useEffect, useState, useTransition } from "react";
 
+import { deleteProduct, getProductDetails } from "~/actions/product";
 import BlurImage from "~/components/miscellaneous/blur-image";
 import { Button } from "~/components/ui/button";
-import { Product } from "~/types";
 import { toast } from "~/components/ui/use-toast";
-import { useLocalStorage } from "~/hooks/use-local-storage";
 import { useOrgContext } from "~/contexts/orgContext";
-import { useRouter } from "next-nprogress-bar";
+import { useLocalStorage } from "~/hooks/use-local-storage";
 import useWindowWidth from "~/hooks/use-window-width";
+import { cn, formatPrice } from "~/lib/utils";
+import { Product } from "~/types";
 
 const variantProperties = {
   left: "50%",
diff --git a/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx b/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
index df820d141..9a81b7b82 100644
--- a/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
+++ b/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
@@ -1,11 +1,15 @@
 "use client";
 
-import { ChangeEvent, FormEvent, useState } from "react";
-
 import Image from "next/image";
 import Link from "next/Link";
+import { ChangeEvent, FormEvent, useState } from "react";
+
 import user from "../../../../../../public/images/user.png";
 
+const Discard = () => {
+  alert("Changes discard");
+};
+
 const ProductDetail = () => {
   const [textValue, setTextValue] = useState<string>("Product 2");
   const [messageValue, setmessageValue] = useState<string>(
@@ -22,16 +26,25 @@ const ProductDetail = () => {
   const handleSubmit = (event: FormEvent<HTMLFormElement>) => {
     event.preventDefault();
 
-    if (!textValue.trim() || !messageValue.trim() || !smallQuantity || !standardQuantity || !largeQuantity || !smallPrice || !standardPrice || !largePrice || !largePrice || !image) {
-      alert("Please fill in all the necessary fields including your image before submitting.");
+    if (
+      !textValue.trim() ||
+      !messageValue.trim() ||
+      !smallQuantity ||
+      !standardQuantity ||
+      !largeQuantity ||
+      !smallPrice ||
+      !standardPrice ||
+      !largePrice ||
+      !largePrice ||
+      !image
+    ) {
+      alert(
+        "Please fill in all the necessary fields including your image before submitting.",
+      );
       return;
     }
     alert("Details updated");
-    };
-
-    const Discard = ()=> {
-        alert("Changes discard")
-    }
+  };
 
   const handleSmallQty = (event: ChangeEvent<HTMLInputElement>) => {
     setSmallQuantity(Number(event.target.value));
@@ -57,7 +70,7 @@ const ProductDetail = () => {
     }
   };
 
-    //comment section
+  //comment section
   const [comments, setComments] = useState([
     {
       name: "Adetunji Oluwatobi",
@@ -126,7 +139,10 @@ const ProductDetail = () => {
             <span className="mr-2 text-green-500">● In stock</span>
           </div>
           <div className="mt-5 flex items-center sm:mt-0">
-            <div onClick={Discard} className="mr-2 rounded-md border-[1px] p-2 text-gray-500 disabled">
+            <div
+              onClick={Discard}
+              className="disabled mr-2 rounded-md border-[1px] p-2 text-gray-500"
+            >
               Discard
             </div>
             <button
@@ -259,7 +275,7 @@ const ProductDetail = () => {
                 </tbody>
               </table>
 
-              <div className="w-[140px] cursor-pointer my-2 mt-4 rounded-md border-[1px] bg-white px-4 py-2">
+              <div className="my-2 mt-4 w-[140px] cursor-pointer rounded-md border-[1px] bg-white px-4 py-2">
                 Add a Variant
               </div>
             </div>
@@ -290,8 +306,7 @@ const ProductDetail = () => {
                   <input
                     type="file"
                     accept="image/*"
-                                      onChange={handleImageChange}
-
+                    onChange={handleImageChange}
                     className="hidden"
                   />
                   +
@@ -344,15 +359,15 @@ const ProductDetail = () => {
           </div>
         ))}
         <textarea
-                  className="bg-[#FAFAFA] border-[1px] w-full rounded-md border-orange-500 p-2 focus:outline-none"
+          className="w-full rounded-md border-[1px] border-orange-500 bg-[#FAFAFA] p-2 focus:outline-none"
           rows={4}
           placeholder="Add a comment..."
           value={newComment}
           onChange={handleCommentChange}
         ></textarea>
         <div className="flex justify-end">
-                  <button
-                      onClick={handleCommentSubmit}
+          <button
+            onClick={handleCommentSubmit}
             type="submit"
             className="mt-2 rounded-md bg-orange-500 px-4 py-2 text-white"
           >

From 82933fdebd2d0cb548268e972b0c60dd25aaa578 Mon Sep 17 00:00:00 2001
From: "Emma F. Mkpurunchi" <mkpurunchiemma@gmail.com>
Date: Sat, 24 Aug 2024 14:08:54 +0100
Subject: [PATCH 20/58] feature:implemented product description text area

---
 .../(user-dashboard)/products/mainproductdetailpage/page.tsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx b/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
index 9a81b7b82..bc73d4130 100644
--- a/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
+++ b/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import Image from "next/image";
-import Link from "next/Link";
+import Link from "next/link";
 import { ChangeEvent, FormEvent, useState } from "react";
 
 import user from "../../../../../../public/images/user.png";

From 39aaeb6f171227148dda88af0dca2ade99500e2c Mon Sep 17 00:00:00 2001
From: "Emma F. Mkpurunchi" <mkpurunchiemma@gmail.com>
Date: Sat, 24 Aug 2024 14:56:01 +0100
Subject: [PATCH 21/58] feature: Implement Stock Management Table

---
 .../(user-dashboard)/products/mainproductdetailpage/page.tsx  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx b/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
index bc73d4130..a0f7d2e30 100644
--- a/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
+++ b/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
@@ -1,9 +1,9 @@
 "use client";
 
-import Image from "next/image";
-import Link from "next/link";
 import { ChangeEvent, FormEvent, useState } from "react";
 
+import Image from "next/image";
+import Link from "next/link";
 import user from "../../../../../../public/images/user.png";
 
 const Discard = () => {

From 1c2a39d5568ee3894f7e3a26b9c74164f90b8408 Mon Sep 17 00:00:00 2001
From: "Emma F. Mkpurunchi" <mkpurunchiemma@gmail.com>
Date: Sat, 24 Aug 2024 15:11:20 +0100
Subject: [PATCH 22/58] feature: Implement Stock Management Table

---
 .../products/mainproductdetailpage/page.tsx     | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx b/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
index a0f7d2e30..7548507ba 100644
--- a/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
+++ b/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
@@ -275,9 +275,7 @@ const ProductDetail = () => {
                 </tbody>
               </table>
 
-              <div className="my-2 mt-4 w-[140px] cursor-pointer rounded-md border-[1px] bg-white px-4 py-2">
-                Add a Variant
-              </div>
+
             </div>
           </div>
 
@@ -312,19 +310,10 @@ const ProductDetail = () => {
                   +
                 </label>
               </div>
-            </div>
+            </div>{/**variant*/}
 
             <div className="">
-              <div className="mb-6 rounded-md bg-white p-4 shadow-md">
-                <h2 className="text-lg font-semibold">Status</h2>
-                <p className="mb-2 text-sm text-gray-500">Availability</p>
-                <hr className="my-4" />
-                <select className="mb-4 w-full rounded-md border border-gray-300 p-2 outline-none">
-                  <option>In Stock</option>
-                  <option>Out of Stock</option>
-                  <option>Low in Stock</option>
-                </select>
-              </div>
+              {/*available*/}
               <div className="rounded-md bg-white p-4 shadow-md">
                 <h2 className="mt-2 text-lg font-semibold">Archive</h2>
                 <p className="mb-2 text-sm text-gray-500">Archive a product.</p>

From c6d8448ec19ddb9489ec08bec9f3d02d400d6b3f Mon Sep 17 00:00:00 2001
From: "Emma F. Mkpurunchi" <mkpurunchiemma@gmail.com>
Date: Sat, 24 Aug 2024 15:30:36 +0100
Subject: [PATCH 23/58] feature: Implement Stock Management Table

---
 .../products/mainproductdetailpage/page.tsx              | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx b/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
index 7548507ba..d7314ee53 100644
--- a/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
+++ b/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
@@ -1,9 +1,9 @@
 "use client";
 
-import { ChangeEvent, FormEvent, useState } from "react";
-
 import Image from "next/image";
 import Link from "next/link";
+import { ChangeEvent, FormEvent, useState } from "react";
+
 import user from "../../../../../../public/images/user.png";
 
 const Discard = () => {
@@ -274,8 +274,6 @@ const ProductDetail = () => {
                   </tr>
                 </tbody>
               </table>
-
-
             </div>
           </div>
 
@@ -310,7 +308,8 @@ const ProductDetail = () => {
                   +
                 </label>
               </div>
-            </div>{/**variant*/}
+            </div>
+            {/**variant*/}
 
             <div className="">
               {/*available*/}

From 725a7f1c9565830fefde7d4213421669c0a841f5 Mon Sep 17 00:00:00 2001
From: Robinson-Taiwo <omoyenisamuell66@gmail.com>
Date: Sat, 24 Aug 2024 15:49:52 +0100
Subject: [PATCH 24/58] Feat: implement delete members  modal

---
 .../settings/organization/members/page.tsx    | 32 +++++++++-
 .../invite-member/DeleteMembers/index.tsx     | 62 +++++++++++++++++++
 2 files changed, 93 insertions(+), 1 deletion(-)
 create mode 100644 src/components/common/modals/invite-member/DeleteMembers/index.tsx

diff --git a/src/app/dashboard/(admin)/admin/(settings)/settings/organization/members/page.tsx b/src/app/dashboard/(admin)/admin/(settings)/settings/organization/members/page.tsx
index be3a54d02..65c41b98b 100644
--- a/src/app/dashboard/(admin)/admin/(settings)/settings/organization/members/page.tsx
+++ b/src/app/dashboard/(admin)/admin/(settings)/settings/organization/members/page.tsx
@@ -7,7 +7,14 @@ import { useState } from "react";
 import CustomButton from "~/components/common/common-button/common-button";
 import { Input } from "~/components/common/input";
 import InviteMemberModal from "~/components/common/modals/invite-member";
+import DeleteMember from "~/components/common/modals/invite-member/DeleteMembers";
 import LoadingSpinner from "~/components/miscellaneous/loading-spinner";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from "~/components/ui/dropdown-menu";
 import {
   Select,
   SelectContent,
@@ -70,6 +77,8 @@ const activeMembers: number = memberData.length;
 
 const Members = () => {
   const [isModalOpen, setIsModalOpen] = useState(false);
+  const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
+
   const [exporting, setExporting] = useState(false);
   const [text, setText] = useState("Export CSV");
 
@@ -86,10 +95,18 @@ const Members = () => {
     setIsModalOpen(true);
   };
 
+  const handleDeleteOpen = () => {
+    setIsDeleteModalOpen(true);
+  };
+
   const handleModalClose = () => {
     setIsModalOpen(false);
   };
 
+  const handleDeleteClose = () => {
+    setIsDeleteModalOpen(false);
+  };
+
   const exportMembers = async () => {
     setExporting(true);
     setText("Exporting...");
@@ -241,7 +258,19 @@ const Members = () => {
                   </Select>
                 </div>
 
-                <EllipsisIcon onClick={() => {}} className="flex-shrink-0" />
+                <DropdownMenu>
+                  <DropdownMenuTrigger>
+                    <EllipsisIcon
+                      onClick={() => {}}
+                      className="flex-shrink-0"
+                    />
+                  </DropdownMenuTrigger>
+                  <DropdownMenuContent className="w-[7.875rem] text-[0.875rem]">
+                    <DropdownMenuItem onClick={handleDeleteOpen}>
+                      <span>Delete Member</span>
+                    </DropdownMenuItem>
+                  </DropdownMenuContent>
+                </DropdownMenu>
               </li>
             );
           })}
@@ -271,6 +300,7 @@ const Members = () => {
         </div>
       </div>
       <InviteMemberModal show={isModalOpen} onClose={handleModalClose} />
+      <DeleteMember show={isDeleteModalOpen} onClose={handleDeleteClose} />
     </div>
   );
 };
diff --git a/src/components/common/modals/invite-member/DeleteMembers/index.tsx b/src/components/common/modals/invite-member/DeleteMembers/index.tsx
new file mode 100644
index 000000000..2d46dd5b7
--- /dev/null
+++ b/src/components/common/modals/invite-member/DeleteMembers/index.tsx
@@ -0,0 +1,62 @@
+"use client";
+
+import { Button } from "~/components/ui/button";
+// import { Link2Icon } from "lucide-react";
+
+// import CustomButton from "~/components/common/common-button/common-button";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogHeader,
+} from "~/components/ui/dialog";
+
+// import { useToast } from "~/components/ui/use-toast";
+
+interface ModalProperties {
+  show: boolean;
+  onClose: () => void;
+}
+
+const DeleteMember: React.FC<ModalProperties> = ({ show, onClose }) => {
+  return (
+    <Dialog open={show} onOpenChange={onClose}>
+      <DialogContent>
+        <DialogHeader>
+          <DialogDescription className="outline-none">
+            <div className="delete-container">
+              <h1 className="mb-[0.5rem] text-[1.125rem] font-semibold leading-[1.75rem] text-[#0F172A]">
+                Delete Member
+              </h1>
+
+              <p className="text=[#64748B] mb-[1rem] text-[0.875rem]">
+                Are you sure you want to delete Chad Bosewick ? All data will be
+                permanently removed. This action cannot be undone.
+              </p>
+
+              <div className="flex w-[100%] justify-end">
+                <div className="flex flex-row gap-[.5rem]">
+                  <Button
+                    className="text-[#0F172A] outline-none focus:outline-none"
+                    variant="outline"
+                  >
+                    Cancel
+                  </Button>
+
+                  <Button
+                    className="outline-none focus:outline-none"
+                    variant="destructive"
+                  >
+                    Delete
+                  </Button>
+                </div>
+              </div>
+            </div>
+          </DialogDescription>
+        </DialogHeader>
+      </DialogContent>
+    </Dialog>
+  );
+};
+
+export default DeleteMember;

From ab8e1d89b838b44ec682aa04bf42e3087398973a Mon Sep 17 00:00:00 2001
From: "Emma F. Mkpurunchi" <mkpurunchiemma@gmail.com>
Date: Sat, 24 Aug 2024 15:52:32 +0100
Subject: [PATCH 25/58] feature:implemented adding a variant button

---
 .../products/mainproductdetailpage/page.tsx           | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx b/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
index d7314ee53..36452179e 100644
--- a/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
+++ b/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
@@ -1,9 +1,9 @@
 "use client";
 
-import Image from "next/image";
-import Link from "next/link";
 import { ChangeEvent, FormEvent, useState } from "react";
 
+import Image from "next/image";
+import Link from "next/link";
 import user from "../../../../../../public/images/user.png";
 
 const Discard = () => {
@@ -274,6 +274,10 @@ const ProductDetail = () => {
                   </tr>
                 </tbody>
               </table>
+
+              <button className="my-2 mt-4 cursor-pointer rounded-md border-[1px] bg-white px-4 py-2">
+                Add a Variant
+              </button>
             </div>
           </div>
 
@@ -309,10 +313,9 @@ const ProductDetail = () => {
                 </label>
               </div>
             </div>
-            {/**variant*/}
 
             <div className="">
-              {/*available*/}
+              {/*availablelity*/}
               <div className="rounded-md bg-white p-4 shadow-md">
                 <h2 className="mt-2 text-lg font-semibold">Archive</h2>
                 <p className="mb-2 text-sm text-gray-500">Archive a product.</p>

From 8acd95590277b6d01ad5268819c551aa84c81f9e Mon Sep 17 00:00:00 2001
From: "Emma F. Mkpurunchi" <mkpurunchiemma@gmail.com>
Date: Sat, 24 Aug 2024 16:04:32 +0100
Subject: [PATCH 26/58] feature:implemented adding a variant button

---
 .../(user-dashboard)/products/mainproductdetailpage/page.tsx  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx b/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
index 36452179e..98d98aaa9 100644
--- a/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
+++ b/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
@@ -1,9 +1,9 @@
 "use client";
 
-import { ChangeEvent, FormEvent, useState } from "react";
-
 import Image from "next/image";
 import Link from "next/link";
+import { ChangeEvent, FormEvent, useState } from "react";
+
 import user from "../../../../../../public/images/user.png";
 
 const Discard = () => {

From abbb599856d99a50b63c5733cd37caf472952912 Mon Sep 17 00:00:00 2001
From: "Emma F. Mkpurunchi" <mkpurunchiemma@gmail.com>
Date: Sat, 24 Aug 2024 16:15:24 +0100
Subject: [PATCH 27/58] feature:implemented availability dropdown

---
 .../products/mainproductdetailpage/page.tsx   | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx b/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
index 98d98aaa9..c98fe3896 100644
--- a/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
+++ b/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
@@ -1,9 +1,9 @@
 "use client";
 
-import Image from "next/image";
-import Link from "next/link";
 import { ChangeEvent, FormEvent, useState } from "react";
 
+import Image from "next/image";
+import Link from "next/link";
 import user from "../../../../../../public/images/user.png";
 
 const Discard = () => {
@@ -315,15 +315,17 @@ const ProductDetail = () => {
             </div>
 
             <div className="">
-              {/*availablelity*/}
-              <div className="rounded-md bg-white p-4 shadow-md">
-                <h2 className="mt-2 text-lg font-semibold">Archive</h2>
-                <p className="mb-2 text-sm text-gray-500">Archive a product.</p>
-                <hr className="my-3" />
-                <button className="mb-4 w-full rounded-md bg-gray-200 px-4 py-2">
-                  Archive Product 2
-                </button>
+              <div className="mb-6 rounded-md bg-white p-4 shadow-md">
+                <h2 className="text-lg font-semibold">Status</h2>
+                <p className="mb-2 text-sm text-gray-500">Availability</p>
+                <hr className="my-4" />
+                <select className="mb-4 w-full rounded-md border border-gray-300 p-2 outline-none">
+                  <option>In Stock</option>
+                  <option>Out of Stock</option>
+                  <option>Low in Stock</option>
+                </select>
               </div>
+
             </div>
           </div>
         </div>

From 6cefc5bfe2b439a58aa67b33bc41014915a9b7ac Mon Sep 17 00:00:00 2001
From: "Emma F. Mkpurunchi" <mkpurunchiemma@gmail.com>
Date: Sat, 24 Aug 2024 16:31:10 +0100
Subject: [PATCH 28/58] feature:implemented availability dropdown

---
 .../(user-dashboard)/products/mainproductdetailpage/page.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx b/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
index c98fe3896..948083e48 100644
--- a/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
+++ b/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
@@ -1,9 +1,9 @@
 "use client";
 
-import { ChangeEvent, FormEvent, useState } from "react";
-
 import Image from "next/image";
 import Link from "next/link";
+import { ChangeEvent, FormEvent, useState } from "react";
+
 import user from "../../../../../../public/images/user.png";
 
 const Discard = () => {
@@ -325,7 +325,6 @@ const ProductDetail = () => {
                   <option>Low in Stock</option>
                 </select>
               </div>
-
             </div>
           </div>
         </div>

From f746327c02de4ff8bff031436424b9b0a5b6fc6a Mon Sep 17 00:00:00 2001
From: Oluwaseyi Tommy <130176232+seshconcept@users.noreply.github.com>
Date: Sat, 24 Aug 2024 16:33:47 +0100
Subject: [PATCH 29/58] Fix: Fix Notifications list Margins with the submit
 button

---
 .../(admin)/admin/(settings)/settings/notification/page.tsx   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/dashboard/(admin)/admin/(settings)/settings/notification/page.tsx b/src/app/dashboard/(admin)/admin/(settings)/settings/notification/page.tsx
index e1e1d263f..431eb04df 100644
--- a/src/app/dashboard/(admin)/admin/(settings)/settings/notification/page.tsx
+++ b/src/app/dashboard/(admin)/admin/(settings)/settings/notification/page.tsx
@@ -77,7 +77,7 @@ const NotificationPage = () => {
   };
 
   return (
-    <main className="text-neutral-dark-2">
+    <main className="px-4 text-neutral-dark-2">
       <div className="mx-[24px] mb-[30px] flex w-fit items-center gap-1 md:hidden">
         <ChevronLeft size="18" className="text-muted-foreground" />
         <span className="font-[600] text-muted-foreground">Notification</span>
@@ -178,7 +178,7 @@ const NotificationPage = () => {
           />
         </section>
       </section>
-      <section className="text-center md:text-end">
+      <section className="text-end">
         <CustomButton
           variant="primary"
           icon={<Check />}

From 860a996ff2a7566f1f04c7863effa3042834f31a Mon Sep 17 00:00:00 2001
From: "Emma F. Mkpurunchi" <mkpurunchiemma@gmail.com>
Date: Sat, 24 Aug 2024 16:46:50 +0100
Subject: [PATCH 30/58] feature:implmentd product archive button

---
 .../products/mainproductdetailpage/page.tsx   | 31 +++++++------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx b/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
index 948083e48..67d19c4e7 100644
--- a/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
+++ b/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
@@ -1,9 +1,9 @@
 "use client";
 
-import Image from "next/image";
-import Link from "next/link";
 import { ChangeEvent, FormEvent, useState } from "react";
 
+import Image from "next/image";
+import Link from "next/link";
 import user from "../../../../../../public/images/user.png";
 
 const Discard = () => {
@@ -325,6 +325,14 @@ const ProductDetail = () => {
                   <option>Low in Stock</option>
                 </select>
               </div>
+              <div className="rounded-md bg-white p-4 shadow-md">
+                <h2 className="mt-2 text-lg font-semibold">Archive</h2>
+                <p className="mb-2 text-sm text-gray-500">Archive a product.</p>
+                <hr className="my-3" />
+                <button className="mb-4 w-full rounded-md bg-gray-200 px-4 py-2">
+                  Archive Product 2
+                </button>
+              </div>
             </div>
           </div>
         </div>
@@ -332,24 +340,7 @@ const ProductDetail = () => {
 
       <div className="mt-8 rounded-md bg-white p-4 shadow-md">
         <h2 className="mb-4 text-lg font-semibold">Comments</h2>
-        {comments.map((comment, index) => (
-          <div key={index} className="mb-4">
-            <div className="mb-2 flex items-center">
-              <Image
-                src={user}
-                alt="User Avatar"
-                width={40}
-                height={40}
-                className="rounded-full"
-              />
-              <div className="ml-4">
-                <p className="font-semibold">{comment.name}</p>
-                <p className="text-sm text-gray-500">{`${comment.date} ${comment.time}`}</p>
-              </div>
-            </div>
-            <p className="text-sm text-gray-700">{comment.comment}</p>
-          </div>
-        ))}
+        {/*comment and reply*/}
         <textarea
           className="w-full rounded-md border-[1px] border-orange-500 bg-[#FAFAFA] p-2 focus:outline-none"
           rows={4}

From 8772da63b20292c9a92120087a0c847a54d6d40e Mon Sep 17 00:00:00 2001
From: "Emma F. Mkpurunchi" <mkpurunchiemma@gmail.com>
Date: Sat, 24 Aug 2024 16:59:51 +0100
Subject: [PATCH 31/58] feature:implmentd product archive button

---
 .../(user-dashboard)/products/mainproductdetailpage/page.tsx  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx b/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
index 67d19c4e7..b69bcf2f7 100644
--- a/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
+++ b/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
@@ -1,10 +1,8 @@
 "use client";
 
-import { ChangeEvent, FormEvent, useState } from "react";
-
 import Image from "next/image";
 import Link from "next/link";
-import user from "../../../../../../public/images/user.png";
+import { ChangeEvent, FormEvent, useState } from "react";
 
 const Discard = () => {
   alert("Changes discard");

From c64c55365339f8e5f7ca7fdbfbdf6170ac2aca34 Mon Sep 17 00:00:00 2001
From: "Emma F. Mkpurunchi" <mkpurunchiemma@gmail.com>
Date: Sat, 24 Aug 2024 17:10:03 +0100
Subject: [PATCH 32/58] feature:implmentd product archive button

---
 .../products/mainproductdetailpage/page.tsx   | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx b/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
index b69bcf2f7..e91bf290a 100644
--- a/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
+++ b/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
@@ -1,8 +1,10 @@
 "use client";
 
+import { ChangeEvent, FormEvent, useState } from "react";
+
 import Image from "next/image";
 import Link from "next/link";
-import { ChangeEvent, FormEvent, useState } from "react";
+import user from "../../../../../../public/images/user.png";
 
 const Discard = () => {
   alert("Changes discard");
@@ -338,7 +340,24 @@ const ProductDetail = () => {
 
       <div className="mt-8 rounded-md bg-white p-4 shadow-md">
         <h2 className="mb-4 text-lg font-semibold">Comments</h2>
-        {/*comment and reply*/}
+        {comments.map((comment, index) => (
+          <div key={index} className="mb-4">
+            <div className="mb-2 flex items-center">
+              <Image
+                src={user}
+                alt="User Avatar"
+                width={40}
+                height={40}
+                className="rounded-full"
+              />
+              <div className="ml-4">
+                <p className="font-semibold">{comment.name}</p>
+                <p className="text-sm text-gray-500">{`${comment.date} ${comment.time}`}</p>
+              </div>
+            </div>
+            <p className="text-sm text-gray-700">{comment.comment}</p>
+          </div>
+        ))}
         <textarea
           className="w-full rounded-md border-[1px] border-orange-500 bg-[#FAFAFA] p-2 focus:outline-none"
           rows={4}

From e8a0d1504f6600749f0836eb3c5544b4e97d392b Mon Sep 17 00:00:00 2001
From: Oluwaseyi Tommy <130176232+seshconcept@users.noreply.github.com>
Date: Sat, 24 Aug 2024 17:37:09 +0100
Subject: [PATCH 33/58] Fix: Remove Extra Login Text in Sign Up Page

---
 public/messages/en.json | 376 ++++++++++++++++++++--------------------
 1 file changed, 188 insertions(+), 188 deletions(-)

diff --git a/public/messages/en.json b/public/messages/en.json
index 9b172d400..45a83875f 100644
--- a/public/messages/en.json
+++ b/public/messages/en.json
@@ -1,190 +1,190 @@
 {
-    "navbar": {
-        "login": "Log in",
-        "register": "Get Started"
-    },
-    "navLinks": {
-        "home": "Home",
-        "pricing": "Pricing",
-        "careers": "Careers"
-    },
-    "login": {
-        "title": "Login",
-        "welcomeBack": "Welcome back, you've been missed!",
-        "continueWithGoogle": "Continue with Google",
-        "emailPlaceholder": "Enter Email Address",
-        "passwordPlaceholder": "Enter Password",
-        "rememberMe": "Remember me",
-        "forgotPassword": "Forgot Password?",
-        "loginButton": "Login",
-        "signInWithMagicLink": "Sign in with magic link",
-        "noAccount": "Don't Have An Account?",
-        "agree": "By logging in, you agree to the",
-        "and": "and",
-        "signUp": "Sign Up",
-        "termsOfService": "Terms of Service",
-        "privacyPolicy": "Privacy Policy",
-        "loggingIn": "Logging in..."
-    },
-    "register": {
-        "signUp": "Sign Up",
-        "createAccountDesc": "Create an account to get started with us.",
-        "continueWithGoogle": "Continue with Google",
-        "firstName": "First Name",
-        "firstNamePlaceholder": "Enter your first name",
-        "lastName": "Last Name",
-        "lastNamePlaceholder": "Enter your last name",
-        "email": "Email",
-        "emailPlaceholder": "Enter Email Address",
-        "password": "Password",
-        "passwordPlaceholder": "Enter Password",
-        "createAccount": "Create Account",
-        "loggingIn": "Logging in...",
-        "emailVerification": "Email Verification",
-        "emailVerificationDesc": "We have sent a code to your email {email}",
-        "checkSpam": "check your spam if you do not receive the email",
-        "otpExpiresIn": "OTP expires in: {timeLeft}",
-        "resendCode": "Didn't receive the code? resend",
-        "dataProcessing": "We would process your data as set forth in our Terms of Use, Privacy Policy and Data Processing Agreement",
-        "alreadyHaveAccount": "Already Have An Account? Login"
-    },
-    "HomePage": {
-        "title": "Hello world!"
-    },
-    "hero": {
-        "headline": "Focus on What Matters. We've Got the Foundation Covered.",
-        "description": "Streamline your processes with a boilerplate built for efficiency and optimal productivity.",
-        "cta": "Get Started"
-    },
-    "userSection": {
-        "userSectionMoreThan": "More than 200",
-        "userSectionUsers": "Users",
-        "userSectionUsage": "make use of our Boilerplate"
-    },
-    "howItWorks": {
-        "howItWorksTitlePrefix": "How It Works:",
-        "howItWorksTitleHighlight": "Experience the benefits of using our product with every step.",
-        "howItWorksDescription": "We designed our product to simplify your life. It offers a comprehensive solution. Here's how it works and how it benefits you at each stage.",
-        "prebuiltTitle": "Pre-Built Sections",
-        "prebuiltDescription": "Leverage pre-built sections like \"Features,\" \"Benefits,\" \"Pricing,\" and \"Testimonials\" to showcase your product effectively.",
-        "scalableTitle": "Scalable Foundation",
-        "scalableDescription": "Our boilerplate is designed to grow with your product. Easily add new features and functionalities as needed.",
-        "easyTitle": "Easy Customization",
-        "easyDescription": "Tailor the experience to your specific needs and preferences for maximum results."
-    },
-    "testimonials": {
-        "title": "Client Testimonials",
-        "description": "Don't just take our word for it - see what actual users of our product have to say about their experience.",
-        "content": "I've been using this web hosting service for over a year and I'm really impressed with the uptime and support. The website has never gone down and the customer service is always quick to help with any issues I have. Highly recommend!"
-    },
-    "perfectFit": {
-        "title": "Find The Perfect Fit",
-        "description": "Choose the boilerplate plan that best suits your project needs and budget. All plans include access to our comprehensive library of pre-built sections, drag-and-drop customization.",
-        "cta": "See Our Pricing Plan"
-    },
-    "footer": {
-        "newsletterSignUp": "Sign Up For Newsletters",
-        "subscribe": "Subscribe",
-        "navigation": "Navigation",
-        "support": "Support",
-        "legal": "Legal",
-        "followUs": "Follow Us",
-        "privacyPolicy": "Privacy Policy",
-        "termsOfUse": "Terms of Use",
-        "enterYourEmail": "Enter your email",
-        "links": {
-            "navigation": "Navigation",
-            "home": "Home",
-            "aboutUs": "About Us",
-            "career": "Career",
-            "features": "Features",
-            "blog": "Blog",
-            "status": "Status",
-            "support": "Support",
-            "helpCenter": "Help Center",
-            "faq": "FAQ",
-            "waitingList": "Waiting List",
-            "pricingExperience": "Pricing Experience",
-            "contactUs": "Contact Us",
-            "legal": "Legal",
-            "privacyPolicy": "Privacy Policy",
-            "termsAndConditions": "Terms and Conditions"
-        },
-        "social": {
-            "facebook": "Facebook",
-            "instagram": "Instagram",
-            "linkedin": "LinkedIn",
-            "youtube": "YouTube"
-        },
-        "footerBottom": {
-            "privacyPolicy": "Privacy Policy",
-            "termsOfUse": "Terms of Use",
-            "copyright": "2024 All Rights Reserved"
-        }
-    },
-    "pricing": {
-        "pricingTitle": "Simple and {{Affordable}} Pricing Plan",
-        "pricingContent": "Our flexible plans are designed to scale with your business. We have a plan for you.",
-        "monthly": "Monthly",
-        "annual": "Annual (save 20%)",
-        "billingPlansNotAvailable": "Billing plans not available",
-        "features": {
-            "feature1": "2 Projects",
-            "feature2": "Up to 100 subscribers",
-            "feature3": "Basic analytics",
-            "feature4": "24-hour support response time",
-            "feature5": "Marketing advisor",
-            "feature6": "Custom integration",
-            "continue": "Continue"
-        },
-        "essentials": "The essentials to provide your best work for clients.",
-        "faqHeader": "Frequently Asked Questions",
-        "faqSubHeader": "We couldn’t answer your question?",
-        "contactUs": "Contact us",
-        "continue": "Continue"
-    },
-    "faq": {
-        "question1": "What is the purpose of this application?",
-        "answer1": "This application is designed to help users manage their tasks efficiently by providing tools for scheduling, tracking progress, and setting reminders.",
-        "question2": "How do I reset my password?",
-        "answer2": "To reset your password, go to the login page and click on the 'Forgot Password' link. Follow the instructions to receive a password reset email and create a new password.",
-        "question3": "Can I use this application on multiple devices?",
-        "answer3": "Yes, the application is accessible from multiple devices including desktops, tablets, and smartphones. Your data will be synced across all devices, ensuring a seamless experience."
-    },
-    "noJobs": {
-        "noJobsTitle": "No available Jobs at the moment",
-        "noJobsContent": "Come back later!"
-    },
-    "ourServices": {
-        "title": "Our Services",
-        "description": "Trained to Give You The Best",
-        "details": "Since our founding in, Hng Boilerplate has been dedicated to constantly evolving to stay ahead of the curve. Our agile mindset and relentless pursuit of innovation ensure that you're always equipped with the most effective tools and strategies."
-    },
-    "mission": {
-        "title": "Our Mission & Vision",
-        "subtitle": "Leading the Way, Redefining Industries",
-        "description": "At Hng Boilerplate, we are dedicated to exceeding your expectations. We strive to understand your unique needs and challenges, providing tailored solutions that drive real results and empower your success."
-    },
-    "coreValues": {
-        "title": "Our Core Values",
-        "description": "Our Values shape the core of our organization and define the character of our industry.",
-        "values": {
-            "integrity": {
-                "title": "Integrity",
-                "description": "We uphold the highest ethical standards in everything we do, fostering trust and transparency with our clients, partners, and employees. We believe that honesty and integrity are the foundation of lasting success."
-            },
-            "customerCentricity": {
-                "title": "Customer Centricity",
-                "description": "Our customers are at the heart of our business. We strive to understand their needs, exceed their expectations, and build lasting relationships based on trust and mutual respect. We believe that putting our customers first is the key to long-term success."
-            },
-            "innovation": {
-                "title": "Innovation",
-                "description": "We embrace a culture of continuous improvement and creativity, constantly seeking new ways to evolve and enhance our products, services, and processes. We encourage experimentation and risk-taking, recognizing that innovation is essential for growth."
-            },
-            "excellence": {
-                "title": "Excellence",
-                "description": "We are committed to delivering exceptional quality in everything we do, from our products and services to our customer interactions and internal processes. We strive for continuous improvement and hold ourselves to the highest standards of performance."
-            }
-        }
+  "navbar": {
+    "login": "Log in",
+    "register": "Get Started"
+  },
+  "navLinks": {
+    "home": "Home",
+    "pricing": "Pricing",
+    "careers": "Careers"
+  },
+  "login": {
+    "title": "Login",
+    "welcomeBack": "Welcome back, you've been missed!",
+    "continueWithGoogle": "Continue with Google",
+    "emailPlaceholder": "Enter Email Address",
+    "passwordPlaceholder": "Enter Password",
+    "rememberMe": "Remember me",
+    "forgotPassword": "Forgot Password?",
+    "loginButton": "Login",
+    "signInWithMagicLink": "Sign in with magic link",
+    "noAccount": "Don't Have An Account?",
+    "agree": "By logging in, you agree to the",
+    "and": "and",
+    "signUp": "Sign Up",
+    "termsOfService": "Terms of Service",
+    "privacyPolicy": "Privacy Policy",
+    "loggingIn": "Logging in..."
+  },
+  "register": {
+    "signUp": "Sign Up",
+    "createAccountDesc": "Create an account to get started with us.",
+    "continueWithGoogle": "Continue with Google",
+    "firstName": "First Name",
+    "firstNamePlaceholder": "Enter your first name",
+    "lastName": "Last Name",
+    "lastNamePlaceholder": "Enter your last name",
+    "email": "Email",
+    "emailPlaceholder": "Enter Email Address",
+    "password": "Password",
+    "passwordPlaceholder": "Enter Password",
+    "createAccount": "Create Account",
+    "loggingIn": "Logging in...",
+    "emailVerification": "Email Verification",
+    "emailVerificationDesc": "We have sent a code to your email {email}",
+    "checkSpam": "check your spam if you do not receive the email",
+    "otpExpiresIn": "OTP expires in: {timeLeft}",
+    "resendCode": "Didn't receive the code? resend",
+    "dataProcessing": "We would process your data as set forth in our Terms of Use, Privacy Policy and Data Processing Agreement",
+    "alreadyHaveAccount": "Already Have An Account?"
+  },
+  "HomePage": {
+    "title": "Hello world!"
+  },
+  "hero": {
+    "headline": "Focus on What Matters. We've Got the Foundation Covered.",
+    "description": "Streamline your processes with a boilerplate built for efficiency and optimal productivity.",
+    "cta": "Get Started"
+  },
+  "userSection": {
+    "userSectionMoreThan": "More than 200",
+    "userSectionUsers": "Users",
+    "userSectionUsage": "make use of our Boilerplate"
+  },
+  "howItWorks": {
+    "howItWorksTitlePrefix": "How It Works:",
+    "howItWorksTitleHighlight": "Experience the benefits of using our product with every step.",
+    "howItWorksDescription": "We designed our product to simplify your life. It offers a comprehensive solution. Here's how it works and how it benefits you at each stage.",
+    "prebuiltTitle": "Pre-Built Sections",
+    "prebuiltDescription": "Leverage pre-built sections like \"Features,\" \"Benefits,\" \"Pricing,\" and \"Testimonials\" to showcase your product effectively.",
+    "scalableTitle": "Scalable Foundation",
+    "scalableDescription": "Our boilerplate is designed to grow with your product. Easily add new features and functionalities as needed.",
+    "easyTitle": "Easy Customization",
+    "easyDescription": "Tailor the experience to your specific needs and preferences for maximum results."
+  },
+  "testimonials": {
+    "title": "Client Testimonials",
+    "description": "Don't just take our word for it - see what actual users of our product have to say about their experience.",
+    "content": "I've been using this web hosting service for over a year and I'm really impressed with the uptime and support. The website has never gone down and the customer service is always quick to help with any issues I have. Highly recommend!"
+  },
+  "perfectFit": {
+    "title": "Find The Perfect Fit",
+    "description": "Choose the boilerplate plan that best suits your project needs and budget. All plans include access to our comprehensive library of pre-built sections, drag-and-drop customization.",
+    "cta": "See Our Pricing Plan"
+  },
+  "footer": {
+    "newsletterSignUp": "Sign Up For Newsletters",
+    "subscribe": "Subscribe",
+    "navigation": "Navigation",
+    "support": "Support",
+    "legal": "Legal",
+    "followUs": "Follow Us",
+    "privacyPolicy": "Privacy Policy",
+    "termsOfUse": "Terms of Use",
+    "enterYourEmail": "Enter your email",
+    "links": {
+      "navigation": "Navigation",
+      "home": "Home",
+      "aboutUs": "About Us",
+      "career": "Career",
+      "features": "Features",
+      "blog": "Blog",
+      "status": "Status",
+      "support": "Support",
+      "helpCenter": "Help Center",
+      "faq": "FAQ",
+      "waitingList": "Waiting List",
+      "pricingExperience": "Pricing Experience",
+      "contactUs": "Contact Us",
+      "legal": "Legal",
+      "privacyPolicy": "Privacy Policy",
+      "termsAndConditions": "Terms and Conditions"
+    },
+    "social": {
+      "facebook": "Facebook",
+      "instagram": "Instagram",
+      "linkedin": "LinkedIn",
+      "youtube": "YouTube"
+    },
+    "footerBottom": {
+      "privacyPolicy": "Privacy Policy",
+      "termsOfUse": "Terms of Use",
+      "copyright": "2024 All Rights Reserved"
+    }
+  },
+  "pricing": {
+    "pricingTitle": "Simple and {{Affordable}} Pricing Plan",
+    "pricingContent": "Our flexible plans are designed to scale with your business. We have a plan for you.",
+    "monthly": "Monthly",
+    "annual": "Annual (save 20%)",
+    "billingPlansNotAvailable": "Billing plans not available",
+    "features": {
+      "feature1": "2 Projects",
+      "feature2": "Up to 100 subscribers",
+      "feature3": "Basic analytics",
+      "feature4": "24-hour support response time",
+      "feature5": "Marketing advisor",
+      "feature6": "Custom integration",
+      "continue": "Continue"
+    },
+    "essentials": "The essentials to provide your best work for clients.",
+    "faqHeader": "Frequently Asked Questions",
+    "faqSubHeader": "We couldn’t answer your question?",
+    "contactUs": "Contact us",
+    "continue": "Continue"
+  },
+  "faq": {
+    "question1": "What is the purpose of this application?",
+    "answer1": "This application is designed to help users manage their tasks efficiently by providing tools for scheduling, tracking progress, and setting reminders.",
+    "question2": "How do I reset my password?",
+    "answer2": "To reset your password, go to the login page and click on the 'Forgot Password' link. Follow the instructions to receive a password reset email and create a new password.",
+    "question3": "Can I use this application on multiple devices?",
+    "answer3": "Yes, the application is accessible from multiple devices including desktops, tablets, and smartphones. Your data will be synced across all devices, ensuring a seamless experience."
+  },
+  "noJobs": {
+    "noJobsTitle": "No available Jobs at the moment",
+    "noJobsContent": "Come back later!"
+  },
+  "ourServices": {
+    "title": "Our Services",
+    "description": "Trained to Give You The Best",
+    "details": "Since our founding in, Hng Boilerplate has been dedicated to constantly evolving to stay ahead of the curve. Our agile mindset and relentless pursuit of innovation ensure that you're always equipped with the most effective tools and strategies."
+  },
+  "mission": {
+    "title": "Our Mission & Vision",
+    "subtitle": "Leading the Way, Redefining Industries",
+    "description": "At Hng Boilerplate, we are dedicated to exceeding your expectations. We strive to understand your unique needs and challenges, providing tailored solutions that drive real results and empower your success."
+  },
+  "coreValues": {
+    "title": "Our Core Values",
+    "description": "Our Values shape the core of our organization and define the character of our industry.",
+    "values": {
+      "integrity": {
+        "title": "Integrity",
+        "description": "We uphold the highest ethical standards in everything we do, fostering trust and transparency with our clients, partners, and employees. We believe that honesty and integrity are the foundation of lasting success."
+      },
+      "customerCentricity": {
+        "title": "Customer Centricity",
+        "description": "Our customers are at the heart of our business. We strive to understand their needs, exceed their expectations, and build lasting relationships based on trust and mutual respect. We believe that putting our customers first is the key to long-term success."
+      },
+      "innovation": {
+        "title": "Innovation",
+        "description": "We embrace a culture of continuous improvement and creativity, constantly seeking new ways to evolve and enhance our products, services, and processes. We encourage experimentation and risk-taking, recognizing that innovation is essential for growth."
+      },
+      "excellence": {
+        "title": "Excellence",
+        "description": "We are committed to delivering exceptional quality in everything we do, from our products and services to our customer interactions and internal processes. We strive for continuous improvement and hold ourselves to the highest standards of performance."
+      }
     }
-}
\ No newline at end of file
+  }
+}

From 267e681b743a0c6af5cb16e4c6fec809c80a3070 Mon Sep 17 00:00:00 2001
From: "Emma F. Mkpurunchi" <mkpurunchiemma@gmail.com>
Date: Sat, 24 Aug 2024 17:42:57 +0100
Subject: [PATCH 34/58] feature:implmentd product archive button

---
 .../(user-dashboard)/products/mainproductdetailpage/page.tsx  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx b/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
index e91bf290a..55ba4ce42 100644
--- a/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
+++ b/src/app/dashboard/(user-dashboard)/products/mainproductdetailpage/page.tsx
@@ -1,9 +1,9 @@
 "use client";
 
-import { ChangeEvent, FormEvent, useState } from "react";
-
 import Image from "next/image";
 import Link from "next/link";
+import { ChangeEvent, FormEvent, useState } from "react";
+
 import user from "../../../../../../public/images/user.png";
 
 const Discard = () => {

From 4638abd71772ee070f96274f9f84fe5d45127be6 Mon Sep 17 00:00:00 2001
From: Prudent Bird <prudentbird@gmail.com>
Date: Fri, 23 Aug 2024 19:42:46 +0100
Subject: [PATCH 35/58] chore: bug fixes

---
 src/components/authproviders/AuthProvider.tsx | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 src/components/authproviders/AuthProvider.tsx

diff --git a/src/components/authproviders/AuthProvider.tsx b/src/components/authproviders/AuthProvider.tsx
deleted file mode 100644
index dcaa74598..000000000
--- a/src/components/authproviders/AuthProvider.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-function AuthProvider({ title }: { title: string }) {
-  return (
-    <>
-      <button className="flex items-center gap-2 rounded-md border border-gray-200 p-4">
-        {title}
-      </button>
-    </>
-  );
-}
-
-export default AuthProvider;

From 9c8d5369e5a6f184f6daa8b062526c6ac7cab0eb Mon Sep 17 00:00:00 2001
From: Prudent Bird <prudentbird@gmail.com>
Date: Sat, 24 Aug 2024 18:58:10 +0100
Subject: [PATCH 36/58] chore: resolve unhandled runtime errors and types

---
 hng_boilerplate_nextjs_project                |   1 -
 package.json                                  |   3 +-
 .../notifications/getAllNotifications.ts      |   4 +-
 src/actions/organization.ts                   |   7 +-
 src/actions/product.ts                        |   1 -
 src/actions/socialAuth.ts                     |   6 +-
 src/app/(auth-routes)/login/page.tsx          |  71 ++-
 .../blog/[id]/_components/BlogDetailsPage.tsx |   1 -
 .../(landing-routes)/blog/comments/page.tsx   |   1 -
 .../_components/layout/sidebar/index.tsx      |   6 +-
 .../create-role/page.tsx                      |   6 +-
 .../roles-and-permissions/page.tsx            |  23 +-
 .../(user-metrics)/layout.tsx                 |   2 +-
 .../_components/layout/navbar/index.tsx       |  65 +--
 .../layout/navbar/organisation-switcher.tsx   |  63 +--
 .../_components/overview-revenue/index.tsx    |  89 ++--
 src/app/dashboard/(user-dashboard)/layout.tsx |   2 +-
 .../_components/new-product-modal.tsx         |   7 +-
 .../_components/product-delete-modal.tsx      |  37 +-
 .../_components/product-detail-modal.tsx      |  42 +-
 .../_components/product-detail-view.tsx       |  37 +-
 src/app/dashboard/layout.tsx                  |  42 +-
 src/app/invite/page.tsx                       |  12 +-
 src/components/card/user-card.tsx             |  61 +--
 .../common/contact-us-form/index.tsx          |  28 +-
 .../layouts/navbar/mobile-navbar.tsx          |   9 +-
 src/config/auth.config.ts                     |  24 +-
 src/contexts/orgContext.tsx                   | 449 ++++--------------
 src/lib/auth.ts                               |   5 +-
 src/test/blog/comment/comment-body.test.tsx   |   6 +-
 src/test/blog/comment/comment-reply.test.tsx  |   1 -
 src/test/blog/comment/index.test.tsx          |   1 -
 src/types/index.d.ts                          |   6 +-
 33 files changed, 363 insertions(+), 755 deletions(-)
 delete mode 160000 hng_boilerplate_nextjs_project

diff --git a/hng_boilerplate_nextjs_project b/hng_boilerplate_nextjs_project
deleted file mode 160000
index 8fc1b95c0..000000000
--- a/hng_boilerplate_nextjs_project
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8fc1b95c0e495b78b6b2d20e43b85695edcafec9
diff --git a/package.json b/package.json
index 00d899270..de17b7cb7 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,8 @@
     "test:ci": "vitest --coverage",
     "email:dev": "email dev --dir \"./src/email/templates\"",
     "email:build": "email build --dir \"./src/email/templates\"",
-    "email:start": "email start"
+    "email:start": "email start",
+    "typecheck": "tsc --project tsconfig.json --noEmit"
   },
   "dependencies": {
     "@hookform/resolvers": "^3.9.0",
diff --git a/src/actions/notifications/getAllNotifications.ts b/src/actions/notifications/getAllNotifications.ts
index c7389fb9f..456b27580 100644
--- a/src/actions/notifications/getAllNotifications.ts
+++ b/src/actions/notifications/getAllNotifications.ts
@@ -3,10 +3,10 @@
 import axios from "axios";
 
 import { auth } from "~/lib/auth";
-import { getApiUrl } from "../getApiUrl";
+
+const apiUrl = process.env.API_URL;
 
 export const getAllNotifications = async () => {
-  const apiUrl = await getApiUrl();
   const session = await auth();
   try {
     const response = await axios.get(`${apiUrl}/api/v1/notifications`, {
diff --git a/src/actions/organization.ts b/src/actions/organization.ts
index 36f321737..ac83db272 100644
--- a/src/actions/organization.ts
+++ b/src/actions/organization.ts
@@ -102,8 +102,13 @@ export const getAnalytics = async () => {
       },
     });
 
+    const formattedData = Object.keys(response.data.data).map((key) => ({
+      month: key,
+      revenue: response.data.data[key],
+    }));
+
     return {
-      data: response.data.data,
+      data: formattedData,
     };
   } catch (error) {
     return axios.isAxiosError(error) && error.response
diff --git a/src/actions/product.ts b/src/actions/product.ts
index b527d36c9..e9fe607f6 100644
--- a/src/actions/product.ts
+++ b/src/actions/product.ts
@@ -70,7 +70,6 @@ export const getAllProduct = async (org_id: string) => {
     );
     return {
       products: response.data.data,
-      response: response,
     };
   } catch (error) {
     return axios.isAxiosError(error) && error.response
diff --git a/src/actions/socialAuth.ts b/src/actions/socialAuth.ts
index 0673e95b5..1324573ac 100644
--- a/src/actions/socialAuth.ts
+++ b/src/actions/socialAuth.ts
@@ -2,14 +2,14 @@
 
 import axios from "axios";
 
-import { AuthResponse, ErrorResponse, Profile } from "~/types";
+import { AuthResponse, ErrorResponse } from "~/types";
 
 const apiUrl = process.env.API_URL;
 
-const googleAuth = async (profile: Profile): Promise<AuthResponse> => {
+const googleAuth = async (idToken: string): Promise<AuthResponse> => {
   try {
     const response = await axios.post(`${apiUrl}/api/v1/auth/google`, {
-      id_token: profile.id_token,
+      id_token: idToken,
     });
 
     return {
diff --git a/src/app/(auth-routes)/login/page.tsx b/src/app/(auth-routes)/login/page.tsx
index 269782fdb..5251e9fee 100644
--- a/src/app/(auth-routes)/login/page.tsx
+++ b/src/app/(auth-routes)/login/page.tsx
@@ -10,7 +10,6 @@ import { useEffect, useState, useTransition } from "react";
 import { useForm } from "react-hook-form";
 import * as z from "zod";
 
-import { loginUser } from "~/actions/login";
 import CustomButton from "~/components/common/common-button/common-button";
 import { Input } from "~/components/common/input";
 import LoadingSpinner from "~/components/miscellaneous/loading-spinner";
@@ -24,28 +23,22 @@ import {
   FormMessage,
 } from "~/components/ui/form";
 import { useToast } from "~/components/ui/use-toast";
-import { useLocalStorage } from "~/hooks/use-local-storage";
 import { cn } from "~/lib/utils";
 import { LoginSchema } from "~/schemas";
-import { Organisation } from "~/types";
 
 const Login = () => {
   const t = useTranslations("login");
   const router = useRouter();
   const { toast } = useToast();
-  const { status } = useSession();
   const [isLoading, startTransition] = useTransition();
   const [showPassword, setShowPassword] = useState(false);
-  const [, setUserOrg] = useLocalStorage<Organisation[]>("user_org", []);
-
-  const [currentOrgId, setCurrentOrgId] = useLocalStorage<string | undefined>(
-    "current_orgid",
-    "",
-  );
+  const { status } = useSession();
 
-  if (status === "authenticated") {
-    router.push("/dashboard");
-  }
+  useEffect(() => {
+    if (status === "authenticated") {
+      router.push("/dashboard");
+    }
+  }, [status, router]);
 
   const form = useForm<z.infer<typeof LoginSchema>>({
     resolver: zodResolver(LoginSchema),
@@ -55,34 +48,37 @@ const Login = () => {
       rememberMe: false,
     },
   });
-
   const onSubmit = async (values: z.infer<typeof LoginSchema>) => {
-    startTransition(async () => {
-      await loginUser(values).then(async (data) => {
-        const { email, password } = values;
+    const { email, password } = values;
 
-        if (data.status === 200) {
-          setUserOrg(data.organisations);
-          if (!currentOrgId && data.organisations.length > 0) {
-            setCurrentOrgId(data.organisations[0].organisation_id);
-          }
-          await signIn(
-            "credentials",
-            {
-              email,
-              password,
-              redirect: false,
-            },
-            { callbackUrl: "/dashboard" },
-          );
+    try {
+      startTransition(async () => {
+        const result = await signIn("credentials", {
+          email,
+          password,
+          redirect: false,
+        });
+
+        if (result?.ok) {
           router.push("/dashboard");
+          toast({
+            title: "Login success",
+            description: "Redirecting",
+          });
+        } else {
+          toast({
+            title: "An error occurred",
+            description: result?.error || "Unknown error",
+          });
         }
-        toast({
-          title: data.status === 200 ? "Login success" : "An error occurred",
-          description: data.status === 200 ? "Redirecting" : data.error,
-        });
       });
-    });
+    } catch (error) {
+      toast({
+        title: "Login failed",
+        description:
+          (error as Error).message || "An error occurred during login",
+      });
+    }
   };
 
   const togglePasswordVisibility = () => {
@@ -91,6 +87,7 @@ const Login = () => {
   useEffect(() => {
     document.title = "Login";
   }, []);
+
   return (
     <div className="flex min-h-full items-center justify-center px-4 py-10 sm:px-6 lg:px-8">
       <div className="w-full max-w-md space-y-6">
@@ -106,7 +103,7 @@ const Login = () => {
           <CustomButton
             variant="outline"
             isLeftIconVisible={true}
-            onClick={() => signIn("google", { callbackUrl: "/dashboard" })}
+            onClick={() => signIn("google", { callbackUrl: "/" })}
             icon={
               <svg
                 width="25"
diff --git a/src/app/(landing-routes)/blog/[id]/_components/BlogDetailsPage.tsx b/src/app/(landing-routes)/blog/[id]/_components/BlogDetailsPage.tsx
index 4eceb676f..71819d4ae 100644
--- a/src/app/(landing-routes)/blog/[id]/_components/BlogDetailsPage.tsx
+++ b/src/app/(landing-routes)/blog/[id]/_components/BlogDetailsPage.tsx
@@ -22,7 +22,6 @@ const mockSession: Session = {
     last_name: "User",
     email: "user@example.com",
     image: "path/to/image",
-    role: "user",
   },
   access_token: "some-token",
   expires: "2100-01-01T00:00:00.000Z",
diff --git a/src/app/(landing-routes)/blog/comments/page.tsx b/src/app/(landing-routes)/blog/comments/page.tsx
index 1f205e1ed..669d30c3d 100644
--- a/src/app/(landing-routes)/blog/comments/page.tsx
+++ b/src/app/(landing-routes)/blog/comments/page.tsx
@@ -12,7 +12,6 @@ const CommentPage = () => {
       last_name: "User",
       email: "user@example.com",
       image: "path/to/image",
-      role: "user",
     },
     access_token: "some-token",
     expires: "1",
diff --git a/src/app/dashboard/(admin)/admin/(settings)/settings/_components/layout/sidebar/index.tsx b/src/app/dashboard/(admin)/admin/(settings)/settings/_components/layout/sidebar/index.tsx
index 48d8aabe8..f65b5e87f 100644
--- a/src/app/dashboard/(admin)/admin/(settings)/settings/_components/layout/sidebar/index.tsx
+++ b/src/app/dashboard/(admin)/admin/(settings)/settings/_components/layout/sidebar/index.tsx
@@ -12,12 +12,12 @@ import {
   UserRoundCog,
   UsersIcon,
 } from "lucide-react";
+import { useSession } from "next-auth/react";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
 import { FC, ForwardRefExoticComponent, RefAttributes } from "react";
 
 import { useOrgContext } from "~/contexts/orgContext";
-import { useLocalStorage } from "~/hooks/use-local-storage";
 
 const sideItems = [
   {
@@ -96,10 +96,10 @@ const SettingsSidebar: FC<Iproperties> = ({ sideNavitems = sideItems }) => {
     pathname?.split("/").length == 2 ? "general" : pathname?.split("/")[3];
   const organizationPath = pathname?.split("/")[4];
   const { organizations } = useOrgContext();
-  const [org_id] = useLocalStorage<string>("current_orgid", "");
+  const { data: session } = useSession();
 
   const organization = organizations.find(
-    (org) => org.organisation_id === org_id,
+    (org) => org.organisation_id === session?.currentOrgId,
   );
 
   return (
diff --git a/src/app/dashboard/(admin)/admin/(settings)/settings/organization/roles-and-permissions/create-role/page.tsx b/src/app/dashboard/(admin)/admin/(settings)/settings/organization/roles-and-permissions/create-role/page.tsx
index 35330829d..a55dfa546 100644
--- a/src/app/dashboard/(admin)/admin/(settings)/settings/organization/roles-and-permissions/create-role/page.tsx
+++ b/src/app/dashboard/(admin)/admin/(settings)/settings/organization/roles-and-permissions/create-role/page.tsx
@@ -2,6 +2,7 @@
 
 import { zodResolver } from "@hookform/resolvers/zod";
 import { ChevronLeftIcon } from "lucide-react";
+import { useSession } from "next-auth/react";
 import Link from "next/link";
 import { useRouter } from "next/navigation";
 import { useEffect, useState } from "react";
@@ -19,7 +20,6 @@ import {
   SelectValue,
 } from "~/components/ui/select";
 import { toast } from "~/components/ui/use-toast";
-import { useLocalStorage } from "~/hooks/use-local-storage";
 import { roleSchema } from "~/schemas";
 
 type UseFormInputs = z.infer<typeof roleSchema>;
@@ -123,7 +123,7 @@ const transformPermissions = (apiResponse: APIPermissions[]) => {
 
 function CreateNewRolePage() {
   const router = useRouter();
-  const [currentOrgId] = useLocalStorage<string>("current_orgid", "");
+  const { data: session } = useSession();
   const [isSaving, setIsSaving] = useState(false);
   const [permissions, setPermissions] = useState<
     PermissionOption["permissions"] | []
@@ -175,7 +175,7 @@ function CreateNewRolePage() {
   const onValid = async (values: UseFormInputs) => {
     setIsSaving(true);
     try {
-      await createRole(values, currentOrgId)
+      await createRole(values, session?.currentOrgId ?? "")
         .then((data) => {
           if (!data.error) {
             toast({
diff --git a/src/app/dashboard/(admin)/admin/(settings)/settings/organization/roles-and-permissions/page.tsx b/src/app/dashboard/(admin)/admin/(settings)/settings/organization/roles-and-permissions/page.tsx
index 11d6b6349..0ec979fa5 100644
--- a/src/app/dashboard/(admin)/admin/(settings)/settings/organization/roles-and-permissions/page.tsx
+++ b/src/app/dashboard/(admin)/admin/(settings)/settings/organization/roles-and-permissions/page.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import { useSession } from "next-auth/react";
 import Link from "next/link";
 import { useEffect, useState } from "react";
 
@@ -13,7 +14,6 @@ import {
 import CustomButton from "~/components/common/common-button/common-button";
 import LoadingSpinner from "~/components/miscellaneous/loading-spinner";
 import { useToast } from "~/components/ui/use-toast";
-import { useLocalStorage } from "~/hooks/use-local-storage";
 
 type Role = {
   id: string;
@@ -39,18 +39,15 @@ const RolesAndPermission = () => {
   const [loadingRoles, setLoadingRoles] = useState<boolean>(true);
   const [loadingPermissions, setLoadingPermissions] = useState<boolean>(false);
   const [loadingRequest, setLoadingRequest] = useState<boolean>(false);
-  const [currentOrgId] = useLocalStorage<string | undefined>(
-    "current_orgid",
-    "",
-  );
+  const { data: session } = useSession();
 
   useEffect(() => {
-    if (!currentOrgId) return;
+    if (!session?.currentOrgId) return;
     const fetchData = async () => {
       try {
         const url = await getApiUrl();
         setApiUrl(url);
-        const { data, error } = await getRoles(currentOrgId);
+        const { data, error } = await getRoles(session?.currentOrgId ?? "");
 
         if (error) throw new Error("An error occurred!");
 
@@ -68,14 +65,14 @@ const RolesAndPermission = () => {
     };
     setLoadingRoles(true);
     fetchData();
-  }, [currentOrgId, toast]);
+  }, [session?.currentOrgId, toast]);
 
   useEffect(() => {
     const fetchPermissions = async () => {
-      if (selectedRoleId && currentOrgId) {
+      if (selectedRoleId && session?.currentOrgId) {
         setLoadingPermissions(true);
         try {
-          await getRolePermissions(currentOrgId, selectedRoleId).then(
+          await getRolePermissions(session?.currentOrgId, selectedRoleId).then(
             (data) => {
               const rolesData = data.data;
               if (rolesData.permissions.length > 0) {
@@ -99,7 +96,7 @@ const RolesAndPermission = () => {
       }
     };
     fetchPermissions();
-  }, [selectedRoleId, apiUrl, currentOrgId, toast]);
+  }, [selectedRoleId, apiUrl, session?.currentOrgId, toast]);
 
   useEffect(() => {
     const fetchPermissions = async () => {
@@ -132,7 +129,7 @@ const RolesAndPermission = () => {
   };
 
   const handleSave = async () => {
-    if (!selectedRoleId || !currentOrgId) return;
+    if (!selectedRoleId || !session?.currentOrgId) return;
     const selectedRole =
       roles.some((role) => role.id === selectedRoleId) &&
       roles.find((role) => role.id === selectedRoleId);
@@ -141,7 +138,7 @@ const RolesAndPermission = () => {
     try {
       await updateRole(
         { ...selectedRole, permissions },
-        currentOrgId,
+        session?.currentOrgId,
         selectedRoleId,
       ).then(() => {
         toast({
diff --git a/src/app/dashboard/(user-dashboard)/(user-metrics)/layout.tsx b/src/app/dashboard/(user-dashboard)/(user-metrics)/layout.tsx
index dbe5f72ec..41a7552da 100644
--- a/src/app/dashboard/(user-dashboard)/(user-metrics)/layout.tsx
+++ b/src/app/dashboard/(user-dashboard)/(user-metrics)/layout.tsx
@@ -22,7 +22,7 @@ const links = [
 export default function UserMetricsLayout({ children }: PropsWithChildren) {
   return (
     <div className="flex h-full flex-col gap-[37px] bg-background p-4">
-      <div className="flex flex-wrap items-center justify-between gap-x-6 gap-y-2 pt-6">
+      <div className="flex flex-wrap items-end justify-between gap-x-6 gap-y-2 pt-6">
         <div className="space-y-6">
           <h1 className="text-2xl font-semibold lg:text-[30px]">Dashboard</h1>
           <Tablinks links={links} />
diff --git a/src/app/dashboard/(user-dashboard)/_components/layout/navbar/index.tsx b/src/app/dashboard/(user-dashboard)/_components/layout/navbar/index.tsx
index d537b16e7..bf87dedb9 100644
--- a/src/app/dashboard/(user-dashboard)/_components/layout/navbar/index.tsx
+++ b/src/app/dashboard/(user-dashboard)/_components/layout/navbar/index.tsx
@@ -1,11 +1,7 @@
 "use client";
 
 import { BellIcon, HelpCircle } from "lucide-react";
-import { useSession } from "next-auth/react";
-import { useRouter } from "next/navigation";
-import { useEffect, useState } from "react";
 
-import { getAllNotifications } from "~/actions/notifications/getAllNotifications";
 import UnreadNotificationCard from "~/app/dashboard/(admin)/_components/unread-notification-card/UnreadNotificationCard";
 import { MobileNavlinks } from "~/app/dashboard/(user-dashboard)/_components/layout/navbar/mobile-navlinks";
 import { Navlinks } from "~/app/dashboard/(user-dashboard)/_components/layout/navbar/navlinks";
@@ -16,62 +12,23 @@ import {
   PopoverContent,
   PopoverTrigger,
 } from "~/components/ui/popover";
+import { useOrgContext } from "~/contexts/orgContext";
 import { OrganisationSwitcher } from "./organisation-switcher";
 
-interface NotificationPreview {
-  message: string;
-  created_at: string;
-  is_read: boolean;
-  id: string;
-}
-
-interface NotificationsData {
-  data: {
-    total_unread_notification_count: number;
-    total_notification_count: number;
-    notifications: NotificationPreview[];
-  };
-  message: string;
-}
-
 const UserNavbar = () => {
-  const [notifications, setNotifications] =
-    useState<NotificationsData | null>();
-  const { status } = useSession();
-  const router = useRouter();
-
-  useEffect(() => {
-    if (status === "unauthenticated") {
-      router.push("/login");
-    }
-  }, [status, router]);
-
-  useEffect(() => {
-    async function fetchNotifications() {
-      const result = await getAllNotifications();
-
-      if (result.error) {
-        return result.error;
-      } else {
-        setNotifications(result.data as NotificationsData);
-      }
-    }
-
-    fetchNotifications();
-  }, []);
+  const { notifications } = useOrgContext();
 
   const totalUnreadNotificationCount =
-    notifications?.data.total_unread_notification_count || 0;
+    notifications?.data?.total_unread_notification_count || 0;
 
   const totalNotificationCount =
-    notifications?.data.total_notification_count || 0;
-  const notificationContent: NotificationPreview[] =
-    notifications?.data.notifications || [];
+    notifications?.data?.total_notification_count || 0;
+  const notificationContent = notifications?.data?.notifications || [];
 
   return (
     <nav
       className="bg-white px-5 py-2.5 md:left-[220px] lg:left-[252px]"
-      role="navbar"
+      role="navigation"
     >
       <div className="flex items-center justify-between gap-2">
         <div className="flex gap-[50px]">
@@ -89,6 +46,7 @@ const UserNavbar = () => {
               <PopoverTrigger>
                 <BellIcon
                   data-testid="bell"
+                  aria-label="Notifications"
                   className="h-6 w-6 text-neutral-dark-2 transition-colors duration-300 hover:cursor-pointer hover:text-neutral-dark-1"
                 />
               </PopoverTrigger>
@@ -104,17 +62,14 @@ const UserNavbar = () => {
                 />
               </PopoverContent>
             </Popover>
-            {notifications && (
-              <>
-                {totalNotificationCount > 0 && (
-                  <span className="absolute right-1 top-0 h-[6px] w-[6px] rounded-full bg-error"></span>
-                )}
-              </>
+            {totalUnreadNotificationCount > 0 && (
+              <span className="absolute right-1 top-0 h-[6px] w-[6px] rounded-full bg-error"></span>
             )}
           </div>
           <div className="max-sm:hidden">
             <HelpCircle
               data-testid="help"
+              aria-label="Help"
               className="h-6 w-6 text-neutral-dark-2 transition-colors duration-300 hover:cursor-pointer hover:text-neutral-dark-1"
             />
           </div>
diff --git a/src/app/dashboard/(user-dashboard)/_components/layout/navbar/organisation-switcher.tsx b/src/app/dashboard/(user-dashboard)/_components/layout/navbar/organisation-switcher.tsx
index 36b1f6e0a..6f5b447e6 100644
--- a/src/app/dashboard/(user-dashboard)/_components/layout/navbar/organisation-switcher.tsx
+++ b/src/app/dashboard/(user-dashboard)/_components/layout/navbar/organisation-switcher.tsx
@@ -1,8 +1,8 @@
-"use client ";
+"use client";
 
-import { useEffect, useState } from "react";
+import { useSession } from "next-auth/react";
+import { useState } from "react";
 
-import { getCurrentOrgApi } from "~/actions/switchOrganization";
 import { Avatar, AvatarFallback, AvatarImage } from "~/components/ui/avatar";
 import { Button } from "~/components/ui/button";
 import {
@@ -14,43 +14,30 @@ import {
 } from "~/components/ui/select";
 import { Skeleton } from "~/components/ui/skeleton";
 import { useOrgContext } from "~/contexts/orgContext";
-import { useLocalStorage } from "~/hooks/use-local-storage";
 import { CreateOrganization } from "../../create-organization";
 
 export const OrganisationSwitcher = () => {
-  const [currentOrgId, setCurrentOrgId] = useLocalStorage<string | undefined>(
-    "current_orgid",
-    "",
-  );
-
-  const { organizations, isLoading, switchOrganization } = useOrgContext();
+  const { data: session } = useSession();
+  const { isLoading, switchOrganization } = useOrgContext();
 
-  useEffect(() => {
-    if (!currentOrgId && organizations.length > 0) {
-      setCurrentOrgId(organizations[0].organisation_id);
-      switchOrganization(organizations[0].organisation_id);
-    }
-    // console.log(organizations);
-  }, [currentOrgId, organizations, setCurrentOrgId, switchOrganization]);
-
-  const handleOrgChange = (currentOrg: string) => {
-    setCurrentOrgId(currentOrg);
-    switchOrganization(currentOrg);
-    getCurrentOrgApi({ orgId: currentOrg });
+  // Ensure that switchOrganization is properly defined and used
+  const handleOrgChange = (currentOrgId: string) => {
+    switchOrganization(currentOrgId);
   };
 
-  const currentOrg =
-    organizations.length > 0
-      ? organizations.find((org) => org.organisation_id === currentOrgId)
-      : undefined;
+  // Ensure currentOrg is correctly derived
+  const currentOrg = session?.userOrg?.find(
+    (org) => org.organisation_id === session.currentOrgId,
+  );
 
+  // State to manage the modal visibility
   const [isOpen, setIsOpen] = useState(false);
 
   return (
     <>
       <CreateOrganization isOpen={isOpen} setIsOpen={setIsOpen} />
       <Select
-        defaultValue={currentOrgId}
+        defaultValue={currentOrg?.name}
         onValueChange={(value) => handleOrgChange(value)}
       >
         <SelectTrigger
@@ -60,31 +47,33 @@ export const OrganisationSwitcher = () => {
           {isLoading ? (
             <Skeleton className="h-4 w-full" />
           ) : (
-            <SelectValue placeholder={currentOrg?.name}>
-              <span className="ml-2">{currentOrg && currentOrg.name}</span>
+            <SelectValue placeholder="Select an organization">
+              <span className="ml-2">
+                {currentOrg?.name || "No Organization Selected"}
+              </span>
             </SelectValue>
           )}
         </SelectTrigger>
         <SelectContent>
-          {organizations.map((org) => (
-            <SelectItem key={org.id} value={org.organisation_id}>
-              <div className="flex items-center gap-3 [&_svg]:h-4 [&_svg]:w-4 [&_svg]:shrink-0 [&_svg]:text-foreground">
-                <Avatar className="size-4 sm:size-3">
+          {session?.userOrg?.map((org) => (
+            <SelectItem key={org.organisation_id} value={org.organisation_id}>
+              <div className="flex items-center gap-3">
+                <Avatar className="h-4 w-4 sm:h-3 sm:w-3">
                   <AvatarImage src={""} />
                   <AvatarFallback className="bg-primary/30 uppercase">
-                    {org?.name?.charAt(0)}
+                    {org.name?.charAt(0)}
                   </AvatarFallback>
-                </Avatar>{" "}
+                </Avatar>
                 {org.name}
               </div>
             </SelectItem>
           ))}
           <Button
             variant="outline"
-            className="w-full"
+            className="mt-2 w-full"
             onClick={() => setIsOpen(!isOpen)}
           >
-            Create Organisation
+            Create Organization
           </Button>
         </SelectContent>
       </Select>
diff --git a/src/app/dashboard/(user-dashboard)/_components/overview-revenue/index.tsx b/src/app/dashboard/(user-dashboard)/_components/overview-revenue/index.tsx
index 10642e0eb..1e3335ebf 100644
--- a/src/app/dashboard/(user-dashboard)/_components/overview-revenue/index.tsx
+++ b/src/app/dashboard/(user-dashboard)/_components/overview-revenue/index.tsx
@@ -1,93 +1,60 @@
 "use client";
 
-import { useEffect, useState } from "react";
-
-import { dashboard } from "~/actions/dashboard";
 import { revenueData } from "~/app/dashboard/(user-dashboard)/_components/overview-revenue/revenueData";
 import CardComponent from "~/components/common/DashboardCard/CardComponent";
 import { useOrgContext } from "~/contexts/orgContext";
 
-interface dashboard {
-  revenue: number;
-  subscriptions: number;
-  sales: number;
-  activeSubscription: number;
-  monthSales: [
-    {
-      id: string;
-      user_id: string;
-      product_id: string;
-      subscription_id: string;
-      type: string;
-      status: string;
-      partners: string;
-      amount: number;
-      reference: string;
-      created_at: string;
-      paid_at: string;
-      modified_at: string;
-    },
-  ];
-}
 export function OverviewRevenue() {
-  const [dashboardObjectData, setDashboardObjectData] = useState<dashboard>();
-  useEffect(() => {
-    getDashboardData();
-  }, []);
-  const getDashboardData = async () => {
-    const data = await dashboard();
-    setDashboardObjectData(data);
-  };
   const { isLoading, dashboardData } = useOrgContext();
+
+  // If dashboardData is undefined or still loading, render a loading state
+  if (isLoading || !dashboardData) {
+    return (
+      <div className="mb-6 mt-4 grid grid-cols-1 gap-4 md:grid-cols-2 xl:grid-cols-4">
+        {/* Placeholder card components or a loading spinner */}
+        {revenueData.map((data, index) => (
+          <CardComponent
+            key={index}
+            title={data.title}
+            value={0} // Default value during loading
+            percentage={0} // Default percentage during loading
+            icon={data.icon}
+            loading={true} // Indicate that the card is in a loading state
+          />
+        ))}
+      </div>
+    );
+  }
+
   return (
     <div className="mb-6 mt-4 grid grid-cols-1 gap-4 md:grid-cols-2 xl:grid-cols-4">
       <CardComponent
         title={revenueData[0].title}
-        // title={revenueData[0].title}
-        value={dashboardObjectData?.revenue || 0}
-        // value={dashboardData?.revenue.current_month || 0}
-        percentage={dashboardData?.revenue.percentage_difference || 0}
-        // percentage={dashboardData?.revenue.percentage_difference || 0}
+        value={dashboardData.revenue.current_month || 0}
+        percentage={dashboardData.revenue.percentage_difference || 0}
         icon={revenueData[0].icon}
-        // icon={revenueData[0].icon}
         loading={isLoading}
-        // loading={isLoading}
       />
       <CardComponent
         title={revenueData[1].title}
-        // title={revenueData[1].title}
-        value={dashboardObjectData?.subscriptions || 0}
-        // value={dashboardData?.Subscriptions.current_month || 0}
-        percentage={dashboardData?.Subscriptions.percentage_difference || 0}
-        // percentage={dashboardData?.Subscriptions.percentage_difference || 0}
+        value={dashboardData.Subscriptions.current_month || 0}
+        percentage={dashboardData.Subscriptions.percentage_difference || 0}
         icon={revenueData[1].icon}
-        // icon={revenueData[1].icon}
         loading={isLoading}
-        // loading={isLoading}
       />
       <CardComponent
         title={revenueData[2].title}
-        // title={revenueData[2].title}
-        value={dashboardObjectData?.sales || 0}
-        // value={dashboardData?.orders.current_month || 0}
-        percentage={dashboardData?.orders.percentage_difference || 0}
-        // percentage={dashboardData?.orders.percentage_difference || 0}
+        value={dashboardData.orders.current_month || 0}
+        percentage={dashboardData.orders.percentage_difference || 0}
         icon={revenueData[2].icon}
-        // icon={revenueData[2].icon}
         loading={isLoading}
-        // loading={isLoading}
       />
       <CardComponent
         title={revenueData[3].title}
-        // title={revenueData[3].title}
-        value={dashboardObjectData?.activeSubscription || 0}
-        // value={dashboardData?.active_users.current || 0}
-        percentage={dashboardData?.active_users.difference_an_hour_ago || 0}
-        // percentage={dashboardData?.active_users.difference_an_hour_ago || 0}
+        value={dashboardData.active_users.current || 0}
+        percentage={dashboardData.active_users.difference_an_hour_ago || 0}
         icon={revenueData[3].icon}
-        // icon={revenueData[3].icon}
         loading={isLoading}
-        // loading={isLoading}
         isUser
       />
     </div>
diff --git a/src/app/dashboard/(user-dashboard)/layout.tsx b/src/app/dashboard/(user-dashboard)/layout.tsx
index 9448e15dc..b03d8ab91 100644
--- a/src/app/dashboard/(user-dashboard)/layout.tsx
+++ b/src/app/dashboard/(user-dashboard)/layout.tsx
@@ -21,7 +21,7 @@ export default function AdminLayout({
           <div className="w-[calc(100%_-_50px)] flex-1">
             <Suspense>{children}</Suspense>
           </div>
-        </div>{" "}
+        </div>
       </div>
     </div>
   );
diff --git a/src/app/dashboard/(user-dashboard)/products/_components/new-product-modal.tsx b/src/app/dashboard/(user-dashboard)/products/_components/new-product-modal.tsx
index f12531b9f..69f7b2c77 100644
--- a/src/app/dashboard/(user-dashboard)/products/_components/new-product-modal.tsx
+++ b/src/app/dashboard/(user-dashboard)/products/_components/new-product-modal.tsx
@@ -2,6 +2,7 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import { AnimatePresence, motion } from "framer-motion";
 import { Loader, X } from "lucide-react";
+import { useSession } from "next-auth/react";
 import Image from "next/image";
 import { useState, useTransition } from "react";
 import { useForm } from "react-hook-form";
@@ -32,7 +33,6 @@ import {
 import { Textarea } from "~/components/ui/textarea";
 import { useToast } from "~/components/ui/use-toast";
 import { useOrgContext } from "~/contexts/orgContext";
-import { useLocalStorage } from "~/hooks/use-local-storage";
 import { cn } from "~/lib/utils";
 import { productSchema } from "~/schemas";
 import { CloudinaryAsset } from "~/types";
@@ -43,7 +43,7 @@ const NewProductModal = () => {
   const { setIsNewModal, isNewModal } = useOrgContext();
   const [image, setImage] = useState<File | Blob>();
   const [isLoading, startTransition] = useTransition();
-  const [org_id] = useLocalStorage<string>("current_orgid", "");
+  const { data: session } = useSession();
 
   const variantProperties = {
     left: "50%",
@@ -82,7 +82,8 @@ const NewProductModal = () => {
         values.image_url = data.url;
       });
 
-      await createProduct(values, org_id).then((data) => {
+      if (session?.currentOrgId === undefined) return;
+      await createProduct(values, session?.currentOrgId).then((data) => {
         if (data.status === 201) {
           newProductForm.reset();
           setIsNewModal(false);
diff --git a/src/app/dashboard/(user-dashboard)/products/_components/product-delete-modal.tsx b/src/app/dashboard/(user-dashboard)/products/_components/product-delete-modal.tsx
index 99f2612a0..eb3904f82 100644
--- a/src/app/dashboard/(user-dashboard)/products/_components/product-delete-modal.tsx
+++ b/src/app/dashboard/(user-dashboard)/products/_components/product-delete-modal.tsx
@@ -1,13 +1,13 @@
 "use client";
 
 import { AnimatePresence, motion } from "framer-motion";
+import { useSession } from "next-auth/react";
 import { useTransition } from "react";
 
 import { deleteProduct } from "~/actions/product";
 import { Button } from "~/components/ui/button";
 import { toast } from "~/components/ui/use-toast";
 import { useOrgContext } from "~/contexts/orgContext";
-import { useLocalStorage } from "~/hooks/use-local-storage";
 import { cn } from "~/lib/utils";
 
 const variantProperties = {
@@ -18,7 +18,7 @@ const variantProperties = {
 };
 
 const ProductDeleteModal = () => {
-  const [org_id] = useLocalStorage<string>("current_orgid", "");
+  const { data: session } = useSession();
   const [isPending, startTransition] = useTransition();
   const { selectedProduct, products, isDelete, setIsDelete } = useOrgContext();
 
@@ -32,21 +32,24 @@ const ProductDeleteModal = () => {
     });
 
     startTransition(async () => {
-      await deleteProduct(org_id, selectedProduct).then((data) => {
-        if (data.status === 200) {
-          toast({
-            title: "Product deleted",
-            description: "Product deleted successfully.",
-          });
-        } else {
-          toast({
-            title: "Error",
-            description: data.error || "An unexpected error occurred.",
-            variant: "destructive",
-          });
-        }
-        setIsDelete(false);
-      });
+      if (session?.currentOrgId === undefined) return;
+      await deleteProduct(session?.currentOrgId, selectedProduct).then(
+        (data) => {
+          if (data.status === 200) {
+            toast({
+              title: "Product deleted",
+              description: "Product deleted successfully.",
+            });
+          } else {
+            toast({
+              title: "Error",
+              description: data.error || "An unexpected error occurred.",
+              variant: "destructive",
+            });
+          }
+          setIsDelete(false);
+        },
+      );
     });
   };
 
diff --git a/src/app/dashboard/(user-dashboard)/products/_components/product-detail-modal.tsx b/src/app/dashboard/(user-dashboard)/products/_components/product-detail-modal.tsx
index 0a6edfceb..271c00fce 100644
--- a/src/app/dashboard/(user-dashboard)/products/_components/product-detail-modal.tsx
+++ b/src/app/dashboard/(user-dashboard)/products/_components/product-detail-modal.tsx
@@ -1,5 +1,6 @@
 import { AnimatePresence, motion } from "framer-motion";
 import { Loader2, X } from "lucide-react";
+import { useSession } from "next-auth/react";
 import { useRouter } from "next-nprogress-bar";
 import { startTransition, useEffect, useState, useTransition } from "react";
 
@@ -8,7 +9,6 @@ import BlurImage from "~/components/miscellaneous/blur-image";
 import { Button } from "~/components/ui/button";
 import { toast } from "~/components/ui/use-toast";
 import { useOrgContext } from "~/contexts/orgContext";
-import { useLocalStorage } from "~/hooks/use-local-storage";
 import useWindowWidth from "~/hooks/use-window-width";
 import { cn, formatPrice } from "~/lib/utils";
 import { Product } from "~/types";
@@ -29,7 +29,7 @@ const ProductDetailModal = () => {
     useOrgContext();
 
   const [isLoading, startLoading] = useTransition();
-  const [org_id] = useLocalStorage<string>("current_orgid", "");
+  const { data: session } = useSession();
   const { winWidth } = useWindowWidth();
 
   useEffect(() => {
@@ -51,23 +51,27 @@ const ProductDetailModal = () => {
     });
 
     startLoading(() => {
-      deleteProduct(org_id, selectedProduct).then(async (data) => {
-        toast({
-          title: data.status === 200 ? `Product deleted` : "an error occurred",
-          description: (
-            <span>
-              <b>{product?.name}</b>{" "}
-              {data.status === 200 ? " has been deleted." : data.error}
-            </span>
-          ),
-          variant: "default",
-          className: "z-[99999]",
-        });
-        if (data.status === 200) {
-          updateOpen(false);
-          setIsDelete(false);
-        }
-      });
+      if (session?.currentOrgId === undefined) return;
+      deleteProduct(session?.currentOrgId, selectedProduct).then(
+        async (data) => {
+          toast({
+            title:
+              data.status === 200 ? `Product deleted` : "an error occurred",
+            description: (
+              <span>
+                <b>{product?.name}</b>{" "}
+                {data.status === 200 ? " has been deleted." : data.error}
+              </span>
+            ),
+            variant: "default",
+            className: "z-[99999]",
+          });
+          if (data.status === 200) {
+            updateOpen(false);
+            setIsDelete(false);
+          }
+        },
+      );
     });
   };
   const handleEditAction = (id: string) => {
diff --git a/src/app/dashboard/(user-dashboard)/products/_components/product-detail-view.tsx b/src/app/dashboard/(user-dashboard)/products/_components/product-detail-view.tsx
index 3c7b03b68..cfbf51e0f 100644
--- a/src/app/dashboard/(user-dashboard)/products/_components/product-detail-view.tsx
+++ b/src/app/dashboard/(user-dashboard)/products/_components/product-detail-view.tsx
@@ -2,6 +2,7 @@
 
 import { AnimatePresence, motion } from "framer-motion";
 import { X } from "lucide-react";
+import { useSession } from "next-auth/react";
 import { useRouter } from "next-nprogress-bar";
 import { useEffect, useTransition } from "react";
 
@@ -11,7 +12,6 @@ import LoadingSpinner from "~/components/miscellaneous/loading-spinner";
 import { Button } from "~/components/ui/button";
 import { toast } from "~/components/ui/use-toast";
 import { useOrgContext } from "~/contexts/orgContext";
-import { useLocalStorage } from "~/hooks/use-local-storage";
 import { cn, formatPrice } from "~/lib/utils";
 
 const ProductDetailView = () => {
@@ -28,7 +28,7 @@ const ProductDetailView = () => {
   const [isLoading, startTransition] = useTransition();
 
   const product = products.find((p) => p.id === selectedProduct);
-  const [org_id] = useLocalStorage<string>("current_orgid", "");
+  const { data: session } = useSession();
 
   const handleDelete = async () => {
     toast({
@@ -38,21 +38,24 @@ const ProductDetailView = () => {
     });
 
     startTransition(async () => {
-      await deleteProduct(org_id, selectedProduct).then((data) => {
-        if (data.status === 200) {
-          toast({
-            title: "Product deleted",
-            description: "Product deleted successfully.",
-          });
-        } else {
-          toast({
-            title: "Error",
-            description: data.error || "An unexpected error occurred.",
-            variant: "destructive",
-          });
-        }
-        setIsDelete(false);
-      });
+      if (session?.currentOrgId === undefined) return;
+      await deleteProduct(session?.currentOrgId, selectedProduct).then(
+        (data) => {
+          if (data.status === 200) {
+            toast({
+              title: "Product deleted",
+              description: "Product deleted successfully.",
+            });
+          } else {
+            toast({
+              title: "Error",
+              description: data.error || "An unexpected error occurred.",
+              variant: "destructive",
+            });
+          }
+          setIsDelete(false);
+        },
+      );
     });
   };
   const handleEditAction = (id: string) => {
diff --git a/src/app/dashboard/layout.tsx b/src/app/dashboard/layout.tsx
index 5c5cff5e4..84430821d 100644
--- a/src/app/dashboard/layout.tsx
+++ b/src/app/dashboard/layout.tsx
@@ -1,9 +1,41 @@
+import { getAllNotifications } from "~/actions/notifications/getAllNotifications";
+import { getAnalytics, getStatistics } from "~/actions/organization";
+import { getAllProduct } from "~/actions/product";
 import OrgContextProvider from "~/contexts/orgContext";
+import { auth } from "~/lib/auth";
 
-export default function GeneralLayout({
-  children,
-}: {
+interface GeneralLayoutProperties {
   children: React.ReactNode;
-}) {
-  return <OrgContextProvider>{children}</OrgContextProvider>;
+}
+
+export default async function GeneralLayout(
+  properties: GeneralLayoutProperties,
+) {
+  const session = await auth();
+
+  if (!session || !session.currentOrgId) {
+    return;
+  }
+
+  const { children } = properties;
+
+  const [notifications, statistics, analytics, products] = await Promise.all([
+    getAllNotifications(),
+    getStatistics(),
+    getAnalytics(),
+    getAllProduct(session?.currentOrgId),
+  ]);
+
+  return (
+    <OrgContextProvider
+      initialData={{
+        notifications: notifications?.data,
+        dashboardData: statistics?.data,
+        monthlyData: analytics?.data,
+        products: products.products,
+      }}
+    >
+      {children}
+    </OrgContextProvider>
+  );
 }
diff --git a/src/app/invite/page.tsx b/src/app/invite/page.tsx
index 61e1c1984..e03c03903 100644
--- a/src/app/invite/page.tsx
+++ b/src/app/invite/page.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { useRouter } from "next/navigation"; // Import from next/navigation
-import { useEffect } from "react";
+import { useCallback, useEffect } from "react";
 
 import { acceptInviteRequest } from "~/actions/inviteMembers";
 
@@ -12,12 +12,12 @@ const extractToken = () => {
     ? queryString
     : queryString.slice(0, Math.max(0, ampersandIndex));
 };
+
 const AcceptInvitePage = () => {
   const router = useRouter();
 
-  // Function to extract token from the query string
-
-  const handleAcceptInvite = async () => {
+  // Memoized function to handle invite acceptance
+  const handleAcceptInvite = useCallback(async () => {
     // Extract token using the function
     const token = extractToken();
 
@@ -56,12 +56,12 @@ const AcceptInvitePage = () => {
       // Handle unexpected errors
       router.push("/error?message=An unexpected error occurred");
     }
-  };
+  }, [router]);
 
   // Process the invite on page load
   useEffect(() => {
     handleAcceptInvite();
-  }, []);
+  }, [handleAcceptInvite]);
 
   return (
     <div className="flex h-[100vh] w-[100vw] items-center justify-center">
diff --git a/src/components/card/user-card.tsx b/src/components/card/user-card.tsx
index 8f37be0ac..ed6fac9af 100644
--- a/src/components/card/user-card.tsx
+++ b/src/components/card/user-card.tsx
@@ -1,10 +1,7 @@
-import axios from "axios";
 import { ChevronDown } from "lucide-react";
 import { signOut, useSession } from "next-auth/react";
 import Link from "next/link";
-import { useCallback, useEffect, useState } from "react";
 
-import { getApiUrl } from "~/actions/getApiUrl";
 import { Avatar, AvatarFallback, AvatarImage } from "~/components/ui/avatar";
 import {
   DropdownMenu,
@@ -16,7 +13,6 @@ import {
   DropdownMenuShortcut,
   DropdownMenuTrigger,
 } from "~/components/ui/dropdown-menu";
-import { toast } from "~/components/ui/use-toast";
 import { cn } from "~/lib/utils";
 
 const handleLogout = async () => {
@@ -27,55 +23,6 @@ const handleLogout = async () => {
 
 const UserCard = () => {
   const { data: session, status } = useSession();
-  const { user } = session ?? {};
-  const [profilePicUrl, setProfilePicUrl] = useState<string | undefined>("");
-
-  const fetchProfileData = useCallback(async () => {
-    if (status === "authenticated" && user?.id) {
-      try {
-        const baseUrl = await getApiUrl();
-        const API_URL = `${baseUrl}/api/v1/profile/${user.id}`;
-        const response = await axios.get(API_URL, {
-          headers: {
-            Authorization: `Bearer ${session?.access_token}`,
-          },
-        });
-        if (response.data?.data) {
-          const { avatar_url, profile_pic_url } = response.data.data;
-          setProfilePicUrl(avatar_url || profile_pic_url);
-        }
-      } catch {
-        toast({
-          title: "Error",
-          description: "Failed to fetch profile data.",
-          variant: "destructive",
-        });
-      }
-    }
-  }, [status, user?.id, session?.access_token]);
-
-  useEffect(() => {
-    fetchProfileData();
-    const handleProfileUpdate = (event: CustomEvent) => {
-      if (event.detail && event.detail.profilePicUrl) {
-        setProfilePicUrl(event.detail.profilePicUrl);
-      } else {
-        fetchProfileData();
-      }
-    };
-
-    window.addEventListener(
-      "userProfileUpdate",
-      handleProfileUpdate as EventListener,
-    );
-
-    return () => {
-      window.removeEventListener(
-        "userProfileUpdate",
-        handleProfileUpdate as EventListener,
-      );
-    };
-  }, [fetchProfileData]);
 
   return (
     <DropdownMenu>
@@ -91,11 +38,11 @@ const UserCard = () => {
           {status === "authenticated" && (
             <Avatar className="size-8 sm:size-10">
               <AvatarImage
-                src={`${profilePicUrl}?t=${Date.now()}`}
+                src={`${session.user.image}?t=${Date.now()}`}
                 alt="User Avatar"
               />
               <AvatarFallback className="bg-primary/30 uppercase">
-                {user?.first_name?.charAt(0)}
+                {session.user?.first_name?.charAt(0)}
               </AvatarFallback>
             </Avatar>
           )}
@@ -110,10 +57,10 @@ const UserCard = () => {
       </DropdownMenuTrigger>
       <DropdownMenuContent className="mr-1 w-56" align="end">
         <DropdownMenuLabel className="pb-0 pt-3">
-          {user?.first_name} {user?.last_name}
+          {session?.user?.first_name} {session?.user?.last_name}
         </DropdownMenuLabel>
         <span className="block px-2 pb-1 text-xs text-neutral-dark-1">
-          {user?.email ?? "Signed In"}
+          {session?.user?.email ?? "Signed In"}
         </span>
         <DropdownMenuSeparator />
         <DropdownMenuGroup>
diff --git a/src/components/common/contact-us-form/index.tsx b/src/components/common/contact-us-form/index.tsx
index 7609b15a6..1d8f692bc 100644
--- a/src/components/common/contact-us-form/index.tsx
+++ b/src/components/common/contact-us-form/index.tsx
@@ -1,13 +1,13 @@
 "use client";
 
 import { Mail } from "lucide-react";
+import { useSession } from "next-auth/react";
 import { useEffect, useState } from "react";
 import { z, ZodError } from "zod";
 
 import { getApiUrl } from "~/actions/getApiUrl";
 import { Toaster } from "~/components/ui/toaster";
 import { useToast } from "~/components/ui/use-toast";
-import { useLocalStorage } from "~/hooks/use-local-storage";
 import CustomButton from "../common-button/common-button";
 import InputField from "./inputfield";
 
@@ -44,7 +44,7 @@ const ContactForm: React.FC = () => {
   const [status, setStatus] = useState<boolean | undefined>();
   const [message, setMessage] = useState<string | undefined>();
   const [loading, setLoading] = useState<boolean>(false);
-  const [org_id] = useLocalStorage<string>("current_orgid", "");
+  const { data: session } = useSession();
   const { toast } = useToast();
 
   useEffect(() => {
@@ -72,22 +72,6 @@ const ContactForm: React.FC = () => {
     }
   };
 
-  function transformFormData(
-    formData: FormData,
-    orgId: string,
-  ): TransformedData {
-    // Create a new object with the required structure
-    const transformedData = {
-      full_name: formData.name,
-      email: formData.email,
-      phone_number: formData.phone,
-      message: formData.message,
-      org_id: orgId, // Pass orgId as a parameter or obtain it from your application context
-    };
-
-    return transformedData;
-  }
-
   const handleChange = (
     event: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>,
   ) => {
@@ -104,7 +88,13 @@ const ContactForm: React.FC = () => {
     }
     try {
       const baseUrl = await getApiUrl();
-      const apiData = transformFormData(formData, org_id);
+      const apiData: TransformedData = {
+        full_name: formData.name,
+        email: formData.email,
+        phone_number: formData.phone,
+        message: formData.message,
+        org_id: session?.currentOrgId ?? "",
+      };
       setLoading(true);
       const response = await fetch(`${baseUrl}/api/v1/contact`, {
         method: "POST",
diff --git a/src/components/layouts/navbar/mobile-navbar.tsx b/src/components/layouts/navbar/mobile-navbar.tsx
index e2b563661..c81c18627 100644
--- a/src/components/layouts/navbar/mobile-navbar.tsx
+++ b/src/components/layouts/navbar/mobile-navbar.tsx
@@ -1,19 +1,20 @@
 import "./menu.css";
 
 import { motion, stagger, useAnimate } from "framer-motion";
+import { useSession } from "next-auth/react";
 import { useTranslations } from "next-intl";
 import Link from "next/link";
 import { useEffect, useState } from "react";
 
-import { useUser } from "~/hooks/user/use-user";
 import { cn } from "~/lib/utils";
 import { NAV_LINKS } from "./links";
 
 export default function MobileNav() {
   const [open, setOpen] = useState(false);
   const [scope, animate] = useAnimate();
-  const { user } = useUser();
   const t = useTranslations();
+  const { data: session } = useSession();
+  const user = session?.user;
 
   // the stagger effect
   const staggerList = stagger(0.1, { startDelay: 0.25 });
@@ -26,7 +27,7 @@ export default function MobileNav() {
       "ul",
       {
         width: open ? 180 : 0,
-        height: open && user.email ? 140 : open ? 250 : 0,
+        height: open && user?.email ? 140 : open ? 250 : 0,
         opacity: open ? 1 : 0,
       },
       {
@@ -45,7 +46,7 @@ export default function MobileNav() {
         delay: open ? staggerList : 0,
       },
     );
-  }, [animate, open, staggerList, user.email]);
+  }, [animate, open, staggerList, user?.email]);
 
   return (
     <>
diff --git a/src/config/auth.config.ts b/src/config/auth.config.ts
index 44768ac63..3206ae8d7 100644
--- a/src/config/auth.config.ts
+++ b/src/config/auth.config.ts
@@ -43,6 +43,7 @@ export default {
         }
 
         const user = {
+          ...response.data,
           ...response.data.user,
           access_token: response.access_token,
         };
@@ -73,7 +74,7 @@ export default {
           return token;
         }
 
-        const response = await googleAuth({ id_token: account?.id_token });
+        const response = await googleAuth(account?.id_token);
 
         if (!response.data) {
           token = {
@@ -127,21 +128,16 @@ export default {
       const customToken = token as CustomJWT;
       session.user = {
         id: customToken.id as string,
-        first_name:
-          customToken.first_name ||
-          customToken.name?.split(" ")[0] ||
-          customToken.fullname?.split(" ")[0] ||
-          "",
-        last_name:
-          customToken.last_name ||
-          customToken.name?.split(" ").slice(1).join(" ") ||
-          customToken.fullname?.split(" ").slice(1).join(" ") ||
-          "",
-        image: token.picture || customToken.avatar_url || "",
-        role: customToken.role as string,
-        email: token.email as string,
+        first_name: customToken.first_name,
+        last_name: customToken.last_name,
+        image: customToken.avatar_url || "",
+        email: customToken.email as string,
       };
       session.access_token = customToken.access_token;
+      session.userOrg = customToken.organisations;
+      session.currentOrgId =
+        customToken.organisations &&
+        customToken.organisations[0]?.organisation_id;
 
       return session;
     },
diff --git a/src/contexts/orgContext.tsx b/src/contexts/orgContext.tsx
index 7a90aeecc..9712adfaa 100644
--- a/src/contexts/orgContext.tsx
+++ b/src/contexts/orgContext.tsx
@@ -1,27 +1,34 @@
 "use client";
 
+import { useSession } from "next-auth/react";
 import React, {
   createContext,
   useCallback,
   useContext,
   useEffect,
-  useLayoutEffect,
-  useMemo,
   useState,
-  useTransition,
 } from "react";
 
-import { getAllProduct } from "~/actions/product";
-import { useLocalStorage } from "~/hooks/use-local-storage";
 import { DashboardData, MonthlyData, Organisation, Product } from "~/types";
-import {
-  getAllOrg,
-  getAnalytics,
-  getStatistics,
-} from "../actions/organization";
 
 type ActiveFilter = "in stock" | "out of stock" | "preorder" | "all";
 
+interface NotificationPreview {
+  message: string;
+  created_at: string;
+  is_read: boolean;
+  id: string;
+}
+
+interface NotificationsData {
+  data: {
+    total_unread_notification_count: number;
+    total_notification_count: number;
+    notifications: NotificationPreview[];
+  };
+  message: string;
+}
+
 interface OrgContextProperties {
   organizations: Organisation[];
   isLoading: boolean;
@@ -41,96 +48,55 @@ interface OrgContextProperties {
   isActionModal: boolean;
   setIsActionModal: React.Dispatch<React.SetStateAction<boolean>>;
   switchOrganization: (orgId: string) => void;
+  notifications: NotificationsData | undefined;
+}
+
+interface SessionCheckerProperties {
+  children: React.ReactNode;
 }
 
 export const OrgContext = createContext({} as OrgContextProperties);
 
-const OrgContextProvider = ({ children }: { children: React.ReactNode }) => {
-  const [organizations, setOrganizations] = useState<Organisation[]>([]);
-  const [isLoading, startTransition] = useTransition();
-  const [monthlyData, setMonthlydata] = useState<MonthlyData | undefined>();
-  const [dashboardData, setDashboardData] = useState<
-    DashboardData | undefined
-  >();
-  const [products, setProducts] = useState<Product[]>([]);
-  const [org_id, setOrgId] = useLocalStorage<string>("current_orgid", "");
-  const [selectedProduct, setSelectedProduct] = useState<string>("");
+interface ProviderProperties {
+  children: React.ReactNode;
+  initialData: {
+    monthlyData?: MonthlyData;
+    dashboardData?: DashboardData;
+    products?: Product[];
+    notifications?: NotificationsData;
+  };
+}
+const OrgContextProvider = (properties: ProviderProperties) => {
+  const { children, initialData } = properties;
+
+  const monthlyData = initialData.monthlyData;
+  const dashboardData = initialData.dashboardData;
+  const products = initialData.products || [];
+  const notifications = initialData.notifications;
+
+  const { data: session, update, status } = useSession();
+
+  const [selectedProduct, setSelectedProduct] = useState("");
   const [isNewModal, setIsNewModal] = useState(false);
   const [isDelete, setIsDelete] = useState(false);
   const [isOpen, updateOpen] = useState(false);
   const [isActionModal, setIsActionModal] = useState(false);
   const [active_filter, setActive_filter] = useState<ActiveFilter>("all");
-  const [userOrg] = useLocalStorage<Organisation[]>("user_org", []);
-
   const isAnyModalOpen = isNewModal || isDelete || isOpen || isActionModal;
+  const isLoading = status === "loading";
 
   const switchOrganization = useCallback(
     (orgId: string) => {
-      setOrgId(orgId);
+      if (session) {
+        const updatedSession = { ...session, currentOrgId: orgId };
+        update(() => updatedSession);
+      }
     },
-    [setOrgId],
+    [session, update],
   );
-
-  useLayoutEffect(() => {
-    if (organizations.length === 0) {
-      startTransition(() => {
-        getAllOrg().then((data) => {
-          const fetchedOrganizations = (data && data.organization) || [];
-          const newOrganizations = fetchedOrganizations.filter(
-            (fetchedOrg: { organisation_id: string }) =>
-              !organizations.some(
-                (org) => org.organisation_id === fetchedOrg.organisation_id,
-              ),
-          );
-
-          if (newOrganizations.length > 0) {
-            setOrganizations((previousOrganizations) => [
-              ...previousOrganizations,
-              ...newOrganizations,
-            ]);
-          }
-        });
-
-        getStatistics().then((subResponse) => {
-          setDashboardData(subResponse.data);
-        });
-
-        getAnalytics().then((data) => {
-          if (data && data.data) {
-            const formattedData: MonthlyData = Object.keys(data.data).map(
-              (key) => ({
-                month: key,
-                revenue: data.data[key],
-              }),
-            );
-            setMonthlydata(formattedData);
-          }
-        });
-      });
-    }
-  }, [organizations]);
-
-  useEffect(() => {
-    if (userOrg.length > 0) {
-      const uniqueOrgs = userOrg.filter(
-        (org) =>
-          !organizations.some(
-            (existingOrg) =>
-              existingOrg.organisation_id === org.organisation_id,
-          ),
-      );
-      setOrganizations((previousOrganizations) => [
-        ...previousOrganizations,
-        ...uniqueOrgs,
-      ]);
-    }
-  }, [userOrg, organizations]);
-
   useEffect(() => {
-    document.body.style.overflow = isAnyModalOpen ? "hidden" : "auto";
-
-    const handleKeyDown = (entries: KeyboardEvent) => {
-      if (entries.key === "Escape") {
+    const handleKeyDown = (event: KeyboardEvent) => {
+      if (event.key === "Escape") {
         setIsNewModal(false);
         setIsDelete(false);
         updateOpen(false);
@@ -138,60 +104,46 @@ const OrgContextProvider = ({ children }: { children: React.ReactNode }) => {
       }
     };
 
+    document.body.style.overflow = isAnyModalOpen ? "hidden" : "auto";
     document.addEventListener("keydown", handleKeyDown);
-
-    return () => {
-      document.removeEventListener("keydown", handleKeyDown);
-    };
+    return () => document.removeEventListener("keydown", handleKeyDown);
   }, [isAnyModalOpen]);
 
-  useLayoutEffect(() => {
-    if (!org_id || org_id === undefined) return;
-    startTransition(() => {
-      getAllProduct(org_id).then((data) => {
-        setProducts(data.products || []);
-      });
-    });
-  }, [org_id]);
+  function SessionChecker({ children }: SessionCheckerProperties) {
+    if (status === "loading") {
+      return <div>Loading...</div>;
+    }
 
-  const value = useMemo(
-    () => ({
-      isLoading,
-      organizations,
-      monthlyData,
-      dashboardData,
-      products,
-      selectedProduct,
-      setSelectedProduct,
-      isNewModal,
-      setIsNewModal,
-      isDelete,
-      setIsDelete,
-      isOpen,
-      updateOpen,
-      isActionModal,
-      setIsActionModal,
-      active_filter,
-      setActive_filter,
-      switchOrganization,
-    }),
-    [
-      isLoading,
-      organizations,
-      monthlyData,
-      dashboardData,
-      products,
-      selectedProduct,
-      isNewModal,
-      isDelete,
-      isOpen,
-      isActionModal,
-      active_filter,
-      switchOrganization,
-    ],
-  );
+    return <>{children}</>;
+  }
 
-  return <OrgContext.Provider value={value}>{children}</OrgContext.Provider>;
+  return (
+    <OrgContext.Provider
+      value={{
+        isLoading,
+        organizations: session?.userOrg || [],
+        monthlyData,
+        dashboardData,
+        products,
+        selectedProduct,
+        setSelectedProduct,
+        isNewModal,
+        setIsNewModal,
+        isDelete,
+        setIsDelete,
+        isOpen,
+        updateOpen,
+        isActionModal,
+        setIsActionModal,
+        active_filter,
+        setActive_filter,
+        switchOrganization,
+        notifications,
+      }}
+    >
+      <SessionChecker>{children}</SessionChecker>
+    </OrgContext.Provider>
+  );
 };
 
 export const useOrgContext = () => {
@@ -204,234 +156,3 @@ export const useOrgContext = () => {
 };
 
 export default OrgContextProvider;
-
-// "use client";
-
-// import React, {
-//   createContext,
-//   useContext,
-//   useEffect,
-//   useLayoutEffect,
-//   useMemo,
-//   useReducer,
-//   useTransition,
-// } from "react";
-
-// import { getAllProduct } from "~/actions/product";
-// import { useLocalStorage } from "~/hooks/use-local-storage";
-// import { DashboardData, MonthlyData, Organisation, Product } from "~/types";
-// import {
-//   getAllOrg,
-//   getAnalytics,
-//   getStatistics,
-// } from "../actions/organization";
-
-// type ActiveFilter = "in stock" | "out of stock" | "preorder" | "all";
-
-// interface OrgState {
-//   organizations: Organisation[];
-//   isLoading: boolean;
-//   monthlyData: MonthlyData | undefined;
-//   dashboardData: DashboardData | undefined;
-//   products: Product[];
-//   selectedProduct: string;
-//   isNewModal: boolean;
-//   isDelete: boolean;
-//   isOpen: boolean;
-//   isActionModal: boolean;
-//   active_filter: ActiveFilter;
-// }
-
-// type OrgAction =
-//   | { type: "SET_ORGANIZATIONS"; payload: Organisation[] }
-//   | { type: "SET_LOADING"; payload: boolean }
-//   | { type: "SET_MONTHLY_DATA"; payload: MonthlyData | undefined }
-//   | { type: "SET_DASHBOARD_DATA"; payload: DashboardData | undefined }
-//   | { type: "SET_PRODUCTS"; payload: Product[] }
-//   | { type: "SET_SELECTED_PRODUCT"; payload: string }
-//   | { type: "TOGGLE_NEW_MODAL"; payload: boolean }
-//   | { type: "TOGGLE_DELETE"; payload: boolean }
-//   | { type: "TOGGLE_OPEN"; payload: boolean }
-//   | { type: "TOGGLE_ACTION_MODAL"; payload: boolean }
-//   | { type: "SET_ACTIVE_FILTER"; payload: ActiveFilter };
-
-// const initialState: OrgState = {
-//   organizations: [],
-//   isLoading: false,
-//   monthlyData: undefined,
-//   dashboardData: undefined,
-//   products: [],
-//   selectedProduct: "",
-//   isNewModal: false,
-//   isDelete: false,
-//   isOpen: false,
-//   isActionModal: false,
-//   active_filter: "all",
-// };
-
-// function orgReducer(state: OrgState, action: OrgAction): OrgState {
-//   switch (action.type) {
-//     case "SET_ORGANIZATIONS": {
-//       return { ...state, organizations: action.payload };
-//     }
-//     case "SET_LOADING": {
-//       return { ...state, isLoading: action.payload };
-//     }
-//     case "SET_MONTHLY_DATA": {
-//       return { ...state, monthlyData: action.payload };
-//     }
-//     case "SET_DASHBOARD_DATA": {
-//       return { ...state, dashboardData: action.payload };
-//     }
-//     case "SET_PRODUCTS": {
-//       return { ...state, products: action.payload };
-//     }
-//     case "SET_SELECTED_PRODUCT": {
-//       return { ...state, selectedProduct: action.payload };
-//     }
-//     case "TOGGLE_NEW_MODAL": {
-//       return { ...state, isNewModal: action.payload };
-//     }
-//     case "TOGGLE_DELETE": {
-//       return { ...state, isDelete: action.payload };
-//     }
-//     case "TOGGLE_OPEN": {
-//       return { ...state, isOpen: action.payload };
-//     }
-//     case "TOGGLE_ACTION_MODAL": {
-//       return { ...state, isActionModal: action.payload };
-//     }
-//     case "SET_ACTIVE_FILTER": {
-//       return { ...state, active_filter: action.payload };
-//     }
-//     default: {
-//       return state;
-//     }
-//   }
-// }
-
-// export const OrgContext = createContext<{
-//   state: OrgState;
-//   dispatch: React.Dispatch<OrgAction>;
-// }>({ state: initialState, dispatch: () => {} });
-
-// const OrgContextProvider = ({ children }: { children: React.ReactNode }) => {
-//   const [state, dispatch] = useReducer(orgReducer, initialState);
-//   const [, startTransition] = useTransition();
-//   const [org_id] = useLocalStorage<string>("current_orgid", "");
-//   const [userOrg] = useLocalStorage<Organisation[]>("user_org", []);
-
-//   const isAnyModalOpen =
-//     state.isNewModal || state.isDelete || state.isOpen || state.isActionModal;
-
-//   useLayoutEffect(() => {
-//     if (state.organizations.length === 0) {
-//       startTransition(() => {
-//         getAllOrg().then((data) => {
-//           const fetchedOrganizations = data.organization || [];
-//           const newOrganizations = fetchedOrganizations.filter(
-//             (fetchedOrg: { organisation_id: string }) =>
-//               !state.organizations.some(
-//                 (org) => org.organisation_id === fetchedOrg.organisation_id,
-//               ),
-//           );
-
-//           if (newOrganizations.length > 0) {
-//             dispatch({
-//               type: "SET_ORGANIZATIONS",
-//               payload: [...state.organizations, ...newOrganizations],
-//             });
-//           }
-//         });
-
-//         getStatistics().then((subResponse) => {
-//           dispatch({
-//             type: "SET_DASHBOARD_DATA",
-//             payload: subResponse.data,
-//           });
-//         });
-
-//         getAnalytics().then((data) => {
-//           const formattedData: MonthlyData = Object.keys(data.data).map(
-//             (key) => ({
-//               month: key,
-//               revenue: data.data[key],
-//             }),
-//           );
-//           dispatch({
-//             type: "SET_MONTHLY_DATA",
-//             payload: formattedData,
-//           });
-//         });
-//       });
-//     }
-//   }, [state.organizations]);
-
-//   useEffect(() => {
-//     if (userOrg.length > 0) {
-//       const uniqueOrgs = userOrg.filter(
-//         (org) =>
-//           !state.organizations.some(
-//             (existingOrg) =>
-//               existingOrg.organisation_id === org.organisation_id,
-//           ),
-//       );
-//       dispatch({
-//         type: "SET_ORGANIZATIONS",
-//         payload: [...state.organizations, ...uniqueOrgs],
-//       });
-//     }
-//   }, [userOrg]);
-
-//   useEffect(() => {
-//     document.body.style.overflow = isAnyModalOpen ? "hidden" : "auto";
-
-//     const handleKeyDown = (entries: KeyboardEvent) => {
-//       if (entries.key === "Escape") {
-//         dispatch({ type: "TOGGLE_NEW_MODAL", payload: false });
-//         dispatch({ type: "TOGGLE_DELETE", payload: false });
-//         dispatch({ type: "TOGGLE_OPEN", payload: false });
-//         dispatch({ type: "TOGGLE_ACTION_MODAL", payload: false });
-//       }
-//     };
-
-//     document.addEventListener("keydown", handleKeyDown);
-
-//     return () => {
-//       document.removeEventListener("keydown", handleKeyDown);
-//     };
-//   }, [isAnyModalOpen]);
-
-//   useLayoutEffect(() => {
-//     if (!org_id || org_id === undefined) return;
-//     startTransition(() => {
-//       getAllProduct(org_id).then((data) => {
-//         dispatch({
-//           type: "SET_PRODUCTS",
-//           payload: data.products || [],
-//         });
-//       });
-//     });
-//   }, [org_id]);
-
-//   const value = useMemo(
-//     () => ({
-//       state,
-//       dispatch,
-//     }),
-//     [state],
-//   );
-
-//   return <OrgContext.Provider value={value}>{children}</OrgContext.Provider>;
-// };
-
-// export const useOrgContext = () => {
-//   const context = useContext(OrgContext);
-
-//   if (!context) {
-//     throw new Error("useOrgContext must be used within a OrgContextProvider");
-//   }
-//   return context;
-// };
-
-// export default OrgContextProvider;
diff --git a/src/lib/auth.ts b/src/lib/auth.ts
index 18de73deb..347e07c7c 100644
--- a/src/lib/auth.ts
+++ b/src/lib/auth.ts
@@ -1,7 +1,7 @@
 import NextAuth, { type DefaultSession } from "next-auth";
 
 import authConfig from "~/config/auth.config";
-import { User } from "~/types";
+import { Organisation, User } from "~/types";
 
 export const {
   handlers: { GET, POST },
@@ -19,11 +19,12 @@ declare module "next-auth" {
       last_name: User["last_name"];
       email: User["email"];
       image: User["avatar_url"];
-      role: User["role"];
       bio?: string;
       username?: string;
       is_superadmin?: boolean;
     } & DefaultSession["user"];
     access_token?: string;
+    currentOrgId?: string;
+    userOrg?: Organisation[];
   }
 }
diff --git a/src/test/blog/comment/comment-body.test.tsx b/src/test/blog/comment/comment-body.test.tsx
index 4fac54610..a486ccbf1 100644
--- a/src/test/blog/comment/comment-body.test.tsx
+++ b/src/test/blog/comment/comment-body.test.tsx
@@ -13,7 +13,6 @@ describe("comment body component", () => {
       last_name: "User",
       email: "user@example.com",
       image: "path/to/image",
-      role: "user",
     },
     access_token: "some-token",
     expires: "1",
@@ -35,6 +34,7 @@ describe("comment body component", () => {
         onLike={vi.fn()}
         onDislike={vi.fn()}
         onReply={vi.fn()}
+        isReplyActive={false}
       />,
     );
     expect(screen.getByTestId("comment-text")).toHaveTextContent(
@@ -64,6 +64,7 @@ describe("comment body component", () => {
         dislikes={0}
         onLike={mockOnLike}
         onDislike={mockOnDislike}
+        isReplyActive={false}
       />,
     );
 
@@ -93,6 +94,7 @@ describe("comment body component", () => {
         dislikes={3}
         onLike={vi.fn()}
         onDislike={vi.fn()}
+        isReplyActive={false}
       />,
     );
 
@@ -118,6 +120,7 @@ describe("comment body component", () => {
         onLike={vi.fn()}
         onDislike={vi.fn()}
         onReply={vi.fn()}
+        isReplyActive={false}
       />,
     );
 
@@ -142,6 +145,7 @@ describe("comment body component", () => {
         onLike={vi.fn()}
         onDislike={vi.fn()}
         onReply={vi.fn()}
+        isReplyActive={false}
       />,
     );
     expect(
diff --git a/src/test/blog/comment/comment-reply.test.tsx b/src/test/blog/comment/comment-reply.test.tsx
index ce980678e..9af91c8be 100644
--- a/src/test/blog/comment/comment-reply.test.tsx
+++ b/src/test/blog/comment/comment-reply.test.tsx
@@ -12,7 +12,6 @@ describe("comment reply component", () => {
       last_name: "User",
       email: "user@example.com",
       image: "path/to/image",
-      role: "user",
     },
     access_token: "some-token",
     expires: "1",
diff --git a/src/test/blog/comment/index.test.tsx b/src/test/blog/comment/index.test.tsx
index 47dc199bd..afc19231d 100644
--- a/src/test/blog/comment/index.test.tsx
+++ b/src/test/blog/comment/index.test.tsx
@@ -15,7 +15,6 @@ describe("comment box component", () => {
       last_name: "User",
       email: "user@example.com",
       image: "path/to/image",
-      role: "user",
     },
     access_token: "some-token",
     expires: "2100-01-01T00:00:00.000Z",
diff --git a/src/types/index.d.ts b/src/types/index.d.ts
index 6d117589b..a847ac733 100644
--- a/src/types/index.d.ts
+++ b/src/types/index.d.ts
@@ -6,24 +6,24 @@ export interface CustomJWT extends JWT {
   email?: string;
   picture?: string;
   avatar_url?: string;
-  role?: string;
   first_name?: string;
   last_name?: string;
   fullname?: string;
   access_token?: string;
+  organisations?: Organisation[];
 }
 export interface CustomSession extends Session {
   user: {
     id: string;
-    name: string;
     first_name: string;
     last_name: string;
     email: string;
     image: string;
-    role: string;
   };
   expires: DefaultSession["expires"];
   access_token?: string;
+  currentOrgId?: string;
+  userOrg?: Organisation[];
 }
 
 export interface User {

From 6e3c8ce0ccf55961b87bea11bd0179fa700d7c5f Mon Sep 17 00:00:00 2001
From: Prudent Bird <prudentbird@gmail.com>
Date: Sat, 24 Aug 2024 19:39:50 +0100
Subject: [PATCH 37/58] chore: fixed test errors

---
 .../forgot-password/page.test.tsx             | 45 +++++++++----------
 .../(landing-routes)/contact-us/page.test.tsx | 12 ++++-
 src/test/contact.test.tsx                     | 17 +++++--
 3 files changed, 45 insertions(+), 29 deletions(-)

diff --git a/src/app/(auth-routes)/forgot-password/page.test.tsx b/src/app/(auth-routes)/forgot-password/page.test.tsx
index 2381a2d7f..e3aebf1db 100644
--- a/src/app/(auth-routes)/forgot-password/page.test.tsx
+++ b/src/app/(auth-routes)/forgot-password/page.test.tsx
@@ -1,5 +1,4 @@
-import { fireEvent, render, screen, waitFor } from "@testing-library/react";
-
+import { fireEvent, render, screen, waitFor, act } from "@testing-library/react";
 import ForgotPassword from "./page";
 
 vi.mock("next/link", () => ({
@@ -12,13 +11,8 @@ describe("forgot password page", () => {
     render(<ForgotPassword />);
 
     expect(screen.getByText(/forgot password/i)).toBeInTheDocument();
-
     expect(screen.getByText(/enter the email address/i)).toBeInTheDocument();
-
-    expect(
-      screen.getByPlaceholderText(/enter your email/i),
-    ).toBeInTheDocument();
-
+    expect(screen.getByPlaceholderText(/enter your email/i)).toBeInTheDocument();
     expect(screen.getByText(/send/i)).toBeInTheDocument();
   });
 
@@ -30,15 +24,15 @@ describe("forgot password page", () => {
     const emailInput = screen.getByPlaceholderText(/enter your email/i);
     const sendButton = screen.getByText(/send/i);
 
-    fireEvent.change(emailInput, {
-      target: { value: "unregistered@example.com" },
+    await act(async () => {
+      fireEvent.change(emailInput, {
+        target: { value: "unregistered@example.com" },
+      });
+      fireEvent.click(sendButton);
     });
-    fireEvent.click(sendButton);
 
     await waitFor(() => {
-      expect(
-        screen.getByText(/this email doesn't match our records/i),
-      ).toBeInTheDocument();
+      expect(screen.getByText(/this email doesn't match our records/i)).toBeInTheDocument();
     });
   });
 
@@ -49,10 +43,12 @@ describe("forgot password page", () => {
     const emailInput = screen.getByPlaceholderText(/enter your email/i);
     const sendButton = screen.getByText(/send/i);
 
-    fireEvent.change(emailInput, {
-      target: { value: "invalid-email@example.com" },
+    await act(async () => {
+      fireEvent.change(emailInput, {
+        target: { value: "invalid-email@example.com" },
+      });
+      fireEvent.click(sendButton);
     });
-    fireEvent.click(sendButton);
 
     await waitFor(() => {
       expect(screen.queryByText("Verification Code")).not.toBeInTheDocument();
@@ -65,17 +61,16 @@ describe("forgot password page", () => {
 
     const emailInput = screen.getByPlaceholderText(/enter your email/i);
     const sendButton = screen.getByText(/send/i);
-    fireEvent.change(emailInput, {
-      target: { value: "invalid-email" },
+
+    await act(async () => {
+      fireEvent.change(emailInput, {
+        target: { value: "invalid-email" },
+      });
+      fireEvent.click(sendButton);
     });
-    fireEvent.click(sendButton);
 
     await waitFor(() => {
-      expect(
-        screen.getByText(
-          "This email doesn't match our records please try again",
-        ),
-      ).toBeInTheDocument();
+      expect(screen.getByText("This email doesn't match our records please try again")).toBeInTheDocument();
     });
   });
 });
diff --git a/src/app/(landing-routes)/contact-us/page.test.tsx b/src/app/(landing-routes)/contact-us/page.test.tsx
index dea52ad56..1c664c4ba 100644
--- a/src/app/(landing-routes)/contact-us/page.test.tsx
+++ b/src/app/(landing-routes)/contact-us/page.test.tsx
@@ -1,11 +1,21 @@
 import { render } from "~/test/utils";
 import Page from "./page";
+import { SessionProvider } from "next-auth/react";
+import { ReactNode } from 'react';
 
 describe("page tests", () => {
+
+  const renderWithSession = (component: ReactNode) => {
+    return render(
+      <SessionProvider session={null}>
+        {component}
+      </SessionProvider>
+    );
+  };
   it("should render correctly", () => {
     expect.assertions(1);
 
-    render(<Page />);
+    renderWithSession(<Page />);
 
     expect(true).toBeTruthy();
   });
diff --git a/src/test/contact.test.tsx b/src/test/contact.test.tsx
index f5e2ef608..658e6e659 100644
--- a/src/test/contact.test.tsx
+++ b/src/test/contact.test.tsx
@@ -1,11 +1,22 @@
 import { fireEvent, render, screen, waitFor } from "@testing-library/react";
+import { SessionProvider } from "next-auth/react";
+import { ReactNode } from "react";
 
 import Contact from "~/app/(landing-routes)/contact-us/page";
 
 describe("contact Page tests", () => {
+
+  const renderWithSession = (component: ReactNode) => {
+    return render(
+      <SessionProvider session={null}>
+        {component}
+      </SessionProvider>
+    );
+  };
+
   it("should render the Contact Us form and content card correctly", () => {
     expect.assertions(4);
-    render(<Contact />);
+    renderWithSession(<Contact />);
 
     expect(screen.getByRole("form")).toBeInTheDocument();
 
@@ -18,7 +29,7 @@ describe("contact Page tests", () => {
 
   it("should validate the form inputs correctly", async () => {
     expect.assertions(1);
-    render(<Contact />);
+    renderWithSession(<Contact />);
 
     fireEvent.change(screen.getByLabelText(/email/i), {
       target: { value: "invalid-email" },
@@ -32,7 +43,7 @@ describe("contact Page tests", () => {
 
   it("should be responsive", () => {
     expect.assertions(2);
-    render(<Contact />);
+    renderWithSession(<Contact />);
 
     window.innerWidth = 320;
     window.dispatchEvent(new Event("resize"));

From 25e4a043596ff5db1cf3cfb9255d424db1b0e9c8 Mon Sep 17 00:00:00 2001
From: Prudent Bird <prudentbird@gmail.com>
Date: Sat, 24 Aug 2024 19:43:52 +0100
Subject: [PATCH 38/58] chore: fixed lint errors

---
 .../forgot-password/page.test.tsx             | 45 ++++++++++---------
 .../(landing-routes)/contact-us/page.test.tsx | 10 ++---
 src/test/contact.test.tsx                     |  5 +--
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/app/(auth-routes)/forgot-password/page.test.tsx b/src/app/(auth-routes)/forgot-password/page.test.tsx
index e3aebf1db..2381a2d7f 100644
--- a/src/app/(auth-routes)/forgot-password/page.test.tsx
+++ b/src/app/(auth-routes)/forgot-password/page.test.tsx
@@ -1,4 +1,5 @@
-import { fireEvent, render, screen, waitFor, act } from "@testing-library/react";
+import { fireEvent, render, screen, waitFor } from "@testing-library/react";
+
 import ForgotPassword from "./page";
 
 vi.mock("next/link", () => ({
@@ -11,8 +12,13 @@ describe("forgot password page", () => {
     render(<ForgotPassword />);
 
     expect(screen.getByText(/forgot password/i)).toBeInTheDocument();
+
     expect(screen.getByText(/enter the email address/i)).toBeInTheDocument();
-    expect(screen.getByPlaceholderText(/enter your email/i)).toBeInTheDocument();
+
+    expect(
+      screen.getByPlaceholderText(/enter your email/i),
+    ).toBeInTheDocument();
+
     expect(screen.getByText(/send/i)).toBeInTheDocument();
   });
 
@@ -24,15 +30,15 @@ describe("forgot password page", () => {
     const emailInput = screen.getByPlaceholderText(/enter your email/i);
     const sendButton = screen.getByText(/send/i);
 
-    await act(async () => {
-      fireEvent.change(emailInput, {
-        target: { value: "unregistered@example.com" },
-      });
-      fireEvent.click(sendButton);
+    fireEvent.change(emailInput, {
+      target: { value: "unregistered@example.com" },
     });
+    fireEvent.click(sendButton);
 
     await waitFor(() => {
-      expect(screen.getByText(/this email doesn't match our records/i)).toBeInTheDocument();
+      expect(
+        screen.getByText(/this email doesn't match our records/i),
+      ).toBeInTheDocument();
     });
   });
 
@@ -43,12 +49,10 @@ describe("forgot password page", () => {
     const emailInput = screen.getByPlaceholderText(/enter your email/i);
     const sendButton = screen.getByText(/send/i);
 
-    await act(async () => {
-      fireEvent.change(emailInput, {
-        target: { value: "invalid-email@example.com" },
-      });
-      fireEvent.click(sendButton);
+    fireEvent.change(emailInput, {
+      target: { value: "invalid-email@example.com" },
     });
+    fireEvent.click(sendButton);
 
     await waitFor(() => {
       expect(screen.queryByText("Verification Code")).not.toBeInTheDocument();
@@ -61,16 +65,17 @@ describe("forgot password page", () => {
 
     const emailInput = screen.getByPlaceholderText(/enter your email/i);
     const sendButton = screen.getByText(/send/i);
-
-    await act(async () => {
-      fireEvent.change(emailInput, {
-        target: { value: "invalid-email" },
-      });
-      fireEvent.click(sendButton);
+    fireEvent.change(emailInput, {
+      target: { value: "invalid-email" },
     });
+    fireEvent.click(sendButton);
 
     await waitFor(() => {
-      expect(screen.getByText("This email doesn't match our records please try again")).toBeInTheDocument();
+      expect(
+        screen.getByText(
+          "This email doesn't match our records please try again",
+        ),
+      ).toBeInTheDocument();
     });
   });
 });
diff --git a/src/app/(landing-routes)/contact-us/page.test.tsx b/src/app/(landing-routes)/contact-us/page.test.tsx
index 1c664c4ba..5c4112890 100644
--- a/src/app/(landing-routes)/contact-us/page.test.tsx
+++ b/src/app/(landing-routes)/contact-us/page.test.tsx
@@ -1,15 +1,13 @@
+import { SessionProvider } from "next-auth/react";
+import { ReactNode } from "react";
+
 import { render } from "~/test/utils";
 import Page from "./page";
-import { SessionProvider } from "next-auth/react";
-import { ReactNode } from 'react';
 
 describe("page tests", () => {
-
   const renderWithSession = (component: ReactNode) => {
     return render(
-      <SessionProvider session={null}>
-        {component}
-      </SessionProvider>
+      <SessionProvider session={undefined}>{component}</SessionProvider>,
     );
   };
   it("should render correctly", () => {
diff --git a/src/test/contact.test.tsx b/src/test/contact.test.tsx
index 658e6e659..c0847a0e7 100644
--- a/src/test/contact.test.tsx
+++ b/src/test/contact.test.tsx
@@ -5,12 +5,9 @@ import { ReactNode } from "react";
 import Contact from "~/app/(landing-routes)/contact-us/page";
 
 describe("contact Page tests", () => {
-
   const renderWithSession = (component: ReactNode) => {
     return render(
-      <SessionProvider session={null}>
-        {component}
-      </SessionProvider>
+      <SessionProvider session={undefined}>{component}</SessionProvider>,
     );
   };
 

From a4742d636be0c9c846733364bf2f36d413f4e743 Mon Sep 17 00:00:00 2001
From: "Emma F. Mkpurunchi" <mkpurunchiemma@gmail.com>
Date: Sat, 24 Aug 2024 20:12:32 +0100
Subject: [PATCH 39/58] feature: implemented product card

---
 public/images/productimage.png                | Bin 0 -> 58582 bytes
 .../_components/productcadrcomponent.tsx      |  51 ++++++++++++++++++
 .../products/productcard/page.tsx             |  18 +++++++
 3 files changed, 69 insertions(+)
 create mode 100644 public/images/productimage.png
 create mode 100644 src/app/dashboard/(user-dashboard)/products/_components/productcadrcomponent.tsx
 create mode 100644 src/app/dashboard/(user-dashboard)/products/productcard/page.tsx

diff --git a/public/images/productimage.png b/public/images/productimage.png
new file mode 100644
index 0000000000000000000000000000000000000000..55cef508ef60d2a6816ffe2e5b35aa90329ddc88
GIT binary patch
literal 58582
zcmV(`K-0g8P)<h;3K|Lk000e1NJLTq007hg0043b1^@s6E1Uo800009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH<ZDSpK~#7Fr2Sd2
zW$ASuh^;-Gc|PaPbIzGHSD}CcK#%|diX<qJl+==1j?fhCi0;-?Lsr-w9e!x}$>9fw
z{pJU^Wy#@at1X2rN-{-CA_bC|3qZ|PIp>|HGtcMjvA=Kq``k=WY(=Y?z^%-@dF~nZ
z{?}UH`qo<CvgAMTtBPMDv#S0jo0aVU#N%c&{yYDm55reg*4C={J!}4L)|2yIPkQ)^
zJ_jGe|KZ>F@Yg-O!mqrsCU5Mn;YE`t!sD~mtCvomxT-%q({HXy_3qcCmo<;C&d%lh
z2fr)X9)3T#FVzZO|Lzz0DP;ft`*=TVvbMK|r`^X(;8m*?eXid51DT!w0Dtbu+8e)$
z|E}Wg&Smdw{{^2F&-cFU|FgftM@sdLzbgB``#aM6o%iMa^O^ju|N2|<{>6QH<DETu
zpWpuho*N%#?^oX7#nbmZ!)HF<KR4H=x~8xB{vW)re?LDzm$_b^nSLhzNbiMf$bVnM
z^;qS5U)#eqoax{9@9#@r%thy8_-k!%@9JhOo`b*hQUBHd@&6{g@_*;Q`ETU@`|ryv
z`Po@=|FZg>#r;jbJA2^<XP^Ie^_4Y0-@Cf`@+Y2;*$YoJ`}ZC(!@bYSU3^um=HIHg
zMpb<FRh*w5uMf@+KTPkur)P=R&^$IP8T|a*{FG$)Jv?BJb1=it>9Ny)dH$(*FL)Mb
zSLZOBoKf5({gSJ%|In{&cGlx@{*(UA{o~&#R<mETZRc;=mi6Z?E3Dd*7R$0Ej$#SL
z65F;#ViEki*p4IkmSl6GgmENx&JhRSvz<sr!-)j*Kq5SNIGxI9G7}q*5!VqnvL&`-
zytpM{J|*Q!UQ+3@#D%=%iv|2#EPkPc7s-n4`Vysm{T=T|VmFoyUN$Ub#CLFEas`Q<
zHL(jDQhPNJ@97^(EgVQbUy!jsm!++eZ2Q}|3HW>SsW{<WqQY1lDa+LFOQBMcXtXBN
zR#Qe#K9;E3m-N!-#gFmHQ+T1mrZ|naWccWxOLp9n^{@OHxqSDTY)nOd>+k<}Qn|e>
z{mrZt?2NQ<cjsLkp@Rd-S{=!xcO;d~i@#*c8NQbq<Na)0ms&lP=E0flZ0E$oH3`-W
z(zzT;CTGiApWBrnoJgs<EK#^2^YKVpXB|0y@}3-@P2~P4kgSuEmp*?_TAhwatsp~O
z>;CDf1hymTYzD7wNhYvl8`m<oc}*ODBIR;f{?6a}oAO)#G%r7V|HpDZ7>n)WcHnmU
z5$~s`httLVwQ#R3+#lRp{EqKM=AfkT<=~qZE{lzCW^ffZ8g+4UMLD~`;SWQc4NK2a
zif02SCS|$!Jot=ZEDl}}Pc5m)6&w|*)v{7f;otB|DYq({*Y~8hwk}Kc70HA%iM)|a
zIuluLH00E`<f1c`ObYMM%1Oq>JDN=;9r+SxhWLzv=k_Fp&+VnM5>2L(P2(LFauVZx
zIrEvMaV}?k^LTGFT=z82X5f2zMlB0}77y3Z#dF&d`uMW&-s}jU*%B*`^>fAeeKvP-
z?yP-WsBhyY{U2b9`wRPVUNokawWa?y2!nrs&-aFHTUm>jl*WULoX%vVR4Pd!my>il
zt>2517jYb$55vW`C6~`i4pyIn;l%tOjVPAq|DH`t1<z9{SEP{5NiCC-?Mg<jEfr;b
zwT1&&G>^rdbn$1L9bAwx-bnyMg$btkWl01tmWH=V=gQ)^HL=q0QpLKsg|bY7xwL!7
zGEe2CzWIt+qn;f9@VDjSlOISi$LHmV!28EroBLylaAQh1IAP~Q9I~F|x4$Oo)z@Sm
zrNzaKb7w7?J^ilC22Ui)Uz1GZh74ish0VK?UEh?=oedeoD^4yi#a_Q5vbhUmPfHGm
zxKzsEn($6cr4BFZq&>;IGl_$)Y+ujI@_GrMqb}w371_DIBI{dtunj{mrEuUXQmq%H
zSWbzJ&+kvhlEr5)6|%B*^R_rJR&O@K0rdrEMf%;5l=0bkm|Pr=$Qw()-<N}D&*a_j
z{Sh3>sjQXK^2RH-<#X?RL1x2|c+;79b5D4;c)$ucJXzb4YFeb8!E3pe6mWlwxIQHu
z<|6J#0cRQCmN0+;*=bo_-_q-eyMpr-;=0n2Mru^~bP9$DCxFM7@t+3%zJl|!Ua)0v
z2?hlRSuNJ&o4@gw<uCtd|AlPaxB~}UlpEJJ<=yXoTVj7E4i3b8JQLriQPR<+#Kn7w
zyeXo~1kOMtjr(NB0i5v^QEDnYc2<h#)Pd2=VIa63fsa4?_`GwO;xl_b9`AYT2!{A9
z{m_yLzWfNMjc1$3AC5)6K=Mn^rX*oetT$rI{#!Wf=RpvC@G}wWFaG(z^xvLeoc_Jz
zvqR|(yKpqdLpd(qJl<3;L$8pAp}6>-gAeD+1d(U%(XT~n;d%l2IDFug!^he9ur}Vf
zuRj~$1eeMM7*kcMFenFaw2XsR%uQjGa~vAn3_R8fUHp7eEdD%RJBAB&=`|z7;y90s
z#rKhdfoAYobNC$>4i_M{%Ob09%W`Q)Dkt~k^4W*tbuJ|Aw<J1$EEO1<g&SnM_#NJl
z(apC~QrfsH)}$iC=1-&$UCOlcft12;z?f2at%>C7OL%NeX5&XPzW7Y`e&g@T^}l{o
z--m-k8$A1tWS)E~>9Q@mU-`Oh{=zrl-4LM%52bVZBdH)FHefJOP?gabH`2P0o!jfe
zlaj05l&zg#7P|zfd3Ims!!ul;6{*)YaLp<*!TT)Vn8?cBk(6tZ^!hkZxg|IhSKfK&
z=jG!c26Fc4#}XiPI5-S$IF(AZEQ4?;qY<tpqM{vrEZI1e^Zr!q3{XI0RWe(*<a2Aw
zQV%Bb(3|L?p`Xdo$2z?JQ=Aw}k%$kw33;euo(W4G=p0cegTq~}73DX7^_Qg8YDw?%
zOy2#$_u<fH65?t0wzg#{la@Ztl!d69hJj|%d5NY0BG*hBKpBNnLvG!BQ{KG2D&P4R
z|Gi8-#0!5UY0H<^#i8sXVg)$tolXy@BP}zWHwV`(11CB|)amtsyzo`QpIsR1bTSby
z2t<JttjdGI%@F17BpS_OL^FJ#S-{T%#Dm9qIJZ-LydZWoNW?tPjtKyKK#WKgC&7bg
zZSi}|XdK5?T%>=HEu`=|{y$WM`qqE>tvy)c->X!Mhyr+l{W*-lgBP;YAX0dv4nj9C
zZWa+L!wAJcXD8BbxA7)DL=hNNHYM3i)_4%S8QZb-g&Ex<7!xB*9XGRDX_y=b7p82D
zWZk|5ROyNzw8RO<L<+d48C;aKLXp@8D8PY;;fV!MfR`eUMtYOsQzeDR#d!XZZ{Egd
zD8OiMH01EppGfogx5U3_Nd_O@LR1;g;EmzcbE&C91j_;3v{N$bcBF)GXwCc5KmM_l
zyT|x^j<i1bT?C9z5dDf03~@cChtm4!ccr{Hkxzf{6B&N^u54zS_$+7A06>2HTmN@y
z{`8+ob$3IuJJ%6mmZi17FZty)ah7gMeW`&PUqcib;%2~WrW%qiRwP|1NZwwPpkD**
zMRXib^z)@*)T8l08oQgaw!JIEku9aw9YCS3%tmK&^IBfqeo^K)5u45u4z44eRtE-z
z&r4W510))CWW7;>)9|D_@}xN!$mH=OJT{UB?$hV$8QjBIQNav{eH41QhlnURPmu>i
zfP;x!CqDcy(~AI)O(PntHnLLB2h#rF_r$|{t-Cq-{0d+?&cXzaX0zhSQa&xEIzHDB
zPR$yN@AhRfi!=hHkt%HO7G-xmmZv}bXK;Y~GVFUW)ROcE9jPG7TGJt(+mXQ-hLb8t
z2&WO^Oc7m-hkZQ0k1PUbl*nc3nmh?-g>XIcr!t-4EW`0TI2$xH8q*xc6!7}sc|1Ik
z2fOePl|mW_9_IiB*fc>HT8MwAljr%RQSoOMMg<gy?_1_<$MSzg4*XjR`F{ROU;V$N
zv*|Yo<x*)_E3A4t2F8Y&rV%!YMQvcqLKX+LR0eFzX);GR1c<1RL1;L5T%k~u9E^^J
zmBHU#dOJJ^zlw-TD~)xjRhJN{0QrzJ)d6SLDh_T8qL?+r&4af@o+I=MFeDL#^l*gN
zQtXNE(bt6LgO~TjDy}21f=7w@9`JZ4#KSW1*cqvBtRjhBmcquaOmG7x!BlGNHDGCA
z_9#?m;R0UG&wnh#!}rCV1B=6G?En!myCm`X$8!2R|0kIreMkJ(Dc}&GMcR_Hk3Nu-
zfAa_O;Gh3%DRnR5fQ|qw$H+n8f$`ema3F*80TSyi+yq-%&7L&Y?n<G44c7+XZPbF-
zhXcT2$vU3oa9HP^`!c=!p?Ixla{2f(xp@4El#mZa(n3CZAmw}s#(|F=BAw2Z@Yz=+
zx3nqcwT4tyO0vA!kPwkKQ;20{X<61b>aw<TOQs<{BXX%s39uMWF^lKS;dA6*H0!HN
zQm!}P$U+>jsa{tHIRhT1&?@qn-@sYnfM#%FavA(QeqSnQWd%?+i^tOYci>dt{My&$
zm3KZbgX3qC0>a7Q&DM%(xp{q4&Q4F{^0FlxJFe_rF9Ft;GzZJ!bI@?BB@i$tJsI?P
z@QaE<rqekODdHuLC=Tt6h5=)k0=5muL*$JEHK+*AJmuJWsE4Bw&aR16sWd(Wpd2IC
z+zT{MoOy^$xbBR&f#!OaMl!^4LF|?}&UgstYynN#__FMjd5rZuEm|0pyZ{1C@QSlR
zWY5*0zV-`W`v<mTWqnxi+?&BW^Z^$}Nr*R$P9Au@2+vPr$t<vGV2sHpZpIf4h|!6}
zM4C}e|Lm$!@r^WU4Ov}Tk|J`bYz~nO##_!KY5`AIGYI2^bU5^I5awr?F~d;om^c}f
z2%eW;yul8TxtrS%JCB1;@*pOzcas}{LygBrfE#v=q{3~<)?s|`mLZHZg+rdf#R~v;
z#_gvPo_;Lxu%n-c?>~fx4d87jfOo0xBk@Ln4O1Vmpdht7ZzB?e2sk{HyyuHQn!_k@
zqX?M*p*FAYBKL}<ebI+gx<o|6;iV-8h^VuUTt0mtQS(rWh<L5ThcHA$WgHM2hS`1m
zp-fK>WO{rdlOq^<&%<E@EbX0&KWNGv#L0YsXb!`%@m?8Ofse$8VQ#LiN*Ts_e)<fK
z3q%2!n=vBN`mLAbl|S?6<)vTvb-XW-P8mcV9Og2v&Al)G68`-SSwr-6VNm?}QZA!p
z(@Xd6$)Mkr3G$5y&MdSND1^_3zz0ZX5XU62r30emrEmP2+<W^=62lRnKY0kh7UB%e
zq;uYp=@5=1730W8$ZtFu50JwEjuuiNo&dqx7i~E_IK^4R^8xOU-~_TIIOcpFc^ZrX
z1`(3jV9pD}nj`8ChEsjM0?rxprx344gR_v1Wb!#ZgWlYiF${Bp-{)`|GrX1;#wHW8
znU4{^T1w{35j=cc&xlF8W%B<>%wsJz8UuH)%;;wzV5|X!U(VnA*59j!PWbnDn8wqQ
zjA2N<9xfy<3^AyU7iPYaM^s|;VN@bC;1e-_;#YtV!w<xN;|JlF;!pBCk$D4*24vwI
zwK^_T4jv$-Sh$M2QwRQJ!V2Ia@oWfF!5afp<G^rTJciMSaF51>tAIBSxInLj4{pPA
zN0}<ZGoVilBSRK|OJ(peZjK*iC4j-%ATM(DRge}X<B?}z^Kcla=NICgT>=&%V&HHv
z7n=a~kbto#Ety~7-+R2cc}d@ROX_!jQLG9gU!y4Hl_E%wva}*Vx1}|?^VMIK2o7gB
zx<nF;hy@a1Ht*tqTY#9r`_CRr)_0_T0)hh0g-mY>xkUyZ<ltlEPnQF+k@KYBFb3yy
zxqNaVB|@8vGwD7(lv!&aa~yCtjf6k!OE|tzV-E268H@^9s;n&2f|n$-dP54;60WtS
zxo7)uUxLoD*myq<{+@y1lyBdY*T4QNfRdZiL7qbtkpVovacvh-C@0J5i8OLEI8o$5
zU~Dy)!hOsj%8hWS$B1C5YzYT7hV$SX1*ClX5Kih0_coFVnO&TVES((=LYilAZpomF
zgH4<T3mJ8g--L{GfWQ$W3UbT<#0}Di9Nyyq5wHsfpMwJ`0~(L|V|@${dlBSJtz6Ut
z9rD2AOr_xb=@8~VBiRIBQ#CYS4Kgwj1<t@FN5DJ@XBKZs8BWdONox{P(nfGyEp;S@
zTr)-#|A~=Gp&(rXNZu-~zCY;VAPkV?brEhSSJ8<f&qtV@!yD7+n5g@NSNQi(^CCwL
ziFuOZSUhpa3&WZK7!*b*;@2Fa7k{4UG!6DG;G2v{qr&T@aS<{VAhxW&`4AVwO@*4b
zS<GvY{D&c#BTJJ@+7x(Dc;*9{HIWmh8{)vD#ZIh|DFnWc0UMdu+4?i^I1cFX{B?0N
z@ZQ-ikQ6@wVeuJm&IpkpkQ{LOob1$`l&~e850J<sKOpR|Gi6!6`L+~3{}oVOE5eLB
zDpe!~cV67ul(gr_+WIY-S2m@9zgOZ5uxn>hB?Su;4?z8n=3wY>AX32dJy7VK=DDn|
z0YX>OaAYl+MtCm3<QUj=I1G^F<FMkO9)0wQl$UY1Y*IF0%Ste89K`YYA#wxco4Jyd
zuHDtcG{e1%;1F#b^6i&?4)+5_dH5+F(m>um$8`scp8|6BP{EnSGMILx4-(|`>_qln
z{{jqfQyxF~SXKcWAHDkrC<XN7+TE(OK!o^U4(FhxL)?!RBF|(R>d{JheLbi-WLNM0
zn}06Aty0P$_d)*SA}ZlD8<c}69fJCv0=^Y%Wm&)0kdwo<o(~V_FPjGgjNE#=x+kaY
zuCj2v-(y6V4AP7&QUp56fVp|fQ7WHj+K&Py#cW0<5Msc3Fi02^7|i}~s%Ov~<5+VZ
z-dmz8%Qk1*!}oBRK~CW_!ixBObkqwtNXv?>D{yy3@g;V3l~?ik`8{W8ZK>MnHNVyF
zwiN1hI&B#vIuZU^c(D}nD&|%>)EcVrs*UAke64`psRPa|BTv|nZ6wQkdpBfzXHPaa
zw{ek7&NKkVoq@tsD3wm&pG|ho)i*Yq_Q2KzpyF}C(=Z^f3-5LyK7Nkq*@BmHTubXu
zq+xA5uZ_qh{CN-zmYt(hLj=tOLe^n4X<QiG2w;0&3)aS%7tjORFv=J|7lUPT%YZn=
z6|g%<+L0_v??MxF-lz)LxEK*9WQ_xmV_Mvn@|`b9_4ezCOzSd3)Nue6V;F#gXq0bU
zm(}gNa{tjIS>CuI?otg=)dRH*Z{-gp9pdJ;C*tJ6Z0=r{v%@194t!;^+80B4@+nHm
zYk)TeM`_`9XD+=iZXKd!8LR-yarE|uoTHGa1A|EybLy}n92f^4ptQ6CZ(Y&r7tKy2
zg{YkY<v#5`mWvaxn=89g+I>})ZrnpIhaA!c6S#uId+UzGh<H7)X*Xa0yzIXHi^%h8
zh%%o_Vbqi&YH6Ma#DME&BMHfXrK^BE$pBH1r=Q__yfeiz==*U~D%rWh#v)4v8C&zN
z0-S6b`HYi;BPP=e!@u|TtH^D0__-R+88S~;M~En0L<wSMgCxp>r6e1QT2QZphy<9(
z;E+O^5aKy!p|5Z*@B?+UJj^N7CR{iqMwTh-p3J9k?s$HfS}@`jaNStvwDEpuM01>v
z37EYxQh+h;{}^P&oKZL_6_I#jJ&x4@BCrL_OXAFxQ5l0G43nOF|Ni?5zig!e0e9eu
zCP?J?AclWFM=oDP!SVC*xBvFvmX}_7N&e^j`d9zzU&-J9`+r~d4<6&7cqVEg@||Cv
zNOy=@PbsGfc^PocqsOPA;ebZOv|xx_c>PpRz#Gk*@XLGw2B1cy$tsMNA9#9#XfuQ1
z=Ve~KD<N(=D#2<%a0hr?Wb!G8{sjh&97#(IWgLDycM)E9js$h~?0vA<GbvuXDXG?x
zT%I1w5S04nt6xF|@;W>wa>`*F-VdG@?<KQzT`zJ9hCK>~a^p*1LR1+7a)F6LV!is(
z7o`W|o}51bJcaiJZ1N-A)UCVn>a9&c5L*VPhjRMChjR8wS9V`sgSQ;X#><=1MUl4{
zqYwnf(+3+!5AJ|*Y<B>^)<8BOkFzSvfT>d$eoHJI-T+j!h3aOi2>2B|Lmq}G(!CG|
zNXl<+g8bZ)AOi*zaB2c}FoOeV&rb!WEcZ5%gG`@+>8#6A6_I5pFDJ*I7Ur|aV>@8w
zUit!ZD&!*wY*Mb)ke|)u=<q}?E_w>xD@8|E%ZPkq=9Gl&IjJ;i$cqti+dVC&diWU+
z%-dQ2LT>JYq*(=#qUD$vXQD6J$_j{sj2s`FOTW{Uwbeb@Sl^JRfXXvCc?}#eKqm^-
zkrL*ST*|mvg@9A0ATYiua^4t*mWL5%Q0L6TsB<u=JYXXuQD=bMnfDye(f4B|Du(#;
zluR*Qc|w&hA{6iQA{xDDQA}+X?BBw|T+)oO?HN{wIFm^rAQyj;F1HZxR#!IUZ~o1{
z`9Is3`0JbB{H8{_|Ht3|@1%9vG#7w*+N6&|$+}Y+p+BR+#sM6((yS-dq_Dgz4B~hb
z>ira(!m~w5+_hrDFiXjb7|&zRn5aLH5!onEs#0G^h(?~I7bLA69`Ix8*<1^i^Ejm+
zJOViprHc}-yd>$@@aEF^{HH&~#e+vi)Z|Od!Q4$dVE0g<jgb=tFc3F~Dt;EUHx5iX
z;su-ldY*x{Mx6yWb`GN}fKf|T>QV{@Ft$t6O+{P}_>o`UkkraO<cww1t&ltqPNns5
zU!Hz&DtQ#PckgV<%8i_i&n^JpQixz3DY~rX;Vst7vU2woiK`ouUVk0e0T5_-4sU&g
zYtfQaxdF#GLexDMt3Q#vRg~h&j%4uu;hjL9HsPpRk`?60mrtcI>!~wwk*frLU&^b?
zGMu(${bo&;N<T0CqpI`~y>fu!)xBHr;y5^Pveh~mMtq*jgJVRHjuHmvC(pFLm@lnq
z{_NU5@<x%9XGhXQ?q_*8m@wuHB9nzecJ0pRz#0P$6w49<cBgP{2*ujRXQ-XE#OtFT
zNFuD-kU~C#bA$YGHrAR{FlXLqx)NMBt?V*O3?t<Lrb13#$us0vG^#vmb_L{HjAH#6
zt^>ZNlR1pYLP1y5u$28{8AhR-$+hTtqbL+Bp(Cs$=rDz$V<vG%gNpQLk-or)wGPEx
zLkn8wIi4q6OePV%8jU4+`|Y>oKlayGzxq}ANB`&_Ne|c^Ap)KjhdAX+DG%Be1jX7$
zO_o<HlCJ=UfI_Dw*(<2><8?#SAy}|w@r)N5U>wgeL5?%l8x|lkurO@Fi)YzKFvY>@
zd<^OxkqNNF${{KSWdD$du_Xujm>ZHMB&&n`%R=>>E-$kpe(f&2GU`vQ$4IOXWP~~m
zZNNqpX`S4cxWv|{B@|)T;RO-F=cs$oGm#C#4J(47eEi*iD@8z+O5yX8Ub_V%q#$l>
zTh^|<E|b;)j0ryjDmljcpW!oQfaUU)qIB>+ojj6c)R!)fk&oma$j|-qFC+Roa{d&g
z1K?G!IfK1BvV40-mch!QXorY`LT9=HV*n<MkVoSA9KQl+HirSgX@ww>sxJXTEyMV(
zDcx+3x+rYpuz{wY4Um7fKURjz4_9E!n<AqN5C<R<YJiX{+mc>^gM0WLselLwa`-ur
zF;W1eMX4f-oMjCLQAa8t0sd8w0HfW4RJZQoz2n-qpWt2%@g8#^KYkAMb|{a3`dwMM
zz9+lyd{t6gugNi3&NP@~5(CO>BOh~|sYWr9O5Ju#%OiZP9w8p{ZGFFlYe*9at5dE<
zM8Z!}?H&#_OE#r?9eEc^JhtS4T2i3=nSUXG$rR7g!;^GDqfY`?As(4swij9284;SI
zt;QW=M53gFt$7&hu$iP=h|!Dahwp!mQpC^n^2KVA(beB0W%+>P@uB}0|6;8tZD5+u
zFpLAT22Z%NyM?0OiquePF9F*!sgB?sq70%=3GfOQ?;{$8BtTfq4QZ4x1Tb?XL2Qc$
ziJc53ar0|PxHn*2FxdVBd_4hkwhWGVUFKjX!K1>iKy0|IgyS(dbT+71mbo0%jb;uA
z4Zym#yCeOlKauSQ3a!Ne-XHk^BU|T0!ZK@Pccs|a)BJ|_e}wA14M>r}_1UPv?;k$^
zBZ%6L>}b=QldFjrS8z}e0S3s^kW+<I6vP{zMpGBwH?^`R6-4sj0IX`qm+qssG+#fF
z;@YNEm#(2Mh2mt4dXx)dD8zFB@(6R53I2@N5Ab(Jd|*PrPZ)7!2d}#XmLB<m%Uo(5
z4q^&=8Fcj=tfk*W9yoyqufc(Jk$3EXx%^FWRza#DI%Pl{1Y?i_D5PdVZlLmxs6LX$
zCh|!q2WlBcoWkd!bITG6!9z!2aJO&b9^yR|0nw3n&8&g=h>C?><e)I@Y-vm0{BwT;
z#)w=G4w{fF?G^C;e~PC-L`Bhe(7cq>{imkIimhva>ilyV&w1I#!45<VyFTf0oKsgb
zWe^EL!r+l0LpdOe^OOU7Ot{C23K_l$a<UP^+WBxUr_G@>`!hI4pqHerNdIe@NMygj
z;4KIT%QE(1N<xNLAo^i+A~Ylu&cd-mJ|1R*N5VZds3f!zqNLNl{AqrXV$UEUw~)xY
zIKivSHQC-+kqy*rRzYeMil#se3P=#ZG@r_W@ypbKXGh3cq7i6U)}m%=P%QewL}5Vi
zED;l3z_08&zJp{oCiQ(LllEsQ`pu-W{WY=c_fY&@gR#P3)2^XH;YongaC3ZxA;jMv
zBGu{}zb+p=!cG0@Guc~DD@4cv*E@hIqh3#fllKsjj-<5uvXrXVBsI%xCr1bv<ii^}
zY!b#H^{2?`vbN&y$!sKp0bn4D-0<LG%9d&WP>ZsD+>p}7D{^^$BIP9;Re!)oSZe!Z
zAOBvF0W;+MiaL?{5+ZvU`P2y1H#}}STT~Wp258LYP1fbWmY|@G`d)2IbDCMVEz^r9
zcpr$W@Vev91(0%AO9o4~-U8tOh7);B2!n}GcMDNpv!|zEB1H|u#kGn`wvs_Kz5vWw
z8U=VOIyI0O9-a(p&SvQ%t0YdSeRCkRfD|gr*TpLAff<ESt=_?5hl9a+m;){iQNQ!7
z8X|uUk>>)>k8?;?HgZA6R6yKxw5x@s01r+h10*mTMM@Cx#kEn_R&<AdXZM34(O8pm
zU6N9W7I4HK9Ondhc?=_LBNseE@%R#C&NyI)!}C^F&49G+NYn-v9T9Q-oY`9h9Lq|6
zz)ISa5}V;K$1P^7kso|(VN8n%rSx|gD%`qr>#qFTul<_*$NnO@@!S9EcfqP4r-04W
zD>=EgUX{JgWm#VVOIRrZM}q;vjhj!AZ@_>?$gvn&^I)wQ$}M(>`y+UF<XvH)4UlwI
zgj<namZ-1+NVcwRM0PaMmZuc*s(5^+M#r|9c;45abC`?4qeLiP2gr%0fQx|#0tU(V
zoCG(ZPy_kmU;-8iq(FJ&wn$?K2Mt&mxm5*5VB`CfUI$noHKjaqOu*OJVRtePCtwtl
z*)nKq88&5f_P%tEKhlF7&gbSZ<k%hqZwb<+*w}?pAfX0)i~NZ+n*)UyDb$%9c=t4(
zXZ6Mxgyr{qzJ)`Dgdfp|Md}bR%LWmHi=a^1^w{~@ggXP}Oj4WeGwIo-jE;XSA&SFf
z#`29VDKyq3NTXJT&jw}#FlZnt6u+JHGOi(r7DjVG)>Mj(x>L~B8xkRp%HVT4%su^6
z?fND*ckp^Chcr3J0yrugPAb4X9ABP-8h>4~OS_tPnL|lH6sy4npxuKmis^l@y5nQL
zcm4Bo`UJcmTP|BYoCO#H>Rl0_T_#_U(U{TL*4k#Q?NGKNpcxws0BPA>!@6Y(wK<2m
zHk`OW2jho&R1fv2i{3;o5v@n;0Eum-<xRe1DDhaHca$$|AWnMwwBa{0h;31Cl^1@}
za1TLGAs_2Wd<r{x$l?bVV;X;&Uwob{>Nqw$#OiWJ)|XH)EIU%o;pW<X&1+c5^Klcp
ztqas-aM)3IC?dfvR`}*UB?@S8ykKeGNJOeR3Y0dIZY5J-c;WmU?;DWC+C*-J2<EV#
za0nXtF_L?H#>o*%S1%*CTF2)_{Q(y`zyToqa{^lrPfYf1_cgg&Spsx}5#T*HaU&+@
z`%<%!K(~D47=UId#s>YqTmW|2)h$4?b-<cUv2cLqI2?!X{cF_S(nyE{yq_Kj3KS0q
zI1I?m2KdU9M~F6TOG30Q)}*|RoNL@hPIZR!3mO-7tK*NJ$jz_clo2A^-rIL%bpNL?
zL>!_JFb0v%N1nvg(#^8jbf$f49-c4DWSLQuqZ3)wWI)3^U^D$ZN*-Hp0!m(!dG`_Q
z{jsEwXN0(ZBjiq{(Y`nZ<OKzk6Z{VW(<@9O!5{+uqV^U=O(Y+PaL9}1y<=QoK&mt#
z8|a|W1L+izfvw}r0Qz)6Rvf-Bz3n{^7;9>TF{tcd(p9H2os+b{^Mh^lKtP0G=R%;N
z9E$H_i{*%{<f_YZ4nk-?^+B;ara0>dniDI~!?|RG>l`HxIx#xz9J}H{q-EF*4@5)b
zbZ`!GfZt<_jI3!0u$2O*cUy!S^XmmB{EwwSabjGNveoQ!<=<V$G}C(QSoa9y2}1$-
zSRJ;L)`_cMaq>j+r!y#R$H0dwWC~KRA!#k5zJeq?mmUBt3;_i#H8yKLk?uuTPA{jj
zwBhQUQWh+YYc;^I8G{OtGqC=_?f?=L{`dq3Y87D~i7lXv=N|*w;T@A9#Anhr5_WXs
zb>?HRM1VMM?G6rN8HS9vh6_8#bLwOdNDd~ap2zwM*t#reY0%L=DDg=+m4j!Xb;DC&
z`zf4(rR`Q}z@_G+`=||lDA#UWmoI((=f#;klFNr5%f$hb@<vvcR#uU-cv@ujdZ4T?
zN0Lv&&~c#sW#oQ<l&qH>AD^1)J#xoEhfyG{Z8lS@DJz>rnb^L`U1k7xxvGSKw1le;
zoIn~i9Clsjkvjw->uot0L{W*Ju($_S@`hA*KBrycNXo=VR0x|NNSJpu?@WU{w-Hez
zHqs)u8uy-xJFdYY;NgIWV>lJI4q0FjQ#kO5(SRRqKx}ws6qiG?w#Z$`kVSx()~qA$
z<Wdc9is!Y<OPaLD$RX!bPxHtTpk><T*vSNjnSznQ=^(Nax((qtYG6Z;&igV%RGH#^
z&6xMXan>tU9U1A2hSCEBWn^Hl9gQdlXPd_t%1(MsQg}a%VwzImEO;=g39c{O#ON$p
zz+Dh=&*Rgd{L2Kb=c!N_nxLaBGLRETS!i(X3y;2fLXKXr*UrHU^7lXOFXnxD(3qTq
zD&%7=^uYqOs7HvQ&H~<mJzEzjcDBG}I`FRUUPWr~f+-wsy9}=|VL^AGVLF=jC7!`!
zIv>GiNZrm5-a!lFFxl)lCtPtGVx`zYk3$!C@fw%7*{Dqc?l?%k{qYcaK_9PMkhri8
z?~FPH;Mly|<@6C=3s@ht@WB&Aox`5yfqAyN0A60U2htCYw0nCBFIxMcFCXuB<ZGX+
z%lhhVSx3I$u<bIN0m}r>=5{stE{+j_aQLkd$u~a7>aEv6p}VrY+|UF$VqSzOFdd_A
zHy9(ADFap_!Vu~KeoclT3=kc2fMh<o^c08@9G)x^@Bn{D8issj7dci|nxK&F!YwJS
z-vCT3$>71ilX3T<_@h&Nb})g>eThLlRH`=tCo4E8i28{Bd3JZuP_0Xjhr(%<bc}&X
zzmh~28&OXrqbzz&$7ZY)m_trsfr|ILsGs%WNI@LAa8xl%6){O2=6iwunKdMKUxc`(
zL<t-V3h6L>PZ{A>tBcyxRPXfwbtN9!45D$hR@dLtp!(UtGs1Op*|-bC$>H3R4P~0*
zXl*sriH8DvPjPhElQ@rQP*bJJXBw#z=w_0rWERi*W35G2(h*@W93xl2)Wb6Kf?B6a
z{@s24T&4k#+<F0cmCPRDRF*8+pY|8Kv;jp5I2hT2tBsrN9f`G)z}b~ZJ$SYNS{pT>
z<I@Y&e0blsWUb~(2{*-^gI>pD9Z6W1sG}G;K;B}@IjB%ZqmuRvI$)bPvqj9#Nnmyf
zvUA><wc#Z@@Lb4!*akB|F?0Wcw4Z^I64X|<Zh<mhMilTgq78xB&(6+d|LGGsZz4j$
z$eV}|6F`s76wgsyl>w69(sD_LxUm1?4<E|E`=ge;ek~`j?`_H^>PCB8C9qVM7E(hU
zEA^z`MaF@=&ILT|9s}N7yM+USyd@1!hkPMlErKlY5YZ-5-9!by-<DEoSw@{FIC!4U
zcLkuZr^p4<*+7lK25g$P0ipa1YIz&deEMUsX?q}5*pmo|cML<q&+BF4EJj4qqAPKF
zhNyu1vb+t7KCSO7hS$$mU9GQ0D12t}wsxJfpD~W`Gax<~xg0pe5LOkz>DeG5JfH{<
zux<{A5ydDO69%(81<;H+Y=lTgrxefIfVg<S(^z{a*_8v_FZvsZm~p=&9iSB#hMU3l
zpp%O@qJbi?&CUxrkL3mo7^o&fl(zA>ESqHUxmbHl<8djRTXxPfrz2@o#CaeiJAp$O
zpq$e8*s0@*Ts7Fq&my#+IleC#SYkvAu42)8v<OC5wE3c&mbfsJNgMi*3BK#dpXwL$
zFy-|{`>h;K;li*SuwWz{M0@T?KO?WGO{Kn)k(0~5JpAmLHtMdUPPGKas))K#9XM^X
z2->{_>ea0PQ%^Pji6=-x!3<fT&tr={eHn9TNVkK0h~ce5i;yI(Bt-;Io_65viopG)
zIY@{n(tP+pj^6uFg2tx8gV|&#o$f%+QQW;8jFcsc;rT{3>OUy#ZrprBD(g2TJOE>d
z!XszNnYo-@`f~jJb9wi@uDrTel~-<8<>$WmvTSawNjUDnrJv!Dr=*N1nnuKq;IBp`
z1xkQ*q>7Q?XDbcaLXB?TouUK)$59{2s1Haxh2zN~62mcY%GaVtX0xyG5aH)>*UB|8
zWZgsY+V4rDgj&ld-;=V7Vksg?#;vPk@uRVN=+UKN{Om>`<@Gg5)z%b324M8y@8Qk+
zl0j}HgL628oOYeCL0N|cgHRHGOjQHCCpb6Mxs;im^bq;L&jE*Jn1_M<iSarC437Cr
zT0jV)4B~_t1GzcMg8JSV#c>u*wSN+@C7b4OX{;m~M>0rN^I$qKssbEzy<EU+4RL;a
zu&AcpErsilLxG!&BiUSz$b`t3**=wZGg@rUr4iK}&ei$PQz*-N;g8P^$TY>iFj&a{
z+13jk62?x<WI7A|ydW>MRPYB)A=T&tFvzjv;eW}mMGKS55bwD<Eg67<jgatKpjk<k
z#()_7vXMAfk$i5i&EdhP^3i99a{u8_o*tC|XOQ3n?yTpA^2J-I{$DRiG26fmzmU|N
zE&CZ<u%Z@Ib#j$aib<t6RyL45fs9->pdK$q$blcSL@9W{ydyVXx-JFlLOy=~LfW6A
zLLa$0a!zf9G(5QrOrL_69l(Qj5tCN8UXtxM-T^GCirZ&#m{=T<Y6%hS;tbKXAScLw
zx=%*({^3NPUD)!K*9x**?{Pd7eDg#-u0H|9?eEKWDTjzqm3Vare}5!F8xVHls0XgD
zS|}*j0a@V%@jAg25rEV=@~jZ$0voW_?{lsSkjbfnGQTd<5C5@P-Ji<1^*$goa|P7&
zvMAJ6Z@>`1&`b|?G$!bWdSJ69d{!`kbR-<(2$3g(rc~z513ZkS12%OR(E+r#<{~&u
zP63}Gt8ks&?Ch%}8yh08nIKo>%)I6%>cprI(ZXvXx<!sQRQq0}$i$Rr(#qV199$%U
z<+AIc#Z(FJ)65R!;QaDM)R=ONP<Rd)7<&jCQ`G2YvCcm^sCT+qlrOR<bf@5{;5fX<
z(}{5>vXYJmCrNQ)!@?=c_k0T1b)E+h_Kz-_CVnPH{4skm#%Al&xGz3{g<OVT?NI}!
zWz6DeMz_<J-~R32{*R{4-+lL8gzYr)l@K)q<QhX>c)n3WzMPI{@F2$CR6i(~a#`C1
zof^5?CGlwgTrPpfo2{ly22FVaR<KdLD_iSJpxcoLSrsI#@Zh;X>r?^oF{|CGcLA?8
zpC1ERf~88`Ms8Aq_si*6h}N`br+7~fWDE+heD4*xjRIt*{zvlYM`P)89y+b(UUCzT
z_Q#-IDOZD=1bFlEy)Q~*{gymB1Bo)8$<37=84p_W`0-=I9w8Tq0aK%VN&2{%pEeyC
zyxWz({A+h%Y)8_+d@A*9EJcptmvEh7B--X>4W*E?r8!`a-WiIhFyzu(@S{1Mtt#YK
zCGYg5-MlX@X!iWhl7!t$Ww-_?{-!{)7Ym?ZkSp3f(DcZO!YT+0<Uh;nsQKU;*nmQT
zzag^}NRWu*Ad$4%BUyoilH3X$Pe&Z&FBCvww1Iblqat%?)Pa2DuEH_~qDutS5NLS?
z`7N7NK|svmP(0*rHAGk&PADXiL^hKhFIp=jG7&{V<FT)u4lL5nwF`nyFD-``mok_!
zD+tx#idE!!^(B-o>L}O(p5}|1Ld5DEP~=XDc27h)8G-xHb~+j}zBvXxPj=MJnC5Jq
z*af^)+FeUXCNFXlI^0AX)4xY2Y-scN%0^y{O4gqM5s_}VRfO1YEv)S-mrA+%MCA9o
zs23a@9P3aV!>;N{Ao~1=zW&KS`6u!(|M_oA9*3S*G(%33f>*3BmsM9HgOKcUY$HW%
zuCK0+Kr7KM^SCS?S42&xqVI)u0FEng+_?+}u#&eBRbWJOj>3cOLT<(}3x^}|h*+`1
zR+J+Z`N(7eWzzJhCa<zN;{tE#PfU+tuDA|E$)LgxFURLZF}4EoBnNLi8L(I^TGIjZ
zE1BgTahC7MI9<Y_*^uRxHSOa%Jw1dGz&PQVBi1C?=7d}>#7#WDY|B||DEk*v`J;D_
z<>9HwXJ<1RyGZugf`s}P=gpY=QT>NH2x&ymS_M}GP_Vp?D0F#WAIE%f1PG>MCvY|y
z=KC;C=6o(_{L82B$=Z!C%k=T5h=yP_!AKIujfY7+1*AX*5O{joM9wvnVH;7ZkdpP!
zeMvu8=$%W@e1z*9YM&$rNLlX#rdF2K0;*uamyO0O`G?A+;r^h`HoH6n6AlLls8+dg
zM{;Ygf>Z$-N$G?ej0==A4b>wu;Y^eyo!lT(aK?N<_p|f1eD>sAqZeCBdEQnwH)VNi
zTWV`-C>Em_UaM*OWQh76b2cp%Aa9Cn5EU?xIc}5(!efm3(+n@dqJE}ON2*a#@tiKo
z4D8w`qZlXoQCi!HvR4sm!TA}&;opx=)}Nej^;~jzVPcgF>!kP!BNG#QYBhMsIVf4x
zZZ`qTYA^h}^)unmw7eV3Wi2QRIyOYurRvNW`1#q>DI!o6R5CniH3`#n5N^^+l7=rX
z#0uHi>0UxDYIS8MYirALx>A+X!yFi&raU}qfx6}xMh*d^tdp=AyvHmeo!Ico9B@pt
z5D70v5gFttHZFKfNiu7eTqs1&%uPv!ZFntsr#!0px89Vg`~V35hvHpcYLqJ?DaL(~
z8Qdys803<BxLML^Ne^t?=U#hT4p7uQXFCe=xYo&`y327N1ygDnq%9*=1q}a_2W>4M
z&^wMNbNPeA6RpYp*{@~g%df7;t##x$OG6y)w{Zy9#c6&l`zNRu#Yd9H`)tCaZ(P3#
z!YCuX<_Jt3ilV52rK@l{-U*CkUj~Sp)qGip4s{HikQaqg4@Ss_VAn>O0kto7A2_(y
z=>q8Gatfw4#cc>Q2Tc_>a9_qM8wV3m=x2F7P53?4Hp=O!1g8|{p_yOvKpX^YK=A+}
zQM`ASuHktBN#S_dm<(!z8U!%Pwic7wC>{C8%5WbD7c<!cSi(U115cq7r5Io*QbA6*
zw6-oQ+q;0iHA&^u+6d6UI6?iar`IxzdlG|?iv5(rXm37N22dNa0q@fY1UWV=gE95t
zAPR_}+1@}#)QU*7CD>%kQ6+gHU*dDT`0K^9zUZc~lR;XYhcW|(CWrbNi{q>kyiq)R
zP9ug0{r4Y!s!(u&8~LSGdFABUGL%>C1O39mnStVFg2^{VMylQO<+Fz+slz}@2;nKR
zegINhE+TUm2UopRE@!ZcA!t$`Mzt*K%T?K4t;+e)6C6fFOcYsb@O~?0Hb{~r!i5DC
z0qG1ndJg(@6SuGcdX@$?(R__s6E^aR5QSNlMk{XP)rv9&e2U-z0>GN`wRhz1>P<QO
z_y^Mb<O3--+bB4Tq4wFT1a@+Qh?ph2hc|v}3k6>!zTK52d3t^T7&%r-nvJy@nL)a^
zc$|}|>YSKc%)@iGz)HGE%tbDmmOT6)K9b-5eM|oHzj#x=bQkYu6v(xAzAB@6Pts4`
zlLEEoM!ciQ32z6;BT%DrM%o!coroOgpYWJ$2{5WPmCmRC8k9FF{)}FmK|7EZ2$n`2
zc}Tp3oC~A?zEX(lTW^6RT0-PYA*#+UaTb6W%6nAmfl<2Jwc-!ihlns;T!Eu113{E@
ze0<LP3dlPgFb8&3L?ueW5SBM3y@GmQVM$Q|yZvoDr8y4S%=rlS2>Goy%cxOCexyB>
z{r()ECoj1y^)slgi0j3fIG~j@PzgI(IO0C&Hs#slhtg@cq>jf#i>?O}8l=i~c-0Jt
z8nPkM?r=iIjOFQUUmkx>u@_Q@U>%K2i|+9_reas5y{G?Ezy7_6U5#`sw2Mgaf(0&M
zUzBuDET}~OT`iU~D8#Rv9f=aDG1cXZRO4=lT*(LY8Ix&CieU=rY>uNx^2z;Y@HRWh
zLAC*5%G&0lINGI9L7*&@xTfIfq!4vb!zmO4d}U<0nv*TCe%<CNiou*|Ny#V!x;wLq
z=bzz_QnUk}c+iy$4t30?QqDl(`#f|GjGPIw%%7<?Lo7I$sFef*)LMcIM3o=QJab!W
zyI+<a(9~P&6?y9Yo=kfv?jm&{HNzpqCS36f$_ih6^G)qKC!SwhUqP*NSy~rJ+GpBH
zsre{}9aDJSd>(ZqI2;N^hTf^<Y@^B02MnGeQUB~{D*y7|?8{p2wrn9!diwAF0n)s#
z6xf*_rKJGl=z)mfSo|h(KHJSp_Z+Yd-Z&5T&;tdWMMT)T=F7qTM~Esw8e=+|SS~xr
zp|&^G;Yk<p>I}3ya>Ly94RH|_^Gh`eSOATBa`^ZYX)Lcw2_ypHB=50}$QDxOEgh;@
z4{7iLuGtXLVB{fpORs@3b>$S%nZlCU1|m}l#^<E<U~@p!qBHX7zI`QIIzT(#q@XHV
zgoC5uP<18xE!@{0uQa>)XOdmAw7qM@C`LjH@8|T{zMMXNipU)x2Xv8Qpf<^tC^xV0
zocbn=fVL5p1j3pDCU;fDlA{`NlA9@`NK|FpSLfU)86{<;=--ET3)@)aP>V<vC*qUt
z;s>77gwGSO7kU7d#NhV{1s9KJB4^n~KZ1k?8zZOlKnsjBYpO;ksxX^TVG|M!ZPXt=
zdVGW%yo*G$u3^?y9lwmiBio)M2Vux!VHGzKaL`VL`nViLU0_&CwIU9GS4N;rrz6yD
z(krr5A@g&oy?p+3A0GV~j0db&VH0&Hyr&pNTtd5W0L1Z$NdGC|2Rt~Kx(J>zKpiHx
z@{$&K1E(l#%S2%Y>=xd4b|}>;VW=zTV4a%yOidi-qoY$fJGm5&VV#~nm6Nk)DvTJZ
z{1kOI7;SUN`8E)38!8gYC_L!rRSbuE1zCJfwq7}S-jANn<p2B+Kb5cEb7TWKVvRLG
zWZb<ADy<^w;&n@4+BjiKq0KrVssnF2J^ci)3$KqHfeoMQ*RQD@@vuz?m66@M4ary5
za8Nt)?7dGAoo2H6_O6s~zYSyB(!<E>?suO6Iv(PnX237tz`7&Uxhxf8VFl1(4;-TV
z1c!f&`y6M0G?uod2skxwK1Af{;#$GrSO-EhQucv|57*xUP3{9C4^g8cJfxDAh5Nzl
zF&X;u)1SOAPaYq_8OPdE#W9;aSiEKAPsPSEQUnxqaa}tc{5%2KL~%|y@&O<sC!Is&
zv2J><-6TAAoJ{gru3?7;P>R>Q5F1Xwg9D$8fn?ZuVJ&zAlPmd&To|W-)fvW%ZV36A
zK=UHka79ieHm8u!S@iBL42th4N;Jq4gJQpwinB<3HEgx`#cDMF#{sK2W{*Ln(TKxY
zwhCqP@s8F?LXZPT&4Jv1b}F0OTdFk6CRT^kHXmqH#M0MB%aF~i2+4#a7V92qN4t(Q
zcx;4&`{bl42ggWCkx$*bfgEIQNj5;MX5r0!d5QxF@`E`G4r~lBmf;lydlnB{V)ant
z0bL(vagb0eNtIrg%&otM_gI(l`TJr`FHj)8E~}rL$?^HW75`CBs`#7%ZrZigntTWd
z^}#0}Y7um6b4fn``Yowv0uV8eRq~3&2m9&L^qQ3N!e^WXoW7k&zOg1FYGeTRM98zU
zT3i7El(OUrxcQTxpe}?oZMzyEXSH<nVjWTX=ifnIg3m<#20DmA9~G$iK>G#9i~!>j
zu5&@}1@ND&?BS842@Y`^(W5P+b5P+E<b|m9m3MAQas4&zD4DT^D{RWF{ZMjXJ!jod
zWIh~AvBuH$D%j3IS-o)N<No?O>_{226e#+1s;a|;t=2xG0!W#)U9oZ`uL?>#hlFEv
z!pPa!CZx1Epf%fr0vOz|+lC>XNw?jG<8h_BQ&MdZ)-3al6{)Um!mwaag{pMVj%ELY
zAITWbD@6sPxg#DN3Q>s4C37}Od~JMX)F*<W0dNXISVBSh$Ah)9nbroo?Ak^XMZ^r(
zva8=1RH%{g#S!-x1un0;(EkMJcSW14fJ#yYwq6Kti{B~!x9Gezq0zoFLPJxV!my>{
zmXyB@HK}z}@DdRSoOr&pBsLOv8wPQF-jSoTCRjX#eI(Ch0I55{IuSq`E<6kofHZJs
zI`E|;Eq+=F6zVCA;N2dd^yLq~k76ti)4}nocyC=7XR9LXr9C8|qRDhX(xHPojaLTD
z+CpxFhyqW^Nf5HQ)JnHhhK$07C;$VyPY%B=B}9j)epecw`?9<PD*Lm4_50G>Z{fi8
zWxJM__s-flL?hM9K7Mu~2cP!j2u`AkC_zGkRB{o?@_;p>OkeV-E6q{hw85AaP~5g+
z90sbOQVxysRsKXNFWP*BO1_Uf(;9OK&QTWZqGZd&naG>32eN_uX`_+{R0Sg!4y6yq
zk6yh}7VWln%Vin1`iQb1E)Yp3Frwxqt{*Pt>Jsk5c3O%Xcrd@=u{eGVhjS!0Skwxf
zQAEx7`UZX;gpz<+TPoq;Hv!qGI)$7U`G<pl7ZkYJ!#0L7O?zjm-(bVxX|G}Isw-wO
zT!}J75JnM>^BX$dmmcbE$0t<TnyN-)3Fu=D^uDH_2>S&PE|s+n)SpmSLLI4nbSS;!
zeY{uF_LgcM(g8Dv(sN3Oj_W?dwVfa*9`T~!&n{Ax6pWXn^E{t4Ax9^=E&ZZFEvWKE
z<S{8voFFXID86WxeG$d|@n1@tqjvKxTdb>|zJ(-`ok;O&9z?6uUM5Q+TCrG22CZ-d
z0yExjErzwo3<jRI*;@{oxMis>Uz7UkHK{IbNU>6fH?XuHD#wXeM3o#2mTI3W;jB_*
zxKK8{EfZjPQ7R=_4n;a#8BBfIKcC6Rk2=yr5%~P{LM~2_1C9Gi_i~(owWCay@f1;D
ze2$3M!{1$n9}yWVw)ZplqiX1sH5*X%<xPo3_dzFrUrNZ=SjTWk?bmCvy15E3JCxSb
zGbH8!IY7q0sKht+q&e!#;j<r0>-bQr_}MRg<rk$)l~i1-9HKFeYcvL{h4iq#yn>=E
z=-lZ@4Z07eBgSD&Ba)RIQGN0f47|oM7rb{Bd7(rcg(q>@*;##ZIg*bboXYoqbOM5h
z&Sq1FGv1Rd495cT2sjD&)M@vTE8zONWyw}IqyuB#Z+f8oD{}iwcO<)p0%@6g2o#)X
ziw*eO`wWB=B1;6TwBe21C@)h$Bp*4_7|=LOElZ|+P15xnsA1Isb92b;rhu0BrSteh
z8C-NERmn<zV@pb_pTlQfhcQiX-Qg&34Q9P(U?A_KPIU-a*#^zuL46U0?wB<@Ac;DR
zXLVU>jS9XRQd`}I^IgYtuBoG)T<puq$M1pN>w*dgYy&+`8Ev|xDQ+T6OooU^J(Mf@
zut*A<da;3X%;ht14LQKt9P)JPmQ3KtMlkvyVf7d&LL6i|XQnla33dhtE79jOEl2V5
zR49Ra=1Upwo*I-BN8ftU$`+W=*wW(9h9V?9;};E0J9$}MR|VNnqC_5$(M0E~DB}$1
zQLL><V|7o;ORM<vGU`25ts9Id#MLtx6AUVo(i#)lLf1BPE|$*j8;x{hWGVGr0}vnk
zM~Ecj2n<tGM*SuXVlKnpNcx?D40@FNol6-QyvB&g!9EIyfa+ztju!*&0XES&IiziS
zhzzW+I8AY;pGg{+n;I6g-YJanLgkvX%QvKc<2Kl|uAKe&eUKytDT1wR;qay%;CncY
zv*x8d1;#%+JJ7~YI-MMnbwaxe9M2py@34EMVk#a7F5yip@S1fPc@4Fs6;RmAY;+}J
za}up_7#Kx{*fN8_uEl-k)JGRR`Sj7TeD<gd=sAV4Mbe*@<lzY@`uvWRH(rxZ_5rQ;
zVT2D`a*3K#s}K4csp0k8dnjW}L6qd+RB#>phcIl`d^l^=lR4@;<D*NNjE3SAvl8cU
z{ZNNW<;tMRr^q!BnE|6l=Z|H4_8CZ^ws!Zg-nu9G<yT=NyLfCthZzM0X|MGdIo5$#
zgJW^#`^Zk=+<^IP6qBb`LpJYxQP%hFN~x67(HyoJan>u0fD-WNJ|fxEk3W>B5AMro
zN@0H(5Dxbk_Xt58#uKYi(YQQBtALXREYwoJ5zjz{+k(S>Khbe}GOPn2Agb!x+W%)T
znTb$Q0^_b4k**Bt#i+FS6K%q5oYAw})A0=^(Q1hamo8V6igsdPqS1;kLE4-wpMEbH
z`>+#j>4*hC4a2b*nP^)vDs{?T<T+`;z5)uhY;p`juyTVK(WN7whQP#}*xUg#RA*0K
zL7N+GVrj>~$b>4yYox(05kA2i0q2i!)47?0?|%kw{cwLQC#O9eBv*|n{o0<aHa0+`
z&x|k&DQqx%6AvC4m_MG!oVM4E7y`1wM;;Vs?}6UFhx`tXV%mgJJ9?8OUzh7&_&g$5
zQ$E`NL)o<6kXzNVJOcII?oH&Rd8o|PpnW0h)g^e^x+*V)u!w3NOd#@(WBA57S+9~S
zWx$bD(CS-7m5Go%jm9_f3cSEBTc~V9$A*C+co_Akc));=756KbGUbM5A4Snl8wP{J
zVt3@jgEk7EBON7oI17|zUuG;9XMH(2oXf4(uK}KML&sdDm)V#+?{&o;+R{D&aRU}G
zQ|3GsB5Glz+7+Y8G0Gnk?e83c44C$s+Ogm7&H&AFxL%0()UM!l9pSO4lLf;w3Hyj%
zWPmS0I`sPj9!a)tfl16SOT2zZ(zTmNaR4u8q`yO*LXJFJqu>O_dhp~Kn9GN7pcL-G
z^(1=XP$#?db@h&|`i+hfWQJ8%J@$~D^C1vGqzH(V`^X~G=W2b58hzCF3l*Bi%GUap
zF)Yhkh+@W)wCO$Xnz#x&v3_Y96ej^Dv9kml8XJ1f@x73ADIsB|eN_{j0+b0|7%H1*
z3@8fCE-4eiP<@7BFv>8rMwU^1rKb&Xm{Oo|M<e7?PmaK}o#Q5MOSH2Fc(f|zDivl6
zW^90pM)W$Q=J7-ar<b6D`?$Hhz>JQz4!p4el5PIIX)N7mEaDz$d(&6mrebYX9R_O*
z2o@4^`~k)0*i<lhVs*sZBD4g>?NqMg^8f<%?rRd8=O_^livvTs_Jv(UyGQcFhwsZv
z>t7YBf@kWhFodC;J^K`J%`wGBYRQS&R#HMSb_KAnj;QtY_^FI%fouXI-7eN;x60|$
zvGzPVRP@od7fZLEC`%P^q$5^Af3qRNl?qja$Y$ZOxiac!_<RMb4ppn#Rn6$0!ut(D
zt8=je+mKQ=XUSZ-yg)wm*-UC1DXCT2kXu)!)$?bF?iUj!1t@NkqYhpR%<Z5hscK5Q
zA}C@q?2M6@4nV|u;tc`m@V@dmoRj80qDND5^>YwPU}9&dW>-}Rk^*(6HuC0iH<lYO
zq09j&Zy^fhaouKsYGg%c^QjIfY73laX-VK5M9SI02?&S?gj7k1Dm%jlXha$gqjF5%
zGWj<RoyS!NM|lnLoO#rpimb#?$OZRejPp4Ts5<N#tw^1T!nNfZ9CmQLkROG~pTi_N
zC0Z?d=8a~bov?h#=mrrL@wc%?xk|VU)-%7y^1SG4C7l$aa=clkEqQ?FI^OLYuV8c7
z3v65}3m8<<9Z8h#Wj8UQ8R^qtoK;~-uBf3ff4AM0qesuAbN)!)eD$W>zI98scX!2I
zTE>AidU~pM!{RXD$a^3DR66}g*0**QPW8^uP+J-pCECagj#10{!zW;+<cSUre&x*@
zvRqH8enL3Egq!CyZ={{lsy)sb7f`kin4=6A!p#9Atu|h{kIxrs!ka}77v(Zixp_x6
z;h7sp_vNJ<B{{o9q8#Vt<&B0^Cv^}Va0c~dsiQ2=Lq&f)_5gufT3ikNnQo%^;+uEm
zOJ8_H$~d6epsf?fu?P4VvX_xW3=Dkc%cM)1+6d>f#-jS%Y?2Nw%~{JOHjSnv&m{q?
zFxt(!Mt9Cb=|(kjU_4~gHlD9%+J2Bx#M(;bs1|(2-H_J#u{^tvdvt;84QQ0F#4=*H
zJ9jSSJ>))9u>k*~RHW@gSr8{VL_QaPucR%#PwY0&=PB+9X4YO&_HWc<S42T}Ztlv`
zW?FV%Dob_qCRn&4A~_1y_;(UmeK2?2%|*72H2TR!OD;My8RN4DfbW%ZQI&=W*#g|(
zDVz)ouQAxe6wXEgN0?5Jg<WbCdThFeDdeocELOuk9kPCgcRD2-h4Wc}^Gva;0KeGj
zPtVF)t8Ito+>;^~69L6qkaV#kG0V2D;GQbi>evw7r_6K!?20zO`mYg5*GjV$CvXr)
zTk{z<5?aQ>RorE!yMh=Y9MnDH5O0)CsPI69AP#CtF^GUZyx**!ky)W=#5C{<)6qaW
zy`D5tZ0vPUP~hum;$8r;P(iN2xWw4VZ3)qAjK@8d<KxG&iX7p_&ASSvPM<xH&hc2i
zoNB2hjh0BY<l`rEsaH;<3Yhu%J7pyPXP|+b$c<2&=(EQqlH{72<dV?J1B{$CwHJ@R
zgf~RHdb7*g`9LAd(zScCchHx|@BeG@52x_#FhB<dTneIqAUHjEhC_Oe=kv9nupiB|
zTO<Z#+AhXYFJ$G`-Ftw*AOXNEMib;~Fya`WG4kOYxMK<4cT(>o?;5D^er9SGoYBEV
zb6aPus<j&OQNUf~Ha2_uK%8*9NQ`I{qHdPMwJsM*a9m|2LmZWza~1khb~wQM<7duS
zP_ru)CDop*VpA>~tIXOQ^z#JlUZJri<>h6WfUYmrkdNRw1{Vi_@o+?3UWS9s4JnlN
z@^F2*FR1{>5`ZC{jazaILL~z@9~C#`sF#utK6(PkUVuTuX^h7DT!n0;@O}hmdC@0Z
zXX{7?Rdczquz)0phrEya<7{GP%hC?WB`W=LjGpeniB#CdX7R={8ydO(X3B+hi1s6V
zHs3Krh)iA5NJq$`s#XO1NZGU?iF~Yx>9&Zi=f)J7^C(FV;PV1+tOa9@PzDFe70|O4
zzBx*HKTpO24QYffRZzBU=44V!;eR%+rjTb8sBg}3V}?H*Mh_pr<3uEjY3yq5qFw^;
z(;Xu`C*#8$4QXDUsTOq)bn^rk%k}%Ro*u|jY7E9}t^@*Abb=uc7FePJywEbB&EEE&
z)JthO-G5!)?Qv*rsA4Fp!<VwP4J5!p`{?NqHKIc)`+#ffX67cE!8kxDjF4cLtF~UG
zGzT2%*a4A9zdD&MTub~O_jP#AEpFjC!Crx8PH)_nm%c(`<@e>U-*{a<J(|kD`Tl#d
z3*zF_eUKZt!Ern@4WW47tZ{faENM{WMMUh44X~aYHziYBMJ)>NdyL5D!H7YhJCiPQ
ziXJ@kSZ906D-%61)KyT5nB5BOXcyMxih8Z-t!Y@fV%FS1oohp}9FJoy$hS*6ix%l<
z4lpk}?>Qf#YO5e3U<?68X#9zh$lfeT2L}8hNRN;@cX+Mk2u1bPRgDT4D6E(Bw-CKs
zS`(X&2eOQui+K$<TCj^fuMo`v`{u}l2Ti$ue<EjXJQfhK36dlPtXrv`aOo@@ZBx7E
znXiyhPE~8DOI2}BEZu&nD#0wc&Nx!i*J<S(h!4(2&BsQrnS8sIwsbJj)?P7N8)Lbj
z5jHA4MEFr`w90iHMq47ntJ;%}Uoc;$!-)(JU?rUsDqs{Z<iyP0G&kWBOuJHOWW<OJ
zf@o1svNQs@x<)2Swhu58Wpyu7qh6Jb)ph({mom2@Xg7FKb;%g9a%sc(AraAvwKh(M
zk&(#-HQhw<uH79;x7XK-c@vfUPP3zi#0JX{hpyKh%h}VBoUP1cxFUER7U2fEy>5cq
z$_Naa%{7*TE}~lphLe}Q8?Q*Wg}?VMP}{hGS1w7Z(m=r%UdRQEX&=CdM{)trm`PU=
zY(~1GIpyJEU*fP1xL4JaQZ3SY8;vq9aA5+yTv{Wo9U_dm0gP)1k4){jHOXJUC9nL3
zBSpZM@=u=0#@d%rjYZ_zAIhiqKa%r<Ct8zoDRULG^+x3Gy_e(*uU!NDxdm8w9jU}J
zunL&7JP!V>io666riduxu?RfSZGIe-)YhFuyMPUyF^M4xrKAelO|H0tWDsEp3*uHv
zGh_Z6{~Q3vg}9$Sy?2_)dlmPEGT5kA`KL0a?))wMy^aG9wD2+LGuFYrfAXnZUgA32
zJ$Uoa;7m)(L$iRY#cR$@0ESj_p?vMjU~etc0TS7Oh2;TYn<YPfzbVZoBJ|XfdeyMG
zH6%8ie+p-PL^FH_IGI$Kz%4Sq*^IKuDGIPegmIp>wQ<YH4338QCY=oxF3zco!d^rC
zKf}pv>fy6X!iu!;OE$2JfY#%d5Egn7#W)cV0Rd5(c}^Ivba`+!&c66k<mMP7wAe@+
zJ1<b@B#m6Ni<x3A{tH5v3rd{%4<C@n4K5T>Y|H1(u2&?!G^l0dHC*S(arT1lcuJ`O
zGD4+XOK~I{Hd)Z)Xqb8&9HszpXF6%91TOW{2QY|}iwk*rbT0QFAIQ=1IYPb1x}oL~
z?!1db#d(}lV0w@dtg{?8QQSk~i{!RH`jL_$n_IV4m}G71x*W17OYH%K@r`S*sy6oe
zQV~SKkL2Lv-;*aT2lTQp0~m2Mnn)cC+1?TgfMAc(F#ZjArA7_;$}BM2eZoR)Nm)R`
zNq(ZReP66T$&L{`BQ9tus}sVvzVVXCPoK%9HJ5Mw-TzXK4xY+){>49*Z~xZs%Gt$8
z#qfDk#uty}qUp$+<*%xuP&Nx@6J$hA1tI}kxvB-l+9+Uu;Z((FVt;B{Wq24Ov!+rj
z{EW0JwrCc5v%7$3Ad1<cnNzx-JBee}aj;Z-G2~W1HVebZINdtwQ-p=yzb>8y7>LN=
zc}3hWwrfpLg90@kP;FIoA#@Lsla7+Cr>~4!q<L5tj_3UM`he8j9>?4j1dogSC@!i9
zCzs)Y)JC3@gE3`QVT${z2=BQcI0p1f0}W7`p4W<Nl+xS-21A-pCZNj$lm&3`xuiNU
zIW1?Kc(l1H#}G@*Gvh01Au@E_tOzn$Ivz?aK6M{`6`5hzxi?Ge^$Bza&{vHUwjcfM
z1cjrHBbkvm+7StXmqFy-*g##iSW-jm_XkPqk*z(1I-XFk6yRx>WMgwhmVkMQzstbk
zMO=guZaT$Qs5e2KG+UPkn?h_Vp|=;s;8+O_N7*?YBi0Myt0XUb{pRzDT;JQ4yEi*>
z_r|V#^wE8J|HIF4gGc&Y8Qt@WXXA+bcp?#!(=H5fH0>*uK1Wsm@|2nfHY)Asa(wVW
zdWc{hB=LTFB<m4tI2kDe=B(d-6NTRcIqse!Wn?!va5M@T$9Nwjz?gNs#}eLSX$ha7
zBl3VRX$l-@Wg4C=oM|%ex42gp2Q{|>FAAoL+o*5_mAb*9S-swn66<T1KavItmN$^t
zclHFiAQ?GVVbF}4f*dLLJe`QPbng{!eqQx2*nk=#C!nM<RbeCMM&c{X;@G*1&t!3m
zm>bJ^V0fSLIXI)lG6QoXUU!Z|lGtD&Tubz%qH$;<W&T8kU)ZukA;>@_sdHwlBF9?t
zf}-oO9G*4he9%{BjI_O@?E(w$9I1vwn%d%cPZ@{J(UCN`-qdAZ947=*Aab}a2Duo>
z9#?fj=Gw!T&pJvoTU>Lb3)NtUoMj?h!x?eer#Ty|G}jykI>i?k6_94}0;6l5hEY-X
zJ%RyF@gCU-OgI@^reT}!kz3!n2w)J#N@PTKsQ1(4KodiY$8sgm62}W&O7kBQ5V{r@
zpH+iaL=?l$^sKC)u6pCz%Tk1Wu%=qb_Y5h)O?YJ_xLa#0a&2!@_I5U4dCOo{P?QBu
z%>x%^kPvc%JCj7}opUfSRxfGk=!L6Y2TszuWLOWSx^+IvY{DRf)FOd;RYX11X&NhQ
zV5in)eFao`J}V!+_krZoGfk}Nxh+5+8sDfrM$xv5f+P-4t}1IQH<2XoNEcZC@w1P>
zraj@%k}9Th?IxiCb>&9*oeK)M8IPhMss#!7V`U1+>&EilfhVUph<k9NtMim>F<XS!
zbYZxu+|X!V1YAYHe!xr6=2UW>;P9eI${ra!Kh;m247b|10VENP&f0SM*@Xy<{Eh9j
ztRmW<o&&P<W0eCg;-;)nhXThVWNVco2GjYRN?NtJYKOgPq<{%MxnhTZ=T-}LXY){S
z=814Ray;#!6y3VzUx}~;h^l_PV4585or_eDJJzT|*)C43a#4fNf+*^Ae1;~Nw@>ar
zLf-R8`s10|ej=QO%o<3;e2tB|Kqv(cMrv}dZQcs^N_j35&){&+b+nxdu*1<*at`6y
z1h6a6`WJUI(Eu!+<`oqT4FUt#e9FY}oap$Es3H{MtPjJXpe_s17Rfp;P}lv-ro!UW
zFjVhCG*_N5Z$fmMP}dI-Ar8%Iq$K<p0zynj#De8sXz<yldsekGwC?H{wwnzGDdery
zN?n#3V4|6);(g_Fh?Z+e?#sC}68tUw+QrxU+OpIToj6XNh36t8$Ei!rb&Yz9q15d~
z(bqK7@&T5Z)sG8VTf=a~IxnM(fRo97g)g9*Gx<>0<&fl{R=0ps&W%pAZa_i&Ne|v-
zY?9dK1wwL^m&Vpj$*<i3<jCRSsBLh-4F`|H9qb9SU?2`W`)VZzh>1exvwbjCxO8p~
zVY!3nohbXm_8goSRN7SlTb3?-*&Mo3&2rIm6L$@if1$=1S>$K?@WS}MeWn}A0~MMC
zjm!mafDkBiN|g3db4f}6@*`<I`b4JZGc7=FR^h?%T0JEGgioZCdrv+R>&xE|0bJk|
zF6%F3u-K?fEY7RSg#o%jBs7US4?Hy*C|wki+K*;h)YipxdXU)K)K&+GFsjZ>?}oP0
zz|%(t&d|%VQsR4D=NfC$&RQOeodFKr`|p1!Kl<T&rUx&GRUf>Bv#_zUtWlCA06V{#
zGjs6+%O$K2j&NOvFt*k8WraZ(XXm)yJtd?Fnbq9qbCpk{W*)`$J&!VAnM6}o6rzQ`
z(UMRlDCXc%qRvWkB`~XOC=15<B|eu&R6*98pO+hC*jGwpWpsk|4N=46eqCQ1bLDwG
ziAqd~Ub$_{m6nR>*)xj)bi`xP6_hB(=5uVjBT~z0s$-Zw!}htq`o%ZEZsp|K&Ni&A
zE_D<LYxv^qzN!404hr@^S(5Pb8V<v&84x3l9P96k?ppOYHrbMtSkK2zB&l#EO|-5)
ze_n;|aVTyglAP_x=m-%3Nv%HtrH<ML2NTaOLgXGW?$w*pxbv1A4P%pVQg0!yNvezl
zpVT^4cIa&Z(FUzEIlnlQN2qbFFE=zlytqV87FjyYJH>k#GC?ICMw0N}qX>?~mp6co
z>or#H!Pep8xri3JF%Lz{h>OoqlnkvvTcjf3`cyqFbCd_tt6viT>{3#tN3ywtx(W9W
zA)=P6@Z?q8go}aJ$z+0h+JirkqmSQ`y)XSH&b}#NdsJz{`=LCv%`twCg7CUJCTEDF
zD1lqr-l-iDPB2xXLML=1F8-dQo_C6zY*l+G)5#o~P69-x2oY)lJWl9fb~l*L%|WLp
z|Mqu&SKfQ~$9NvXSW#rcl%R%GAQgmK^C=h0vV^=k0<1Gbp)7x(T)@FWIJ0pjt&}!Z
zjw}^OvGx9Q=`~xabUz@X6g4B*u*$t$j4-~kZ3)Zgq;w%0odH*ShB_7$8Wz#g?L&%o
z7{yp|3Yc12NxH$<&k+}Vv&q~EMm6V_cSC$@PGp&ne^q035*q!vQ9W-%T8wwlaJVX#
zL56c-tXa`v@XsSKk6n;#?mJ)oqSlg@muiSec@?%)SeH&+HObON5`L)_U!`lVG9L6i
z%#Unq(LflPZG*~=P+%~t(a5$IofVdbcylz22NlQAkEJ3Ce_M4K+e=ch*w!*Ze#E>8
z)p^vfD&=e9)V8J1rKoJm1!i{(4O!lM3%L^KbpYQEJ_Ch|BI?7Z^6<%_!p@boZ30^)
zp^<JdjF6Aa*uhSQN5g$61H89qeUbMc3vx$W3N^UN3@%m?^_9}D=5gb}7#IGUj(?LC
z%D@YIolBGgaDYHLd)5x>IVBW9zl+y#boXoycb-Z;K0MiKrYbXvPcn&taX$F*zmz37
zhtgVE%!uYh^NyJ9U>ZqsDl@G^mr9bDp*hvrCLGqUiMG!0dWH^{2;_8qrr>kxwIzw6
zOU0FsmN^dCcr?@bGH&ejM_@nq59E^%K9C=O|NAhi4jciOm1Xq6vipVmcq4XkgJsK?
z3AdNECd9^u0m>DgH__Zo>oGy7dKWR}!Kg~h{F;!CIT$H$I5k(LxgtF)`HZ7mGy;Pd
zm2xM1@<?mUl0|(;n&ymLkue0S#Aa0-#za15M4@dqJ<>6mx)Vq&eD&~o`R6!6M;a$1
zBeSrO1ap*-OY3rWlhPQXVy@dw4D%NRk><8xxR}5Qwe9Wr_(%iG7*MLyZ4>gXO0h!5
zF0CI%jfgZX0jh23{0oy?u9MNgYndBN56YT|qy1EV;sK5N4Xf2;`7AD;mgmc>ES(%P
zAHs@sTduaV=wPMlQ^zpug4ApjVA(!`N_{X3wTMYC%F*aK4y6sEVHx<9ST>vI=DVut
zbif5D5FWITWIE{S-`V;^NvSq99$=gfX-}P+1>BeiT03B|bBbsH2Ph9tV_E-fF4dwX
zYrNRSuEgaf{WnQnlWhHU+)Xe~1LjU?g`MfrP1H^HfZ8mT7S7@Tx?ElcN`8#bKuvRx
zLP~(PMX+dt`I(e(gJK&jB0J%y%i_%NI`fe#&2m(MyPxbV>qU8;dZqSU9GM<7&6hah
zt(*KpjXa@tPP2;uxfh{QoLBQBAoYTo9(W=dZU*ru+*8GMn>~5&d*6{Ce&>%s=rmPz
zHHYUbmJ7NQIh8CG^Kf{EAP8t&j8tioAO1`k!!c@qBQBh#AWdL4Q*f+&YWWIStc0Y}
z%^IOO%nI9hwj6U7%ziRa)-qJ`Ak<uF09YMHrkBo1;2hy+mW>6rArjcq##^IZ<B_S+
z(e(`R*sgE3Zg{bY1lne1z1aMn49c>g3#vX3qK5g<Vi5p?0=I64Nh=r+4(nfGCR84Q
zPNCc53SHDs=cMzIO04azX@Y8L;u{z^rjxk#RW#BK?Ecu?6ms(pN7i#1ffT~Au%&Gv
z)Z3oxZYS*yr(baNza~0a=As$UV%F9(dg&%y%?G9+K@iPqxUn-=T9=+Gi|V!GLIFY{
z9W%C-dCY6R1P_M@&<72Ec8UTl>jE5p%am|<CJIq0EyXz;A4#%`cX+yJ$W+K9!w6Aj
zhm*IAeoqer*#zV(6u@MaS)+-moQ3Dyg(2bxGQMudh{0AdX|F9$#T`GDxHr_cqRF_c
z8z<^7-I6M@;u&ghXHPF=4Crd7dy-v3K^zgYfe4ps9?R&mEzSEslxg!!mO;aouDv4p
z-Pgpfmt{iH%|Hi=@ZLScG7|UmhK6aalQH@zoa4$KyLbifVD?D*+4V73=;gsVwGI#E
zqaXc9_MaS!kAm~r{!<-gsdL^P_kyamL@EIuU#(VD)9$2ssn;<NLv``k%d;aTq3EGm
z0&!h-dB>VZsm@6htHwtV7<n!pctW&{E;CCMVtLP<WIQEQ5Cpi00~}H=Io7C4){q~a
zKbGSVsBNAnjh`VAqEXp0#-s)n8$dk5?>(;h1e-BW7N;4DjZCdBK}rkOP7AY)#uUTM
zW@WK?hUAWw6mZREnpkOdw%Ucs<T@7xaKxVVI2DRzfs?8<l(dzkZ_khqw%O>Wb0WUk
zMhB|e?7Kyx>`u5IT@z$Y#w^3`S)o}ZY}%h*5D1Hnh3lFuE7@Th>m|{y1a7pjA}-pZ
zb^$^wygHL#dZJt|mMj>lS<ul=0xnvP{6Gz@QplMhMm*P)2Z3+{AK<0e--6e@lxL3~
zXqN-!uPDo_Bg}9Fx)&;r71MJP7cmY=GCUye*aXjY-ic-Pawf%ETXVz6s_Wohz$MN>
z5d;XX+vS18$dRI13*SfRhaowfCm5j~QQeW!jaOlKB}AZ}?2Inu;^8CI&`yz8@x=mZ
ze)5rY_s>vUYswnF#R0|^YhGI@8sB(LZhieXBwXH>xKvQ5K_^Geh6quMDoP%1c;Gwg
zD45CH)CcGFho_9Eo~qw+fwPV4HMqQ#pZ@eiWl;|vKh~rgq?9b96vEcC0-~zf))y(U
zLny@_%obpbH=nD~6f<en3t{cZqMV$^kr&f`!^6MWmd+fOHNt6R2r7Er0+&()fw+3O
zL?b?DyqI67Ot3MH0AeBsPlgwoh0#QE9A9ArZjpThBs5}^KheLL{K?kg(>Y$Zhv)6V
zpgl=yQi{^d0&^N&d^KciI{E1UXe87fWOvDnS`mbR3=X;{Ix!-hJYI~yvtE`-*38c0
z=M%fyhOy}1OS&X9g^kVX4;B}7I4(2?Qrx^UF?Px*9+C1Sbri*mDMv@g-x)!uZ@u^u
zt&><<-_b~=yg$5FM5Q8XE0BXiVm;^pqlY?Vm(D~|sc=~|in5`BP`y@L^Ozj+nLLcT
ziuWVcW#NzaK&7)AUWGU~_3q(NaSv1!T#Yvq3iA@@@$YqbJeUh8ZC@dk1C9UzQks3#
zrY=X)z^zH8!6tGwjm6cMH@T8r!r>=KQj56g1$9Cr>1o@L<+s5EmUM5eRocKwC?e`2
z_o!c&C9Xb+kl@3}`e&cYxbsA+`LU$?p;E!qGbGTLh+1bY`Mux&o_K&EE4OY)X>(0x
zU>slh`k#~P^_L7(@mWr2$?4-qnhRB^41~ja^z@NjJb5NVK-`n#3u&K%q`>#Nd7d@E
z9VFKDr+MUg4%|MY3F|C%6z+%IGEapdj+`Tcv7=x0?m0|K2t+{?7D4A`pDdX~DjE@1
zvOC++DOpRqIhfb*Zc<gN$N^F{K2Aw5@@O*`LCg}0*(Mk#Qw?nI;R)nsk~DKKV7(%4
zDGh24r!m3LAtlz@l#=9J6N^6&*l3GCOrFmXEO6G<V4y72kSyz}dz{nLgl>#R>15q!
zRvW+_jX)}lNoEsuST|ArB8^T`$4vJ|V!{Pex_B{0WgAz)gQW%)Xv<5)T}rcgvI4}_
zrcp{lQK^V+E(_HdWkzT;9I#0jv_j5&EKV?Mtn_)Tm1K@lut>tF5eE|()*RoCRd+ga
zrZ6T}#Z7Y~_xcoc;1G`udvY|m0KP`(9h9V0L*cpBka`(#1V!2zB1?DFll$+#3r|7?
zopTxYn<y3zVO*ZBv|%%)ofPbBO;aO~5+?Blk`td73wJMo-x$Lc7RH>nLR94D!73tw
z&qh-VtQHu(+6HWE1OMKXqRpZ)SF&^!hG|hV7|T@m{H0MMSb~9Zk5Wd75x(zCZ$+Hp
z1Bu#)QUG(=`K&Kx!bp0%(=qBOL-7&0E)N{-Wcc9m`?C4Ut4JjBG8jw%-JZ(9!^c|J
zA&t!rgYj^r3%7wt!H~sL%jZ<Xf%%Ug7L-Ms`dqPN2J!N6Mkzd>u$2jDAWe*g_t$A&
zXs;#@Qn8RV;*x|rfmwr@CxJkCM97SDlV|6C+Vt{8OyYI4CQ=fDdv57GLq-S|bV;3u
zNimgoA(?of6L)A#B)mvnI{^rYP_lNY(UALz0W#H~xRsGpxk1uAO?WqqZ2f+yZ9;ZJ
z<t_MSN30j3la9KFM%{}K<G6@BVF5R%k&0i7F(wTf6o7TpO0MYlBlCTZ(^JxoEqbW)
z&y?0Q72@bBG@70<vyja9raCEW!4p$x#U_;u7D;7|X&j0{jlv9DIaFNH$!YT@FO0-V
zV#*4>vVBfMxd*0bNilg8Ppx>MTQ$OI2TYfT8-asJc8XF4;H?Wb;D&uHxxkh7<rpvq
zxf58m>hcnbY&GdMyC5DerF-^F&fw)k7G=5m6L6Ik`b;X;JkU+{_%KMa*w=>}9qXvM
zrG?-21aKo$lhSqrj2T5-T41S$QlR(BG=P&UGU;EaGE!C}ucz7!!LX~k+|{k?GAC&R
z2GYtc>*v(oGOl&83p$J$xJCROhm_p`^HT})Gbt@Kq`I~wZPahZO-BmFsjT30rEnN0
z-LA}gU>UuS<>b3R(RHZZ)?5{THkhL-bV_#4q6{_1^_p|c0UnilbaNg<Q2QR7jz<z>
zEc*9YH99<PqGf(iV6!vsIW_OtMV`}%fs_{S*#IlaT(%xbE$DMs7K{_$FJ%GA(v}*F
z2A{~ZC1tdC&@@?-QRbh?AL#CtFg6<EtVPF$fbe3|0~%XKr=Cd^7gi7aSdE6Pokl0-
zT^99FVs##z+?@oG$}($r2+x@nKc~lIGeEnDQn6vf%*+#$I6fa&nj%6G)_J;_-Zk%=
z+VP<gDpJGIB6OfoFs+WP00{0c_CrN-l^N;<3-lsU#3SNLPMkbDU)7O}RIa4PLfE$u
zywDtrI37{UPP8Y;0&>)V-k7vFe`k@BiZ@#SP`W)~ui`1!zT-KlHE;@}=-^<(<I(!@
z-U8RKzm_uwL_3sa7<GFT%Mr)AFDyAbI7H#GsO>==(Ab04u|}mpw=VFeBEbafWFZUI
zuH{HEhI&y#AHs%|LXTJrvCVNL56=SGy48^N^*jzqS=`Q3B-M<vEBIVRIP;-2ZrsBm
z!-XE4pa6_QEa2TJY>8FQgT5|EjQ5$&t>`RRgcBSwT60cEuW8O~6wgx8mipmfNP)}j
z`kJczv>nvsoSAIDa!>WnBYd8?-I3n$q1f$-mJC+PsKbpyGyKU3Rt|Q6o$C+gVBP?;
zxM5EUh?tI&8Egb~U_^ng#I$74AM3;b?}3GS7H6A?g<CMD7G8_HYu(utk*$J!tS@uq
zWLN8iSVts1%7Z-d6s}fqfw(r5?M%8c!-`B3fa7XjYA^C7%cKXI+&Jd2Q=}(Ol=)*e
z`Edz^Hdb4jFLgs(i_FZ+<_Tn1?NLjs0frQbjI^_M<R`l1FaEk3w@A!tv2o@_**x7+
zr~;Siq(&8sS);ocgE#MyL>6Td3`^*0iouAcq=fc2X?P?y3=F>2qLwLOX>r~KjmwB+
zXT+dhSG|_#4xUK=&Im-jtsSnU-Bl7ct+^8^W-V_gf*7%~ic{^Rrg*<)@uq~T?H5cU
zRmS0bjZ=gX;7hyMwT3X1n@ilx*N};SDXk{wg?cEs=43wWOS5|hd_R&5<%0p!C?RDG
zD%QQLY^91Q8H~uq0lk!E+F0~=yaJhOO+u$&*X9M8gn6lCsi%;W;h-&L7>7$5nouV|
zwY*eEgc;&Fan$lPc&m!G_yjOse=tHcZEL?<q%ao|TLwxwJGnBh#~8T%V|@P%)H@=6
z0g$X%QxVIRmou`SscU;qjDzmhQ2SXPs$79x;Gv!By+{v(M7fpvN!-ty;o213)3LVf
zXgskT?f&QZ4OuiF*StSq*Z)wKIYF>i*RAip;UyeE0mjrb&`i580v#iXKy<M4JJv~J
z(Oi?w(2HqSmaUj0F(2chkL(4~3KQ}m)&|>5Vn8e=u`e;hc_;RUl5El1(_AilJ(;(9
z`g0@<IAz4v<SFvsab%t^X|*%0RQMZZ1H8!Oba6s}nHj#T6v|NL#<CRd^H&&03)z$_
zGGeZyH<B=XsjJ=7#vqf4;F*~vGkX9s+I3#YmrR7>jj<BQr#*MXv5Z0q1k^S|+ek<m
z$tF|zHhmlh8tT>wZ57Yz)^J@yVw*M@(=%m0D2tN1aRcOna?xI2DS0NY?B0z~W8y@m
z_JMH>d#R2ZPeJ?gs8-~HZQHr^y6hF+5cfMjl^=fpebqIvIC}*z8uAOtx{VK=can+9
z&_J#<;HLv`oQg>RAjd(l%*3j?tt@4Mf+#uDYEw?50D9h%kC3Ey)<$xB1Me!0!`puX
zBe%>BTU<!dJ-r=77?vIYk21^n+=x)92c@Ho?!NL^UrMEoR4|9)5iRGFHs13oF7E@>
zo7h^ihv&#5nnc>kuXH%BBgukvKBb4r&Le8?Y)PD*iqr3C2giu3P?=|>4SUM%kX-b<
zv{IMz<}`UstSV9_0}m9g@WdEVoLKr`@~m*G&9iOfZ>;^0z+j&oY3k{yuOkmCaYmBB
zF$Gu^(}~PRc9v3Dq%b{mq8f{O*PTST2d_QHYq@z>yKwTwvTl1X<v`PeB+(iWJp2f#
z;^5>I&%cj4*+BKuDYX*BDI;~q!_NE31MeDITkE5du^BC3+s0_(h2bTwMu{?!ToG|e
zq*|;?yV|;evliNBT`XBrsv+q_uGXj0+M7z2nk5*%r*wvk26Ffum1G3oiINw$ldoh-
zSCV(5tap&)Se6nCT3ygjVA_qSo4{2h&m)mznq~Eq*vXrZG)60HNLgNvWFxUhMvh<>
zD(y?vQK8&d$w9qlQ&Np}cy4$AX(P9S0j6tGSl^V=@{arh4s;qf?p@>*(=j4W%$1Vx
zdLC;CS%oaR9Xv8E_!;(KbJ<$V9lw^2OtUb}2*rfDgp-oZgsS3dgIKtD!izbTb}f|r
zJFeWj&E7rKn!F2qEaVlbB|sAtko^`eLs9i3Y~55*)A=Jp<k(>po`BlrZJV3ijr8jr
zur_{*1JIRR@fGByVDZNLQpn^rndYEdsKk)1-Q<jN9Q@;kc;BAGi=vRo8WTQOv6z;6
zwTk-JRF#T!IRQRbrig2RT2-!$yeTv}L>}Zq4>h|f90jAc8awMnmZ?E1B#KO_BggeF
zL=6-<HIv?YCP+@`vDD55TaC+SBPyUC3)rL@i}?(4Do4?QXw$0bm`??8xB|wrT5o_M
zH3r31J~`dSk^<X`&r{Ax1wVgwcqUySkO>z6M5gBCDPdt)1S<(SQ9`$yXe>zwxp4qW
zxGDXeG7{p6(XcF__11Vn`Wf;;HO?t)<CqBTb54pvsd1d_q0XyKXs+j(?vOIdDcN*M
z+oiZ7!^q95z_}6nvy$Y^pho9v{M}HGi7QBEL|E~598*;%fQ-rTX#`6d*3fdUVy&rA
zJ4V)LiW}cOkqL4WE<?^Nm33S`LcutM0cF-wQro--xVMH^1Zm;n08%F#9**Mi4zT~~
z=8AmftDgsCsmV`&^b<KefcH(+bWVwpVLHW)uqbMR3&bW*UN9J00ba8LjK|+eXu-iq
z8Th}H;YhTlYf0%q*iyqL)NxDXvkyaAu9Ri{&a!Uzn+{Kbc5(Sq$fp8oQ-DrSZR^$y
zs%$!7iY(-d9-=A>nE`iTp?1f^p4Be;Gd%Yp4ij!r>J@P+n>g4Vvu6q953Bnr*82kO
zV%4H%3XUe2&&^s;i~Dt5sqnfX656q?wG<)-b~y}(Fy1_yd%;L@|D_g!1G%`okY0DF
z29eI7zL$x$30IqABO^S**QlXBrNT8JDpDC^+)gsF%Jnr88F3zN;{a%v{>0ZBP%6Ws
zJD2CdaPnzwkKz~#ADe|2Ut3y3A$&<H^_ohtvE|23j)?_mo5yq4K<2Dh@^XOZd1^nE
z%hOAlurr=&vyNe5NlN(I2y2<OItj8<ZSth<q#fi$mxz2^bIUWTtC$#dl0H2<>D*a#
znd_uFM>SY5j?6T#wjV{w1^^nhXAF$Q9jAu%?Bi#9C^NX^+R4Plwr6mnk_D#mHBPXn
ziCM`kqDnF^q?ByaszK_Us;la>44bEqS81}Oe=p%axCtYgwj}Hw$?)hC)MD<7i>Q!K
z-$ov^0)s*xQokdadKunyOOw^v>;&(zgNp^$#bshV*5_kCTD6{+SKru^)s;Lb<U?s+
zT*%?$Pi5FX#i1t*^pFFXYCPqf9egn|RS^hlX_GVMaz^tmYb8;d)qcka<<CJSO;E!g
zG-LUr@Ac&Cm0Pm=+HDjvLCKGwp)yc{VS%WaWq|w7#Vz86K;T&UE!=olmuBbSy}j{?
z*&~bS9R>p(H6J0{&Q-T?*sBWdw2LH~Yh$OA$?G&K4`deC!1so#Tog<%;aIw01CifN
zn9Rd)LF=6#QxTV&1#^lJcyGKJ)mr=7Q#V1udBTox<R^R_2?LkNgdN`sp9)G-Gq<vm
zf;YW0Q4WP+h+qn?@!+&^&L?r-?GVwS&AbV}7eStI5VcxJYa!Pmw5RR^^6V^(vWPsf
z(I_KI<s=W7o3RkRk@wC}+hP}to3_-z*r{I0Rb_pp0JalF_&%a-WHyb=*~IJFS_Jk;
zk0;G-k!8dt4LL66?Ab=fp@ipS{fLI)=t|S{f(_TR%?V#M!6>?7yGb}OGA;TA7sLf8
z0W`X4!z?~mY`Q0G7QM~HZq*<(TWK%tm|$C`(K||57ctF3+Bree!ZMzU9J~c%;`F6y
z+l-&rvy$f7IAMi!k1F$`IV$fkrZEg@c=DMH&-b;Xx>#9}YGWJkWf_NT1Ngk8spxF{
zSZ1To;6>X=U^z<O1Fdw4NW=A_h$s}N$HlGIGIICsHOanoQy#D8<m5?OdKX~(dempY
zg+h1^kVx`lvOrkFxvOSH_1X$qcxf<gwzkCp&VZ)2GqLIRW}RbZ%Ls?JgCBl+@Kj2B
z_oP&LnS(Ys2&g&PARfX;xZ1dBJyv+DU?yu|?KV|GmE96nri^O<=QZyGo}zdPD|Iv1
z5ozz3Jxr7+wgDlzJ~c>b=d~*9-~fyOb$zgK)S}RK9jXoaoZiL39&k3Pg1jUvGdoZz
zEH}^YcpUaN>QViP&X75Xgx<v5rIede{rDW`cbwQvLk}kk3)L0kez0weM!?GWZ02iA
zk&ZJUg6Jp&4;P$M8-EDENHmH$SuUhN;Bc3%VfeyC-n)q0xD3=m(a%B_<qI&FGHt7*
zK}7A0Nl#f=?t}_}a(ekyNrCC)uwwzRu|hmf(isS5L`IEL)o=v97{n7_@pe`+0GYru
z$GIB0Fl8IFz>S~5_09K99V#@!tRy@Fv)!Hfe51ak?|%$5HDX<ll)6Gd-^_4XW~S`o
z;u6ues1DGC9jX<vtAX`A4yzG%XpJaLevdUtb~JJGO#8cIawIcUXap}f8)WG)mZL-j
z=?soa5IRJ&k&Z(I-KR1;|4c^5pMl;!(&A)*3Tmwz%4TGQ3h6K?mgxKEIDAjx5vTBI
zYylbJqE98BJ{EU=A=%tD-9Vm#S7%cvyVp4Vxwf|_wFY2McS|P2G4eE2+d3T>?*Ryj
z9%%3hzPMrB6fxNmPL47PER_r+kCLG-vSS+l`T5H;B<LO>sa=ut%aP=3T-ibgfyjdc
z5sXeG%_Z2N%EhI~%Nc@AAB-dD?ks9iPF=M-l*L5d$D4F;`0l}rujxh$j=!_JoQuOk
z#V?5ZG07OfP8{Y`sshLg=nDdga#(DH^#QeWwI$df3b$|ub6``F2LbZBIAj+@K?dB{
ziwNVR*yhECb|Qn9$KkfQ+t^`F<;h?YYt$%ZELARI2Ze<%-w#xAm7I#YRj_dxj?D}V
zd@X~mYm|!8D3@dj5h$N=wb5BK8bV>cpLh;fe~!gcif#sA@CIkX9YGZof>UKv4`K-+
zRalcSw}ePU{uxno1rCKefMZ|s)KuiOGDqY|CX*v4q?Z@yZ(EYtJX<vgbxAizND_4-
zE$fhoqF#lY(y<rMOGpVZ-SR{!8>>sQvwa<BGn8ig0^dKAp`Y}BT4qj)hRM>;a0n;K
zmMmN=GXl?@x|U(%Y_N2?KSygsW;DZahz3`(qc_y?4AV+vG%k%drSYh8EUn(28O2x9
z7gW~ipW`APiFff>{If%uU$(>p&gTdK2haw6YE6uh!{7i-;eFt_Y}9nfx@Gc+Snz5A
z>NhElPLQC0u}N-ARd2$W1AG~st)kFIwg9FL&|<o_sS;=Q6tB~|kkJ{Kq>uxGZG2wB
zMqlefS*_eV+{p$*ja7Hufyd3}(uT0%^?`?U=0%lc#y^4$%b}PI=r`qT6%JWyi1z`u
zGBN^}nOs&i9;j9t;t);11hNW4_Ow#1Bbp!|k{$?>nHIMx4Zuavp%N%y27OC6cj$Z$
zH9H6!N9WQ*L0Rlo$)arF#@v0CmodF{*jEOXtRt0`$jWBPLbAB3xd%Qiu5%iB2}er;
zYOKLYju6S((-|PQC3QrDq8lg#4qVdpc>WZxe^zNwj+irIX_PN=<1n|br*-6~UaRO=
zmQ8mgt+a!{D5=I^adA_%Y(dHEIBdh%x`6a-?;*$PQHBD~RafT|BccQQBdV6Ag!`DU
z4djA5ts+Spd@MBvp20ARlc*wBIgVlZ;)K;Ry?4HC<nQS0wM$OSq5w7{Xr83a(q>}}
zqZk>;TDb}$2#%^ahtUjWI+-Pn)Rsc@MH4L@3v)R#pl%PCI>(EW$?474aHvU{ZAc1+
zOD+7mW)_DqE{Zi5Q2Ay`+;W3=V47lM<_S}-iWwOgNskD)HEEy7xJ!dNml&bmAK;J;
z*+&|yx{iI`mAx5=h!Qt9T;M~`wW#Y*9SYXZx(apDU3W=lDRwiXz!~kp0ho>7vC4lT
zdLlmwStxNTs!kf?kV_WHBG|cfx-K~_;^y$&6YXFRaL{d#BDz_EV;5lQLL5?Vt7m(U
zuH&)Tk_7w>$d+qdgFS8GewSqkYB|kq_8HLMfPGPTi5gTH7acV_L?ms0!F6*o)Rp4|
zZpJK@o7lPvlhVdA-N(UORc0)ksVH?lol>l(E^eWuUE^%Tu<+TYGaN)jfKv6EuJ#=C
zd(s_tRTsVlmT%Z;>2BXFVAGgFINeLr9gmO3(ffS0ta;sJ?CIjT4C*FN51ZPFP{Acz
zPWe)=AWuO=nYcJu)s!r6UX$|Dk``;nU=aIMmjX*j29F1v&r_-trBp9SxmMDelFNZ5
z+YF~Fb&mHQ1!FjbOPRKq4|idZd0E=Ihgx4C-ScA|W(^RL1E2X#MwNXtV076d8s{o_
z|H$ufT}EM~kyjT5as>^G^Dpdbk_CmXY+j)0hwHw$T_e&?mBnLKCcqDLY-I5q{0gbP
z0SD#iJX=~j@3~RMSH{l_+Qw0Q)rC$7NNo*w27~f(kT^17hmPr1c2kM5CzQDs`2ubK
z(BP`ICD(kPb1t#1MN+mX`G_*XkUDm_x$sOW7Ix|VxflSnE~hU!FB5@B9nT#Z0KX4>
zTUN8{Qe1lzg~b%A>hA%=;<ctQoN-6|;ZO~rR6{{`!g^3w;@M+3wjEqtK%vw!42}%f
z7>6$z2_fxCrjeo@pssnS?IMRJN`Nf5$T0^EXD}4H@1n{}Q7tHP>!|lMU??S>=hFTO
z+lbH5<2!{Fz>*CdfSNYjdK5T7-oxa(0QfQ^MIIp%1r?3Z9*Uw_8?O&2XTj_G{y+~G
zPKoxnWt3r>;UH1j$Wpq>MWmvm2vi{6*6Ymyw@h|Rf^<`xcqu>=rKn{Qs#=vl8|tdi
zXc}rEbP8-gr67(z2ck(OW#Bp9!$q?z<>kDzP}t?B!(~K@B{->iHKRpi3x{ZVr6Nn)
z*QCC=ryCdt{l37@sU`%+|D4Ep{xsN}<z*OBqXw8<R$)y_fU)n><oC&le&lM|Aetfy
z%_xTqvLSa9h3inKrc0=`g>Wb#@~3QR4Zf@b!lw-9jL%nT;U`ldaVAPigtpNVj~44^
z7NQr6Ae9tosgR`7UtD>UXq5+kl&Hg+NE7LKriP)Jf#Uh+$V#()DY<N3Te9Y!*~@IY
zBV5x2&gtU75EQ%)X4*F`?s@NAG6T?xS+nod@=fBon2}ctB%u(@%?LIVT5cn>%z&V!
zR?0p;Pxq$s#s>4Q%!e%*4?%U?S$LX?3g08)fd@^gz5{a=u43uVkUSH*uxE|i0+BrX
z@bI3)l{0fOL-HxjQKm3TivxUMxitB7_Hg)i5n0y7r>bQx5es3j5{xLL-R~S#wzT->
zqCS)&q+(Kn98D~<?IY$uWSX7xC@_}6x&bm$bR|NLVwg%tn}W$W5)yNp2O~J8lH15p
zT+rP+AVU0Ei-WTGS$t09Y7ss!^%9(@Xf)r!YO&B6;2JoB94wfso;sdInMEGDFys?d
zRr%G@@${s4N!HP-0gmm-aEej`QAH|m@~>p~5<MsnofDVkqNU@uY8-ml0GGMcuGO7t
z1fNsm9Iu@#<P`ckm8?uyw*v8#U(TQgh{Ke1OwER~WURRWxs;Kp$EY8P*1CM{n#kuO
zsZlqhQZi~-$jfv_2|uF@7&ZJ*n9bUoa3V`O3Pk7J_cPl0v3%`K?M1Y~>`4xhIagC>
z7U{w?F4soH2jw2(zH3AQf#HXysdll)NvCifC#mi%CLc^w0@*im6s#{TjBv5}UF8pu
z+hw!)MB{vd)MF&wL08X5E^F2{nSQ>EvVYV;_XF>$p2ajn#ftDf_rV7bfayyr?7?|?
z?tW5cgb7yyNp(t*2BqOPV>F$$he=EeKF1>X0)Aj*!f?>0U`58DV7WB902;NJ%PSo5
zCTS267FZJjv*gP8D3k$mh?CBNjQS6Om+QFboJQsJB%(nU@DX0vv(E8e3hIpmEpRq*
z(VrqDZ{T7#a7d~WWqJ8ZcyH`<hgY#jNr8`^rj8HH-MxSlK~}#)=8GzA#`Y?Z4pc8H
zZ-aSj0CJ#~q-sq`ky_hr0v!b><2FMC9&|3`;_#7pNU&YMF6(uC_TCKdU|?!RT(E-Z
z$sWSUW|5WU2s)#p_SA()&O`qa&kg1)vy0EPsieb{tx15PED{oaPnc+GV!+M}<^X2g
zg<e_@36-73ZCu|Wo+l-zM^iaDivh)AEmSjNXHXyV0PQ+p=sJkpk55Jd<Ok$1)i$CN
zB17b~tgCM#0`-9mmcbI1YjZ$FiiQ@XR$tLk4fXCsEYpF^L9RrIt`iV5Zjqz>MLk2*
zMx5gsxN3NTqMdZkOd^=w%Zd7sWjb(TLSd@mx;f1yJ*_jvs(MQ%IinhoAZkzo@n>)f
zL?4>NhY8hfLX_(7FV@zI=>Ty+j=%Hcl?#%Tgpb!EP@>1jW`Y`=`ReM1j&St3i#LIL
zqtQTNWoni-YnEINAQm)oak0UGQ{j=>6i<qM3WCGk2W_2c=5#CI#`-!uO-1(_vFOGT
zbM2+l^_5f8`oU2S-0*Ax2a(ONI<`zjPu6>2z4)4rV;PQO+!VmNDH8PoE^}c5rlyBO
zIF&PStruNSPMUKh#Hfw1X!z+<`MFPjEbFh|ka~t%*&}K;>ZB>h1B#g~jW%|i(av#3
zi*WW({I0KuDpP%1d~P9URN+t%$N`_tsBFsRbnzVd2w1nsW<T6mHzRt9*Jif}XPPW_
zfFnu;?66L@i?FLfn^|#ae0VQz>|ou5y>Fu)5@o>H&e=r1d(xMiw^!tqm$#6+JVQk8
zz(7KH?2*d*`572J@+vn~SJ)f?`UMt8r$MkF2h5~*aF~|yJ?cp?r<+j0T%8)*iRQ>*
zSQwt89>>iTaSZAi#0pniP8sE9zQSlSmCg1<TYuOIk+zM_JJprW$F4j9J9jYRc0@}F
z9xG#M>(~ekrh|L<`Q01x@*6j#>>|R0<;>&fGPyD$d_kuRbhuQzz<DMB!KWEqlfDiN
z(!29oXHd}2;d+wFXQxU?qXJtNy0I3c*}CJvP$&eWt!yA)c%On~s))}OM9IJ*evX?=
zxEiPj7?$?u%B&I2ii)Yql`*MWQG)(#op>;Wx}7Y!(6%E>l0Q4zr<cZOV%;l`$jV+k
zo@Y|w-EK?ibKL}w_eiDWMuW}L8=5Dco}I|k{YP?+{4YxCwGn5>dhn=RCVX;sA)9M!
zvc9@3>-c?Xsjf^1!y&Dj^2A(@7HN2cr2+<IQH5t?AP4<s@O0jUy3@Gn(@4NnOBV*!
zL6trd;Cs{`LS0%slGDLVE(b8G@mxlLm^dHss$+TYJD<pA+Lyf>gnm<1nVsYLGBA#E
z?K&_vs__&@iFaXCpeZMhWZv!T4a_j_$X~~WDysk_ckqgxH689YXIo$_b1-84SeZ1>
zE~uAt07p4_Y@v{9gMrif3fVH%nm__Nhw<Tk`-qAjCzj_N2jOP~)B<evS+a+b4-jcT
z{;ZG4UXiuchER4d6^=DZk<sFg+6aei3V4{s>v-W*n|Il%o3fX6dA8Aou#~WHQ+Zvd
z!x0MRD<OU^1Q8S4p#711Pzrf8Xdwcad*gxF8G{<<Vs5R?QInmU5s{nBaDC2z48HfI
zC!bxyc$98mO;%l+eX|^kW!YhUeNA3_>&u|Z9pqu4-+?evYCx{`W$F$lt?%P=(GWm~
zTQHnZ>psO~nSrIvuo<J#ZH~Na)*x{fijs0<g{ctBsRfr}G>E)&IEC4wE5SA^MVUip
z@_8Me)I7!V655(1h8bsH{E8P6%3?hq*GT@|(%MqSz_;kRp>dd!Ffa|{D&jmdts&Vn
zB&8nEA*QsuqmJ@K0fx7}zNrjir`OS1)nXiklGl7L_xv0`Jnn<}8OoEV``UfH1`d9A
zdmB9bw$x#jInLSBs1T**47YH(cCRmmavk(-S@Q{RZsv|W9JJAJ0Ard1Qm~Z>xY)|U
z0|qick+nM*OB4S#ht)T#c{NPxyxT*-j!#cyf6W3Ny({IlvU=PJLNE_s4kt8)dPkZ=
zixFU5go_imz(br#(0>m%6p3(Y3TEsEjH9ky$7Fw8ZAlKL*J*;%h9~ugdO@h<YNyIL
zaTV2eV`nzgjWB_@6q2;LRtB{ak98*eTnsWLgi{Hpb6o;38^Kdf%}^!vx#u|CfB4;}
z@XAfxfRudhja#z4ori}<1O`E4xh=8swoW-)KI(F)8^tP=38yye=yY;QpKBY@EU%v0
zO0#ppGh~J3=thiOaRbJ4s$Kp8a@Jn!O!`fbONjP4<RLEAY+X+~8RobyhZ9G>{h%fL
z1Fmy1ldzO8&ZkT-8}};};H*-Vz(&E>E!L#CyeEa2b+)dNhK`JsnX7tVEIwP>W)@jl
zWg;o+&-Z34Lda;MuU($1dFPtBB4vsl&8Mkw>)}Ag?B?e6CIa$}P9W<*nk%W~a;Qc5
zP@7&Yt$&hrOM50Fgi3iQ!-;m%WiBr+Ml*9+Tw+lM4bB!MmW9|p#Qjnn@1Nm*vKQ1w
zqB=&ZqU9_ay~W(Hsz1l~PZ=}HEi-Q#!O^pKl6e$IH@4Pyq{8Od^Ye2Jw50wz)E0xs
ze{ygv4;~%J&d!$X?(E1iXj883Wd1Oj8(nBZkaDFCoL<8L$SD&tCme#Y%qE;EVJi|m
zSIX88+{A&tz-#q-l-TvP_Qgrk3XHXgH=3Q!l#%J5qVjy71AV?^>t%R|W!*j)x~Lt2
z>C2?o)xdo1F{|jNBMy~$A&PJQL%cS}Ku{}kxjisv#@;~|96tU7Fo1p8-n=J;>V`}x
zFAQ2;6;rtig}N5nr<PI2s9JaUOx)70&8B=jMMGwR?&O_}=r|auJdiIFO;jf+rnJt7
zsGPR}cYXPzANAz=-Br1Mvo7~;?jri9rDRcJ>s)gX%kSgoTW~r!Bq(|l`c2uh&B48_
zfvs`Cx*v0>q2BxwNR#<+YGl2}1Ju?|W!P#fLBP2qGLqfSNOP{PRh83jB<~({<xvkT
ztdc8$fjAJ91mIy;Bjy*3rKBSjfTPqLMAXTmCS*s;>RbqUk#MP)58>!&aG~O$DOE5?
zCz|T6My+%f`6{lhstel*M?me7gv6pF&?V<A!B7bn_dihKlR#NVhE^Z-K#x<~c%9M7
z12~J0l#uf}u95PxNQHCR0K0pVWzweY%}hd2)z?5h(c&#zn)sy)+LdlM>>SY*_4H^Y
zML29DFf-E;4IP9GData|1qB}N@8R(iZSEd0XmC%mYHt)|6Ok+JCd#^5GIvPACkVg8
z@fbHbkZ0p_Id6C6>A{Jtt}FwlI5I(Wnri|&QM$Z{I!Uz(gF;QAH)K};-&9>zH?F}`
z<z+-j2P2(MyK;$KZ9HtN=V4-PQ|Mw6pm1AM3A17W#Wyf>$LD|&;{zEWsos8dN9tQQ
zq*w=8kVE}KT4pdXuIS8DKv5Lxy#Z=uSn~>-I-KUH@FtSX(A-o9hhSwBL_>&N0MReV
ztmxqTlw;adlnsoi2t5$ndNh+IE60gmpUHP%HZx3pg|(wDYB9sH?ltPRTGB`T$3qUv
zF?V9!9P1x&B)!&9zVpMm{Lc3eBwyK=)kaA^f2S(fc0$=*Ey;~7cuQ?GZR3ESh&AJO
zc;<KWWFRuHQenQ|m0AB15jN7A)Ts9nqVj>vkyG%!v1O{7XYGmla1+%mEUh=>!=5FR
z@|vV~X!wtH2{(}jl^%F*g9t_gLntASoVB>E9>i3>sB=wez%edvv+R=5fncGZNqlGw
z%7)RfKs%odbl||H$}Ssl5upfGEf7QO@ucpE*7|iEo`Z~V##82_QzNzD8aZUv$AZ|j
zxYA*h{-2y3N$2DfkUl56#l65rRCbPp{Bp16lwOd6P1@xwea^)mK^hSWhryt)MQBEq
z8RgVe#Vb-WXAYvNH#9`tqF%*;##XDTk^(d|syz9sJ7OMVL|bfyhScK7XW<Cf*4A`V
zwGKLzi;SN>+gJ4$z5&(}C^V^W8i%ZjC-;)hVWUTVVN_wj;d8KTWo1Xl(aE@-HV1e<
zFB#m*>!xo9g+uBPa8QkT2%9#&z|lS^&iwQTr*i+aEge+ry8~QU`xKF}C^>D%L89*T
z5$fUDQRofXqsA##M2&e^l*)Qt3QP2MEu85#4%TPV#(|o8ga~ESNwSh}tf9u0(>yRr
zHd1JJ2O&vpV1NqLXm8zAg*K;nohkP_fl8ghX-xVpU0OiRKZ-b7$g4JLsOEDH3Lbhe
z>QQn=SCL+H$Fkp=%h@a=&7m!qFt*c^11X}=Ttb~~ch!|Udnx&aFYn?&c99P~kr80q
z<-n1hYjhN`zArbX#IvWyMU9MkaG_C!OThDGLdcfP+GFHABA5NK^l;eEql$dg?a6W#
zj*{INoWM?$sHh6XDFGkP$4!qt<g@dUFV&)fWiIo{q;rO2Ic5&RQMkpDLn>`{AV&dm
z=-fp6Hd)$W-(jHL-bQSa<MA5t)tJnDQlMHy_<lNL>YVJzU}N>f)80T%CbE6Z!*!ls
zJj8uIQUZi(w;bWnT#mDEQ_oBWU#;p)Hf@@*TUiXU8onS_W2O*gW|B#URZU%q#n=U_
zH|GeDW%>d+KSs*DK=}aJ#c(*##~8bfuJSTIJJH$0rw_F`Lbc6Pz?HPNBHlFfC3Zb9
z@#7QdVgRn=j6{VzMt$F4O!E5-ow!jUm^~_rF0J2?LVZWNqe!|a*cQtxM(+;Mq*R-0
zn+U}=N=Q~b$4O>VQaUcqsWl30P&SvM{$mQa7N<xEFD0Kwa*XIEsj-p+Q9p%z4D@ez
zhC>v~MSm*w?IXGVQVm7RGkBFtz%fr3D>u);gn?NrEU$nP2ZITtU*6tAUgJuo2=bt~
zf?RKg$0C;;bhP)3Z6!nGdwo1l_xu!w+eI!n#7!SjDH8e4SnGB!Yc77MvpiYHaB?mv
z|D`1`LiL6;I-t)p9Vw2}lAk)#0$CH_^Uj=xj3~$aIFLg`;_j66`Mwsx>nIyc!<syL
zdL}QwyaBR>`hUJ^h^IKLhs3&4+SPhh>>(GKQZ_9sqtr-s#YYogo(<CSV|?xzBC(6&
z`TpUlVJz8(MCDc{&#F!YCqi{pYS6*h`Z&~m6wx&wNmgVMBC0&SW!jodb2R^s;xy`N
zE=U48H9C-pgaoN<n^(eP4Os<E9Lp?r<)5i+L_1<xhE6;74E&-q(>#f)RLIeK=g(w#
z{zzdl!X;o?1cECt>au(on^}`#LNh!lSA5@MwrSBJZua9wnkFzfPy-^JHsv4JH4<Q=
zn@18Y3piTJs=fNk8?v^xfmG#09z1}9Za0&~>@SYi8-pe!oWTjZU;UL|0nOW!pZw$}
zIEXF9hel^CrSmmZd5I#^s!pngW6MlXZLLrTW=IPjsEEUv1H1sCE;FhW0p74`u8Pur
zK?eajTa!bi;S#Yd4h9X1NoarzI0_A>)gD1y^d=Ji!$VJ&^QXeK;k9LMDkqZ#@6}^n
z)|F`|k{15$2=x1-NB8B2-#yk&3~oKoq>akX7&juD0t<GA$i<2`yl<{r*2d3rWlgF}
z>oNvLZZ|J9Ct=Hpj`4F23L&0`MHEOiQ?~y!0B<Y!N&zNb9$)IRuWq`fn@LE3i~xsb
z1Hz&##m8iOXHS+upzI+)oc4eKE{D<@b`?T$=BZY~p|9VOdLht+eP{iy9(qoTJ_GaF
z@16rzp5icq{oGxa*I(OH2+jK0eCW&IvLl^i5EAo@Jn6ae?I%O|@ktk@2-FlyIn+ze
zw6~A7998d4)?Tuc-vZi5!*g?-1(!v)W3-PCW!!FyvlXcbs2Z0pUP4&}k<JBknf5y}
zI{k^v89e|Kebm)v`5WStuH$veT1eM?hJ{(jRkDEXM=U>Z10gjPnaA`2!N_E*Aj)K-
z0;B=2=f$y{JpBaR{uv^_t=$d%&O|yLwjR-uhbA&v&l@D3N2!FINSb9$JJG_xjIr<>
zN<vuBzI88i93~QTk>+}o64>0_21Q<mqwQ)bsRfAr+&~vv6Q-|Ki^y!dya0URni&1P
z-#56BeNRlbaOlfiX#+^s!eiQ<j_ErTvtO6{ja0~kEA82$K~Ys4#7wcED{^x9Ij!9w
z$(zh^VDOks78mETrP^-vSTslGV?3BKE_8v#R+mFyft-VtdiW4*%(=+MS_+W`w-)fS
z50Bp)WaX%XFb>b(q;wP@`FzahDgoDzRpFF{Xi5O*tcg(^B?Q4K@c`q9-8&%&nfNEj
zBSIZ}=OOc%C*exvSP}rNNC5_rnoY;CZj8`naAcpDe@*8q7*ND%WUrpj!L?Z|r^h3C
zcDk=r{0cl=v6|J5>?=t6Yq$5Lw)r_J)ho)7E;W{<Q7P+li{2E9k{BgkuIpsMaW=Un
zXD27}gP%N*|L1@Ip;YQF7&<@_wk?reO)UxPv~tixNumR<TUwF~`_rf-g{YUwvi~w;
zc6Dj-6NiDaW4H&a00+wjSBC=Yjk2t7EKBe7NCq1hQf7`vn1w@}o*;iXdtbcHhk%zK
zB7c3Tk^q5=C&;eJ+<A;z+b-_?H9+%*vXq<)3sk$&(dBL2$mmbmO*2<EjW9~LX5xC!
z5E(lcm(o1m2g!0EV~|*BmIDw$xTRwV_{<*I5f!Rf(~=jW(hCtv**)fB+ExCuk;-h@
zur(s{JKBY=vwULo;v=IKN#hs{2J-mvV??NRM5Y!}pRQ5&5;HTU#uz<ceZxURLP_^`
ze&=_zg^}ce<`80N#!wHCbv3a_`7LdEPnn8!ty<Oyb$D_Lrp(p06b7+8jA(UhS1a8E
zBy*QALLZ)<+rX)*JwSd#{K&mR85m_2Zz4k-H{?1VXzCfLcfLVYANI`bG@eEVQChmV
zNkbUh#R%|F_9O=RLAkCX4rZ2J955CZ+Ge;JEkqm&Vn&Qgp0904Y0J^xIgS%#T#gn{
zJ5P7atClZQQYNx&i{U;as_o1yGx*QqvFn<$JE00|Dj5`9>2z|eZQyXSeV<*^BdSJm
z{pQ%ySuwWg?cBWvNcyrgHf~C)%+dH*a~W-*A%!2hV%Dc2#z$uVQ<$^V5YirUK;*b9
zySwu0TTN-gA)TK!W&h|@E?beVww&SmkHBoX`I@ZNw-uVUMr~b`%?*;e{6WXt;n+Y?
z7j3Y#%poEpOF)>*eNRiJg7iTKy!!|LTHgHmUz9opHv2>Q{{R2~Ba@>)k~^!OlyiV*
zc|bOINm7M%98?%Ekjb#u1WX13N!5`5a!X+j5e&{EThvYz5&;3uzzmLun?5+nOXHex
z&+_SsoF5&DKWxEyjnuL8T#W;+qA@*_)GCP*rC61(v&;cEBf81FyUI0)S?}{g4N6Bh
zsF8u|KwUu^4PhfAJ!k3{f-Vcgq)zz<AO2JxJuYZJ=A6n^i6Je(rFHfEX5qC?0kS!k
z(}oKPW>tRGHyJ5iJOX<`p^6E9FPF-w7O%h>v)V1exqIirMF@7a@sd^LBI+@BZ{Gqb
z;K^qX9x80$8_ytw=2H!AGvac{6!ICa9<>t%ByIOcR2<AbrKW=!ARRwzfd#;{dcEef
zCP#Q5=U@jjwVG62Q0k!V@4WhotfLS;?RO;o<TD+AfBN9QJo)59Q0g7+NTy+`egqB@
zH6$|B;igavrJkoo{iu*J8yZw2JPo*n$8&RdAjwWZ=72tbKETh}x?wSc*W#84{(OY@
zOnEPoHk2mwU^MG%OY+7qeO+$7`KlCA(}S;9ffsE#i%q9KEsi2CEI9L!II4}6S8)<u
zB?R_}(qH-f5~9e4Y+vhxd78^BtsZKJXY%duzOP#|V#jnoPUn5e<38jf7TssM%|bmi
zJbea6TL9^^hI^Q&st}w_IaLCTb9L3~Ba}@zxHq?vFSmR0#?O5oHLgQBZ$6fl)orm5
z!7?i=60-@mf*iEIg@d}JtXmdQY{-suII<}StQI1jN6kM<BxFhoaVf7%)~tv0Vuqab
z<bW+_J#~JR*e<8o1k8FGJ7Q9}w(R*dD~H$t6S4(}!v0y)Iu!UuXZ%W{VWD)Cj7F(W
zMnW_Y%Cj?qy?`co*hU{>AtR=S=Umb4L{^j%h_5Dg<10c!|85zTFO_FjW{@fn99!kK
zJK|bDv1~C5t7wta=~!<(-&`4mE8<GN>0_`}mk5R2UO^~F<T=wq*-RNQ7AR}D=u<!%
z&<GMB$A|#`LX{{(4Jn&e#wjG{kNSpLUzwE&7{MvWz?CVpq_P6~dl_Uyx+q-oaDu$4
z508}#K*i4=$(=XeQ5D-PBHm{o9ZDNS#Mi&^i}L0dz9|2{fAs%CUiBSB8PANJupk|o
z#U`$A86#mgfkm<eRVy3{7U!x<E69aVp8&2O!1`wNmdFbbVs%w0>*EF2Qk_1I&FA=M
z#|$YN`6^rMK|A+u$*=$Qzae`szYI^EOLXAC)`bQ*Yfhu#k5GdXsG-rnP(c*S=)NUm
z2I;hI2KGW~BeJc>Ly4lMkbE#|%6H%WP)<<X4eX5GgVCs@QIjx~h=4tHc@P{mz}rR&
zhK@s7;IuV6*E1OvHksk@j~NMYt(SLEsBCPaUWcOPy*K66FMdUdhXQpOad4)ToJOiW
zOELPa0KTqD0k7u*VH99k^|hfiR!-y@9Nh8Ak(@l_(mM+VhrF<b9E|A&n@n-OtibFz
zPQ_-(&&AouXwK*A)bu1U{Y0wto8s2Ql9qau%$S=gTGJsBCeSUq>hV*OAsG_Yadw^Y
zi?3Rg7FvCh7@n1kZ}0(8BIM#EtxM)PpGPGU8-+qqZD+zQ9T9a5XJ(_GcFbDFh?pr7
z*D`@!6u>OPGIlfvrl{I#UP>GF7`FCr?xI#y1J(pJcewuyj8sK7Hg<K{SC&hy*$s)z
zo*U_wmUdLN<`Q_BwHk(S7HU~6W&2VWIm>kFD|W9`;nA0OWSC~YG|(NjK8l^}upT0^
z(um%9^9_0D%U@Pc|C1lTt3z`uYdf;Hx2DaP`-dm;<kL@;tqKxvWUHQO(%(hqD;bE(
zA|G%XyOLYkgz*lfJv-IeD<@}bXT;PuH-q$bDioCxR_U>nrG074!E&%r?rAEnugI_b
z)xRn)zw<>M_G8m9^G1q;s9=6*MzytgXqf}xMrQjS^C$~OY9|r`ma$XqgQMJZ$}ftS
zo+=?grM9p9+*?vAWi?XWe{u=0I>K`d^?tH|>~e)BUX!wFlub)9QuB)<qqvqH3?Ky4
z>cWv+zx%Sh{?5<K&DTFKCFE}wM|+reA`++sD!nl0)TpZ{W9@pN^Ce<Q<?_a{fL1S*
z*I`t9U|(-Y=A-xJyYK(M<-0%pv9hupX3Zhz%)!75AVT<Fc>FTS#z3V(C`ZO#I@?h2
zJTvUZr>1-cMjf)9j7U9W3c_s8j<sgznSnpyXoaT{C{b-mm_E-KreQDC*cKZI?IhwT
zc|jp**AObtb@}Y82*v)tt<4>&ft78cuzm_AkgI)E+nhQIMzGKD^Fd(LNLlDhBLoxn
z`MOAJ2tzngAwV)<d?Ptr#FhFoY9cGrMzQhY><}K<Qhn-jwIY>5TBb<G=YU+>Ype3w
z+ixo4^#A?G{}k+1+iX6c4OPQnh_F8xPLy6xqjpqXxr2)RDxS9`LqJGX2&Y69!hPg{
z2tmT~;SauJmRy5GI61pS61l2{=K*Ry8{5}pWqn<apFBoB6eu;Ut29HSy{*bNDsT_a
zTV9r>-CI&&UdBB@Y$}EKU9MJCJ+}*HYeESt5HQ?;&VV(AgW)3NVWfTF3Lm-Bv$Rr{
zU;5^+$;)5-qK<Mf3Xr9vR)-#p1eI8csJ@P?Dc)v{&emvQ>kciG@J3>`opZixp+!d#
zP+fg0RdLo$tBkhyMDNN+51R^wC|u$uwHVfc*j>(nJzYQzqNYrtD&&$`e8xAv@n__f
zpZ_J<xb>1`5&2wYVa@I@5<5Cfr%E@mQM9rbsf44ES;t4H?6iPP>^ea-X{5L0E<VR!
z_=|J-^znfV&)Pa+O_{YQ6)9RNsfY`l5u6ug(%ACD&J-@in*j2$1#6*I9%^%LN^?_2
z4hp+CRA(Z9@aEcqVR(Rqy^G8Uhms#$?1$^Ova)(rsO64k1~)FA-o<%ge;x_C(Xgkm
zlfi@y-n5BDt02h@My3){AZ<wslH#(6QI3r>b|OD3$rPgbp(rvN2UHme96LMGDbdTE
zi0_y}h&%@qE{N`eqxVKQ$VlE0!OHNMyV17FU&S!QF))5Vo6^HytQKSqFz(>-rzj})
zf#Zj|FLpq^IQB(m%P`PgS-$>~tgbCfu>T0rDNqdoZvW#N6)rKba04H{_d~fnc_!uM
zbvZh3Au_IOHT=orN2pa@DE*wtrFGa*sl3Q6|MDZVpqZGwR9=<MTd&FWo3E%wx;JB+
z&p@MViM?NORs}f5Q|<wp8NH0i2z$<9EZjde!$F(iTCBih{qkS<3-Zgq{+m)ko=5pD
zEge`Y9Bkl3Wc0dq<B4U)vaKN2xhzY`3Zo-vsa9T?a97TiejK+~xYXZ>DE1J+TUL<U
z*xH!NJ+gz*AHriIk70|Cc1#=m&)-;p_Z(B`9Kyw~?rqAi{I$O(U--pelEUhmWB_^D
z4G?mN7PBesheYgEHqJ3hSNNZ=+vUv&MJQ$mtr6=p!Ypx^z$$zW?rXk%=cfF{U;kD4
zC;#-f<+6w9fhZQ2YYHP>?i2G+*tR>WrW<hc1;>YQ7&sE7a%Bmz5V3uVq>VPnnpPv-
zL56EO<pg#(SL5bbMVu6Z<Ak)}V<||v+*nOSSwJ9-r^?oGEMseXM<2z;h8Y|@HO&2B
zXb6mCBqYI!D%x^}8YQ2j-|Op!7af6r<Bd0DfFFJas5YN@dULsz!L)058i9083Owy}
zI#++kiAJ%kL`f5oi^{E}$pLrTIPCqXCHn{WRmv-e8!+s3klXaMBKP3or#g2Ppx8U=
z;J}YjxQnJ5VyRgW)5L3Al3%$lOFOsq!la5-7)eho<X{1!4=01mVAyJ4nj(DQjnX<k
zJP3_KMqa-6lJ;!<@cZABPd@yy^xy#4vZ7S2dTnz-C@#-pb&QKv*xZ$kn=i>Ses{IL
z2A<9z=_D<+F6dCWGl@frb1sy#lBs1K`ZJTO?5WQbvhpkc>3=G}`M>(hfVNdNhUaU7
zLWOcVuAoLGW($d!O%W#H^~FiFqg1ZVG20^vP?=AupuJ^kf4ZQYkc1A=F<lJnINa~B
z=@j?z_kRBe^7OQ?5ttE>y5`&psG|R{6>e2^@@0ARSAJbS_shQllBa^d=T)D9i=}Oq
zk1#m}`^)2`UygsK2#b@{aP*iuM(k3D`ot()MT<ymnb%yZSLLf;`HDPzurJ^H>3u*}
zK)1q@GJqMv+gVQ8Jl(M9n;(u7&rccakhQcFwJmaqfT{_Q%DhQn)QCa@^O(NyT4!^n
zH;)BZ-QMU&M)O2rs@ayv*(N?2+s>GV=&mb#emWesa?N1_irA8k@cMpO-$X&3k!!JR
zYOz4U`PE<gS~Z=^f2)qlKBLxnJT{7%zJE2^o5`j$$!0huO&lbXilooA*DWc?GH}g^
zeZxRkDRwW<WsJy05t1n<NdeWmot8X#^gu37Kp=3I#AjdDOmF0zv@f7ud3g_q`vz(v
z+w$z$Q#l8v8lhmCqoH$875>cSU&|<5mXY7Qa`y(XYy<u@C5^RB-E269p?>cVzpVpw
zB{&7rnuEzyp{MVet%kf6`PznDyZe?buWurvG!)7{d3YZ=;+dhvwR40MqH`r^s41=q
zENeiPsn@Zyom$;r`o*uxxBfT(l`Jnej7oK6B6+N<a}tQ8a%`pr$Q+6|5yYA377}j#
z)ht4zldp%=oJ+?X2Ig0eA&GRWiIZr1*hU>S$2_%GrCbe|xl4Fp<NS0V7B@!F%X6j=
zQT*%Q{8jnQzx-DKi`O)nXXIyb)l~*Ft<a9+FNTZuP5nh76c9o*NDBLD&7JrG!^L9l
zg$#1?`S=?P`PJHzu0?(P>;QG1kse%yW$dZ5m>!jtDh~kV*&V`b#;JrcC%r+xTb$@c
zWDD$MElq5cZ#@t%vl&&gW@-p*a4I7RY@i0nBDS~aR>wP8T59MXEYjkvgV9-%O6Pm&
zb~`$)%bq{B6Hzvd>5bks*STuK6?u{AOQ?Evh;h#WMP2Rod*5P0N5K}VYSQcQO|aKV
z8wqFJ<}fyk$_SV6Z`7jBqkzk<Z2laresk-V+_-fQ$Rnj=9`o@?yAP&Z)Mjz{@D#>z
zEXRn3t;<tw*^dIF9nH}Pb}E;bHl@D0gG0G4JKLK|t@m3^HK-WI$9#sB?mP^t%C+`L
z`<UZ>`sj&#_Vh%+xPw(X0j-)*gAL|mdHMEj6)0p)%+s)B8-+Anl=|wftZm)Fg<hBI
z*RJV7XkN5+K(1b2l^R$|USx0DH*0;E)Gk*4kch~nl!;p1Sd;(l|L*U~z1ugmqk>)8
z+K9SnQ?U#)#5~Tm;$#7Mlr)_JMh4Vp@9CEvO?7PC5cZ4+8I_jSHZZM=1!j>o$qte$
zi%7!aG`xKt@2Q4jG4I#2ebfncua}s@F5YVu5bQtu&;Qr*SO3P}kWIiG9w?za9G*Ar
z8jW<F%;jhW&x{=?JISTZYzs;|>~?7C>Q^$>o~r&tX1lvA*2x-K?*${qf1xmGZFyN?
z<oCbxhk7<RdeR0`8KORwEw0Pb@^xiixxbesgb5spmqN79!bySM)5QbYpc<<@9nld9
zB<75&$7dU8n9pZ*86TsSF*1`=QSg$R?T1J;XgG{)VPu5=*&(E|(t)S7#)!=UbcT*|
zCE&8y48I7G3gKhJK;o5qswrW$<ExS21&wI>oJ{^igQ6xu4sVhYScHPKV79Z*I3GlO
ziRazk*_Kyce_J-sPUMep!7gBgGaP6pi^>Y&;FxZLxq+f8k7-6n6h^_@=D657&vy6~
zc$j5i=~zyl6s12x-NN^E#YqhBIYwRPtUJWT#|P|=z%U}WLP7EVXP*HkMrvro{yAQE
zDi`ew9S9>+rG-?-RZ$M+DrBeFEq)Er<=TxM8Nf@CAaFr*leV{!D02yQIN?|~t`R(5
zkg#=h9GQGhxBT6E>8`x?@;&`LmLxK4@eB14U1k?1TJS~;%gD9)D%8(~a9lb-EkFJQ
z1xn&f4WwlbiFX!(DWl)_7DD+60x=>awo#o8S%pH06}3B(F<<!n8}jVvOuqM{`v$Fu
z5p?;pfA*X57ypz0M3#`8TROFy(q(qhJkZ=u$H<w(akGjTr(oFz?xb{S1I0rx@Np=G
zhMdKjsW2!v7f~}WPIlc=@kyg<;>n2#iin_ZzJ5=3ch*p+e5wv6z}cA15Q!#pIgR>~
znxb9?qKrzAGwL{i#<x(^pRtrd0U#JQCv3B+lr9G3b#;^kO=$sp=FN4CrxmpHrFn)k
zxQ65LM7LWK8Zx&g6g0IfQ-5+)L^Q2}L@G}a8(BOnNfQ<uI4o<y$e79CjqNRUN|%=x
zq|IlFmzjvlBI(7u;F#~m#%8jVx2fMRBlo$ncU`yNotzxY(eaTk>#`g>5x5wu7u#A}
zk=I{&RlYmu;(G|iFgzd6V}UYdKNl~6Z5x4&=xWH4O|qa}agf<;S}s$Yz?LHFEGw()
z$hXdL;EZr4g;JQPw#H^vBP-xOmmctN!P5~xcTkihJgXEl((F?9I8w3Bm<NJ70XA94
zBECOBA(B*cOUacS9$#&gq<Pel@g<oa8%6Db7KfSOvcto5i|~}bZa(A?pM#6}i(mZ(
zDHTd)`ZdAX>O~W=P@@?i>Sho!XU36)O5nsWCN3RdVjj*f@C7F{UlzNP!2wypwaIGk
z6-SFr@OILlW(tsuxM~Fao@>NM3snaWB9<?G@lAQ}<Hv}wMuzy>-md)GH@~Ul-1b6f
z$9AutOMM$VWjGTR8ZCQW5FHtrV=hl)0ev<;$H&U3+7w&GQmQQEXcxO_rE`;kc1ueZ
zae|ZxqgPiO^5rkREe{?%(TJ!*KTHcI9lV>eZeL8}JeKo#exMc(E{>-IM3o*2y;DtF
zxWoY7O|NN9HBoYknlf<6T_7g*-4VHvNXhCnwxfE3gry7+3<QhZ$FQ!Zmc&%YkSVH|
zscm%$oJ)$uCL)>UT1UTLefc%*1>^#6XQ`O2BDwvR_BaKLVJ!>Bv>`Wc-joTfy4h?h
zqsLAOT5<=hMhBjp74g`_J*8N=X`SqdcB|usp6)-@)|V2DLZ>cid>ow!{VR*t`6#}5
zZY}_Zt~J(xvn$A<HZ^xsqsANUcP>FJ^o{7gn0-@ejx2+n37nkLsctH(;)-f8@Ln~*
zxC(NlVxcYt5*y_zXjrqEg7=(WWx`QiC#&5Nl;KK&6rq~zpnCyA<6I_`a>i$3v~es)
zJv^s4YsgbZld<01o40StU;FES9c)&^$W3eR<mn+Ho;Q)n*Kv13+yJElLRS?LrT7gA
zkU7`efbO20$*g~fXv}W=Ep6=yIU=ryE=WA8oy0x8_(l@jHlp`>E!o5jr;~O~t>vd5
z-j`-)sBq^m{iVMkzxcJU>c|XX9rL9up*@$WF{(xsFd-}|8S*JIhbq+7t%w|82q*m~
z5=_r=KLZudq!F?nNjZc_8*oi-w-EA<7u^U%1l$f!NR02l`-7h%XZ1|Y(~h+>frdPq
zakI#r^ZUr5Tp7TK26TA3s>nBON!(0{NJPDj-OVkzbNjB`z4MaXxOP+OjU~-5IUZyj
zbW!CTIKJM%ziBBVQ9iPgT9i`ZxkN{W4iV0TjSR~u2hl<M$?IAP8JD90=L)9Tmbw=R
z1~AB;lchn4e9Ks5ti>#D|9<n$x8(KLUQ=(|Y+mZWu}O9U7&jb@)Zz`?i<Fp%lI2)M
zKp?iVfA>4zmNVo_w{F~&Kl>}cCJhv6Nj>LFMGzFGpNpQF<Pa5Y@`Va6UJ8`@D!BZ-
z;_|({ZS87!^6-J2o*ikEq7IS8)B->bS8gD=#=*!`C0ANeaYt@(&lhw0e1-A~UazKX
zPp(+d!#@GB!0^wd%cW9P?!ECg7)V4lM6c!QlI#JtGFKY*2WHlajfA*hq(#$NvwM}J
z2Zd5WJy;tC_m!`HRetdszod|Z2E%Dum8Oo3q_xSXf&>P7YFtq`Q8=28Ct$dm5|56>
z@9xW_eGFJL)G_y5aTk!UrX%Ig*Ed*K4#Bj}m;+(P3X<GMDQ&aQID>=U?T_RqAKuq|
z?<+s|1>D!q>ETbO%w8}yLq+3`aL7O>pWLh(3SZOa>KZ4dN>6kW4tECkAAy)fZahM1
z*MkvR8B>gAZs<s2OlF444En?g#5Fy5WGdNIe0+E&2m1$C*M<O@^&~G@$1{gP4B@mi
zhb0+Ag2#%lW}g^2S=QJ_f%W?CHQCzQ(XZXz>q=;`&B$!`Fc6Kz2!~>6TqAZ<<NamR
zd8NlW_e3U_zrsZ4ob6jA-q;N^XNy*~rjO$sR+tovNoKH~#d9^IK`j-lRYdb|k;=Yv
z=eE8$lQj<EQQYw0-~e7^r2C4dBpT+1mgJ>pT}pTHCLxhq+!#_XE^sK?7ux!=M2V*5
zRZX1ph;Vmac?Ixltdo!o*X)PW#zK5}FQ)F>s<txG8?Zxs1&mA)H7$C90e;Tq!ffPF
zc|@^PhT3si)zDi4Gf2s)-r!Wl-BYO&K73W{KZi$8<>&}RNb^)Wt#g%!;^$zeaS9jc
zq6=t;Kj#tEZr<FHF+S%3au0sYXg<?qJ*08yN=-z@jBD~2_6p!ezww37%je#CCuy>!
zcA#$-8f$w|U>4HR2)Iv{TO0XY0rMsp?UZV&Po#VFv5YPcCFV>`Wm^jMTlj42fVU-u
zQITa97f3>}o7N?>K#W>{W}U08gMr$K!F4w}i{z+B{oW7W)oJ9nU%w%5y#A)Lw%Xke
za)(UoynlxLY^1xO*vY^M5Zi&~6Rai9D5S}ji^;i6+b}3VYanh}*?B`M%Nw}gr&Lc&
z=yQ_)Y#U0Of-{3t(i+4Xk@kO}aGL`n`RRur;2@4<b7ft{Ey;1}a&*pAv&=y)ag~BI
zRJo3VSY`uZrC3(&lWm}x3eX1)qk{8RMJ+Im$kgo*rPFC^&)@(~iVW@sqErDtH-e+2
zp8qOd_nj|%QR-m-*!?qCGJ<(?PNCrtXNAsTWo=FV%3t}bAgY$-;`~yhH=RSHQB(Qp
zK63QwblP+7zH+mA{rb&sjkO!XSH_Nc6}t^uZBD+9m7HMHqnYIOG=I@?c=l1n(G^T&
zPZJO809EFz)_S<C4%oE^prYrbAwi#WV2dnEDrHtI(%5um3J!GvQNu+Qn!=K&93vQX
z<jX(zWqIqZx4;Zu>T)ZdCr+B$h@@lYe#xdpssOc{pk(_kz{5Zbe}_j;<nZ7ra;gh_
zzil=s_$C*bvegODRcU`1^AuJ2A~&-mly7ZqD_L=QvabT3+An4qH930Yl&S*FG@pF?
zOJ9~(;V4+3jA1BBCoiZyg<^){CL_kew8cTaaHg8yT-F^Sk87SEAu1wD;6_&JfV)LN
zT?*U)hH|1+4`pO}EmcjHK3<J_u1d7jX`nd1W7)|>t{z{_XSm()>7$QirDVw$UfGeg
z6+~`$X&Mjp5UB3tjZSn{Nt;QjWb5^Hgd|5%9K1gd_bY2pWN`39IDlj6;2zE<lr5;K
z=u7wFNSRnp5NKiArQ%dp^Rqa~%cG=2TU&cLvICUx^yo;%PF}kAx=cdkN^CCnO@tTS
zDV5dH2&xLHaEh3AHReVf;#^x<(^{#|8kV-mxk_G~03F?b@Ch8_zP7ya)rX^rq9mSE
zsvI$oC8@NzyRDM~{n1p`Hny|`!`dr_I_EH|6t_c)5ytHIdddjyA{R~RW|HaE)(+T7
z&-vf~-T%6J_vM$q)qsUQ0JQ3MyH|t(e`lgcl7Mw3v-LVq+A;`@!1{t|;%t;|AmoZr
zeE~2rI2@b6w+x+^uzq@r*5#S9emszlZGOf{8A5_sms)W)A`d&Kxr&l%Odj&E9WW_m
zcAh=kmva>0I>VWErjO>H8WU5o`4q|M#ewP-Q1qh(gJ^dz6TCfBxhTy(qGZQaXb6Lp
z7Fbid(ITfL$g<qIaZQHZHfm;{sQAnjx#Wyv`(mo_bS88*BS6=0f;GEwZ4ZZfrc9=;
ztQ0%ZjkA(SrM#_KAsTq9ipyvg&8d(((w}8Mr3@+zJ5yLe-KC+zEv$2~4rNQSx<v`Y
zP*rp#?BO*hn%t*TIW6#pYD~5sZ2nY6=bw7g$au2RfWcN8TGS<!<Gsz;p7{MEJl{-r
z9``PvAb-5TVJ>PT@2qzq)4`c!@miOU{+*0Lbq~5N9I%E=qyR(^%KpPoREDgCgP6&3
zsdqs&$f<9ru{`Ow(%g@5m<Je9;;hvHi7?Xqb^oko+KlE&?Z=`5Rux~U9n~mrx2ZY2
zu8qOx%&USCYf*vbYYYf;ILph{rF{7D`zRSa){;#+YoyIs949K_f&#uid+$#0SiX-m
zp6l%|d`W)s>wiWe^Xc)4%83QZxglY3ba((Ke=19f5?Hf|JR6T$=u6=6_uPN@Km0@B
z%8KI0!C<U&P;_g=n>TOVP-A%i{STC!h?1HLSv6i1M~nWh&i*Vm5rj$wn{fyAqqx!Z
zh^zSGL@?`9<!V{C<#C%HNen(OwFg|_*%Fe*0TS1v!^g^Y^#QNW5UIZX?LR<7%i(a(
z)pKNu4cWVS8yBN1gWkZbi`1HfSvf+V!h$ikYnZmGNb?1)zOz`GRPhNZ*iR^Fz*ldG
zn$?bMH;VF;@BF?TJ$j4^e@*Jww^UD}hX~h46da>|GEX`BS=QE9<>fm!kY1oriRWRy
zWY(z|2{X-nLQ`uZJx&OvEk!gS<WO88Mpa%qq#}qDuJrVPrN$scGAIL(V6gJk>2Qsz
zk&2HX8ArWp2KePiBSbY6a;e3xghgcX7RxLlXL#fRfBW^<<bxqs?+nEUf&hbrzz&EG
zwr)fzw&9sV(l!e5XJ`9>U+aLt>jKb(2z3A`dMTG@LkasR#&ex$40JFB?6><MQ6l-d
zpZ_Kf@)KRSP0>orHtNILr)YYnk|L-fEGXEYA<+di((3ZsbwFM%iw9cUcWmuom;$Pi
zQ~-jKYdd?&Ot#@9DKbfi&FkL-o6C8)+qdp$<UTk)lzpTr++<%WP=~LmXlr}#ro8sr
zTXOHt%i1&gqwjxLIv@8Dz4G$vo1c?!eB)OE6&rGSej(e)!9IHbJ=F&xLB$*@ip}|E
z|KO9y50yiR^sEJX9+Tk?L!0+uNNpT;7IHba#Ct&uX(MtB5so>POH4}sp5c<r2oH;P
zh$M!j5e;FK;c~=+8KW7(@WC_YU~?piYl^R5y7!XSvW`#A<<7m=6iyBhMwwT&J6(AN
zAMO+v>0tk%MwQ_>0FAw(c(_!}80s6Zv$lOhZr*)Eo;>*sj$o>6ArF*FNW-ggSTRnF
zOA=)qd(jUTT34+iybQsNEmd7*j6V6{@5}ILQ(7lYT+FoGM44a)$it3u*C9DEkX#|7
zZ9```{7bbmhy_HJVIt*~NbTqtJ+}l}W~h&_j+*am1m=3@7!e~JU*e#4l@w5+L>NXU
zUl$5zPT0}WZ)%p#<px$hZJK8t&QG;)un$2mqlO4L<C1-)k}g3^Y-npcHly6!sA7jH
zJuD><LZZd-sp+2t!88H+67=^aM4it@-HS6=D{Hsmh*;-g8xCG8Y)dL^;(d(81MW<t
z^kC&zB&y$#Ew+c*U{Gtwm5U$&5b<n^irS_{NQ>Fbh!P?twiYWpW6kwSm6Ar_;dBOv
z>MHD1S#L&Kz-M;6gn-F57)x$I%ojGbH;_-k6yVe8eML1{L>RKJB(5$IIcRLGbJCEr
zAR_L*^pbqzmw#23m)A4}A^kqV+1TFQl|S>Vzb0GTyV3`F(?*)Z2J5|RJM!SuAFD&o
zWXxcrt=HG^1xy(nUDssxPc6pr-7kLeYk*M4@?B8lVX_j`(M}0Zsc{~3b|$#mfM_bi
zN?kH4*=8*Wx0VwQ=HMxAT)UwW<s6pIPtDvc@J}?kqgR;>*>so#16PxKjb%`iMLAZ=
z-BS_5B8tb$VL?{Qc^F;CjCZhxl`<pTscg#B0`NZ1PY!WV=SB>ZjhwTQ&S9x0HgPx!
z0Yams0JmTW%?(Xj_hIA(E(`<1$9}URh>I2l;C)w%yBRQqtWk6jop`Zx9MQ+m+`fB9
zlVLj;f=oCStDI4~SQpnZlCZL@)paVP23mg$l2xcajMAHQrGI$@SjCl<MQ#|-LqSH5
zG``oKn0imUD-}4j;!>;x1;^Th8P|(;bh%nOM<%MQ#cp*ebQ-Z)#%+|H#BB0Iq)%lm
zh0i{XnL2>T0sZa)qQbuJKT0jXCdG}nkhCx9Ncwcv1DglZWY`4U>w_|9({oK)Lr;1m
zSGHc;lR{$)uY<ZACz?T`Sey)2vCAB<uE8mmnL$%6^VkTGvg4gOOg80ed(dz=<(^SQ
zrJi0ZZx(AiR1eqSlTSWC4vci+=8dFH$O9~2Q<ioWITSm@k5A8Vj?YjVUF7E}RZn7S
zl1F)kB^^RED$<f07=V?lE-%YXL^evNQK9$z=s<q_!|%cv$8rRR&fZN*<2l;JA6~iO
zMg2;Ri^12ipLd(@?ye~drHhD_Hcx34nZ`9n64wI*#vdeq&jgGD>5B@n7U(To`=(ge
zU~co|$wO6+)oyHV%EOywUNr(VV?PuV#R4Ga>u<az@BidSDiGO6nCGCFF1!X4wE;rl
zOP_m7{s_6&MR%a1Bb4AB!zlAS(C{or@LZ?QK9=q64TUSb@HQJ)6<Wm#H`S{o1AmT=
z7(`bB^-)s1W60mw+?71AH3_OEc(Bki%prG@1%M+~G}XpkHrL#}cTXlT@O+_$lE5wL
zoj;a?NB3oGy@~^y(w$2#qdbhmiX1KaI@%!}tG-4&#?5RZ5l0Tv2dpa;Z~(!Arr<@X
z4MrL_R=t9`YT)@D<SmH!<CSx%G&V%EQyhmI5Iu*oL5jInx~{U)SM{mLN^WqV8sTZn
z^s3Eg0~M=`LKrkvYr`(y&xMTIXVN7SSjOwuc0gzpb;21bftfbQz+houL*ye<z|r$_
zUn<Bka}DG)$bDQpZN^G$(<o~t&8Lizy5U3?<LHKvV6m58UAtyHU#03M6EMCcd?>0(
z?FL47+t&G|3m8HN=;g9`ZaNt7ncn)`7v<%9ui*ag=<89u->ArXdJTAn^JO+PgXjRv
zeHVs8<s!D2rErE=2H8d4OQ-nk$z!A=7xDwZz>hwB53umIY@-f4q3|n`y4l=MoUxHY
zFq#xUD*&Su6vt)$;19m7Egvtx{IXtjE|&UGsmzI1oY&XamHA_GIKkl{IpIx5Y8++)
zaxPtbSc+PVH6Mzuq;DCyN+^zzr)NT6z@JmPw<(mf^FuH(Cu$tJVUG)?@j=g<C&;bN
zQG>cAzwzgOQ$Bh0M1J()C#L%yUL_oNB?2r6xP%R_-9Acd9`rwU^<_PFo!NE!oIBQd
zZ;fP;#o|nnl3J9+rl`T~mJD^f+cw<YiGdi60C9rk#R(9-<RMS?PspQ#BtYIec}QRw
zYQS)#TSHT74WuNFMHX4bn&;uxeCO-6*8a{V)szSpi&eMIJ?Hzrz4uycuPxtk`a(!~
z;jpWFSi2Xu4<rtSv1B{xFj3+Nz>_|pSt&I_HZ$F*YH$do3)Wrew$kP-e&#OlgR)#^
zCno3Aw()3k0WfmiP7dd+qq$|dCZStwhVC*5=RzV06&KW!C0l5tX!wFBN>xBKmOc^D
zsu@+R#;K2ht~n5TXB9>8#FFi89oq0nAL=PAmQJLF^w{PsVx)#~#~>E+fOsG!v2io#
zHhm$}xrzr~jT1Lk*TAXaKw|wyY0f^!`IMDP#hraNgp8pVq&kP>#Toa_i>X?u>{)L&
zQcwUh%L_ox?mR)gle4$qIB8u)`W&*y$nB3w0BZ_nXh{)z(oB+T*Gfe}Ov<c>es?7z
z$uvo2PaZw{NQTpMUL$9twnBj$kP(RMml0`UejfKEFZmmV-MxigeO?@4cc+uJJk00;
zf}bOR3-5pS@sxZ|I+!AsHl)f}U0Js2sR`Qza7GSwW35NtDQxTSDGY1iAE_koO*1Fa
zEliG&L%a$DK-9iLIPsV7|58fa?Wh%0z%5xPUBGUAIQ~Gew>!OfCnMj$UhsitT_x#K
z)0@MRVb_EgQyi(u(I-gv=p7(88vOIjlWoDylAZ)6UFIy<c$1H-8WeEy%qe^Q>Z^A5
zJ~*1gZ6PZpUD@c^DsL-turL<bK(;<a0-c44h_U5-k<vTw;ZrI?4r_SyEb6%-Z1i4_
z9#{-3+aUD%x@=_hlos9k);16_`kb@hCRQp^!zoW$)cVpI7JS9h^+D^+BSjn?a&(VR
zkxrB;)N$0{=~%`4M8RH1eUYN&8fw&ZxyueV0XI__0K~5Y8;XDCu&E0@IjaoyB6Xu^
zbr(q7Hi8p)t9S?-06z!6TY%N0G$%Eh7Go@e6elR^%mW}{8{1W&l#{lOLj7=M+*;c$
z8|eeFS<72*x(g|K0ccmJb>{|=+8(!5SHIe7@<=<`qEW%kD!00<kf(YdueV-C-GYse
z*I(J(wqce69eDvhijA#C7;GM<U$jIGYdy5WK_+P*HuM325k|amL=6gVsY9%z7Nuf>
zPpsDTnNF1W5Dlj3B-aqz`?)UZr9U(M#J=;L%XZ}0h|=-7g?W+EZ(hBIgR;-oR@U%-
zNR4dR^pmNuIk85NVZ=D>+2H!c#&x|G?cy2@_m7xD#L6O5_|rfC7uqEEZr!xQ$A{h-
z%<-@qgzb|&s#2r7H-+@CbUi9#0}X<pDwS9>rDVNKqL=0@pM3J$&<oSF#POE04Dtws
z(D@=Y`nzRw^6(QMRrepvKM6DPw4sWCDs?IiC}8Bj$2d{MYX$8arvNHZiK)(*vk!j#
zzHa8;+O$%aa=BB5E>9vnZe%aj(D(0Ah;BvRvRn_X%5mU>ngX188mrw8IdS30aqC3N
zQWya*1F~-mkUp)I59N@QMyiV%1Cfv@W~ELyQ%Y*O9OBP;uVUZOh;1z)<wG>-?AVe?
zWh#g7sb)11J_2$`d$mTC70(p|My3l;R6y;}#ESr|$sXoVuK=a2$xQ*NBsNL5$kW04
zTUpEXW>kAMTO2+OB(F9s(1rJ(L@Ilx*v`P7s#Jp$BT_a#yKJ{7=4}xh;0ch*^@R!W
zL{rv-%Q|~}z@9tYv_Bf{MuC3T4!5RIUt#g~aLj2=&^(_303`q08&7Hu*Uoiw{7wle
z88eY8PU@BwM+#a8Ym3v?edH8Q`yTOgKEcBkGoBKqU9@ZN$Iys;Yef_!BjsJksXw>0
z6o#NBIzm_Br_wIcK7I^DEFgZaHI@<)>fPrry`a%EPo|#O%<Qy&_MzyLGzi)e01&Te
z(8b2eiru|)M_wt`npL?{>?_*kS6;SLXV2NMe)TIvrDbX23*hA#EH;56lF&_o#D4JL
zu4@1F<t1(ARx_+Gf?b^6n04ZspHItULWAAwMclymj*c7^=fs`P8`|IBuVRrVm_+`#
z!T1e4^_BlplNUlU-#7`^PC%f^-`&)r*|u;>QZAm%+|{m@j-1b`d-2=|074WxVmA<i
zR}tn@L2;nQH+=XKNYppqxCZ!iQIZhm#Dp=U&{3-PcGuMF<mg~Cq6CyV5pXF)iJ_5`
zHhk=~4Ps**8y%G-g{{%_W1t|H@F<-^*H#vV7-`5{7=ubL3u?adsF|2*a#j_srj8al
zkh)W-lN22sze1zO$jQ!Ds1aym#wNx_eFN`nTadbQB;6W^(@ghhQY5=zI}sh^)Xf>S
zIKj!$W%5O#X!P8ps-(gc7m;vd{Qz~sl6`Y;-ah~8iOr%wzkl}zVB&RU13L#qDf5V2
z4VznB7b@G42dGqFpHZi}UP-4^I5v~=8XR^*DEilD$L-;bPi^wSjC7Kx&!4hkpr59>
z%xP%}Ga8@TYAZ;5;8_&f#*;}HDOsj*LGrL(U)j`@!msY!Q%)oK5{-2DdU$3OX!ii<
zV!Js(E*_-PUjoe|u&{wcaA|2lzT!hihV9*V-?bBCqlz#OA3i_?o3sbxckvuoHAszC
zV2PNT*Z1hr1jzI)q0bl2pToV#dDks~5|%a$Fk3(kDeO+B$Mb+sCK^i3qaL&l;S5+?
zrS!#%7qtoQ-@mU^F0rd+8$@DmL74?nAWbd^0$QShBoUJhLz7Gi5}TgB@wJ+v37?@d
z8EMaA(R=;<W>ey%i*=|&{Z?$QBTqr{cYmMrX{qvN8ws_4P1$`B8Ow0sTWVjH&=)Q|
zXMg;|AK)fV*{9cki^a93laZt?d#WgEB~eIKa*H;p^g_V*A35p+v^cnXZDk#w%i<bq
zvS;Q7JqBWW6DS_j6mDJ~EJQciAC?7-o<~G!f=?pBw+JfW_!!`1su(!1O<fBOH@@Kz
z?5G#l-0v<=M8cRB0_BT3B6YPks{0yGlj`hIi+2mBWEvYK4}PkF`%t4BR2hr#U=!cp
z2WYuh*My6(jZ)oiJy@}s$BTCJ_G4@2hj0)Y-rordq>%DVYF^e>vmf=_pnWsBX6vPY
zvTHA&u<!lhHR~=mm9BAv^8M9nsFQKDmp7N~?w6n0?9`N0=tDz!yoZ{)Yzu(Nn@u{t
zb^shHYW5RJYxZ0*OGt(2)ZSDgx6SR+I4Tv_Gd(%$wGty(!(`7^4+t7F8`b8hUvt>-
z)R#U4flMCCLixe<Hoq{95~SNMUOaEJGqZLB*UJ_g+G`WYa<tV{j<A-0Fn-S-J{b2+
zEN8DnfN4{XWOMDNTv|r!JZ_#wvl+lrkKX(mqKM64@9ZN+TbkgKDwWoYc)|CYx>-Z&
z*kyW_3WXOxpLFl?WA>J`LVpaAJ-%?USd>&g@h*!~fyCqASj)t2+)h0pK@WXxGg17;
z__@RQeWd*w=}Z<pz-c$gKz+yPbL7YofgohJsmYqgjbktW&>$J~5x}bJBJjvVuq&8@
zvD1oLZW&D#c;a+ZN0`obp^gDOJUVvL&YwH2_qB=?fm|3TSkRY(i=%u<J=m&Fw|cOi
zZUpxn_SR@%86H#(Ux(xk+}L^R2GEho1AyV&;?&c5#jJBOY+oVq%&ytk`=bc1aL#QM
zu@wd%BjQH%G;h{J4H!xMs_~hYmqH<;V=HArh-!zm9Dtiy)PHQvuG{Lyru7~<VHvsu
zA?@k};7~3jMM1im?HRNa=U-6Q^ImD$HddExW@gTg4UcF_ALUq_n?%13Lu$D4_>Mie
z`3e3G)GSZ`jSfvisUsrM7>5Uk#$_U%bq!x=Tj58ck0@ykNreNZ1Ulx?qenJ1J!`-G
z$6wn%QY`wdM?qicod^z76D%GaJgV+n=4MOCN)AwaH50GA*w+|AgU62^+BoWMj+xoT
z0Z*Bm++aCyfue7mFrzpi8Ckeiyv56<bKF!EY_kPJ8C1)=5x8+vQ5-n5;PIDOkF}n<
z(Tc=IZY-N4zBqp^A)hsCclEX<NC_mE_)JJ<fvXYXhZB<D@9pruTh%5X>Zmvsw^KiU
zj`Aa3Q={D??NtsV7r&Qj=TYR%SFXHfpL}|qdTwz$Cy`?0a)igX_4?-kSj@9)7n`{U
z>E_zXg5CV=Gc~xW>5NgZy%1aSR;bBXB^3<f4S9Hnq*grTNpN$Lh^M4gO(-P6xQhox
z^>Y;{7uCz#J5^BuLa9(Yvip`ZvJVf+wzh!>Ql;}vpGDYEt@KkfmZ)Bq+(^oNtvBZ1
zT}a^weV1J$$Ts+h+A#1atzPqnUx)hBoR-%h*Oiyzq6Siz6@Cst$I@mQz|FkXG6gHG
z@7NglnzJuowb|KKq-9+i?TO_i0q5>v!?tkhS2!RW8!_4iS2)2QtoQBD{`mWdz#SsP
zGdL&~K$=f{^O<ESmC9sPhvpGIJ2*nKD=X*MJO`+yGVXV8K3T9OjJ2s};PaY1b0Nf8
z0b;hkyrAKGx9^SHI-Vy<?P70Hv<y4Od4ou@^RT80g1;_3e@Q7Y^_|=>M49>Zamu6M
z4xS6^9ScDqA@Th%OV(K=r=q>RL+2%%j@W5a1k{eNMNbPqdtIf@@wlx23D#LCRT61l
z60vw4%%oEJe7cB#crU@yU6h!hZmsr4dUm2gvOAe;a&d}yjoh_^VO}24`Z(5~yfGHc
z1rrxf?+i}q-}l)nj|I&WfjuiD$42e5FTS*8FyVZQl-u_fJPK}YmUInV=o^67*;=y9
zT8f4l6g!e&M1(9Bd&4Gg1RE*u8)8b6%CZry*Gb#hy$5T7Smq6v9|j&8hm5f&YGZ9d
zy*jyUR#BD$Tk;-d{LHS-tUS}{hQtYugJ9WTeCfN24lN&Bfs>g-#;WRjs#SN@x?w>#
z#{?%W#eE#Eku_Id2LGJL<Zb4M-fqv9i(H2k85|gJ$hLgcJ$D{%S*cdE&f+oKMnr$^
z(nae7@wr{D2*e>1w7a>f6o$jDH3R}cNd|RTnw`N2CG|bL#`3iFL<e@TGHFl7zqW_>
zZ`%$IKwe8H$7uq#@9qbpiNe2#L$9N67zpW6DG^9{(71;DQ6uSb^JCdNU$wz1*i7?)
zsHbdpZqa`6|NjB0bzOF8oWbi}B`rNS4*6rGNYbnVP-UXVlar4`PBU9*G+p}RY)BN=
zZL{sI$A(z)r_4A=Bs0U=0<TF!*0gF{=gqvKwo{pzf<@#Tjn9sm5q;Q`O_Yqn;h%|y
zFM;?0mXx%iKvunHfjNmnG)mI7W^nCsGr*|*JFQmmrz7eWjUs1^lOIkngPSQ6et4Xi
zcZ6H5bS8E((yf~6GG%89QWkXIR3qQde)=<@jn{EHEg?E|==)hrs!<US>KOgE%Rc|N
zQ0NhS&o_DI%vtNk2HDx!^$m^)#Cq$1UfH##>N85KXeGtwKo0GumW!>-haisER~Kw)
zVNy+vK26?17&_r_QIhW}6uN-$<&?&h<;T&q0m^WYJ~K6ByN9!3rUg|4??f#g&R1--
zvbS=GCv)B?o$W!o*`pc1Bw{HOGI^d?_5MT$5UXSxH#XEBfQHA5ct#zgwzj>G_g0Zv
z4!<gkw3RZjjb(~iw;Y+`&}h64)%a<EGjX;H>2B8g0Mm2q(Bjm6D{st7@5e4>HUwq~
zz~DU+BJb)4%`h-xx#FOuy9QB~6{KR33sjsy<gI|Py5GGJ*A|;L*KBIyq20Up(BA*Y
zk8BbV)WM6`O8`0~rBmL_N=IB~2UQ2TXxvYqh~<?<cWD)b-SpNU>IRwK<G+g+pI2uB
zd*0>&qpNE-<CE(pk!v_d%2~pEmdrk6xI<+LL57?I6Ex@XR;HbHYZA)>riMcEh+Jnf
z!THPA^V-_FZzzzD?<p+_+6s3|da88`pZ!+qCwRM2|5ha9TT(6@Jsl;&i&p!5Z?7(f
zA7{dN#zeZ&3OYOaG~i7f!70xgh*~@i{K8jJdQwG*@8Oh)zJl0qo=~xzN;A5dZlmkI
zYW!J@P9!<GamY1&@11ufbfmhNCm|z_=Gdn5`k3NfHc%23svu9_-r|UxEs@a#C~7qy
zb<+q&p!}YWY(~oKJw(}qgBrjSvm#AWI8w7CYdr(~0wCNG))e*F!a<J>syb9BMM(hn
zl!N!7UI&?6-x2~Cd+QzUM^%nM%_`lWVwseb>p8oAXT$E!Y}o<Z#u1r&di(7Jos4jB
z3<2Fdz~QqAw3gJv0l=l|!JeF)h|m#Dt5pDt0}PQc8q`H~cT-wT`l-hn!VqiIq-X(+
zOrfJVtZ0})9hw3P$zC=!Himkk6*TrFvo+GW)zUDE>4^z@aPNVA`Sm^f{N_Ei_3Nl%
zy`G81Nxt;rcXS9Y;}D=K;WBtqcE@rPEiW%hJ??hPtq_SK)&4KNbQx=8%f0yU`7OL(
z9?tyr)?06B+$YzNq6yp8vC(8xka8lLujfdyr-1CnrPz89H9GzJwN_*YQB_&O!=AvI
z04?^`Yt1)GsUkL1D~jKXqo)zbQ!;BCwxkm8XF0`o=;Kr-trNme7z=v2xZMZEXCpYV
z>0yx<;u|m3-jGRQ*%qpX&35VHC41rd7qmH9NU|A`P$^H?yry_JJ=Z3$!OqUAo3HSH
zZYG{4JUy7YvA*MJ#)s3{(W&rHEf@=L=EYRFbKo`W6n_0OYO$3ia5!_*YPq)1cAlXR
zI2Q_$Os)~t3{8>M+aL}(j)x1Dy1kwbI*WGL(9vPp5=W^HDG$_nK|hU_w<hp4Tx-}8
z`OQvNsz^-HdS9b2b>BHIlOD*L;EHQ)(9I{S$?4UoVB<?oyZ+ULXp5IFzica5ShX@I
z682z2^-8V54aH$<jMj8+Vxi8TmF4u2s4mIQA)ZkmA_E7_nWpu{J^`MHD>qY5pY<RW
z>qe@VEgV6_Dj>oEc;U>jmZx}0S8+WUwFm&fX4=Lf^$<1F&9Cp<N1uKL2;a^6qojWe
z-&ZUYKwS(AG3ImQf)x*m#jj!Mx?lA`$s}2mr(fhjHxY$5OC?)kM5dxXOv~5>ki|_$
z@c~;e1iUfj3xR^`G}cCnC4u9HA;{1}yXDd2g2t&7Vq{{?U9MExYns29ii!`7q7sPZ
zbP*`VdzSR<v^Q0&y}?=`{o~XPhT>}F>DZfeAXUAcBT~3d(zjs{#D@yco`U&nxj2=R
z4;5+y8OspciGr6m`Sh9d_R5tj+FW<<-SKoW)L?A<A`(Mc6O|KW&U2ZJ10oG?>|>wI
z*)!*C2^?0PwF*mQ{5&rF4%~Qlgt8q)h8;-#=ruvp72G1!W3z(E*|$W<U5y_+2;{$A
z7l*;~rB>OOU-<rRNkUu?F%eRThI)Uxah=CUPs&_hy|kH(+aNPiu~j}wx9=+l!$qxR
zV>uVYuOoGv&U6ZhXtogg;%>YK?h$GqQq}bq4u}>flBDha<T6s$lQwqpoQy21^+<w^
ze9pCWoN~?y<_xYJ`KeT?>8?{;5L6U&63{_?Si}9L06Irott>^ad2FVFbrlB?agSP8
z-%+52MR}`7nxmWY5wTG)df^?X(F?$g9U!jji%7k&Nk9DU=l0PTw{3a7<l4Sir$wmA
z{czqx^kg4fweH*x=?HE1!vp=D61BvOJjtGjxDws1R+ILa#2VRO`%s8ptn`ug;%pkU
z@Lc(t3>e%rTxXryT#o7u0L^@YdXH=K%(*lAo`uE50J3=ik%Lk-_^UVSj`AhHqCm(#
zJ4!K0^Y}w}`X@Wn$-GRPw@QcRLcT^fE=qMv%OTSkNAkII=j`Q|U$OBA52XmEn3e2v
z8psVv!5qRm30gApUww7czW(NGaR$7RQ9ucK4V2!yJ#@Ds7km79s?E*MdK!>U>7*%#
z_Izys9tI>KaV<nL8I@QwaS{YK(r$^v=9;R>I1wVMRR#UhO_cuDjaoXi!nf2?Qf024
z_4ms*?TnQ8K2@)R1^Z}v)A|SI?aFI=Rv6gVC{L73LbFK9ra7u6l{3e{a1YCA8R16&
zBccekAfPvD{^L}a+S|p|X<8mOB_b2|Z@JtM0bAlwvfWsz;2I*q#M%~+!yc=kraJ`C
zP^%2si_c%gslBcupZA*!h><!*eYRI&Jy})<ajw79+}#e*y-q*+l%fQOD9{rx-32P3
zs}CEj+iNDZFteScDmN)QPc_qd9R}$-;P<r|Acc=@esRt2Pc7T~zxkc50)<R^qoQxs
z<!;!?KB!%!^KmPFI-4vM|FQr#k4Ul(OMC5<WItZ(C#8u6)r^B;eC}L7taUx=d$%}|
z+j>2zW1C^1^`TyXk&;nqVPR4H76XOE4LL6>*v`*i8Er=ATpg5%Q|~=H)+0de-}?2e
z;vxCF1p-%aVan%~c4}U)8@D8C3BGBLN;z}pjQ#LOKT>f&H#6;Br|ehZsSr5>ee%>P
z6{CDT@=d8WmtldS_BTyHgybhXeove@VLR9yeE289D>0>GXy%Qg(wj`XQohb^)l~GO
zdjYvRib%Cf%W(&AZe^b)lNIR+IjAjGWUC1trv58QH+XH`h>&|bJ33j(Q^;A=nt?$#
zEm-#Y96dJd3hY)aRkkLha}G@St#*=zT;=!<@%J1yEK#ElO;c~u@rZWIEpSAKX{0g+
zp6LJ!vuu+KyY|I6(wpX>Z63C)Oy{1#GcxI~9qg#dZU>Q=<1O#pxdX6eRl2o9ywAhk
zb^P8$I#p875mo;@B<OX=O+q8lTqdh~&uCjjw$V3y)Cxl*vc}GJ7c@r5V&`F0LqtA{
znKz)ey>6>h<F<t7JU%gFzxwR1%`9(*wBPR++x^{BkZ9V74mmzcuSXBm<VtZiKW;V}
z?X~#(3LO8~+9sFDT4om04W#eH=m~*aJd9PYq=F4+<jszW4<$Dr^{fP)TngvwSG-ub
zZb|I|J(NUM`2nUnZEWnE*HHKg?{Q-!5hvN{PbaiRZFV?`TpgVqfpf~Y?UfSr!&)w|
zO%M>*_ce4%+`V(#CLTTzXb=Zjordr%W1qWtQO#X^<4i9p{YXT!NqFZe#fQPdbpV8L
zFVZz`u61k<=CLdwxgnV+Q%XY4ijXKJMf^IUeC+f@Ju!S_7zOJaYAvB{G#y`CR7f-f
zkHw8k(+)OOh6Y9f5&5i6`!Y{?{6}(`{ZXtn*gr-9ql`^WI)KG6?bkAzcjS{cl+Lw6
zM?4X^mP>v(1!eD`j!i(W4;v2~s#?onff>@E8ludBEw1d^#MGKSm<5kBQ?i@WB`ar#
zEZyC2SwP@@y~or_pTg<MI;GNxY;IvmgmtXQv~64K%fLgB{(;=BRXmdO9&<uvp|=Z%
zM@6>R0|0-R67~%gZTQ%T^$#Bd7y)z-bVHhRq7aRm@{EX8KgyvMC}tfSbPH+T()_Yb
z&aK$>8~1E{YDsCTD(=X;z6oj(fMFVT_3CT5rw!Xc1R?6Uv$d^Ob#_5e4wsY}PIJ3Y
zN1Vu<oc(TdPYEK;b?GLTSt(ntUAv}8LyCgEYplnkl#j4UHY(FM0cqxtI@dJoGs?|m
zOP=#JrA=iPc-9u`t$w@m%4?<6Ub$W>^mP7hlDZ|nV@X(ic0>LCFNp=&<(tcD!!Y!6
zqwr6@5f*}1uU^#;XJN@O$yN>)nEW2{J}yOSspFQ`UDRkDU?H-D_-U@%HuX)wM%5%g
z|M|bRpZw$}LV>8=(#FICQg0P!1n0f`m_LJ2lzBP7pS%+dW5!ONv^U>;UCN5t=_!0+
z*&j~eLb!2LGD^$|VdDcNxyYY!xWBKokoLkq{?U)^yRUxNPMtn$<KyE>1zAAv;%gSL
zs0e_t)}-K*7r<spE)e;-Bjw`gRKnByKnY9R2l}3^ZK|XX?a|`}obdBDJ72Q3&5A8x
zL*0A4WslZsHot>|q!L*r4fq>m^2O&~vOJ#M%KVgD6M*#1_x9oN*vIRk&@Tg|K}2fS
z0C-esr(9MB5QkY=tbYfKgzT%<O^shCQ?Qf`05R+z8AA;<XxT2Dzu9g{siIV>Z68OU
zka~IF_BYmSb#BI<OwQPyM+^4pHxKdWoJ@5zZz(7%5|0TT<m|yKyZ<=b+&TV-3UT+}
zs|k5+1mZXj>oJvj3Y>jw%_eDNSfdqnr0;|Stf@4P8HF_)L3@~LqtQa{7;W@Bt=4v0
zKn&o({Qmdf_Q(~`Jw8(&@&quXZKe4ukStwAXFl~;2))JRg18y@1@_EFN(Ggzg^O*5
zs6=x2JeYY$V#<~@UC}4pcYRB5f*a^Sg9sXJ)kMG(9kgJL##8-ZUt&ZJAWNs(YVjz9
zXs!3AH;A0SaKT279<@`aPTGU<`#|TGESU);<b@HG>14|16>+=_Q;d4cQ#1M#+`o6v
zCLWBdPIHjO31A|5bi6%v`i#B#`ZYaZauV{ru2kCc8k%@gWxlk$jGAr}NYffp*mRgQ
zP9CFdQ&ZD!fCKoNOCl9`Ii{w(H$>nzxA$yjVbyMpKbF($!zU~DaC#NB#|lpQEt_6C
zu=U-#t?xH&Wv6N@hp}z!wKVQ?5BI%zbj-%iT(Tp>1w`vPTix8XOkv1|M#sdz?W5S=
z+u72v1-8LgkrGCM1a&vmmW(&)i%yS?6soDN4iLG8P8%9KXNBWuEeAM0$~Yk61Zt$=
zbA;h{OB=R|s5JLv+V0+cXdirX!+!JG*GNm(tQruxHkhD;DJ><r+*<4IEj~7OLh>Q@
zCnaKP9<I(~B}j5)Cr^$^8pZ?qDKc%}-cZkco`)&dTOw^!`$d=(9~zq4Uz;4_+GKSf
z9m*fCj&!Ugnhh~%cxvC&Yjb0|z4QL(dX?e9?!U!J{5Q#qrW095fXRu?AA|vG2`imk
zc*116FS;wn86pWnFjR9VU%K?XAjpqC{!ka0PPuu!kI2+pR)k`wtDI!Rl(<B?l<*q<
zhOM24Gq-1sOz4WI&<}t312E~6cIWmj)dO9WvrvbK$kmCTe-!yRWk#>R{)XMWc>@UI
zefJkvQ<uZp6vxWaEOv=f1}EwexTN`+NhblZh=>R!xpe_>Dx(cA`SsUd*M=(gb=%$B
zchti}Q^cc4Ew@px5Pdo^dQ6}VVe`@B$8<05-MtIAemM-iMiGvJpQ-DGGpFr~Pktxc
zfY2tSW<DaNWwny0r8lhNv>1EoEj#`EYdTy=_|7ctVMC4B(D4&G=t^r#wz+^Pe7J!>
zAKUu;6HV&KrE@wwsXk}{q!<P;(Gk_~yJ8p49<vMQPT867yk>pJ&Pc7F7SDGeYXj;k
z`FuCl)^PnRI#ed7=52m?L-UcVO*i7SFqtr!Rm+t4D4mJVp0nGxZi!P=LC?dk=DeIH
zztB#=o&sb{;gd9uhc-7M*C)}-WIb{NNSOVsWX_(EA(?{_>7)j;XChh@yhd8qCW85_
zsZgOiREdsYVQyL`>jU4Mo+&E`q@vcpRq|M^r~g}5KKeKK@Khp(O+<f8n|L!SvLkK<
zV~S)<V${BPPYWBWefXw`z_D)O_uRdEJBVu=f^wgd#ikqH3ghWH1wl26Zj$=~F!ka|
zWI+$czpI@bH*;ToL{)GLgGxC*{^+9sX!wo2fMWDd{`{vlG4a^0U%!rYvSe4TT(!%W
zUs0&90FonFxV^pU1}mKOfY%!XF!ILtz9${o-~YeAN9wjGo<yQwM)a;uEkXh>q!BhY
zHsumKKQ|?!Z*_51iuEJIJ!0OEU?Y#^&f42=zhmbvoU^ZQd};sdfBbjb*f|7HbK2(D
zc5Sy3+u7${Mnna14bX((!2Mg_SgGoxD5;~%#?JH*M2UqcHYo|z#K_Xhtd+-3qaHem
z`lQ>61D%K{eX4=D_|~xC%QzHUNcrkGEK{*V^{jgmZ37E&3XU5nm3szzBumP656GT6
zg~dhr(k`ML?X~8Bd_9_)vB%T%GSJ!QpgqzdJh_{}LM>{wQ)pMl_`m>0ME1#bq81w)
z8v|f+TM84Z)O}^g!5GDHP*;E_`Wm12)C&Ii-U{@zUFeNB-mtm3xu?3+$Y)!nWM>w)
z({}bRNrz{xcIMRv<-!<HZd|S-Hk9&bveSUiyin}Z=eb81IL5~xAf6w5^JwbH|5nO}
z1zYaz$bW=F?Jv8#yYnmxedbf_qCo2GD6^n_SkMd+63>JYqDfj9r{cDtwi4<XNg^A;
zGyNG7H&ItaLB<;el8yx`7b)9CqChZPn>>!4={A${B2Od=QSC4O<zEQMSXfwak!DC$
z`v!*8Jow^^FKXek&imb`pW5x)cf}!aJ}OU|S6>0kzV3Zs4qVhVRGZGZC&$<;)u}O&
z{op0YVZ<R_c;}sWWU@%B0A3e|aFv61IuC}Oy&XC6<f+OB?ELn-e`0-u!??~B`|Qh`
zNb_jnTUCMo2k-pAp1=I6X56w9^*L<3&p-Xd_BS`IzbCKB^I5#7OQ(<6P=Bu-0NA+v
z##=UWa?~~f$dLIb_mj;OaUB)g#p`kk36ad@1=KLuNL9e-hg+Zs))rBxRLqCHx#+CX
zbkBLE<dmG@{>XF`*T(m>h}W1<j}f5orDePS@Uh*x|JWARws9C>V*<gfbE;x0(_WO(
zQ)<&?Q{i($%<#;qOT2pZ3SM{I>mh3eYdY6>ro);@pzuUT8nq)&(svcN*9xN~Q@apw
z+SwFSvm^>>Er*^vAHEg`p46jK()UDkIFTAr)93V1MjRefR+7XU8w7h&)2U46$IHvh
zr38lKe4ge0?)?Al>h1bz5x+==6-A;RIP@KP`1Y2KY~Z3|)iJ!FLt*#6skqTJRh}su
zJ^u1}g=Z&=6Tg9HbKj(G+UKNd=yH^5%T_Gm!(zW&>akeD#C~82(c9ALxf2dJzk!>G
zl8;bZeR};v5OfnDZRfD@7&*7~8vpUH{}WD|f<1cpNU{|ohv&|nN2Hmx3dqfVY}#Aj
ze5EF{GpME5xG32XJ=*F`G3JNZU?azm>)btY_Bp%!$`yIO_Yd@`k8JeBDZBjg6^#?!
z-r3W8rt!@&e9xszFW8ZzBg)0erExL_5jNTjSCNyiE-iu(UH29bP|O_kJkVPJAJk#5
z{?VV>fBCO}V}JIepV%yFG+Is59$<E1QUeeUXylI!g0E2likWR9f&hIh?|>>e*jCF(
zL(@Dwf+RXcPWd~mwQLJW;}j6OukKCQXE$%zt$UC0_f-H4Gj?wRKM!eLx#o5Papc?<
z53)q$n{Z6Y=Hdf(8JX8KYVW{%ynp|mzPCMsHVz5~MWvJ@cjhTr8<YtD#bF~QU!zP%
zEh2%d3Q;E`EngHirXT8(z2V=f`SY2%T|yNzp<z%{DcQV=wN7iici;U1GMz^X6#REh
zIn)7M`w*M#XE$!#m{z%D&-|KRE=}8V>GY}5!M73qe~Q3$5}z(grrz+{h8u@<P7;ZD
zV!3N(DCnpLXjxD|#5(O8Ld5*E@Y*T)*xIK(+v@qfxr`HrY$jyu1+AP+Q#x9LQ=fnS
zMY{>&H=B0fJDNn^AHN%5`m|&=c^SI<WCrH?Ox0*5eONhE%LAhizyITpKd_zBt~~-^
zkPv=MAxYG3qAvJydjk>b6cEQvo1dRoAuG)z{$rY%!fUZerB(F6&=Gt6%|DQZ)#p83
ziY~)A)vlplyYkvKJ9qw~eemlK?0^2<-`U&W|3mxvzxqr5H2e6&kL-)jKGFNW^76}e
z^NTO+Hy`}k{^~#cJ4a6IUL>>Wk7|v%tsNUh<o)-5{hu`@V`*;5P9W7A8XiHU+_X2Z
zy(&PXGu3D1(voE;F#@Vb4P5<jPaVc_;P2R`;p&X0Y_?n_9);GO$lKR7kv;{Y7n>C6
zARn}NoU||eWC3|i>7YTgl@#`-u4OGWd_5ywS{@>io{3N8Xv#}aqSydmM`l5D_j_Fq
zQ50H>{D5tSrtEMg`*jD9K^}UM;{pDPPelrectM#I2yH^>&Aq1Tqf<!t35pQXC&|nK
z8LW|h@qd1yHA*GL>dNXg?$6A@?*505r>8%Bb`SkCT4qxgM;SIy00000NkvXXu0mjf
DYzksU

literal 0
HcmV?d00001

diff --git a/src/app/dashboard/(user-dashboard)/products/_components/productcadrcomponent.tsx b/src/app/dashboard/(user-dashboard)/products/_components/productcadrcomponent.tsx
new file mode 100644
index 000000000..d14a057e3
--- /dev/null
+++ b/src/app/dashboard/(user-dashboard)/products/_components/productcadrcomponent.tsx
@@ -0,0 +1,51 @@
+'use client'
+import Image, { StaticImageData } from 'next/image';
+interface ProductCardProps {
+    title: string;
+    price: string;
+    description: string;
+    inStock: boolean;
+    imageUrl: string | StaticImageData;
+}
+
+const Delete = () => {
+    alert('Are you sure you want to delete')
+}
+
+const Edit = () => {
+    alert('Proceed to edit')
+}
+
+const ProductCard: React.FC<ProductCardProps> = ({ title, price, description, inStock, imageUrl }) => {
+    return (
+        <div className="max-w-sm rounded-md shadow-md overflow-hidden bg-white p-3 border-[#D9D9D9] border-[1px]">
+            <Image
+                src={imageUrl}
+                alt={title}
+                width={400}
+                height={300}
+                className="w-full h-48 object-cover rounded-md"
+            />
+            <div className="p-4">
+                <div className="flex justify-between items-center">
+                    <h2 className="font-bold text-xl">{title}</h2>
+                    <p className="text-gray-900 font-bold text-[20px] mt-1">{price}</p>
+                </div>
+                <p className="text-gray-700 text-base mb-4">{description}</p>
+                <span className={`px-5 py-2 text-sm mt-3 ${inStock ? 'bg-[#E7F7E9] rounded-full  text-green-500' : 'bg-[#FDE7E7] text-red-500'}`}>
+                  {inStock ? 'In stock' : 'Out of stock'}
+                </span>
+                <div className="mt-6 flex  justify-between space-x-2">
+                    <button onClick={Edit} className="text-black px-4 w-[130px] py-2 rounded-md border-[1px]">
+                        Edit
+                    </button>
+                    <button onClick={Delete} className="bg-white text-[#DC2626] px-4  w-[130px] py-2 rounded-md border-[1px]">
+                        Delete
+                    </button>
+                </div>
+            </div>
+        </div>
+    )
+};
+
+export default ProductCard;
\ No newline at end of file
diff --git a/src/app/dashboard/(user-dashboard)/products/productcard/page.tsx b/src/app/dashboard/(user-dashboard)/products/productcard/page.tsx
new file mode 100644
index 000000000..7b21b1fc1
--- /dev/null
+++ b/src/app/dashboard/(user-dashboard)/products/productcard/page.tsx
@@ -0,0 +1,18 @@
+import ProductCard from "../_components/productcadrcomponent";
+import productimage from '../../../public/images/productimage.png'
+
+const Home: React.FC = () => {
+    return (
+        <div className="flex justify-center items-center min-h-screen bg-gray-100">
+            <ProductCard
+                title="Product 1"
+                price="$19.00"
+                description="Breakfast"
+                inStock={true}
+                imageUrl={productimage}
+            />
+        </div>
+    );
+};
+
+export default Home;
\ No newline at end of file

From e1d797ca01fe0f54c3477dfeabcddf503377c788 Mon Sep 17 00:00:00 2001
From: Muneerat <oladipomunirat@gmail.com>
Date: Fri, 23 Aug 2024 13:15:12 +0100
Subject: [PATCH 40/58] fix: add router for terms and privacy in footer bottom

---
 src/components/layouts/footer/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/layouts/footer/index.tsx b/src/components/layouts/footer/index.tsx
index f9cef3e04..6e0c3b550 100644
--- a/src/components/layouts/footer/index.tsx
+++ b/src/components/layouts/footer/index.tsx
@@ -152,8 +152,8 @@ const Footer = () => {
   ];
 
   const footerBottom = [
-    { route: "privacyPolicy", link: "/" },
-    { route: "termsOfUse", link: "/" },
+    { route: "privacyPolicy", link: "/privacy-policy" },
+    { route: "termsOfUse", link: "/terms-and-conditions" },
   ];
 
   //

From cb25f6b7db0fa230b9a161bf09fcf14689e5bc42 Mon Sep 17 00:00:00 2001
From: Muneerat <oladipomunirat@gmail.com>
Date: Sat, 24 Aug 2024 09:34:42 +0100
Subject: [PATCH 41/58] Fix  update placeholder

---
 src/app/dashboard/(admin)/admin/(settings)/settings/page.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/dashboard/(admin)/admin/(settings)/settings/page.tsx b/src/app/dashboard/(admin)/admin/(settings)/settings/page.tsx
index 909155e7e..0f26d3f06 100644
--- a/src/app/dashboard/(admin)/admin/(settings)/settings/page.tsx
+++ b/src/app/dashboard/(admin)/admin/(settings)/settings/page.tsx
@@ -270,7 +270,7 @@ export default function SettingsPage() {
               onValueChange={(value) => setPronoun(value)}
             >
               <SelectTrigger className="w-full rounded-md border border-slate-300 bg-white text-sm font-medium text-slate-700 focus:border-orange-500 focus:ring-0">
-                <SelectValue placeholder="Select language" />
+                <SelectValue placeholder="Select" />
               </SelectTrigger>
               <SelectContent>
                 {pronouns.map((pronoun) => (

From f7f8a3e51a30af221df0c316758679daad4dc68f Mon Sep 17 00:00:00 2001
From: Muneerat <oladipomunirat@gmail.com>
Date: Sat, 24 Aug 2024 10:01:16 +0100
Subject: [PATCH 42/58] fix/update invite member modal title and dropdown

---
 src/components/common/modals/invite-member/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/common/modals/invite-member/index.tsx b/src/components/common/modals/invite-member/index.tsx
index ce0f294af..ee93cd2b4 100644
--- a/src/components/common/modals/invite-member/index.tsx
+++ b/src/components/common/modals/invite-member/index.tsx
@@ -154,14 +154,14 @@ const InviteMemberModal: React.FC<ModalProperties> = ({ show, onClose }) => {
             </div>
             <div>
               <label className="mb-2 block text-left text-base text-neutral-dark-2">
-                Add to Organization (Optional)
+                Invite as
               </label>
               <Select
                 onOpenChange={handleOrganizationDropdownOpen}
                 onValueChange={handleOrganizationChange}
               >
                 <SelectTrigger className="bg-white">
-                  <SelectValue placeholder="Select Organization" />
+                  <SelectValue placeholder="Select Role" />
                 </SelectTrigger>
                 <SelectContent>
                   <SelectGroup>

From 2709a95f894808f8f0d08f446d2a7f1ba015504a Mon Sep 17 00:00:00 2001
From: Muneerat <oladipomunirat@gmail.com>
Date: Sat, 24 Aug 2024 11:34:22 +0100
Subject: [PATCH 43/58] fix/link go to plans

---
 .../(settings)/settings/organization/members/page.tsx      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/app/dashboard/(admin)/admin/(settings)/settings/organization/members/page.tsx b/src/app/dashboard/(admin)/admin/(settings)/settings/organization/members/page.tsx
index 65c41b98b..e7b948454 100644
--- a/src/app/dashboard/(admin)/admin/(settings)/settings/organization/members/page.tsx
+++ b/src/app/dashboard/(admin)/admin/(settings)/settings/organization/members/page.tsx
@@ -2,6 +2,7 @@
 
 import { AxiosResponse } from "axios";
 import { EllipsisIcon } from "lucide-react";
+import Link from "next/link";
 import { useState } from "react";
 
 import CustomButton from "~/components/common/common-button/common-button";
@@ -201,7 +202,11 @@ const Members = () => {
         <p className="text-sm">
           On the Free plan all members in a workspace are administrators.
           Upgrade to a paid plan to add the ability to assign or remove
-          administrator roles. <span className="text-primary">Go to Plans</span>
+          administrator roles.{" "}
+          <Link href="/dashboard/admin/settings/payment-information">
+            {" "}
+            <span className="text-primary">Go to Plans</span>
+          </Link>
         </p>
       </div>
       <div className="my-8 flex justify-between">

From 89ab9bd1afc662e69886901a5236697a222ffe4e Mon Sep 17 00:00:00 2001
From: JoshuaAkpan <joshuaakpan7@gmail.com>
Date: Sat, 24 Aug 2024 01:02:54 +0100
Subject: [PATCH 44/58] feat: enhance create role form with validation and
 error handling

---
 .../create-role/page.tsx                      | 41 +++++++++++++++----
 src/schemas/index.ts                          | 23 ++++++++---
 2 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/src/app/dashboard/(admin)/admin/(settings)/settings/organization/roles-and-permissions/create-role/page.tsx b/src/app/dashboard/(admin)/admin/(settings)/settings/organization/roles-and-permissions/create-role/page.tsx
index 0333ece7a..35330829d 100644
--- a/src/app/dashboard/(admin)/admin/(settings)/settings/organization/roles-and-permissions/create-role/page.tsx
+++ b/src/app/dashboard/(admin)/admin/(settings)/settings/organization/roles-and-permissions/create-role/page.tsx
@@ -137,8 +137,9 @@ function CreateNewRolePage() {
     handleSubmit,
     formState: { errors },
     setValue,
+    trigger,
   } = useForm<UseFormInputs>({
-    mode: "onBlur",
+    mode: "onChange",
     resolver: zodResolver(roleSchema),
   });
 
@@ -207,6 +208,10 @@ function CreateNewRolePage() {
     }
   };
 
+  const handleInputChange = (field: keyof UseFormInputs) => {
+    trigger(field);
+  };
+
   return (
     <div className="flex w-full max-w-[682px] flex-col gap-6">
       <div className="flex flex-col gap-2">
@@ -237,17 +242,28 @@ function CreateNewRolePage() {
             <input
               type="text"
               placeholder="e.g: IT Staff"
-              {...register("name")}
-              className="!w-full rounded-md border border-border bg-transparent px-3 py-2 shadow-sm outline-none focus:border-primary focus:ring-ring md:w-56"
+              {...register("name", {
+                onChange: () => handleInputChange("name"),
+              })}
+              className={`!w-full rounded-md border ${
+                errors.name ? "border-red-500" : "border-border"
+              } bg-transparent px-3 py-2 shadow-sm outline-none focus:border-primary focus:ring-ring md:w-56`}
             />
+            {errors.name && (
+              <p className="mt-1 text-sm text-red-500">{errors.name.message}</p>
+            )}
           </div>
+
           <div className="flex w-full max-w-[620px] flex-col gap-2">
             <label className="block text-left text-base font-bold text-neutral-dark-2">
               Permissions
             </label>
             <div className="flex flex-col gap-0.5">
               <Select
-                onValueChange={(value) => setPermissions(JSON.parse(value))}
+                onValueChange={(value) => {
+                  setPermissions(JSON.parse(value));
+                  trigger("permissions");
+                }}
               >
                 <SelectTrigger className="!text-left">
                   <SelectValue
@@ -269,7 +285,9 @@ function CreateNewRolePage() {
                 </SelectContent>
               </Select>
               {errors.permissions && (
-                <p className="text-red-500">Please select valid permissions.</p>
+                <p className="mt-1 text-sm text-red-500">
+                  {errors.permissions.message}
+                </p>
               )}
             </div>
           </div>
@@ -279,9 +297,18 @@ function CreateNewRolePage() {
             </label>
             <textarea
               placeholder="describe role"
-              {...register("description")}
-              className="min-h-20 w-full resize-none rounded-md border border-border bg-transparent px-3 py-2 shadow-sm outline-none focus:border-primary focus:ring-ring"
+              {...register("description", {
+                onChange: () => handleInputChange("description"),
+              })}
+              className={`min-h-20 w-full resize-none rounded-md border ${
+                errors.description ? "border-red-500" : "border-border"
+              } bg-transparent px-3 py-2 shadow-sm outline-none focus:border-primary focus:ring-ring`}
             />
+            {errors.description && (
+              <p className="mt-1 text-sm text-red-500">
+                {errors.description.message}
+              </p>
+            )}
           </div>
         </div>
         <div className="flex gap-x-6">
diff --git a/src/schemas/index.ts b/src/schemas/index.ts
index 734a3fe96..74c9a6868 100644
--- a/src/schemas/index.ts
+++ b/src/schemas/index.ts
@@ -121,14 +121,25 @@ export const permissionsSchema = z.object({
   "Can create users": z.boolean(),
   "Can blacklist/whitelist users": z.boolean(),
 });
+
 export const roleSchema = z.object({
-  name: z.string().min(2, {
-    message: "name is required",
-  }),
+  name: z
+    .string()
+    .min(2, { message: "Name is required" })
+    .max(50, { message: "Name must be 50 characters or less" })
+    .regex(/^[a-zA-Z0-9 .,!?()-]+$/, {
+      message:
+        "Name can only include letters, numbers, spaces, and common punctuation marks",
+    }),
+  description: z
+    .string()
+    .min(10, { message: "Role description must be at least 10 characters" })
+    .max(200, { message: "Role description must be 200 characters or less" })
+    .regex(/^[a-zA-Z0-9 .,!?()-]+$/, {
+      message:
+        "Description can only include letters, numbers, spaces, and common punctuation marks",
+    }),
   permissions: z
     .array(z.string().uuid())
     .nonempty("At least one permission must be selected"),
-  description: z.string().min(2, {
-    message: "Role description must be at least 2 characters.",
-  }),
 });

From e2108b0d84243d464bccc5b3519b5a4eb25a089c Mon Sep 17 00:00:00 2001
From: JoshuaAkpan <joshuaakpan7@gmail.com>
Date: Sat, 24 Aug 2024 01:56:10 +0100
Subject: [PATCH 45/58] fix: fix lint error by optimizing regex

---
 src/schemas/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/schemas/index.ts b/src/schemas/index.ts
index 74c9a6868..03bf949cc 100644
--- a/src/schemas/index.ts
+++ b/src/schemas/index.ts
@@ -127,7 +127,7 @@ export const roleSchema = z.object({
     .string()
     .min(2, { message: "Name is required" })
     .max(50, { message: "Name must be 50 characters or less" })
-    .regex(/^[a-zA-Z0-9 .,!?()-]+$/, {
+    .regex(/^[\d !(),.?A-Za-z-]+$/, {
       message:
         "Name can only include letters, numbers, spaces, and common punctuation marks",
     }),
@@ -135,7 +135,7 @@ export const roleSchema = z.object({
     .string()
     .min(10, { message: "Role description must be at least 10 characters" })
     .max(200, { message: "Role description must be 200 characters or less" })
-    .regex(/^[a-zA-Z0-9 .,!?()-]+$/, {
+    .regex(/^[\d !(),.?A-Za-z-]+$/, {
       message:
         "Description can only include letters, numbers, spaces, and common punctuation marks",
     }),

From d9f07344e3243ac600bc10ccab563440c3e60f22 Mon Sep 17 00:00:00 2001
From: Oluwaseyi Tommy <130176232+seshconcept@users.noreply.github.com>
Date: Sat, 24 Aug 2024 00:09:09 +0100
Subject: [PATCH 46/58] Fix: responsiveness and uniform alignment of waitlist
 page.

---
 src/components/waitList/WaitListForm.tsx    | 12 +++++------
 src/components/waitList/WaitlistDialog.tsx  | 22 ++++++++++++---------
 src/components/waitList/WaitlistJoin.tsx    | 10 +++++-----
 src/components/waitList/WaitlistPayment.tsx |  6 ++++--
 4 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/src/components/waitList/WaitListForm.tsx b/src/components/waitList/WaitListForm.tsx
index 549d53c73..f997e6591 100644
--- a/src/components/waitList/WaitListForm.tsx
+++ b/src/components/waitList/WaitListForm.tsx
@@ -122,7 +122,7 @@ const WaitlistForm: React.FC = () => {
   };
 
   return (
-    <div className="mt-20 flex flex-col items-center justify-center text-neutral-dark-2">
+    <div className="mt-20 flex flex-col items-center justify-center text-neutral-dark-2 ">
       <div className="flex flex-col items-center justify-center text-center md:mb-[50px] md:w-[623px]">
         <div className="mb-4 flex items-center justify-center gap-2 md:mb-[18px]">
           <Image
@@ -131,19 +131,19 @@ const WaitlistForm: React.FC = () => {
             src="/images/WaitList/circle 1.svg"
             alt="Circle with Tick"
           />
-          <h3 className="text-[18px] font-normal leading-5 md:text-[24px]">
+          <h3 className="text-sm font-normal leading-5 md:text-[24px]">
             Deployment made easy
           </h3>
         </div>
-        <h1 className="mb-2 w-[320px] text-[24px] font-bold leading-7 md:h-[108px] md:w-[623px] md:text-[36px] md:leading-10">
+        <h1 className="mb-2 w-[320px] text-2xl font-bold leading-8 md:h-[108px] md:w-[623px] md:text-[36px] lg:text-4xl lg:font-semibold lg:leading-10">
           You can level up your SaaS production today
         </h1>
-        <h1 className="text-center text-[16px] font-normal leading-5 md:text-[20px] md:leading-7">
+        <h1 className="text-center text-base font-normal leading-7 md:text-[20px] md:leading-7">
           Join our waitlist and get early access to our boilerplates
         </h1>
       </div>
 
-      <div className="mt-[52px] flex h-auto w-[383.344px] shrink-0 items-start gap-[19.2px] rounded-md border border-gray-300 p-7 md:mt-5 md:w-[510px] md:p-2.5">
+      <div className="mb-24 mt-[52px] flex h-auto w-[383.344px] shrink-0 items-start gap-[19.2px] rounded-md border border-gray-200 p-7 md:mt-5 md:w-[510px] md:p-2.5">
         {isSubmitted ? (
           <div className="flex w-full flex-col items-center justify-center">
             <Image
@@ -162,7 +162,7 @@ const WaitlistForm: React.FC = () => {
               <div className="mb-6 h-[90px]">
                 <label
                   htmlFor="full_name"
-                  className="mb-5 block text-left text-lg font-normal text-neutral-dark-2"
+                  className="mb-5 block text-left text-lg font-normal text-[#0A0A0A]"
                 >
                   Full Name
                 </label>
diff --git a/src/components/waitList/WaitlistDialog.tsx b/src/components/waitList/WaitlistDialog.tsx
index 39dd00a89..ce4c98955 100644
--- a/src/components/waitList/WaitlistDialog.tsx
+++ b/src/components/waitList/WaitlistDialog.tsx
@@ -4,8 +4,8 @@ import React from "react";
 const WaitlistDialog: React.FC = () => {
   return (
     <div className="flex flex-col items-center justify-center">
-      <div className="mt-[20px] flex flex-col items-center justify-center gap-[20px] text-neutral-dark-2 md:mt-[60px] md:flex-row md:gap-[57px]">
-        <div className="flex w-[320px] shrink-0 flex-col items-start rounded-[8px] border-[1px] border-neutral-dark-1 p-[24px] transition-transform duration-300 hover:scale-105 hover:bg-gray-50 hover:shadow-lg">
+      <div className="mt-[20px] grid grid-cols-1 gap-[20px] md:px-2 lg:grid-cols-3 lg:gap-[40px]">
+        <div className="flex shrink-0 flex-col items-start rounded-[8px] border-[1px] border-neutral-300 p-[24px] transition-transform duration-300 hover:scale-105 hover:bg-gray-50 hover:shadow-lg md:w-[500px] lg:w-[300px]">
           <div className="flex h-[53px] w-[53px] shrink-0 items-center justify-center rounded-full bg-primary">
             <Image
               src="/images/WaitList/Vector.svg"
@@ -14,7 +14,7 @@ const WaitlistDialog: React.FC = () => {
               height="25"
             />
           </div>
-          <h1 className="mt-[12px] text-[18px] font-semibold leading-[28px]">
+          <h1 className="mt-[12px] text-xl font-semibold leading-[28px]">
             Easy Customization
           </h1>
           <p className="w-[252px] text-[14px] font-normal leading-[20px]">
@@ -22,7 +22,7 @@ const WaitlistDialog: React.FC = () => {
             maximum results
           </p>
         </div>
-        <div className="flex w-[320px] shrink-0 flex-col items-start rounded-[8px] border-[1px] border-neutral-dark-1 p-[24px] transition-transform duration-300 hover:scale-105 hover:bg-gray-50 hover:shadow-lg">
+        <div className="flex shrink-0 flex-col items-start rounded-[8px] border-[1px] border-neutral-300 p-[24px] transition-transform duration-300 hover:scale-105 hover:bg-gray-50 hover:shadow-lg md:w-[500px] lg:w-[300px]">
           <div className="flex h-[53px] w-[53px] shrink-0 items-center justify-center rounded-full bg-primary">
             <Image
               src="/images/WaitList/pie-chart2.svg"
@@ -31,7 +31,7 @@ const WaitlistDialog: React.FC = () => {
               height="30"
             />
           </div>
-          <h1 className="mt-[12px] text-[18px] font-semibold leading-[28px]">
+          <h1 className="mt-[12px] text-xl font-semibold leading-[28px]">
             Scalable Foundation
           </h1>
           <p className="w-[252px] text-[14px] font-normal leading-[20px]">
@@ -39,7 +39,7 @@ const WaitlistDialog: React.FC = () => {
             product
           </p>
         </div>
-        <div className="flex w-[320px] shrink-0 flex-col items-start rounded-[8px] border-[1px] border-neutral-dark-1 p-[24px] transition-transform duration-300 hover:scale-105 hover:bg-gray-50 hover:shadow-lg">
+        <div className="flex shrink-0 flex-col items-start rounded-[8px] border-[1px] border-neutral-300 p-[24px] transition-transform duration-300 hover:scale-105 hover:bg-gray-50 hover:shadow-lg md:w-[500px] lg:w-[300px]">
           <div className="flex h-[53px] w-[53px] shrink-0 items-center justify-center rounded-full bg-primary">
             <Image
               src="/images/WaitList/activity 2.svg"
@@ -48,7 +48,7 @@ const WaitlistDialog: React.FC = () => {
               height="36"
             />
           </div>
-          <h1 className="mt-[12px] text-[18px] font-semibold leading-[28px]">
+          <h1 className="mt-[12px] text-xl font-semibold leading-[28px]">
             Pre-built Sections
           </h1>
           <p className="w-[252px] text-[14px] font-normal leading-[20px]">
@@ -65,8 +65,12 @@ const WaitlistDialog: React.FC = () => {
           <div className="boorder-white ml-[-16px] h-[40px] w-[40px] rounded-full border-[1px] bg-gray-300"></div>
         </div>
         <div>
-          <p className="text-[12px] text-neutral-dark-1">Resource variety</p>
-          <h1 className="text-[16px] font-bold">150+ Team support</h1>
+          <p className="text-[12px] font-normal leading-4 text-gray-400">
+            Resource variety
+          </p>
+          <h1 className="text-[16px] font-medium leading-5">
+            150+ Team support
+          </h1>
         </div>
       </div>
     </div>
diff --git a/src/components/waitList/WaitlistJoin.tsx b/src/components/waitList/WaitlistJoin.tsx
index bbcdc9239..c2a7f1c06 100644
--- a/src/components/waitList/WaitlistJoin.tsx
+++ b/src/components/waitList/WaitlistJoin.tsx
@@ -14,21 +14,21 @@ const scrollToForm = () => {
 const WaitlistJoin: React.FC = () => {
   return (
     <div className="mt-[10px] flex flex-col items-center justify-center text-neutral-dark-2 md:mt-[10px]">
-      <div className="mb-[10px] rounded-md bg-slate-200 px-3 text-[20px] font-normal">
+      <div className="mb-[10px] rounded-md bg-[#F1F1F1] px-3 text-[20px] font-normal leading-6">
         waitlist
       </div>
-      <div className="mt-[10px] flex h-auto w-[322px] flex-col items-center justify-center text-center md:mt-[25px] md:w-[1104px] md:gap-[15px]">
-        <h1 className="text-[32px] font-bold leading-[38.73px] md:text-[60px] md:leading-[72.61px]">
+      <div className="mt-[10px] flex h-auto w-[322px] flex-col items-center justify-center text-center md:mt-[25px] md:w-[700px] md:gap-[15px] lg:w-[1004px]">
+        <h1 className="text-3xl font-bold leading-normal md:text-3xl md:leading-[72.61px] lg:text-5xl">
           Join the waitlist and get early{" "}
           <span className="text-primary">access!</span>
         </h1>
-        <p className="text-16px leading-bormal mt-[12px] w-[322px] font-normal md:mt-0 md:w-[802px] md:text-[28px]">
+        <p className="mt-[12px] w-[322px] text-lg font-normal leading-6 md:mt-0 md:w-[802px] md:text-2xl md:leading-9 lg:text-2xl">
           Transform your remote work meetings into fun and engaging sessions
           with our innovative game-based platform.
         </p>
       </div>
       <div className="mt-[20px] h-[54px] w-[322px] text-center font-semibold leading-[28px] md:mt-[30px] md:h-[28px] md:w-[584px]">
-        <p className="text-[20px]">
+        <p className="text-lg font-bold leading-6 text-[#525252] md:font-medium md:leading-7">
           Be a part of the first 2300 users for a{" "}
           <span className="text-primary">10% discount</span>{" "}
         </p>
diff --git a/src/components/waitList/WaitlistPayment.tsx b/src/components/waitList/WaitlistPayment.tsx
index 9fa2a9991..947bf9096 100644
--- a/src/components/waitList/WaitlistPayment.tsx
+++ b/src/components/waitList/WaitlistPayment.tsx
@@ -95,8 +95,10 @@ const WaitlistPayment: React.FC = () => {
   return (
     <div className="mt-[60px] flex flex-col items-center justify-center px-3 text-neutral-dark-2 md:mt-[100px] md:flex-col">
       <div className="text-center">
-        <p className="text-[18px] md:text-[24px]">We have got you covered</p>
-        <h1 className="h-[87px] w-[332px] text-[24px] font-bold leading-[29.05px] md:h-[132px] md:w-[669px] md:text-[36px] md:leading-[43.57px]">
+        <p className="text-[18px] font-normal leading-8 md:text-[24px]">
+          We have got you covered
+        </p>
+        <h1 className="mb-6 mt-3 h-[87px] w-[332px] text-[24px] font-bold leading-[29.05px] md:h-[132px] md:w-[632px] md:text-[36px] md:leading-[43.57px] lg:w-[950px]">
           Transform your Deployment the easy and seamless way with our
           boilerplates.
         </h1>

From ac44cfddfd9699632bb3397feed58f179fc1f1ab Mon Sep 17 00:00:00 2001
From: Oluwaseyi Tommy <130176232+seshconcept@users.noreply.github.com>
Date: Sat, 24 Aug 2024 01:06:23 +0100
Subject: [PATCH 47/58] Fix: responsiveness and uniform alignment of waitlist
 page.

---
 src/components/waitList/WaitListForm.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/waitList/WaitListForm.tsx b/src/components/waitList/WaitListForm.tsx
index f997e6591..d3950373b 100644
--- a/src/components/waitList/WaitListForm.tsx
+++ b/src/components/waitList/WaitListForm.tsx
@@ -122,7 +122,7 @@ const WaitlistForm: React.FC = () => {
   };
 
   return (
-    <div className="mt-20 flex flex-col items-center justify-center text-neutral-dark-2 ">
+    <div className="mt-20 flex flex-col items-center justify-center text-neutral-dark-2">
       <div className="flex flex-col items-center justify-center text-center md:mb-[50px] md:w-[623px]">
         <div className="mb-4 flex items-center justify-center gap-2 md:mb-[18px]">
           <Image

From 9fed4eac192cba984c8cda99f285be1fa11ce751 Mon Sep 17 00:00:00 2001
From: Mary <101870828+Chioma227@users.noreply.github.com>
Date: Fri, 23 Aug 2024 18:52:25 +0100
Subject: [PATCH 48/58] chore: fix
 Non-Functional-Terms-of-Service-and-Privacy-Policy-Links

---
 src/app/(auth-routes)/login/page.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/(auth-routes)/login/page.tsx b/src/app/(auth-routes)/login/page.tsx
index 553cfd797..269782fdb 100644
--- a/src/app/(auth-routes)/login/page.tsx
+++ b/src/app/(auth-routes)/login/page.tsx
@@ -283,14 +283,14 @@ const Login = () => {
           <ShieldCheck className="mr-1 hidden h-4 w-4 text-gray-400 sm:inline-block" />
           {t("agree")}{" "}
           <a
-            href="#"
+            href="/terms-and-conditions"
             className="text-sm font-bold text-primary hover:text-orange-500"
           >
             {t("termsOfService")}
           </a>{" "}
           {t("and")}{" "}
           <a
-            href="#"
+            href="/privacy-policy"
             className="text-sm font-bold text-primary hover:text-orange-500"
           >
             {t("privacyPolicy")}

From 7e9ff42172486af029f878a3c1c7dbf83056aea4 Mon Sep 17 00:00:00 2001
From: Mary <101870828+Chioma227@users.noreply.github.com>
Date: Fri, 23 Aug 2024 19:03:15 +0100
Subject: [PATCH 49/58] chore: remove duplicate contactUs from help-center

---
 src/app/(landing-routes)/help-center/page.tsx | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/app/(landing-routes)/help-center/page.tsx b/src/app/(landing-routes)/help-center/page.tsx
index 26ff2313b..768041179 100644
--- a/src/app/(landing-routes)/help-center/page.tsx
+++ b/src/app/(landing-routes)/help-center/page.tsx
@@ -114,17 +114,6 @@ const HelpCenter = () => {
               >
                 Frequently Asked Questions
               </h1>
-
-              <p className="mb-3 text-[18px] text-neutral-600">
-                We couldn&apos;t answer your question?
-              </p>
-
-              <Link
-                href="/contact-us"
-                className="align-center flex w-[150px] justify-center rounded-md border border-[#0A0A0A] bg-[#FFF] py-4 text-[#0F172A] hover:bg-accent hover:text-accent-foreground"
-              >
-                Contact us
-              </Link>
             </div>
 
             <FaqAccordion faqs={faqData} containerClassName="px-0 py-0 " />

From 5b2012a9b67f09b6d2346d851694911fc3f58a1f Mon Sep 17 00:00:00 2001
From: Prudent Bird <prudentbird@gmail.com>
Date: Fri, 23 Aug 2024 19:42:46 +0100
Subject: [PATCH 50/58] chore: bug fixes

---
 src/components/authproviders/AuthProvider.tsx | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 src/components/authproviders/AuthProvider.tsx

diff --git a/src/components/authproviders/AuthProvider.tsx b/src/components/authproviders/AuthProvider.tsx
deleted file mode 100644
index dcaa74598..000000000
--- a/src/components/authproviders/AuthProvider.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-function AuthProvider({ title }: { title: string }) {
-  return (
-    <>
-      <button className="flex items-center gap-2 rounded-md border border-gray-200 p-4">
-        {title}
-      </button>
-    </>
-  );
-}
-
-export default AuthProvider;

From 86fb5bd3930f9e98a7de2e01cc2265ecbec1b07a Mon Sep 17 00:00:00 2001
From: Prudent Bird <prudentbird@gmail.com>
Date: Sat, 24 Aug 2024 18:58:10 +0100
Subject: [PATCH 51/58] chore: resolve unhandled runtime errors and types

---
 hng_boilerplate_nextjs_project                |   1 -
 package.json                                  |   3 +-
 .../notifications/getAllNotifications.ts      |   4 +-
 src/actions/organization.ts                   |   7 +-
 src/actions/product.ts                        |   1 -
 src/actions/socialAuth.ts                     |   6 +-
 src/app/(auth-routes)/login/page.tsx          |  71 ++-
 .../blog/[id]/_components/BlogDetailsPage.tsx |   1 -
 .../(landing-routes)/blog/comments/page.tsx   |   1 -
 .../_components/layout/sidebar/index.tsx      |   6 +-
 .../create-role/page.tsx                      |   6 +-
 .../roles-and-permissions/page.tsx            |  23 +-
 .../(user-metrics)/layout.tsx                 |   2 +-
 .../_components/layout/navbar/index.tsx       |  65 +--
 .../layout/navbar/organisation-switcher.tsx   |  63 +--
 .../_components/overview-revenue/index.tsx    |  89 ++--
 src/app/dashboard/(user-dashboard)/layout.tsx |   2 +-
 .../_components/new-product-modal.tsx         |   7 +-
 .../_components/product-delete-modal.tsx      |  37 +-
 .../_components/product-detail-modal.tsx      |  42 +-
 .../_components/product-detail-view.tsx       |  37 +-
 src/app/dashboard/layout.tsx                  |  42 +-
 src/app/invite/page.tsx                       |  12 +-
 src/components/card/user-card.tsx             |  61 +--
 .../common/contact-us-form/index.tsx          |  28 +-
 .../layouts/navbar/mobile-navbar.tsx          |   9 +-
 src/config/auth.config.ts                     |  24 +-
 src/contexts/orgContext.tsx                   | 449 ++++--------------
 src/lib/auth.ts                               |   5 +-
 src/test/blog/comment/comment-body.test.tsx   |   6 +-
 src/test/blog/comment/comment-reply.test.tsx  |   1 -
 src/test/blog/comment/index.test.tsx          |   1 -
 src/types/index.d.ts                          |   6 +-
 33 files changed, 363 insertions(+), 755 deletions(-)
 delete mode 160000 hng_boilerplate_nextjs_project

diff --git a/hng_boilerplate_nextjs_project b/hng_boilerplate_nextjs_project
deleted file mode 160000
index 8fc1b95c0..000000000
--- a/hng_boilerplate_nextjs_project
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8fc1b95c0e495b78b6b2d20e43b85695edcafec9
diff --git a/package.json b/package.json
index 00d899270..de17b7cb7 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,8 @@
     "test:ci": "vitest --coverage",
     "email:dev": "email dev --dir \"./src/email/templates\"",
     "email:build": "email build --dir \"./src/email/templates\"",
-    "email:start": "email start"
+    "email:start": "email start",
+    "typecheck": "tsc --project tsconfig.json --noEmit"
   },
   "dependencies": {
     "@hookform/resolvers": "^3.9.0",
diff --git a/src/actions/notifications/getAllNotifications.ts b/src/actions/notifications/getAllNotifications.ts
index c7389fb9f..456b27580 100644
--- a/src/actions/notifications/getAllNotifications.ts
+++ b/src/actions/notifications/getAllNotifications.ts
@@ -3,10 +3,10 @@
 import axios from "axios";
 
 import { auth } from "~/lib/auth";
-import { getApiUrl } from "../getApiUrl";
+
+const apiUrl = process.env.API_URL;
 
 export const getAllNotifications = async () => {
-  const apiUrl = await getApiUrl();
   const session = await auth();
   try {
     const response = await axios.get(`${apiUrl}/api/v1/notifications`, {
diff --git a/src/actions/organization.ts b/src/actions/organization.ts
index 36f321737..ac83db272 100644
--- a/src/actions/organization.ts
+++ b/src/actions/organization.ts
@@ -102,8 +102,13 @@ export const getAnalytics = async () => {
       },
     });
 
+    const formattedData = Object.keys(response.data.data).map((key) => ({
+      month: key,
+      revenue: response.data.data[key],
+    }));
+
     return {
-      data: response.data.data,
+      data: formattedData,
     };
   } catch (error) {
     return axios.isAxiosError(error) && error.response
diff --git a/src/actions/product.ts b/src/actions/product.ts
index b527d36c9..e9fe607f6 100644
--- a/src/actions/product.ts
+++ b/src/actions/product.ts
@@ -70,7 +70,6 @@ export const getAllProduct = async (org_id: string) => {
     );
     return {
       products: response.data.data,
-      response: response,
     };
   } catch (error) {
     return axios.isAxiosError(error) && error.response
diff --git a/src/actions/socialAuth.ts b/src/actions/socialAuth.ts
index 0673e95b5..1324573ac 100644
--- a/src/actions/socialAuth.ts
+++ b/src/actions/socialAuth.ts
@@ -2,14 +2,14 @@
 
 import axios from "axios";
 
-import { AuthResponse, ErrorResponse, Profile } from "~/types";
+import { AuthResponse, ErrorResponse } from "~/types";
 
 const apiUrl = process.env.API_URL;
 
-const googleAuth = async (profile: Profile): Promise<AuthResponse> => {
+const googleAuth = async (idToken: string): Promise<AuthResponse> => {
   try {
     const response = await axios.post(`${apiUrl}/api/v1/auth/google`, {
-      id_token: profile.id_token,
+      id_token: idToken,
     });
 
     return {
diff --git a/src/app/(auth-routes)/login/page.tsx b/src/app/(auth-routes)/login/page.tsx
index 269782fdb..5251e9fee 100644
--- a/src/app/(auth-routes)/login/page.tsx
+++ b/src/app/(auth-routes)/login/page.tsx
@@ -10,7 +10,6 @@ import { useEffect, useState, useTransition } from "react";
 import { useForm } from "react-hook-form";
 import * as z from "zod";
 
-import { loginUser } from "~/actions/login";
 import CustomButton from "~/components/common/common-button/common-button";
 import { Input } from "~/components/common/input";
 import LoadingSpinner from "~/components/miscellaneous/loading-spinner";
@@ -24,28 +23,22 @@ import {
   FormMessage,
 } from "~/components/ui/form";
 import { useToast } from "~/components/ui/use-toast";
-import { useLocalStorage } from "~/hooks/use-local-storage";
 import { cn } from "~/lib/utils";
 import { LoginSchema } from "~/schemas";
-import { Organisation } from "~/types";
 
 const Login = () => {
   const t = useTranslations("login");
   const router = useRouter();
   const { toast } = useToast();
-  const { status } = useSession();
   const [isLoading, startTransition] = useTransition();
   const [showPassword, setShowPassword] = useState(false);
-  const [, setUserOrg] = useLocalStorage<Organisation[]>("user_org", []);
-
-  const [currentOrgId, setCurrentOrgId] = useLocalStorage<string | undefined>(
-    "current_orgid",
-    "",
-  );
+  const { status } = useSession();
 
-  if (status === "authenticated") {
-    router.push("/dashboard");
-  }
+  useEffect(() => {
+    if (status === "authenticated") {
+      router.push("/dashboard");
+    }
+  }, [status, router]);
 
   const form = useForm<z.infer<typeof LoginSchema>>({
     resolver: zodResolver(LoginSchema),
@@ -55,34 +48,37 @@ const Login = () => {
       rememberMe: false,
     },
   });
-
   const onSubmit = async (values: z.infer<typeof LoginSchema>) => {
-    startTransition(async () => {
-      await loginUser(values).then(async (data) => {
-        const { email, password } = values;
+    const { email, password } = values;
 
-        if (data.status === 200) {
-          setUserOrg(data.organisations);
-          if (!currentOrgId && data.organisations.length > 0) {
-            setCurrentOrgId(data.organisations[0].organisation_id);
-          }
-          await signIn(
-            "credentials",
-            {
-              email,
-              password,
-              redirect: false,
-            },
-            { callbackUrl: "/dashboard" },
-          );
+    try {
+      startTransition(async () => {
+        const result = await signIn("credentials", {
+          email,
+          password,
+          redirect: false,
+        });
+
+        if (result?.ok) {
           router.push("/dashboard");
+          toast({
+            title: "Login success",
+            description: "Redirecting",
+          });
+        } else {
+          toast({
+            title: "An error occurred",
+            description: result?.error || "Unknown error",
+          });
         }
-        toast({
-          title: data.status === 200 ? "Login success" : "An error occurred",
-          description: data.status === 200 ? "Redirecting" : data.error,
-        });
       });
-    });
+    } catch (error) {
+      toast({
+        title: "Login failed",
+        description:
+          (error as Error).message || "An error occurred during login",
+      });
+    }
   };
 
   const togglePasswordVisibility = () => {
@@ -91,6 +87,7 @@ const Login = () => {
   useEffect(() => {
     document.title = "Login";
   }, []);
+
   return (
     <div className="flex min-h-full items-center justify-center px-4 py-10 sm:px-6 lg:px-8">
       <div className="w-full max-w-md space-y-6">
@@ -106,7 +103,7 @@ const Login = () => {
           <CustomButton
             variant="outline"
             isLeftIconVisible={true}
-            onClick={() => signIn("google", { callbackUrl: "/dashboard" })}
+            onClick={() => signIn("google", { callbackUrl: "/" })}
             icon={
               <svg
                 width="25"
diff --git a/src/app/(landing-routes)/blog/[id]/_components/BlogDetailsPage.tsx b/src/app/(landing-routes)/blog/[id]/_components/BlogDetailsPage.tsx
index 4eceb676f..71819d4ae 100644
--- a/src/app/(landing-routes)/blog/[id]/_components/BlogDetailsPage.tsx
+++ b/src/app/(landing-routes)/blog/[id]/_components/BlogDetailsPage.tsx
@@ -22,7 +22,6 @@ const mockSession: Session = {
     last_name: "User",
     email: "user@example.com",
     image: "path/to/image",
-    role: "user",
   },
   access_token: "some-token",
   expires: "2100-01-01T00:00:00.000Z",
diff --git a/src/app/(landing-routes)/blog/comments/page.tsx b/src/app/(landing-routes)/blog/comments/page.tsx
index 1f205e1ed..669d30c3d 100644
--- a/src/app/(landing-routes)/blog/comments/page.tsx
+++ b/src/app/(landing-routes)/blog/comments/page.tsx
@@ -12,7 +12,6 @@ const CommentPage = () => {
       last_name: "User",
       email: "user@example.com",
       image: "path/to/image",
-      role: "user",
     },
     access_token: "some-token",
     expires: "1",
diff --git a/src/app/dashboard/(admin)/admin/(settings)/settings/_components/layout/sidebar/index.tsx b/src/app/dashboard/(admin)/admin/(settings)/settings/_components/layout/sidebar/index.tsx
index 48d8aabe8..f65b5e87f 100644
--- a/src/app/dashboard/(admin)/admin/(settings)/settings/_components/layout/sidebar/index.tsx
+++ b/src/app/dashboard/(admin)/admin/(settings)/settings/_components/layout/sidebar/index.tsx
@@ -12,12 +12,12 @@ import {
   UserRoundCog,
   UsersIcon,
 } from "lucide-react";
+import { useSession } from "next-auth/react";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
 import { FC, ForwardRefExoticComponent, RefAttributes } from "react";
 
 import { useOrgContext } from "~/contexts/orgContext";
-import { useLocalStorage } from "~/hooks/use-local-storage";
 
 const sideItems = [
   {
@@ -96,10 +96,10 @@ const SettingsSidebar: FC<Iproperties> = ({ sideNavitems = sideItems }) => {
     pathname?.split("/").length == 2 ? "general" : pathname?.split("/")[3];
   const organizationPath = pathname?.split("/")[4];
   const { organizations } = useOrgContext();
-  const [org_id] = useLocalStorage<string>("current_orgid", "");
+  const { data: session } = useSession();
 
   const organization = organizations.find(
-    (org) => org.organisation_id === org_id,
+    (org) => org.organisation_id === session?.currentOrgId,
   );
 
   return (
diff --git a/src/app/dashboard/(admin)/admin/(settings)/settings/organization/roles-and-permissions/create-role/page.tsx b/src/app/dashboard/(admin)/admin/(settings)/settings/organization/roles-and-permissions/create-role/page.tsx
index 35330829d..a55dfa546 100644
--- a/src/app/dashboard/(admin)/admin/(settings)/settings/organization/roles-and-permissions/create-role/page.tsx
+++ b/src/app/dashboard/(admin)/admin/(settings)/settings/organization/roles-and-permissions/create-role/page.tsx
@@ -2,6 +2,7 @@
 
 import { zodResolver } from "@hookform/resolvers/zod";
 import { ChevronLeftIcon } from "lucide-react";
+import { useSession } from "next-auth/react";
 import Link from "next/link";
 import { useRouter } from "next/navigation";
 import { useEffect, useState } from "react";
@@ -19,7 +20,6 @@ import {
   SelectValue,
 } from "~/components/ui/select";
 import { toast } from "~/components/ui/use-toast";
-import { useLocalStorage } from "~/hooks/use-local-storage";
 import { roleSchema } from "~/schemas";
 
 type UseFormInputs = z.infer<typeof roleSchema>;
@@ -123,7 +123,7 @@ const transformPermissions = (apiResponse: APIPermissions[]) => {
 
 function CreateNewRolePage() {
   const router = useRouter();
-  const [currentOrgId] = useLocalStorage<string>("current_orgid", "");
+  const { data: session } = useSession();
   const [isSaving, setIsSaving] = useState(false);
   const [permissions, setPermissions] = useState<
     PermissionOption["permissions"] | []
@@ -175,7 +175,7 @@ function CreateNewRolePage() {
   const onValid = async (values: UseFormInputs) => {
     setIsSaving(true);
     try {
-      await createRole(values, currentOrgId)
+      await createRole(values, session?.currentOrgId ?? "")
         .then((data) => {
           if (!data.error) {
             toast({
diff --git a/src/app/dashboard/(admin)/admin/(settings)/settings/organization/roles-and-permissions/page.tsx b/src/app/dashboard/(admin)/admin/(settings)/settings/organization/roles-and-permissions/page.tsx
index 11d6b6349..0ec979fa5 100644
--- a/src/app/dashboard/(admin)/admin/(settings)/settings/organization/roles-and-permissions/page.tsx
+++ b/src/app/dashboard/(admin)/admin/(settings)/settings/organization/roles-and-permissions/page.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import { useSession } from "next-auth/react";
 import Link from "next/link";
 import { useEffect, useState } from "react";
 
@@ -13,7 +14,6 @@ import {
 import CustomButton from "~/components/common/common-button/common-button";
 import LoadingSpinner from "~/components/miscellaneous/loading-spinner";
 import { useToast } from "~/components/ui/use-toast";
-import { useLocalStorage } from "~/hooks/use-local-storage";
 
 type Role = {
   id: string;
@@ -39,18 +39,15 @@ const RolesAndPermission = () => {
   const [loadingRoles, setLoadingRoles] = useState<boolean>(true);
   const [loadingPermissions, setLoadingPermissions] = useState<boolean>(false);
   const [loadingRequest, setLoadingRequest] = useState<boolean>(false);
-  const [currentOrgId] = useLocalStorage<string | undefined>(
-    "current_orgid",
-    "",
-  );
+  const { data: session } = useSession();
 
   useEffect(() => {
-    if (!currentOrgId) return;
+    if (!session?.currentOrgId) return;
     const fetchData = async () => {
       try {
         const url = await getApiUrl();
         setApiUrl(url);
-        const { data, error } = await getRoles(currentOrgId);
+        const { data, error } = await getRoles(session?.currentOrgId ?? "");
 
         if (error) throw new Error("An error occurred!");
 
@@ -68,14 +65,14 @@ const RolesAndPermission = () => {
     };
     setLoadingRoles(true);
     fetchData();
-  }, [currentOrgId, toast]);
+  }, [session?.currentOrgId, toast]);
 
   useEffect(() => {
     const fetchPermissions = async () => {
-      if (selectedRoleId && currentOrgId) {
+      if (selectedRoleId && session?.currentOrgId) {
         setLoadingPermissions(true);
         try {
-          await getRolePermissions(currentOrgId, selectedRoleId).then(
+          await getRolePermissions(session?.currentOrgId, selectedRoleId).then(
             (data) => {
               const rolesData = data.data;
               if (rolesData.permissions.length > 0) {
@@ -99,7 +96,7 @@ const RolesAndPermission = () => {
       }
     };
     fetchPermissions();
-  }, [selectedRoleId, apiUrl, currentOrgId, toast]);
+  }, [selectedRoleId, apiUrl, session?.currentOrgId, toast]);
 
   useEffect(() => {
     const fetchPermissions = async () => {
@@ -132,7 +129,7 @@ const RolesAndPermission = () => {
   };
 
   const handleSave = async () => {
-    if (!selectedRoleId || !currentOrgId) return;
+    if (!selectedRoleId || !session?.currentOrgId) return;
     const selectedRole =
       roles.some((role) => role.id === selectedRoleId) &&
       roles.find((role) => role.id === selectedRoleId);
@@ -141,7 +138,7 @@ const RolesAndPermission = () => {
     try {
       await updateRole(
         { ...selectedRole, permissions },
-        currentOrgId,
+        session?.currentOrgId,
         selectedRoleId,
       ).then(() => {
         toast({
diff --git a/src/app/dashboard/(user-dashboard)/(user-metrics)/layout.tsx b/src/app/dashboard/(user-dashboard)/(user-metrics)/layout.tsx
index dbe5f72ec..41a7552da 100644
--- a/src/app/dashboard/(user-dashboard)/(user-metrics)/layout.tsx
+++ b/src/app/dashboard/(user-dashboard)/(user-metrics)/layout.tsx
@@ -22,7 +22,7 @@ const links = [
 export default function UserMetricsLayout({ children }: PropsWithChildren) {
   return (
     <div className="flex h-full flex-col gap-[37px] bg-background p-4">
-      <div className="flex flex-wrap items-center justify-between gap-x-6 gap-y-2 pt-6">
+      <div className="flex flex-wrap items-end justify-between gap-x-6 gap-y-2 pt-6">
         <div className="space-y-6">
           <h1 className="text-2xl font-semibold lg:text-[30px]">Dashboard</h1>
           <Tablinks links={links} />
diff --git a/src/app/dashboard/(user-dashboard)/_components/layout/navbar/index.tsx b/src/app/dashboard/(user-dashboard)/_components/layout/navbar/index.tsx
index d537b16e7..bf87dedb9 100644
--- a/src/app/dashboard/(user-dashboard)/_components/layout/navbar/index.tsx
+++ b/src/app/dashboard/(user-dashboard)/_components/layout/navbar/index.tsx
@@ -1,11 +1,7 @@
 "use client";
 
 import { BellIcon, HelpCircle } from "lucide-react";
-import { useSession } from "next-auth/react";
-import { useRouter } from "next/navigation";
-import { useEffect, useState } from "react";
 
-import { getAllNotifications } from "~/actions/notifications/getAllNotifications";
 import UnreadNotificationCard from "~/app/dashboard/(admin)/_components/unread-notification-card/UnreadNotificationCard";
 import { MobileNavlinks } from "~/app/dashboard/(user-dashboard)/_components/layout/navbar/mobile-navlinks";
 import { Navlinks } from "~/app/dashboard/(user-dashboard)/_components/layout/navbar/navlinks";
@@ -16,62 +12,23 @@ import {
   PopoverContent,
   PopoverTrigger,
 } from "~/components/ui/popover";
+import { useOrgContext } from "~/contexts/orgContext";
 import { OrganisationSwitcher } from "./organisation-switcher";
 
-interface NotificationPreview {
-  message: string;
-  created_at: string;
-  is_read: boolean;
-  id: string;
-}
-
-interface NotificationsData {
-  data: {
-    total_unread_notification_count: number;
-    total_notification_count: number;
-    notifications: NotificationPreview[];
-  };
-  message: string;
-}
-
 const UserNavbar = () => {
-  const [notifications, setNotifications] =
-    useState<NotificationsData | null>();
-  const { status } = useSession();
-  const router = useRouter();
-
-  useEffect(() => {
-    if (status === "unauthenticated") {
-      router.push("/login");
-    }
-  }, [status, router]);
-
-  useEffect(() => {
-    async function fetchNotifications() {
-      const result = await getAllNotifications();
-
-      if (result.error) {
-        return result.error;
-      } else {
-        setNotifications(result.data as NotificationsData);
-      }
-    }
-
-    fetchNotifications();
-  }, []);
+  const { notifications } = useOrgContext();
 
   const totalUnreadNotificationCount =
-    notifications?.data.total_unread_notification_count || 0;
+    notifications?.data?.total_unread_notification_count || 0;
 
   const totalNotificationCount =
-    notifications?.data.total_notification_count || 0;
-  const notificationContent: NotificationPreview[] =
-    notifications?.data.notifications || [];
+    notifications?.data?.total_notification_count || 0;
+  const notificationContent = notifications?.data?.notifications || [];
 
   return (
     <nav
       className="bg-white px-5 py-2.5 md:left-[220px] lg:left-[252px]"
-      role="navbar"
+      role="navigation"
     >
       <div className="flex items-center justify-between gap-2">
         <div className="flex gap-[50px]">
@@ -89,6 +46,7 @@ const UserNavbar = () => {
               <PopoverTrigger>
                 <BellIcon
                   data-testid="bell"
+                  aria-label="Notifications"
                   className="h-6 w-6 text-neutral-dark-2 transition-colors duration-300 hover:cursor-pointer hover:text-neutral-dark-1"
                 />
               </PopoverTrigger>
@@ -104,17 +62,14 @@ const UserNavbar = () => {
                 />
               </PopoverContent>
             </Popover>
-            {notifications && (
-              <>
-                {totalNotificationCount > 0 && (
-                  <span className="absolute right-1 top-0 h-[6px] w-[6px] rounded-full bg-error"></span>
-                )}
-              </>
+            {totalUnreadNotificationCount > 0 && (
+              <span className="absolute right-1 top-0 h-[6px] w-[6px] rounded-full bg-error"></span>
             )}
           </div>
           <div className="max-sm:hidden">
             <HelpCircle
               data-testid="help"
+              aria-label="Help"
               className="h-6 w-6 text-neutral-dark-2 transition-colors duration-300 hover:cursor-pointer hover:text-neutral-dark-1"
             />
           </div>
diff --git a/src/app/dashboard/(user-dashboard)/_components/layout/navbar/organisation-switcher.tsx b/src/app/dashboard/(user-dashboard)/_components/layout/navbar/organisation-switcher.tsx
index 36b1f6e0a..6f5b447e6 100644
--- a/src/app/dashboard/(user-dashboard)/_components/layout/navbar/organisation-switcher.tsx
+++ b/src/app/dashboard/(user-dashboard)/_components/layout/navbar/organisation-switcher.tsx
@@ -1,8 +1,8 @@
-"use client ";
+"use client";
 
-import { useEffect, useState } from "react";
+import { useSession } from "next-auth/react";
+import { useState } from "react";
 
-import { getCurrentOrgApi } from "~/actions/switchOrganization";
 import { Avatar, AvatarFallback, AvatarImage } from "~/components/ui/avatar";
 import { Button } from "~/components/ui/button";
 import {
@@ -14,43 +14,30 @@ import {
 } from "~/components/ui/select";
 import { Skeleton } from "~/components/ui/skeleton";
 import { useOrgContext } from "~/contexts/orgContext";
-import { useLocalStorage } from "~/hooks/use-local-storage";
 import { CreateOrganization } from "../../create-organization";
 
 export const OrganisationSwitcher = () => {
-  const [currentOrgId, setCurrentOrgId] = useLocalStorage<string | undefined>(
-    "current_orgid",
-    "",
-  );
-
-  const { organizations, isLoading, switchOrganization } = useOrgContext();
+  const { data: session } = useSession();
+  const { isLoading, switchOrganization } = useOrgContext();
 
-  useEffect(() => {
-    if (!currentOrgId && organizations.length > 0) {
-      setCurrentOrgId(organizations[0].organisation_id);
-      switchOrganization(organizations[0].organisation_id);
-    }
-    // console.log(organizations);
-  }, [currentOrgId, organizations, setCurrentOrgId, switchOrganization]);
-
-  const handleOrgChange = (currentOrg: string) => {
-    setCurrentOrgId(currentOrg);
-    switchOrganization(currentOrg);
-    getCurrentOrgApi({ orgId: currentOrg });
+  // Ensure that switchOrganization is properly defined and used
+  const handleOrgChange = (currentOrgId: string) => {
+    switchOrganization(currentOrgId);
   };
 
-  const currentOrg =
-    organizations.length > 0
-      ? organizations.find((org) => org.organisation_id === currentOrgId)
-      : undefined;
+  // Ensure currentOrg is correctly derived
+  const currentOrg = session?.userOrg?.find(
+    (org) => org.organisation_id === session.currentOrgId,
+  );
 
+  // State to manage the modal visibility
   const [isOpen, setIsOpen] = useState(false);
 
   return (
     <>
       <CreateOrganization isOpen={isOpen} setIsOpen={setIsOpen} />
       <Select
-        defaultValue={currentOrgId}
+        defaultValue={currentOrg?.name}
         onValueChange={(value) => handleOrgChange(value)}
       >
         <SelectTrigger
@@ -60,31 +47,33 @@ export const OrganisationSwitcher = () => {
           {isLoading ? (
             <Skeleton className="h-4 w-full" />
           ) : (
-            <SelectValue placeholder={currentOrg?.name}>
-              <span className="ml-2">{currentOrg && currentOrg.name}</span>
+            <SelectValue placeholder="Select an organization">
+              <span className="ml-2">
+                {currentOrg?.name || "No Organization Selected"}
+              </span>
             </SelectValue>
           )}
         </SelectTrigger>
         <SelectContent>
-          {organizations.map((org) => (
-            <SelectItem key={org.id} value={org.organisation_id}>
-              <div className="flex items-center gap-3 [&_svg]:h-4 [&_svg]:w-4 [&_svg]:shrink-0 [&_svg]:text-foreground">
-                <Avatar className="size-4 sm:size-3">
+          {session?.userOrg?.map((org) => (
+            <SelectItem key={org.organisation_id} value={org.organisation_id}>
+              <div className="flex items-center gap-3">
+                <Avatar className="h-4 w-4 sm:h-3 sm:w-3">
                   <AvatarImage src={""} />
                   <AvatarFallback className="bg-primary/30 uppercase">
-                    {org?.name?.charAt(0)}
+                    {org.name?.charAt(0)}
                   </AvatarFallback>
-                </Avatar>{" "}
+                </Avatar>
                 {org.name}
               </div>
             </SelectItem>
           ))}
           <Button
             variant="outline"
-            className="w-full"
+            className="mt-2 w-full"
             onClick={() => setIsOpen(!isOpen)}
           >
-            Create Organisation
+            Create Organization
           </Button>
         </SelectContent>
       </Select>
diff --git a/src/app/dashboard/(user-dashboard)/_components/overview-revenue/index.tsx b/src/app/dashboard/(user-dashboard)/_components/overview-revenue/index.tsx
index 10642e0eb..1e3335ebf 100644
--- a/src/app/dashboard/(user-dashboard)/_components/overview-revenue/index.tsx
+++ b/src/app/dashboard/(user-dashboard)/_components/overview-revenue/index.tsx
@@ -1,93 +1,60 @@
 "use client";
 
-import { useEffect, useState } from "react";
-
-import { dashboard } from "~/actions/dashboard";
 import { revenueData } from "~/app/dashboard/(user-dashboard)/_components/overview-revenue/revenueData";
 import CardComponent from "~/components/common/DashboardCard/CardComponent";
 import { useOrgContext } from "~/contexts/orgContext";
 
-interface dashboard {
-  revenue: number;
-  subscriptions: number;
-  sales: number;
-  activeSubscription: number;
-  monthSales: [
-    {
-      id: string;
-      user_id: string;
-      product_id: string;
-      subscription_id: string;
-      type: string;
-      status: string;
-      partners: string;
-      amount: number;
-      reference: string;
-      created_at: string;
-      paid_at: string;
-      modified_at: string;
-    },
-  ];
-}
 export function OverviewRevenue() {
-  const [dashboardObjectData, setDashboardObjectData] = useState<dashboard>();
-  useEffect(() => {
-    getDashboardData();
-  }, []);
-  const getDashboardData = async () => {
-    const data = await dashboard();
-    setDashboardObjectData(data);
-  };
   const { isLoading, dashboardData } = useOrgContext();
+
+  // If dashboardData is undefined or still loading, render a loading state
+  if (isLoading || !dashboardData) {
+    return (
+      <div className="mb-6 mt-4 grid grid-cols-1 gap-4 md:grid-cols-2 xl:grid-cols-4">
+        {/* Placeholder card components or a loading spinner */}
+        {revenueData.map((data, index) => (
+          <CardComponent
+            key={index}
+            title={data.title}
+            value={0} // Default value during loading
+            percentage={0} // Default percentage during loading
+            icon={data.icon}
+            loading={true} // Indicate that the card is in a loading state
+          />
+        ))}
+      </div>
+    );
+  }
+
   return (
     <div className="mb-6 mt-4 grid grid-cols-1 gap-4 md:grid-cols-2 xl:grid-cols-4">
       <CardComponent
         title={revenueData[0].title}
-        // title={revenueData[0].title}
-        value={dashboardObjectData?.revenue || 0}
-        // value={dashboardData?.revenue.current_month || 0}
-        percentage={dashboardData?.revenue.percentage_difference || 0}
-        // percentage={dashboardData?.revenue.percentage_difference || 0}
+        value={dashboardData.revenue.current_month || 0}
+        percentage={dashboardData.revenue.percentage_difference || 0}
         icon={revenueData[0].icon}
-        // icon={revenueData[0].icon}
         loading={isLoading}
-        // loading={isLoading}
       />
       <CardComponent
         title={revenueData[1].title}
-        // title={revenueData[1].title}
-        value={dashboardObjectData?.subscriptions || 0}
-        // value={dashboardData?.Subscriptions.current_month || 0}
-        percentage={dashboardData?.Subscriptions.percentage_difference || 0}
-        // percentage={dashboardData?.Subscriptions.percentage_difference || 0}
+        value={dashboardData.Subscriptions.current_month || 0}
+        percentage={dashboardData.Subscriptions.percentage_difference || 0}
         icon={revenueData[1].icon}
-        // icon={revenueData[1].icon}
         loading={isLoading}
-        // loading={isLoading}
       />
       <CardComponent
         title={revenueData[2].title}
-        // title={revenueData[2].title}
-        value={dashboardObjectData?.sales || 0}
-        // value={dashboardData?.orders.current_month || 0}
-        percentage={dashboardData?.orders.percentage_difference || 0}
-        // percentage={dashboardData?.orders.percentage_difference || 0}
+        value={dashboardData.orders.current_month || 0}
+        percentage={dashboardData.orders.percentage_difference || 0}
         icon={revenueData[2].icon}
-        // icon={revenueData[2].icon}
         loading={isLoading}
-        // loading={isLoading}
       />
       <CardComponent
         title={revenueData[3].title}
-        // title={revenueData[3].title}
-        value={dashboardObjectData?.activeSubscription || 0}
-        // value={dashboardData?.active_users.current || 0}
-        percentage={dashboardData?.active_users.difference_an_hour_ago || 0}
-        // percentage={dashboardData?.active_users.difference_an_hour_ago || 0}
+        value={dashboardData.active_users.current || 0}
+        percentage={dashboardData.active_users.difference_an_hour_ago || 0}
         icon={revenueData[3].icon}
-        // icon={revenueData[3].icon}
         loading={isLoading}
-        // loading={isLoading}
         isUser
       />
     </div>
diff --git a/src/app/dashboard/(user-dashboard)/layout.tsx b/src/app/dashboard/(user-dashboard)/layout.tsx
index 9448e15dc..b03d8ab91 100644
--- a/src/app/dashboard/(user-dashboard)/layout.tsx
+++ b/src/app/dashboard/(user-dashboard)/layout.tsx
@@ -21,7 +21,7 @@ export default function AdminLayout({
           <div className="w-[calc(100%_-_50px)] flex-1">
             <Suspense>{children}</Suspense>
           </div>
-        </div>{" "}
+        </div>
       </div>
     </div>
   );
diff --git a/src/app/dashboard/(user-dashboard)/products/_components/new-product-modal.tsx b/src/app/dashboard/(user-dashboard)/products/_components/new-product-modal.tsx
index f12531b9f..69f7b2c77 100644
--- a/src/app/dashboard/(user-dashboard)/products/_components/new-product-modal.tsx
+++ b/src/app/dashboard/(user-dashboard)/products/_components/new-product-modal.tsx
@@ -2,6 +2,7 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import { AnimatePresence, motion } from "framer-motion";
 import { Loader, X } from "lucide-react";
+import { useSession } from "next-auth/react";
 import Image from "next/image";
 import { useState, useTransition } from "react";
 import { useForm } from "react-hook-form";
@@ -32,7 +33,6 @@ import {
 import { Textarea } from "~/components/ui/textarea";
 import { useToast } from "~/components/ui/use-toast";
 import { useOrgContext } from "~/contexts/orgContext";
-import { useLocalStorage } from "~/hooks/use-local-storage";
 import { cn } from "~/lib/utils";
 import { productSchema } from "~/schemas";
 import { CloudinaryAsset } from "~/types";
@@ -43,7 +43,7 @@ const NewProductModal = () => {
   const { setIsNewModal, isNewModal } = useOrgContext();
   const [image, setImage] = useState<File | Blob>();
   const [isLoading, startTransition] = useTransition();
-  const [org_id] = useLocalStorage<string>("current_orgid", "");
+  const { data: session } = useSession();
 
   const variantProperties = {
     left: "50%",
@@ -82,7 +82,8 @@ const NewProductModal = () => {
         values.image_url = data.url;
       });
 
-      await createProduct(values, org_id).then((data) => {
+      if (session?.currentOrgId === undefined) return;
+      await createProduct(values, session?.currentOrgId).then((data) => {
         if (data.status === 201) {
           newProductForm.reset();
           setIsNewModal(false);
diff --git a/src/app/dashboard/(user-dashboard)/products/_components/product-delete-modal.tsx b/src/app/dashboard/(user-dashboard)/products/_components/product-delete-modal.tsx
index 99f2612a0..eb3904f82 100644
--- a/src/app/dashboard/(user-dashboard)/products/_components/product-delete-modal.tsx
+++ b/src/app/dashboard/(user-dashboard)/products/_components/product-delete-modal.tsx
@@ -1,13 +1,13 @@
 "use client";
 
 import { AnimatePresence, motion } from "framer-motion";
+import { useSession } from "next-auth/react";
 import { useTransition } from "react";
 
 import { deleteProduct } from "~/actions/product";
 import { Button } from "~/components/ui/button";
 import { toast } from "~/components/ui/use-toast";
 import { useOrgContext } from "~/contexts/orgContext";
-import { useLocalStorage } from "~/hooks/use-local-storage";
 import { cn } from "~/lib/utils";
 
 const variantProperties = {
@@ -18,7 +18,7 @@ const variantProperties = {
 };
 
 const ProductDeleteModal = () => {
-  const [org_id] = useLocalStorage<string>("current_orgid", "");
+  const { data: session } = useSession();
   const [isPending, startTransition] = useTransition();
   const { selectedProduct, products, isDelete, setIsDelete } = useOrgContext();
 
@@ -32,21 +32,24 @@ const ProductDeleteModal = () => {
     });
 
     startTransition(async () => {
-      await deleteProduct(org_id, selectedProduct).then((data) => {
-        if (data.status === 200) {
-          toast({
-            title: "Product deleted",
-            description: "Product deleted successfully.",
-          });
-        } else {
-          toast({
-            title: "Error",
-            description: data.error || "An unexpected error occurred.",
-            variant: "destructive",
-          });
-        }
-        setIsDelete(false);
-      });
+      if (session?.currentOrgId === undefined) return;
+      await deleteProduct(session?.currentOrgId, selectedProduct).then(
+        (data) => {
+          if (data.status === 200) {
+            toast({
+              title: "Product deleted",
+              description: "Product deleted successfully.",
+            });
+          } else {
+            toast({
+              title: "Error",
+              description: data.error || "An unexpected error occurred.",
+              variant: "destructive",
+            });
+          }
+          setIsDelete(false);
+        },
+      );
     });
   };
 
diff --git a/src/app/dashboard/(user-dashboard)/products/_components/product-detail-modal.tsx b/src/app/dashboard/(user-dashboard)/products/_components/product-detail-modal.tsx
index 0a6edfceb..271c00fce 100644
--- a/src/app/dashboard/(user-dashboard)/products/_components/product-detail-modal.tsx
+++ b/src/app/dashboard/(user-dashboard)/products/_components/product-detail-modal.tsx
@@ -1,5 +1,6 @@
 import { AnimatePresence, motion } from "framer-motion";
 import { Loader2, X } from "lucide-react";
+import { useSession } from "next-auth/react";
 import { useRouter } from "next-nprogress-bar";
 import { startTransition, useEffect, useState, useTransition } from "react";
 
@@ -8,7 +9,6 @@ import BlurImage from "~/components/miscellaneous/blur-image";
 import { Button } from "~/components/ui/button";
 import { toast } from "~/components/ui/use-toast";
 import { useOrgContext } from "~/contexts/orgContext";
-import { useLocalStorage } from "~/hooks/use-local-storage";
 import useWindowWidth from "~/hooks/use-window-width";
 import { cn, formatPrice } from "~/lib/utils";
 import { Product } from "~/types";
@@ -29,7 +29,7 @@ const ProductDetailModal = () => {
     useOrgContext();
 
   const [isLoading, startLoading] = useTransition();
-  const [org_id] = useLocalStorage<string>("current_orgid", "");
+  const { data: session } = useSession();
   const { winWidth } = useWindowWidth();
 
   useEffect(() => {
@@ -51,23 +51,27 @@ const ProductDetailModal = () => {
     });
 
     startLoading(() => {
-      deleteProduct(org_id, selectedProduct).then(async (data) => {
-        toast({
-          title: data.status === 200 ? `Product deleted` : "an error occurred",
-          description: (
-            <span>
-              <b>{product?.name}</b>{" "}
-              {data.status === 200 ? " has been deleted." : data.error}
-            </span>
-          ),
-          variant: "default",
-          className: "z-[99999]",
-        });
-        if (data.status === 200) {
-          updateOpen(false);
-          setIsDelete(false);
-        }
-      });
+      if (session?.currentOrgId === undefined) return;
+      deleteProduct(session?.currentOrgId, selectedProduct).then(
+        async (data) => {
+          toast({
+            title:
+              data.status === 200 ? `Product deleted` : "an error occurred",
+            description: (
+              <span>
+                <b>{product?.name}</b>{" "}
+                {data.status === 200 ? " has been deleted." : data.error}
+              </span>
+            ),
+            variant: "default",
+            className: "z-[99999]",
+          });
+          if (data.status === 200) {
+            updateOpen(false);
+            setIsDelete(false);
+          }
+        },
+      );
     });
   };
   const handleEditAction = (id: string) => {
diff --git a/src/app/dashboard/(user-dashboard)/products/_components/product-detail-view.tsx b/src/app/dashboard/(user-dashboard)/products/_components/product-detail-view.tsx
index 3c7b03b68..cfbf51e0f 100644
--- a/src/app/dashboard/(user-dashboard)/products/_components/product-detail-view.tsx
+++ b/src/app/dashboard/(user-dashboard)/products/_components/product-detail-view.tsx
@@ -2,6 +2,7 @@
 
 import { AnimatePresence, motion } from "framer-motion";
 import { X } from "lucide-react";
+import { useSession } from "next-auth/react";
 import { useRouter } from "next-nprogress-bar";
 import { useEffect, useTransition } from "react";
 
@@ -11,7 +12,6 @@ import LoadingSpinner from "~/components/miscellaneous/loading-spinner";
 import { Button } from "~/components/ui/button";
 import { toast } from "~/components/ui/use-toast";
 import { useOrgContext } from "~/contexts/orgContext";
-import { useLocalStorage } from "~/hooks/use-local-storage";
 import { cn, formatPrice } from "~/lib/utils";
 
 const ProductDetailView = () => {
@@ -28,7 +28,7 @@ const ProductDetailView = () => {
   const [isLoading, startTransition] = useTransition();
 
   const product = products.find((p) => p.id === selectedProduct);
-  const [org_id] = useLocalStorage<string>("current_orgid", "");
+  const { data: session } = useSession();
 
   const handleDelete = async () => {
     toast({
@@ -38,21 +38,24 @@ const ProductDetailView = () => {
     });
 
     startTransition(async () => {
-      await deleteProduct(org_id, selectedProduct).then((data) => {
-        if (data.status === 200) {
-          toast({
-            title: "Product deleted",
-            description: "Product deleted successfully.",
-          });
-        } else {
-          toast({
-            title: "Error",
-            description: data.error || "An unexpected error occurred.",
-            variant: "destructive",
-          });
-        }
-        setIsDelete(false);
-      });
+      if (session?.currentOrgId === undefined) return;
+      await deleteProduct(session?.currentOrgId, selectedProduct).then(
+        (data) => {
+          if (data.status === 200) {
+            toast({
+              title: "Product deleted",
+              description: "Product deleted successfully.",
+            });
+          } else {
+            toast({
+              title: "Error",
+              description: data.error || "An unexpected error occurred.",
+              variant: "destructive",
+            });
+          }
+          setIsDelete(false);
+        },
+      );
     });
   };
   const handleEditAction = (id: string) => {
diff --git a/src/app/dashboard/layout.tsx b/src/app/dashboard/layout.tsx
index 5c5cff5e4..84430821d 100644
--- a/src/app/dashboard/layout.tsx
+++ b/src/app/dashboard/layout.tsx
@@ -1,9 +1,41 @@
+import { getAllNotifications } from "~/actions/notifications/getAllNotifications";
+import { getAnalytics, getStatistics } from "~/actions/organization";
+import { getAllProduct } from "~/actions/product";
 import OrgContextProvider from "~/contexts/orgContext";
+import { auth } from "~/lib/auth";
 
-export default function GeneralLayout({
-  children,
-}: {
+interface GeneralLayoutProperties {
   children: React.ReactNode;
-}) {
-  return <OrgContextProvider>{children}</OrgContextProvider>;
+}
+
+export default async function GeneralLayout(
+  properties: GeneralLayoutProperties,
+) {
+  const session = await auth();
+
+  if (!session || !session.currentOrgId) {
+    return;
+  }
+
+  const { children } = properties;
+
+  const [notifications, statistics, analytics, products] = await Promise.all([
+    getAllNotifications(),
+    getStatistics(),
+    getAnalytics(),
+    getAllProduct(session?.currentOrgId),
+  ]);
+
+  return (
+    <OrgContextProvider
+      initialData={{
+        notifications: notifications?.data,
+        dashboardData: statistics?.data,
+        monthlyData: analytics?.data,
+        products: products.products,
+      }}
+    >
+      {children}
+    </OrgContextProvider>
+  );
 }
diff --git a/src/app/invite/page.tsx b/src/app/invite/page.tsx
index 61e1c1984..e03c03903 100644
--- a/src/app/invite/page.tsx
+++ b/src/app/invite/page.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { useRouter } from "next/navigation"; // Import from next/navigation
-import { useEffect } from "react";
+import { useCallback, useEffect } from "react";
 
 import { acceptInviteRequest } from "~/actions/inviteMembers";
 
@@ -12,12 +12,12 @@ const extractToken = () => {
     ? queryString
     : queryString.slice(0, Math.max(0, ampersandIndex));
 };
+
 const AcceptInvitePage = () => {
   const router = useRouter();
 
-  // Function to extract token from the query string
-
-  const handleAcceptInvite = async () => {
+  // Memoized function to handle invite acceptance
+  const handleAcceptInvite = useCallback(async () => {
     // Extract token using the function
     const token = extractToken();
 
@@ -56,12 +56,12 @@ const AcceptInvitePage = () => {
       // Handle unexpected errors
       router.push("/error?message=An unexpected error occurred");
     }
-  };
+  }, [router]);
 
   // Process the invite on page load
   useEffect(() => {
     handleAcceptInvite();
-  }, []);
+  }, [handleAcceptInvite]);
 
   return (
     <div className="flex h-[100vh] w-[100vw] items-center justify-center">
diff --git a/src/components/card/user-card.tsx b/src/components/card/user-card.tsx
index 8f37be0ac..ed6fac9af 100644
--- a/src/components/card/user-card.tsx
+++ b/src/components/card/user-card.tsx
@@ -1,10 +1,7 @@
-import axios from "axios";
 import { ChevronDown } from "lucide-react";
 import { signOut, useSession } from "next-auth/react";
 import Link from "next/link";
-import { useCallback, useEffect, useState } from "react";
 
-import { getApiUrl } from "~/actions/getApiUrl";
 import { Avatar, AvatarFallback, AvatarImage } from "~/components/ui/avatar";
 import {
   DropdownMenu,
@@ -16,7 +13,6 @@ import {
   DropdownMenuShortcut,
   DropdownMenuTrigger,
 } from "~/components/ui/dropdown-menu";
-import { toast } from "~/components/ui/use-toast";
 import { cn } from "~/lib/utils";
 
 const handleLogout = async () => {
@@ -27,55 +23,6 @@ const handleLogout = async () => {
 
 const UserCard = () => {
   const { data: session, status } = useSession();
-  const { user } = session ?? {};
-  const [profilePicUrl, setProfilePicUrl] = useState<string | undefined>("");
-
-  const fetchProfileData = useCallback(async () => {
-    if (status === "authenticated" && user?.id) {
-      try {
-        const baseUrl = await getApiUrl();
-        const API_URL = `${baseUrl}/api/v1/profile/${user.id}`;
-        const response = await axios.get(API_URL, {
-          headers: {
-            Authorization: `Bearer ${session?.access_token}`,
-          },
-        });
-        if (response.data?.data) {
-          const { avatar_url, profile_pic_url } = response.data.data;
-          setProfilePicUrl(avatar_url || profile_pic_url);
-        }
-      } catch {
-        toast({
-          title: "Error",
-          description: "Failed to fetch profile data.",
-          variant: "destructive",
-        });
-      }
-    }
-  }, [status, user?.id, session?.access_token]);
-
-  useEffect(() => {
-    fetchProfileData();
-    const handleProfileUpdate = (event: CustomEvent) => {
-      if (event.detail && event.detail.profilePicUrl) {
-        setProfilePicUrl(event.detail.profilePicUrl);
-      } else {
-        fetchProfileData();
-      }
-    };
-
-    window.addEventListener(
-      "userProfileUpdate",
-      handleProfileUpdate as EventListener,
-    );
-
-    return () => {
-      window.removeEventListener(
-        "userProfileUpdate",
-        handleProfileUpdate as EventListener,
-      );
-    };
-  }, [fetchProfileData]);
 
   return (
     <DropdownMenu>
@@ -91,11 +38,11 @@ const UserCard = () => {
           {status === "authenticated" && (
             <Avatar className="size-8 sm:size-10">
               <AvatarImage
-                src={`${profilePicUrl}?t=${Date.now()}`}
+                src={`${session.user.image}?t=${Date.now()}`}
                 alt="User Avatar"
               />
               <AvatarFallback className="bg-primary/30 uppercase">
-                {user?.first_name?.charAt(0)}
+                {session.user?.first_name?.charAt(0)}
               </AvatarFallback>
             </Avatar>
           )}
@@ -110,10 +57,10 @@ const UserCard = () => {
       </DropdownMenuTrigger>
       <DropdownMenuContent className="mr-1 w-56" align="end">
         <DropdownMenuLabel className="pb-0 pt-3">
-          {user?.first_name} {user?.last_name}
+          {session?.user?.first_name} {session?.user?.last_name}
         </DropdownMenuLabel>
         <span className="block px-2 pb-1 text-xs text-neutral-dark-1">
-          {user?.email ?? "Signed In"}
+          {session?.user?.email ?? "Signed In"}
         </span>
         <DropdownMenuSeparator />
         <DropdownMenuGroup>
diff --git a/src/components/common/contact-us-form/index.tsx b/src/components/common/contact-us-form/index.tsx
index 7609b15a6..1d8f692bc 100644
--- a/src/components/common/contact-us-form/index.tsx
+++ b/src/components/common/contact-us-form/index.tsx
@@ -1,13 +1,13 @@
 "use client";
 
 import { Mail } from "lucide-react";
+import { useSession } from "next-auth/react";
 import { useEffect, useState } from "react";
 import { z, ZodError } from "zod";
 
 import { getApiUrl } from "~/actions/getApiUrl";
 import { Toaster } from "~/components/ui/toaster";
 import { useToast } from "~/components/ui/use-toast";
-import { useLocalStorage } from "~/hooks/use-local-storage";
 import CustomButton from "../common-button/common-button";
 import InputField from "./inputfield";
 
@@ -44,7 +44,7 @@ const ContactForm: React.FC = () => {
   const [status, setStatus] = useState<boolean | undefined>();
   const [message, setMessage] = useState<string | undefined>();
   const [loading, setLoading] = useState<boolean>(false);
-  const [org_id] = useLocalStorage<string>("current_orgid", "");
+  const { data: session } = useSession();
   const { toast } = useToast();
 
   useEffect(() => {
@@ -72,22 +72,6 @@ const ContactForm: React.FC = () => {
     }
   };
 
-  function transformFormData(
-    formData: FormData,
-    orgId: string,
-  ): TransformedData {
-    // Create a new object with the required structure
-    const transformedData = {
-      full_name: formData.name,
-      email: formData.email,
-      phone_number: formData.phone,
-      message: formData.message,
-      org_id: orgId, // Pass orgId as a parameter or obtain it from your application context
-    };
-
-    return transformedData;
-  }
-
   const handleChange = (
     event: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>,
   ) => {
@@ -104,7 +88,13 @@ const ContactForm: React.FC = () => {
     }
     try {
       const baseUrl = await getApiUrl();
-      const apiData = transformFormData(formData, org_id);
+      const apiData: TransformedData = {
+        full_name: formData.name,
+        email: formData.email,
+        phone_number: formData.phone,
+        message: formData.message,
+        org_id: session?.currentOrgId ?? "",
+      };
       setLoading(true);
       const response = await fetch(`${baseUrl}/api/v1/contact`, {
         method: "POST",
diff --git a/src/components/layouts/navbar/mobile-navbar.tsx b/src/components/layouts/navbar/mobile-navbar.tsx
index e2b563661..c81c18627 100644
--- a/src/components/layouts/navbar/mobile-navbar.tsx
+++ b/src/components/layouts/navbar/mobile-navbar.tsx
@@ -1,19 +1,20 @@
 import "./menu.css";
 
 import { motion, stagger, useAnimate } from "framer-motion";
+import { useSession } from "next-auth/react";
 import { useTranslations } from "next-intl";
 import Link from "next/link";
 import { useEffect, useState } from "react";
 
-import { useUser } from "~/hooks/user/use-user";
 import { cn } from "~/lib/utils";
 import { NAV_LINKS } from "./links";
 
 export default function MobileNav() {
   const [open, setOpen] = useState(false);
   const [scope, animate] = useAnimate();
-  const { user } = useUser();
   const t = useTranslations();
+  const { data: session } = useSession();
+  const user = session?.user;
 
   // the stagger effect
   const staggerList = stagger(0.1, { startDelay: 0.25 });
@@ -26,7 +27,7 @@ export default function MobileNav() {
       "ul",
       {
         width: open ? 180 : 0,
-        height: open && user.email ? 140 : open ? 250 : 0,
+        height: open && user?.email ? 140 : open ? 250 : 0,
         opacity: open ? 1 : 0,
       },
       {
@@ -45,7 +46,7 @@ export default function MobileNav() {
         delay: open ? staggerList : 0,
       },
     );
-  }, [animate, open, staggerList, user.email]);
+  }, [animate, open, staggerList, user?.email]);
 
   return (
     <>
diff --git a/src/config/auth.config.ts b/src/config/auth.config.ts
index 44768ac63..3206ae8d7 100644
--- a/src/config/auth.config.ts
+++ b/src/config/auth.config.ts
@@ -43,6 +43,7 @@ export default {
         }
 
         const user = {
+          ...response.data,
           ...response.data.user,
           access_token: response.access_token,
         };
@@ -73,7 +74,7 @@ export default {
           return token;
         }
 
-        const response = await googleAuth({ id_token: account?.id_token });
+        const response = await googleAuth(account?.id_token);
 
         if (!response.data) {
           token = {
@@ -127,21 +128,16 @@ export default {
       const customToken = token as CustomJWT;
       session.user = {
         id: customToken.id as string,
-        first_name:
-          customToken.first_name ||
-          customToken.name?.split(" ")[0] ||
-          customToken.fullname?.split(" ")[0] ||
-          "",
-        last_name:
-          customToken.last_name ||
-          customToken.name?.split(" ").slice(1).join(" ") ||
-          customToken.fullname?.split(" ").slice(1).join(" ") ||
-          "",
-        image: token.picture || customToken.avatar_url || "",
-        role: customToken.role as string,
-        email: token.email as string,
+        first_name: customToken.first_name,
+        last_name: customToken.last_name,
+        image: customToken.avatar_url || "",
+        email: customToken.email as string,
       };
       session.access_token = customToken.access_token;
+      session.userOrg = customToken.organisations;
+      session.currentOrgId =
+        customToken.organisations &&
+        customToken.organisations[0]?.organisation_id;
 
       return session;
     },
diff --git a/src/contexts/orgContext.tsx b/src/contexts/orgContext.tsx
index 7a90aeecc..9712adfaa 100644
--- a/src/contexts/orgContext.tsx
+++ b/src/contexts/orgContext.tsx
@@ -1,27 +1,34 @@
 "use client";
 
+import { useSession } from "next-auth/react";
 import React, {
   createContext,
   useCallback,
   useContext,
   useEffect,
-  useLayoutEffect,
-  useMemo,
   useState,
-  useTransition,
 } from "react";
 
-import { getAllProduct } from "~/actions/product";
-import { useLocalStorage } from "~/hooks/use-local-storage";
 import { DashboardData, MonthlyData, Organisation, Product } from "~/types";
-import {
-  getAllOrg,
-  getAnalytics,
-  getStatistics,
-} from "../actions/organization";
 
 type ActiveFilter = "in stock" | "out of stock" | "preorder" | "all";
 
+interface NotificationPreview {
+  message: string;
+  created_at: string;
+  is_read: boolean;
+  id: string;
+}
+
+interface NotificationsData {
+  data: {
+    total_unread_notification_count: number;
+    total_notification_count: number;
+    notifications: NotificationPreview[];
+  };
+  message: string;
+}
+
 interface OrgContextProperties {
   organizations: Organisation[];
   isLoading: boolean;
@@ -41,96 +48,55 @@ interface OrgContextProperties {
   isActionModal: boolean;
   setIsActionModal: React.Dispatch<React.SetStateAction<boolean>>;
   switchOrganization: (orgId: string) => void;
+  notifications: NotificationsData | undefined;
+}
+
+interface SessionCheckerProperties {
+  children: React.ReactNode;
 }
 
 export const OrgContext = createContext({} as OrgContextProperties);
 
-const OrgContextProvider = ({ children }: { children: React.ReactNode }) => {
-  const [organizations, setOrganizations] = useState<Organisation[]>([]);
-  const [isLoading, startTransition] = useTransition();
-  const [monthlyData, setMonthlydata] = useState<MonthlyData | undefined>();
-  const [dashboardData, setDashboardData] = useState<
-    DashboardData | undefined
-  >();
-  const [products, setProducts] = useState<Product[]>([]);
-  const [org_id, setOrgId] = useLocalStorage<string>("current_orgid", "");
-  const [selectedProduct, setSelectedProduct] = useState<string>("");
+interface ProviderProperties {
+  children: React.ReactNode;
+  initialData: {
+    monthlyData?: MonthlyData;
+    dashboardData?: DashboardData;
+    products?: Product[];
+    notifications?: NotificationsData;
+  };
+}
+const OrgContextProvider = (properties: ProviderProperties) => {
+  const { children, initialData } = properties;
+
+  const monthlyData = initialData.monthlyData;
+  const dashboardData = initialData.dashboardData;
+  const products = initialData.products || [];
+  const notifications = initialData.notifications;
+
+  const { data: session, update, status } = useSession();
+
+  const [selectedProduct, setSelectedProduct] = useState("");
   const [isNewModal, setIsNewModal] = useState(false);
   const [isDelete, setIsDelete] = useState(false);
   const [isOpen, updateOpen] = useState(false);
   const [isActionModal, setIsActionModal] = useState(false);
   const [active_filter, setActive_filter] = useState<ActiveFilter>("all");
-  const [userOrg] = useLocalStorage<Organisation[]>("user_org", []);
-
   const isAnyModalOpen = isNewModal || isDelete || isOpen || isActionModal;
+  const isLoading = status === "loading";
 
   const switchOrganization = useCallback(
     (orgId: string) => {
-      setOrgId(orgId);
+      if (session) {
+        const updatedSession = { ...session, currentOrgId: orgId };
+        update(() => updatedSession);
+      }
     },
-    [setOrgId],
+    [session, update],
   );
-
-  useLayoutEffect(() => {
-    if (organizations.length === 0) {
-      startTransition(() => {
-        getAllOrg().then((data) => {
-          const fetchedOrganizations = (data && data.organization) || [];
-          const newOrganizations = fetchedOrganizations.filter(
-            (fetchedOrg: { organisation_id: string }) =>
-              !organizations.some(
-                (org) => org.organisation_id === fetchedOrg.organisation_id,
-              ),
-          );
-
-          if (newOrganizations.length > 0) {
-            setOrganizations((previousOrganizations) => [
-              ...previousOrganizations,
-              ...newOrganizations,
-            ]);
-          }
-        });
-
-        getStatistics().then((subResponse) => {
-          setDashboardData(subResponse.data);
-        });
-
-        getAnalytics().then((data) => {
-          if (data && data.data) {
-            const formattedData: MonthlyData = Object.keys(data.data).map(
-              (key) => ({
-                month: key,
-                revenue: data.data[key],
-              }),
-            );
-            setMonthlydata(formattedData);
-          }
-        });
-      });
-    }
-  }, [organizations]);
-
-  useEffect(() => {
-    if (userOrg.length > 0) {
-      const uniqueOrgs = userOrg.filter(
-        (org) =>
-          !organizations.some(
-            (existingOrg) =>
-              existingOrg.organisation_id === org.organisation_id,
-          ),
-      );
-      setOrganizations((previousOrganizations) => [
-        ...previousOrganizations,
-        ...uniqueOrgs,
-      ]);
-    }
-  }, [userOrg, organizations]);
-
   useEffect(() => {
-    document.body.style.overflow = isAnyModalOpen ? "hidden" : "auto";
-
-    const handleKeyDown = (entries: KeyboardEvent) => {
-      if (entries.key === "Escape") {
+    const handleKeyDown = (event: KeyboardEvent) => {
+      if (event.key === "Escape") {
         setIsNewModal(false);
         setIsDelete(false);
         updateOpen(false);
@@ -138,60 +104,46 @@ const OrgContextProvider = ({ children }: { children: React.ReactNode }) => {
       }
     };
 
+    document.body.style.overflow = isAnyModalOpen ? "hidden" : "auto";
     document.addEventListener("keydown", handleKeyDown);
-
-    return () => {
-      document.removeEventListener("keydown", handleKeyDown);
-    };
+    return () => document.removeEventListener("keydown", handleKeyDown);
   }, [isAnyModalOpen]);
 
-  useLayoutEffect(() => {
-    if (!org_id || org_id === undefined) return;
-    startTransition(() => {
-      getAllProduct(org_id).then((data) => {
-        setProducts(data.products || []);
-      });
-    });
-  }, [org_id]);
+  function SessionChecker({ children }: SessionCheckerProperties) {
+    if (status === "loading") {
+      return <div>Loading...</div>;
+    }
 
-  const value = useMemo(
-    () => ({
-      isLoading,
-      organizations,
-      monthlyData,
-      dashboardData,
-      products,
-      selectedProduct,
-      setSelectedProduct,
-      isNewModal,
-      setIsNewModal,
-      isDelete,
-      setIsDelete,
-      isOpen,
-      updateOpen,
-      isActionModal,
-      setIsActionModal,
-      active_filter,
-      setActive_filter,
-      switchOrganization,
-    }),
-    [
-      isLoading,
-      organizations,
-      monthlyData,
-      dashboardData,
-      products,
-      selectedProduct,
-      isNewModal,
-      isDelete,
-      isOpen,
-      isActionModal,
-      active_filter,
-      switchOrganization,
-    ],
-  );
+    return <>{children}</>;
+  }
 
-  return <OrgContext.Provider value={value}>{children}</OrgContext.Provider>;
+  return (
+    <OrgContext.Provider
+      value={{
+        isLoading,
+        organizations: session?.userOrg || [],
+        monthlyData,
+        dashboardData,
+        products,
+        selectedProduct,
+        setSelectedProduct,
+        isNewModal,
+        setIsNewModal,
+        isDelete,
+        setIsDelete,
+        isOpen,
+        updateOpen,
+        isActionModal,
+        setIsActionModal,
+        active_filter,
+        setActive_filter,
+        switchOrganization,
+        notifications,
+      }}
+    >
+      <SessionChecker>{children}</SessionChecker>
+    </OrgContext.Provider>
+  );
 };
 
 export const useOrgContext = () => {
@@ -204,234 +156,3 @@ export const useOrgContext = () => {
 };
 
 export default OrgContextProvider;
-
-// "use client";
-
-// import React, {
-//   createContext,
-//   useContext,
-//   useEffect,
-//   useLayoutEffect,
-//   useMemo,
-//   useReducer,
-//   useTransition,
-// } from "react";
-
-// import { getAllProduct } from "~/actions/product";
-// import { useLocalStorage } from "~/hooks/use-local-storage";
-// import { DashboardData, MonthlyData, Organisation, Product } from "~/types";
-// import {
-//   getAllOrg,
-//   getAnalytics,
-//   getStatistics,
-// } from "../actions/organization";
-
-// type ActiveFilter = "in stock" | "out of stock" | "preorder" | "all";
-
-// interface OrgState {
-//   organizations: Organisation[];
-//   isLoading: boolean;
-//   monthlyData: MonthlyData | undefined;
-//   dashboardData: DashboardData | undefined;
-//   products: Product[];
-//   selectedProduct: string;
-//   isNewModal: boolean;
-//   isDelete: boolean;
-//   isOpen: boolean;
-//   isActionModal: boolean;
-//   active_filter: ActiveFilter;
-// }
-
-// type OrgAction =
-//   | { type: "SET_ORGANIZATIONS"; payload: Organisation[] }
-//   | { type: "SET_LOADING"; payload: boolean }
-//   | { type: "SET_MONTHLY_DATA"; payload: MonthlyData | undefined }
-//   | { type: "SET_DASHBOARD_DATA"; payload: DashboardData | undefined }
-//   | { type: "SET_PRODUCTS"; payload: Product[] }
-//   | { type: "SET_SELECTED_PRODUCT"; payload: string }
-//   | { type: "TOGGLE_NEW_MODAL"; payload: boolean }
-//   | { type: "TOGGLE_DELETE"; payload: boolean }
-//   | { type: "TOGGLE_OPEN"; payload: boolean }
-//   | { type: "TOGGLE_ACTION_MODAL"; payload: boolean }
-//   | { type: "SET_ACTIVE_FILTER"; payload: ActiveFilter };
-
-// const initialState: OrgState = {
-//   organizations: [],
-//   isLoading: false,
-//   monthlyData: undefined,
-//   dashboardData: undefined,
-//   products: [],
-//   selectedProduct: "",
-//   isNewModal: false,
-//   isDelete: false,
-//   isOpen: false,
-//   isActionModal: false,
-//   active_filter: "all",
-// };
-
-// function orgReducer(state: OrgState, action: OrgAction): OrgState {
-//   switch (action.type) {
-//     case "SET_ORGANIZATIONS": {
-//       return { ...state, organizations: action.payload };
-//     }
-//     case "SET_LOADING": {
-//       return { ...state, isLoading: action.payload };
-//     }
-//     case "SET_MONTHLY_DATA": {
-//       return { ...state, monthlyData: action.payload };
-//     }
-//     case "SET_DASHBOARD_DATA": {
-//       return { ...state, dashboardData: action.payload };
-//     }
-//     case "SET_PRODUCTS": {
-//       return { ...state, products: action.payload };
-//     }
-//     case "SET_SELECTED_PRODUCT": {
-//       return { ...state, selectedProduct: action.payload };
-//     }
-//     case "TOGGLE_NEW_MODAL": {
-//       return { ...state, isNewModal: action.payload };
-//     }
-//     case "TOGGLE_DELETE": {
-//       return { ...state, isDelete: action.payload };
-//     }
-//     case "TOGGLE_OPEN": {
-//       return { ...state, isOpen: action.payload };
-//     }
-//     case "TOGGLE_ACTION_MODAL": {
-//       return { ...state, isActionModal: action.payload };
-//     }
-//     case "SET_ACTIVE_FILTER": {
-//       return { ...state, active_filter: action.payload };
-//     }
-//     default: {
-//       return state;
-//     }
-//   }
-// }
-
-// export const OrgContext = createContext<{
-//   state: OrgState;
-//   dispatch: React.Dispatch<OrgAction>;
-// }>({ state: initialState, dispatch: () => {} });
-
-// const OrgContextProvider = ({ children }: { children: React.ReactNode }) => {
-//   const [state, dispatch] = useReducer(orgReducer, initialState);
-//   const [, startTransition] = useTransition();
-//   const [org_id] = useLocalStorage<string>("current_orgid", "");
-//   const [userOrg] = useLocalStorage<Organisation[]>("user_org", []);
-
-//   const isAnyModalOpen =
-//     state.isNewModal || state.isDelete || state.isOpen || state.isActionModal;
-
-//   useLayoutEffect(() => {
-//     if (state.organizations.length === 0) {
-//       startTransition(() => {
-//         getAllOrg().then((data) => {
-//           const fetchedOrganizations = data.organization || [];
-//           const newOrganizations = fetchedOrganizations.filter(
-//             (fetchedOrg: { organisation_id: string }) =>
-//               !state.organizations.some(
-//                 (org) => org.organisation_id === fetchedOrg.organisation_id,
-//               ),
-//           );
-
-//           if (newOrganizations.length > 0) {
-//             dispatch({
-//               type: "SET_ORGANIZATIONS",
-//               payload: [...state.organizations, ...newOrganizations],
-//             });
-//           }
-//         });
-
-//         getStatistics().then((subResponse) => {
-//           dispatch({
-//             type: "SET_DASHBOARD_DATA",
-//             payload: subResponse.data,
-//           });
-//         });
-
-//         getAnalytics().then((data) => {
-//           const formattedData: MonthlyData = Object.keys(data.data).map(
-//             (key) => ({
-//               month: key,
-//               revenue: data.data[key],
-//             }),
-//           );
-//           dispatch({
-//             type: "SET_MONTHLY_DATA",
-//             payload: formattedData,
-//           });
-//         });
-//       });
-//     }
-//   }, [state.organizations]);
-
-//   useEffect(() => {
-//     if (userOrg.length > 0) {
-//       const uniqueOrgs = userOrg.filter(
-//         (org) =>
-//           !state.organizations.some(
-//             (existingOrg) =>
-//               existingOrg.organisation_id === org.organisation_id,
-//           ),
-//       );
-//       dispatch({
-//         type: "SET_ORGANIZATIONS",
-//         payload: [...state.organizations, ...uniqueOrgs],
-//       });
-//     }
-//   }, [userOrg]);
-
-//   useEffect(() => {
-//     document.body.style.overflow = isAnyModalOpen ? "hidden" : "auto";
-
-//     const handleKeyDown = (entries: KeyboardEvent) => {
-//       if (entries.key === "Escape") {
-//         dispatch({ type: "TOGGLE_NEW_MODAL", payload: false });
-//         dispatch({ type: "TOGGLE_DELETE", payload: false });
-//         dispatch({ type: "TOGGLE_OPEN", payload: false });
-//         dispatch({ type: "TOGGLE_ACTION_MODAL", payload: false });
-//       }
-//     };
-
-//     document.addEventListener("keydown", handleKeyDown);
-
-//     return () => {
-//       document.removeEventListener("keydown", handleKeyDown);
-//     };
-//   }, [isAnyModalOpen]);
-
-//   useLayoutEffect(() => {
-//     if (!org_id || org_id === undefined) return;
-//     startTransition(() => {
-//       getAllProduct(org_id).then((data) => {
-//         dispatch({
-//           type: "SET_PRODUCTS",
-//           payload: data.products || [],
-//         });
-//       });
-//     });
-//   }, [org_id]);
-
-//   const value = useMemo(
-//     () => ({
-//       state,
-//       dispatch,
-//     }),
-//     [state],
-//   );
-
-//   return <OrgContext.Provider value={value}>{children}</OrgContext.Provider>;
-// };
-
-// export const useOrgContext = () => {
-//   const context = useContext(OrgContext);
-
-//   if (!context) {
-//     throw new Error("useOrgContext must be used within a OrgContextProvider");
-//   }
-//   return context;
-// };
-
-// export default OrgContextProvider;
diff --git a/src/lib/auth.ts b/src/lib/auth.ts
index 18de73deb..347e07c7c 100644
--- a/src/lib/auth.ts
+++ b/src/lib/auth.ts
@@ -1,7 +1,7 @@
 import NextAuth, { type DefaultSession } from "next-auth";
 
 import authConfig from "~/config/auth.config";
-import { User } from "~/types";
+import { Organisation, User } from "~/types";
 
 export const {
   handlers: { GET, POST },
@@ -19,11 +19,12 @@ declare module "next-auth" {
       last_name: User["last_name"];
       email: User["email"];
       image: User["avatar_url"];
-      role: User["role"];
       bio?: string;
       username?: string;
       is_superadmin?: boolean;
     } & DefaultSession["user"];
     access_token?: string;
+    currentOrgId?: string;
+    userOrg?: Organisation[];
   }
 }
diff --git a/src/test/blog/comment/comment-body.test.tsx b/src/test/blog/comment/comment-body.test.tsx
index 4fac54610..a486ccbf1 100644
--- a/src/test/blog/comment/comment-body.test.tsx
+++ b/src/test/blog/comment/comment-body.test.tsx
@@ -13,7 +13,6 @@ describe("comment body component", () => {
       last_name: "User",
       email: "user@example.com",
       image: "path/to/image",
-      role: "user",
     },
     access_token: "some-token",
     expires: "1",
@@ -35,6 +34,7 @@ describe("comment body component", () => {
         onLike={vi.fn()}
         onDislike={vi.fn()}
         onReply={vi.fn()}
+        isReplyActive={false}
       />,
     );
     expect(screen.getByTestId("comment-text")).toHaveTextContent(
@@ -64,6 +64,7 @@ describe("comment body component", () => {
         dislikes={0}
         onLike={mockOnLike}
         onDislike={mockOnDislike}
+        isReplyActive={false}
       />,
     );
 
@@ -93,6 +94,7 @@ describe("comment body component", () => {
         dislikes={3}
         onLike={vi.fn()}
         onDislike={vi.fn()}
+        isReplyActive={false}
       />,
     );
 
@@ -118,6 +120,7 @@ describe("comment body component", () => {
         onLike={vi.fn()}
         onDislike={vi.fn()}
         onReply={vi.fn()}
+        isReplyActive={false}
       />,
     );
 
@@ -142,6 +145,7 @@ describe("comment body component", () => {
         onLike={vi.fn()}
         onDislike={vi.fn()}
         onReply={vi.fn()}
+        isReplyActive={false}
       />,
     );
     expect(
diff --git a/src/test/blog/comment/comment-reply.test.tsx b/src/test/blog/comment/comment-reply.test.tsx
index ce980678e..9af91c8be 100644
--- a/src/test/blog/comment/comment-reply.test.tsx
+++ b/src/test/blog/comment/comment-reply.test.tsx
@@ -12,7 +12,6 @@ describe("comment reply component", () => {
       last_name: "User",
       email: "user@example.com",
       image: "path/to/image",
-      role: "user",
     },
     access_token: "some-token",
     expires: "1",
diff --git a/src/test/blog/comment/index.test.tsx b/src/test/blog/comment/index.test.tsx
index 47dc199bd..afc19231d 100644
--- a/src/test/blog/comment/index.test.tsx
+++ b/src/test/blog/comment/index.test.tsx
@@ -15,7 +15,6 @@ describe("comment box component", () => {
       last_name: "User",
       email: "user@example.com",
       image: "path/to/image",
-      role: "user",
     },
     access_token: "some-token",
     expires: "2100-01-01T00:00:00.000Z",
diff --git a/src/types/index.d.ts b/src/types/index.d.ts
index 6d117589b..a847ac733 100644
--- a/src/types/index.d.ts
+++ b/src/types/index.d.ts
@@ -6,24 +6,24 @@ export interface CustomJWT extends JWT {
   email?: string;
   picture?: string;
   avatar_url?: string;
-  role?: string;
   first_name?: string;
   last_name?: string;
   fullname?: string;
   access_token?: string;
+  organisations?: Organisation[];
 }
 export interface CustomSession extends Session {
   user: {
     id: string;
-    name: string;
     first_name: string;
     last_name: string;
     email: string;
     image: string;
-    role: string;
   };
   expires: DefaultSession["expires"];
   access_token?: string;
+  currentOrgId?: string;
+  userOrg?: Organisation[];
 }
 
 export interface User {

From 5a93f6cc5989d3526c0e96ece1aaf463ade7e8c2 Mon Sep 17 00:00:00 2001
From: Prudent Bird <prudentbird@gmail.com>
Date: Sat, 24 Aug 2024 19:39:50 +0100
Subject: [PATCH 52/58] chore: fixed test errors

---
 .../forgot-password/page.test.tsx             | 45 +++++++++----------
 .../(landing-routes)/contact-us/page.test.tsx | 12 ++++-
 src/test/contact.test.tsx                     | 17 +++++--
 3 files changed, 45 insertions(+), 29 deletions(-)

diff --git a/src/app/(auth-routes)/forgot-password/page.test.tsx b/src/app/(auth-routes)/forgot-password/page.test.tsx
index 2381a2d7f..e3aebf1db 100644
--- a/src/app/(auth-routes)/forgot-password/page.test.tsx
+++ b/src/app/(auth-routes)/forgot-password/page.test.tsx
@@ -1,5 +1,4 @@
-import { fireEvent, render, screen, waitFor } from "@testing-library/react";
-
+import { fireEvent, render, screen, waitFor, act } from "@testing-library/react";
 import ForgotPassword from "./page";
 
 vi.mock("next/link", () => ({
@@ -12,13 +11,8 @@ describe("forgot password page", () => {
     render(<ForgotPassword />);
 
     expect(screen.getByText(/forgot password/i)).toBeInTheDocument();
-
     expect(screen.getByText(/enter the email address/i)).toBeInTheDocument();
-
-    expect(
-      screen.getByPlaceholderText(/enter your email/i),
-    ).toBeInTheDocument();
-
+    expect(screen.getByPlaceholderText(/enter your email/i)).toBeInTheDocument();
     expect(screen.getByText(/send/i)).toBeInTheDocument();
   });
 
@@ -30,15 +24,15 @@ describe("forgot password page", () => {
     const emailInput = screen.getByPlaceholderText(/enter your email/i);
     const sendButton = screen.getByText(/send/i);
 
-    fireEvent.change(emailInput, {
-      target: { value: "unregistered@example.com" },
+    await act(async () => {
+      fireEvent.change(emailInput, {
+        target: { value: "unregistered@example.com" },
+      });
+      fireEvent.click(sendButton);
     });
-    fireEvent.click(sendButton);
 
     await waitFor(() => {
-      expect(
-        screen.getByText(/this email doesn't match our records/i),
-      ).toBeInTheDocument();
+      expect(screen.getByText(/this email doesn't match our records/i)).toBeInTheDocument();
     });
   });
 
@@ -49,10 +43,12 @@ describe("forgot password page", () => {
     const emailInput = screen.getByPlaceholderText(/enter your email/i);
     const sendButton = screen.getByText(/send/i);
 
-    fireEvent.change(emailInput, {
-      target: { value: "invalid-email@example.com" },
+    await act(async () => {
+      fireEvent.change(emailInput, {
+        target: { value: "invalid-email@example.com" },
+      });
+      fireEvent.click(sendButton);
     });
-    fireEvent.click(sendButton);
 
     await waitFor(() => {
       expect(screen.queryByText("Verification Code")).not.toBeInTheDocument();
@@ -65,17 +61,16 @@ describe("forgot password page", () => {
 
     const emailInput = screen.getByPlaceholderText(/enter your email/i);
     const sendButton = screen.getByText(/send/i);
-    fireEvent.change(emailInput, {
-      target: { value: "invalid-email" },
+
+    await act(async () => {
+      fireEvent.change(emailInput, {
+        target: { value: "invalid-email" },
+      });
+      fireEvent.click(sendButton);
     });
-    fireEvent.click(sendButton);
 
     await waitFor(() => {
-      expect(
-        screen.getByText(
-          "This email doesn't match our records please try again",
-        ),
-      ).toBeInTheDocument();
+      expect(screen.getByText("This email doesn't match our records please try again")).toBeInTheDocument();
     });
   });
 });
diff --git a/src/app/(landing-routes)/contact-us/page.test.tsx b/src/app/(landing-routes)/contact-us/page.test.tsx
index dea52ad56..1c664c4ba 100644
--- a/src/app/(landing-routes)/contact-us/page.test.tsx
+++ b/src/app/(landing-routes)/contact-us/page.test.tsx
@@ -1,11 +1,21 @@
 import { render } from "~/test/utils";
 import Page from "./page";
+import { SessionProvider } from "next-auth/react";
+import { ReactNode } from 'react';
 
 describe("page tests", () => {
+
+  const renderWithSession = (component: ReactNode) => {
+    return render(
+      <SessionProvider session={null}>
+        {component}
+      </SessionProvider>
+    );
+  };
   it("should render correctly", () => {
     expect.assertions(1);
 
-    render(<Page />);
+    renderWithSession(<Page />);
 
     expect(true).toBeTruthy();
   });
diff --git a/src/test/contact.test.tsx b/src/test/contact.test.tsx
index f5e2ef608..658e6e659 100644
--- a/src/test/contact.test.tsx
+++ b/src/test/contact.test.tsx
@@ -1,11 +1,22 @@
 import { fireEvent, render, screen, waitFor } from "@testing-library/react";
+import { SessionProvider } from "next-auth/react";
+import { ReactNode } from "react";
 
 import Contact from "~/app/(landing-routes)/contact-us/page";
 
 describe("contact Page tests", () => {
+
+  const renderWithSession = (component: ReactNode) => {
+    return render(
+      <SessionProvider session={null}>
+        {component}
+      </SessionProvider>
+    );
+  };
+
   it("should render the Contact Us form and content card correctly", () => {
     expect.assertions(4);
-    render(<Contact />);
+    renderWithSession(<Contact />);
 
     expect(screen.getByRole("form")).toBeInTheDocument();
 
@@ -18,7 +29,7 @@ describe("contact Page tests", () => {
 
   it("should validate the form inputs correctly", async () => {
     expect.assertions(1);
-    render(<Contact />);
+    renderWithSession(<Contact />);
 
     fireEvent.change(screen.getByLabelText(/email/i), {
       target: { value: "invalid-email" },
@@ -32,7 +43,7 @@ describe("contact Page tests", () => {
 
   it("should be responsive", () => {
     expect.assertions(2);
-    render(<Contact />);
+    renderWithSession(<Contact />);
 
     window.innerWidth = 320;
     window.dispatchEvent(new Event("resize"));

From a2a8eceeb67d6de19e11a6c6008f127becea08ee Mon Sep 17 00:00:00 2001
From: Prudent Bird <prudentbird@gmail.com>
Date: Sat, 24 Aug 2024 19:43:52 +0100
Subject: [PATCH 53/58] chore: fixed lint errors

---
 .../forgot-password/page.test.tsx             | 45 ++++++++++---------
 .../(landing-routes)/contact-us/page.test.tsx | 10 ++---
 src/test/contact.test.tsx                     |  5 +--
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/app/(auth-routes)/forgot-password/page.test.tsx b/src/app/(auth-routes)/forgot-password/page.test.tsx
index e3aebf1db..2381a2d7f 100644
--- a/src/app/(auth-routes)/forgot-password/page.test.tsx
+++ b/src/app/(auth-routes)/forgot-password/page.test.tsx
@@ -1,4 +1,5 @@
-import { fireEvent, render, screen, waitFor, act } from "@testing-library/react";
+import { fireEvent, render, screen, waitFor } from "@testing-library/react";
+
 import ForgotPassword from "./page";
 
 vi.mock("next/link", () => ({
@@ -11,8 +12,13 @@ describe("forgot password page", () => {
     render(<ForgotPassword />);
 
     expect(screen.getByText(/forgot password/i)).toBeInTheDocument();
+
     expect(screen.getByText(/enter the email address/i)).toBeInTheDocument();
-    expect(screen.getByPlaceholderText(/enter your email/i)).toBeInTheDocument();
+
+    expect(
+      screen.getByPlaceholderText(/enter your email/i),
+    ).toBeInTheDocument();
+
     expect(screen.getByText(/send/i)).toBeInTheDocument();
   });
 
@@ -24,15 +30,15 @@ describe("forgot password page", () => {
     const emailInput = screen.getByPlaceholderText(/enter your email/i);
     const sendButton = screen.getByText(/send/i);
 
-    await act(async () => {
-      fireEvent.change(emailInput, {
-        target: { value: "unregistered@example.com" },
-      });
-      fireEvent.click(sendButton);
+    fireEvent.change(emailInput, {
+      target: { value: "unregistered@example.com" },
     });
+    fireEvent.click(sendButton);
 
     await waitFor(() => {
-      expect(screen.getByText(/this email doesn't match our records/i)).toBeInTheDocument();
+      expect(
+        screen.getByText(/this email doesn't match our records/i),
+      ).toBeInTheDocument();
     });
   });
 
@@ -43,12 +49,10 @@ describe("forgot password page", () => {
     const emailInput = screen.getByPlaceholderText(/enter your email/i);
     const sendButton = screen.getByText(/send/i);
 
-    await act(async () => {
-      fireEvent.change(emailInput, {
-        target: { value: "invalid-email@example.com" },
-      });
-      fireEvent.click(sendButton);
+    fireEvent.change(emailInput, {
+      target: { value: "invalid-email@example.com" },
     });
+    fireEvent.click(sendButton);
 
     await waitFor(() => {
       expect(screen.queryByText("Verification Code")).not.toBeInTheDocument();
@@ -61,16 +65,17 @@ describe("forgot password page", () => {
 
     const emailInput = screen.getByPlaceholderText(/enter your email/i);
     const sendButton = screen.getByText(/send/i);
-
-    await act(async () => {
-      fireEvent.change(emailInput, {
-        target: { value: "invalid-email" },
-      });
-      fireEvent.click(sendButton);
+    fireEvent.change(emailInput, {
+      target: { value: "invalid-email" },
     });
+    fireEvent.click(sendButton);
 
     await waitFor(() => {
-      expect(screen.getByText("This email doesn't match our records please try again")).toBeInTheDocument();
+      expect(
+        screen.getByText(
+          "This email doesn't match our records please try again",
+        ),
+      ).toBeInTheDocument();
     });
   });
 });
diff --git a/src/app/(landing-routes)/contact-us/page.test.tsx b/src/app/(landing-routes)/contact-us/page.test.tsx
index 1c664c4ba..5c4112890 100644
--- a/src/app/(landing-routes)/contact-us/page.test.tsx
+++ b/src/app/(landing-routes)/contact-us/page.test.tsx
@@ -1,15 +1,13 @@
+import { SessionProvider } from "next-auth/react";
+import { ReactNode } from "react";
+
 import { render } from "~/test/utils";
 import Page from "./page";
-import { SessionProvider } from "next-auth/react";
-import { ReactNode } from 'react';
 
 describe("page tests", () => {
-
   const renderWithSession = (component: ReactNode) => {
     return render(
-      <SessionProvider session={null}>
-        {component}
-      </SessionProvider>
+      <SessionProvider session={undefined}>{component}</SessionProvider>,
     );
   };
   it("should render correctly", () => {
diff --git a/src/test/contact.test.tsx b/src/test/contact.test.tsx
index 658e6e659..c0847a0e7 100644
--- a/src/test/contact.test.tsx
+++ b/src/test/contact.test.tsx
@@ -5,12 +5,9 @@ import { ReactNode } from "react";
 import Contact from "~/app/(landing-routes)/contact-us/page";
 
 describe("contact Page tests", () => {
-
   const renderWithSession = (component: ReactNode) => {
     return render(
-      <SessionProvider session={null}>
-        {component}
-      </SessionProvider>
+      <SessionProvider session={undefined}>{component}</SessionProvider>,
     );
   };
 

From 2f1af46a3eaff58a08febd4d7e672d0b06124375 Mon Sep 17 00:00:00 2001
From: Robinson-Taiwo <omoyenisamuell66@gmail.com>
Date: Sat, 24 Aug 2024 20:15:00 +0100
Subject: [PATCH 54/58] Feat: implement DeleteMember modal

---
 .../modals/invite-member/DeleteMembers/index.tsx    | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/components/common/modals/invite-member/DeleteMembers/index.tsx b/src/components/common/modals/invite-member/DeleteMembers/index.tsx
index 2d46dd5b7..eb5c7e6ec 100644
--- a/src/components/common/modals/invite-member/DeleteMembers/index.tsx
+++ b/src/components/common/modals/invite-member/DeleteMembers/index.tsx
@@ -1,18 +1,14 @@
 "use client";
 
 import { Button } from "~/components/ui/button";
-// import { Link2Icon } from "lucide-react";
-
-// import CustomButton from "~/components/common/common-button/common-button";
 import {
   Dialog,
   DialogContent,
   DialogDescription,
   DialogHeader,
+  DialogTitle,
 } from "~/components/ui/dialog";
 
-// import { useToast } from "~/components/ui/use-toast";
-
 interface ModalProperties {
   show: boolean;
   onClose: () => void;
@@ -24,11 +20,13 @@ const DeleteMember: React.FC<ModalProperties> = ({ show, onClose }) => {
       <DialogContent>
         <DialogHeader>
           <DialogDescription className="outline-none">
-            <div className="delete-container">
+            <DialogTitle>
+              {" "}
               <h1 className="mb-[0.5rem] text-[1.125rem] font-semibold leading-[1.75rem] text-[#0F172A]">
                 Delete Member
               </h1>
-
+            </DialogTitle>
+            <div className="delete-container">
               <p className="text=[#64748B] mb-[1rem] text-[0.875rem]">
                 Are you sure you want to delete Chad Bosewick ? All data will be
                 permanently removed. This action cannot be undone.
@@ -37,6 +35,7 @@ const DeleteMember: React.FC<ModalProperties> = ({ show, onClose }) => {
               <div className="flex w-[100%] justify-end">
                 <div className="flex flex-row gap-[.5rem]">
                   <Button
+                    onClick={onClose}
                     className="text-[#0F172A] outline-none focus:outline-none"
                     variant="outline"
                   >

From 280455f897a9137cfccf0a755900aa1ec249b299 Mon Sep 17 00:00:00 2001
From: "Emma F. Mkpurunchi" <mkpurunchiemma@gmail.com>
Date: Sat, 24 Aug 2024 20:58:43 +0100
Subject: [PATCH 55/58] feat: implement product card delete button

---
 .../_components/productcadrcomponent.tsx      | 100 ++++++++++--------
 .../products/productcard/page.tsx             |  26 ++---
 2 files changed, 71 insertions(+), 55 deletions(-)

diff --git a/src/app/dashboard/(user-dashboard)/products/_components/productcadrcomponent.tsx b/src/app/dashboard/(user-dashboard)/products/_components/productcadrcomponent.tsx
index d14a057e3..e77bc85ed 100644
--- a/src/app/dashboard/(user-dashboard)/products/_components/productcadrcomponent.tsx
+++ b/src/app/dashboard/(user-dashboard)/products/_components/productcadrcomponent.tsx
@@ -1,51 +1,67 @@
-'use client'
-import Image, { StaticImageData } from 'next/image';
-interface ProductCardProps {
-    title: string;
-    price: string;
-    description: string;
-    inStock: boolean;
-    imageUrl: string | StaticImageData;
+"use client";
+
+import Image, { StaticImageData } from "next/image";
+
+interface ProductCardProperties {
+  title: string;
+  price: string;
+  description: string;
+  inStock: boolean;
+  imageUrl: string | StaticImageData;
 }
 
 const Delete = () => {
-    alert('Are you sure you want to delete')
-}
+  alert("Are you sure you want to delete");
+};
 
 const Edit = () => {
-    alert('Proceed to edit')
-}
+  alert("Proceed to edit");
+};
 
-const ProductCard: React.FC<ProductCardProps> = ({ title, price, description, inStock, imageUrl }) => {
-    return (
-        <div className="max-w-sm rounded-md shadow-md overflow-hidden bg-white p-3 border-[#D9D9D9] border-[1px]">
-            <Image
-                src={imageUrl}
-                alt={title}
-                width={400}
-                height={300}
-                className="w-full h-48 object-cover rounded-md"
-            />
-            <div className="p-4">
-                <div className="flex justify-between items-center">
-                    <h2 className="font-bold text-xl">{title}</h2>
-                    <p className="text-gray-900 font-bold text-[20px] mt-1">{price}</p>
-                </div>
-                <p className="text-gray-700 text-base mb-4">{description}</p>
-                <span className={`px-5 py-2 text-sm mt-3 ${inStock ? 'bg-[#E7F7E9] rounded-full  text-green-500' : 'bg-[#FDE7E7] text-red-500'}`}>
-                  {inStock ? 'In stock' : 'Out of stock'}
-                </span>
-                <div className="mt-6 flex  justify-between space-x-2">
-                    <button onClick={Edit} className="text-black px-4 w-[130px] py-2 rounded-md border-[1px]">
-                        Edit
-                    </button>
-                    <button onClick={Delete} className="bg-white text-[#DC2626] px-4  w-[130px] py-2 rounded-md border-[1px]">
-                        Delete
-                    </button>
-                </div>
-            </div>
+const ProductCard: React.FC<ProductCardProperties> = ({
+  title,
+  price,
+  description,
+  inStock,
+  imageUrl,
+}) => {
+  return (
+    <div className="max-w-sm overflow-hidden rounded-md border-[1px] border-[#D9D9D9] bg-white p-3 shadow-md">
+      <Image
+        src={imageUrl}
+        alt={title}
+        width={400}
+        height={300}
+        className="h-48 w-full rounded-md object-cover"
+      />
+      <div className="p-4">
+        <div className="flex items-center justify-between">
+          <h2 className="text-xl font-bold">{title}</h2>
+          <p className="mt-1 text-[20px] font-bold text-gray-900">{price}</p>
+        </div>
+        <p className="mb-4 text-base text-gray-700">{description}</p>
+        <span
+          className={`mt-3 px-5 py-2 text-sm ${inStock ? "rounded-full bg-[#E7F7E9] text-green-500" : "bg-[#FDE7E7] text-red-500"}`}
+        >
+          {inStock ? "In stock" : "Out of stock"}
+        </span>
+        <div className="mt-6 flex justify-between space-x-2">
+          <button
+            onClick={Edit}
+            className="w-[130px] rounded-md border-[1px] px-4 py-2 text-black"
+          >
+            Edit
+          </button>
+          <button
+            onClick={Delete}
+            className="w-[130px] rounded-md border-[1px] bg-white px-4 py-2 text-[#DC2626]"
+          >
+            Delete
+          </button>
         </div>
-    )
+      </div>
+    </div>
+  );
 };
 
-export default ProductCard;
\ No newline at end of file
+export default ProductCard;
diff --git a/src/app/dashboard/(user-dashboard)/products/productcard/page.tsx b/src/app/dashboard/(user-dashboard)/products/productcard/page.tsx
index 7b21b1fc1..1739d66c1 100644
--- a/src/app/dashboard/(user-dashboard)/products/productcard/page.tsx
+++ b/src/app/dashboard/(user-dashboard)/products/productcard/page.tsx
@@ -1,18 +1,18 @@
 import ProductCard from "../_components/productcadrcomponent";
-import productimage from '../../../public/images/productimage.png'
+import productimage from "../../../public/images/productimage.png";
 
 const Home: React.FC = () => {
-    return (
-        <div className="flex justify-center items-center min-h-screen bg-gray-100">
-            <ProductCard
-                title="Product 1"
-                price="$19.00"
-                description="Breakfast"
-                inStock={true}
-                imageUrl={productimage}
-            />
-        </div>
-    );
+  return (
+    <div className="flex min-h-screen items-center justify-center bg-gray-100">
+      <ProductCard
+        title="Product 1"
+        price="$19.00"
+        description="Breakfast"
+        inStock={true}
+        imageUrl={productimage}
+      />
+    </div>
+  );
 };
 
-export default Home;
\ No newline at end of file
+export default Home;

From 77d188d01c26923feb36fc9f4f6fbfdf80280deb Mon Sep 17 00:00:00 2001
From: "Emma F. Mkpurunchi" <mkpurunchiemma@gmail.com>
Date: Sat, 24 Aug 2024 21:44:52 +0100
Subject: [PATCH 56/58] error fixed

---
 .../dashboard/(user-dashboard)/products/productcard/page.tsx   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/dashboard/(user-dashboard)/products/productcard/page.tsx b/src/app/dashboard/(user-dashboard)/products/productcard/page.tsx
index 1739d66c1..baca39210 100644
--- a/src/app/dashboard/(user-dashboard)/products/productcard/page.tsx
+++ b/src/app/dashboard/(user-dashboard)/products/productcard/page.tsx
@@ -1,5 +1,6 @@
+import productimage from "/public/images/productimage.png";
+
 import ProductCard from "../_components/productcadrcomponent";
-import productimage from "../../../public/images/productimage.png";
 
 const Home: React.FC = () => {
   return (

From aa9eb9f994a7e0d3a828e3ee2ff8dfc48667d3b3 Mon Sep 17 00:00:00 2001
From: Jibola Paul <harjibbolar26@gmail.com>
Date: Sat, 24 Aug 2024 23:00:51 +0100
Subject: [PATCH 57/58] fix: update branch

---
 .../(settings)/settings/account/_component.tsx/password.tsx      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/dashboard/(admin)/admin/(settings)/settings/account/_component.tsx/password.tsx b/src/app/dashboard/(admin)/admin/(settings)/settings/account/_component.tsx/password.tsx
index 5114d8b4b..4b5a99a26 100644
--- a/src/app/dashboard/(admin)/admin/(settings)/settings/account/_component.tsx/password.tsx
+++ b/src/app/dashboard/(admin)/admin/(settings)/settings/account/_component.tsx/password.tsx
@@ -2,7 +2,6 @@
 
 import { zodResolver } from "@hookform/resolvers/zod";
 import axios from "axios";
-import { Eye, EyeOff } from "lucide-react";
 import { useSession } from "next-auth/react";
 import { useState } from "react";
 import { useForm } from "react-hook-form";

From 29959c90104cc37a100eb5e88705af849940f567 Mon Sep 17 00:00:00 2001
From: Jibola Paul <harjibbolar26@gmail.com>
Date: Sun, 25 Aug 2024 00:38:05 +0100
Subject: [PATCH 58/58] fix: buttons for data-and-privary page

---
 .../(settings)/settings/data-and-privacy/page.tsx    | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/app/dashboard/(admin)/admin/(settings)/settings/data-and-privacy/page.tsx b/src/app/dashboard/(admin)/admin/(settings)/settings/data-and-privacy/page.tsx
index dfd73041e..aa0e9bd79 100644
--- a/src/app/dashboard/(admin)/admin/(settings)/settings/data-and-privacy/page.tsx
+++ b/src/app/dashboard/(admin)/admin/(settings)/settings/data-and-privacy/page.tsx
@@ -2,6 +2,8 @@
 
 import { useState } from "react";
 
+import CustomButton from "~/components/common/common-button/common-button";
+
 interface ToggleSwitchProperties {
   label: string;
   description: string;
@@ -21,7 +23,7 @@ const ToggleSwitch: React.FC<ToggleSwitchProperties> = ({
   return (
     <div className="mb-4 rounded-md border p-6 shadow">
       <div className="mb-2 flex items-center justify-between">
-        <label className="text-2xl text-lg font-semibold">{label}</label>
+        <label className="text-2xl font-semibold">{label}</label>
         <label className="relative inline-block h-8 w-14">
           <input
             type="checkbox"
@@ -94,6 +96,14 @@ const Page = () => {
         description="Allow us to show you personalized ads based on your interests and browsing behavior. By enabling this feature, you consent to the use of data collected from your interactions within the app and across other platforms to deliver ads that are more relevant to you."
         apiEndpoint="/api/toggle-ads"
       />
+      <div className="mt-6 flex items-center justify-between gap-3 sm:justify-end">
+        <CustomButton variant="outline" className="font-[500] max-sm:w-full">
+          Cancel
+        </CustomButton>
+        <CustomButton variant="primary" className="font-[500] max-sm:w-full">
+          Save Changes
+        </CustomButton>
+      </div>
     </div>
   );
 };