Compare commits

...

11 Commits

Author SHA1 Message Date
Vaka.pro
85aff823fc feat: add mobile race list tabs
Some checks failed
CI / build-and-test (pull_request) Has been cancelled
2026-05-24 14:10:09 +03:00
13dd8fa426 Merge pull request 'fix: remove fallback image from dashboard race hero' (#35) from fix/dashboard-hero-background-layering into main
Some checks failed
CI / build-and-test (push) Has been cancelled
Reviewed-on: #35
2026-04-27 21:40:55 +00:00
Vaka.pro
f62be600cd fix: remove fallback image from dashboard race hero
Some checks failed
CI / build-and-test (pull_request) Has been cancelled
2026-04-28 00:40:01 +03:00
0f5249726b Merge pull request 'fix: use next race image as dashboard hero background' (#34) from fix/dashboard-hero-race-background into main
Some checks failed
CI / build-and-test (push) Has been cancelled
Reviewed-on: #34
fix: use next race image as dashboard hero background
Set the dashboard hero background from the nearest upcoming race visual, using the existing race visual fallback chain. Add a BEM modifier for the image-backed hero state and bump the frontend patch version.
2026-04-27 20:31:25 +00:00
Vaka.pro
fdb0ba3d2d fix: use next race image as dashboard hero background
Some checks failed
CI / build-and-test (pull_request) Has been cancelled
2026-04-27 23:30:36 +03:00
367868cf1b Merge pull request 'fix: tolerate missing race cover image field' (#33) from fix/race-cover-api-backcompat into main
Some checks failed
CI / build-and-test (push) Has been cancelled
Reviewed-on: #33
2026-04-27 20:08:11 +00:00
Vaka.pro
78d0ab5ece fix: tolerate missing race cover image field
Some checks failed
CI / build-and-test (pull_request) Has been cancelled
2026-04-27 23:07:31 +03:00
e2eb71522d Merge pull request 'feat: add race cover image extraction' (#32) from feature/race-cover-images into main
Some checks failed
CI / build-and-test (push) Has been cancelled
Reviewed-on: #32
2026-04-27 20:02:08 +00:00
Vaka.pro
00985732ec Merge remote-tracking branch 'origin/main' into feature/race-cover-images
Some checks failed
CI / build-and-test (pull_request) Has been cancelled
# Conflicts:
#	frontend/package-lock.json
#	frontend/package.json
2026-04-27 23:01:19 +03:00
Vaka.pro
0153f223f2 feat: add race cover image extraction
Some checks failed
CI / build-and-test (pull_request) Has been cancelled
2026-04-27 22:56:41 +03:00
b1b363a7e8 Merge pull request 'feat(frontend): add service favicon' (#31) from feat/add-service-favicon into main
Some checks failed
CI / build-and-test (push) Has been cancelled
Reviewed-on: #31
2026-04-27 11:29:02 +00:00
18 changed files with 425 additions and 16 deletions

View File

@@ -0,0 +1,2 @@
ALTER TABLE races
ADD COLUMN IF NOT EXISTS cover_image_url TEXT;

View File

@@ -1,12 +1,12 @@
{ {
"name": "calendar-run-backend", "name": "calendar-run-backend",
"version": "1.2.2", "version": "1.3.0",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "calendar-run-backend", "name": "calendar-run-backend",
"version": "1.2.2", "version": "1.3.0",
"dependencies": { "dependencies": {
"cors": "^2.8.5", "cors": "^2.8.5",
"csv-parse": "^5.6.0", "csv-parse": "^5.6.0",

View File

@@ -1,6 +1,6 @@
{ {
"name": "calendar-run-backend", "name": "calendar-run-backend",
"version": "1.2.2", "version": "1.3.0",
"private": true, "private": true,
"scripts": { "scripts": {
"build": "tsc", "build": "tsc",

View File

@@ -24,6 +24,7 @@ function mockRowFromInsert(sql: string, params: unknown[]): RaceRow {
distance_km: "0", distance_km: "0",
status: null, status: null,
official_url: null, official_url: null,
cover_image_url: null,
start_time: null, start_time: null,
cluster_schedule: null, cluster_schedule: null,
bib_pickup: null, bib_pickup: null,
@@ -47,6 +48,7 @@ function mockRowFromInsert(sql: string, params: unknown[]): RaceRow {
distance_km: String(row.distance_km ?? "0"), distance_km: String(row.distance_km ?? "0"),
status: row.status != null ? String(row.status) : null, status: row.status != null ? String(row.status) : null,
official_url: row.official_url != null ? String(row.official_url) : null, official_url: row.official_url != null ? String(row.official_url) : null,
cover_image_url: row.cover_image_url != null ? String(row.cover_image_url) : null,
start_time: row.start_time != null ? String(row.start_time) : null, start_time: row.start_time != null ? String(row.start_time) : null,
cluster_schedule: row.cluster_schedule != null ? String(row.cluster_schedule) : null, cluster_schedule: row.cluster_schedule != null ? String(row.cluster_schedule) : null,
bib_pickup: row.bib_pickup != null ? String(row.bib_pickup) : null, bib_pickup: row.bib_pickup != null ? String(row.bib_pickup) : null,
@@ -108,7 +110,19 @@ function createMockPool(): Pool {
if (!existing) { if (!existing) {
return emptyResult(); return emptyResult();
} }
const setMatch = sql.match(/UPDATE races SET (.+) WHERE id =/);
const updated = { ...existing, updated_at: new Date() }; const updated = { ...existing, updated_at: new Date() };
const setColumns =
setMatch?.[1]
.split(",")
.map((part) => part.trim())
.filter((part) => !part.startsWith("updated_at"))
.map((part) => part.split("=")[0]?.trim())
.filter((col): col is string => Boolean(col)) ?? [];
setColumns.forEach((col, index) => {
(updated as unknown as Record<string, unknown>)[col] = p[index] ?? null;
});
store.set(id, updated); store.set(id, updated);
return { return {
rows: [updated as unknown as T], rows: [updated as unknown as T],

View File

@@ -9,6 +9,7 @@ export interface RaceRow {
distance_km: string; distance_km: string;
status: string | null; status: string | null;
official_url: string | null; official_url: string | null;
cover_image_url: string | null;
start_time: string | null; start_time: string | null;
cluster_schedule: string | null; cluster_schedule: string | null;
bib_pickup: string | null; bib_pickup: string | null;
@@ -28,6 +29,7 @@ export interface RaceDto {
distanceKm: number; distanceKm: number;
status: string | null; status: string | null;
officialUrl: string | null; officialUrl: string | null;
coverImageUrl: string | null;
startTime: string | null; startTime: string | null;
clusterSchedule: string | null; clusterSchedule: string | null;
bibPickup: string | null; bibPickup: string | null;
@@ -64,6 +66,7 @@ export function rowToDto(row: RaceRow): RaceDto {
distanceKm: parseFloat(row.distance_km), distanceKm: parseFloat(row.distance_km),
status: row.status, status: row.status,
officialUrl: row.official_url, officialUrl: row.official_url,
coverImageUrl: row.cover_image_url ?? null,
startTime: row.start_time, startTime: row.start_time,
clusterSchedule: row.cluster_schedule, clusterSchedule: row.cluster_schedule,
bibPickup: row.bib_pickup, bibPickup: row.bib_pickup,
@@ -83,6 +86,7 @@ const FIELD_MAP: Record<string, string> = {
distanceKm: "distance_km", distanceKm: "distance_km",
status: "status", status: "status",
officialUrl: "official_url", officialUrl: "official_url",
coverImageUrl: "cover_image_url",
startTime: "start_time", startTime: "start_time",
clusterSchedule: "cluster_schedule", clusterSchedule: "cluster_schedule",
bibPickup: "bib_pickup", bibPickup: "bib_pickup",

View File

@@ -0,0 +1,103 @@
const IMAGE_META_KEYS = new Set([
"og:image",
"og:image:url",
"twitter:image",
"twitter:image:src",
]);
const FETCH_TIMEOUT_MS = 5_000;
function getAttribute(tag: string, name: string): string | null {
const pattern = new RegExp(`${name}\\s*=\\s*["']([^"']+)["']`, "i");
return tag.match(pattern)?.[1] ?? null;
}
function toHttpUrl(value: string, baseUrl: string): string | null {
try {
const url = new URL(value, baseUrl);
return url.protocol === "http:" || url.protocol === "https:" ? url.href : null;
} catch {
return null;
}
}
function isRuncRunUrl(value: string): boolean {
try {
const hostname = new URL(value).hostname.toLowerCase();
return hostname === "runc.run" || hostname.endsWith(".runc.run");
} catch {
return false;
}
}
function findRuncIntroImage(html: string, baseUrl: string): string | null {
const introMatch = html.match(/<div\b[^>]*class=["'][^"']*\brun-intro__image\b[^"']*["'][^>]*>[\s\S]*?<img\b[^>]*>/i);
if (!introMatch) {
return null;
}
const src = getAttribute(introMatch[0], "src");
return src ? toHttpUrl(src, baseUrl) : null;
}
function findMetaImage(html: string, baseUrl: string): string | null {
const tags = html.match(/<meta\b[^>]*>/gi) ?? [];
for (const tag of tags) {
const key = (getAttribute(tag, "property") || getAttribute(tag, "name") || "").toLowerCase();
if (!IMAGE_META_KEYS.has(key)) {
continue;
}
const content = getAttribute(tag, "content");
if (!content) {
continue;
}
const imageUrl = toHttpUrl(content, baseUrl);
if (imageUrl) {
return imageUrl;
}
}
return null;
}
export function extractRaceCoverImageFromHtml(html: string, pageUrl: string): string | null {
if (isRuncRunUrl(pageUrl)) {
const runcImage = findRuncIntroImage(html, pageUrl);
if (runcImage) {
return runcImage;
}
}
return findMetaImage(html, pageUrl);
}
export async function extractRaceCoverImage(officialUrl: string): Promise<string | null> {
const normalizedUrl = toHttpUrl(officialUrl, officialUrl);
if (!normalizedUrl) {
return null;
}
const controller = new AbortController();
const timeout = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS);
try {
const response = await fetch(normalizedUrl, {
redirect: "follow",
signal: controller.signal,
});
if (!response.ok) {
return null;
}
const html = await response.text();
return extractRaceCoverImageFromHtml(html, response.url || normalizedUrl);
} catch {
return null;
} finally {
clearTimeout(timeout);
}
}

View File

@@ -1,6 +1,7 @@
import { Router, Request, Response } from "express"; import { Router, Request, Response } from "express";
import { pool } from "../db"; import { pool } from "../db";
import { rowToDto, bodyToColumns, RaceRow } from "../mappers/race"; import { rowToDto, bodyToColumns, RaceRow } from "../mappers/race";
import { extractRaceCoverImage } from "../raceCoverImage";
const router = Router(); const router = Router();
@@ -117,7 +118,15 @@ router.post("/races", async (req: Request, res: Response) => {
return; return;
} }
const { columns, values } = bodyToColumns(body); const payload = { ...body };
const hasManualCover = typeof payload.coverImageUrl === "string" && payload.coverImageUrl.trim() !== "";
const hasOfficialUrl = typeof payload.officialUrl === "string" && payload.officialUrl.trim() !== "";
if (!hasManualCover && hasOfficialUrl) {
payload.coverImageUrl = await extractRaceCoverImage(payload.officialUrl);
}
const { columns, values } = bodyToColumns(payload);
columns.unshift("id"); columns.unshift("id");
values.unshift(body.id); values.unshift(body.id);

View File

@@ -2,6 +2,7 @@ import assert from "node:assert/strict";
import { test } from "node:test"; import { test } from "node:test";
import request from "supertest"; import request from "supertest";
import { createApp } from "../src/app"; import { createApp } from "../src/app";
import { extractRaceCoverImageFromHtml } from "../src/raceCoverImage";
const app = createApp(); const app = createApp();
@@ -45,3 +46,124 @@ test("GET /api/races/:id returns not_found", async () => {
assert.equal(res.body.error, "not_found"); assert.equal(res.body.error, "not_found");
assert.ok(Array.isArray(res.body.details)); assert.ok(Array.isArray(res.body.details));
}); });
test("extractRaceCoverImageFromHtml prefers runc.run intro image", () => {
const html = `
<meta property="og:image" content="https://example.com/og.jpg">
<div class="run-intro__image">
<div class="run-intro__image-left-shadow"></div>
<img src="/uploads/race_landing_header_backgrounds/header.jpg" alt="">
<div class="run-intro__image-right-shadow"></div>
</div>
`;
assert.equal(
extractRaceCoverImageFromHtml(html, "https://aprilrun5km.runc.run/"),
"https://aprilrun5km.runc.run/uploads/race_landing_header_backgrounds/header.jpg",
);
});
test("extractRaceCoverImageFromHtml reads Open Graph and Twitter images", () => {
assert.equal(
extractRaceCoverImageFromHtml(
'<meta property="og:image" content="/cover.png">',
"https://example.com/race",
),
"https://example.com/cover.png",
);
assert.equal(
extractRaceCoverImageFromHtml(
'<meta name="twitter:image" content="https://cdn.example.com/twitter.jpg">',
"https://example.com/race",
),
"https://cdn.example.com/twitter.jpg",
);
});
test("POST /api/races stores manual coverImageUrl", async () => {
const coverImageUrl = "https://example.com/manual.jpg";
const res = await request(app)
.post("/api/races")
.send({
id: "2026-06-01-manual-cover",
date: "2026-06-01",
title: "Manual Cover",
distanceKm: 10,
officialUrl: "https://example.com/race",
coverImageUrl,
})
.expect(201);
assert.equal(res.body.coverImageUrl, coverImageUrl);
});
test("POST /api/races auto extracts coverImageUrl from officialUrl", async () => {
const originalFetch = globalThis.fetch;
globalThis.fetch = async () =>
new Response('<meta property="og:image" content="/auto.jpg">', {
status: 200,
headers: { "content-type": "text/html" },
});
try {
const res = await request(app)
.post("/api/races")
.send({
id: "2026-06-02-auto-cover",
date: "2026-06-02",
title: "Auto Cover",
distanceKm: 21.1,
officialUrl: "https://example.com/race",
})
.expect(201);
assert.equal(res.body.coverImageUrl, "https://example.com/auto.jpg");
} finally {
globalThis.fetch = originalFetch;
}
});
test("POST /api/races succeeds when cover extraction fails", async () => {
const originalFetch = globalThis.fetch;
globalThis.fetch = async () => {
throw new Error("network down");
};
try {
const res = await request(app)
.post("/api/races")
.send({
id: "2026-06-03-cover-fail",
date: "2026-06-03",
title: "Cover Fail",
distanceKm: 5,
officialUrl: "https://example.com/race",
})
.expect(201);
assert.equal(res.body.coverImageUrl, null);
} finally {
globalThis.fetch = originalFetch;
}
});
test("PATCH /api/races/:id updates coverImageUrl explicitly", async () => {
const id = "2026-06-04-patch-cover";
await request(app)
.post("/api/races")
.send({
id,
date: "2026-06-04",
title: "Patch Cover",
distanceKm: 10,
})
.expect(201);
const coverImageUrl = "https://example.com/patched.jpg";
const res = await request(app)
.patch(`/api/races/${id}`)
.send({ coverImageUrl })
.expect(200);
assert.equal(res.body.coverImageUrl, coverImageUrl);
});

View File

@@ -81,6 +81,7 @@ GET /api/races?year=2026&month=5
"distanceKm": 42.195, "distanceKm": 42.195,
"status": "planned", "status": "planned",
"officialUrl": null, "officialUrl": null,
"coverImageUrl": null,
"startTime": null, "startTime": null,
"clusterSchedule": null, "clusterSchedule": null,
"bibPickup": null, "bibPickup": null,
@@ -124,6 +125,7 @@ GET /api/races?year=2026&month=5
"distanceKm": 10, "distanceKm": 10,
"status": "planned", "status": "planned",
"officialUrl": "https://example.com", "officialUrl": "https://example.com",
"coverImageUrl": "https://example.com/cover.jpg",
"startTime": "09:30", "startTime": "09:30",
"clusterSchedule": null, "clusterSchedule": null,
"bibPickup": null, "bibPickup": null,
@@ -167,7 +169,7 @@ GET /api/races?year=2026&month=5
} }
``` ```
**Допустимые поля:** `date`, `title`, `distanceKm`, `status`, `officialUrl`, `startTime`, `clusterSchedule`, `bibPickup`, `bibNumber`, `finishTime`, `finishPlace`, `notes`. **Допустимые поля:** `date`, `title`, `distanceKm`, `status`, `officialUrl`, `coverImageUrl`, `startTime`, `clusterSchedule`, `bibPickup`, `bibNumber`, `finishTime`, `finishPlace`, `notes`.
**Ответ 200:** обновлённый объект `Race`. **Ответ 200:** обновлённый объект `Race`.
@@ -207,6 +209,7 @@ GET /api/races?year=2026&month=5
| `distanceKm` | number | да | да | Дистанция в км | | `distanceKm` | number | да | да | Дистанция в км |
| `status` | string \| null | нет | да | `"planned"` / `"registered"` / `"completed"` | | `status` | string \| null | нет | да | `"planned"` / `"registered"` / `"completed"` |
| `officialUrl` | string \| null | нет | да | URL организатора | | `officialUrl` | string \| null | нет | да | URL организатора |
| `coverImageUrl` | string \| null | нет | да | URL обложки забега. При `POST` может быть найден автоматически по `officialUrl`, если не передан вручную |
| `startTime` | string \| null | нет | да | Время старта, напр. `"09:30"` или `"09:30:00"` (часы:минуты:секунды) | | `startTime` | string \| null | нет | да | Время старта, напр. `"09:30"` или `"09:30:00"` (часы:минуты:секунды) |
| `clusterSchedule` | string \| null | нет | да | Расписание кластеров | | `clusterSchedule` | string \| null | нет | да | Расписание кластеров |
| `bibPickup` | string \| null | нет | да | Выдача номеров | | `bibPickup` | string \| null | нет | да | Выдача номеров |

View File

@@ -1,12 +1,12 @@
{ {
"name": "calendar-run-frontend", "name": "calendar-run-frontend",
"version": "0.5.2", "version": "0.6.2",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "calendar-run-frontend", "name": "calendar-run-frontend",
"version": "0.5.2", "version": "0.6.2",
"dependencies": { "dependencies": {
"react": "^18.3.1", "react": "^18.3.1",
"react-dom": "^18.3.1", "react-dom": "^18.3.1",

View File

@@ -1,7 +1,7 @@
{ {
"name": "calendar-run-frontend", "name": "calendar-run-frontend",
"private": true, "private": true,
"version": "0.5.2", "version": "0.6.2",
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",

View File

@@ -10,6 +10,10 @@ function isNullableString(value: unknown): value is string | null {
return value === null || typeof value === "string"; return value === null || typeof value === "string";
} }
function isOptionalNullableString(value: unknown): value is string | null | undefined {
return value === undefined || isNullableString(value);
}
function normalizeRace(input: unknown): Race { function normalizeRace(input: unknown): Race {
const race = input as Partial<Race>; const race = input as Partial<Race>;
@@ -23,6 +27,7 @@ function normalizeRace(input: unknown): Race {
race?.status === "registered" || race?.status === "registered" ||
race?.status === "completed") && race?.status === "completed") &&
isNullableString(race?.officialUrl) && isNullableString(race?.officialUrl) &&
isOptionalNullableString(race?.coverImageUrl) &&
isNullableString(race?.startTime) && isNullableString(race?.startTime) &&
isNullableString(race?.clusterSchedule) && isNullableString(race?.clusterSchedule) &&
isNullableString(race?.bibPickup) && isNullableString(race?.bibPickup) &&
@@ -48,6 +53,7 @@ function normalizeRace(input: unknown): Race {
distanceKm: race.distanceKm, distanceKm: race.distanceKm,
status: race.status, status: race.status,
officialUrl: race.officialUrl, officialUrl: race.officialUrl,
coverImageUrl: race.coverImageUrl ?? null,
startTime: race.startTime, startTime: race.startTime,
clusterSchedule: race.clusterSchedule, clusterSchedule: race.clusterSchedule,
bibPickup: race.bibPickup, bibPickup: race.bibPickup,

View File

@@ -7,6 +7,7 @@ export interface Race {
distanceKm: number; distanceKm: number;
status: RaceStatus | null; status: RaceStatus | null;
officialUrl: string | null; officialUrl: string | null;
coverImageUrl: string | null;
startTime: string | null; startTime: string | null;
clusterSchedule: string | null; clusterSchedule: string | null;
bibPickup: string | null; bibPickup: string | null;
@@ -30,6 +31,7 @@ export interface CreateRacePayload {
distanceKm: number; distanceKm: number;
status?: RaceStatus | null; status?: RaceStatus | null;
officialUrl?: string | null; officialUrl?: string | null;
coverImageUrl?: string | null;
startTime?: string | null; startTime?: string | null;
clusterSchedule?: string | null; clusterSchedule?: string | null;
bibPickup?: string | null; bibPickup?: string | null;

View File

@@ -187,6 +187,15 @@ function getFallbackRaceVisual(race: Race): RaceVisual {
export function getRaceVisual(race: Race): RaceVisual { export function getRaceVisual(race: Race): RaceVisual {
const fallback = getFallbackRaceVisual(race); const fallback = getFallbackRaceVisual(race);
if (race.coverImageUrl) {
return {
...fallback,
imageSrc: race.coverImageUrl,
fallbackSrc: fallback.imageSrc,
};
}
const title = normalizeTitle(race.title); const title = normalizeTitle(race.title);
const official = OFFICIAL_VISUALS.find((visual) => const official = OFFICIAL_VISUALS.find((visual) =>
visual.keywords.some((keyword) => title.includes(normalizeTitle(keyword))), visual.keywords.some((keyword) => title.includes(normalizeTitle(keyword))),

View File

@@ -1,3 +1,4 @@
import type { CSSProperties } from "react";
import { useEffect, useMemo, useState } from "react"; import { useEffect, useMemo, useState } from "react";
import { Link } from "react-router-dom"; import { Link } from "react-router-dom";
import type { Race } from "../api"; import type { Race } from "../api";
@@ -7,6 +8,7 @@ import {
formatDistance, formatDistance,
formatRaceDate, formatRaceDate,
getRaceCountdownLabel, getRaceCountdownLabel,
getRaceVisual,
getPaceLabel, getPaceLabel,
isCloseDistance, isCloseDistance,
parseFinishTimeToSeconds, parseFinishTimeToSeconds,
@@ -16,6 +18,10 @@ import {
const PR_DISTANCES = [5, 10, 21.1, 42.2] as const; const PR_DISTANCES = [5, 10, 21.1, 42.2] as const;
type DashboardHeroStyle = CSSProperties & {
"--dashboard-hero-image"?: string;
};
function getErrorMessage(error: unknown): string { function getErrorMessage(error: unknown): string {
if (error instanceof ApiError) { if (error instanceof ApiError) {
return error.message; return error.message;
@@ -23,6 +29,10 @@ function getErrorMessage(error: unknown): string {
return "Не удалось загрузить данные обзора."; return "Не удалось загрузить данные обзора.";
} }
function toCssUrl(value: string): string {
return `url(${JSON.stringify(value)})`;
}
export function DashboardPage(): JSX.Element { export function DashboardPage(): JSX.Element {
const [races, setRaces] = useState<Race[]>([]); const [races, setRaces] = useState<Race[]>([]);
const [isLoading, setIsLoading] = useState<boolean>(true); const [isLoading, setIsLoading] = useState<boolean>(true);
@@ -136,6 +146,10 @@ export function DashboardPage(): JSX.Element {
dashboardMetrics.seasonTotal > 0 dashboardMetrics.seasonTotal > 0
? Math.round((dashboardMetrics.seasonCompletedCount / dashboardMetrics.seasonTotal) * 100) ? Math.round((dashboardMetrics.seasonCompletedCount / dashboardMetrics.seasonTotal) * 100)
: 0; : 0;
const dashboardHeroVisual = dashboardMetrics.nextRace ? getRaceVisual(dashboardMetrics.nextRace) : null;
const dashboardHeroStyle: DashboardHeroStyle | undefined = dashboardHeroVisual
? { "--dashboard-hero-image": toCssUrl(dashboardHeroVisual.imageSrc) }
: undefined;
if (isLoading) { if (isLoading) {
return ( return (
@@ -157,7 +171,11 @@ export function DashboardPage(): JSX.Element {
return ( return (
<section className="page page--dashboard"> <section className="page page--dashboard">
<section className="dashboard-hero" aria-label="Обзор сезона"> <section
className={`dashboard-hero${dashboardHeroVisual ? " dashboard-hero--with-image" : ""}`}
style={dashboardHeroStyle}
aria-label="Обзор сезона"
>
<div className="dashboard-hero__content"> <div className="dashboard-hero__content">
<p className="dashboard-hero__eyebrow">Календарь сезона</p> <p className="dashboard-hero__eyebrow">Календарь сезона</p>
<h1 className="dashboard-hero__title">Беговой штаб</h1> <h1 className="dashboard-hero__title">Беговой штаб</h1>

View File

@@ -31,6 +31,7 @@ interface FormData {
distanceKm: string; distanceKm: string;
status: string; status: string;
officialUrl: string; officialUrl: string;
coverImageUrl: string;
startTime: string; startTime: string;
clusterSchedule: string; clusterSchedule: string;
bibPickup: string; bibPickup: string;
@@ -46,6 +47,7 @@ const EMPTY_FORM: FormData = {
distanceKm: "", distanceKm: "",
status: "planned", status: "planned",
officialUrl: "", officialUrl: "",
coverImageUrl: "",
startTime: "", startTime: "",
clusterSchedule: "", clusterSchedule: "",
bibPickup: "", bibPickup: "",
@@ -63,6 +65,7 @@ function raceToFormData(race: Race): FormData {
distanceKm: String(race.distanceKm), distanceKm: String(race.distanceKm),
status: race.status ?? "", status: race.status ?? "",
officialUrl: race.officialUrl ?? "", officialUrl: race.officialUrl ?? "",
coverImageUrl: race.coverImageUrl ?? "",
startTime: race.startTime ?? "", startTime: race.startTime ?? "",
clusterSchedule: race.clusterSchedule ?? "", clusterSchedule: race.clusterSchedule ?? "",
bibPickup: race.bibPickup ?? "", bibPickup: race.bibPickup ?? "",
@@ -208,6 +211,7 @@ export function RaceFormPage(): JSX.Element {
distanceKm: parseFloat(form.distanceKm), distanceKm: parseFloat(form.distanceKm),
status: statusValue, status: statusValue,
officialUrl: emptyToNull(form.officialUrl), officialUrl: emptyToNull(form.officialUrl),
coverImageUrl: emptyToNull(form.coverImageUrl),
startTime: emptyToNull(form.startTime), startTime: emptyToNull(form.startTime),
clusterSchedule: emptyToNull(form.clusterSchedule), clusterSchedule: emptyToNull(form.clusterSchedule),
bibPickup: emptyToNull(form.bibPickup), bibPickup: emptyToNull(form.bibPickup),
@@ -228,6 +232,7 @@ export function RaceFormPage(): JSX.Element {
distanceKm: parseFloat(form.distanceKm), distanceKm: parseFloat(form.distanceKm),
status: statusValue, status: statusValue,
officialUrl: emptyToNull(form.officialUrl), officialUrl: emptyToNull(form.officialUrl),
coverImageUrl: emptyToNull(form.coverImageUrl),
startTime: emptyToNull(form.startTime), startTime: emptyToNull(form.startTime),
clusterSchedule: emptyToNull(form.clusterSchedule), clusterSchedule: emptyToNull(form.clusterSchedule),
bibPickup: emptyToNull(form.bibPickup), bibPickup: emptyToNull(form.bibPickup),
@@ -358,6 +363,18 @@ export function RaceFormPage(): JSX.Element {
</label> </label>
)} )}
<label className="race-form__field">
<span className="race-form__label">URL обложки</span>
<input
className="race-form__input"
type="url"
name="coverImageUrl"
value={form.coverImageUrl}
onChange={handleChange}
placeholder="https://…"
/>
</label>
{hideOrgScheduleFields ? null : ( {hideOrgScheduleFields ? null : (
<div className="race-form__field"> <div className="race-form__field">
<span className="race-form__label">Время старта</span> <span className="race-form__label">Время старта</span>

View File

@@ -33,6 +33,7 @@ const MONTH_OPTIONS: { value: string; label: string }[] = [
const VIEW_STORAGE_KEY = "races-view-mode"; const VIEW_STORAGE_KEY = "races-view-mode";
type ViewMode = "list" | "calendar"; type ViewMode = "list" | "calendar";
type RaceListTab = "upcoming" | "completed";
function yearSelectOptions(): number[] { function yearSelectOptions(): number[] {
const current = new Date().getFullYear(); const current = new Date().getFullYear();
@@ -61,11 +62,11 @@ function readInitialViewMode(): ViewMode {
} }
} }
function RaceList(props: { title: string; races: Race[] }): JSX.Element { function RaceList(props: { title: string; races: Race[]; variant: RaceListTab }): JSX.Element {
const { title, races } = props; const { title, races, variant } = props;
return ( return (
<section className="race-list" aria-label={title}> <section className={`race-list race-list--${variant}`} aria-label={title}>
<h2 className="race-list__title">{title}</h2> <h2 className="race-list__title">{title}</h2>
{races.length > 0 ? ( {races.length > 0 ? (
<ul className="race-list__items"> <ul className="race-list__items">
@@ -138,6 +139,7 @@ export function RacesPage(): JSX.Element {
const [yearFilter, setYearFilter] = useState<string>(""); const [yearFilter, setYearFilter] = useState<string>("");
const [monthFilter, setMonthFilter] = useState<string>(""); const [monthFilter, setMonthFilter] = useState<string>("");
const [viewMode, setViewMode] = useState<ViewMode>(() => readInitialViewMode()); const [viewMode, setViewMode] = useState<ViewMode>(() => readInitialViewMode());
const [activeListTab, setActiveListTab] = useState<RaceListTab>("upcoming");
const setViewModePersist = useCallback((mode: ViewMode) => { const setViewModePersist = useCallback((mode: ViewMode) => {
setViewMode(mode); setViewMode(mode);
@@ -332,10 +334,34 @@ export function RacesPage(): JSX.Element {
</div> </div>
{viewMode === "list" ? ( {viewMode === "list" ? (
<div className="race-lists"> <>
<RaceList title="Будущие" races={upcoming} /> <div className="race-list-tabs" role="tablist" aria-label="Раздел стартов">
<RaceList title="Завершенные" races={completed} /> <button
</div> type="button"
role="tab"
aria-selected={activeListTab === "upcoming"}
className={`race-list-tabs__btn${activeListTab === "upcoming" ? " race-list-tabs__btn--active" : ""}`}
onClick={() => setActiveListTab("upcoming")}
>
Будущие
<span className="race-list-tabs__count">{upcoming.length}</span>
</button>
<button
type="button"
role="tab"
aria-selected={activeListTab === "completed"}
className={`race-list-tabs__btn${activeListTab === "completed" ? " race-list-tabs__btn--active" : ""}`}
onClick={() => setActiveListTab("completed")}
>
Прошедшие
<span className="race-list-tabs__count">{completed.length}</span>
</button>
</div>
<div className={`race-lists race-lists--mobile-${activeListTab}`}>
<RaceList title="Будущие" races={upcoming} variant="upcoming" />
<RaceList title="Завершенные" races={completed} variant="completed" />
</div>
</>
) : ( ) : (
<div className="races-cal-wrap"> <div className="races-cal-wrap">
<RacesCalendar <RacesCalendar

View File

@@ -248,6 +248,27 @@ a {
gap: var(--space-4); gap: var(--space-4);
} }
.race-list-tabs {
display: none;
}
.race-list-tabs__btn {
display: inline-flex;
align-items: center;
justify-content: center;
gap: var(--space-2);
}
.race-list-tabs__count {
min-width: 1.75rem;
border-radius: 999px;
padding: 0.1rem var(--space-2);
background: var(--color-surface-soft);
color: var(--color-text-muted);
font-size: var(--font-size-caption);
font-weight: 700;
}
.race-list { .race-list {
border: 1px solid var(--color-border); border: 1px solid var(--color-border);
border-radius: var(--radius-md); border-radius: var(--radius-md);
@@ -1355,6 +1376,12 @@ body {
url("/images/runner-hero.jpg") center / cover; url("/images/runner-hero.jpg") center / cover;
} }
.dashboard-hero--with-image {
background:
linear-gradient(90deg, rgba(7, 25, 39, 0.94) 0%, rgba(7, 25, 39, 0.68) 48%, rgba(7, 25, 39, 0.2) 100%),
var(--dashboard-hero-image) center / cover;
}
.dashboard-hero__content, .dashboard-hero__content,
.dashboard-hero__panel { .dashboard-hero__panel {
position: relative; position: relative;
@@ -1984,6 +2011,53 @@ body {
grid-template-columns: 1fr; grid-template-columns: 1fr;
} }
.race-list-tabs {
margin-top: var(--space-6);
display: grid;
grid-template-columns: repeat(2, minmax(0, 1fr));
gap: var(--space-1);
padding: var(--space-1);
border: 1px solid var(--color-border);
border-radius: var(--radius-md);
background: var(--color-surface);
}
.race-list-tabs__btn {
min-height: 2.75rem;
border: 0;
border-radius: var(--radius-sm);
background: transparent;
color: var(--color-text-muted);
font: inherit;
font-weight: 700;
cursor: pointer;
}
.race-list-tabs__btn:hover,
.race-list-tabs__btn:focus-visible {
color: var(--color-text);
outline: none;
}
.race-list-tabs__btn--active {
background: var(--color-accent);
color: var(--color-surface);
}
.race-list-tabs__btn--active .race-list-tabs__count {
background: var(--color-surface);
color: var(--color-accent);
}
.race-lists {
margin-top: var(--space-4);
}
.race-lists--mobile-upcoming .race-list--completed,
.race-lists--mobile-completed .race-list--upcoming {
display: none;
}
.races-cal__year { .races-cal__year {
grid-template-columns: repeat(2, minmax(0, 1fr)); grid-template-columns: repeat(2, minmax(0, 1fr));
} }