diff --git a/src/assets/exersise.png b/src/assets/exersise.png new file mode 100644 index 0000000..702808e Binary files /dev/null and b/src/assets/exersise.png differ diff --git a/src/components/HeaderNav.tsx b/src/components/HeaderNav.tsx index 6cbda0a..f845de7 100644 --- a/src/components/HeaderNav.tsx +++ b/src/components/HeaderNav.tsx @@ -16,7 +16,7 @@ const HeaderNav: React.FC = ({ return (
-
+

{text}

{item}

diff --git a/src/pages/CourseExercises.tsx b/src/pages/CourseExercises.tsx index d05e629..075ba24 100644 --- a/src/pages/CourseExercises.tsx +++ b/src/pages/CourseExercises.tsx @@ -3,6 +3,8 @@ import type React from "react" import { useState } from "react" import { useHistory } from "react-router-dom" + +import HeaderNav from "../components/HeaderNav" import BottomNavigation from "../components/BottomNavigation" const CourseExercises: React.FC = () => { @@ -10,6 +12,8 @@ const CourseExercises: React.FC = () => { // const { id } = useParams<{ id: string }>() const [currentSlide, setCurrentSlide] = useState(0) + + const exercises = [ { id: 1, @@ -57,14 +61,14 @@ const CourseExercises: React.FC = () => { }, ] - const nextSlide = () => { + // Функции для переключения на следующее/предыдущее упражнение + const nextExercise = () => { setCurrentSlide((prev) => (prev + 1) % exercises.length) } - const prevSlide = () => { + const prevExercise = () => { setCurrentSlide((prev) => (prev - 1 + exercises.length) % exercises.length) } - const currentExercise = exercises[currentSlide] const getDifficultyColor = (difficulty: string) => { @@ -85,29 +89,23 @@ const CourseExercises: React.FC = () => { -
- {/* Header */} -
-
-
-

Курс упражнений

-

Восстановление колена

-
-
+
+
+ {/* Exercise Slider */} -
-
+
+
{/* Exercise Image */}
{currentExercise.name} -
+
{/* Difficulty Badge */}
@@ -119,22 +117,24 @@ const CourseExercises: React.FC = () => {
{/* Navigation arrows */} - - + + + + {/* Play Button Overlay */}
@@ -150,7 +150,7 @@ const CourseExercises: React.FC = () => {

{currentExercise.name}

- +
@@ -185,9 +184,8 @@ const CourseExercises: React.FC = () => {
history.push(`/exercise/${exercise.id}`)} - className={`glass-morphism rounded-2xl p-4 sm:p-6 border border-white/50 shadow-lg cursor-pointer transition-all duration-300 hover:shadow-2xl transform hover:scale-[1.02] backdrop-blur-xl ${ - index === currentSlide ? "ring-2 ring-[#2BACBE] bg-cyan-50/20" : "" - }`} + className={`glass-morphism rounded-2xl p-4 sm:p-6 border border-white/50 shadow-lg cursor-pointer transition-all duration-300 hover:shadow-2xl transform hover:scale-[1.02] backdrop-blur-xl ${index === currentSlide ? "ring-2 ring-[#2BACBE] bg-cyan-50/20" : "" + }`} >
@@ -213,6 +211,7 @@ const CourseExercises: React.FC = () => {
+
) } diff --git a/src/pages/Courses.tsx b/src/pages/Courses.tsx index 2e53b40..d8f4df2 100644 --- a/src/pages/Courses.tsx +++ b/src/pages/Courses.tsx @@ -4,6 +4,8 @@ import type React from "react" import BottomNavigation from "../components/BottomNavigation" import { useHistory } from "react-router-dom" +import HeaderNav from "../components/HeaderNav" + const Home: React.FC = () => { const history = useHistory() @@ -11,12 +13,18 @@ const Home: React.FC = () => { { id: 1, name: "Восстановление колена", progress: 75, color: "from-[#2BACBE] to-[#2BACBE]/80" }, { id: 2, name: "Укрепление спины", progress: 45, color: "from-[#5F5C5C] to-[#5F5C5C]/80" }, { id: 3, name: "Реабилитация плеча", progress: 90, color: "from-[#2BACBE]/80 to-[#5F5C5C]" }, - ] + ]; + + + return ( -
+ +
+ + {/* Analytics Cards */}
diff --git a/src/pages/Exercise.tsx b/src/pages/Exercise.tsx index 602aa9d..d8631cb 100644 --- a/src/pages/Exercise.tsx +++ b/src/pages/Exercise.tsx @@ -4,6 +4,7 @@ import { useState, useEffect } from "react" import { useHistory } from "react-router-dom" import BottomNavigation from "../components/BottomNavigation" +import HeaderNav from "../components/HeaderNav" const Exercise: React.FC = () => { @@ -116,76 +117,12 @@ const Exercise: React.FC = () => { return ( -
+
+
+ + - {/* Header */} -
-
- -
- - - -
- -

Подъемы ног лежа

-

Упражнение 1 из 12

-
- - -
-
- - - - - {/* Header */} -
-
- -
-

Подъемы ног лежа

-

Упражнение 1 из 12

-
-
- -
-
- {/* Set Counter */} -
- {Array.from({ length: totalSets }).map((_, index) => ( -
- {index + 1} -
- ))} -
-
{/* Video/Image Section */} @@ -201,7 +138,7 @@ const Exercise: React.FC = () => {
@@ -211,12 +148,12 @@ const Exercise: React.FC = () => {
- LIVE + Выполнение
)} {/* Timer Display */} -
+
{formatTime(currentTime)}
@@ -243,25 +180,7 @@ const Exercise: React.FC = () => {
))}
- {/* Important Notes */} -
-
-
-
- ! -
-
-

Важные замечания

-
    -
  • • Не отрывайте поясницу от пола
  • -
  • • Дышите равномерно, не задерживайте дыхание
  • -
  • • При болевых ощущениях немедленно прекратите
  • -
  • • Движения должны быть плавными и контролируемыми
  • -
-
-
-
-
+ {/* Fixed Timer at Bottom */}
@@ -320,6 +239,7 @@ const Exercise: React.FC = () => {
+
) } diff --git a/src/pages/Home.tsx b/src/pages/Home.tsx index 8b32b1e..2371ae2 100644 --- a/src/pages/Home.tsx +++ b/src/pages/Home.tsx @@ -71,7 +71,7 @@ export default function Home() {
-

Добрый день!

+

Добрый день!

{currentDate}

diff --git a/src/pages/Settings.tsx b/src/pages/Settings.tsx index 9d280da..e5e18f2 100644 --- a/src/pages/Settings.tsx +++ b/src/pages/Settings.tsx @@ -30,17 +30,11 @@ const Settings: React.FC = () => {
{/* Profile Information */} -
+

Личная информация

-
- -
- Александр Петров -
-