diff --git a/capacitor.config.ts b/capacitor.config.ts index 21e1c5d..593138c 100644 --- a/capacitor.config.ts +++ b/capacitor.config.ts @@ -6,7 +6,7 @@ const config: CapacitorConfig = { webDir: 'dist', server:{ androidScheme: "http", - allowNavigation: [ "10.224.10.177:8093" ], + allowNavigation: [ "localhost:8093" ], } }; diff --git a/src/AppRoutes.tsx b/src/AppRoutes.tsx index 0ab7b28..1e91fbe 100644 --- a/src/AppRoutes.tsx +++ b/src/AppRoutes.tsx @@ -1,28 +1,48 @@ import { Route } from "react-router-dom" -import Home from "./pages/Home" -import Login from "./pages/Login" + import Welcome from "./pages/Welcome" -import ForgotPassword from "./pages/ForgotPassword" +import Login from "./pages/Login" +import Home from "./pages/Home" +import ForgotPasword from "./pages/ForgotPassword" import Courses from "./pages/Courses" import CourseExercises from "./pages/CourseExercises" import Exercise from "./pages/Exercise" import Settings from "./pages/Settings" import CourseComplete from "./pages/CourseComplete" + + + + + +import { getRouteWelcome } from "./shared/consts/router" import { getRouteLogin } from "./shared/consts/router" +import { getRouteHome } from "./shared/consts/router" +import { getRouteForgotPassword } from "./shared/consts/router" +import { getRouteCourses } from "./shared/consts/router" +import { getRouteCourseExercises } from "./shared/consts/router" +import { getRouteExercise } from "./shared/consts/router" +import { getRouteSettings } from "./shared/consts/router" +import { getRouteCourseComplete } from "./shared/consts/router" + + + + + + const AppRoutes = () => ( <> - - + - - - - - - - + + + + + + + > ) export default AppRoutes + diff --git a/src/confconnect.js b/src/confconnect.js index 5f745c1..9962955 100644 --- a/src/confconnect.js +++ b/src/confconnect.js @@ -4,7 +4,7 @@ import { AUTH_TOKEN, USER_KEY } from '@/shared/consts/localStorage'; import { getRouteLogin } from '@/shared/consts/router'; const instance = axios.create({ - baseURL: 'http://10.224.10.177:8093/', + baseURL: 'http://localhost:8093/', headers: { 'Content-type': 'application/json', }, diff --git a/src/pages/CourseExercises.tsx b/src/pages/CourseExercises.tsx index 95fd344..c659ce6 100644 --- a/src/pages/CourseExercises.tsx +++ b/src/pages/CourseExercises.tsx @@ -2,7 +2,7 @@ import type React from "react" import { useState } from "react" -import { useHistory } from "react-router-dom" +import { useHistory, useParams } from "react-router-dom" import HeaderNav from "../components/HeaderNav" import BottomNavigation from "../components/BottomNavigation" @@ -10,7 +10,7 @@ import video from "../assets/video.mov" const CourseExercises: React.FC = () => { const history = useHistory() - // const { id } = useParams<{ id: string }>() + const { id } = useParams<{ id: string }>(); const [currentSlide, setCurrentSlide] = useState(0) @@ -153,10 +153,10 @@ const course = { - history.push(`/exercise/${currentExercise.id}`)} - className="w-full bg-gradient-to-r bg-orange-400 text-white font-semibold py-4 px-6 rounded-2xl hover:shadow-2xl transition-all duration-300 transform hover:scale-105 shadow-lg backdrop-blur-sm" - > + history.push(getExerciseRoute(currentExercise.id))} + className="w-full bg-gradient-to-r bg-orange-400 text-white font-semibold py-4 px-6 rounded-2xl hover:shadow-2xl transition-all duration-300 transform hover:scale-105 shadow-lg backdrop-blur-sm" +> Начать упражнение diff --git a/src/pages/Courses.tsx b/src/pages/Courses.tsx index aec056b..3249ada 100644 --- a/src/pages/Courses.tsx +++ b/src/pages/Courses.tsx @@ -63,11 +63,7 @@ const Home: React.FC = () => { 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} @@ -79,7 +75,8 @@ const Home: React.FC = () => { {course.progress}% завершено - → + + diff --git a/src/pages/Home.tsx b/src/pages/Home.tsx index 8426f47..2cb0811 100644 --- a/src/pages/Home.tsx +++ b/src/pages/Home.tsx @@ -1,7 +1,7 @@ "use client" import { useEffect, useState } from "react" -import { useHistory } from "react-router-dom" +import { useHistory, Link } from "react-router-dom" import HeaderNav from "../components/HeaderNav" diff --git a/src/pages/Login.tsx b/src/pages/Login.tsx index 5f42a2b..9866004 100644 --- a/src/pages/Login.tsx +++ b/src/pages/Login.tsx @@ -7,6 +7,8 @@ import manImage from "../assets/man.svg" // Reverted to original import import { connect } from '../confconnect'; import axios from 'axios'; import { toast } from 'sonner'; +import { getRouteHome } from '../shared/consts/router' +import { getRouteForgotPassword } from '../shared/consts/router' export default function LoginPage() { @@ -53,7 +55,7 @@ export default function LoginPage() { localStorage.setItem('isLoggedIn', 'true'); // Перенаправляем пользователя - history.push("/home"); + history.push(getRouteHome()); } else { console.log('Ответ:', response); } @@ -111,7 +113,7 @@ export default function LoginPage() { console.log('Отправляемые данные:', { email, password }); // После этого можно перейти или показать сообщение - history.push("/home") + history.push(getRouteHome()) } catch (error) { console.error('Ошибка при регистрации:', error) alert('Ошибка при регистрации') @@ -258,7 +260,7 @@ export default function LoginPage() { history.push("/forgot-password")} + onClick={() => history.push(getRouteForgotPassword())} className="text-[#2BACBE] font-medium hover:text-[#2099A8] transition-colors" > Забыли пароль? diff --git a/src/shared/consts/router.ts b/src/shared/consts/router.ts index 0acbad4..a8aa86a 100644 --- a/src/shared/consts/router.ts +++ b/src/shared/consts/router.ts @@ -1,20 +1,17 @@ +export const getRouteWelcome = () => `/welcome`; export const getRouteLogin = () => `/login`; -export const getRouteRegister = () => `/auth/register`; -export const getRouteResetPassword = () => `/auth/reset-password`; -export const getRouteLkHome = () => `/lk`; +export const getRouteHome = () => `/home`; +export const getRouteForgotPassword = () => `/forgot-password`; + +export const getRouteCourses = () => `/courses`; +export const getRouteCourseExercises = (id: number | string) => `/course/${id}/exercises`; +export const getRouteExercise = (id: number | string) => `/exercise/${id}`; + +export const getRouteSettings = () => `/settings`; +export const getRouteCourseComplete = () => `/course-complete`; + + -export const getRouteUsersList = () => `/lk/admin/users`; -export const getRouteUserEdit = (id: number | string) => `/lk/admin/users/${id}`; -export const getRouteUserCreate = () => `/lk/admin/users/create`; -export const getRouteUserRolesList = () => `/lk/admin/user-roles`; -export const getRouteUserRoleEdit = (id: number | string) => `/lk/admin/user-roles/${id}`; -export const getRouteUserRoleCreate = () => `/lk/admin/user-roles/create`; -export const getRouterExercisesList = () =>`/lk/admin/exercises`; -export const getRouterExercisesEdit = (id: number | string) =>`/lk/admin/exercises/${id}`; -export const getRouterExercisesCreate = () =>`/lk/admin/exercises/create`; -export const getRouterCoursesList = () => `/lk/admin/courses`; -export const getRouterCoursesEdit = (id: number | string) => `/lk/admin/courses/${id}`; -export const getRouterCoursesCreate = () => `/lk/admin/courses/create`;
{course.progress}% завершено