From 9fde2d331c360752ca203bef048cfe76bd20abd8 Mon Sep 17 00:00:00 2001 From: Tatyana Date: Mon, 11 Aug 2025 10:48:13 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=D0=B0=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=BE=D0=BD=D0=B5=D0=BD=D1=82?= =?UTF-8?q?=20=D1=85=D0=B5=D0=B4=D0=B5=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/HeaderNav.tsx | 31 ++++++++++++ src/pages/Home.tsx | 95 ++++++++++++++++++------------------ 2 files changed, 79 insertions(+), 47 deletions(-) create mode 100644 src/components/HeaderNav.tsx diff --git a/src/components/HeaderNav.tsx b/src/components/HeaderNav.tsx new file mode 100644 index 0000000..6cbda0a --- /dev/null +++ b/src/components/HeaderNav.tsx @@ -0,0 +1,31 @@ +import type React from "react" + + +interface HeaderProps { + item: string + text: string +} + +const HeaderNav: React.FC = ({ + item, + text, +}) => { + + + +return ( +
+
+
+

{text}

+

{item}

+
+
+) + +} + +export default HeaderNav; + + + diff --git a/src/pages/Home.tsx b/src/pages/Home.tsx index ed11f5b..8b32b1e 100644 --- a/src/pages/Home.tsx +++ b/src/pages/Home.tsx @@ -1,6 +1,9 @@ "use client" import { useEffect, useState } from "react" import { useHistory } from "react-router-dom" + + +import HeaderNav from "../components/HeaderNav" import BottomNavigation from "../components/BottomNavigation" import CircularProgressDisplay from "../components/CircularProgressDisplay" @@ -11,7 +14,6 @@ export default function Home() { useEffect(() => { setCurrentDate( new Date().toLocaleDateString("ru-RU", { - year: "numeric", month: "long", day: "numeric", @@ -22,10 +24,6 @@ export default function Home() { - - - - const courses = [ { id: 1, @@ -62,13 +60,18 @@ export default function Home() { const overallProgress = Math.round(courses.reduce((sum, course) => sum + course.progress, 0) / totalCourses) return ( -
-
- {/* Header */} + + + +
+
+ + +
-

Результаты

+

Добрый день!

{currentDate}

@@ -100,9 +103,14 @@ export default function Home() { {/* Заголовок и статус */}

Тренировка

-
- Активно -
+
{/* Основной блок с иконками и прогрессом */}
@@ -128,32 +136,25 @@ export default function Home() {

Текущее упражнение

{/* Кнопка с стрелкой */}
- +
{/* Quick Stats (Total Exercises & Total Courses) */}
history.push("/courses")} className="glass-morphism rounded-3xl text-left border border-white/50 shadow-lg backdrop-blur-xl p-6 text-white transition-transform transform hover:scale-105 duration-300 overflow-hidden"> - - - + + +
{/* Clock icon SVG */} все назначенные
history.push("/course/${courseId}/exercises")} className="glass-morphism rounded-3xl text-left border border-white/50 shadow-lg backdrop-blur-xl p-6 text-white transition-transform transform hover:scale-105 duration-300 overflow-hidden"> - - - - + + + +