From 57d9b8da1e58d525f813244fb637e88e6f013ffe Mon Sep 17 00:00:00 2001 From: charlesgauthereau Date: Sun, 21 Dec 2025 20:17:05 +0100 Subject: [PATCH] Bug in profile. --- .../logged-in/logged-in-button.server.tsx | 23 ++++ .../common/logged-in/logged-in-button.tsx | 108 ++++++++++++------ .../dashboard/common/sidebar/app-sidebar.tsx | 2 +- src/features/layout/Header.tsx | 2 +- 4 files changed, 99 insertions(+), 36 deletions(-) create mode 100644 src/components/wrappers/dashboard/common/logged-in/logged-in-button.server.tsx diff --git a/src/components/wrappers/dashboard/common/logged-in/logged-in-button.server.tsx b/src/components/wrappers/dashboard/common/logged-in/logged-in-button.server.tsx new file mode 100644 index 00000000..fa79865f --- /dev/null +++ b/src/components/wrappers/dashboard/common/logged-in/logged-in-button.server.tsx @@ -0,0 +1,23 @@ +import {currentUser} from "@/lib/auth/current-user"; +import {getAccounts, getSession, getSessions} from "@/lib/auth/auth"; +import {LoggedInButtonClient} from "./logged-in-button"; + +export const LoggedInButton = async () => { + const user = await currentUser(); + const sessions = await getSessions(); + const currentSession = await getSession(); + const accounts = await getAccounts(); + + + if (!user) return null; + + return ( + + ); +}; diff --git a/src/components/wrappers/dashboard/common/logged-in/logged-in-button.tsx b/src/components/wrappers/dashboard/common/logged-in/logged-in-button.tsx index c8ab31e8..42ee70df 100644 --- a/src/components/wrappers/dashboard/common/logged-in/logged-in-button.tsx +++ b/src/components/wrappers/dashboard/common/logged-in/logged-in-button.tsx @@ -1,43 +1,83 @@ -import { ChevronUp } from "lucide-react"; +// import { ChevronUp } from "lucide-react"; +// +// import {Avatar, AvatarFallback, AvatarImage} from "@/components/ui/avatar"; +// import { currentUser } from "@/lib/auth/current-user"; +// import { SidebarMenuButton } from "@/components/ui/sidebar"; +// import { getAccounts, getSession, getSessions } from "@/lib/auth/auth"; +// import {LoggedInDropdown} from "@/components/wrappers/dashboard/common/logged-in/logged-in-dropdown"; +// +// export const LoggedInButton = async () => { +// const user = await currentUser(); +// const sessions = await getSessions(); +// const currentSession = await getSession(); +// const accounts = await getAccounts(); +// +// if (!user) return null; +// +// +// return ( +// <> +// +// +// +// +// {user?.name[0].toUpperCase()} +// {user?.image ? : null} +// +// +// {user?.name} +// +// +// +// +// ); +// }; +"use client"; +import {ChevronUp} from "lucide-react"; import {Avatar, AvatarFallback, AvatarImage} from "@/components/ui/avatar"; -import { currentUser } from "@/lib/auth/current-user"; -import { SidebarMenuButton } from "@/components/ui/sidebar"; -import { getAccounts, getSession, getSessions } from "@/lib/auth/auth"; -import {LoggedInDropdown} from "@/components/wrappers/dashboard/common/logged-in/logged-in-dropdown"; +import {SidebarMenuButton} from "@/components/ui/sidebar"; +import {LoggedInDropdown} from "./logged-in-dropdown"; +import {Account, Session, User} from "better-auth"; -export const LoggedInButton = async () => { - const user = await currentUser(); - const sessions = await getSessions(); - const currentSession = await getSession(); - const accounts = await getAccounts(); - - // if (!user) return null; +type LoggedInButtonClientProps = { + user: User; + sessions: Session[]; + currentSession: Session; + accounts: Account[]; +} +export const LoggedInButtonClient = ({user, sessions, currentSession, accounts}: LoggedInButtonClientProps) => { return ( - <> - - + + + + {user.name[0].toUpperCase()} + {user.image && } + - - {user?.name[0].toUpperCase()} - {user?.image ? : null} - - - {user?.name} - - - - + {user.name} + + + ); }; diff --git a/src/components/wrappers/dashboard/common/sidebar/app-sidebar.tsx b/src/components/wrappers/dashboard/common/sidebar/app-sidebar.tsx index 84a202a8..5c05e380 100644 --- a/src/components/wrappers/dashboard/common/sidebar/app-sidebar.tsx +++ b/src/components/wrappers/dashboard/common/sidebar/app-sidebar.tsx @@ -9,8 +9,8 @@ import {SidebarLogo} from "@/components/wrappers/dashboard/common/sidebar/logo-s import {SidebarMenuCustomMain} from "@/components/wrappers/dashboard/common/sidebar/menu-sidebar-main"; import {SideBarFooterCredit} from "@/components/wrappers/dashboard/common/sidebar/side-bar-footer-credit"; import {OrganizationCombobox} from "@/components/wrappers/dashboard/organization/organization-combobox"; -import {LoggedInButton} from "@/components/wrappers/dashboard/common/logged-in/logged-in-button"; import {env} from "@/env.mjs"; +import {LoggedInButton} from "@/components/wrappers/dashboard/common/logged-in/logged-in-button.server"; export function AppSidebar() { const projectName = env.PROJECT_NAME; diff --git a/src/features/layout/Header.tsx b/src/features/layout/Header.tsx index deebb3f4..0d7b84ea 100644 --- a/src/features/layout/Header.tsx +++ b/src/features/layout/Header.tsx @@ -5,7 +5,7 @@ import {ModeToggle} from "@/features/theme/ModeToggle"; import {currentUser} from "@/lib/auth/current-user"; import {BreadCrumbsWrapper} from "@/components/wrappers/common/bread-crumbs/bread-crumbs"; import GitHubStarsButtonCustom from "@/components/wrappers/common/github/github-button"; -import {LoggedInButton} from "@/components/wrappers/dashboard/common/logged-in/logged-in-button"; +import {LoggedInButton} from "@/components/wrappers/dashboard/common/logged-in/logged-in-button.server"; export const Header = async () => { const user = await currentUser();