From e4a8634b71ef76d83a536637cbd3f70bda9f6ba6 Mon Sep 17 00:00:00 2001
From: Oluwaseyi Tommy <130176232+seshconcept@users.noreply.github.com>
Date: Sat, 24 Aug 2024 13:55:40 +0100
Subject: [PATCH 1/5] Fix: Icon, Bio Length and Clear Password Issues.

---
 .../register/organisation/page.tsx            |  2 +-
 src/app/(landing-routes)/contact-us/page.tsx  | 26 +++++++++++--------
 .../account/_component.tsx/password.tsx       |  9 ++++++-
 .../admin/(settings)/settings/page.tsx        | 15 +++++++++--
 .../_components/layout/navbar/index.tsx       | 11 +++++---
 src/components/layouts/footer/index.tsx       |  2 +-
 6 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/src/app/(auth-routes)/register/organisation/page.tsx b/src/app/(auth-routes)/register/organisation/page.tsx
index 731fccda4..a0a0f8841 100644
--- a/src/app/(auth-routes)/register/organisation/page.tsx
+++ b/src/app/(auth-routes)/register/organisation/page.tsx
@@ -263,7 +263,7 @@ function Organisation() {
               </Button>
               <div className="flex justify-center gap-2">
                 <p className="text-sm">Already Have An Account?</p>
-                <Link className="text-sm text-orange-500" href={"#"}>
+                <Link className="text-sm text-orange-500" href={"/login"}>
                   Login
                 </Link>
               </div>
diff --git a/src/app/(landing-routes)/contact-us/page.tsx b/src/app/(landing-routes)/contact-us/page.tsx
index 1cc7ac903..d2d9b8680 100644
--- a/src/app/(landing-routes)/contact-us/page.tsx
+++ b/src/app/(landing-routes)/contact-us/page.tsx
@@ -1,4 +1,5 @@
 import { ArrowRight } from "lucide-react";
+import Link from "next/link";
 
 import ContactForm from "~/components/common/contact-us-form";
 import { bizTime, contactInfo } from "./constants";
@@ -40,19 +41,22 @@ const Contact = () => {
                 ))}
               </div>
             </div>
-            <div className="gap-2 max-lg:grid">
-              <div className="flex justify-between">
-                <h2 className="text-xl font-semibold text-primary underline underline-offset-2">
-                  FAQ
-                </h2>
-                <div>
-                  <ArrowRight className="text-primary" />
+
+            <Link href={"/faqs"}>
+              <div className="gap-2 max-lg:grid">
+                <div className="flex justify-between">
+                  <h2 className="text-xl font-semibold text-primary underline underline-offset-2">
+                    FAQ
+                  </h2>
+                  <div>
+                    <ArrowRight className="text-primary" />
+                  </div>
                 </div>
+                <p className="texl-lg">
+                  See and get answers to the most frequent asked questions
+                </p>
               </div>
-              <p className="texl-lg">
-                See and get answers to the most frequent asked questions
-              </p>
-            </div>
+            </Link>
           </div>
         </div>
       </section>
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..fe9f529b5 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
@@ -31,6 +31,13 @@ const Password = () => {
     }));
   };
 
+  const clearPassword = () => {
+    setFormData({
+      oldPassword: "",
+      password: "",
+      confirmPassword: "",
+    });
+  };
   const submit = async () => {
     if (formData.password !== formData.confirmPassword) {
       return toast({
@@ -115,7 +122,7 @@ const Password = () => {
           />
         </div>
         <div className="flex items-center justify-start gap-6">
-          <CustomButton variant="outline" onClick={() => setOpen(false)}>
+          <CustomButton variant="outline" onClick={clearPassword}>
             Cancel
           </CustomButton>
           <CustomButton
diff --git a/src/app/dashboard/(admin)/admin/(settings)/settings/page.tsx b/src/app/dashboard/(admin)/admin/(settings)/settings/page.tsx
index 909155e7e..337a5f0e1 100644
--- a/src/app/dashboard/(admin)/admin/(settings)/settings/page.tsx
+++ b/src/app/dashboard/(admin)/admin/(settings)/settings/page.tsx
@@ -36,6 +36,8 @@ export default function SettingsPage() {
   const [isPending, setIsPending] = useState(false);
 
   const [pronoun, setPronoun] = useState("");
+  const [bioCharacterLeft, setBioCharacterLeft] = useState(64);
+  const [isbioCharacterExceeded, setIsBioCharacterExceeded] = useState(false);
 
   const [profilePicture, setProfilePicture] = useState<string | undefined>();
 
@@ -45,6 +47,11 @@ export default function SettingsPage() {
     linkedin: "",
   });
 
+  const checkCharacterLeft = () => {
+    const bioLength: number = formData.bio.length;
+    setBioCharacterLeft(64 - bioLength);
+    setIsBioCharacterExceeded(bioLength > 50);
+  };
   const linksDataHandler = (
     event: ChangeEvent<HTMLInputElement | HTMLTextAreaElement>,
   ) => {
@@ -317,13 +324,17 @@ export default function SettingsPage() {
           </label>
           <Textarea
             name="bio"
+            maxLength={64}
+            onKeyUp={checkCharacterLeft}
             value={formData.bio}
             onChange={formDataHandler}
             className="resize-none bg-white text-[#020817]"
           />
           <div className="border-b-[1px] border-b-[#e4e2e2]">
-            <p className="pb-[24px] pt-2 text-[14px] text-[#64748B]">
-              Maximum of 64 characters
+            <p
+              className={`pb-[24px] pt-2 text-[14px] ${isbioCharacterExceeded ? "text-red-400" : "text-[#64748B]"} `}
+            >
+              Maximum of 64 characters (character left : {bioCharacterLeft})
             </p>
           </div>
         </div>
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..5a2afa37f 100644
--- a/src/app/dashboard/(user-dashboard)/_components/layout/navbar/index.tsx
+++ b/src/app/dashboard/(user-dashboard)/_components/layout/navbar/index.tsx
@@ -2,6 +2,7 @@
 
 import { BellIcon, HelpCircle } from "lucide-react";
 import { useSession } from "next-auth/react";
+import Link from "next/link";
 import { useRouter } from "next/navigation";
 import { useEffect, useState } from "react";
 
@@ -113,10 +114,12 @@ const UserNavbar = () => {
             )}
           </div>
           <div className="max-sm:hidden">
-            <HelpCircle
-              data-testid="help"
-              className="h-6 w-6 text-neutral-dark-2 transition-colors duration-300 hover:cursor-pointer hover:text-neutral-dark-1"
-            />
+            <Link href={"/help-center"}>
+              <HelpCircle
+                data-testid="help"
+                className="h-6 w-6 text-neutral-dark-2 transition-colors duration-300 hover:cursor-pointer hover:text-neutral-dark-1"
+              />
+            </Link>
           </div>
           <div className="pr-1">
             <UserCard />
diff --git a/src/components/layouts/footer/index.tsx b/src/components/layouts/footer/index.tsx
index 0e4eadca9..66a25750c 100644
--- a/src/components/layouts/footer/index.tsx
+++ b/src/components/layouts/footer/index.tsx
@@ -158,7 +158,7 @@ const Footer = () => {
   //
 
   return (
-    <footer className="bg-background dark:bg-default">
+    <footer className="bg-[#FAFAFA] 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">

From 5089b06da19ad14124518b9b4935726d0050dafc Mon Sep 17 00:00:00 2001
From: Oluwaseyi Tommy <130176232+seshconcept@users.noreply.github.com>
Date: Sat, 24 Aug 2024 14:22:24 +0100
Subject: [PATCH 2/5] Fix: Icon, Bio Length and Clear Password Issues.

---
 src/app/dashboard/(admin)/_components/layout/navbar/index.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/dashboard/(admin)/_components/layout/navbar/index.tsx b/src/app/dashboard/(admin)/_components/layout/navbar/index.tsx
index c756c0063..3158d0b5f 100644
--- a/src/app/dashboard/(admin)/_components/layout/navbar/index.tsx
+++ b/src/app/dashboard/(admin)/_components/layout/navbar/index.tsx
@@ -4,6 +4,7 @@ import { BellIcon, HelpCircle, SearchIcon } from "lucide-react";
 import { useSession } from "next-auth/react";
 import { useRouter } from "next/navigation";
 import { useEffect, useState } from "react";
+import Link from "next/link";
 
 import { getAllNotifications } from "~/actions/notifications/getAllNotifications";
 import UserCard from "~/components/card/user-card";
@@ -109,10 +110,11 @@ const DashboardNavbar = () => {
               <span className="absolute right-1 top-0 h-[6px] w-[6px] rounded-full bg-error"></span>
             </div>
             <div>
-              <HelpCircle
+              <Link href={"/help-center"}><HelpCircle
                 data-testid="help"
                 className="h-6 w-6 text-neutral-dark-2 transition-colors duration-300 hover:cursor-pointer hover:text-neutral-dark-1"
               />
+              </Link>
             </div>
             <div className="hover:bg-black-1 flex w-full max-w-[64px] cursor-pointer items-center justify-between gap-2">
               <UserCard />

From d78427d3c4871dbf1e4e59efd507ddb36d52b8a2 Mon Sep 17 00:00:00 2001
From: Oluwaseyi Tommy <130176232+seshconcept@users.noreply.github.com>
Date: Sat, 24 Aug 2024 14:55:48 +0100
Subject: [PATCH 3/5] Fix: Icon, Bio Length and Clear Password Issues.

---
 .../(admin)/_components/layout/navbar/index.tsx       | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/app/dashboard/(admin)/_components/layout/navbar/index.tsx b/src/app/dashboard/(admin)/_components/layout/navbar/index.tsx
index 3158d0b5f..fb9306fcd 100644
--- a/src/app/dashboard/(admin)/_components/layout/navbar/index.tsx
+++ b/src/app/dashboard/(admin)/_components/layout/navbar/index.tsx
@@ -2,9 +2,9 @@
 
 import { BellIcon, HelpCircle, SearchIcon } from "lucide-react";
 import { useSession } from "next-auth/react";
+import Link from "next/link";
 import { useRouter } from "next/navigation";
 import { useEffect, useState } from "react";
-import Link from "next/link";
 
 import { getAllNotifications } from "~/actions/notifications/getAllNotifications";
 import UserCard from "~/components/card/user-card";
@@ -110,10 +110,11 @@ const DashboardNavbar = () => {
               <span className="absolute right-1 top-0 h-[6px] w-[6px] rounded-full bg-error"></span>
             </div>
             <div>
-              <Link href={"/help-center"}><HelpCircle
-                data-testid="help"
-                className="h-6 w-6 text-neutral-dark-2 transition-colors duration-300 hover:cursor-pointer hover:text-neutral-dark-1"
-              />
+              <Link href={"/help-center"}>
+                <HelpCircle
+                  data-testid="help"
+                  className="h-6 w-6 text-neutral-dark-2 transition-colors duration-300 hover:cursor-pointer hover:text-neutral-dark-1"
+                />
               </Link>
             </div>
             <div className="hover:bg-black-1 flex w-full max-w-[64px] cursor-pointer items-center justify-between gap-2">

From 2ac721e107db5c6fc7395521e8cbc6a3a892fa89 Mon Sep 17 00:00:00 2001
From: Oluwaseyi Tommy <130176232+seshconcept@users.noreply.github.com>
Date: Sat, 24 Aug 2024 15:26:25 +0100
Subject: [PATCH 4/5] Fix: Icon, Bio Length and Clear Password Issues.

---
 .../settings/account/_component.tsx/password.tsx     | 12 ++----------
 1 file changed, 2 insertions(+), 10 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 702c28328..297aab1d4 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
@@ -29,16 +29,8 @@ const Password = () => {
     mode: "all",
   });
 
-  const clearPassword = (values: PasswordFormData) => {
-    /*PasswordFormData({
-      oldPassword: "",
-      password: "",
-      confirmPassword: "",
-    });*/
-
-    values.currentPassword = "";
-    values.newPassword = "";
-    values.confirmPassword = "";
+  const clearPassword = () => {
+    reset();
   };
 
   const submitHandler = async (values: PasswordFormData) => {

From deb6d1d0838ff9d8e99fc4e5db0429d543d1b212 Mon Sep 17 00:00:00 2001
From: Oluwaseyi Tommy <130176232+seshconcept@users.noreply.github.com>
Date: Sun, 25 Aug 2024 02:45:05 +0100
Subject: [PATCH 5/5] Fix: FAQ Icon(?) on Navbar, Cancel Button to Clear
 Password & Max Length of Bio Message.

---
 .../(user-dashboard)/_components/layout/navbar/index.tsx     | 5 -----
 1 file changed, 5 deletions(-)

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 49cb53031..dbda9c309 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 Link from "next/link";
-import { useRouter } from "next/navigation";
-import { useEffect, useState } from "react";
-
 
 import UnreadNotificationCard from "~/app/dashboard/(admin)/_components/unread-notification-card/UnreadNotificationCard";
 import { MobileNavlinks } from "~/app/dashboard/(user-dashboard)/_components/layout/navbar/mobile-navlinks";
@@ -78,7 +74,6 @@ const UserNavbar = () => {
                 className="h-6 w-6 text-neutral-dark-2 transition-colors duration-300 hover:cursor-pointer hover:text-neutral-dark-1"
               />
             </Link>
-
           </div>
           <div className="pr-1">
             <UserCard />