From 54dc5301a479cbd0e1cdc2b95ffe9d2215ed8e38 Mon Sep 17 00:00:00 2001
From: ezraexe <ezrakimcs@gmail.com>
Date: Sat, 7 Mar 2026 20:49:50 -0500
Subject: [PATCH 1/4] added changes for part 1

---
 src/components/NavBarLayout.tsx | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/components/NavBarLayout.tsx b/src/components/NavBarLayout.tsx
index 15816966..2f6c8d0e 100644
--- a/src/components/NavBarLayout.tsx
+++ b/src/components/NavBarLayout.tsx
@@ -230,6 +230,13 @@ function ResetButton() {
   );
 }
 
+function getPortalLabel(isPartnerUser: boolean, isSuper?: boolean) {
+  if (isPartnerUser) return "Partner Portal";
+  if (isSuper) return "Admin Portal";
+
+  return "Staff Portal"; 
+}
+
 function DesktopNavbar() {
   const { user } = useUser();
   const isPartnerUser = isPartner(user?.type);
@@ -243,7 +250,7 @@ function DesktopNavbar() {
       <img src="/logo.svg" alt="Hope for Haiti Logo" className="mt-6 mb-2" />
 
       <h1 className="mt-2 font-bold hidden md:block">
-        {isPartnerUser ? "Partner Portal" : "Staff Portal"}
+        {getPortalLabel(isPartnerUser, user?.isSuper)}
       </h1>
 
       <hr className="mt-2 mb-4 h-1 bg-blue-dark border-t-0 w-full" />
@@ -275,7 +282,7 @@ function MobileNavbar() {
         className={`w-full h-full flex flex-col items-start transition-all ${open ? "opacity-100" : "opacity-0"}`}
       >
         <h1 className="m-1.5 mb-1 font-semibold whitespace-nowrap">
-          {isPartnerUser ? "Partner Portal" : "Staff Portal"}
+          {getPortalLabel(isPartnerUser, user?.isSuper)}
         </h1>
 
         <hr className="mt-4 mb-3 h-0.5 bg-blue-dark border-t-0 w-full" />

From e566ea2566050ee0dd59018825aeb2ebd07ca28d Mon Sep 17 00:00:00 2001
From: ezraexe <ezrakimcs@gmail.com>
Date: Sat, 7 Mar 2026 21:57:27 -0500
Subject: [PATCH 2/4] added part 2

---
 src/auth/index.ts                      | 10 ++++++++++
 src/components/NavBarLayout.tsx        |  3 +++
 src/components/context/UserContext.tsx |  1 +
 3 files changed, 14 insertions(+)

diff --git a/src/auth/index.ts b/src/auth/index.ts
index a47a7929..ff385889 100644
--- a/src/auth/index.ts
+++ b/src/auth/index.ts
@@ -27,6 +27,7 @@ declare module "next-auth" {
     enabled: boolean;
     pending: boolean;
     tag?: string;
+    siteName?: string;
   }
 
   interface Session {
@@ -39,6 +40,7 @@ declare module "next-auth" {
       tag?: string;
       enabled: boolean;
       pending: boolean;
+      siteName?: string;
     } & DefaultSession["user"] &
       PermissionFlags;
   }
@@ -54,6 +56,7 @@ declare module "next-auth/jwt" {
     streamUserId: string | null;
     streamUserToken: string | null;
     tag?: string;
+    siteName?: string;
   }
 }
 
@@ -80,6 +83,7 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
             tag: true,
             streamUserId: true,
             streamUserToken: true,
+            partnerDetails: true, 
             ...PERMISSION_SELECT,
           },
         });
@@ -101,6 +105,10 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
           streamUserId: user.streamUserId,
           streamUserToken: user.streamUserToken,
           tag: user.tag ?? undefined,
+          siteName: 
+            user.type === "PARTNER" && user.partnerDetails
+              ? (user.partnerDetails as { siteName?: string })?.siteName
+              : undefined, 
         };
       },
     }),
@@ -116,6 +124,7 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
         token.streamUserId = user.streamUserId;
         token.streamUserToken = user.streamUserToken;
         token.tag = user.tag;
+        token.siteName = user.siteName;
         PERMISSION_FIELDS.forEach((field) => {
           token[field] = user[field];
         });
@@ -132,6 +141,7 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
       session.user.streamUserId = token.streamUserId;
       session.user.streamUserToken = token.streamUserToken;
       session.user.tag = token.tag;
+      session.user.siteName = token.siteName; 
       PERMISSION_FIELDS.forEach((field) => {
         session.user[field] = Boolean(token[field]);
       });
diff --git a/src/components/NavBarLayout.tsx b/src/components/NavBarLayout.tsx
index 2f6c8d0e..019a91dc 100644
--- a/src/components/NavBarLayout.tsx
+++ b/src/components/NavBarLayout.tsx
@@ -157,6 +157,9 @@ function NavLinks() {
       )}
       {/* Spacer to push the profile and sign out buttons to the bottom */}
       <li className="flex-grow" />
+      <p className="px-2 mb-1 text-sm font-medium line-clamp-2 hidden md:block">
+        {isPartnerUser ? user?.siteName : user?.name}
+      </p>
       <ul className="flex gap-2">
         <li className="flex-1 mt-auto">
           <NavLink
diff --git a/src/components/context/UserContext.tsx b/src/components/context/UserContext.tsx
index 06182535..14a66471 100644
--- a/src/components/context/UserContext.tsx
+++ b/src/components/context/UserContext.tsx
@@ -11,6 +11,7 @@ export type SessionUser = PermissionFlags & {
   streamUserToken: string | null;
   streamUserId: string | null;
   tag?: string;
+  siteName?: string;
 }
 
 interface UseUserType {

From da7b3d88e17d5577e512ecc53f6304a302c698b9 Mon Sep 17 00:00:00 2001
From: ezraexe <ezrakimcs@gmail.com>
Date: Sat, 7 Mar 2026 22:00:59 -0500
Subject: [PATCH 3/4] fixing up bugs

---
 src/components/NavBarLayout.tsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/NavBarLayout.tsx b/src/components/NavBarLayout.tsx
index 019a91dc..08c26e0f 100644
--- a/src/components/NavBarLayout.tsx
+++ b/src/components/NavBarLayout.tsx
@@ -157,9 +157,11 @@ function NavLinks() {
       )}
       {/* Spacer to push the profile and sign out buttons to the bottom */}
       <li className="flex-grow" />
-      <p className="px-2 mb-1 text-sm font-medium line-clamp-2 hidden md:block">
-        {isPartnerUser ? user?.siteName : user?.name}
-      </p>
+      <li>
+        <p className="px-2 mb-1 text-sm font-medium line-clamp-3 hidden md:block">
+          {isPartnerUser ? (user?.siteName ?? user?.name) : user?.name }
+        </p>
+      </li>
       <ul className="flex gap-2">
         <li className="flex-1 mt-auto">
           <NavLink

From 02ad2ff79a61546bf76e8fed3d6e41c19309959c Mon Sep 17 00:00:00 2001
From: ezraexe <ezrakimcs@gmail.com>
Date: Sun, 8 Mar 2026 09:32:37 -0400
Subject: [PATCH 4/4] Added Logged In As as per PR request

---
 src/components/NavBarLayout.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/NavBarLayout.tsx b/src/components/NavBarLayout.tsx
index 08c26e0f..c9c545d5 100644
--- a/src/components/NavBarLayout.tsx
+++ b/src/components/NavBarLayout.tsx
@@ -159,6 +159,8 @@ function NavLinks() {
       <li className="flex-grow" />
       <li>
         <p className="px-2 mb-1 text-sm font-medium line-clamp-3 hidden md:block">
+          <span className="font-normal text-xs text-gray-500">Logged in as</span>
+          <br />
           {isPartnerUser ? (user?.siteName ?? user?.name) : user?.name }
         </p>
       </li>