diff --git a/taskncoffee-app/src/App.jsx b/taskncoffee-app/src/App.jsx index 4735723..56087df 100644 --- a/taskncoffee-app/src/App.jsx +++ b/taskncoffee-app/src/App.jsx @@ -23,7 +23,8 @@ function App() { } /> - } /> + } /> } /> diff --git a/taskncoffee-app/src/components/Card.jsx b/taskncoffee-app/src/components/Card.jsx index 88987c5..fe40982 100644 --- a/taskncoffee-app/src/components/Card.jsx +++ b/taskncoffee-app/src/components/Card.jsx @@ -1,14 +1,30 @@ -import { useState } from 'react' +import { useState, useEffect } from 'react' +import { useNavigate, useLocation } from 'react-router' import styles from '@/lib/styles' import { cn } from '@/lib/utils' import { X } from 'lucide-react' export function TaskButton({ taskData }) { + const navigate = useNavigate() + const location = useLocation() const [isModalOpen, setIsModalOpen] = useState(false) - const openModal = () => setIsModalOpen(true) - const closeModal = () => setIsModalOpen(false) + const taskId = taskData?.id || 1 + + // Проверяем, открыта ли карточка по URL + useEffect(() => { + const isCardRoute = location.pathname === `/card/${taskId}` + setIsModalOpen(isCardRoute) + }, [location.pathname, taskId]) + + const openModal = () => { + navigate(`/card/${taskId}`) + } + + const closeModal = () => { + navigate(-1) // Возвращаемся на предыдущую страницу + } return ( <> @@ -28,19 +44,7 @@ export function TaskButton({ taskData }) { className="fixed inset-0 bg-black/50 backdrop-blur-sm flex items-center justify-center z-50 p-4" onClick={closeModal} > -
e.stopPropagation()} - > - {/* Кнопка закрытия */} - - +
e.stopPropagation()}>