поправила ццвета и таймлайн вынесла наверх + вернула навигацию

This commit is contained in:
Tatyana 2025-08-07 15:39:52 +03:00
parent 3f407ab5f2
commit a53f9d2623
3 changed files with 12 additions and 39 deletions

View File

@ -48,9 +48,10 @@ const BottomNavigation: React.FC = () => {
height={40}
viewBox="0 0 29 29"
fill={active ? "#2B8794" : "#ffffff"}
>
<g fill="#fff" clipPath="url(#a)">
<path stroke="#fff" strokeWidth="1.172" d="M20.136 6.739c.944 0 1.892.183 2.593.716.672.51 1.215 1.417 1.215 3.094v7.03c0 1.677-.543 2.584-1.215 3.095-.701.533-1.65.715-2.593.715-.945 0-1.894-.182-2.595-.715-.672-.51-1.215-1.418-1.215-3.094v-7.031c0-1.677.543-2.584 1.215-3.094.701-.533 1.65-.716 2.595-.716ZM7.994 6.739c.944 0 1.892.183 2.593.716.672.51 1.215 1.417 1.215 3.094v7.03c0 1.677-.543 2.584-1.215 3.095-.701.533-1.65.715-2.593.715-.945 0-1.893-.182-2.595-.715-.671-.51-1.215-1.418-1.215-3.094v-7.031c0-1.677.544-2.584 1.215-3.094.702-.533 1.65-.716 2.595-.716ZM15.154 13.771v.586h-2.18v-.586h2.18Z" />
<g clipPath="url(#a)">
<path d="M20.136 6.739c.944 0 1.892.183 2.593.716.672.51 1.215 1.417 1.215 3.094v7.03c0 1.677-.543 2.584-1.215 3.095-.701.533-1.65.715-2.593.715-.945 0-1.894-.182-2.595-.715-.672-.51-1.215-1.418-1.215-3.094v-7.031c0-1.677.543-2.584 1.215-3.094.701-.533 1.65-.716 2.595-.716ZM7.994 6.739c.944 0 1.892.183 2.593.716.672.51 1.215 1.417 1.215 3.094v7.03c0 1.677-.543 2.584-1.215 3.095-.701.533-1.65.715-2.593.715-.945 0-1.893-.182-2.595-.715-.671-.51-1.215-1.418-1.215-3.094v-7.031c0-1.677.544-2.584 1.215-3.094.702-.533 1.65-.716 2.595-.716ZM15.154 13.771v.586h-2.18v-.586h2.18Z" />
<path d="M26.37 17.873a.885.885 0 0 1-.879-.879v-5.86c0-.48.399-.879.88-.879.48 0 .878.399.878.88v5.86c0 .48-.398.878-.879.878ZM1.758 17.873a.885.885 0 0 1-.88-.879v-5.86c0-.48.4-.879.88-.879s.879.399.879.88v5.86c0 .48-.399.878-.88.878Z" />
</g>
<defs>

View File

@ -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 = () => (
<svg className="w-6 h-6 text-gray-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={2}
d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11.356-1.913a9.75 9.75 0 00-1.036-1.388C18.29 4.71 16.05 3 12 3c-4.05 0-6.29 1.71-7.778 3.702M4 12a8.001 8.001 0 0015.356 2m0 0H15m-11.356 2A9.75 9.75 0 004.582 15m0 0H9m11.356-1.913a9.75 9.75 0 00-1.036-1.388C18.29 4.71 16.05 3 12 3c-4.05 0-6.29 1.71-7.778 3.702"
/>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"> <path d="M2.5 2v6h6M21.5 22v-6h-6"/><path d="M22 11.5A10 10 0 0 0 3.2 7.2M2 12.5a10 10 0 0 0 18.8 4.2"/></svg>
)
const CheckIcon = () => (
@ -229,7 +224,7 @@ const Exercise: React.FC = () => {
</div>
</div>
{/* Fixed Timer at Bottom */}
<div className="fixed bottom-0 left-0 right-0 glass-morphism border-t border-white/20 px-4 sm:px-6 py-4 shadow-2xl z-30">
<div className="fixed bottom-36 left-0 right-0 glass-morphism border-t border-white/20 px-4 sm:px-6 py-4 shadow-2xl z-30">
<div className="max-w-md mx-auto">
<div className="flex items-center justify-between mb-3">
<div className="flex items-center space-x-2">
@ -244,7 +239,7 @@ const Exercise: React.FC = () => {
</div>
<div className="bg-white/30 rounded-full h-3 mb-4 overflow-hidden">
<div
className="bg-gradient-to-r from-[#2BACBE] via-blue-500 to-indigo-600 h-3 rounded-full transition-all duration-1000 shadow-sm"
className="bg-gradient-to-r from-[#2BACBE] via-cyan-500 to-cyan-700 h-3 rounded-full transition-all duration-1000 shadow-sm"
style={{ width: `${progress}%` }}
></div>
</div>
@ -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 = () => {
</div>
</div>
</div>
<BottomNavigation />
</div>
)
}

View File

@ -107,31 +107,7 @@ const Settings: React.FC = () => {
</div>
</div>
{/* Statistics */}
<div className="px-4 mb-6">
<div className="bg-white/80 backdrop-blur-lg rounded-2xl p-6 border border-gray-200/50 shadow-lg">
<h2 className="text-lg font-semibold text-gray-800 mb-4">Статистика</h2>
<div className="grid grid-cols-2 gap-4">
<div className="text-center">
<div className="text-2xl font-bold text-blue-600">28</div>
<div className="text-sm text-gray-600">Дней занятий</div>
</div>
<div className="text-center">
<div className="text-2xl font-bold text-green-600">156</div>
<div className="text-sm text-gray-600">Упражнений выполнено</div>
</div>
<div className="text-center">
<div className="text-2xl font-bold text-purple-600">3</div>
<div className="text-sm text-gray-600">Курса завершено</div>
</div>
<div className="text-center">
<div className="text-2xl font-bold text-orange-600">42</div>
<div className="text-sm text-gray-600">Часов тренировок</div>
</div>
</div>
</div>
</div>
{/* Settings Options */}
<div className="px-4 mb-6">
@ -184,7 +160,7 @@ const Settings: React.FC = () => {
<div className="px-4 mb-8">
<button
onClick={handleLogout}
className="w-full bg-red-500 hover:bg-red-600 text-white font-semibold py-4 px-6 rounded-2xl transition-all duration-200 transform hover:scale-105 shadow-lg"
className="w-full bg-gray-400 hover:bg-gray-500 text-white font-semibold py-4 px-6 rounded-2xl transition-all duration-200 transform hover:scale-105 shadow-lg"
>
Выйти из аккаунта
</button>