diff --git a/src/assets/Confetti.gif b/src/assets/img/Confetti.gif similarity index 100% rename from src/assets/Confetti.gif rename to src/assets/img/Confetti.gif diff --git a/src/assets/emblem.png b/src/assets/img/emblem.png similarity index 100% rename from src/assets/emblem.png rename to src/assets/img/emblem.png diff --git a/src/assets/exersise.png b/src/assets/img/exersise.png similarity index 100% rename from src/assets/exersise.png rename to src/assets/img/exersise.png diff --git a/src/assets/man.svg b/src/assets/img/man.svg similarity index 100% rename from src/assets/man.svg rename to src/assets/img/man.svg diff --git a/src/assets/video.mov b/src/assets/img/video.mov similarity index 100% rename from src/assets/video.mov rename to src/assets/img/video.mov diff --git a/src/pages/CourseComplete.tsx b/src/pages/CourseComplete.tsx index 179e192..345d647 100644 --- a/src/pages/CourseComplete.tsx +++ b/src/pages/CourseComplete.tsx @@ -4,7 +4,7 @@ import type React from "react" import { useEffect, useState } from "react" import { useHistory } from "react-router-dom" -import confetti from "../assets/Confetti.gif" +import confetti from "../assets/img/Confetti.gif" import { getRouteCourses } from "../shared/consts/router" import { getRouteHome } from "../shared/consts/router" diff --git a/src/pages/CourseExercises.tsx b/src/pages/CourseExercises.tsx index 2491ea4..a3520e8 100644 --- a/src/pages/CourseExercises.tsx +++ b/src/pages/CourseExercises.tsx @@ -6,7 +6,7 @@ import { useHistory } from "react-router-dom" import HeaderNav from "../components/HeaderNav" import BottomNavigation from "../components/BottomNavigation" -import video from "../assets/video.mov" +import video from "../assets/img/video.mov" import { getRouteExercise } from "../shared/consts/router" diff --git a/src/pages/Courses.tsx b/src/pages/Courses.tsx index ee1e651..74a6409 100644 --- a/src/pages/Courses.tsx +++ b/src/pages/Courses.tsx @@ -9,7 +9,7 @@ import { getRouteCourseExercises } from "../shared/consts/router" const ProgressLine = () => { return (
); diff --git a/src/pages/Exercise.tsx b/src/pages/Exercise.tsx index 1fd103b..12c44b0 100644 --- a/src/pages/Exercise.tsx +++ b/src/pages/Exercise.tsx @@ -6,7 +6,7 @@ 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/video.mov" +import video from "../assets/img/video.mov" const Exercise: React.FC = () => { @@ -96,50 +96,6 @@ const Exercise: React.FC = () => { }, ] - class User { - age = 18; - private _token = ''; - - constructor(age = 18, token = '') { - this.token = token - this.age = age - } - - get isOld() { - return this.age > 70; - } - - get isAuth() { - - return this._token.length > 0 && this._token.length <= 20; - } - - set token (t: string) { - if(t.length === 0) return; - - this._token = t; - } - - get token () { - return this._token; - } - } - - const user = new User(); - - user.isOld // false - - user.age = 71 - - user.isOld // true - - user.isAuth // false - - user.token = '123' - - user.isAuth // true - - user.token = '123' return ( diff --git a/src/pages/Login.tsx b/src/pages/Login.tsx index e797c8e..719f447 100644 --- a/src/pages/Login.tsx +++ b/src/pages/Login.tsx @@ -2,7 +2,7 @@ import React, { useState } from "react" import { useHistory } from "react-router-dom" -import manImage from "../assets/man.svg" // Reverted to original import +import manImage from "../assets/img/man.svg" import { connect } from '../confconnect'; import axios from 'axios'; diff --git a/src/pages/Settings.tsx b/src/pages/Settings.tsx index 71e10f5..bdd32ec 100644 --- a/src/pages/Settings.tsx +++ b/src/pages/Settings.tsx @@ -5,6 +5,7 @@ import { useHistory } from "react-router-dom" import BottomNavigation from "../components/BottomNavigation" import { getRouteLogin } from "../shared/consts/router" +import manImage from "../assets/img/man.svg" const Settings: React.FC = () => { const history = useHistory() @@ -17,17 +18,15 @@ const Settings: React.FC = () => { return (Профиль пациента