Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 79dd9be11e | |||
| 08152fba51 | |||
| 9bfb890143 | |||
| 4fe47377d1 | |||
| c32239d557 | |||
| e3895d30b4 |
@@ -1,3 +1,17 @@
|
||||
## [0.1.16] - 2026-05-02
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Merge branch 'main' of https://git.notsosm.art/david/euchre_camp
|
||||
- feat: add bracket visualization for tournament schedule (#8)
|
||||
|
||||
## [0.1.15] - 2026-05-02
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Merge branch 'main' of https://git.notsosm.art/david/euchre_camp
|
||||
- feat: add view-as-role feature for site admins (#15)
|
||||
|
||||
## [0.1.14] - 2026-05-02
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
Feature: Bracket Visualization
|
||||
As a tournament admin
|
||||
I want to see a visual bracket of the tournament schedule
|
||||
So that I can track tournament progress at a glance
|
||||
|
||||
@happy-path @tournament @issue-8
|
||||
Scenario: Tournament admin views bracket with a generated schedule
|
||||
Given I am logged in as a tournament admin
|
||||
And a tournament exists with 4 teams
|
||||
When I go to the tournament schedule page
|
||||
And I click the "Generate Schedule" button
|
||||
Then I should see "Generated"
|
||||
When I go to the tournament detail page
|
||||
And I click the "Bracket" tab
|
||||
Then I should see "Tournament Bracket"
|
||||
And I should see "Round 1"
|
||||
And I should see "Round 2"
|
||||
And I should see "Round 3"
|
||||
And I should see bracket matchup cards
|
||||
|
||||
@happy-path @tournament @issue-8
|
||||
Scenario: Bracket shows team names in matchup cards
|
||||
Given I am logged in as a tournament admin
|
||||
And a tournament exists with 4 teams
|
||||
When I go to the tournament schedule page
|
||||
And I click the "Generate Schedule" button
|
||||
Then I should see "Generated"
|
||||
When I go to the tournament detail page
|
||||
And I click the "Bracket" tab
|
||||
Then I should see bracket matchup cards with team names
|
||||
|
||||
@happy-path @tournament @issue-8
|
||||
Scenario: Bracket tab is not visible without a schedule
|
||||
Given I am logged in as a tournament admin
|
||||
And a tournament exists with 4 teams
|
||||
When I go to the tournament detail page
|
||||
Then I should not see the "Bracket" tab
|
||||
@@ -0,0 +1,46 @@
|
||||
Feature: View As Role
|
||||
As a site admin
|
||||
I want to temporarily view the site as a player or club admin
|
||||
So that I can understand and improve the experience for each role
|
||||
|
||||
@happy-path @admin-features @issue-15
|
||||
Scenario: Site admin sees role switcher in navigation
|
||||
Given I am logged in as a site admin
|
||||
When I view the navigation
|
||||
Then I should see the role switcher dropdown
|
||||
Then the role switcher should default to "Viewing as Site Admin"
|
||||
|
||||
@happy-path @admin-features @issue-15
|
||||
Scenario: Site admin switches to player view
|
||||
Given I am logged in as a site admin
|
||||
When I select "View as Player" from the role switcher
|
||||
Then I should see the player navigation links
|
||||
And I should not see the "Admin" link
|
||||
And I should not see the "Users" link
|
||||
And I should see a banner indicating I am viewing as "Player"
|
||||
|
||||
@happy-path @admin-features @issue-15
|
||||
Scenario: Site admin switches to tournament admin view
|
||||
Given I am logged in as a site admin
|
||||
When I select "View as Tournament Admin" from the role switcher
|
||||
Then I should see the "Tournaments" link
|
||||
And I should not see the "Admin" link
|
||||
And I should not see the "Users" link
|
||||
And I should see a banner indicating I am viewing as "Tournament Admin"
|
||||
|
||||
@happy-path @admin-features @issue-15
|
||||
Scenario: Site admin switches to club admin view
|
||||
Given I am logged in as a site admin
|
||||
When I select "View as Club Admin" from the role switcher
|
||||
Then I should see the "Admin" link
|
||||
And I should see the "Users" link
|
||||
And I should see a banner indicating I am viewing as "Club Admin"
|
||||
|
||||
@happy-path @admin-features @issue-15
|
||||
Scenario: Site admin resets to site admin view
|
||||
Given I am logged in as a site admin
|
||||
When I select "View as Player" from the role switcher
|
||||
And I click the "Reset to Site Admin" button
|
||||
Then the role switcher should default to "Viewing as Site Admin"
|
||||
And I should see the "Admin" link
|
||||
And I should not see the viewing as banner
|
||||
@@ -158,6 +158,58 @@ Given('I am logged in as a tournament admin', async function () {
|
||||
console.log(`🌍 User created: ${credentials.email}`);
|
||||
});
|
||||
|
||||
/**
|
||||
* Precondition: I am logged in as a site admin
|
||||
* Creates a new user and assigns site_admin role via Prisma
|
||||
*/
|
||||
Given('I am logged in as a site admin', async function () {
|
||||
console.log('🌍 Creating and logging in as a site admin...');
|
||||
|
||||
const credentials = generateTestCredentials();
|
||||
world.user = credentials;
|
||||
|
||||
await world.page.goto(`${world.baseURL}/auth/register`);
|
||||
await world.page.waitForLoadState('domcontentloaded');
|
||||
|
||||
await world.page.fill('input[name="name"]', credentials.name);
|
||||
await world.page.fill('input[name="email"]', credentials.email);
|
||||
await world.page.fill('input[name="password"]', credentials.password);
|
||||
|
||||
await world.page.click('button[type="submit"]');
|
||||
await world.page.waitForURL(/\/players\/\d+\/profile/, { timeout: 15000 });
|
||||
|
||||
const currentUrl = world.page.url();
|
||||
const match = currentUrl.match(/\/players\/(\d+)\/profile/);
|
||||
if (match) {
|
||||
const playerId = match[1];
|
||||
world.playerId = playerId;
|
||||
|
||||
const prisma = await world.getPrisma();
|
||||
const player = await prisma.player.findUnique({
|
||||
where: { id: parseInt(playerId) },
|
||||
include: { user: true }
|
||||
});
|
||||
|
||||
if (player && player.user) {
|
||||
const userId = player.user.id;
|
||||
(world.user as any).id = userId;
|
||||
|
||||
await prisma.user.update({
|
||||
where: { id: userId },
|
||||
data: { role: 'site_admin' }
|
||||
});
|
||||
console.log(`🌍 Assigned site_admin role to user: ${userId}`);
|
||||
|
||||
// Navigate to home page to trigger Navigation re-mount with new role
|
||||
await world.page.goto(`${world.baseURL}/`);
|
||||
await world.page.waitForLoadState('networkidle');
|
||||
await world.page.waitForTimeout(1000);
|
||||
}
|
||||
}
|
||||
|
||||
console.log(`🌍 Site admin created: ${credentials.email}`);
|
||||
});
|
||||
|
||||
/**
|
||||
* Precondition: I am logged in as a club admin
|
||||
* Uses a pre-existing admin user from the database
|
||||
|
||||
@@ -690,3 +690,102 @@ Then('I should be on the match result entry page', async function () {
|
||||
console.log(`🌍 Checking current URL: ${currentUrl}`);
|
||||
expect(currentUrl).toMatch(/\/matches\/|\/admin\/tournaments\/\d+\/(entry|results)/);
|
||||
});
|
||||
|
||||
// View As Role Steps
|
||||
When('I view the navigation', async function () {
|
||||
await world.page.waitForLoadState('networkidle');
|
||||
await world.page.waitForTimeout(1000);
|
||||
console.log('🌍 Viewing navigation');
|
||||
});
|
||||
|
||||
Then('I should see the role switcher dropdown', async function () {
|
||||
const switcher = world.page.locator('[data-testid="role-switcher"]');
|
||||
await expect(switcher).toBeVisible({ timeout: 5000 });
|
||||
console.log('🌍 Verified role switcher dropdown is visible');
|
||||
});
|
||||
|
||||
Then('the role switcher should default to {string}', async function (expectedText: string) {
|
||||
const switcher = world.page.locator('[data-testid="role-switcher"]');
|
||||
const selectedValue = await switcher.inputValue();
|
||||
const selectedText = await switcher.locator('option:checked').textContent();
|
||||
console.log(`🌍 Dropdown selected text: "${selectedText}", value: "${selectedValue}"`);
|
||||
expect(selectedText?.trim()).toBe(expectedText);
|
||||
});
|
||||
|
||||
When('I select {string} from the role switcher', async function (optionText: string) {
|
||||
const switcher = world.page.locator('[data-testid="role-switcher"]');
|
||||
await switcher.selectOption({ label: optionText });
|
||||
await world.page.waitForTimeout(500);
|
||||
console.log(`🌍 Selected "${optionText}" from role switcher`);
|
||||
});
|
||||
|
||||
Then('I should see the player navigation links', async function () {
|
||||
await expect(world.page.locator('nav a:has-text("Rankings")')).toBeVisible();
|
||||
await expect(world.page.locator('nav a:has-text("Tournaments")')).toBeVisible();
|
||||
console.log('🌍 Verified player navigation links are visible');
|
||||
});
|
||||
|
||||
Then('I should not see the {string} link', async function (linkText: string) {
|
||||
const link = world.page.locator(`nav a:has-text("${linkText}")`);
|
||||
await expect(link).not.toBeVisible({ timeout: 3000 });
|
||||
console.log(`🌍 Verified "${linkText}" nav link is not visible`);
|
||||
});
|
||||
|
||||
Then('I should see the {string} link', async function (linkText: string) {
|
||||
const link = world.page.locator(`nav a:has-text("${linkText}")`);
|
||||
await expect(link).toBeVisible({ timeout: 5000 });
|
||||
console.log(`🌍 Verified "${linkText}" nav link is visible`);
|
||||
});
|
||||
|
||||
Then('I should see a banner indicating I am viewing as {string}', async function (roleName: string) {
|
||||
const banner = world.page.locator(`text=Viewing as ${roleName}`);
|
||||
await expect(banner).toBeVisible({ timeout: 5000 });
|
||||
console.log(`🌍 Verified viewing as ${roleName} banner is visible`);
|
||||
});
|
||||
|
||||
Then('I should not see the viewing as banner', async function () {
|
||||
const banner = world.page.locator('[data-testid="reset-view-as"]');
|
||||
await expect(banner).not.toBeVisible({ timeout: 3000 });
|
||||
console.log('🌍 Verified viewing as banner is not visible');
|
||||
});
|
||||
|
||||
// Bracket Visualization Steps
|
||||
When('I go to the tournament detail page', async function () {
|
||||
const tournamentId = world.tournament?.id || 1;
|
||||
await world.page.goto(`${world.baseURL}/admin/tournaments/${tournamentId}`);
|
||||
await world.page.waitForLoadState('networkidle');
|
||||
await world.page.waitForTimeout(500);
|
||||
console.log(`🌍 Navigated to tournament detail page: ${tournamentId}`);
|
||||
});
|
||||
|
||||
When('I click the {string} tab', async function (tabName: string) {
|
||||
const tab = world.page.locator(`button:has-text("${tabName}")`);
|
||||
await tab.click();
|
||||
await world.page.waitForTimeout(500);
|
||||
console.log(`🌍 Clicked "${tabName}" tab`);
|
||||
});
|
||||
|
||||
Then('I should see bracket matchup cards', async function () {
|
||||
const cards = world.page.locator('[data-testid="bracket-matchup"]');
|
||||
const count = await cards.count();
|
||||
expect(count).toBeGreaterThan(0);
|
||||
console.log(`🌍 Found ${count} bracket matchup cards`);
|
||||
});
|
||||
|
||||
Then('I should see bracket matchup cards with team names', async function () {
|
||||
const cards = world.page.locator('[data-testid="bracket-matchup"]');
|
||||
const count = await cards.count();
|
||||
expect(count).toBeGreaterThan(0);
|
||||
|
||||
const firstCard = cards.first();
|
||||
const text = await firstCard.textContent();
|
||||
expect(text).toBeTruthy();
|
||||
expect(text!.length).toBeGreaterThan(2);
|
||||
console.log(`🌍 Verified bracket matchup cards have team names`);
|
||||
});
|
||||
|
||||
Then('I should not see the {string} tab', async function (tabName: string) {
|
||||
const tab = world.page.locator(`button:has-text("${tabName}")`);
|
||||
await expect(tab).not.toBeVisible({ timeout: 3000 });
|
||||
console.log(`🌍 Verified "${tabName}" tab is not visible`);
|
||||
});
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "euchre_camp",
|
||||
"version": "0.1.14",
|
||||
"version": "0.1.16",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"dev": "NEXT_PUBLIC_GIT_COMMIT=$(git rev-parse --short HEAD) next dev",
|
||||
|
||||
@@ -7,6 +7,7 @@ import Navigation from "@/components/Navigation"
|
||||
import TeamsSection from "@/components/TeamsSection"
|
||||
import { DeleteTournamentButton } from "@/components/DeleteTournamentButton"
|
||||
import { ScheduleGenerator } from "@/components/ScheduleGenerator"
|
||||
import { BracketVisualization } from "@/components/BracketVisualization"
|
||||
import MatchEditor from "@/components/MatchEditor"
|
||||
|
||||
interface PageProps {
|
||||
@@ -420,6 +421,11 @@ export default function TournamentDetailPage({ params }: PageProps) {
|
||||
</div>
|
||||
)
|
||||
|
||||
case "bracket":
|
||||
return (
|
||||
<BracketVisualization rounds={rounds} />
|
||||
)
|
||||
|
||||
default:
|
||||
return null
|
||||
}
|
||||
@@ -555,6 +561,18 @@ export default function TournamentDetailPage({ params }: PageProps) {
|
||||
>
|
||||
Results
|
||||
</button>
|
||||
{hasSchedule && (
|
||||
<button
|
||||
onClick={() => setActiveTab("bracket")}
|
||||
className={`whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm ${
|
||||
activeTab === "bracket"
|
||||
? "border-green-500 text-green-600"
|
||||
: "border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300"
|
||||
}`}
|
||||
>
|
||||
Bracket
|
||||
</button>
|
||||
)}
|
||||
<span className="border-transparent text-gray-400 whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm cursor-not-allowed">
|
||||
Analytics
|
||||
</span>
|
||||
|
||||
+5
-2
@@ -1,6 +1,7 @@
|
||||
import type { Metadata } from "next";
|
||||
import "./globals.css";
|
||||
import { SessionProvider } from "@/components/SessionProvider";
|
||||
import { RoleSwitcherProvider } from "@/components/RoleSwitcher";
|
||||
import Footer from "@/components/Footer";
|
||||
|
||||
const inter = {
|
||||
@@ -24,8 +25,10 @@ export default function RootLayout({
|
||||
>
|
||||
<body className="min-h-full flex flex-col overflow-x-hidden">
|
||||
<SessionProvider>
|
||||
{children}
|
||||
<Footer />
|
||||
<RoleSwitcherProvider>
|
||||
{children}
|
||||
<Footer />
|
||||
</RoleSwitcherProvider>
|
||||
</SessionProvider>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -0,0 +1,168 @@
|
||||
"use client"
|
||||
|
||||
interface Player {
|
||||
id: number
|
||||
name: string
|
||||
}
|
||||
|
||||
interface BracketMatchup {
|
||||
id: number
|
||||
roundId: number
|
||||
player1P1: Player | null
|
||||
player1P2: Player | null
|
||||
player2P1: Player | null
|
||||
player2P2: Player | null
|
||||
match: { id: number; team1Score: number; team2Score: number } | null
|
||||
bracketPosition: number | null
|
||||
status: string
|
||||
}
|
||||
|
||||
interface TournamentRound {
|
||||
id: number
|
||||
roundNumber: number
|
||||
status: string
|
||||
bracketMatchups: BracketMatchup[]
|
||||
}
|
||||
|
||||
interface BracketVisualizationProps {
|
||||
rounds: TournamentRound[]
|
||||
}
|
||||
|
||||
export function BracketVisualization({ rounds }: BracketVisualizationProps) {
|
||||
if (rounds.length === 0) {
|
||||
return (
|
||||
<div className="bg-white shadow rounded-lg p-6">
|
||||
<p className="text-gray-500">No schedule generated yet. Generate a schedule to see the bracket.</p>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
const currentRoundIdx = rounds.findIndex(r => r.status === "in_progress")
|
||||
const completedRounds = rounds.filter(r => r.status === "completed").length
|
||||
|
||||
return (
|
||||
<div className="bg-white shadow rounded-lg p-6">
|
||||
<div className="flex items-center justify-between mb-6">
|
||||
<h2 className="text-lg font-semibold text-gray-900">Tournament Bracket</h2>
|
||||
<div className="flex items-center space-x-4 text-sm text-gray-500">
|
||||
<span>{rounds.length} rounds</span>
|
||||
<span>{completedRounds} completed</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="overflow-x-auto pb-4">
|
||||
<div
|
||||
className="inline-grid gap-4"
|
||||
style={{
|
||||
gridTemplateColumns: `repeat(${rounds.length}, minmax(200px, 1fr))`,
|
||||
minWidth: `${rounds.length * 220}px`,
|
||||
}}
|
||||
>
|
||||
{rounds.map((round, roundIdx) => {
|
||||
const isCurrent = roundIdx === currentRoundIdx
|
||||
const isCompleted = round.status === "completed"
|
||||
|
||||
return (
|
||||
<div key={round.id} className="flex flex-col">
|
||||
{/* Round Header */}
|
||||
<div
|
||||
className={`text-center py-2 px-3 rounded-t-lg font-medium text-sm ${
|
||||
isCurrent
|
||||
? "bg-green-100 text-green-800 border border-green-300"
|
||||
: isCompleted
|
||||
? "bg-gray-100 text-gray-600 border border-gray-200"
|
||||
: "bg-gray-50 text-gray-500 border border-gray-200"
|
||||
}`}
|
||||
>
|
||||
Round {round.roundNumber}
|
||||
{isCurrent && (
|
||||
<span className="ml-1 text-xs">(current)</span>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* Matchups */}
|
||||
<div className="flex flex-col gap-2 mt-2">
|
||||
{round.bracketMatchups
|
||||
.sort((a, b) => (a.bracketPosition || 0) - (b.bracketPosition || 0))
|
||||
.map((matchup) => (
|
||||
<MatchupCard key={matchup.id} matchup={matchup} isCurrentRound={isCurrent} />
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
})}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
function MatchupCard({ matchup, isCurrentRound }: { matchup: BracketMatchup; isCurrentRound: boolean }) {
|
||||
const team1Name = matchup.player1P1 && matchup.player1P2
|
||||
? `${matchup.player1P1.name.split(" ").pop()} & ${matchup.player1P2.name.split(" ").pop()}`
|
||||
: "TBD"
|
||||
const team2Name = matchup.player2P1 && matchup.player2P2
|
||||
? `${matchup.player2P1.name.split(" ").pop()} & ${matchup.player2P2.name.split(" ").pop()}`
|
||||
: "TBD"
|
||||
|
||||
const hasResult = matchup.match !== null
|
||||
const team1Won = hasResult && matchup.match!.team1Score > matchup.match!.team2Score
|
||||
const team2Won = hasResult && matchup.match!.team2Score > matchup.match!.team1Score
|
||||
|
||||
const borderColor = isCurrentRound
|
||||
? "border-green-400"
|
||||
: hasResult
|
||||
? "border-gray-300"
|
||||
: "border-gray-200"
|
||||
|
||||
return (
|
||||
<div
|
||||
className={`border rounded-md p-2 text-xs transition-colors ${borderColor} ${
|
||||
isCurrentRound ? "shadow-sm" : ""
|
||||
}`}
|
||||
data-testid="bracket-matchup"
|
||||
>
|
||||
{/* Team 1 */}
|
||||
<div
|
||||
className={`flex justify-between items-center py-1 px-1 ${
|
||||
team1Won ? "font-semibold" : ""
|
||||
}`}
|
||||
>
|
||||
<span className={`truncate ${team1Won ? "text-green-700" : "text-gray-700"}`}>
|
||||
{team1Name}
|
||||
</span>
|
||||
{hasResult && (
|
||||
<span className={`ml-1 font-mono ${team1Won ? "text-green-700" : "text-gray-500"}`}>
|
||||
{matchup.match!.team1Score}
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* Divider */}
|
||||
<div className="border-t border-gray-200 my-0.5" />
|
||||
|
||||
{/* Team 2 */}
|
||||
<div
|
||||
className={`flex justify-between items-center py-1 px-1 ${
|
||||
team2Won ? "font-semibold" : ""
|
||||
}`}
|
||||
>
|
||||
<span className={`truncate ${team2Won ? "text-green-700" : "text-gray-700"}`}>
|
||||
{team2Name}
|
||||
</span>
|
||||
{hasResult && (
|
||||
<span className={`ml-1 font-mono ${team2Won ? "text-green-700" : "text-gray-500"}`}>
|
||||
{matchup.match!.team2Score}
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* Status indicator */}
|
||||
{!hasResult && matchup.status === "pending" && (
|
||||
<div className="text-center text-gray-400 text-[10px] mt-1">
|
||||
pending
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
+138
-96
@@ -4,12 +4,13 @@ import Link from "next/link"
|
||||
import { useSession } from "./SessionProvider"
|
||||
import { authClient } from "@/lib/auth-client"
|
||||
import { useEffect, useState } from "react"
|
||||
import { useRoleSwitcher } from "./RoleSwitcher"
|
||||
|
||||
export default function Navigation() {
|
||||
const { session, loading } = useSession()
|
||||
const [userRole, setUserRole] = useState<string | null>(null)
|
||||
const { viewAsRole, setViewAsRole, effectiveRole } = useRoleSwitcher()
|
||||
|
||||
// Fetch user role whenever session changes
|
||||
useEffect(() => {
|
||||
const fetchUserRole = async () => {
|
||||
const userId = (session?.user as { id?: string })?.id
|
||||
@@ -34,117 +35,158 @@ export default function Navigation() {
|
||||
}, [session])
|
||||
|
||||
const handleLogout = async () => {
|
||||
setViewAsRole(null)
|
||||
await authClient.signOut()
|
||||
window.location.href = '/auth/login'
|
||||
}
|
||||
|
||||
// Determine wordmark href based on session and role
|
||||
// If session exists but role is not yet loaded, use /rankings as default for players
|
||||
const wordmarkHref = session
|
||||
? (userRole === "club_admin" || userRole === "site_admin")
|
||||
? "/admin"
|
||||
const displayRole = effectiveRole || userRole
|
||||
const isSiteAdmin = userRole === "site_admin"
|
||||
|
||||
const wordmarkHref = session
|
||||
? (displayRole === "club_admin" || displayRole === "site_admin")
|
||||
? "/admin"
|
||||
: "/rankings"
|
||||
: "/";
|
||||
: "/"
|
||||
|
||||
const roleLabels: Record<string, string> = {
|
||||
player: "Player",
|
||||
tournament_admin: "Tournament Admin",
|
||||
club_admin: "Club Admin",
|
||||
site_admin: "Site Admin",
|
||||
}
|
||||
|
||||
return (
|
||||
<nav className="bg-white shadow-sm">
|
||||
<div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
|
||||
<div className="flex justify-between h-16">
|
||||
<div className="flex items-center min-w-0 overflow-hidden">
|
||||
<Link
|
||||
href="/"
|
||||
className="text-xl font-bold text-gray-900 no-underline flex-shrink-0"
|
||||
<>
|
||||
{viewAsRole && (
|
||||
<div className="bg-yellow-50 border-b border-yellow-200 px-4 py-2">
|
||||
<div className="max-w-7xl mx-auto flex items-center justify-between">
|
||||
<p className="text-sm text-yellow-800">
|
||||
<span className="font-medium">Viewing as {roleLabels[viewAsRole]}</span>
|
||||
{" "}— you are seeing what a {roleLabels[viewAsRole]?.toLowerCase()} would see.
|
||||
</p>
|
||||
<button
|
||||
onClick={() => setViewAsRole(null)}
|
||||
className="text-sm font-medium text-yellow-800 hover:text-yellow-900 underline"
|
||||
data-testid="reset-view-as"
|
||||
>
|
||||
EuchreCamp
|
||||
</Link>
|
||||
<div className="hidden md:ml-6 md:flex md:space-x-8 min-w-0 overflow-hidden">
|
||||
Reset to Site Admin
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
<nav className="bg-white shadow-sm">
|
||||
<div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
|
||||
<div className="flex justify-between h-16">
|
||||
<div className="flex items-center min-w-0 overflow-hidden">
|
||||
<Link
|
||||
href="/rankings"
|
||||
className="border-transparent text-gray-500 hover:text-gray-700 inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium"
|
||||
href="/"
|
||||
className="text-xl font-bold text-gray-900 no-underline flex-shrink-0"
|
||||
>
|
||||
Rankings
|
||||
EuchreCamp
|
||||
</Link>
|
||||
{session && (
|
||||
<>
|
||||
<Link
|
||||
href="/admin/tournaments"
|
||||
className="border-transparent text-gray-500 hover:text-gray-700 inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium"
|
||||
<div className="hidden md:ml-6 md:flex md:space-x-8 min-w-0 overflow-hidden">
|
||||
<Link
|
||||
href="/rankings"
|
||||
className="border-transparent text-gray-500 hover:text-gray-700 inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium"
|
||||
>
|
||||
Rankings
|
||||
</Link>
|
||||
{session && (
|
||||
<>
|
||||
<Link
|
||||
href="/admin/tournaments"
|
||||
className="border-transparent text-gray-500 hover:text-gray-700 inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium"
|
||||
>
|
||||
Tournaments
|
||||
</Link>
|
||||
{(displayRole === "club_admin" || displayRole === "site_admin") && (
|
||||
<>
|
||||
<Link
|
||||
href="/admin"
|
||||
className="border-transparent text-gray-500 hover:text-gray-700 inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium"
|
||||
>
|
||||
Admin
|
||||
</Link>
|
||||
<Link
|
||||
href="/admin/matches"
|
||||
className="border-transparent text-gray-500 hover:text-gray-700 inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium"
|
||||
>
|
||||
Matches
|
||||
</Link>
|
||||
<Link
|
||||
href="/admin/players"
|
||||
className="border-transparent text-gray-500 hover:text-gray-700 inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium"
|
||||
>
|
||||
Players
|
||||
</Link>
|
||||
<Link
|
||||
href="/admin/users"
|
||||
className="border-transparent text-gray-500 hover:text-gray-700 inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium"
|
||||
>
|
||||
Users
|
||||
</Link>
|
||||
<Link
|
||||
href="/admin/matches/upload"
|
||||
className="border-transparent text-gray-500 hover:text-gray-700 inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium"
|
||||
>
|
||||
Upload Matches
|
||||
</Link>
|
||||
</>
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
<div className="flex items-center min-w-0 overflow-hidden space-x-4">
|
||||
{isSiteAdmin && (
|
||||
<select
|
||||
value={viewAsRole || ""}
|
||||
onChange={(e) => setViewAsRole(e.target.value ? e.target.value as "player" | "tournament_admin" | "club_admin" : null)}
|
||||
className="text-sm border border-gray-300 rounded-md px-2 py-1 bg-white text-gray-700 focus:outline-none focus:ring-green-500 focus:border-green-500"
|
||||
data-testid="role-switcher"
|
||||
>
|
||||
<option value="">Viewing as Site Admin</option>
|
||||
<option value="player">View as Player</option>
|
||||
<option value="tournament_admin">View as Tournament Admin</option>
|
||||
<option value="club_admin">View as Club Admin</option>
|
||||
</select>
|
||||
)}
|
||||
{loading ? (
|
||||
<div className="text-gray-500">Loading...</div>
|
||||
) : session ? (
|
||||
<div className="flex items-center space-x-4">
|
||||
<span className="text-gray-700 text-sm font-medium">
|
||||
{(session.user as { name?: string; email?: string })?.name ||
|
||||
(session.user as { name?: string; email?: string })?.email}
|
||||
</span>
|
||||
<button
|
||||
onClick={handleLogout}
|
||||
className="text-gray-500 hover:text-gray-700 text-sm font-medium"
|
||||
>
|
||||
Tournaments
|
||||
Sign out
|
||||
</button>
|
||||
</div>
|
||||
) : (
|
||||
<div className="flex items-center space-x-4">
|
||||
<Link
|
||||
href="/auth/login"
|
||||
className="text-gray-500 hover:text-gray-700 text-sm font-medium"
|
||||
>
|
||||
Sign in
|
||||
</Link>
|
||||
{(userRole === "club_admin" || userRole === "site_admin") && (
|
||||
<>
|
||||
<Link
|
||||
href="/admin"
|
||||
className="border-transparent text-gray-500 hover:text-gray-700 inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium"
|
||||
>
|
||||
Admin
|
||||
</Link>
|
||||
<Link
|
||||
href="/admin/matches"
|
||||
className="border-transparent text-gray-500 hover:text-gray-700 inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium"
|
||||
>
|
||||
Matches
|
||||
</Link>
|
||||
<Link
|
||||
href="/admin/players"
|
||||
className="border-transparent text-gray-500 hover:text-gray-700 inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium"
|
||||
>
|
||||
Players
|
||||
</Link>
|
||||
<Link
|
||||
href="/admin/users"
|
||||
className="border-transparent text-gray-500 hover:text-gray-700 inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium"
|
||||
>
|
||||
Users
|
||||
</Link>
|
||||
<Link
|
||||
href="/admin/matches/upload"
|
||||
className="border-transparent text-gray-500 hover:text-gray-700 inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium"
|
||||
>
|
||||
Upload Matches
|
||||
</Link>
|
||||
</>
|
||||
)}
|
||||
</>
|
||||
<Link
|
||||
href="/auth/register"
|
||||
className="bg-green-600 text-white px-3 py-1 rounded-md text-sm font-medium hover:bg-green-700"
|
||||
>
|
||||
Sign up
|
||||
</Link>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
<div className="flex items-center min-w-0 overflow-hidden">
|
||||
{loading ? (
|
||||
<div className="text-gray-500">Loading...</div>
|
||||
) : session ? (
|
||||
<div className="flex items-center space-x-4">
|
||||
<span className="text-gray-700 text-sm font-medium">
|
||||
{(session.user as { name?: string; email?: string })?.name ||
|
||||
(session.user as { name?: string; email?: string })?.email}
|
||||
</span>
|
||||
<button
|
||||
onClick={handleLogout}
|
||||
className="text-gray-500 hover:text-gray-700 text-sm font-medium"
|
||||
>
|
||||
Sign out
|
||||
</button>
|
||||
</div>
|
||||
) : (
|
||||
<div className="flex items-center space-x-4">
|
||||
<Link
|
||||
href="/auth/login"
|
||||
className="text-gray-500 hover:text-gray-700 text-sm font-medium"
|
||||
>
|
||||
Sign in
|
||||
</Link>
|
||||
<Link
|
||||
href="/auth/register"
|
||||
className="bg-green-600 text-white px-3 py-1 rounded-md text-sm font-medium hover:bg-green-700"
|
||||
>
|
||||
Sign up
|
||||
</Link>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
</nav>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
"use client"
|
||||
|
||||
import { createContext, useContext, useState, useCallback, ReactNode } from "react"
|
||||
|
||||
type ViewAsRole = "player" | "tournament_admin" | "club_admin" | null
|
||||
|
||||
interface RoleSwitcherContextType {
|
||||
viewAsRole: ViewAsRole
|
||||
setViewAsRole: (role: ViewAsRole) => void
|
||||
effectiveRole: string | null
|
||||
}
|
||||
|
||||
const RoleSwitcherContext = createContext<RoleSwitcherContextType | undefined>(undefined)
|
||||
|
||||
export function RoleSwitcherProvider({ children }: { children: ReactNode }) {
|
||||
const [viewAsRole, setViewAsRole] = useState<ViewAsRole>(null)
|
||||
|
||||
const value = {
|
||||
viewAsRole,
|
||||
setViewAsRole: useCallback((role: ViewAsRole) => setViewAsRole(role), []),
|
||||
effectiveRole: viewAsRole,
|
||||
}
|
||||
|
||||
return (
|
||||
<RoleSwitcherContext.Provider value={value}>
|
||||
{children}
|
||||
</RoleSwitcherContext.Provider>
|
||||
)
|
||||
}
|
||||
|
||||
export function useRoleSwitcher() {
|
||||
const context = useContext(RoleSwitcherContext)
|
||||
if (!context) {
|
||||
throw new Error("useRoleSwitcher must be used within RoleSwitcherProvider")
|
||||
}
|
||||
return context
|
||||
}
|
||||
Reference in New Issue
Block a user