Implement task fetching in Calendar component with loading state

This commit is contained in:
IluaAir
2025-10-19 23:18:24 +03:00
parent 024fa8b366
commit 692618ea21
2 changed files with 37 additions and 15 deletions

View File

@@ -1,9 +1,27 @@
import { useState } from 'react'; import { useState, useEffect } from 'react';
import { getUserTasks } from '@/api/users.service';
export default function Calendar() { export default function Calendar() {
const [tasksFromBackend, setTasksFromBackend] = useState([]); const [tasksFromBackend, setTasksFromBackend] = useState([]);
const [loading, setLoading] = useState(true);
// Fetch tasks when component mounts
useEffect(() => {
const fetchTasks = async () => {
try {
console.log('Calendar: Fetching user tasks...');
const response = await getUserTasks(1);
console.log('Calendar: Tasks from backend:', response);
setTasksFromBackend(response);
} catch (error) {
console.error('Calendar: Failed to fetch tasks:', error);
} finally {
setLoading(false);
}
};
fetchTasks();
}, []);
const today = new Date(); const today = new Date();
const currentDay = today.getDay(); const currentDay = today.getDay();
@@ -56,7 +74,15 @@ export default function Calendar() {
}; };
}); });
if (loading) {
return (
<div className="dashboard-surface-container">
<div className="flex items-center justify-center p-8">
<p className="text-lg">Loading tasks...</p>
</div>
</div>
);
}
return ( return (
<div className="dashboard-surface-container"> <div className="dashboard-surface-container">

View File

@@ -6,7 +6,6 @@ import { MenuDock } from '@/components/ui/shadcn-io/menu-dock';
import { Home, Settings, Bell } from 'lucide-react'; import { Home, Settings, Bell } from 'lucide-react';
import { Avatar, AvatarImage, AvatarFallback } from '@/components/ui/avatar'; import { Avatar, AvatarImage, AvatarFallback } from '@/components/ui/avatar';
import { jwtexp } from '@/lib/utils'; import { jwtexp } from '@/lib/utils';
import { getUserTasks } from '@/api/users.service';
import Calendar from '@/components/Calendar'; import Calendar from '@/components/Calendar';
const menuItems = [ const menuItems = [
@@ -19,12 +18,12 @@ export default function Dashboard() {
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(true);
const [authError, setAuthError] = useState(false); const [authError, setAuthError] = useState(false);
// Fetch tasks // Validate token on page load
useEffect(() => { useEffect(() => {
console.log('Dashboard useEffect triggered'); console.log('Dashboard useEffect triggered');
const fetchTasks = async () => { const validateAuth = async () => {
try { try {
console.log('Starting fetchTasks...'); console.log('Validating authentication...');
const token = localStorage.getItem('access_token'); const token = localStorage.getItem('access_token');
if (token) { if (token) {
console.log('Token found, validating...'); console.log('Token found, validating...');
@@ -41,19 +40,16 @@ export default function Dashboard() {
setLoading(false); setLoading(false);
return; return;
} }
console.log('Authentication validated successfully');
console.log('Fetching user tasks...');
const response = await getUserTasks(1);
console.log('Tasks from backend:', response);
setTasksFromBackend(response);
} catch (error) { } catch (error) {
console.error('Failed to fetch tasks:', error); console.error('Authentication validation error:', error);
setAuthError(true);
} finally { } finally {
setLoading(false); setLoading(false);
} }
}; };
fetchTasks(); validateAuth();
}, []); }, []);
// Get current date and week // Get current date and week