-
+
diff --git a/components/navigation/top-nav.tsx b/components/navigation/top-nav.tsx
index 85796a8..6d2af00 100644
--- a/components/navigation/top-nav.tsx
+++ b/components/navigation/top-nav.tsx
@@ -1,8 +1,10 @@
"use client";
+import Image from "next/image";
import Link from "next/link";
import { usePathname } from "next/navigation";
import type { AuthState } from "@/lib/auth/session";
+import type { NavProfile } from "@/lib/profile/service";
import { AccountMenu } from "@/components/navigation/account-menu";
import {
isActivePath,
@@ -14,23 +16,32 @@ import { cn } from "@/lib/utils";
type TopNavProps = {
authState: AuthState;
- navAvatarUrl: string | null;
+ navProfile: NavProfile | null;
};
-export function TopNav({ authState, navAvatarUrl }: TopNavProps) {
+export function TopNav({ authState, navProfile }: TopNavProps) {
const pathname = usePathname();
const useCompactBottomNav = shouldUseBottomNav(pathname);
return (
{children}
-
-
- Inspannings Monitor
-
-
- Wellness-first dagflow
-
+
+
+
+
+ Inspannings Monitor
+
+
+ Wellness-first dagflow
+
+
{
+export type NavProfile = {
+ avatarUrl: string | null;
+ displayName: string | null;
+};
+
+export async function getNavProfileForCurrentUser(userId: string): Promise {
const supabase = await createClient();
const { data } = await supabase
.from("profiles")
- .select("avatar_path")
+ .select("avatar_path, display_name")
.eq("id", userId)
.maybeSingle();
- return getProfileAvatarUrl(data?.avatar_path ?? null);
+ return {
+ avatarUrl: await getProfileAvatarUrl(data?.avatar_path ?? null),
+ displayName: data?.display_name ?? null,
+ };
}
+
diff --git a/next-env.d.ts b/next-env.d.ts
index c4b7818..9edff1c 100644
--- a/next-env.d.ts
+++ b/next-env.d.ts
@@ -1,6 +1,6 @@
///
///
-import "./.next/dev/types/routes.d.ts";
+import "./.next/types/routes.d.ts";
// NOTE: This file should not be edited
// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
diff --git a/package.json b/package.json
index 36861a6..cda1050 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "inspannings-monitor",
- "version": "0.1.0",
+ "version": "0.1.1",
"private": true,
"scripts": {
"dev": "next dev",