diff --git a/src/App.tsx b/src/App.tsx index d1f7ff1..4ecf20f 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -12,7 +12,11 @@ const App: React.FC = () => ( +
+ +
+
diff --git a/src/calendar-2(1).svg b/src/calendar-2(1).svg new file mode 100644 index 0000000..8d9bd1a --- /dev/null +++ b/src/calendar-2(1).svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/components/BottomNavigation.tsx b/src/components/BottomNavigation.tsx index 320e19c..d0b2a8a 100644 --- a/src/components/BottomNavigation.tsx +++ b/src/components/BottomNavigation.tsx @@ -15,7 +15,7 @@ const BottomNavigation: React.FC = () => { width={40} height={40} viewBox="0 0 29 29" - fill={ active ? "#2B8794" : "#ffffff"} + fill={active ? "#2B8794" : "#ffffff"} stroke={"none"} strokeWidth="2" strokeLinecap="round" @@ -32,7 +32,7 @@ const BottomNavigation: React.FC = () => { width={40} height={40} viewBox="0 0 26 26" - fill={ active ? "#2B8794" : "#ffffff"} + fill={active ? "#2B8794" : "#ffffff"} strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" @@ -47,7 +47,7 @@ const BottomNavigation: React.FC = () => { width={40} height={40} viewBox="0 0 29 29" - fill={ active ? "#2B8794" : "#ffffff"} + fill={active ? "#2B8794" : "#ffffff"} > @@ -67,7 +67,7 @@ const BottomNavigation: React.FC = () => { width={40} height={40} viewBox="0 0 28 28" - fill={ active ? "#2B8794" : "#ffffff"} + fill={active ? "#2B8794" : "#ffffff"} // stroke={active ? "none" : "#ffffff"} strokeWidth="2" strokeLinecap="round" diff --git a/src/index.css b/src/index.css index 6ea2d63..7d54bfb 100644 --- a/src/index.css +++ b/src/index.css @@ -133,6 +133,9 @@ box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37); /* Shadow */ } -.body { - overflow-y: auto !important; /* включаем вертикальную прокрутку */ +body { + overflow: auto !important; /* включаем вертикальную прокрутку */ } +.overflow_auto { + overflow: auto !important; +} \ No newline at end of file diff --git a/src/pages/Courses.tsx b/src/pages/Courses.tsx index 2e89807..2e53b40 100644 --- a/src/pages/Courses.tsx +++ b/src/pages/Courses.tsx @@ -6,12 +6,6 @@ import { useHistory } from "react-router-dom" const Home: React.FC = () => { const history = useHistory() - const currentDate = new Date().toLocaleDateString("ru-RU", { - weekday: "long", - year: "numeric", - month: "long", - day: "numeric", - }) const courses = [ { id: 1, name: "Восстановление колена", progress: 75, color: "from-[#2BACBE] to-[#2BACBE]/80" }, @@ -20,62 +14,37 @@ const Home: React.FC = () => { ] return ( -
+
{/* Analytics Cards */} -
-
-
-
-
12
-
Дней подряд
-
-
-
-
-
85%
-
Прогресс
-
-
-
-
+
+ +
- {/* Current Exercise */} -
-

Текущее упражнение

-
-
-
- 🦵 -
-
-

Подъемы ног

-

Восстановление колена • 3 подхода

-
-
-
-
- -
-
+
+ {/* Прогрессная часть */} +
+ {/* Текст поверх линии */} +
Вы прошли реабилитацию на {85}%
+ +
+ +
+ + {/* Courses */}

Мои курсы

- + */}
{courses.map((course) => ( @@ -85,13 +54,13 @@ 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}

+

{course.name}

{ ] return ( -
+
{/* Header */}
diff --git a/src/pages/Home.tsx b/src/pages/Home.tsx index d357ae0..f1fb41e 100644 --- a/src/pages/Home.tsx +++ b/src/pages/Home.tsx @@ -146,8 +146,8 @@ export default function Home() { const overallProgress = Math.round(courses.reduce((sum, course) => sum + course.progress, 0) / totalCourses) return ( -
-
+
+
{/* Header */}
@@ -277,7 +277,7 @@ export default function Home() { xmlns="http://www.w3.org/2000/svg" width={40} height={40} - viewBox="0 0 26 26" + viewBox="0 0 27 27" fill={"#FF8D28"} strokeWidth="2" strokeLinecap="round" diff --git a/src/pages/Settings.tsx b/src/pages/Settings.tsx index e78c196..af32e37 100644 --- a/src/pages/Settings.tsx +++ b/src/pages/Settings.tsx @@ -13,23 +13,25 @@ const Settings: React.FC = () => { } return ( -
+
{/* Header */} -
+

Настройки

Профиль пациента

- 👤 + + + +
{/* Profile Information */} -
-
+
+

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

@@ -70,15 +72,7 @@ const Settings: React.FC = () => {

Медицинская информация

-
- -
-
- 🦵 - Травма колена -
-
-
+
@@ -99,13 +93,13 @@ const Settings: React.FC = () => {
-
+
- Активная реабилитация - 75% завершено + Активная реабилитация + 75% завершено
-
-
+
+