diff --git a/app/frontend/App.tsx b/app/frontend/App.tsx index fe8dd91..08e6700 100644 --- a/app/frontend/App.tsx +++ b/app/frontend/App.tsx @@ -21,6 +21,7 @@ import ProfileSettings from "./components/Profile/ProfileSettings"; import Layout from "./Layout"; import { DataProvider } from "./contexts/DataContext"; import { User } from "./entities/User"; +import TasksToday from "./components/Task/TasksToday"; const App: React.FC = () => { const [currentUser, setCurrentUser] = useState(null); @@ -85,7 +86,7 @@ const App: React.FC = () => { useEffect(() => { if (currentUser && location.pathname === "/") { - navigate("/tasks?type=today", { replace: true }); + navigate("/today", { replace: true }); // Navigate to /today instead of /tasks?type=today } }, [currentUser, location.pathname, navigate]); @@ -104,12 +105,13 @@ const App: React.FC = () => { {currentUser ? ( - } /> + } /> + } /> } /> } /> } /> @@ -119,7 +121,10 @@ const App: React.FC = () => { } /> } /> } /> - } /> + } + /> } /> diff --git a/app/frontend/components/Login.tsx b/app/frontend/components/Login.tsx index b7c374e..cc7d6c3 100644 --- a/app/frontend/components/Login.tsx +++ b/app/frontend/components/Login.tsx @@ -24,7 +24,7 @@ const Login: React.FC = () => { if (response.ok) { console.log('Login successful:', data); - navigate('/tasks?type=today&order_by=due_date%3Aasc'); + navigate('/today'); } else { setError(data.errors[0] || 'Login failed. Please try again.'); } diff --git a/app/frontend/components/Sidebar/SidebarNav.tsx b/app/frontend/components/Sidebar/SidebarNav.tsx index 6d0c968..2b4436c 100644 --- a/app/frontend/components/Sidebar/SidebarNav.tsx +++ b/app/frontend/components/Sidebar/SidebarNav.tsx @@ -18,7 +18,7 @@ interface SidebarNavProps { } const navLinks = [ - { path: '/tasks?type=today', title: 'Today', icon: , query: 'type=today' }, + { path: '/today', title: 'Today', icon: , query: 'type=today' }, { path: '/tasks?type=upcoming', title: 'Upcoming', icon: , query: 'type=upcoming' }, { path: '/tasks?type=next', title: 'Next Actions', icon: , query: 'type=next' }, { path: '/tasks?type=inbox', title: 'Inbox', icon: , query: 'type=inbox' }, diff --git a/app/frontend/components/Task/TaskHeader.tsx b/app/frontend/components/Task/TaskHeader.tsx index 642bc48..6fab21c 100644 --- a/app/frontend/components/Task/TaskHeader.tsx +++ b/app/frontend/components/Task/TaskHeader.tsx @@ -41,7 +41,7 @@ const TaskHeader: React.FC = ({ )} -
+
{/* Tags without onTagRemove prop */} {task.due_date && } diff --git a/app/frontend/components/Task/TaskTags.tsx b/app/frontend/components/Task/TaskTags.tsx index 61270e8..207825c 100644 --- a/app/frontend/components/Task/TaskTags.tsx +++ b/app/frontend/components/Task/TaskTags.tsx @@ -17,11 +17,11 @@ const TaskTags: React.FC = ({ tags = [], onTagRemove, className } }; return ( -
+
{tags.map((tag, index) => (