+
+
+ {isLoading ? (
+
+
+ );
+};
+
+export default CompetitionPreview;
\ No newline at end of file
diff --git a/services/frontend/src/pages/CompetitionsPage/components/CompetitionCard/index.tsx b/services/frontend/src/pages/CompetitionsPage/components/CompetitionCard/index.tsx
new file mode 100644
index 0000000..5c06328
--- /dev/null
+++ b/services/frontend/src/pages/CompetitionsPage/components/CompetitionCard/index.tsx
@@ -0,0 +1,55 @@
+import { Competition } from "@/shared/types/types";
+import { cn } from "@/shared/lib/utils";
+import {
+ Card,
+ CardContent,
+ CardFooter,
+} from "@/components/ui/card";
+import { useNavigate } from "react-router";
+
+interface CompetitionCardProps {
+ competition: Competition;
+ className?: string;
+}
+
+export function CompetitionCard({ competition, className }: CompetitionCardProps) {
+ const { id, name, imageUrl, isOlympics, status } = competition;
+ const navigate = useNavigate();
+
+ const handleClick = () => {
+ navigate(`/competition/${id}`);
+ };
+
+ return (
+
+
+ ) : competition ? (
+ Загрузка...
+
+
+ ) : (
+
+ 
+
+
+
+
+
+
+
+ {competition.name}
+ +
+
+ {competition.description}
+
+
+ )}
+ Соревнование не найдено
+Запрошенное соревнование не существует или было удалено.
+
+ 
+
+
+ {name}
+
+ {error && (
+
+ {error}
+
+ )}
+
+
+
+ );
+}
+
+export default CompetitionsPage;
\ No newline at end of file
diff --git a/services/frontend/src/pages/CompetitionsPage/modules/CompetitionGrid/index.tsx b/services/frontend/src/pages/CompetitionsPage/modules/CompetitionGrid/index.tsx
new file mode 100644
index 0000000..7bcc1fa
--- /dev/null
+++ b/services/frontend/src/pages/CompetitionsPage/modules/CompetitionGrid/index.tsx
@@ -0,0 +1,46 @@
+import { Competition } from "@/shared/types/types";
+import { CompetitionCard } from "../../components/CompetitionCard";
+import CompetitionSkeleton from "../../components/CompetitionSkeleton";
+import { cn } from "@/shared/lib/utils";
+
+interface CompetitionGridProps {
+ competitions: Competition[];
+ isLoading?: boolean;
+ className?: string;
+ skeletonCount?: number;
+}
+
+export function CompetitionGrid({
+ competitions,
+ isLoading = false,
+ className,
+ skeletonCount
+}: CompetitionGridProps) {
+ const gridClasses = cn(
+ "grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-6",
+ className
+ );
+
+ const numberOfSkeletons = skeletonCount ?? (competitions.length > 0 ? competitions.length : 4);
+
+ if (isLoading) {
+ return (
+
+
+
+
+
+
+ Текущие
+ Завершенные
+
+
+
+
+ {isLoading ? (
+ Мои события
+
+
+ )}
+ + {activeTab === "ongoing" ? "У вас нет текущих соревнований" : "У вас нет завершенных соревнований"} +
+
+
+ Доступные события
+ + {isLoading ? ( +
+
+ )}
+ Нет доступных соревнований
+
+ {Array.from({ length: numberOfSkeletons }).map((_, index) => (
+
+ );
+ }
+
+ return (
+
+ {competitions.map((competition) => (
+
+ );
+}
\ No newline at end of file
diff --git a/services/frontend/src/pages/CompetitionsPage/types.ts b/services/frontend/src/pages/CompetitionsPage/types.ts
new file mode 100644
index 0000000..e69de29
diff --git a/services/frontend/src/shared/types/types.ts b/services/frontend/src/shared/types/types.ts
new file mode 100644
index 0000000..6fd3a3e
--- /dev/null
+++ b/services/frontend/src/shared/types/types.ts
@@ -0,0 +1,17 @@
+enum Status {
+ InProgress = 'В процессе',
+ NotParticipating = 'Не участвую',
+ Completed = 'Завершено'
+}
+
+interface Competition {
+ id: string;
+ name: string;
+ imageUrl: string;
+ isOlympics: boolean;
+ status: Status;
+ description?: string;
+}
+
+export {Status}
+export type {Competition}
\ No newline at end of file
diff --git a/services/frontend/src/styles/fonts.css b/services/frontend/src/styles/fonts.css
new file mode 100644
index 0000000..8f6986d
--- /dev/null
+++ b/services/frontend/src/styles/fonts.css
@@ -0,0 +1,20 @@
+@font-face {
+ font-family: 'HSE Sans';
+ src: url('/fonts/HSESans-Regular.otf') format('opentype');
+ font-weight: normal;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'HSE Sans';
+ src: url('/fonts/HSESans-Bold.otf') format('opentype');
+ font-weight: bold;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'HSE Sans';
+ src: url('/fonts/HSESans-SemiBold.otf') format('opentype');
+ font-weight: 600;
+ font-style: normal;
+}
\ No newline at end of file
diff --git a/services/frontend/src/styles/globals.css b/services/frontend/src/styles/globals.css
index 1f613d0..9df6fec 100644
--- a/services/frontend/src/styles/globals.css
+++ b/services/frontend/src/styles/globals.css
@@ -1,5 +1,5 @@
@import "tailwindcss";
-
+@import "./fonts.css";
@plugin "tailwindcss-animate";
@custom-variant dark (&:is(.dark *));
@@ -40,6 +40,9 @@
--sidebar-ring: oklch(0.87 0 0);
}
+@theme inline {
+ --font-hse-sans: "HSE Sans", system-ui, sans-serif
+}
.dark {
--background: oklch(0.145 0 0);
--foreground: oklch(0.985 0 0);
diff --git a/services/frontend/tailwind.config.js b/services/frontend/tailwind.config.js
new file mode 100644
index 0000000..50cd5f6
--- /dev/null
+++ b/services/frontend/tailwind.config.js
@@ -0,0 +1,11 @@
+/** @type {import('tailwindcss').Config} */
+module.exports = {
+ theme: {
+ extend: {
+ fontFamily: {
+ 'hse-sans': ['"HSE Sans"', 'system-ui', 'sans-serif'],
+ },
+ },
+ },
+ plugins: [],
+}
diff --git a/tests/README.md b/tests/README.md
index ff758b6..4eb6984 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -1,4 +1,4 @@
-# project_name Tests
+# DataRush Tests
There is `unit` and `e2e` tests available, unit tests are placed all around `backend` serivce folder and `e2e` tests placed [here](./e2e/).
diff --git a/tests/e2e/README.md b/tests/e2e/README.md
index 467ca99..7d32628 100644
--- a/tests/e2e/README.md
+++ b/tests/e2e/README.md
@@ -1,4 +1,4 @@
-# E2E tests for project_name
+# E2E tests for DataRush
## Prerequisites
diff --git a/tests/e2e/conftest.py b/tests/e2e/conftest.py
index 7750ce3..e7ecdcd 100644
--- a/tests/e2e/conftest.py
+++ b/tests/e2e/conftest.py
@@ -30,7 +30,7 @@ def docker_compose() -> Generator[None]:
"docker",
"compose",
"--project-name",
- "project_name",
+ "datarush-testing",
"up",
"-d",
"--build",
@@ -49,7 +49,7 @@ def docker_compose() -> Generator[None]:
"docker",
"compose",
"--project-name",
- "project_name",
+ "datarush-testing",
"down",
"-v",
],
diff --git a/tests/e2e/pyproject.toml b/tests/e2e/pyproject.toml
index 01813d7..0ba7a70 100644
--- a/tests/e2e/pyproject.toml
+++ b/tests/e2e/pyproject.toml
@@ -1,5 +1,5 @@
[project]
-name = "project_name-e2e-tests"
+name = "datarush-e2e-tests"
version = "0.1.0"
readme = "README.md"
requires-python = ">=3.10,<3.12"