+
+ )
+ }
+
+ if (error) {
+ return (
+
+
+
+
+
+ Загрузка упражнений...
+
+
+ )
+ }
+
+ if (!course || exercises.length === 0) {
+ return (
+
+
+
+
+
+
+ {error}
+ +
+
+ )
+ }
+
+ const availableDays = Object.keys(exercisesByDay)
+ .map(Number)
+ .sort((a, b) => a - b)
return (
-
-
-
+
+
+
+
+
+ В этом курсе пока нет упражнений
+ +
+
- );
-};
-
-
-export default CourseExercises;
\ No newline at end of file
+export default CourseExercises
diff --git a/src/pages/Exercise old.tsx b/src/pages/Exercise old.tsx
new file mode 100644
index 0000000..b43f781
--- /dev/null
+++ b/src/pages/Exercise old.tsx
@@ -0,0 +1,240 @@
+"use client"
+
+import { useState, useEffect } from "react"
+import { useHistory } from "react-router-dom"
+
+import BottomNavigation from "../components/BottomNavigation"
+import { getRouteCourseComplete } from "../shared/consts/router"
+import HeaderNav from "../components/HeaderNav"
+import video from "../assets/img/video.mov"
+
+
+export interface Exercise {
+ id: number;
+ title: string;
+ desc: string;
+ url_file: string;
+ url_file_img: string;
+}
+
+
+
+
+
+export const Exercise = () => {
+ const history = useHistory()
+ // const { id } = useParams<{ id: string }>()
+ const [isPlaying, setIsPlaying] = useState(false)
+ const [currentTime, setCurrentTime] = useState(0)
+ const [totalTime] = useState(900) // 15 minutes in seconds
+ const [currentSet, setCurrentSet] = useState(1)
+ const [totalSets] = useState(3)
+
+ useEffect(() => {
+ let interval: NodeJS.Timeout | undefined
+ if (isPlaying) {
+ interval = setInterval(() => {
+ setCurrentTime((prev) => {
+ if (prev >= totalTime) {
+ setIsPlaying(false)
+ // Show completion animation
+ history.push(getRouteCourseComplete())
+ return totalTime
+ }
+ return prev + 1
+ })
+ }, 1000)
+ }
+ return () => {
+ if (interval) clearInterval(interval)
+ }
+ }, [isPlaying, totalTime, history])
+
+ const formatTime = (seconds: number) => {
+ const mins = Math.floor(seconds / 60)
+ const secs = seconds % 60
+ return `${mins.toString().padStart(2, "0")}:${secs.toString().padStart(2, "0")}`
+ }
+
+ const progress = (currentTime / totalTime) * 100
+
+
+
+ const PlayIcon = () => (
+
+ )
+
+ const PauseIcon = () => (
+
+ )
+
+ const RefreshIcon = () => (
+
+ )
+
+ const CheckIcon = () => (
+
+ )
+
+ const exerciseSteps = [
+ {
+ title: "Исходное положение",
+ description:
+ "Лягте на спирку на коврик. Руки вдоль тела, ладони прижаты к полу. Ноги выпрямлены, носки направлены вверх. Поясница плотно прижата к полу.",
+ },
+ {
+ title: "Задание",
+ description:
+ "Медленно поднимите прямые ноги до угла 90 градусов. Задержитесь на 2 секунды, затем медленно опустите ноги, не касаясь пола. Повторите движение плавно и контролируемо.",
+ },
+ {
+ title: "Подходы",
+ description: "Выполните 3 подхода по 12 повторений с отдыхом 60 секунд между подходами.",
+ },
+ {
+ title: "Перерыв",
+ description: "Отдыхайте 60 секунд между подходами. Дышите спокойно и расслабьте мышцы.",
+ },
+ {
+ title: "Динамика и статика",
+ description:
+ "Динамическая фаза: подъем и опускание ног выполняется плавно, 2 секунды вверх, 2 секунды вниз. Статическая фаза: удержание ног в верхней точке на 2 секунды.",
+ },
+ ]
+
+
+ return (
+
+
-
+ )
+}
-
-
Курс ID: {id}
+
+
+ )}
- {/* тут можете использовать id для загрузки данных или другого */}
+ {/* Exercise Slider */}
+ {currentDayExercises.length > 0 && currentExercise && (
+
+ {availableDays.map((day) => (
+
+ ))}
+
+
+
+ )}
+
+ {/* Exercise List for Selected Day */}
+
+ {/* Exercise Image */}
+
+
+ {/* Slide indicators */}
+ {currentDayExercises.length > 1 && (
+
+ 
+
+
+ {/* Time Badge */}
+
+
+ {/* Exercise Info */}
+
+
+
+ {/* Navigation arrows */}
+ {currentDayExercises.length > 1 && (
+ <>
+
+
+
+ )}
+
+ {currentExercise.time} мин
+
+
+
+ {currentExercise.title}
+{currentExercise.desc}
+ + +
+ {currentDayExercises.map((_, index) => (
+
+ )}
+
+
+
+ + {availableDays.length > 1 ? `Упражнения на день ${selectedDay}` : "Все упражнения курса"} +
+
+ {currentDayExercises.map((exercise, index) => (
+
+ history.push(getRouteExercise(id!, exercise.id.toString()))}
+ 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" : ""
+ }`}
+ >
+
+ ))}
+
+
+
+
+
+ {exercise.position}
+
+
+
+ {exercise.title}
+{exercise.desc}
+
+ {exercise.time} мин
+ •
+ {exercise.count} подходов
+ •
+ {exercise.repeats} повторений
+
+
+
+
+
+
+ )
+}
+
+
diff --git a/src/pages/Exercise.tsx b/src/pages/Exercise.tsx
index b43f781..5c1d9b0 100644
--- a/src/pages/Exercise.tsx
+++ b/src/pages/Exercise.tsx
@@ -1,34 +1,105 @@
"use client"
import { useState, useEffect } from "react"
-import { useHistory } from "react-router-dom"
+import { useHistory, useParams } from "react-router-dom"
import BottomNavigation from "../components/BottomNavigation"
import { getRouteCourseComplete } from "../shared/consts/router"
import HeaderNav from "../components/HeaderNav"
import video from "../assets/img/video.mov"
-
+import { connect } from "../confconnect"
export interface Exercise {
- id: number;
- title: string;
- desc: string;
- url_file: string;
- url_file_img: string;
+ id: number
+ title: string
+ desc: string
+ url_file: string
+ url_file_img: string
+ time: string
+ repeats: number
+ count: number
+ position: number
+ day: number
+ sessionname: string
}
-
-
-
+interface RouteParams {
+ courseId: string
+ exerciseId: string
+}
export const Exercise = () => {
const history = useHistory()
- // const { id } = useParams<{ id: string }>()
+ const { courseId, exerciseId } = useParams
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {isPlaying && (
+
+
+
+ Выполнение
+
+
+ )}
+
+
+ {formatTime(currentTime)}
+
+
+ {exerciseSteps.map((step, index) => (
+
+
+ {/* Fixed Timer at Bottom */}
+
+
+ ))}
+
+
+
+
+
+ {step.title}
+{step.description}
+
+
+
+
+
+
+
+
+
+ Подход {currentSet} из {totalSets}
+
+
+
+ {formatTime(currentTime)} / {formatTime(totalTime)}
+
+
+
+
+
+
+
+
+
+
+
+ )
+ }
+
+ if (error) {
+ return (
+
+
+
+
+
+ Загрузка упражнения...
+
+
+ )
+ }
+
+ if (!exercise) {
+ return (
+
+
+
+
+
+
+ {error}
+ +
+
+ )
+ }
return (
-
+
+
+
+
+
+ Упражнение не найдено
+ +
-
-
-
+ 
-
+
{isPlaying && (
-
+
Выполнение
)}
-
+
{formatTime(currentTime)}
@@ -165,7 +308,6 @@ export const Exercise = () => {
className="bg-white rounded-2xl p-5 border border-gray-200 shadow-lg hover:shadow-xl transition-all duration-300"
>
-
)
}
-
-
diff --git a/src/shared/consts/localStorage.ts b/src/shared/consts/localStorage.ts
index b2535b9..8516a10 100644
--- a/src/shared/consts/localStorage.ts
+++ b/src/shared/consts/localStorage.ts
@@ -1,2 +1,2 @@
-export const USER_KEY = 'user';
-export const AUTH_TOKEN = 'token';
+export const AUTH_TOKEN = "authToken"
+export const USER_KEY = "userId"
diff --git a/src/shared/consts/router.ts b/src/shared/consts/router.ts
index d79cbc7..7aeb765 100644
--- a/src/shared/consts/router.ts
+++ b/src/shared/consts/router.ts
@@ -1,17 +1,10 @@
-export const getRouteWelcome = () => `/welcome`;
-export const getRouteLogin = () => `/login`;
-export const getRouteHome = () => `/home`;
-export const getRouteForgotPassword = () => `/forgot-password`;
-
-export const getRouteCourses = () => `/courses`;
-export const getRouteCourseExercises = (id: number | string) => `/course/${id}`;
-export const getRouteExercise = (id: number | string) => `/exercise/${id}`;
-
-export const getRouteSettings = () => `/settings`;
-export const getRouteCourseComplete = () => `/course-complete`;
-
-
-
-
-
-
+export const getRouteWelcome = () => `/welcome`
+export const getRouteLogin = () => `/login`
+export const getRouteHome = () => `/home`
+export const getRouteForgotPassword = () => `/forgot-password`
+export const getRouteCourses = () => `/courses`
+export const getRouteCourseExercises = (id: number | string) => `/course/${id}`
+export const getRouteExercise = (courseId: number | string, exerciseId: number | string) =>
+ `/course/${courseId}/exercise/${exerciseId}`
+export const getRouteSettings = () => `/settings`
+export const getRouteCourseComplete = () => `/course-complete`
{step.title}
{step.description}
@@ -198,10 +340,11 @@ export const Exercise = () => {