diff --git a/services/frontend/src/app/globals.css b/services/frontend/src/app/globals.css index d2ba276..bf2aefd 100644 --- a/services/frontend/src/app/globals.css +++ b/services/frontend/src/app/globals.css @@ -64,6 +64,28 @@ p { margin: 0; } .nav a { color: var(--ink-2); text-decoration: none; padding: 10px 12px; border-radius: 8px; min-height: 44px; display: inline-flex; align-items: center; } .nav a:hover, .nav a[aria-current="page"] { color: var(--gold); background: rgba(217, 180, 106, 0.08); } .who { display: flex; align-items: center; gap: 12px; color: var(--muted); font-size: 14px; } +.user-menu { position: relative; } +.who-name { + display: inline-flex; align-items: center; gap: 6px; min-height: 40px; padding: 0 10px; cursor: pointer; + border: 1px solid var(--line-2); border-radius: 999px; background: none; color: var(--ink-2); font: inherit; font-size: 14px; +} +.who-name:hover, .who-name[aria-expanded="true"] { color: var(--gold); border-color: #5a6790; } +.who-chevron { width: 14px; height: 14px; flex: none; fill: none; stroke: currentColor; stroke-width: 2; stroke-linecap: round; stroke-linejoin: round; } +.who-name[aria-expanded="true"] .who-chevron { transform: rotate(180deg); } +.user-menu-list { + position: absolute; right: 0; top: calc(100% + 8px); z-index: 30; min-width: 200px; padding: 6px; + display: flex; flex-direction: column; background: var(--panel); border: 1px solid var(--line-2); border-radius: 12px; + box-shadow: 0 16px 40px rgba(0, 0, 0, 0.45); +} +.user-menu-item { + display: flex; align-items: center; min-height: 40px; padding: 0 12px; border: 0; border-radius: 8px; background: none; + color: var(--ink); font: inherit; font-size: 14px; text-align: left; text-decoration: none; cursor: pointer; +} +.user-menu-item:hover, .user-menu-item:focus-visible { background: rgba(255, 255, 255, 0.05); color: var(--gold); } +.user-menu-item[aria-current="page"] { color: var(--gold); } +.user-menu-logout { border-top: 1px solid var(--line); border-radius: 0 0 8px 8px; margin-top: 4px; padding-top: 2px; color: var(--muted); } +.who-name-text { max-width: 220px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } +.who-icon { width: 18px; height: 18px; flex: none; fill: none; stroke: currentColor; stroke-width: 1.6; stroke-linecap: round; } .pkg-pill { display: inline-flex; align-items: center; gap: 6px; min-height: 32px; padding: 0 12px; border-radius: 999px; border: 1px solid rgba(217, 180, 106, 0.5); color: var(--gold); text-decoration: none; font-size: 13px; white-space: nowrap; @@ -334,7 +356,8 @@ td.num { font-variant-numeric: tabular-nums; white-space: nowrap; } h1 { font-size: 32px; } .site-header { padding: 10px 16px; gap: 12px; } .nav { order: 3; flex-basis: 100%; } - .who-name { display: none; } + .who-name-text { max-width: 120px; } + .who { margin-left: auto; } .card { padding: 18px; } .auth-aside { padding: 28px 20px; min-height: 0; } .wheel { width: 60%; } @@ -741,8 +764,6 @@ a.pair-row:hover strong { color: var(--gold); } .share-cta .btn { align-self: flex-start; } /* Promo codes: redeeming (header, packages page, /bevaltas) and the admin page */ -.redeem-link { color: var(--ink-2); font-size: 13px; text-decoration: none; white-space: nowrap; } -.redeem-link:hover { color: var(--gold); text-decoration: underline; text-underline-offset: 3px; } .redeem { display: flex; flex-direction: column; gap: 8px; } .redeem-row { display: flex; gap: 8px; flex-wrap: wrap; } .redeem-input { flex: 1 1 220px; width: auto; font-family: ui-monospace, SFMono-Regular, Menlo, monospace; letter-spacing: 1.5px; text-transform: uppercase; } diff --git a/services/frontend/src/components/LogoutButton.tsx b/services/frontend/src/components/LogoutButton.tsx index f81ca62..518032a 100644 --- a/services/frontend/src/components/LogoutButton.tsx +++ b/services/frontend/src/components/LogoutButton.tsx @@ -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 ( - ); diff --git a/services/frontend/src/components/SiteHeader.tsx b/services/frontend/src/components/SiteHeader.tsx index 260d251..70867f4 100644 --- a/services/frontend/src/components/SiteHeader.tsx +++ b/services/frontend/src/components/SiteHeader.tsx @@ -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 }) {
- - Kód beváltása - - {me.user.display_name || me.user.email} - + 0} />
); diff --git a/services/frontend/src/components/UserMenu.tsx b/services/frontend/src/components/UserMenu.tsx new file mode 100644 index 0000000..0f4ce92 --- /dev/null +++ b/services/frontend/src/components/UserMenu.tsx @@ -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(null); + const button = useRef(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 ( +
+ + {open && ( + + )} +
+ ); +}