diff --git a/.gitignore b/.gitignore index c55999a..b17ec00 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,6 @@ npm-debug.log* .DS_Store .idea/ .vscode/ + +# Windows download metadata +*:Zone.Identifier diff --git a/.prettierignore b/.prettierignore index 84d48f1..037d7a6 100644 --- a/.prettierignore +++ b/.prettierignore @@ -3,9 +3,10 @@ .github/ISSUE_TEMPLATE/ .next/ coverage/ +data/ infrastructure_plan.md node_modules/ package-lock.json playwright-report/ test-results/ -next-env.d.ts \ No newline at end of file +next-env.d.ts diff --git a/app/Navbar.css b/app/Navbar.css index aca85b9..b75f27f 100644 --- a/app/Navbar.css +++ b/app/Navbar.css @@ -3,15 +3,18 @@ nav { color: black; } -ul { +nav > ul { list-style-type: none; margin: 1rem; padding: 0; display: flex; + align-items: center; justify-content: space-around; } -li { +nav > ul > li { + display: flex; + align-items: center; padding: 15px; } @@ -24,6 +27,28 @@ a:hover { text-decoration: underline; } +.navbar-profile { + display: inline-flex; + align-items: center; + gap: 0.5rem; +} + +.navbar-avatar { + display: inline-grid; + width: 2rem; + height: 2rem; + place-items: center; + overflow: hidden; + border-radius: 50%; + font-size: 1.25rem; +} + +.navbar-avatar img { + width: 100%; + height: 100%; + object-fit: cover; +} + nav form { margin: 0; } diff --git a/app/Navbar.tsx b/app/Navbar.tsx index 601f9f7..c86812a 100644 --- a/app/Navbar.tsx +++ b/app/Navbar.tsx @@ -1,13 +1,17 @@ import Link from 'next/link' +import Image from 'next/image' import { signOut } from '../auth' +import type { ProfileImageOption } from '../lib/profile-images' import './Navbar.css' type NavbarProps = { + displayName?: string | null session: { user?: { name?: string | null } } | null + avatar?: ProfileImageOption } -export default function Navbar({ session }: NavbarProps) { +export default function Navbar({ displayName, session, avatar }: NavbarProps) { return (