diff --git a/src/components/CourseCard.tsx b/src/components/CourseCard.tsx index 28e82d4..d7a7d3e 100644 --- a/src/components/CourseCard.tsx +++ b/src/components/CourseCard.tsx @@ -19,12 +19,14 @@ const CourseCard: React.FC = ({ progress, color, icon, - exercises, - nextExercise, }) => { const history = useHistory() return ( + + + +
history.push(`/course/${id}/exercises`)} 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]" diff --git a/src/components/Icons.tsx b/src/components/Icons.tsx deleted file mode 100644 index 715f0b5..0000000 --- a/src/components/Icons.tsx +++ /dev/null @@ -1,24 +0,0 @@ -import type React from "react" - -// Your custom Home icon component -export const CustomHomeIcon = ({ active, size = 24 }: { active: boolean; size?: number }) => ( - - - - -); - -// You can add other custom icons here if needed in the future -// export const CustomAnotherIcon = ({ active, size = 24 }: { active: boolean; size?: number }) => ( -// ... -// ); diff --git a/src/pages/CourseComplete.tsx b/src/pages/CourseComplete.tsx index 384bc87..cb32f4c 100644 --- a/src/pages/CourseComplete.tsx +++ b/src/pages/CourseComplete.tsx @@ -21,7 +21,14 @@ const CourseComplete: React.FC = () => { }, []) return ( -
+ + + + + + + +
{/* Background Animation */}
diff --git a/src/pages/CourseExercises.tsx b/src/pages/CourseExercises.tsx index a680c80..d05e629 100644 --- a/src/pages/CourseExercises.tsx +++ b/src/pages/CourseExercises.tsx @@ -2,12 +2,12 @@ import type React from "react" import { useState } from "react" -import { useHistory, useParams } from "react-router-dom" +import { useHistory } from "react-router-dom" import BottomNavigation from "../components/BottomNavigation" const CourseExercises: React.FC = () => { const history = useHistory() - const { id } = useParams<{ id: string }>() + // const { id } = useParams<{ id: string }>() const [currentSlide, setCurrentSlide] = useState(0) const exercises = [ diff --git a/src/pages/Exercise.tsx b/src/pages/Exercise.tsx index ad9a52e..602aa9d 100644 --- a/src/pages/Exercise.tsx +++ b/src/pages/Exercise.tsx @@ -1,14 +1,14 @@ "use client" import type React from "react" import { useState, useEffect } from "react" -import { useHistory, useParams } from "react-router-dom" +import { useHistory } from "react-router-dom" import BottomNavigation from "../components/BottomNavigation" const Exercise: React.FC = () => { const history = useHistory() - const { id } = useParams<{ id: string }>() + // const { id } = useParams<{ id: string }>() const [isPlaying, setIsPlaying] = useState(false) const [currentTime, setCurrentTime] = useState(0) const [totalTime] = useState(900) // 15 minutes in seconds @@ -74,12 +74,12 @@ const Exercise: React.FC = () => { ) const RefreshIcon = () => ( - + ) const CheckIcon = () => ( - - + + ) @@ -115,9 +115,47 @@ const Exercise: React.FC = () => { ] return ( -
+ +
+ + {/* Header */} -
+
+
+ +
+ + + +
+ +

Подъемы ног лежа

+

Упражнение 1 из 12

+
+ + +
+
+ + + + + {/* Header */} +
+ + {/* Video/Image Section */} -
+
{
- +
) } diff --git a/src/pages/Home.tsx b/src/pages/Home.tsx index c28a21a..ed11f5b 100644 --- a/src/pages/Home.tsx +++ b/src/pages/Home.tsx @@ -24,91 +24,7 @@ export default function Home() { - const stats = [ - { - value: "12", - label: "Дней подряд", - color: "from-orange-400 to-red-500", - svg: ( - - - - - ), - }, - { - value: "85%", - label: "Прогресс", - color: "from-emerald-400 to-green-500", - svg: ( - - - - - ), - }, - { - value: "3", - label: "Курса", - color: "from-cyan-400 to-cyan-500", - svg: ( - - - - ), - }, - { - value: "45", - label: "Минут", - color: "from-purple-400 to-pink-500", - svg: ( - - - - - ), - }, - ] + const courses = [ { @@ -196,7 +112,6 @@ export default function Home() { {/* Clock SVG */} - {/* Удалил лишний circle, так как он не нужен */}
diff --git a/src/pages/Settings.tsx b/src/pages/Settings.tsx index ddcca38..9d280da 100644 --- a/src/pages/Settings.tsx +++ b/src/pages/Settings.tsx @@ -109,52 +109,6 @@ const Settings: React.FC = () => { - {/* Settings Options */} -
-
-
- - - - - - - -
-
-
{/* Logout Button */}
diff --git a/src/pages/Welcome.tsx b/src/pages/Welcome.tsx index 83588c4..ffc9518 100644 --- a/src/pages/Welcome.tsx +++ b/src/pages/Welcome.tsx @@ -1,6 +1,7 @@ "use client" import { useEffect, useState } from "react" +import { useIonRouter } from '@ionic/react'; export default function Welcome() { const [animationPhase, setAnimationPhase] = useState(0) @@ -45,6 +46,19 @@ export default function Welcome() { } }, [animationPhase]) // Зависимость от animationPhase + + +const router = useIonRouter() + + useEffect(() => { + const timer = setTimeout(() => { + router.push("/home", "forward") + }, 5000) // Задержка 3 секунды + + return () => clearTimeout(timer) + }, [router]) + + return (
{/* Background and particles */} @@ -148,7 +162,7 @@ export default function Welcome() { strokeWidth={6} strokeLinecap="round" className={`arm-limb ${animationPhase >= 2 ? 'limb-grow-active' : ''}`} /* Apply active class when phase 2 starts */ - style={{ '--length': '70' }} + /> {/* Правая рука (волнообразная вверх) - This arm will remain static after growth */} @@ -159,7 +173,7 @@ export default function Welcome() { strokeWidth={6} strokeLinecap="round" className={`arm-limb ${animationPhase >= 2 ? 'limb-grow-active' : ''}`} /* Apply active class when phase 2 starts */ - style={{ '--length': '60' }} + /> {/* Левая нога - длиннее */}