fix frontend calendar race states

Reviewed-on: #27

Dockerfile.frontend

@@ -1,5 +1,5 @@
 # Сборка из корня монорепо: docker build -f Dockerfile.frontend .
-# SPA дергает API по префиксу /api (nginx проксирует на сервис backend:3000).
+# SPA дергает API по префиксу /api (nginx проксирует на сервис runners-calendar-backend:3000).
 FROM node:20-alpine AS build
 WORKDIR /app
 COPY frontend/package.json frontend/package-lock.json ./

README.md

@@ -28,7 +28,7 @@ npm install
 npm run dev
 ```
 
-Фронт всегда отправляет запросы на относительный префикс `**/api**`. В dev это проксирует Vite на `http://localhost:3001`, в Docker/проде — nginx фронта проксирует на backend. У бэкенда `CORS_ORIGIN` должен совпадать с origin приложения (например `http://localhost:5173`).
+Фронт всегда отправляет запросы на относительный префикс `**/api**`. В dev это проксирует Vite на `http://localhost:3001`, в Docker/проде — nginx фронта проксирует на `runners-calendar-backend:3000`. У бэкенда `CORS_ORIGIN` должен совпадать с origin приложения (например `http://localhost:5173`).
 
 ## Docker: backend + frontend рядом с Postgres
 
@@ -36,11 +36,11 @@ npm run dev
 
 ```bash
 docker compose -f docker-compose.stack.yml up -d --build
-docker compose -f docker-compose.stack.yml exec backend node dist/migrate.js
+docker compose -f docker-compose.stack.yml exec runners-calendar-backend node dist/migrate.js
-docker compose -f docker-compose.stack.yml exec backend node dist/seed.js
+docker compose -f docker-compose.stack.yml exec runners-calendar-backend node dist/seed.js
 ```
 
-Фронт в браузере обращается к API по префиксу `**/api**` (nginx в образе фронта проксирует на backend).
+Фронт в браузере обращается к API по префиксу `**/api**` (nginx в образе фронта проксирует на сервис `runners-calendar-backend` в той же сети).
 
 ## Документация API и бэкенда
 

backend/package-lock.json

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

backend/package.json

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

backend/src/app.ts

@@ -7,25 +7,6 @@ import racesRouter from "./routes/races";
 export function createApp(): express.Express {
   const app = express();
 
-  // TEMP: compare Host vs Origin for 200 vs 401 debugging — remove when done
-  app.use((req, res, next) => {
-    const host = req.headers.host;
-    const origin = req.headers.origin;
-    res.on("finish", () => {
-      console.log(
-        JSON.stringify({
-          tag: "temp-req-headers",
-          host,
-          origin: origin ?? null,
-          method: req.method,
-          path: req.originalUrl ?? req.url,
-          status: res.statusCode,
-        }),
-      );
-    });
-    next();
-  });
-
   app.use(
     cors({ origin: config.corsOrigin, methods: ["GET", "POST", "PATCH", "DELETE", "OPTIONS"] }),
   );

docker-compose.stack.yml

@@ -10,13 +10,14 @@
 #   docker compose -f docker-compose.stack.yml up -d --build
 #
 # Миграции и seed (один раз после появления БД):
-#   docker compose -f docker-compose.stack.yml exec backend node dist/migrate.js
+#   docker compose -f docker-compose.stack.yml exec runners-calendar-backend node dist/migrate.js
-#   docker compose -f docker-compose.stack.yml exec backend node dist/seed.js
+#   docker compose -f docker-compose.stack.yml exec runners-calendar-backend node dist/seed.js
 #
-# NPM: проброс на порт 3033. Браузер ходит на /api → nginx во фронте → backend:3000.
+# NPM: проброс на порт 3033. Браузер ходит на /api → nginx во фронте → runners-calendar-backend:3000.
+# Имя сервиса уникально в общей сети (не «backend»), чтобы не пересекаться с другими стеками.
 
 services:
-  backend:
+  runners-calendar-backend:
     build:
       context: .
       dockerfile: Dockerfile.backend
@@ -40,7 +41,7 @@ services:
       dockerfile: Dockerfile.frontend
     container_name: runners-calendar-frontend
     depends_on:
-      - backend
+      - runners-calendar-backend
     ports:
       - "3033:80"
     restart: unless-stopped

docker/nginx.frontend.conf

@@ -10,7 +10,7 @@ server {
 
   # Браузер ходит на тот же origin: /api/* → бэкенд с тем же префиксом /api
   location /api/ {
-    proxy_pass http://backend:3000;
+    proxy_pass http://runners-calendar-backend:3000;
     proxy_http_version 1.1;
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;

docs/backend-api-for-frontend.md

@@ -5,7 +5,7 @@
 SPA всегда отправляет запросы на относительный префикс `/api` текущего origin.
 
 - В dev (`npm run dev`): Vite proxy отправляет `/api/*` на `http://localhost:3001/api/*`.
-- В Docker/проде: nginx фронта проксирует `/api/*` на backend в той же сети.
+- В Docker/проде: nginx фронта проксирует `/api/*` на хост `runners-calendar-backend:3000` в той же сети (уникальное имя сервиса Compose, без коллизий с чужими стеками).
 
 ## 2. CORS
 
@@ -207,7 +207,7 @@ GET /api/races?year=2026&month=5
 | `distanceKm` | number | да | да | Дистанция в км |
 | `status` | string \| null | нет | да | `"planned"` / `"registered"` / `"completed"` |
 | `officialUrl` | string \| null | нет | да | URL организатора |
-| `startTime` | string \| null | нет | да | Время старта, напр. `"09:30"` |
+| `startTime` | string \| null | нет | да | Время старта, напр. `"09:30"` или `"09:30:00"` (часы:минуты:секунды) |
 | `clusterSchedule` | string \| null | нет | да | Расписание кластеров |
 | `bibPickup` | string \| null | нет | да | Выдача номеров |
 | `bibNumber` | string \| null | нет | да | Стартовый номер |

docs/backend.md

@@ -78,7 +78,7 @@ API слушает порт: **`PORT`** (если задан), иначе **`API
 | `API_PORT` | Порт API-сервера | `3001` |
 | `CORS_ORIGIN` | Разрешённый origin для CORS | `http://localhost:5173` |
 
-Фронтенд всегда обращается к API по префиксу `/api` на текущем origin. В локальной разработке этот префикс проксирует Vite (`frontend/vite.config.ts`) на `http://localhost:3001`; в Docker-стеке — nginx фронта проксирует на backend.
+Фронтенд всегда обращается к API по префиксу `/api` на текущем origin. В локальной разработке этот префикс проксирует Vite (`frontend/vite.config.ts`) на `http://localhost:3001`; в Docker-стеке — nginx фронта проксирует на `runners-calendar-backend:3000`.
 
 **Без mock:** при отсутствии любой из `DB_*` процесс падает при старте: `Missing required environment variable: <NAME>`.
 
@@ -118,4 +118,4 @@ backend/
 
 Файл [`docker-compose.stack.yml`](../docker-compose.stack.yml) поднимает API и nginx со статикой SPA в **внешней** сети Docker (рядом с уже запущенным Postgres). Переменные — в **корневом** `.env` (шаблон [`.env.example`](../.env.example)): как минимум `DB_*`, `CORS_ORIGIN` (для выдачи фронта на порту 3033 задайте `http://localhost:3033`). Перед первым `up` файл `.env` должен существовать.
 
-Порядок после старта контейнеров: `node dist/migrate.js` и `node dist/seed.js` внутри контейнера `backend` (см. комментарии в compose-файле).
+Порядок после старта контейнеров: `node dist/migrate.js` и `node dist/seed.js` внутри сервиса `runners-calendar-backend` (см. комментарии в compose-файле).

docs/plan-korrektirovok-starty.md

@@ -0,0 +1,52 @@
+# План корректировок: форма старта, время, календарь стартов
+
+Краткое описание реализованных изменений в клиенте **runners-calendar** (версия клиента см. в футере приложения).
+
+## 1. Форма старта (редактирование прошедшего события)
+
+При **редактировании** старта, чья **дата уже в прошлом**, в блоке «Организация» скрыты поля, неактуальные после забега:
+
+- сайт организатора;
+- время старта;
+- расписание кластеров;
+- выдача номеров.
+
+Значения по-прежнему хранятся в состоянии формы и отправляются при сохранении (не затираются). Утилита: `isRaceDateInPast` в `frontend/src/lib/raceMetrics.ts`.
+
+## 2. Время старта
+
+Вместо свободного текста — три селекта (часы, минуты, секунды), компонент `StartTimeSelects` в `frontend/src/components/StartTimeSelects.tsx`. Сохраняется строка `HH:mm:ss` или пусто → `null` в API. Поддерживается разбор старых значений `HH:mm` при загрузке.
+
+## 3. Список на странице «Календарь стартов»
+
+Для стартов со статусом **«внесите результат»** вся карточка — ссылка на `/races/:id/edit` с лёгким увеличением и тенью при наведении/фокусе (токен `--shadow-card-lift`).
+
+## 4. Виды: список и календарь
+
+- Переключатель **Список / Календарь**, выбор сохраняется в `sessionStorage` (`races-view-mode`).
+- **Календарь:** загрузка гонок за выбранный **год** (без фильтра месяца в запросе), отображение сетки месяцев.
+- При выборе **месяца** в фильтре — крупная сетка этого месяца и компактная навигация по остальным месяцам + «Весь год».
+
+## 5. Ячейка даты в календаре
+
+- Наведение или фокус: всплывающая панель — либо «Стартов нет» и кнопка **Добавить** (`/races/new?date=YYYY-MM-DD`), либо список стартов со ссылками на карточки и **Добавить**.
+- Клик по числу — страница дня `/races/day/:ymd`.
+
+## 6. Страница дня
+
+Маршрут `races/day/:ymd`: список стартов на дату, пустое состояние, кнопка **Добавить** с предзаполнением даты через query.
+
+## 7. Новый старт с датой из календаря
+
+`RaceFormPage` читает query-параметр `?date=YYYY-MM-DD` при создании старта.
+
+## Основные файлы
+
+| Область | Файлы |
+|--------|--------|
+| Метрики даты | `frontend/src/lib/raceMetrics.ts`, `frontend/src/lib/calendarUtils.ts` |
+| Форма | `frontend/src/pages/RaceFormPage.tsx`, `frontend/src/components/StartTimeSelects.tsx` |
+| Список и календарь | `frontend/src/pages/RacesPage.tsx`, `frontend/src/components/RacesCalendar.tsx` |
+| День | `frontend/src/pages/RaceDayPage.tsx`, `frontend/src/app/router.tsx` |
+| Стили | `frontend/src/styles/global.css`, `frontend/src/styles/tokens.css` |
+| API-док | `docs/backend-api-for-frontend.md` (формат `startTime`) |

frontend/package-lock.json

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

frontend/package.json

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

frontend/src/app/layouts/AppLayout.tsx

@@ -1,11 +1,13 @@
-import { NavLink, Outlet } from "react-router-dom";
+import { Link, NavLink, Outlet } from "react-router-dom";
 import { AppShellFooter } from "./AppShellFooter";
 
 export function AppLayout(): JSX.Element {
   return (
     <div className="app-shell">
       <header className="app-shell__header">
-        <div className="app-shell__brand">Календарь стартов</div>
+        <Link className="app-shell__brand" to="/">
+          Календарь стартов
+        </Link>
         <nav className="app-shell__nav" aria-label="Основная навигация">
           <NavLink
             to="/"

frontend/src/app/router.tsx

@@ -4,6 +4,7 @@ import { DashboardPage } from "../pages/DashboardPage";
 import { RacesPage } from "../pages/RacesPage";
 import { RaceDetailsPage } from "../pages/RaceDetailsPage";
 import { RaceFormPage } from "../pages/RaceFormPage";
+import { RaceDayPage } from "../pages/RaceDayPage";
 
 export const appRouter = createBrowserRouter([
   {
@@ -13,6 +14,7 @@ export const appRouter = createBrowserRouter([
       { index: true, element: <DashboardPage /> },
       { path: "races", element: <RacesPage /> },
       { path: "races/new", element: <RaceFormPage /> },
+      { path: "races/day/:ymd", element: <RaceDayPage /> },
       { path: "races/:raceId", element: <RaceDetailsPage /> },
       { path: "races/:raceId/edit", element: <RaceFormPage /> },
     ],

frontend/src/components/DatePickerField.tsx

@@ -0,0 +1,197 @@
+import { useEffect, useMemo, useRef, useState } from "react";
+import { buildMonthCells, toYmd, WEEKDAY_LABELS_SHORT_RU } from "../lib";
+
+const MONTH_NAMES_RU = [
+  "Январь",
+  "Февраль",
+  "Март",
+  "Апрель",
+  "Май",
+  "Июнь",
+  "Июль",
+  "Август",
+  "Сентябрь",
+  "Октябрь",
+  "Ноябрь",
+  "Декабрь",
+];
+
+interface DatePickerFieldProps {
+  value: string;
+  name: string;
+  required?: boolean;
+  onChange: (value: string) => void;
+}
+
+function parseYmd(value: string): { year: number; monthIndex: number; day: number } | null {
+  if (!/^\d{4}-\d{2}-\d{2}$/.test(value)) {
+    return null;
+  }
+
+  const year = Number(value.slice(0, 4));
+  const monthIndex = Number(value.slice(5, 7)) - 1;
+  const day = Number(value.slice(8, 10));
+
+  if (!Number.isInteger(year) || !Number.isInteger(monthIndex) || !Number.isInteger(day)) {
+    return null;
+  }
+  if (monthIndex < 0 || monthIndex > 11) {
+    return null;
+  }
+
+  return { year, monthIndex, day };
+}
+
+function getInitialVisibleMonth(value: string): { year: number; monthIndex: number } {
+  const parsed = parseYmd(value);
+  if (parsed) {
+    return { year: parsed.year, monthIndex: parsed.monthIndex };
+  }
+
+  const now = new Date();
+  return { year: now.getFullYear(), monthIndex: now.getMonth() };
+}
+
+export function DatePickerField(props: DatePickerFieldProps): JSX.Element {
+  const { value, name, required, onChange } = props;
+  const [isOpen, setIsOpen] = useState(false);
+  const [visibleMonth, setVisibleMonth] = useState(() => getInitialVisibleMonth(value));
+  const rootRef = useRef<HTMLDivElement | null>(null);
+
+  useEffect(() => {
+    const parsed = parseYmd(value);
+    if (!parsed) {
+      return;
+    }
+    setVisibleMonth({ year: parsed.year, monthIndex: parsed.monthIndex });
+  }, [value]);
+
+  useEffect(() => {
+    if (!isOpen) {
+      return;
+    }
+
+    function handlePointerDown(event: MouseEvent): void {
+      if (rootRef.current?.contains(event.target as Node)) {
+        return;
+      }
+      setIsOpen(false);
+    }
+
+    function handleKeyDown(event: KeyboardEvent): void {
+      if (event.key === "Escape") {
+        setIsOpen(false);
+      }
+    }
+
+    document.addEventListener("mousedown", handlePointerDown);
+    document.addEventListener("keydown", handleKeyDown);
+    return () => {
+      document.removeEventListener("mousedown", handlePointerDown);
+      document.removeEventListener("keydown", handleKeyDown);
+    };
+  }, [isOpen]);
+
+  const selected = parseYmd(value);
+  const todayYmd = toYmd(new Date().getFullYear(), new Date().getMonth(), new Date().getDate());
+  const cells = useMemo(
+    () => buildMonthCells(visibleMonth.year, visibleMonth.monthIndex),
+    [visibleMonth],
+  );
+  const monthTitle = `${MONTH_NAMES_RU[visibleMonth.monthIndex]} ${visibleMonth.year}`;
+
+  function shiftMonth(delta: number): void {
+    setVisibleMonth((prev) => {
+      const next = new Date(Date.UTC(prev.year, prev.monthIndex + delta, 1));
+      return { year: next.getUTCFullYear(), monthIndex: next.getUTCMonth() };
+    });
+  }
+
+  return (
+    <div className="date-picker" ref={rootRef}>
+      <div className="date-picker__control">
+        <input
+          className="race-form__input date-picker__input"
+          type="text"
+          inputMode="numeric"
+          name={name}
+          value={value}
+          onChange={(event) => {
+            onChange(event.target.value);
+          }}
+          onFocus={() => setIsOpen(true)}
+          placeholder="2026-05-03"
+          autoComplete="off"
+          required={required}
+        />
+        <button
+          className="date-picker__toggle"
+          type="button"
+          aria-label="Открыть календарь"
+          aria-expanded={isOpen}
+          onClick={() => setIsOpen((prev) => !prev)}
+        >
+          ▾
+        </button>
+      </div>
+
+      {isOpen ? (
+        <div className="date-picker__popover" role="dialog" aria-label="Выбор даты">
+          <div className="date-picker__header">
+            <button
+              className="date-picker__nav"
+              type="button"
+              aria-label="Предыдущий месяц"
+              onClick={() => shiftMonth(-1)}
+            >
+              ‹
+            </button>
+            <p className="date-picker__title">{monthTitle}</p>
+            <button
+              className="date-picker__nav"
+              type="button"
+              aria-label="Следующий месяц"
+              onClick={() => shiftMonth(1)}
+            >
+              ›
+            </button>
+          </div>
+          <div className="date-picker__weekdays" aria-hidden>
+            {WEEKDAY_LABELS_SHORT_RU.map((weekday) => (
+              <span key={weekday} className="date-picker__weekday">
+                {weekday}
+              </span>
+            ))}
+          </div>
+          <div className="date-picker__cells">
+            {cells.map((day, idx) => {
+              if (day === null) {
+                return <span key={`empty-${idx}`} className="date-picker__cell date-picker__cell--empty" />;
+              }
+
+              const ymd = toYmd(visibleMonth.year, visibleMonth.monthIndex, day);
+              const isSelected =
+                selected?.year === visibleMonth.year &&
+                selected.monthIndex === visibleMonth.monthIndex &&
+                selected.day === day;
+
+              return (
+                <button
+                  key={ymd}
+                  className={`date-picker__day${isSelected ? " date-picker__day--selected" : ""}${ymd === todayYmd ? " date-picker__day--today" : ""}`}
+                  type="button"
+                  onClick={() => {
+                    onChange(ymd);
+                    setIsOpen(false);
+                  }}
+                >
+                  {day}
+                </button>
+              );
+            })}
+          </div>
+        </div>
+      ) : null}
+    </div>
+  );
+}

frontend/src/components/PaceTrendChart.tsx

@@ -55,16 +55,38 @@ export function PaceTrendChart(props: PaceTrendChartProps): JSX.Element {
     .join(" ");
 
   const last = series[series.length - 1]!;
+  const best = series.reduce((currentBest, item) => (item.minutes < currentBest.minutes ? item : currentBest), series[0]!);
+  const dotPoints = series.map((s, i) => {
+    const x = pad + (n === 1 ? innerW / 2 : (i / (n - 1)) * innerW);
+    const norm = (maxM - s.minutes) / range;
+    const y = pad + (1 - norm) * innerH;
+    return { x, y, id: s.race.id };
+  });
 
   return (
     <div className="pace-chart">
       <svg className="pace-chart__svg" viewBox={`0 0 ${w} ${h}`} role="img" aria-label="Динамика времени на дистанции">
+        <line className="pace-chart__grid-line" x1={pad} y1={pad} x2={w - pad} y2={pad} />
+        <line className="pace-chart__grid-line" x1={pad} y1={h - pad} x2={w - pad} y2={h - pad} />
         <polyline className="pace-chart__line" fill="none" points={points} />
+        {dotPoints.map((point, index) => (
+          <circle
+            key={point.id}
+            className={index === dotPoints.length - 1 ? "pace-chart__dot pace-chart__dot--last" : "pace-chart__dot"}
+            cx={point.x}
+            cy={point.y}
+            r="1.6"
+          />
+        ))}
       </svg>
-      <p className="pace-chart__caption">
+      <div className="pace-chart__stats">
-        Последний пункт: {formatRaceDate(last.race.date)} — {last.race.finishTime} (
+        <p className="pace-chart__caption">
-        {last.minutes.toFixed(1)} мин)
+          Последний: {formatRaceDate(last.race.date)} · {last.race.finishTime} · {last.minutes.toFixed(1)} мин
-      </p>
+        </p>
+        <p className="pace-chart__caption pace-chart__caption--best">
+          Лучший: {formatRaceDate(best.race.date)} · {best.race.finishTime} · {best.minutes.toFixed(1)} мин
+        </p>
+      </div>
     </div>
   );
 }

frontend/src/components/RacesCalendar.tsx

@@ -0,0 +1,291 @@
+import { useCallback, useMemo, useRef, useState } from "react";
+import { Link, useNavigate } from "react-router-dom";
+import type { Race } from "../api";
+import { buildMonthCells, groupRacesByYmd, isRaceDateInPast, toYmd, WEEKDAY_LABELS_SHORT_RU } from "../lib";
+
+const MONTH_NAMES_RU_SHORT = [
+  "янв.",
+  "февр.",
+  "мар.",
+  "апр.",
+  "май",
+  "июн.",
+  "июл.",
+  "авг.",
+  "сент.",
+  "окт.",
+  "нояб.",
+  "дек.",
+];
+
+const POPOVER_LEAVE_MS = 140;
+
+function toLocalYmd(date: Date): string {
+  const y = date.getFullYear();
+  const m = String(date.getMonth() + 1).padStart(2, "0");
+  const d = String(date.getDate()).padStart(2, "0");
+  return `${y}-${m}-${d}`;
+}
+
+interface RacesCalendarProps {
+  displayYear: number;
+  monthFilter: string;
+  races: Race[];
+  onMonthFilterChange: (value: string) => void;
+}
+
+function DayPopover(props: {
+  ymd: string;
+  races: Race[];
+  onCancelClose: () => void;
+  onScheduleClose: () => void;
+}): JSX.Element {
+  const { ymd, races, onCancelClose, onScheduleClose } = props;
+  const hasRaces = races.length > 0;
+
+  return (
+    <div
+      className="races-cal__popover"
+      role="tooltip"
+      onMouseEnter={onCancelClose}
+      onMouseLeave={onScheduleClose}
+    >
+      {hasRaces ? (
+        <ul className="races-cal__popover-list">
+          {races.map((r) => (
+            <li key={r.id} className="races-cal__popover-item">
+              <Link className="races-cal__popover-link" to={`/races/${r.id}`} onClick={onCancelClose}>
+                {r.title}
+              </Link>
+            </li>
+          ))}
+        </ul>
+      ) : (
+        <p className="races-cal__popover-empty">Стартов нет</p>
+      )}
+      <Link
+        className="btn btn--secondary races-cal__popover-add"
+        to={`/races/new?date=${ymd}`}
+        onClick={onCancelClose}
+      >
+        Добавить
+      </Link>
+    </div>
+  );
+}
+
+function CalendarMonthBlock(props: {
+  year: number;
+  monthIndex: number;
+  racesByYmd: Map<string, Race[]>;
+  compact: boolean;
+  navigate: ReturnType<typeof useNavigate>;
+  openYmd: string | null;
+  setOpenYmd: (v: string | null) => void;
+  scheduleClose: () => void;
+  cancelClose: () => void;
+  onMonthSelect?: (monthIndex: number) => void;
+  todayYmd: string;
+}): JSX.Element {
+  const {
+    year,
+    monthIndex,
+    racesByYmd,
+    compact,
+    navigate,
+    openYmd,
+    setOpenYmd,
+    scheduleClose,
+    cancelClose,
+    onMonthSelect,
+    todayYmd,
+  } = props;
+  const cells = useMemo(() => buildMonthCells(year, monthIndex), [year, monthIndex]);
+  const title = `${MONTH_NAMES_RU_SHORT[monthIndex]} ${year}`;
+
+  const blockClass = compact ? "races-cal__month races-cal__month--compact" : "races-cal__month";
+
+  return (
+    <div className={blockClass}>
+      <h3 className="races-cal__month-title">
+        {onMonthSelect ? (
+          <button
+            type="button"
+            className="races-cal__month-title-button"
+            onClick={() => {
+              onMonthSelect(monthIndex);
+            }}
+          >
+            {title}
+          </button>
+        ) : (
+          title
+        )}
+      </h3>
+      <div className="races-cal__weekdays" aria-hidden>
+        {WEEKDAY_LABELS_SHORT_RU.map((d) => (
+          <span key={d} className="races-cal__weekday">
+            {d}
+          </span>
+        ))}
+      </div>
+      <div className="races-cal__cells">
+        {cells.map((day, idx) => {
+          if (day === null) {
+            return <div key={`e-${idx}`} className="races-cal__cell races-cal__cell--empty" />;
+          }
+          const ymd = toYmd(year, monthIndex, day);
+          const dayRaces = racesByYmd.get(ymd) ?? [];
+          const hasRaces = dayRaces.length > 0;
+          const isOpen = openYmd === ymd;
+          const isPast = isRaceDateInPast(ymd);
+          const isToday = ymd === todayYmd;
+          const cellClassName = [
+            "races-cal__cell",
+            hasRaces ? "races-cal__cell--has-race" : "",
+            isOpen ? "races-cal__cell--open" : "",
+            isPast ? "races-cal__cell--past" : "",
+            isToday ? "races-cal__cell--today" : "",
+          ]
+            .filter(Boolean)
+            .join(" ");
+
+          return (
+            <div
+              key={ymd}
+              className={cellClassName}
+              onMouseEnter={() => {
+                cancelClose();
+                setOpenYmd(hasRaces ? ymd : null);
+              }}
+              onMouseLeave={scheduleClose}
+            >
+              <button
+                type="button"
+                className="races-cal__day-btn"
+                onClick={() => {
+                  navigate(`/races/day/${ymd}`);
+                }}
+                onFocus={() => {
+                  cancelClose();
+                  setOpenYmd(hasRaces ? ymd : null);
+                }}
+                onBlur={(e) => {
+                  const next = e.relatedTarget as Node | null;
+                  if (next && e.currentTarget.closest(".races-cal__cell")?.contains(next)) {
+                    return;
+                  }
+                  scheduleClose();
+                }}
+              >
+                {day}
+              </button>
+              {isOpen && hasRaces ? (
+                <DayPopover
+                  ymd={ymd}
+                  races={dayRaces}
+                  onCancelClose={cancelClose}
+                  onScheduleClose={scheduleClose}
+                />
+              ) : null}
+            </div>
+          );
+        })}
+      </div>
+    </div>
+  );
+}
+
+export function RacesCalendar(props: RacesCalendarProps): JSX.Element {
+  const { displayYear, monthFilter, races, onMonthFilterChange } = props;
+  const navigate = useNavigate();
+  const [openYmd, setOpenYmd] = useState<string | null>(null);
+  const leaveTimerRef = useRef<number | null>(null);
+
+  const cancelClose = useCallback(() => {
+    if (leaveTimerRef.current !== null) {
+      window.clearTimeout(leaveTimerRef.current);
+      leaveTimerRef.current = null;
+    }
+  }, []);
+
+  const scheduleClose = useCallback(() => {
+    cancelClose();
+    leaveTimerRef.current = window.setTimeout(() => {
+      setOpenYmd(null);
+      leaveTimerRef.current = null;
+    }, POPOVER_LEAVE_MS);
+  }, [cancelClose]);
+
+  const racesByYmd = useMemo(() => groupRacesByYmd(races), [races]);
+  const todayYmd = useMemo(() => toLocalYmd(new Date()), []);
+
+  const focusedMonthIndex = monthFilter === "" ? null : parseInt(monthFilter, 10) - 1;
+
+  return (
+    <div className="races-cal">
+      <p className="races-cal__hint">Наведите на дату с забегом — краткая информация. Клик — страница дня.</p>
+      {focusedMonthIndex === null || Number.isNaN(focusedMonthIndex) ? (
+        <div className="races-cal__year">
+          {MONTH_NAMES_RU_SHORT.map((_, mi) => (
+            <CalendarMonthBlock
+              key={mi}
+              year={displayYear}
+              monthIndex={mi}
+              racesByYmd={racesByYmd}
+              compact
+              navigate={navigate}
+              openYmd={openYmd}
+              setOpenYmd={setOpenYmd}
+              scheduleClose={scheduleClose}
+              cancelClose={cancelClose}
+              onMonthSelect={(mi) => {
+                onMonthFilterChange(String(mi + 1));
+                setOpenYmd(null);
+              }}
+              todayYmd={todayYmd}
+            />
+          ))}
+        </div>
+      ) : (
+        <div className="races-cal__month-focus">
+          <nav className="races-cal__month-nav" aria-label="Месяцы года">
+            {MONTH_NAMES_RU_SHORT.map((label, mi) => (
+              <button
+                key={label}
+                type="button"
+                className={`races-cal__month-nav-item${mi === focusedMonthIndex ? " races-cal__month-nav-item--active" : ""}`}
+                onClick={() => {
+                  onMonthFilterChange(String(mi + 1));
+                }}
+              >
+                {label}
+              </button>
+            ))}
+            <button
+              type="button"
+              className="races-cal__month-nav-item races-cal__month-nav-item--all"
+              onClick={() => {
+                onMonthFilterChange("");
+              }}
+            >
+              Весь год
+            </button>
+          </nav>
+          <CalendarMonthBlock
+            year={displayYear}
+            monthIndex={focusedMonthIndex}
+            racesByYmd={racesByYmd}
+            compact={false}
+            navigate={navigate}
+            openYmd={openYmd}
+            setOpenYmd={setOpenYmd}
+            scheduleClose={scheduleClose}
+            cancelClose={cancelClose}
+            todayYmd={todayYmd}
+          />
+        </div>
+      )}
+    </div>
+  );
+}

frontend/src/components/StartTimeSelects.tsx

@@ -0,0 +1,157 @@
+import { useCallback, useMemo } from "react";
+
+function pad2(n: number): string {
+  return String(n).padStart(2, "0");
+}
+
+function parseToParts(value: string): { h: number | null; m: number | null; s: number | null } {
+  const t = value.trim();
+  if (!t) {
+    return { h: null, m: null, s: null };
+  }
+  const parts = t.split(":").map((p) => p.trim());
+  if (parts.length === 2) {
+    const h = Number(parts[0]);
+    const m = Number(parts[1]);
+    if (Number.isInteger(h) && Number.isInteger(m) && h >= 0 && h <= 23 && m >= 0 && m <= 59) {
+      return { h, m, s: 0 };
+    }
+  }
+  if (parts.length >= 3) {
+    const h = Number(parts[0]);
+    const m = Number(parts[1]);
+    const s = Number(parts[2]);
+    if (
+      Number.isInteger(h) &&
+      Number.isInteger(m) &&
+      Number.isInteger(s) &&
+      h >= 0 &&
+      h <= 23 &&
+      m >= 0 &&
+      m <= 59 &&
+      s >= 0 &&
+      s <= 59
+    ) {
+      return { h, m, s };
+    }
+  }
+  return { h: null, m: null, s: null };
+}
+
+function partsToString(h: number | null, m: number | null, s: number | null): string {
+  if (h === null || m === null || s === null) {
+    return "";
+  }
+  return `${pad2(h)}:${pad2(m)}:${pad2(s)}`;
+}
+
+const HOURS = Array.from({ length: 24 }, (_, i) => i);
+const MIN_SEC = Array.from({ length: 60 }, (_, i) => i);
+
+interface StartTimeSelectsProps {
+  value: string;
+  onChange: (next: string) => void;
+  disabled?: boolean;
+}
+
+export function StartTimeSelects(props: StartTimeSelectsProps): JSX.Element {
+  const { value, onChange, disabled } = props;
+  const { h, m, s } = useMemo(() => parseToParts(value), [value]);
+
+  const emit = useCallback(
+    (nextH: number | null, nextM: number | null, nextS: number | null) => {
+      onChange(partsToString(nextH, nextM, nextS));
+    },
+    [onChange],
+  );
+
+  const hourVal = h === null ? "" : String(h);
+  const minVal = m === null ? "" : String(m);
+  const secVal = s === null ? "" : String(s);
+
+  return (
+    <div className="race-form__time-picker">
+      <label className="race-form__time-picker__unit">
+        <span className="race-form__time-picker__label">Часы</span>
+        <select
+          className="race-form__input race-form__time-picker__select"
+          aria-label="Часы"
+          disabled={disabled}
+          value={hourVal}
+          onChange={(e) => {
+            const v = e.target.value;
+            if (v === "") {
+              emit(null, null, null);
+              return;
+            }
+            const nh = Number(v);
+            emit(nh, m ?? 0, s ?? 0);
+          }}
+        >
+          <option value="">—</option>
+          {HOURS.map((n) => (
+            <option key={n} value={String(n)}>
+              {pad2(n)}
+            </option>
+          ))}
+        </select>
+      </label>
+      <span className="race-form__time-picker__sep" aria-hidden>
+        :
+      </span>
+      <label className="race-form__time-picker__unit">
+        <span className="race-form__time-picker__label">Минуты</span>
+        <select
+          className="race-form__input race-form__time-picker__select"
+          aria-label="Минуты"
+          disabled={disabled}
+          value={minVal}
+          onChange={(e) => {
+            const v = e.target.value;
+            if (v === "") {
+              emit(null, null, null);
+              return;
+            }
+            const nm = Number(v);
+            emit(h ?? 0, nm, s ?? 0);
+          }}
+        >
+          <option value="">—</option>
+          {MIN_SEC.map((n) => (
+            <option key={n} value={String(n)}>
+              {pad2(n)}
+            </option>
+          ))}
+        </select>
+      </label>
+      <span className="race-form__time-picker__sep" aria-hidden>
+        :
+      </span>
+      <label className="race-form__time-picker__unit">
+        <span className="race-form__time-picker__label">Секунды</span>
+        <select
+          className="race-form__input race-form__time-picker__select"
+          aria-label="Секунды"
+          disabled={disabled}
+          value={secVal}
+          onChange={(e) => {
+            const v = e.target.value;
+            if (v === "") {
+              emit(null, null, null);
+              return;
+            }
+            const ns = Number(v);
+            emit(h ?? 0, m ?? 0, ns);
+          }}
+        >
+          <option value="">—</option>
+          {MIN_SEC.map((n) => (
+            <option key={n} value={String(n)}>
+              {pad2(n)}
+            </option>
+          ))}
+        </select>
+      </label>
+    </div>
+  );
+}

frontend/src/components/index.ts

@@ -1 +1,4 @@
+export { DatePickerField } from "./DatePickerField";
 export { PaceTrendChart } from "./PaceTrendChart";
+export { RacesCalendar } from "./RacesCalendar";
+export { StartTimeSelects } from "./StartTimeSelects";

frontend/src/lib/calendarUtils.ts

@@ -0,0 +1,53 @@
+import type { Race } from "../api";
+
+export const WEEKDAY_LABELS_SHORT_RU: string[] = ["Пн", "Вт", "Ср", "Чт", "Пт", "Сб", "Вс"];
+
+/** Monday-based week: Mon=0 ... Sun=6 */
+function mondayIndexFromJsDay(jsDay: number): number {
+  return (jsDay + 6) % 7;
+}
+
+/** Monday-based week: Mon=0 ... Sun=6 */
+export function mondayIndexFromDate(d: Date): number {
+  return mondayIndexFromJsDay(d.getDay());
+}
+
+/** Grid cells for one month: `null` = empty, `1..31` = day of month. Padded to full weeks, at least 6 rows. */
+export function buildMonthCells(year: number, monthIndex: number): (number | null)[] {
+  const lead = mondayIndexFromJsDay(new Date(Date.UTC(year, monthIndex, 1)).getUTCDay());
+  const dim = new Date(Date.UTC(year, monthIndex + 1, 0)).getUTCDate();
+  const cells: (number | null)[] = [];
+  for (let i = 0; i < lead; i += 1) {
+    cells.push(null);
+  }
+  for (let day = 1; day <= dim; day += 1) {
+    cells.push(day);
+  }
+  while (cells.length % 7 !== 0) {
+    cells.push(null);
+  }
+  while (cells.length < 42) {
+    cells.push(null);
+  }
+  return cells;
+}
+
+export function toYmd(year: number, monthIndex: number, day: number): string {
+  const m = String(monthIndex + 1).padStart(2, "0");
+  const d = String(day).padStart(2, "0");
+  return `${year}-${m}-${d}`;
+}
+
+export function groupRacesByYmd(races: Race[]): Map<string, Race[]> {
+  const map = new Map<string, Race[]>();
+  for (const race of races) {
+    const ymd = race.date.slice(0, 10);
+    if (!/^\d{4}-\d{2}-\d{2}$/.test(ymd)) {
+      continue;
+    }
+    const list = map.get(ymd) ?? [];
+    list.push(race);
+    map.set(ymd, list);
+  }
+  return map;
+}

frontend/src/lib/index.ts

@@ -6,6 +6,7 @@ export {
   getRaceStatusClassName,
   getRaceStatusLabel,
   isCloseDistance,
+  isRaceDateInPast,
   parseFinishTimeToSeconds,
   parseRaceDate,
   raceNeedsResultEntry,
@@ -13,3 +14,7 @@ export {
   sortByDateDesc,
   splitRacesByDate,
 } from "./raceMetrics";
+
+export { buildMonthCells, groupRacesByYmd, toYmd, WEEKDAY_LABELS_SHORT_RU } from "./calendarUtils";
+export { getRaceVisual } from "./raceVisuals";
+export type { RaceVisualVariant } from "./raceVisuals";

frontend/src/lib/raceMetrics.ts

@@ -12,6 +12,13 @@ export function parseRaceDate(date: string): Date {
   return parsed;
 }
 
+/** Дата старта (календарный день) строго раньше сегодняшней полуночи по локали. */
+export function isRaceDateInPast(raceDate: string, now: Date = new Date()): boolean {
+  const today = new Date(now);
+  today.setHours(0, 0, 0, 0);
+  return parseRaceDate(raceDate).getTime() < today.getTime();
+}
+
 export function parseFinishTimeToSeconds(value: string | null): number | null {
   if (!value) {
     return null;

frontend/src/lib/raceVisuals.ts

@@ -0,0 +1,206 @@
+import type { Race } from "../api";
+
+export type RaceVisualVariant = "short" | "half" | "marathon" | "trail" | "night";
+export type RaceVisualFit = "cover" | "contain";
+
+interface RaceVisual {
+  variant: RaceVisualVariant;
+  imageSrc: string;
+  fallbackSrc: string;
+  imageFit: RaceVisualFit;
+  label: string;
+}
+
+interface OfficialRaceVisual {
+  keywords: string[];
+  imageSrc: string;
+  imageFit?: RaceVisualFit;
+  label: string;
+}
+
+const FALLBACK_VISUALS: Record<RaceVisualVariant, RaceVisual> = {
+  short: {
+    variant: "short",
+    imageSrc: "/images/race-short.jpg",
+    fallbackSrc: "/images/race-short.jpg",
+    imageFit: "cover",
+    label: "Городской темп",
+  },
+  half: {
+    variant: "half",
+    imageSrc: "/images/race-half.jpg",
+    fallbackSrc: "/images/race-half.jpg",
+    imageFit: "cover",
+    label: "Полумарафон",
+  },
+  marathon: {
+    variant: "marathon",
+    imageSrc: "/images/race-marathon.jpg",
+    fallbackSrc: "/images/race-marathon.jpg",
+    imageFit: "cover",
+    label: "Марафон",
+  },
+  trail: {
+    variant: "trail",
+    imageSrc: "/images/race-trail.jpg",
+    fallbackSrc: "/images/race-trail.jpg",
+    imageFit: "cover",
+    label: "Трейл",
+  },
+  night: {
+    variant: "night",
+    imageSrc: "/images/race-night.jpg",
+    fallbackSrc: "/images/race-night.jpg",
+    imageFit: "cover",
+    label: "Ночной старт",
+  },
+};
+
+const OFFICIAL_VISUALS: OfficialRaceVisual[] = [
+  {
+    keywords: ["забег апрель"],
+    imageSrc: "https://aprilrun5km.runc.run/uploads/page_card_photos/AprilRun_photo_1.jpg",
+    label: "Забег Апрель",
+  },
+  {
+    keywords: ["быстрый пес"],
+    imageSrc: "https://fastdogxc.runc.run/uploads/page_card_photos/Dog_spring_2026-5.jpg",
+    label: "Кросс",
+  },
+  {
+    keywords: ["лисья гора"],
+    imageSrc: "https://foxhillxc.runc.run/uploads/page_card_photos/Fox_Spring_2026-0.jpg",
+    label: "Кросс",
+  },
+  {
+    keywords: ["казанский марафон"],
+    imageSrc: "https://static.tildacdn.com/tild3961-6436-4462-b738-356665613039/Frame_2131327895.png",
+    imageFit: "contain",
+    label: "Казанский марафон",
+  },
+  {
+    keywords: ["мышкинский полумарафон", "по шести холмам"],
+    imageSrc: "https://static.tildacdn.com/tild6133-6137-4865-b166-623532313531/photo.jpg",
+    label: "Золотое кольцо",
+  },
+  {
+    keywords: ["забег.рф", "забег рф"],
+    imageSrc: "https://xn--80acghh.xn--p1ai/zabeg.jpg",
+    label: "ЗаБег.РФ",
+  },
+  {
+    keywords: ["переславский марафон", "александровские версты"],
+    imageSrc: "https://static.tildacdn.com/tild6432-3338-4533-b262-633339353335/photo_1.jpg",
+    label: "Золотое кольцо",
+  },
+  {
+    keywords: ["красочный забег"],
+    imageSrc: "https://colorrun5km.runc.run/uploads/page_card_photos/ColorRun2026-1.jpg",
+    label: "Красочный забег",
+  },
+  {
+    keywords: ["здорово кострома", "здорово, кострома"],
+    imageSrc: "https://static.tildacdn.com/tild6139-3539-4661-b232-386230336431/kostroma.jpg",
+    label: "Золотое кольцо",
+  },
+  {
+    keywords: ["ночной забег москва"],
+    imageSrc: "https://nightrun10km.runc.run/uploads/page_card_photos/NightRun_2026-9.jpg",
+    label: "Ночной забег",
+  },
+  {
+    keywords: ["белые ночи"],
+    imageSrc: "https://wnmarathon.runc.run/uploads/page_card_photos/WN_photo_01.jpg",
+    label: "Белые ночи",
+  },
+  {
+    keywords: ["сергиевым путем", "сергиевым путём"],
+    imageSrc: "https://static.tildacdn.com/tild6236-3466-4239-b666-393061326338/serg.jpg",
+    label: "Золотое кольцо",
+  },
+  {
+    keywords: ["ночной забег нижний новгород"],
+    imageSrc: "https://rrweb.russiarunning.com/-x740/generalimages/0531a1b8-3876-4620-8961-2fa374e474e5.png",
+    imageFit: "contain",
+    label: "Ночной забег",
+  },
+  {
+    keywords: ["suvorov extreme"],
+    imageSrc: "https://goldenultra.ru/grut/files/photos/100.jpg",
+    label: "Трейл",
+  },
+  {
+    keywords: ["рыбинский полумарафон", "великий хлебный путь"],
+    imageSrc: "https://static.tildacdn.com/tild6130-3230-4332-b932-366166366633/photo.jpg",
+    label: "Золотое кольцо",
+  },
+  {
+    keywords: ["ярославский полумарафон", "золотое кольцо"],
+    imageSrc: "https://static.tildacdn.com/tild6331-6333-4635-b635-376262373361/photo.jpg",
+    label: "Золотое кольцо",
+  },
+  {
+    keywords: ["моя столица"],
+    imageSrc: "https://static.tildacdn.com/tild3263-3036-4639-b830-653365663832/-min.jpg",
+    imageFit: "contain",
+    label: "Моя столица",
+  },
+];
+
+function normalizeTitle(value: string): string {
+  return value
+    .toLowerCase()
+    .replaceAll("ё", "е")
+    .replace(/[«»|]/g, " ")
+    .replace(/[^\p{L}\p{N}.&]+/gu, " ")
+    .replace(/\s+/g, " ")
+    .trim();
+}
+
+function getFallbackRaceVisual(race: Race): RaceVisual {
+  const title = normalizeTitle(race.title);
+
+  if (title.includes("ночной")) {
+    return FALLBACK_VISUALS.night;
+  }
+
+  if (
+    title.includes("trail") ||
+    title.includes("extreme") ||
+    title.includes("suvorov") ||
+    title.includes("трейл") ||
+    title.includes("экстрим")
+  ) {
+    return FALLBACK_VISUALS.trail;
+  }
+
+  if (Math.abs(race.distanceKm - 42.2) < 0.8) {
+    return FALLBACK_VISUALS.marathon;
+  }
+
+  if (Math.abs(race.distanceKm - 21.1) < 0.4) {
+    return FALLBACK_VISUALS.half;
+  }
+
+  return FALLBACK_VISUALS.short;
+}
+
+export function getRaceVisual(race: Race): RaceVisual {
+  const fallback = getFallbackRaceVisual(race);
+  const title = normalizeTitle(race.title);
+  const official = OFFICIAL_VISUALS.find((visual) =>
+    visual.keywords.some((keyword) => title.includes(normalizeTitle(keyword))),
+  );
+
+  if (!official) {
+    return fallback;
+  }
+
+  return {
+    ...fallback,
+    imageSrc: official.imageSrc,
+    fallbackSrc: fallback.imageSrc,
+    imageFit: official.imageFit ?? fallback.imageFit,
+    label: official.label,
+  };
+}

frontend/src/pages/DashboardPage.tsx

@@ -1,4 +1,5 @@
 import { useEffect, useMemo, useState } from "react";
+import { Link } from "react-router-dom";
 import type { Race } from "../api";
 import { ApiError, getRaces } from "../api";
 import { PaceTrendChart } from "../components";
@@ -61,26 +62,14 @@ export function DashboardPage(): JSX.Element {
 
   const dashboardMetrics = useMemo(() => {
     const { upcoming, past } = splitRacesByDate(races);
-    const completed = races.filter((race) => race.status === "completed");
 
     const nextRace = upcoming[0] ?? null;
     const lastResult = past.find((race) => race.status === "completed") ?? null;
 
-    let personalRecord: Race | null = null;
+    const lastPersonalRecord =
-    let personalRecordSeconds = Number.POSITIVE_INFINITY;
+      past.find(
-
+        (race) => race.status === "completed" && parseFinishTimeToSeconds(race.finishTime) !== null,
-    for (const race of completed) {
+      ) ?? null;
-      const finishSeconds = parseFinishTimeToSeconds(race.finishTime);
-      if (!finishSeconds) {
-        continue;
-      }
-
-      const candidate = finishSeconds / race.distanceKm;
-      if (candidate < personalRecordSeconds) {
-        personalRecordSeconds = candidate;
-        personalRecord = race;
-      }
-    }
 
     const currentYear = new Date().getFullYear();
     const seasonRaces = races.filter((race) => parseRaceDate(race.date).getFullYear() === currentYear);
@@ -89,7 +78,7 @@ export function DashboardPage(): JSX.Element {
     return {
       nextRace,
       lastResult,
-      personalRecord,
+      lastPersonalRecord,
       seasonTotal: seasonRaces.length,
       seasonCompletedCount: seasonCompleted.length,
     };
@@ -143,6 +132,11 @@ export function DashboardPage(): JSX.Element {
       .sort((left, right) => right.year - left.year || left.title.localeCompare(right.title, "ru-RU"));
   }, [races]);
 
+  const seasonProgress =
+    dashboardMetrics.seasonTotal > 0
+      ? Math.round((dashboardMetrics.seasonCompletedCount / dashboardMetrics.seasonTotal) * 100)
+      : 0;
+
   if (isLoading) {
     return (
       <section className="page page--dashboard" aria-busy="true">
@@ -163,60 +157,125 @@ export function DashboardPage(): JSX.Element {
 
   return (
     <section className="page page--dashboard">
-      <h1 className="page__title">Обзор</h1>
+      <section className="dashboard-hero" aria-label="Обзор сезона">
-      <p className="page__subtitle">Ключевые метрики по вашему календарю стартов.</p>
+        <div className="dashboard-hero__content">
+          <p className="dashboard-hero__eyebrow">Календарь сезона</p>
+          <h1 className="dashboard-hero__title">Беговой штаб</h1>
+          <p className="dashboard-hero__text">
+            Планируйте старты, держите фокус на ближайшей гонке и сравнивайте прогресс по дистанциям.
+          </p>
+          <div className="dashboard-hero__actions">
+            <Link className="btn btn--primary" to="/races">
+              Смотреть старты
+            </Link>
+            <Link className="btn btn--secondary dashboard-hero__secondary" to="/races/new">
+              Добавить старт
+            </Link>
+          </div>
+        </div>
+        <div className="dashboard-hero__panel">
+          <p className="dashboard-hero__panel-label">Ближайший старт</p>
+          {dashboardMetrics.nextRace ? (
+            <Link className="dashboard-hero__race-link" to={`/races/${dashboardMetrics.nextRace.id}`}>
+              <span className="dashboard-hero__race-title">{dashboardMetrics.nextRace.title}</span>
+              <span className="dashboard-hero__race-meta">
+                {formatRaceDate(dashboardMetrics.nextRace.date)} · {formatDistance(dashboardMetrics.nextRace.distanceKm)}
+              </span>
+              <span className="dashboard-hero__race-countdown">
+                {getRaceCountdownLabel(dashboardMetrics.nextRace.date)}
+              </span>
+            </Link>
+          ) : (
+            <p className="dashboard-hero__empty">Запланируйте первый старт сезона.</p>
+          )}
+        </div>
+      </section>
 
       <div className="dashboard-grid" aria-label="Ключевые метрики">
-        <article className="dashboard-card">
+        <article
-          <h2 className="dashboard-card__title">Ближайший старт</h2>
+          className={`dashboard-card dashboard-card--accent-blue${dashboardMetrics.nextRace ? " dashboard-card--linked" : ""}`}
+        >
           {dashboardMetrics.nextRace ? (
-            <>
+            <Link
+              className="dashboard-card__link-surface"
+              to={`/races/${dashboardMetrics.nextRace.id}`}
+              aria-label={`Ближайший старт: ${dashboardMetrics.nextRace.title}`}
+            >
+              <h2 className="dashboard-card__title">Ближайший старт</h2>
               <p className="dashboard-card__value">{dashboardMetrics.nextRace.title}</p>
               <p className="dashboard-card__meta">
-                {formatRaceDate(dashboardMetrics.nextRace.date)} · {formatDistance(dashboardMetrics.nextRace.distanceKm)}
+                {formatRaceDate(dashboardMetrics.nextRace.date)} ·{" "}
+                {formatDistance(dashboardMetrics.nextRace.distanceKm)}
               </p>
               <p className="dashboard-card__hint">{getRaceCountdownLabel(dashboardMetrics.nextRace.date)}</p>
-            </>
+            </Link>
           ) : (
-            <p className="dashboard-card__empty">Нет запланированных стартов.</p>
+            <>
+              <h2 className="dashboard-card__title">Ближайший старт</h2>
+              <p className="dashboard-card__empty">Нет запланированных стартов.</p>
+            </>
           )}
         </article>
 
-        <article className="dashboard-card">
+        <article
-          <h2 className="dashboard-card__title">Последний результат</h2>
+          className={`dashboard-card dashboard-card--accent-coral${dashboardMetrics.lastResult ? " dashboard-card--linked" : ""}`}
+        >
           {dashboardMetrics.lastResult ? (
-            <>
+            <Link
+              className="dashboard-card__link-surface"
+              to={`/races/${dashboardMetrics.lastResult.id}`}
+              aria-label={`Последний результат: ${dashboardMetrics.lastResult.title}`}
+            >
+              <h2 className="dashboard-card__title">Последний результат</h2>
               <p className="dashboard-card__value">{dashboardMetrics.lastResult.finishTime ?? "время не указано"}</p>
               <p className="dashboard-card__meta">
                 {dashboardMetrics.lastResult.title} · {formatDistance(dashboardMetrics.lastResult.distanceKm)}
               </p>
               <p className="dashboard-card__hint">{formatRaceDate(dashboardMetrics.lastResult.date)}</p>
-            </>
+            </Link>
           ) : (
-            <p className="dashboard-card__empty">Пока нет завершённых стартов.</p>
-          )}
-        </article>
-
-        <article className="dashboard-card">
-          <h2 className="dashboard-card__title">Личный рекорд</h2>
-          {dashboardMetrics.personalRecord ? (
             <>
-              <p className="dashboard-card__value">{dashboardMetrics.personalRecord.finishTime ?? "время не указано"}</p>
+              <h2 className="dashboard-card__title">Последний результат</h2>
-              <p className="dashboard-card__meta">
+              <p className="dashboard-card__empty">Пока нет завершённых стартов.</p>
-                {dashboardMetrics.personalRecord.title} · {formatDistance(dashboardMetrics.personalRecord.distanceKm)}
-              </p>
-              <p className="dashboard-card__hint">Лучший темп среди завершённых стартов.</p>
             </>
-          ) : (
-            <p className="dashboard-card__empty">Недостаточно данных для личного рекорда.</p>
           )}
         </article>
 
-        <article className="dashboard-card">
+        <article
+          className={`dashboard-card dashboard-card--accent-lime${dashboardMetrics.lastPersonalRecord ? " dashboard-card--linked" : ""}`}
+        >
+          {dashboardMetrics.lastPersonalRecord ? (
+            <Link
+              className="dashboard-card__link-surface"
+              to={`/races/${dashboardMetrics.lastPersonalRecord.id}`}
+              aria-label={`Последний личный рекорд: ${dashboardMetrics.lastPersonalRecord.title}`}
+            >
+              <h2 className="dashboard-card__title">Последний личный рекорд</h2>
+              <p className="dashboard-card__value">
+                {dashboardMetrics.lastPersonalRecord.finishTime ?? "время не указано"}
+              </p>
+              <p className="dashboard-card__meta">
+                {dashboardMetrics.lastPersonalRecord.title} ·{" "}
+                {formatDistance(dashboardMetrics.lastPersonalRecord.distanceKm)}
+              </p>
+              <p className="dashboard-card__hint">{formatRaceDate(dashboardMetrics.lastPersonalRecord.date)}</p>
+            </Link>
+          ) : (
+            <>
+              <h2 className="dashboard-card__title">Последний личный рекорд</h2>
+              <p className="dashboard-card__empty">Нет завершённых стартов с финишным временем.</p>
+            </>
+          )}
+        </article>
+
+        <article className="dashboard-card dashboard-card--season dashboard-card--accent-violet">
           <h2 className="dashboard-card__title">Сезон</h2>
           <p className="dashboard-card__value">{dashboardMetrics.seasonTotal}</p>
           <p className="dashboard-card__meta">стартов в этом году</p>
           <p className="dashboard-card__hint">Завершено: {dashboardMetrics.seasonCompletedCount}</p>
+          <div className="dashboard-card__progress" aria-label={`Сезон завершен на ${seasonProgress}%`}>
+            <span style={{ width: `${seasonProgress}%` }} />
+          </div>
         </article>
       </div>
 

frontend/src/pages/RaceDayPage.tsx

@@ -0,0 +1,170 @@
+import { useEffect, useMemo, useState } from "react";
+import { Link, useParams } from "react-router-dom";
+import type { Race } from "../api";
+import { ApiError, getRaces } from "../api";
+import {
+  formatDistance,
+  formatRaceDate,
+  getRaceStatusClassName,
+  getRaceStatusLabel,
+  getRaceVisual,
+  sortByDateAsc,
+} from "../lib";
+
+function getErrorMessage(error: unknown): string {
+  if (error instanceof ApiError) {
+    return error.message;
+  }
+  return "Не удалось загрузить старты.";
+}
+
+export function RaceDayPage(): JSX.Element {
+  const { ymd } = useParams<{ ymd: string }>();
+  const [races, setRaces] = useState<Race[]>([]);
+  const [isLoading, setIsLoading] = useState(true);
+  const [errorMessage, setErrorMessage] = useState<string | null>(null);
+
+  const validYmd = ymd && /^\d{4}-\d{2}-\d{2}$/.test(ymd) ? ymd : null;
+  const year = validYmd ? parseInt(validYmd.slice(0, 4), 10) : NaN;
+
+  useEffect(() => {
+    if (!validYmd || Number.isNaN(year)) {
+      setIsLoading(false);
+      setRaces([]);
+      return;
+    }
+
+    const ac = new AbortController();
+    let mounted = true;
+
+    async function load(): Promise<void> {
+      setIsLoading(true);
+      try {
+        const items = await getRaces({ year }, { signal: ac.signal });
+        if (!mounted || ac.signal.aborted) {
+          return;
+        }
+        const forDay = items.filter((r) => r.date.slice(0, 10) === validYmd);
+        setRaces(sortByDateAsc(forDay));
+        setErrorMessage(null);
+      } catch (e) {
+        if (ac.signal.aborted || !mounted) {
+          return;
+        }
+        setErrorMessage(getErrorMessage(e));
+        setRaces([]);
+      } finally {
+        if (mounted && !ac.signal.aborted) {
+          setIsLoading(false);
+        }
+      }
+    }
+
+    void load();
+    return () => {
+      mounted = false;
+      ac.abort();
+    };
+  }, [validYmd, year]);
+
+  const heading = useMemo(() => {
+    if (!validYmd) {
+      return "Дата не указана";
+    }
+    return formatRaceDate(validYmd);
+  }, [validYmd]);
+
+  if (!validYmd) {
+    return (
+      <section className="page page--race-day">
+        <div className="race-day-hero">
+          <p className="race-day-hero__eyebrow">Страница дня</p>
+          <h1 className="page__title">Некорректная дата</h1>
+          <Link className="page-link" to="/races">
+            Вернуться к календарю стартов
+          </Link>
+        </div>
+      </section>
+    );
+  }
+
+  return (
+    <section className="page page--race-day">
+      <section className="race-day-hero" aria-label="Старты дня">
+        <Link className="page-link" to="/races">
+          ← Календарь стартов
+        </Link>
+        <p className="race-day-hero__eyebrow">Старты дня</p>
+        <h1 className="page__title">{heading}</h1>
+        <p className="page__subtitle">
+          {isLoading
+            ? "Загружаем расписание..."
+            : races.length > 0
+              ? `Запланировано стартов: ${races.length}`
+              : "Проверьте расписание или добавьте старт на эту дату."}
+        </p>
+      </section>
+
+      {errorMessage ? (
+        <p className="page__subtitle page__subtitle--error" role="alert">
+          {errorMessage}
+        </p>
+      ) : null}
+
+      {isLoading ? (
+        <p className="page__subtitle" aria-busy="true">
+          Загружаем…
+        </p>
+      ) : null}
+
+      {!isLoading && !errorMessage && races.length === 0 ? (
+        <p className="page__subtitle">На эту дату стартов нет.</p>
+      ) : null}
+
+      {!isLoading && races.length > 0 ? (
+        <ul className="race-day__list">
+          {races.map((race) => {
+            const visual = getRaceVisual(race);
+
+            return (
+              <li key={race.id} className="race-day__item">
+                <Link className="race-day__link" to={`/races/${race.id}`}>
+                  <img
+                    className={`race-day__image${
+                      visual.imageFit === "contain" ? " race-day__image--contain" : ""
+                    }`}
+                    src={visual.imageSrc}
+                    alt=""
+                    loading="lazy"
+                    referrerPolicy="no-referrer"
+                    onError={(event) => {
+                      event.currentTarget.onerror = null;
+                      event.currentTarget.classList.remove("race-day__image--contain");
+                      event.currentTarget.src = visual.fallbackSrc;
+                    }}
+                  />
+                  <span className="race-day__body">
+                    <span className="race-day__kicker">{visual.label}</span>
+                    <span className="race-day__title">{race.title}</span>
+                    <span className="race-day__meta">
+                      {formatDistance(race.distanceKm)} ·{" "}
+                      <span className={getRaceStatusClassName(race.status, race.date)}>
+                        {getRaceStatusLabel(race.status, race.date)}
+                      </span>
+                    </span>
+                  </span>
+                </Link>
+              </li>
+            );
+          })}
+        </ul>
+      ) : null}
+
+      <div className="race-day__actions">
+        <Link className="btn btn--primary" to={`/races/new?date=${validYmd}`}>
+          Добавить
+        </Link>
+      </div>
+    </section>
+  );
+}

frontend/src/pages/RaceDetailsPage.tsx

@@ -7,6 +7,7 @@ import {
   getPaceLabel,
   getRaceStatusClassName,
   getRaceStatusLabel,
+  getRaceVisual,
   raceNeedsResultEntry,
 } from "../lib";
 import type { Race } from "../api";
@@ -139,18 +140,40 @@ export function RaceDetailsPage(): JSX.Element {
   }
 
   const isCompleted = race.status === "completed";
+  const visual = getRaceVisual(race);
 
   return (
     <section className="page page--race-details">
-      <div className="race-details-header">
+      <section className={`race-details-hero race-details-hero--${visual.variant}`} aria-label="Карточка старта">
-        <div className="race-details-header__main">
+        <img
+          className={`race-details-hero__image${
+            visual.imageFit === "contain" ? " race-details-hero__image--contain" : ""
+          }`}
+          src={visual.imageSrc}
+          alt=""
+          loading="eager"
+          referrerPolicy="no-referrer"
+          onError={(event) => {
+            event.currentTarget.onerror = null;
+            event.currentTarget.classList.remove("race-details-hero__image--contain");
+            event.currentTarget.src = visual.fallbackSrc;
+          }}
+        />
+        <div className="race-details-hero__shade" aria-hidden="true" />
+        <div className="race-details-hero__content">
+          <Link className="race-details-hero__back" to="/races">
+            ← Календарь стартов
+          </Link>
+          <p className="race-details-hero__eyebrow">{visual.label}</p>
           <h1 className="page__title">{race.title}</h1>
           <p className="page__subtitle">
             {formatRaceDate(race.date)} · {formatDistance(race.distanceKm)}
           </p>
+          <span className={getRaceStatusClassName(race.status, race.date)}>
+            {getRaceStatusLabel(race.status, race.date)}
+          </span>
         </div>
-        <span className={getRaceStatusClassName(race.status, race.date)}>{getRaceStatusLabel(race.status, race.date)}</span>
+      </section>
-      </div>
 
       {raceNeedsResultEntry(race) ? (
         <p className="race-details-past-hint" role="status">

frontend/src/pages/RaceFormPage.tsx

@@ -1,7 +1,9 @@
 import { useCallback, useEffect, useState } from "react";
-import { Link, useNavigate, useParams } from "react-router-dom";
+import { Link, useNavigate, useParams, useSearchParams } from "react-router-dom";
 import { ApiError, createRace, getRaceById, updateRace } from "../api";
 import type { CreateRacePayload, Race, RaceStatus, UpdateRacePayload } from "../api";
+import { DatePickerField, StartTimeSelects } from "../components";
+import { isRaceDateInPast, parseFinishTimeToSeconds } from "../lib";
 
 function slugify(text: string): string {
   return text
@@ -91,9 +93,21 @@ function validateForm(form: FormData): string[] {
   return errors;
 }
 
+function isRaceDateTodayOrPast(date: string): boolean {
+  if (!date.trim()) {
+    return false;
+  }
+  const today = new Date();
+  const y = today.getFullYear();
+  const m = String(today.getMonth() + 1).padStart(2, "0");
+  const d = String(today.getDate()).padStart(2, "0");
+  return isRaceDateInPast(date) || date.slice(0, 10) === `${y}-${m}-${d}`;
+}
+
 export function RaceFormPage(): JSX.Element {
   const { raceId } = useParams<{ raceId: string }>();
   const navigate = useNavigate();
+  const [searchParams] = useSearchParams();
   const isEditMode = Boolean(raceId);
 
   const [form, setForm] = useState<FormData>(EMPTY_FORM);
@@ -135,10 +149,29 @@ export function RaceFormPage(): JSX.Element {
     };
   }, [raceId]);
 
+  useEffect(() => {
+    if (isEditMode) {
+      return;
+    }
+    const d = searchParams.get("date");
+    if (d && /^\d{4}-\d{2}-\d{2}$/.test(d)) {
+      setForm((prev) => (prev.date === d ? prev : { ...prev, date: d }));
+    }
+  }, [isEditMode, searchParams]);
+
   const handleChange = useCallback(
     (event: React.ChangeEvent<HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement>) => {
       const { name, value } = event.target;
-      setForm((prev) => ({ ...prev, [name]: value }));
+      setForm((prev) => {
+        const next = { ...prev, [name]: value };
+        if (name === "finishTime") {
+          const trimmed = value.trim();
+          if (trimmed !== "" && parseFinishTimeToSeconds(trimmed) !== null) {
+            return { ...next, status: "completed" };
+          }
+        }
+        return next;
+      });
     },
     [],
   );
@@ -157,10 +190,16 @@ export function RaceFormPage(): JSX.Element {
       setIsSaving(true);
 
       try {
-        const statusValue: RaceStatus | null =
+        const finishTrimmed = form.finishTime.trim();
+        const hasParsedFinish =
+          finishTrimmed !== "" && parseFinishTimeToSeconds(finishTrimmed) !== null;
+        let statusValue: RaceStatus | null =
           form.status === "planned" || form.status === "registered" || form.status === "completed"
             ? form.status
             : null;
+        if (hasParsedFinish) {
+          statusValue = "completed";
+        }
 
         if (isEditMode && raceId) {
           const payload: UpdateRacePayload = {
@@ -214,6 +253,8 @@ export function RaceFormPage(): JSX.Element {
     [form, isEditMode, raceId, navigate],
   );
 
+  const hideOrgScheduleFields = isEditMode && isRaceDateInPast(form.date);
+  const showResultFields = isRaceDateTodayOrPast(form.date);
   const pageTitle = isEditMode ? "Редактирование старта" : "Новый старт";
 
   if (isLoading) {
@@ -245,17 +286,17 @@ export function RaceFormPage(): JSX.Element {
         <fieldset className="race-form__group">
           <legend className="race-form__legend">Основная информация</legend>
 
-          <label className="race-form__field">
+          <div className="race-form__field">
             <span className="race-form__label">Дата *</span>
-            <input
+            <DatePickerField
-              className="race-form__input"
-              type="date"
               name="date"
               value={form.date}
-              onChange={handleChange}
+              onChange={(next) => {
+                setForm((prev) => ({ ...prev, date: next }));
+              }}
               required
             />
-          </label>
+          </div>
 
           <label className="race-form__field">
             <span className="race-form__label">Название *</span>
@@ -303,51 +344,57 @@ export function RaceFormPage(): JSX.Element {
         <fieldset className="race-form__group">
           <legend className="race-form__legend">Организация</legend>
 
-          <label className="race-form__field">
+          {hideOrgScheduleFields ? null : (
-            <span className="race-form__label">Сайт организатора</span>
+            <label className="race-form__field">
-            <input
+              <span className="race-form__label">Сайт организатора</span>
-              className="race-form__input"
+              <input
-              type="url"
+                className="race-form__input"
-              name="officialUrl"
+                type="url"
-              value={form.officialUrl}
+                name="officialUrl"
-              onChange={handleChange}
+                value={form.officialUrl}
-              placeholder="https://…"
+                onChange={handleChange}
-            />
+                placeholder="https://…"
-          </label>
+              />
+            </label>
+          )}
 
-          <label className="race-form__field">
+          {hideOrgScheduleFields ? null : (
-            <span className="race-form__label">Время старта</span>
+            <div className="race-form__field">
-            <input
+              <span className="race-form__label">Время старта</span>
-              className="race-form__input"
+              <StartTimeSelects
-              type="text"
+                value={form.startTime}
-              name="startTime"
+                onChange={(next) => {
-              value={form.startTime}
+                  setForm((prev) => ({ ...prev, startTime: next }));
-              onChange={handleChange}
+                }}
-              placeholder="09:30"
+              />
-            />
+            </div>
-          </label>
+          )}
 
-          <label className="race-form__field">
+          {hideOrgScheduleFields ? null : (
-            <span className="race-form__label">Расписание кластеров</span>
+            <label className="race-form__field">
-            <input
+              <span className="race-form__label">Расписание кластеров</span>
-              className="race-form__input"
+              <input
-              type="text"
+                className="race-form__input"
-              name="clusterSchedule"
+                type="text"
-              value={form.clusterSchedule}
+                name="clusterSchedule"
-              onChange={handleChange}
+                value={form.clusterSchedule}
-            />
+                onChange={handleChange}
-          </label>
+              />
+            </label>
+          )}
 
-          <label className="race-form__field">
+          {hideOrgScheduleFields ? null : (
-            <span className="race-form__label">Выдача номеров</span>
+            <label className="race-form__field">
-            <input
+              <span className="race-form__label">Выдача номеров</span>
-              className="race-form__input"
+              <input
-              type="text"
+                className="race-form__input"
-              name="bibPickup"
+                type="text"
-              value={form.bibPickup}
+                name="bibPickup"
-              onChange={handleChange}
+                value={form.bibPickup}
-            />
+                onChange={handleChange}
-          </label>
+              />
+            </label>
+          )}
 
           <label className="race-form__field">
             <span className="race-form__label">Стартовый номер</span>
@@ -362,33 +409,35 @@ export function RaceFormPage(): JSX.Element {
           </label>
         </fieldset>
 
-        <fieldset className="race-form__group">
+        {showResultFields ? (
-          <legend className="race-form__legend">Результаты</legend>
+          <fieldset className="race-form__group">
+            <legend className="race-form__legend">Результаты</legend>
 
-          <label className="race-form__field">
+            <label className="race-form__field">
-            <span className="race-form__label">Финишное время</span>
+              <span className="race-form__label">Финишное время</span>
-            <input
+              <input
-              className="race-form__input"
+                className="race-form__input"
-              type="text"
+                type="text"
-              name="finishTime"
+                name="finishTime"
-              value={form.finishTime}
+                value={form.finishTime}
-              onChange={handleChange}
+                onChange={handleChange}
-              placeholder="1:45:30"
+                placeholder="1:45:30"
-            />
+              />
-          </label>
+            </label>
 
-          <label className="race-form__field">
+            <label className="race-form__field">
-            <span className="race-form__label">Место на финише</span>
+              <span className="race-form__label">Место на финише</span>
-            <input
+              <input
-              className="race-form__input"
+                className="race-form__input"
-              type="text"
+                type="text"
-              name="finishPlace"
+                name="finishPlace"
-              value={form.finishPlace}
+                value={form.finishPlace}
-              onChange={handleChange}
+                onChange={handleChange}
-              placeholder="12/340"
+                placeholder="12/340"
-            />
+              />
-          </label>
+            </label>
-        </fieldset>
+          </fieldset>
+        ) : null}
 
         <fieldset className="race-form__group">
           <legend className="race-form__legend">Дополнительно</legend>

frontend/src/pages/RacesPage.tsx

@@ -1,13 +1,17 @@
-import { useEffect, useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
 import { Link } from "react-router-dom";
 import type { Race, RacesQuery } from "../api";
 import { ApiError, getRaces } from "../api";
+import { RacesCalendar } from "../components/RacesCalendar";
 import {
   formatDistance,
   formatRaceDate,
+  getRaceVisual,
   getRaceStatusClassName,
   getRaceStatusLabel,
-  splitRacesByDate,
+  parseRaceDate,
+  sortByDateAsc,
+  sortByDateDesc,
 } from "../lib";
 
 const MONTH_OPTIONS: { value: string; label: string }[] = [
@@ -26,6 +30,10 @@ const MONTH_OPTIONS: { value: string; label: string }[] = [
   { value: "12", label: "Декабрь" },
 ];
 
+const VIEW_STORAGE_KEY = "races-view-mode";
+
+type ViewMode = "list" | "calendar";
+
 function yearSelectOptions(): number[] {
   const current = new Date().getFullYear();
   const start = current - 2;
@@ -44,6 +52,15 @@ function getErrorMessage(error: unknown): string {
   return "Не удалось загрузить календарь стартов.";
 }
 
+function readInitialViewMode(): ViewMode {
+  try {
+    const v = sessionStorage.getItem(VIEW_STORAGE_KEY);
+    return v === "calendar" ? "calendar" : "list";
+  } catch {
+    return "list";
+  }
+}
+
 function RaceList(props: { title: string; races: Race[] }): JSX.Element {
   const { title, races } = props;
 
@@ -52,21 +69,60 @@ function RaceList(props: { title: string; races: Race[] }): JSX.Element {
       <h2 className="race-list__title">{title}</h2>
       {races.length > 0 ? (
         <ul className="race-list__items">
-          {races.map((race) => (
+          {races.map((race) => {
-            <li key={race.id} className="race-card">
+            const visual = getRaceVisual(race);
-              <div className="race-card__main">
+            const parsedDate = parseRaceDate(race.date);
-                <p className="race-card__title">
+            const day = parsedDate.toLocaleDateString("ru-RU", { day: "2-digit" });
-                  <Link className="race-card__link" to={`/races/${race.id}`}>
+            const month = parsedDate.toLocaleDateString("ru-RU", { month: "short" });
-                    {race.title}
+
-                  </Link>
+            return (
-                </p>
+              <li key={race.id} className={`race-card race-card--action race-card--poster race-card--${visual.variant}`}>
-                <p className="race-card__meta">
+                <Link
-                  {formatRaceDate(race.date)} · {formatDistance(race.distanceKm)}
+                  className="race-card__link-surface"
-                </p>
+                  to={`/races/${race.id}`}
-              </div>
+                  aria-label={`Старт: ${race.title}`}
-              <span className={getRaceStatusClassName(race.status, race.date)}>{getRaceStatusLabel(race.status, race.date)}</span>
+                >
-            </li>
+                  <div className="race-card__image-wrap">
-          ))}
+                    <img
+                      className={`race-card__image${
+                        visual.imageFit === "contain" ? " race-card__image--contain" : ""
+                      }`}
+                      src={visual.imageSrc}
+                      alt=""
+                      loading="lazy"
+                      referrerPolicy="no-referrer"
+                      onError={(event) => {
+                        event.currentTarget.onerror = null;
+                        event.currentTarget.classList.remove("race-card__image--contain");
+                        event.currentTarget.src = visual.fallbackSrc;
+                      }}
+                    />
+                    <span className="race-card__date-badge">
+                      <span>{day}</span>
+                      <span>{month}</span>
+                    </span>
+                  </div>
+                  <div className="race-card__content">
+                    <div className="race-card__main">
+                      <p className="race-card__kicker">{visual.label}</p>
+                      <p className="race-card__title">
+                        <span className="race-card__title-text">{race.title}</span>
+                      </p>
+                      <p className="race-card__meta">
+                        {formatRaceDate(race.date)} · {formatDistance(race.distanceKm)}
+                      </p>
+                    </div>
+                    <div className="race-card__footer">
+                      <span className={getRaceStatusClassName(race.status, race.date)}>
+                        {getRaceStatusLabel(race.status, race.date)}
+                      </span>
+                      <span className="race-card__cta">Открыть</span>
+                    </div>
+                  </div>
+                </Link>
+              </li>
+            );
+          })}
         </ul>
       ) : (
         <p className="race-list__empty">Пока нет данных в этом разделе.</p>
@@ -81,8 +137,34 @@ export function RacesPage(): JSX.Element {
   const [errorMessage, setErrorMessage] = useState<string | null>(null);
   const [yearFilter, setYearFilter] = useState<string>("");
   const [monthFilter, setMonthFilter] = useState<string>("");
+  const [viewMode, setViewMode] = useState<ViewMode>(() => readInitialViewMode());
+
+  const setViewModePersist = useCallback((mode: ViewMode) => {
+    setViewMode(mode);
+    try {
+      sessionStorage.setItem(VIEW_STORAGE_KEY, mode);
+    } catch {
+      /* ignore */
+    }
+  }, []);
+
+  const handleViewList = useCallback(() => {
+    setViewModePersist("list");
+  }, [setViewModePersist]);
+
+  const handleViewCalendar = useCallback(() => {
+    setViewModePersist("calendar");
+    setYearFilter((prev) => (prev === "" ? String(new Date().getFullYear()) : prev));
+  }, [setViewModePersist]);
 
   const listQuery = useMemo((): RacesQuery | undefined => {
+    if (viewMode === "calendar") {
+      const y = yearFilter !== "" ? parseInt(yearFilter, 10) : new Date().getFullYear();
+      if (!Number.isNaN(y)) {
+        return { year: y };
+      }
+      return undefined;
+    }
     const q: RacesQuery = {};
     if (yearFilter !== "") {
       const y = parseInt(yearFilter, 10);
@@ -97,7 +179,15 @@ export function RacesPage(): JSX.Element {
       }
     }
     return Object.keys(q).length > 0 ? q : undefined;
-  }, [yearFilter, monthFilter]);
+  }, [viewMode, yearFilter, monthFilter]);
+
+  const displayYear = useMemo(() => {
+    if (yearFilter !== "") {
+      const y = parseInt(yearFilter, 10);
+      return Number.isNaN(y) ? new Date().getFullYear() : y;
+    }
+    return new Date().getFullYear();
+  }, [yearFilter]);
 
   useEffect(() => {
     const ac = new AbortController();
@@ -131,7 +221,13 @@ export function RacesPage(): JSX.Element {
     };
   }, [listQuery]);
 
-  const { upcoming, past } = useMemo(() => splitRacesByDate(races), [races]);
+  const { upcoming, completed } = useMemo(
+    () => ({
+      upcoming: sortByDateAsc(races.filter((race) => race.status !== "completed")),
+      completed: sortByDateDesc(races.filter((race) => race.status === "completed")),
+    }),
+    [races],
+  );
 
   if (errorMessage && races.length === 0 && !isLoading) {
     return (
@@ -144,8 +240,66 @@ export function RacesPage(): JSX.Element {
 
   return (
     <section className="page page--races">
-      <h1 className="page__title">Календарь стартов</h1>
+      <section className="races-hero" aria-label="Календарь стартов">
-      <p className="page__subtitle">Будущие и прошедшие старты в одном месте.</p>
+        <div className="races-hero__content">
+          <p className="races-hero__eyebrow">Сезонная афиша</p>
+          <h1 className="page__title">Календарь стартов</h1>
+          <p className="page__subtitle">Будущие и прошедшие старты в одном месте.</p>
+          <div className="races-view-toggle" role="group" aria-label="Вид отображения">
+            <button
+              type="button"
+              className={`races-view-toggle__btn${viewMode === "list" ? " races-view-toggle__btn--active" : ""}`}
+              onClick={handleViewList}
+            >
+              Список
+            </button>
+            <button
+              type="button"
+              className={`races-view-toggle__btn${viewMode === "calendar" ? " races-view-toggle__btn--active" : ""}`}
+              onClick={handleViewCalendar}
+            >
+              Календарь
+            </button>
+          </div>
+        </div>
+        <div className="races-hero__filters">
+          <div className="races-filter" role="search" aria-label="Фильтр по дате">
+            <label className="races-filter__field">
+              <span className="races-filter__label">Год</span>
+              <select
+                className="races-filter__select"
+                value={viewMode === "list" ? yearFilter : yearFilter || String(displayYear)}
+                onChange={(event) => {
+                  setYearFilter(event.target.value);
+                }}
+              >
+                {viewMode === "list" ? <option value="">Все года</option> : null}
+                {yearSelectOptions().map((y) => (
+                  <option key={y} value={String(y)}>
+                    {y}
+                  </option>
+                ))}
+              </select>
+            </label>
+            <label className="races-filter__field">
+              <span className="races-filter__label">Месяц</span>
+              <select
+                className="races-filter__select"
+                value={monthFilter}
+                onChange={(event) => {
+                  setMonthFilter(event.target.value);
+                }}
+              >
+                {MONTH_OPTIONS.map((opt) => (
+                  <option key={opt.value || "all"} value={opt.value}>
+                    {opt.label}
+                  </option>
+                ))}
+              </select>
+            </label>
+          </div>
+        </div>
+      </section>
 
       {errorMessage && !isLoading ? (
         <p className="page__subtitle page__subtitle--error" role="alert" style={{ marginTop: "var(--space-4)" }}>
@@ -153,41 +307,9 @@ export function RacesPage(): JSX.Element {
         </p>
       ) : null}
 
-      <div className="races-filter" role="search" aria-label="Фильтр по дате">
+      {viewMode === "calendar" && monthFilter === "" ? (
-        <label className="races-filter__field">
+        <p className="page__subtitle races-cal__filter-hint">Выберите месяц, чтобы увидеть его крупным планом.</p>
-          <span className="races-filter__label">Год</span>
+      ) : null}
-          <select
-            className="races-filter__select"
-            value={yearFilter}
-            onChange={(event) => {
-              setYearFilter(event.target.value);
-            }}
-          >
-            <option value="">Все года</option>
-            {yearSelectOptions().map((y) => (
-              <option key={y} value={String(y)}>
-                {y}
-              </option>
-            ))}
-          </select>
-        </label>
-        <label className="races-filter__field">
-          <span className="races-filter__label">Месяц</span>
-          <select
-            className="races-filter__select"
-            value={monthFilter}
-            onChange={(event) => {
-              setMonthFilter(event.target.value);
-            }}
-          >
-            {MONTH_OPTIONS.map((opt) => (
-              <option key={opt.value || "all"} value={opt.value}>
-                {opt.label}
-              </option>
-            ))}
-          </select>
-        </label>
-      </div>
 
       {isLoading ? (
         <p className="page__subtitle" aria-busy="true">
@@ -195,10 +317,21 @@ export function RacesPage(): JSX.Element {
         </p>
       ) : null}
 
-      <div className="race-lists">
+      {viewMode === "list" ? (
-        <RaceList title="Будущие" races={upcoming} />
+        <div className="race-lists">
-        <RaceList title="Прошедшие" races={past} />
+          <RaceList title="Будущие" races={upcoming} />
-      </div>
+          <RaceList title="Завершенные" races={completed} />
+        </div>
+      ) : (
+        <div className="races-cal-wrap">
+          <RacesCalendar
+            displayYear={displayYear}
+            monthFilter={monthFilter}
+            races={races}
+            onMonthFilterChange={setMonthFilter}
+          />
+        </div>
+      )}
     </section>
   );
 }

frontend/src/styles/tokens.css

@@ -1,20 +1,26 @@
 :root {
-  --color-bg: #f3f5f7;
+  --color-bg: #edf3f6;
+  --color-bg-deep: #071927;
   --color-surface: #ffffff;
-  --color-text: #13202b;
+  --color-surface-soft: #f7fafc;
-  --color-text-muted: #5d6b77;
+  --color-text: #0e1f2d;
-  --color-accent: #1f7ae0;
+  --color-text-muted: #647483;
-  --color-border: #dce2e8;
+  --color-accent: #1168d8;
-  --color-success: #2f9e63;
+  --color-accent-strong: #0c48a0;
-  --color-warning: #c0821f;
+  --color-lime: #b9f24a;
-  --color-error: #cc3a3a;
+  --color-coral: #ff6f5e;
+  --color-violet: #6d5dfc;
+  --color-border: #d6e1ea;
+  --color-success: #168657;
+  --color-warning: #b77716;
+  --color-error: #c43333;
 
   --font-family-base: "Inter", "Segoe UI", Arial, sans-serif;
-  --font-size-h1: 2rem;
+  --font-size-h1: 2.35rem;
-  --font-size-h2: 1.5rem;
+  --font-size-h2: 1.35rem;
   --font-size-body: 1rem;
   --font-size-caption: 0.875rem;
-  --line-height-base: 1.5;
+  --line-height-base: 1.45;
 
   --space-1: 0.25rem;
   --space-2: 0.5rem;
@@ -25,6 +31,10 @@
   --space-8: 2rem;
 
   --radius-sm: 0.375rem;
-  --radius-md: 0.75rem;
+  --radius-md: 0.625rem;
-  --radius-lg: 1rem;
+  --radius-lg: 0.75rem;
+
+  --shadow-card: 0 10px 30px rgba(14, 31, 45, 0.08);
+  --shadow-card-lift: 0 16px 34px rgba(14, 31, 45, 0.16);
+  --shadow-hero: 0 22px 60px rgba(7, 25, 39, 0.24);
 }