Compare commits
4 Commits
feature/ra
...
fix/dashbo
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fdb0ba3d2d | ||
| 367868cf1b | |||
|
|
78d0ab5ece | ||
| e2eb71522d |
@@ -66,7 +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,
|
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,
|
||||||
|
|||||||
4
frontend/package-lock.json
generated
4
frontend/package-lock.json
generated
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "calendar-run-frontend",
|
"name": "calendar-run-frontend",
|
||||||
"version": "0.6.0",
|
"version": "0.6.1",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "calendar-run-frontend",
|
"name": "calendar-run-frontend",
|
||||||
"version": "0.6.0",
|
"version": "0.6.1",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"react": "^18.3.1",
|
"react": "^18.3.1",
|
||||||
"react-dom": "^18.3.1",
|
"react-dom": "^18.3.1",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "calendar-run-frontend",
|
"name": "calendar-run-frontend",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "0.6.0",
|
"version": "0.6.1",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
|
|||||||
@@ -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,7 +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) &&
|
||||||
isNullableString(race?.coverImageUrl) &&
|
isOptionalNullableString(race?.coverImageUrl) &&
|
||||||
isNullableString(race?.startTime) &&
|
isNullableString(race?.startTime) &&
|
||||||
isNullableString(race?.clusterSchedule) &&
|
isNullableString(race?.clusterSchedule) &&
|
||||||
isNullableString(race?.bibPickup) &&
|
isNullableString(race?.bibPickup) &&
|
||||||
@@ -49,7 +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,
|
coverImageUrl: race.coverImageUrl ?? null,
|
||||||
startTime: race.startTime,
|
startTime: race.startTime,
|
||||||
clusterSchedule: race.clusterSchedule,
|
clusterSchedule: race.clusterSchedule,
|
||||||
bibPickup: race.bibPickup,
|
bibPickup: race.bibPickup,
|
||||||
|
|||||||
@@ -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>
|
||||||
|
|||||||
@@ -1355,6 +1355,13 @@ 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,
|
||||||
|
url("/images/runner-hero.jpg") center / cover;
|
||||||
|
}
|
||||||
|
|
||||||
.dashboard-hero__content,
|
.dashboard-hero__content,
|
||||||
.dashboard-hero__panel {
|
.dashboard-hero__panel {
|
||||||
position: relative;
|
position: relative;
|
||||||
|
|||||||
Reference in New Issue
Block a user