feat: add Header and UserNav components, update layout to include Header and enhance profile page with settings link

This commit is contained in:
2025-09-06 21:21:53 +02:00
parent bf2e280cdd
commit 8b82a5e48e
5 changed files with 157 additions and 12 deletions

View File

@@ -3,6 +3,7 @@ import { Geist, Geist_Mono } from "next/font/google";
import "./globals.css";
import { AuthProvider } from "@/hooks/use-auth";
import { Toaster } from "@/components/ui/sonner";
import { Header } from "@/components/header";
const geistSans = Geist({
variable: "--font-geist-sans",
@@ -30,7 +31,8 @@ export default function RootLayout({
className={`${geistSans.variable} ${geistMono.variable} antialiased`}
>
<AuthProvider>
{children}
<Header />
<main className="flex-1">{children}</main>
<Toaster />
</AuthProvider>
</body>

View File

@@ -1,6 +1,6 @@
import { getMe, getUserProfile, getUserThoughts, Me } from "@/lib/api";
import { UserAvatar } from "@/components/user-avatar";
import { Calendar } from "lucide-react";
import { Calendar, Settings } from "lucide-react";
import { Card } from "@/components/ui/card";
import { notFound } from "next/navigation";
import { cookies } from "next/headers";
@@ -8,6 +8,8 @@ import { FollowButton } from "@/components/follow-button";
import { TopFriends } from "@/components/top-friends";
import { buildThoughtThreads } from "@/lib/utils";
import { ThoughtThread } from "@/components/thought-thread";
import { Button } from "@/components/ui/button";
import Link from "next/link";
interface ProfilePageProps {
params: { username: string };
@@ -54,7 +56,7 @@ export default async function ProfilePage({ params }: ProfilePageProps) {
)}
<div
className="h-48 bg-gray-200 bg-cover bg-center"
className="h-48 bg-gray-200 bg-cover bg-center profile-header"
style={{
backgroundImage: user.headerUrl ? `url(${user.headerUrl})` : "none",
}}
@@ -81,12 +83,21 @@ export default async function ProfilePage({ params }: ProfilePageProps) {
</div>
</div>
{!isOwnProfile && token && (
<FollowButton
username={user.username}
isInitiallyFollowing={isFollowing}
/>
)}
<div>
{isOwnProfile ? (
<Button asChild variant="outline">
<Link href="/settings/profile">
<Settings className="mr-2 h-4 w-4" />
Settings
</Link>
</Button>
) : token ? (
<FollowButton
username={user.username}
isInitiallyFollowing={isFollowing}
/>
) : null}
</div>
</div>
<p className="mt-4 whitespace-pre-wrap">{user.bio}</p>