TDvorak/MyClub
1
0
Fork 0
mirror of https://github.com/Dvorinka/MyClubServer.git synced 2026-06-04 10:42:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dev day #65,5

Browse Source
This commit is contained in:
Tomas Dvorak
2025-10-20 10:40:55 +02:00
parent 9ccca365b3
commit 68e69e00cc
41 changed files with 981 additions and 1376 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/components/home/CompetitionMatches.tsx
+23 -7
View File
@@ -9,7 +9,7 @@ import { sortCategoriesWithOrder } from '../../utils/categorySort';
import { sanitizeClubName } from '../../utils/url';
import '../../styles/logos.css';
const Row: React.FC<{ d: string; h: string; hid?: string; hl?: string; a: string; aid?: string; al?: string; s?: string; clubName?: string }> = ({ d, h, hid, hl, a, aid, al, s, clubName }) => (
const Row: React.FC<{ d: string; h: string; hid?: string; hl?: string; a: string; aid?: string; al?: string; s?: string; clubName?: string; clubId?: string }> = ({ d, h, hid, hl, a, aid, al, s, clubName, clubId }) => (
<HStack justify="space-between" borderRadius="lg" p={3} bg="white" boxShadow="sm">
<Text w="140px" fontSize="sm" color="gray.600">{d}</Text>
<HStack flex={1} justify="flex-end" spacing={4}>
@@ -28,14 +28,30 @@ const Row: React.FC<{ d: string; h: string; hid?: string; hl?: string; a: string
<HStack minW="60px" justify="center" spacing={2}>
<Text fontWeight="bold" textAlign="center">{s || '-:-'}</Text>
{(() => {
if (!s || !clubName) return null;
if (!s) return null;
const m = s.match(/^(\d+)\s*[:\-]\s*(\d+)$/);
if (!m) return null;
const hG = parseInt(m[1], 10), aG = parseInt(m[2], 10);
const norm = (x: string) => String(x||'').normalize('NFD').replace(/[\u0300-\u036f]/g,'').replace(/\s+/g,' ').trim().toLowerCase();
const strip = (x: string) => norm(x).replace(/\b(mestsky|m\.?f\.?k\.?|mfk|tj|sk|sokol|fotbalovy|fotbalový|fotbalovy\s+klub|fotbalovy\s+klub)\b/g,'').replace(/\s+/g,' ').trim();
const ourHome = (() => { const A = strip(h); const B = strip(clubName); return A && B && (A===B || A.endsWith(B) || B.endsWith(A)); })();
const ourAway = (() => { const A = strip(a); const B = strip(clubName); return A && B && (A===B || A.endsWith(B) || B.endsWith(A)); })();
// First try ID-based matching (most reliable)
let ourHome = false;
let ourAway = false;
if (clubId && hid && aid) {
ourHome = hid === clubId;
ourAway = aid === clubId;
}
// Fallback to name matching if IDs not available or no match
if (!ourHome && !ourAway && clubName) {
const norm = (x: string) => String(x||'').normalize('NFD').replace(/[\u0300-\u036f]/g,'').replace(/\s+/g,' ').trim().toLowerCase();
const strip = (x: string) => norm(x).replace(/\b(mestsky|m\.?f\.?k\.?|mfk|tj|sk|sokol|fotbalovy|fotbalový|fotbalovy\s+klub|fotbalovy\s+klub)\b/g,'').replace(/\s+/g,' ').trim();
const A = strip(h);
const B = strip(clubName);
ourHome = Boolean(A && B && (A===B || A.endsWith(B) || B.endsWith(A)));
const C = strip(a);
ourAway = Boolean(C && B && (C===B || C.endsWith(B) || B.endsWith(C)));
}
if (!ourHome && !ourAway) return null;
if (hG === aG) return <Badge colorScheme="blue" variant="subtle">Remíza</Badge>;
const our = ourHome ? hG : aG; const opp = ourHome ? aG : hG;
@@ -135,7 +151,7 @@ const CompetitionMatches: React.FC = () => {
<TabPanel key={c.id} px={0}>
<VStack align="stretch" spacing={3}>
{(c.matches || []).slice(0, 6).map((m, idx) => (
<Row key={m.match_id || idx} d={m.date_time} h={m.home} hid={m.home_id} hl={m.home_logo_url} a={m.away} aid={m.away_id} al={m.away_logo_url} s={m.score} clubName={data.name} />
<Row key={m.match_id || idx} d={m.date_time} h={m.home} hid={m.home_id} hl={m.home_logo_url} a={m.away} aid={m.away_id} al={m.away_logo_url} s={m.score} clubName={data.name} clubId={data.club_internal_id} />
))}
{(c.matches || []).length === 0 && (
<Text color="gray.500">Žádné zápasy k dispozici.</Text>
frontend/src/components/home/MatchesSection.tsx
+24 -6
View File
@@ -12,7 +12,8 @@ const MatchRow: React.FC<{
away: { name: string; logo?: string; id?: string };
score?: string;
clubName?: string;
}> = ({ date, home, away, score, clubName }) => (
clubId?: string;
}> = ({ date, home, away, score, clubName, clubId }) => (
<HStack justify="space-between" borderWidth="1px" borderRadius="md" p={3} bg="white">
<Text w="140px" fontSize="sm" color="gray.600">{date}</Text>
<HStack flex={1} justify="flex-end">
@@ -32,14 +33,30 @@ const MatchRow: React.FC<{
<Text fontWeight="bold" textAlign="center">{score || '-:-'}</Text>
{(() => {
const sent = (() => {
if (!score || !clubName) return null;
if (!score) return null;
const m = score.match(/^(\d+)\s*[:\-]\s*(\d+)$/);
if (!m) return null;
const h = parseInt(m[1], 10), a = parseInt(m[2], 10);
const norm = (s: string) => String(s||'').normalize('NFD').replace(/[\u0300-\u036f]/g, '').replace(/\s+/g,' ').trim().toLowerCase();
const strip = (s: string) => norm(s).replace(/\b(mestsky|m\.?f\.?k\.?|mfk|tj|sk|sokol|fotbalovy|fotbalový|fotbalovy\s+klub|fotbalovy\s+klub)\b/g,'').replace(/\s+/g,' ').trim();
const ourIsHome = (() => { const aName = strip(home.name); const bName = strip(clubName); return aName && bName && (aName===bName || aName.endsWith(bName) || bName.endsWith(aName)); })();
const ourIsAway = (() => { const aName = strip(away.name); const bName = strip(clubName); return aName && bName && (aName===bName || aName.endsWith(bName) || bName.endsWith(aName)); })();
// First try ID-based matching (most reliable)
let ourIsHome = false;
let ourIsAway = false;
if (clubId && home.id && away.id) {
ourIsHome = home.id === clubId;
ourIsAway = away.id === clubId;
}
// Fallback to name matching if IDs not available or no match
if (!ourIsHome && !ourIsAway && clubName) {
const norm = (s: string) => String(s||'').normalize('NFD').replace(/[\u0300-\u036f]/g, '').replace(/\s+/g,' ').trim().toLowerCase();
const strip = (s: string) => norm(s).replace(/\b(mestsky|m\.?f\.?k\.?|mfk|tj|sk|sokol|fotbalovy|fotbalový|fotbalovy\s+klub|fotbalovy\s+klub)\b/g,'').replace(/\s+/g,' ').trim();
const aName = strip(home.name);
const bName = strip(clubName);
ourIsHome = Boolean(aName && bName && (aName===bName || aName.endsWith(bName) || bName.endsWith(aName)));
const cName = strip(away.name);
ourIsAway = Boolean(cName && bName && (cName===bName || cName.endsWith(bName) || bName.endsWith(cName)));
}
if (!ourIsHome && !ourIsAway) return null;
if (h === a) return { label: 'Remíza', color: 'blue' } as const;
const our = ourIsHome ? h : a; const opp = ourIsHome ? a : h;
@@ -100,6 +117,7 @@ const MatchesSection: React.FC = () => {
away={{ name: m.away, logo: m.away_logo_url, id: m.away_id }}
score={m.score}
clubName={data.name}
clubId={data.club_internal_id}
/>
))}
{(c.matches || []).length === 0 && (