Header: an account menu under the user's name
Profile, invoices, redeeming a code and logging out moved from the crowded top right and the main menu into a menu that opens from the name; on phones the name shows too (shortened), so the profile stays reachable. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
This commit is contained in:
@@ -5,7 +5,7 @@ import { useState } from "react";
|
||||
|
||||
import { api } from "@/lib/api";
|
||||
|
||||
export function LogoutButton() {
|
||||
export function LogoutButton({ className = "btn btn-sm", role }: { className?: string; role?: "menuitem" }) {
|
||||
const router = useRouter();
|
||||
const [busy, setBusy] = useState(false);
|
||||
async function logout() {
|
||||
@@ -20,7 +20,7 @@ export function LogoutButton() {
|
||||
router.refresh();
|
||||
}
|
||||
return (
|
||||
<button type="button" className="btn btn-sm" onClick={logout} disabled={busy}>
|
||||
<button type="button" className={className} role={role} onClick={logout} disabled={busy}>
|
||||
Kilépés
|
||||
</button>
|
||||
);
|
||||
|
||||
@@ -2,8 +2,8 @@ import Link from "next/link";
|
||||
|
||||
import type { Me } from "@/lib/types";
|
||||
|
||||
import { LogoutButton } from "./LogoutButton";
|
||||
import { NavLinks } from "./NavLinks";
|
||||
import { UserMenu } from "./UserMenu";
|
||||
|
||||
/** The mark: the orbit, the thread (an S, with the crossbar an f) and a star on the rim. */
|
||||
export function LogoMark({ className = "logo-mark" }: { className?: string }) {
|
||||
@@ -91,8 +91,6 @@ export function SiteHeader({ me }: { me: Me }) {
|
||||
{ href: "/osszevetesek", label: "Összevetések" },
|
||||
{ href: "/kartyajoslas", label: "Kártyajóslás" },
|
||||
{ href: "/csomagok", label: "Csomagok" },
|
||||
...(me.invoice_count > 0 ? [{ href: "/szamlak", label: "Számláim" }] : []),
|
||||
{ href: "/profil", label: "Profil" },
|
||||
];
|
||||
if (me.user.roles.includes("admin")) links.push({ href: "/admin", label: "Admin" });
|
||||
return (
|
||||
@@ -101,11 +99,7 @@ export function SiteHeader({ me }: { me: Me }) {
|
||||
<NavLinks links={links} />
|
||||
<div className="who">
|
||||
<PackageBadge me={me} />
|
||||
<Link href="/bevaltas" className="redeem-link">
|
||||
Kód beváltása
|
||||
</Link>
|
||||
<span className="who-name">{me.user.display_name || me.user.email}</span>
|
||||
<LogoutButton />
|
||||
<UserMenu name={me.user.display_name || me.user.email} invoices={me.invoice_count > 0} />
|
||||
</div>
|
||||
</header>
|
||||
);
|
||||
|
||||
@@ -0,0 +1,82 @@
|
||||
"use client";
|
||||
|
||||
import Link from "next/link";
|
||||
import { usePathname } from "next/navigation";
|
||||
import { useEffect, useId, useRef, useState } from "react";
|
||||
|
||||
import { LogoutButton } from "./LogoutButton";
|
||||
|
||||
/**
|
||||
* The account menu under the user's name (top right): profile, invoices,
|
||||
* redeeming a code, logging out. Closes on a click outside, Escape, or
|
||||
* moving to another page.
|
||||
*/
|
||||
export function UserMenu({ name, invoices }: { name: string; invoices: boolean }) {
|
||||
const [open, setOpen] = useState(false);
|
||||
const box = useRef<HTMLDivElement>(null);
|
||||
const button = useRef<HTMLButtonElement>(null);
|
||||
const menuId = useId();
|
||||
const pathname = usePathname();
|
||||
|
||||
useEffect(() => setOpen(false), [pathname]);
|
||||
useEffect(() => {
|
||||
if (!open) return;
|
||||
const outside = (e: PointerEvent) => {
|
||||
if (box.current && !box.current.contains(e.target as Node)) setOpen(false);
|
||||
};
|
||||
document.addEventListener("pointerdown", outside);
|
||||
return () => document.removeEventListener("pointerdown", outside);
|
||||
}, [open]);
|
||||
|
||||
function keydown(e: React.KeyboardEvent) {
|
||||
if (e.key === "Escape" && open) {
|
||||
setOpen(false);
|
||||
button.current?.focus();
|
||||
}
|
||||
}
|
||||
|
||||
const items = [
|
||||
{ href: "/profil", label: "Profil" },
|
||||
...(invoices ? [{ href: "/szamlak", label: "Számláim" }] : []),
|
||||
{ href: "/bevaltas", label: "Kód beváltása" },
|
||||
];
|
||||
|
||||
return (
|
||||
<div className="user-menu" ref={box} onKeyDown={keydown}>
|
||||
<button
|
||||
ref={button}
|
||||
type="button"
|
||||
className="who-name"
|
||||
aria-expanded={open}
|
||||
aria-controls={menuId}
|
||||
aria-haspopup="menu"
|
||||
onClick={() => setOpen((o) => !o)}
|
||||
>
|
||||
<svg viewBox="0 0 24 24" aria-hidden="true" className="who-icon">
|
||||
<circle cx="12" cy="8" r="4" />
|
||||
<path d="M4 20c1.5-4 4.5-6 8-6s6.5 2 8 6" />
|
||||
</svg>
|
||||
<span className="who-name-text">{name}</span>
|
||||
<svg viewBox="0 0 24 24" aria-hidden="true" className="who-chevron">
|
||||
<path d="M6 9l6 6 6-6" />
|
||||
</svg>
|
||||
</button>
|
||||
{open && (
|
||||
<div id={menuId} className="user-menu-list" role="menu" aria-label="Fiók">
|
||||
{items.map((item) => (
|
||||
<Link
|
||||
key={item.href}
|
||||
href={item.href}
|
||||
role="menuitem"
|
||||
className="user-menu-item"
|
||||
aria-current={pathname.startsWith(item.href) ? "page" : undefined}
|
||||
>
|
||||
{item.label}
|
||||
</Link>
|
||||
))}
|
||||
<LogoutButton className="user-menu-item user-menu-logout" role="menuitem" />
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user