diff --git a/src/components/BottomNavigation.tsx b/src/components/BottomNavigation.tsx index d0b2a8a..825c7d5 100644 --- a/src/components/BottomNavigation.tsx +++ b/src/components/BottomNavigation.tsx @@ -48,9 +48,10 @@ const BottomNavigation: React.FC = () => { height={40} viewBox="0 0 29 29" fill={active ? "#2B8794" : "#ffffff"} + > - - + + diff --git a/src/pages/Exercise.tsx b/src/pages/Exercise.tsx index 08a0139..ad9a52e 100644 --- a/src/pages/Exercise.tsx +++ b/src/pages/Exercise.tsx @@ -2,7 +2,9 @@ import type React from "react" import { useState, useEffect } from "react" import { useHistory, useParams } from "react-router-dom" -// Удален импорт BottomNavigation + +import BottomNavigation from "../components/BottomNavigation" + const Exercise: React.FC = () => { const history = useHistory() @@ -72,14 +74,7 @@ const Exercise: React.FC = () => { ) const RefreshIcon = () => ( - - - + ) const CheckIcon = () => ( @@ -229,7 +224,7 @@ const Exercise: React.FC = () => { {/* Fixed Timer at Bottom */} -
+
@@ -244,7 +239,7 @@ const Exercise: React.FC = () => {
@@ -253,7 +248,7 @@ const Exercise: React.FC = () => { onClick={() => setIsPlaying(!isPlaying)} className={`flex-1 font-bold py-3 px-4 rounded-xl transition-all duration-300 transform hover:scale-105 flex items-center justify-center space-x-2 ${ isPlaying - ? "bg-gradient-to-r from-red-500 to-pink-500 hover:from-red-600 hover:to-pink-600 text-white shadow-lg" + ? "bg-gray-400 text-white shadow-lg" : "bg-[#2BACBE] hover:bg-[#2099A8] text-white shadow-lg" }`} > @@ -285,6 +280,7 @@ const Exercise: React.FC = () => {
+
) } diff --git a/src/pages/Settings.tsx b/src/pages/Settings.tsx index af32e37..ddcca38 100644 --- a/src/pages/Settings.tsx +++ b/src/pages/Settings.tsx @@ -107,31 +107,7 @@ const Settings: React.FC = () => { - {/* Statistics */} -
-
-

Статистика

-
-
-
28
-
Дней занятий
-
-
-
156
-
Упражнений выполнено
-
-
-
3
-
Курса завершено
-
-
-
42
-
Часов тренировок
-
-
-
-
{/* Settings Options */}
@@ -184,7 +160,7 @@ const Settings: React.FC = () => {