From da7b502936ab95270404c4170a7e2900e18f3dc1 Mon Sep 17 00:00:00 2001 From: Park Dahyeon Date: Tue, 10 Nov 2026 13:35:11 +0900 Subject: [PATCH] feat(web): refresh the app with Astryx and coral branding --- .claude/launch.json | 11 + .gitignore | 4 + apps/web/package.json | 4 +- apps/web/src/App.css | 1 - apps/web/src/App.tsx | 220 ++-- apps/web/src/api/mappers.ts | 8 +- apps/web/src/components/AdminPage.tsx | 82 ++ apps/web/src/components/DevAuthSwitcher.tsx | 69 +- .../components/InternalGameAnalysisTabs.tsx | 56 +- apps/web/src/components/RankBadge.tsx | 19 +- apps/web/src/components/TierHistoryChart.tsx | 16 +- .../competition/CompetitionAdminControls.tsx | 34 +- .../competition/MatchDetailTabBar.tsx | 10 +- .../competition/TeamTournamentCodes.tsx | 2 +- apps/web/src/index.css | 482 ++++++--- apps/web/src/lib/league.ts | 57 +- apps/web/src/main.tsx | 5 +- apps/web/src/pages/AuctionAstryx.tsx | 97 ++ apps/web/src/pages/AuctionPage.tsx | 766 ++++++++------ apps/web/src/pages/AuthCallback.tsx | 7 +- .../src/pages/CommunityInternalStatsPage.tsx | 802 +++++++++----- apps/web/src/pages/HomePage.tsx | 977 +++++++----------- .../web/src/pages/InternalMatchDetailPage.tsx | 180 ++-- apps/web/src/pages/Login.tsx | 39 +- apps/web/src/pages/MatchDetailPage.tsx | 288 +++--- apps/web/src/pages/MatchGameDetailPage.tsx | 344 +++--- apps/web/src/pages/MatchTeamProgressPage.tsx | 95 +- apps/web/src/pages/UserHistoryPage.tsx | 571 +++++----- apps/web/src/pages/admin/LegacyImportPage.tsx | 74 +- .../web/src/pages/admin/LegacyMatchesPage.tsx | 61 +- apps/web/src/pages/admin/MatchAdminPage.tsx | 72 +- .../src/pages/admin/TournamentCodesPage.tsx | 64 +- apps/web/src/pages/auction.css | 377 +++++++ apps/web/src/ui/AppTheme.tsx | 20 + apps/web/src/ui/Btn.tsx | 84 ++ apps/web/src/ui/Feedback.tsx | 87 ++ apps/web/src/ui/Page.tsx | 203 ++++ apps/web/src/ui/Pill.tsx | 70 ++ apps/web/src/ui/RouterLink.tsx | 21 + apps/web/src/ui/index.ts | 13 + apps/web/src/ui/layout.ts | 12 + apps/web/test/design-tokens.test.ts | 85 +- design-qa.md | 34 + .../match-status-and-result-presentation.md | 121 +++ .../06-ui-improvement-review.md | 21 + .../07-visual-design-review.md | 65 ++ docs/ux-audit-2026-11-10/README.md | 46 + .../evidence/AP-baseline-1280-light.jpg | Bin 0 -> 89435 bytes .../evidence/AP-comparison-1280.jpg | Bin 0 -> 83119 bytes .../evidence/AP-preview-1280-dark.jpg | Bin 0 -> 63620 bytes .../evidence/AP-preview-1280-light.jpg | Bin 0 -> 62287 bytes .../evidence/AP-preview-1440-light.jpg | Bin 0 -> 73468 bytes .../evidence/AP-preview-390-light.jpg | Bin 0 -> 29662 bytes .../evidence/AP-preview-390-teams.jpg | Bin 0 -> 26563 bytes .../evidence/AP-team-comparison-1280.jpg | Bin 0 -> 47342 bytes .../evidence/AU-preview-1280-light.jpg | Bin 0 -> 57010 bytes .../evidence/AU-preview-1440-dark.jpg | Bin 0 -> 69322 bytes .../evidence/AU-preview-390-light.jpg | Bin 0 -> 28750 bytes .../evidence/AU-reference-comparison-dark.jpg | Bin 0 -> 78968 bytes .../AU-reference-comparison-detail.jpg | Bin 0 -> 30723 bytes .../AU-reference-comparison-light.jpg | Bin 0 -> 69182 bytes .../evidence/AX-preview-1280-dark.jpg | Bin 0 -> 71335 bytes .../evidence/AX-preview-1280-light.jpg | Bin 0 -> 74154 bytes .../evidence/AX-preview-390-light.jpg | Bin 0 -> 29469 bytes .../evidence/AX-reference-card-dark.jpg | Bin 0 -> 37158 bytes .../evidence/AX-reference-comparison.jpg | Bin 0 -> 72782 bytes .../evidence/AX-reference-tabs-dark.jpg | Bin 0 -> 32377 bytes .../ux-audit-2026-11-10/evidence/L01-home.jpg | Bin 0 -> 61908 bytes .../evidence/L02-match.jpg | Bin 0 -> 32215 bytes .../evidence/L03-auction.jpg | Bin 0 -> 76591 bytes .../evidence/L04-leaderboard.jpg | Bin 0 -> 107093 bytes .../evidence/L05-internal-match.jpg | Bin 0 -> 123639 bytes .../evidence/L06-game-scoreboard.jpg | Bin 0 -> 96911 bytes .../evidence/L07-game-lane.jpg | Bin 0 -> 113341 bytes .../evidence/L08-game-build.jpg | Bin 0 -> 129097 bytes .../evidence/L09-competition.jpg | Bin 0 -> 80983 bytes .../evidence/L10-series.jpg | Bin 0 -> 79270 bytes .../evidence/L11-teams.jpg | Bin 0 -> 90651 bytes .../evidence/L12-competition-ops.jpg | Bin 0 -> 70637 bytes .../evidence/L13-team-progress.jpg | Bin 0 -> 65961 bytes .../evidence/L14-team-state.jpg | Bin 0 -> 74702 bytes .../evidence/L15-mobile-team.jpg | Bin 0 -> 40899 bytes .../evidence/L16-login.jpg | Bin 0 -> 44677 bytes .../evidence/L17-admin-matches.jpg | Bin 0 -> 121844 bytes .../evidence/L18-admin-codes.jpg | Bin 0 -> 37935 bytes .../evidence/L19-admin-import.jpg | Bin 0 -> 76014 bytes .../evidence/L20-admin-legacy.jpg | Bin 0 -> 55998 bytes .../evidence/L21-round-robin.jpg | Bin 0 -> 78138 bytes .../evidence/L22-user-profile.jpg | Bin 0 -> 88731 bytes .../evidence/L23-user-solo.jpg | Bin 0 -> 90397 bytes .../evidence/L24-mobile-home.jpg | Bin 0 -> 32451 bytes .../evidence/L25-mobile-bracket.jpg | Bin 0 -> 43580 bytes .../evidence/L26-mobile-game.jpg | Bin 0 -> 39071 bytes .../evidence/L27-mobile-auction.jpg | Bin 0 -> 34475 bytes .../evidence/L28-wide-bracket.jpg | Bin 0 -> 107011 bytes .../evidence/L30-dark-schedule.jpg | Bin 0 -> 79867 bytes .../evidence/L31-auction-cancel.jpg | Bin 0 -> 62944 bytes .../evidence/L32-admin-create.jpg | Bin 0 -> 64485 bytes .../evidence/L33-callback.jpg | Bin 0 -> 38849 bytes .../evidence/L34-terms.jpg | Bin 0 -> 57497 bytes .../evidence/L35-privacy.jpg | Bin 0 -> 59064 bytes .../evidence/L36-not-found.jpg | Bin 0 -> 37782 bytes .../evidence/L37-match-info.jpg | Bin 0 -> 104607 bytes .../evidence/L38-home-admin.jpg | Bin 0 -> 86091 bytes .../evidence/L39-two-team-series.jpg | Bin 0 -> 71901 bytes .../evidence/L40-missing-match.jpg | Bin 0 -> 41363 bytes .../evidence/L42-admin-denied.jpg | Bin 0 -> 29185 bytes .../evidence/L43-public-game.jpg | Bin 0 -> 97400 bytes .../evidence/R01-opgg-home.jpg | Bin 0 -> 79239 bytes .../evidence/R02-opgg-profile.jpg | Bin 0 -> 86485 bytes .../evidence/R03-lolps-home.jpg | Bin 0 -> 116506 bytes .../evidence/R04-poro-home.jpg | Bin 0 -> 87175 bytes .../evidence/R05-poro-multi.jpg | Bin 0 -> 61330 bytes .../evidence/R06-blitz-home.jpg | Bin 0 -> 122355 bytes .../evidence/R07-tracker-home.jpg | Bin 0 -> 106654 bytes .../evidence/R08-mobalytics-home.jpg | Bin 0 -> 81276 bytes .../evidence/R09-mobalytics-lol.jpg | Bin 0 -> 46573 bytes .../evidence/R10-blitz-lol.jpg | Bin 0 -> 58847 bytes .../evidence/R11-blitz-search.jpg | Bin 0 -> 31988 bytes .../evidence/R12-tracker-leaderboard.jpg | Bin 0 -> 97838 bytes .../evidence/R13-mobalytics-gpi.jpg | Bin 0 -> 62990 bytes .../evidence/R14-lolps-studio.jpg | Bin 0 -> 37588 bytes .../evidence/R15-lolps-rank.jpg | Bin 0 -> 102371 bytes .../evidence/R16-opgg-match.jpg | Bin 0 -> 123449 bytes .../evidence/R17-mobalytics-search.jpg | Bin 0 -> 78544 bytes .../evidence/R18-mobalytics-profile.jpg | Bin 0 -> 113227 bytes .../evidence/R19-poro-profile.jpg | Bin 0 -> 95961 bytes .../evidence/V01-home-light.jpg | Bin 0 -> 56767 bytes .../evidence/V02-auction-light.jpg | Bin 0 -> 89360 bytes .../evidence/V03-auction-player.jpg | Bin 0 -> 81858 bytes .../evidence/V04-series-light.jpg | Bin 0 -> 61381 bytes .../evidence/V05-game-light.jpg | Bin 0 -> 80158 bytes .../evidence/V06-game-dark.jpg | Bin 0 -> 81147 bytes .../evidence/V07-auction-dark.jpg | Bin 0 -> 88375 bytes .../evidence/V08-records-light.jpg | Bin 0 -> 69956 bytes .../evidence/V09-opgg-profile.jpg | Bin 0 -> 66087 bytes .../evidence/V10-mobalytics-profile.jpg | Bin 0 -> 75454 bytes .../evidence/V11-auction-team-width.jpg | Bin 0 -> 56248 bytes .../evidence/comparison-event-vs-series.jpg | Bin 0 -> 47314 bytes pnpm-lock.yaml | 123 ++- 140 files changed, 4531 insertions(+), 2368 deletions(-) create mode 100644 .claude/launch.json delete mode 100644 apps/web/src/App.css create mode 100644 apps/web/src/components/AdminPage.tsx create mode 100644 apps/web/src/pages/AuctionAstryx.tsx create mode 100644 apps/web/src/pages/auction.css create mode 100644 apps/web/src/ui/AppTheme.tsx create mode 100644 apps/web/src/ui/Btn.tsx create mode 100644 apps/web/src/ui/Feedback.tsx create mode 100644 apps/web/src/ui/Page.tsx create mode 100644 apps/web/src/ui/Pill.tsx create mode 100644 apps/web/src/ui/RouterLink.tsx create mode 100644 apps/web/src/ui/index.ts create mode 100644 apps/web/src/ui/layout.ts create mode 100644 design-qa.md create mode 100644 docs/specs/match-status-and-result-presentation.md create mode 100644 docs/ux-audit-2026-11-10/06-ui-improvement-review.md create mode 100644 docs/ux-audit-2026-11-10/07-visual-design-review.md create mode 100644 docs/ux-audit-2026-11-10/README.md create mode 100644 docs/ux-audit-2026-11-10/evidence/AP-baseline-1280-light.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/AP-comparison-1280.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/AP-preview-1280-dark.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/AP-preview-1280-light.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/AP-preview-1440-light.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/AP-preview-390-light.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/AP-preview-390-teams.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/AP-team-comparison-1280.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/AU-preview-1280-light.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/AU-preview-1440-dark.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/AU-preview-390-light.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/AU-reference-comparison-dark.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/AU-reference-comparison-detail.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/AU-reference-comparison-light.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/AX-preview-1280-dark.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/AX-preview-1280-light.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/AX-preview-390-light.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/AX-reference-card-dark.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/AX-reference-comparison.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/AX-reference-tabs-dark.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L01-home.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L02-match.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L03-auction.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L04-leaderboard.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L05-internal-match.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L06-game-scoreboard.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L07-game-lane.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L08-game-build.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L09-competition.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L10-series.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L11-teams.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L12-competition-ops.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L13-team-progress.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L14-team-state.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L15-mobile-team.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L16-login.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L17-admin-matches.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L18-admin-codes.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L19-admin-import.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L20-admin-legacy.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L21-round-robin.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L22-user-profile.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L23-user-solo.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L24-mobile-home.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L25-mobile-bracket.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L26-mobile-game.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L27-mobile-auction.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L28-wide-bracket.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L30-dark-schedule.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L31-auction-cancel.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L32-admin-create.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L33-callback.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L34-terms.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L35-privacy.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L36-not-found.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L37-match-info.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L38-home-admin.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L39-two-team-series.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L40-missing-match.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L42-admin-denied.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/L43-public-game.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/R01-opgg-home.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/R02-opgg-profile.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/R03-lolps-home.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/R04-poro-home.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/R05-poro-multi.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/R06-blitz-home.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/R07-tracker-home.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/R08-mobalytics-home.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/R09-mobalytics-lol.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/R10-blitz-lol.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/R11-blitz-search.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/R12-tracker-leaderboard.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/R13-mobalytics-gpi.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/R14-lolps-studio.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/R15-lolps-rank.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/R16-opgg-match.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/R17-mobalytics-search.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/R18-mobalytics-profile.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/R19-poro-profile.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/V01-home-light.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/V02-auction-light.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/V03-auction-player.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/V04-series-light.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/V05-game-light.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/V06-game-dark.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/V07-auction-dark.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/V08-records-light.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/V09-opgg-profile.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/V10-mobalytics-profile.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/V11-auction-team-width.jpg create mode 100644 docs/ux-audit-2026-11-10/evidence/comparison-event-vs-series.jpg diff --git a/.claude/launch.json b/.claude/launch.json new file mode 100644 index 00000000..a3c09b0f --- /dev/null +++ b/.claude/launch.json @@ -0,0 +1,11 @@ +{ + "version": "0.0.1", + "configurations": [ + { + "name": "web-staging", + "runtimeExecutable": "pnpm", + "runtimeArgs": ["--filter", "web", "start:staging"], + "port": 5173 + } + ] +} diff --git a/.gitignore b/.gitignore index f3857a37..96db833e 100644 --- a/.gitignore +++ b/.gitignore @@ -23,9 +23,13 @@ website/LICENSE *.md !README.md +!design-qa.md !docs/specs/internal-match-game-analysis.md !docs/plans/internal-match-game-analysis-p0-p1.md !docs/specs/double-elimination-connector-routing.md +!docs/specs/match-status-and-result-presentation.md +!docs/ux-audit-2026-11-10/06-ui-improvement-review.md +!docs/ux-audit-2026-11-10/07-visual-design-review.md !docs/plans/double-elimination-connector-routing.md !docs/plans/redis-8.10-optimization.md /tmp/ diff --git a/apps/web/package.json b/apps/web/package.json index 87ee4b45..50694258 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -19,10 +19,13 @@ "preview": "vite preview" }, "dependencies": { + "@astryxdesign/core": "0.7.11", + "@astryxdesign/theme-neutral": "0.7.11", "@azure/msal-browser": "^5.8.0", "@azure/msal-react": "^5.3.1", "@lolympus/contracts": "workspace:*", "@newrelic/browser-agent": "^1.318.0", + "@stylexjs/stylex": "0.19.1", "@tanstack/react-query": "^5.100.1", "lucide-react": "^1.14.0", "react": "^19.2.8", @@ -38,7 +41,6 @@ "@types/react": "^19.2.14", "@types/react-dom": "^19.2.3", "@vitejs/plugin-react": "^6.0.1", - "daisyui": "^5.5.19", "eslint": "^9.39.4", "eslint-plugin-react-hooks": "^7.0.1", "eslint-plugin-react-refresh": "^0.5.2", diff --git a/apps/web/src/App.css b/apps/web/src/App.css deleted file mode 100644 index e00a71c3..00000000 --- a/apps/web/src/App.css +++ /dev/null @@ -1 +0,0 @@ -/* App-specific styles — currently using Tailwind + daisyUI */ diff --git a/apps/web/src/App.tsx b/apps/web/src/App.tsx index b1fb1527..d415ef94 100644 --- a/apps/web/src/App.tsx +++ b/apps/web/src/App.tsx @@ -1,10 +1,10 @@ -import { BrowserRouter, Link, Route, Routes } from "react-router"; +import { BrowserRouter, Link, NavLink, Route, Routes } from "react-router"; import type { ReactNode } from "react"; import { useMsal } from "@azure/msal-react"; -import { Moon, Sun } from "lucide-react"; +import { LogOut, Moon, Sun } from "lucide-react"; import DevAuthSwitcher from "./components/DevAuthSwitcher"; import { DEFAULT_COMMUNITY_ID, setTheme, useTheme } from "./config"; -import { useCommunity } from "./api/hooks"; +import { useCommunity, useMe } from "./api/hooks"; import { isMsalConfigured } from "./lib/auth/msal.config"; import AuthCallbackPage from "./pages/AuthCallback"; import HomePage from "./pages/HomePage"; @@ -20,6 +20,24 @@ import LegacyImportPage from "./pages/admin/LegacyImportPage"; import LegacyMatchesPage from "./pages/admin/LegacyMatchesPage"; import MatchAdminPage from "./pages/admin/MatchAdminPage"; import TournamentCodesPage from "./pages/admin/TournamentCodesPage"; +import { PlainPage, Tooltip, pageWidthClass } from "./ui"; + +const NAV_ICON_BUTTON_CLASS = + "grid size-9 place-items-center rounded-field text-on-ink-muted transition-colors hover:bg-white/10 hover:text-on-ink"; + +function BrandMark() { + return ( + + ); +} function MsalHeaderActions() { const { accounts, instance } = useMsal(); @@ -28,7 +46,7 @@ function MsalHeaderActions() { if (!account) { return ( 로그인 @@ -36,15 +54,24 @@ function MsalHeaderActions() { ); } + const name = account.name ?? account.username; + return ( - +
+ + {name} + + + + +
); } @@ -56,32 +83,117 @@ function ThemeToggle() { const Icon = nextTheme === "dark" ? Moon : Sun; return ( - + - + + ); +} + +function PrimaryNavLink({ + to, + end, + children, +}: { + to: string; + end?: boolean; + children: ReactNode; +}) { + return ( + + `relative inline-flex h-14 items-center px-3 text-sm font-semibold transition-colors ${ + isActive + ? "text-on-ink after:absolute after:inset-x-3 after:bottom-0 after:h-[3px] after:rounded-t-full after:bg-brand-coral" + : "text-on-ink-muted hover:text-on-ink" + }` + } + > + {children} + + ); +} + +function AppHeader() { + const communityQuery = useCommunity(DEFAULT_COMMUNITY_ID); + const meQuery = useMe(); + const communityLabel = communityQuery.data?.name ?? "LOLYMPUS"; + const role = meQuery.data?.memberships.find( + (membership) => membership.community?._id === DEFAULT_COMMUNITY_ID, + )?.user?.role; + const canManage = role === "owner" || role === "admin"; + + return ( +
+
+
+ + + + {communityLabel} + + + {DEFAULT_COMMUNITY_ID && ( + + )} +
+
+ + {isMsalConfigured && } +
+
+
); } function AppFooter() { return ( -