From 9b8e266f88ad3dab0076ce39487fe529cf438b00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Kr=C3=BCger?= Date: Sun, 14 Jun 2026 21:07:56 +0200 Subject: [PATCH] feat: team pages with match/tournament history, mobile padding fixes, linked scorers and nations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Team page: add Tournament Participations (year pills → /tournaments/[year]) and Match History (grouped by year, W/D/L badge, opponent, score from team's perspective, PSO/AET annotations, each row → match anchor) - GraphQL: extend matches() query with teamId filter (OR team1_id/team2_id) - Match card: link team names to /teams/[slug]; fix ET score display — show scoreEt as headline for AET matches, scoreFt as footnote; winner determination uses scoreP ?? scoreEt ?? scoreFt - Tournament page: scorer names below each match linked to /players/[name] with dotted underline (solid + green on hover) - Stats page: reduce mobile padding on Goals chart, Top Scorers, Titles, Goals by Minute — hide progress bars and trophy emojis on small screens - Homepage: Golden Boot Race same mobile padding/bar treatment; add slug to match team queries Co-Authored-By: Claude Sonnet 4.6 --- app/favicon.ico | Bin 25931 -> 0 bytes app/globals.css | 2 + app/page.tsx | 16 ++--- app/stats/page.tsx | 48 +++++++------ app/teams/[slug]/page.tsx | 121 ++++++++++++++++++++++++++++++-- app/tournaments/[year]/page.tsx | 16 +++-- components/match-card.tsx | 79 ++++++++++++--------- lib/graphql/resolvers/index.ts | 3 +- lib/graphql/schema.ts | 2 +- 9 files changed, 210 insertions(+), 77 deletions(-) delete mode 100644 app/favicon.ico diff --git a/app/favicon.ico b/app/favicon.ico deleted file mode 100644 index 718d6fea4835ec2d246af9800eddb7ffb276240c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25931 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 LrJugUA?W`A8`#=m diff --git a/app/globals.css b/app/globals.css index aaec121..18c4300 100644 --- a/app/globals.css +++ b/app/globals.css @@ -1,6 +1,8 @@ @import "tailwindcss"; @import "flag-icons/css/flag-icons.min.css"; +@custom-variant hover (&:hover); + @theme { --color-bg: #040d08; --color-card: #0a1810; diff --git a/app/page.tsx b/app/page.tsx index bac34b7..1387567 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -11,15 +11,15 @@ const HOME_QUERY = gql` tournamentStats { totalTournaments totalMatches totalGoals avgGoalsPerGame } liveMatches { id year round group date time isLive scoreFt scoreEt scoreP isQualiPlayoff - team1 { name iso2 } team2 { name iso2 } + team1 { name iso2 slug } team2 { name iso2 slug } } recentMatches(limit: 9) { id year round group date time isLive isQualiPlayoff scoreFt scoreEt scoreP - team1 { name iso2 } team2 { name iso2 } + team1 { name iso2 slug } team2 { name iso2 slug } } upcomingMatches(limit: 9) { id year round group date time isLive isQualiPlayoff scoreFt - team1 { name iso2 } team2 { name iso2 } + team1 { name iso2 slug } team2 { name iso2 slug } } topScorers(year: 2026, limit: 8) { playerName goals penalties ownGoals @@ -80,8 +80,8 @@ interface MatchData { id: number; year: number; round: string; group?: string | null date?: string | null; time?: string | null; isLive: boolean; isQualiPlayoff: boolean scoreFt?: number[] | null; scoreEt?: number[] | null; scoreP?: number[] | null - team1: { name: string; iso2?: string | null } - team2: { name: string; iso2?: string | null } + team1: { name: string; iso2?: string | null; slug?: string | null } + team2: { name: string; iso2?: string | null; slug?: string | null } } export default function HomePage() { @@ -185,15 +185,15 @@ export default function HomePage() {
{scorers.map((s, i) => ( -
{i + 1} {s.team && }
{s.playerName}
-
{s.team?.name}{s.penalties > 0 ? ` · ${s.penalties}P` : ''}
+
{s.team?.name}{s.penalties > 0 ? ` · ${s.penalties}P` : ''}
-
+
{s.goals} diff --git a/app/stats/page.tsx b/app/stats/page.tsx index 848c122..07dd88e 100644 --- a/app/stats/page.tsx +++ b/app/stats/page.tsx @@ -94,14 +94,14 @@ export default function StatsPage() {
⚽ Goals Scored per Tournament -
-
+
+
{tournaments.map(t => { const h = Math.max(4, Math.round(((t.totalGoals ?? 0) / maxGoals) * 140)) const avg = t.avgGoalsPerGame ? Number(t.avgGoalsPerGame).toFixed(1) : null return ( - -
{t.totalGoals}
+ +
{t.totalGoals}
-
+
{tournaments.map(t => (
{t.year} @@ -129,15 +129,15 @@ export default function StatsPage() { {scorers.map((s, i) => ( -
{i + 1} {s.team && }
{s.playerName}
-
{s.team?.name} · {s.tournaments} WC{s.tournaments !== 1 ? 's' : ''}{s.penalties > 0 ? ` · ${s.penalties}P` : ''}
+
{s.team?.name} · {s.tournaments} WC{s.tournaments !== 1 ? 's' : ''}{s.penalties > 0 ? ` · ${s.penalties}P` : ''}
-
+
{s.goals} @@ -153,12 +153,12 @@ export default function StatsPage() { {titlesByNation.map((t, i) => ( -
{i + 1} -
{t.name}
-
+
{t.name}
+
{Array.from({ length: t.stats?.titles ?? 0 }).map((_, j) => ( 🏆 ))} @@ -175,18 +175,20 @@ export default function StatsPage() { {minuteBuckets.length > 0 && (
⏱ Goals by Minute (All-Time) - -
- {minuteBuckets.map(b => { - const h = Math.max(8, Math.round((b.count / maxMinute) * 80)) - return ( -
- {b.count} -
- {b.bucket} -
- ) - })} + +
+
+ {minuteBuckets.map(b => { + const h = Math.max(8, Math.round((b.count / maxMinute) * 80)) + return ( +
+ {b.count} +
+ {b.bucket} +
+ ) + })} +
diff --git a/app/teams/[slug]/page.tsx b/app/teams/[slug]/page.tsx index 50911c3..c25dc50 100644 --- a/app/teams/[slug]/page.tsx +++ b/app/teams/[slug]/page.tsx @@ -3,7 +3,6 @@ import { useQuery, gql } from '@/lib/graphql/hooks' import { use, useEffect } from 'react' import Link from 'next/link' import { TeamFlag } from '@/components/team-flag' -import { MatchCard } from '@/components/match-card' const TEAM_QUERY = gql` query Team($slug: String!) { @@ -14,10 +13,10 @@ const TEAM_QUERY = gql` } ` const TEAM_MATCHES_QUERY = gql` - query TeamMatches($teamName: String!) { - topScorers(limit: 100) { - playerName goals penalties ownGoals tournaments - team { name iso2 } + query TeamMatches($teamId: Int!) { + matches(teamId: $teamId, isQuali: false) { + id year round group date isLive scoreFt scoreEt scoreP + team1 { name iso2 slug } team2 { name iso2 slug } } } ` @@ -31,6 +30,18 @@ interface TeamData { } | null } +interface MatchRow { + id: number; year: number; round: string; group?: string | null + date?: string | null; isLive: boolean + scoreFt?: number[] | null; scoreEt?: number[] | null; scoreP?: number[] | null + team1: { name: string; iso2?: string | null; slug?: string | null } + team2: { name: string; iso2?: string | null; slug?: string | null } +} + +function formatDate(d: string) { + return new Date(d).toLocaleDateString('en-GB', { day: 'numeric', month: 'short' }) +} + export default function TeamPage({ params }: { params: Promise<{ slug: string }> }) { const { slug } = use(params) const { data: teamData, loading } = useQuery(TEAM_QUERY, { variables: { slug } }) @@ -40,6 +51,11 @@ export default function TeamPage({ params }: { params: Promise<{ slug: string }> document.title = team ? `${team.name} · World Cup` : 'Team · World Cup' }, [team]) + const { data: matchesData } = useQuery(TEAM_MATCHES_QUERY, { + variables: { teamId: team?.id }, + skip: !team?.id, + }) + // Load all scorers to filter by team const { data: scorerData } = useQuery(gql` query TeamScorers { @@ -52,6 +68,14 @@ export default function TeamPage({ params }: { params: Promise<{ slug: string }> const allScorers = scorerData?.topScorers ?? [] const teamScorers = team ? allScorers.filter((s: { team?: { id: number } | null }) => s.team?.id === team.id).slice(0, 15) : [] + const teamMatches: MatchRow[] = matchesData?.matches ?? [] + + // Group matches by year for the history display + const matchesByYear = teamMatches.reduce((acc: Record, m) => { + ;(acc[m.year] ??= []).push(m) + return acc + }, {}) + const years = Object.keys(matchesByYear).map(Number).sort((a, b) => b - a) if (loading && !teamData) { return
Loading team…
@@ -130,6 +154,93 @@ export default function TeamPage({ params }: { params: Promise<{ slug: string }>
)} + + {/* Tournament participations */} + {years.length > 0 && ( +
+

Tournament Participations

+
+ {years.map(year => ( + + {year} + + ))} +
+
+ )} + + {/* Match history by year */} + {years.length > 0 && ( +
+

Match History

+
+ {years.map(year => { + const yMatches = matchesByYear[year] + return ( +
+ + {year} + +
+ {yMatches.map((m, i) => { + const isHome = m.team1.name === team.name + const opponent = isHome ? m.team2 : m.team1 + const ft = m.scoreFt + const scoreEt = m.scoreEt + const scoreP = m.scoreP + // Winner: PSO first, then ET, then FT + const decisive = scoreP ?? scoreEt ?? ft + const myScore = decisive ? (isHome ? decisive[0] : decisive[1]) : null + const theirScore = decisive ? (isHome ? decisive[1] : decisive[0]) : null + const result = myScore != null && theirScore != null + ? myScore > theirScore ? 'W' : myScore < theirScore ? 'L' : 'D' + : null + const resultColor = result === 'W' ? 'text-[#22c55e]' : result === 'L' ? 'text-[#ef4444]' : 'text-[#6abf7a]' + // Display the decisive score (ET score for AET matches, FT for normal, PSO for shootouts) + const displayScore = scoreP ? null : (scoreEt ?? ft) + return ( + +
+ {result ?? '–'} + +
+
{opponent.name}
+
+ {m.round}{m.group ? ` · ${m.group}` : ''}{m.date ? ` · ${formatDate(m.date)}` : ''} +
+
+
+
+ {scoreP + ? `${isHome ? scoreP[0] : scoreP[1]}–${isHome ? scoreP[1] : scoreP[0]}` + : displayScore + ? `${isHome ? displayScore[0] : displayScore[1]}–${isHome ? displayScore[1] : displayScore[0]}` + : '–'} +
+ {scoreP && ft && ( +
+ {`${isHome ? ft[0] : ft[1]}–${isHome ? ft[1] : ft[0]}`} a.e.t. +
+ )} + {scoreEt && !scoreP && ( +
a.e.t.
+ )} +
+
+ + ) + })} +
+
+ ) + })} +
+
+ )}
{/* Sidebar: top scorers */} diff --git a/app/tournaments/[year]/page.tsx b/app/tournaments/[year]/page.tsx index 442cefa..f967f61 100644 --- a/app/tournaments/[year]/page.tsx +++ b/app/tournaments/[year]/page.tsx @@ -49,12 +49,20 @@ function GoalList({ match }: { match: MatchData }) { if (!match.goals?.length) return null const t1Goals = match.goals.filter(g => !g.isOwnGoal ? g.team.id === match.team1.id : g.team.id !== match.team1.id) const t2Goals = match.goals.filter(g => !g.isOwnGoal ? g.team.id === match.team2.id : g.team.id !== match.team2.id) - const renderGoal = (g: MatchData['goals'][0]) => - `${g.playerName} ${g.minute ?? ''}${g.minuteOffset ? `+${g.minuteOffset}` : ''}'${g.isPenalty ? ' (P)' : g.isOwnGoal ? ' (OG)' : ''}` + const renderGoal = (g: MatchData['goals'][0], i: number) => ( + + {i > 0 && ,} + + {g.playerName} + + {' '}{g.minute ?? ''}{g.minuteOffset ? `+${g.minuteOffset}` : ''}'{g.isPenalty ? ' (P)' : g.isOwnGoal ? ' (OG)' : ''} + + ) return (
-
{t1Goals.map(renderGoal).join(', ')}
-
{t2Goals.map(renderGoal).join(', ')}
+
{t1Goals.map(renderGoal)}
+
{t2Goals.map(renderGoal)}
) } diff --git a/components/match-card.tsx b/components/match-card.tsx index 6d13fe3..74680d2 100644 --- a/components/match-card.tsx +++ b/components/match-card.tsx @@ -2,7 +2,7 @@ import Link from 'next/link' import { TeamFlag } from './team-flag' import { LiveBadge } from './live-badge' -interface Team { name: string; iso2?: string | null } +interface Team { name: string; iso2?: string | null; slug?: string | null } interface Match { id: number year: number @@ -25,8 +25,8 @@ function formatDate(d: string) { export function MatchCard({ match, compact = false }: { match: Match; compact?: boolean }) { const ft = match.scoreFt const hasScore = ft != null - // Penalty score determines the winner when present - const decisive = match.scoreP ?? ft + // Winner: penalties first, then ET, then FT + const decisive = match.scoreP ?? match.scoreEt ?? ft const winner = decisive ? (decisive[0] > decisive[1] ? 'home' : decisive[0] < decisive[1] ? 'away' : 'draw') : null if (compact) { @@ -48,7 +48,9 @@ export function MatchCard({ match, compact = false }: { match: Match; compact?: {hasScore ? match.scoreP ? `${match.scoreP[0]} – ${match.scoreP[1]}` - : `${ft![0]} – ${ft![1]}` + : match.scoreEt + ? `${match.scoreEt[0]} – ${match.scoreEt[1]}` + : `${ft![0]} – ${ft![1]}` : match.isLive ? : '–'}
{match.scoreP && ( @@ -56,6 +58,9 @@ export function MatchCard({ match, compact = false }: { match: Match; compact?: {ft![0]}–{ft![1]} a.e.t.
)} + {match.scoreEt && !match.scoreP && ( +
a.e.t.
+ )}
@@ -72,42 +77,46 @@ export function MatchCard({ match, compact = false }: { match: Match; compact?: ) } + const matchHref = `/tournaments/${match.year}#match-${match.id}` + return ( - -
- {match.isLive &&
} -
-
- -
- {match.team1.name} -
+
+ {match.isLive &&
} +
+ + +
+ {match.team1.name}
-
-
- {hasScore - ? match.scoreP - ? `${match.scoreP[0]}–${match.scoreP[1]}` + + +
+ {hasScore + ? match.scoreP + ? `${match.scoreP[0]}–${match.scoreP[1]}` + : match.scoreEt + ? `${match.scoreEt[0]}–${match.scoreEt[1]}` : `${ft![0]}–${ft![1]}` - : '?–?'} -
- {match.scoreP && ( -
{ft![0]}–{ft![1]} a.e.t.
- )} - {match.scoreEt && !match.scoreP && ( -
a.e.t.
- )} -
{match.round}
-
{match.date ? formatDate(match.date) : ''}
+ : '?–?'}
-
- -
- {match.team2.name} -
+ {match.scoreP && ( +
{ft![0]}–{ft![1]} a.e.t.
+ )} + {match.scoreEt && !match.scoreP && ( +
{ft![0]}–{ft![1]} (a.e.t.)
+ )} +
{match.round}
+
{match.date ? formatDate(match.date) : ''}
+ + + +
+ {match.team2.name}
-
+
- +
) } diff --git a/lib/graphql/resolvers/index.ts b/lib/graphql/resolvers/index.ts index bad88d7..902b6f9 100644 --- a/lib/graphql/resolvers/index.ts +++ b/lib/graphql/resolvers/index.ts @@ -81,13 +81,14 @@ export const resolvers = { return { ...rows[0], avgGoalsPerGame: rows[0].avgGoalsPerGame ? parseFloat(rows[0].avgGoalsPerGame) : null } } catch (e) { if (isMissingTable(e)) return null; throw e } }, - async matches(_: unknown, args: { year?: number; group?: string; round?: string; isQuali?: boolean }) { + async matches(_: unknown, args: { year?: number; group?: string; round?: string; isQuali?: boolean; teamId?: number }) { try { const conditions = [] if (args.year) conditions.push(eq(matches.tournamentYear, args.year)) if (args.group) conditions.push(eq(matches.groupName, args.group)) if (args.round) conditions.push(eq(matches.round, args.round)) if (args.isQuali != null) conditions.push(eq(matches.isQualiPlayoff, args.isQuali)) + if (args.teamId) conditions.push(or(eq(matches.team1Id, args.teamId), eq(matches.team2Id, args.teamId))!) const rows = await db.select().from(matches) .where(conditions.length > 0 ? and(...conditions) : undefined) .orderBy(asc(matches.date), asc(matches.id)) diff --git a/lib/graphql/schema.ts b/lib/graphql/schema.ts index cb56b21..3794cd9 100644 --- a/lib/graphql/schema.ts +++ b/lib/graphql/schema.ts @@ -161,7 +161,7 @@ export const typeDefs = /* GraphQL */ ` tournaments: [Tournament!]! tournament(year: Int!): Tournament - matches(year: Int, group: String, round: String, isQuali: Boolean): [Match!]! + matches(year: Int, group: String, round: String, isQuali: Boolean, teamId: Int): [Match!]! match(id: Int!): Match liveMatches: [Match!]! recentMatches(limit: Int): [Match!]!