+
+ )
+}
+
+export const Courses = () => {
+ const history = useHistory()
+
+ // Внутренний компонент для загрузки упражнений
+ const Exercises = () => {
+ const [exercises, setExercises] = useState
+
+
+ {/* Прогрессная часть */}
+
+ Вы прошли реабилитацию на {85}%
+
+ {/* Можно добавить заголовок или обертку */}
+
+ );
+ };
+
+ return (
+ -
+ {exercises.map(ex => (
+
-
+
{ex.title}
+{ex.desc}
+ {/* Вставка изображения */} ++
+ ))}
+
+
+ )
+}
\ No newline at end of file
diff --git a/src/pages/Courses.tsx b/src/pages/Courses.tsx
index 74a6409..1db36ae 100644
--- a/src/pages/Courses.tsx
+++ b/src/pages/Courses.tsx
@@ -1,93 +1,100 @@
"use client"
-import type React from "react"
+import { useState, useEffect } from 'react';
import BottomNavigation from "../components/BottomNavigation"
-import { useHistory } from "react-router-dom"
-
+import { useHistory } from "react-router-dom" // для v5
import HeaderNav from "../components/HeaderNav"
-import { getRouteCourseExercises } from "../shared/consts/router"
+import { connect } from '../confconnect';
-const ProgressLine = () => {
- return (
- );
+interface Course {
+ ID: number;
+ title: string;
+ desc: string;
+ url_file_img: string;
}
-const AnalitcsCards = () => {
+export const Courses = () => {
+ const history = useHistory();
- {/* Analytics Cards */ }
- return (
-
+
*/}
+
+
+
+ Мои курсы
+ +
+ {courses.map((course) => (
+
+ history.push(getRouteCourseExercises(':id'))}
+ className="bg-white/30 backdrop-blur-2xl rounded-3xl p-6 border border-white/20 shadow-xl cursor-pointer hover:shadow-2xl transition-all duration-300 transform hover:scale-[1.02]"
+ >
+
+ ))}
+
+
+
+
+
+ {course.name}
+
+
+
+ {course.progress}% завершено
+
+ {/* Иконка стрелки */}
+ {/**/}
+ {/*
+
-
- )
-}
+ useEffect(() => {
+ if (!token) {
+ setError('Токен не найден');
+ return;
+ }
-const Home: React.FC = () => {
- const history = useHistory()
+ connect.get('/pacient/courses', {
+ headers: {
+ Authorization: `Bearer ${token}`,
+ },
+ })
+ .then(response => {
+ console.log('Response status:', response.status);
+
+ // Предполагаемая структура:
+ // response.data.courses — массив пользователей
+ const users = response.data.courses || [];
- const courses = [
- { 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]" },
- ];
+ // Собираем все курсы из всех пользователей
+ const allCourses: Course[] = [];
+
+ users.forEach(user => {
+ if (user.Courses && Array.isArray(user.Courses)) {
+ user.Courses.forEach(course => {
+ // Можно добавить проверку или преобразование
+ allCourses.push({
+ ID: course.id, // или course.ID, зависит от структуры
+ title: course.title,
+ desc: course.desc,
+ url_file_img: course.url_file_img,
+ });
+ });
+ }
+ });
+
+ setCourses(allCourses);
+ })
+ .catch(error => {
+ if (error.response) {
+ console.error('Ошибка ответа сервера:', error.response.status, error.response.data);
+ setError(`Ошибка сервера: ${error.response.status}`);
+ } else if (error.request) {
+ console.error('Нет ответа от сервера:', error.request);
+ setError('Нет ответа от сервера');
+ } else {
+ console.error('Ошибка при настройке запроса:', error.message);
+ setError(`Ошибка: ${error.message}`);
+ }
+ });
+ }, [token]);
return (
-
-
- {/* Прогрессная часть */}
- ([]);
+ const [error, setError] = useState('');
+ const token = localStorage.getItem('authToken');
- {/* Текст поверх линии */}
-
- Вы прошли реабилитацию на {85}%
- {error}
} - {/* Courses */} -
-
- {/* Exercise Steps - Vertical Scroll */}
+
-
- Мои курсы
- {/* */} -
- {courses.map((course) => (
-
- )
-}
-
-export default Home
+ );
+};
\ No newline at end of file
diff --git a/src/pages/Exercise.tsx b/src/pages/Exercise.tsx
index 12c44b0..b43f781 100644
--- a/src/pages/Exercise.tsx
+++ b/src/pages/Exercise.tsx
@@ -1,5 +1,5 @@
"use client"
-import type React from "react"
+
import { useState, useEffect } from "react"
import { useHistory } from "react-router-dom"
@@ -9,7 +9,19 @@ import HeaderNav from "../components/HeaderNav"
import video from "../assets/img/video.mov"
-const Exercise: React.FC = () => {
+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)
@@ -104,7 +116,7 @@ const Exercise: React.FC = () => {
history.push(getRouteCourseExercises(':id'))}
- className="bg-white/30 backdrop-blur-2xl rounded-3xl p-6 border border-white/20 shadow-xl cursor-pointer hover:shadow-2xl transition-all duration-300 transform hover:scale-[1.02]"
- >
-
-
-
+ {/* Выводим список курсов */}
+
-
- {course.name}
-
-
-
- {course.progress}% завершено
-
-
-
-
-
+ {courses.length > 0 ? (
+ courses.map(course => (
+
+ ))
+ ) : (
+ !error &&
+ 
+ )}
- ))}
- {course.title}
+{course.desc}
+ {course.url_file_img && ( +Нет назначенных курсов
+ )}
@@ -129,7 +141,7 @@ const Exercise: React.FC = () => {
{isPlaying ?
- {/* Live indicators */}
+
{isPlaying && (
@@ -138,14 +150,14 @@ const Exercise: React.FC = () => {
)}
- {/* Timer Display */}
+
{formatTime(currentTime)}
{exerciseSteps.map((step, index) => (
{
)
}
-export default Exercise
+
diff --git a/ответы сервера b/ответы сервера
new file mode 100644
index 0000000..5d92415
--- /dev/null
+++ b/ответы сервера
@@ -0,0 +1,70 @@
+curl -i -X OPTIONS http://localhost:8093/auth/api/login -H "Origin: http://localhost" -H "Access-Control-Request-Method: POST"
+
+
+
+tatyana@fedora:~/Рабочий стол/RehabMobileApp/RehabMobileApp/android$ curl -i -X OPTIONS http://localhost:8093/auth/api/login -H "Origin: http://localhost" -H "Access-Control-Request-Method: POST"
+HTTP/1.1 204 No Content
+Access-Control-Allow-Credentials: true
+Access-Control-Allow-Headers: Accept-Language,Access-Control-Allow-Origin,Authorization,Content-Language,X-Csrf-Token,X-Xsrf-Token,Origin,X-Requested-With,Content-Type,Accept
+Access-Control-Allow-Methods: PUT,GET,POST,PATCH,OPTIONS,DELETE
+Access-Control-Allow-Origin: http://localhost
+Vary: Origin
+Vary: Access-Control-Request-Method
+Vary: Access-Control-Request-Headers
+Date: Fri, 22 Aug 2025 08:09:40 GMT
+
+
+tatyana@fedora:~/Рабочий стол/RehabMobileApp/RehabMobileApp/android$ curl -i -X POST http://localhost:8093/auth/api/login \
+-H "Origin: http://localhost" \
+-H "Content-Type: application/json" \
+-d '{"Email": "krasnova@mail.ru", "Password": "Tatyana1"}'
+
+
+curl -H "Authorization: Bearer YOUR_TOKEN" http://localhost:8093/pacient/courses
+
+
+
+ "courses": [
+ {
+ "CreatedAt": "2025-08-19T10:50:04.454157+03:00",
+ "UpdatedAt": "2025-08-19T10:50:04.454157+03:00",
+ "DeletedAt": null,
+ "ID": 25,
+ "Name": "krasnova@mail.ru",
+ "Email": "krasnova@mail.ru",
+ "Password": "$2a$10$ryI/OSON56IlmDL0sAHhmOk9vhFkuTRieFlj32p/cKYCrPWGOJZKC",
+ "Role": "",
+ "UserDoctorID": 0,
+ "ExerciseCourses": null,
+ "Courses": [
+ {
+ "ID": 0,
+ "CreatedAt": "2025-08-15T11:46:58.879953+03:00",
+ "UpdatedAt": "2025-08-15T11:46:58.879953+03:00",
+ "DeletedAt": null,
+ "id": 1,
+ "title": "Восстановление",
+ "desc": "Восстановиться",
+ "time_course": "",
+ "day_course": 0,
+ "url_file_img": "https://vivasport.ru/assets/images/news/12555/spine-training-1.webp",
+ "users": null,
+ "exercises": null
+ }
+ ]
+ },
+ {
+ "CreatedAt": "2025-08-20T14:19:19.754239+03:00",
+ "UpdatedAt": "2025-08-20T14:19:19.754239+03:00",
+ "DeletedAt": null,
+ "ID": 26,
+ "Name": "krasnova5@mail.ru",
+ "Email": "krasnova5@mail.ru",
+ "Password": "$2a$10$sdcCn51708LV5y6wsmOho.dLtpDGf43muXobIcvGYQ1.TtB1WxFju",
+ "Role": "",
+ "UserDoctorID": 0,
+ "ExerciseCourses": null,
+ "Courses": []
+ }
+ ],
+ "sessionname": "krasnova@mail.ru"
\ No newline at end of file