diff --git a/frontend/src/components/Header.tsx b/frontend/src/components/Header.tsx index 1803622..059948f 100644 --- a/frontend/src/components/Header.tsx +++ b/frontend/src/components/Header.tsx @@ -9,13 +9,13 @@ const Header = () => { const [showMenu, setShowMenu] = useState(false); return ( -
-
+
+
{/* Logo et titre */} -
-
+
+

@@ -23,18 +23,18 @@ const Header = () => {

- {/* Menu burger sur mobile */} + {/* Bouton burger mobile */}
- {/* Barre de recherche et actions sur desktop */} + {/* Barre de recherche + actions (desktop uniquement) */}
@@ -53,11 +53,11 @@ const Header = () => { onClick={() => setShowNotifications(!showNotifications)} className="relative p-2 text-slate-300 hover:text-white transition-colors" > - {} - + {} + -
+
{currentUser?.userName} @@ -67,7 +67,7 @@ const Header = () => { @@ -75,63 +75,58 @@ const Header = () => {
- {/* Menu burger mobile */} + {/* Drawer mobile */} {showMenu && ( -
setShowMenu(false)} - >
- )} - {showMenu && ( -
-
-
-

- TaskFlow -

- -
- -
- - -
+
+ {/* Header du drawer */} +
+

+ TaskFlow +

+ +
-
- + {/* Recherche mobile */} +
+ + +
-
- - - {currentUser?.userName} - -
+ {/* Actions mobile */} +
+ - +
+ + + {currentUser?.userName} +
+ +
)} diff --git a/frontend/src/components/Main.tsx b/frontend/src/components/Main.tsx index ec80c5f..31a09ec 100644 --- a/frontend/src/components/Main.tsx +++ b/frontend/src/components/Main.tsx @@ -14,25 +14,25 @@ const Main = () => { window.location.href = "/login"; } return ( -
-
+
+
{/* Barre d'outils */} -
+
{/* Tâches */} -
+
{/* Rooms */} -
+
{/* Stats */} -
+
diff --git a/frontend/src/context/AuthContext.ts b/frontend/src/context/AuthContext.ts index deddd24..6e6fbda 100644 --- a/frontend/src/context/AuthContext.ts +++ b/frontend/src/context/AuthContext.ts @@ -7,6 +7,7 @@ export interface AuthContextType { user: User[]; currentUser: User | null; loading: boolean; + error: string; login: (email: string, password: string) => Promise; register: (userName: string, email: string, password: string) => Promise; logout: () => void; @@ -20,5 +21,6 @@ export const AuthContext = createContext({ register: async () => {}, logout: () => { }, getAllUser: async () => { }, - loading: false + loading: false, + error:"" }); diff --git a/frontend/src/context/AuthProvider.tsx b/frontend/src/context/AuthProvider.tsx index 3071258..ed10a3b 100644 --- a/frontend/src/context/AuthProvider.tsx +++ b/frontend/src/context/AuthProvider.tsx @@ -3,6 +3,16 @@ import { AuthContext } from "./AuthContext"; import instance from "../services/api"; import type { User } from "../types/user"; + +type ApiError = Error & { + response?: { + data?: { + error?: string; + message?: string; + }; + }; +}; + export const AuthProvider = ({ children }: { children: React.ReactNode }) => { // Séparation entre l'utilisateur connecté et tous les utilisateurs const [currentUser, setCurrentUser] = useState(null); @@ -11,6 +21,7 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => { localStorage.getItem("token") ); const [loading, setLoading] = useState(false); + const [error, setError] = useState("") // Essaye de récupérer l'utilisateur connecté stocké en local useEffect(() => { @@ -61,6 +72,13 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => { setToken(token); localStorage.setItem("token", token); } catch (error) { + const apiError = error as ApiError; + const errorMessage = + apiError.response?.data?.error || + apiError.response?.data?.message || + apiError.message || + "Failed login"; + setError(`Error: ${errorMessage}`); console.error("Login failed:", error); throw error; } finally { @@ -81,6 +99,13 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => { setCurrentUser(user); // Note: Pas de token automatique après registration selon votre logique } catch (error) { + const apiError = error as ApiError; + const errorMessage = + apiError.response?.data?.error || + apiError.response?.data?.message || + apiError.message || + "Failed register"; + setError(`Error: ${errorMessage}`); console.error("Registration failed:", error); throw error; } finally { @@ -113,7 +138,14 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => { console.error("API ne retourne pas un array:", res.data); setUser([]); } - } catch (error: any) { + } catch (error) { + const apiError = error as ApiError; + const errorMessage = + apiError.response?.data?.error || + apiError.response?.data?.message || + apiError.message || + "Failed to get User"; + setError(`Error: ${errorMessage}`); console.error("Erreur getAllUser:", error); setUser([]); throw error; @@ -131,7 +163,8 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => { register, logout, getAllUser, - loading + loading, + error }} > {children} diff --git a/frontend/src/context/TaskProvider.tsx b/frontend/src/context/TaskProvider.tsx index d0c6253..4cf2d9f 100644 --- a/frontend/src/context/TaskProvider.tsx +++ b/frontend/src/context/TaskProvider.tsx @@ -14,6 +14,15 @@ interface TaskProviderProps { children: React.ReactNode; } +type ApiError = Error & { + response?: { + data?: { + error?: string; + message?: string; + }; + }; +}; + export const TaskProvider = ({ children }: TaskProviderProps) => { const { user } = useContext(AuthContext); const [tasks, setTasks] = useState([]); @@ -30,7 +39,13 @@ export const TaskProvider = ({ children }: TaskProviderProps) => { setTasks(res.data.tasks); setError(null); } catch (error) { - setError("Failed to fetch tasks"); + const apiError = error as ApiError; + const errorMessage = + apiError.response?.data?.error || + apiError.response?.data?.message || + apiError.message || + "Failed to get task"; + setError(`Error: ${errorMessage}`); console.error("Error fetching tasks:", error); } finally { setLoading(false); @@ -68,8 +83,13 @@ export const TaskProvider = ({ children }: TaskProviderProps) => { setError(null); return res.data; } catch (error) { - const errorMessage = "Failed to add task"; - setError(errorMessage); + const apiError = error as ApiError; + const errorMessage = + apiError.response?.data?.error || + apiError.response?.data?.message || + apiError.message || + "Failed to add Task"; + setError(`Error: ${errorMessage}`); console.error(errorMessage, error); throw error; } @@ -87,11 +107,14 @@ export const TaskProvider = ({ children }: TaskProviderProps) => { setError(null); toast.success("Tâche mise à jour avec succès"); return res.data; - } catch (error: any) { + } catch (error) { + const apiError = error as ApiError; const errorMessage = - error.response?.data?.error || "Échec de la mise à jour de la tâche"; - setError(errorMessage); - toast.error(errorMessage); + apiError.response?.data?.error || + apiError.response?.data?.message || + apiError.message || + "Failed to update"; + setError(`Error: ${errorMessage}`); console.error("Update task error:", error); throw error; } @@ -103,8 +126,13 @@ export const TaskProvider = ({ children }: TaskProviderProps) => { const res = await instance.get(`/get/task/${id}`); return res.data; } catch (error) { - const errorMessage = `Failed to fetch task with id ${id}`; - setError(errorMessage); + const apiError = error as ApiError; + const errorMessage = + apiError.response?.data?.error || + apiError.response?.data?.message || + apiError.message || + "Failed to get"; + setError(`Error: ${errorMessage}`); console.error(errorMessage, error); return null; } @@ -117,11 +145,14 @@ export const TaskProvider = ({ children }: TaskProviderProps) => { setTasks((prevTasks) => prevTasks.filter((task) => task._id !== id)); setError(null); toast.success("Tâche supprimée avec succès"); - } catch (error: any) { + } catch (error) { + const apiError = error as ApiError; const errorMessage = - error.response?.data?.error || "Échec de la suppression de la tâche"; - setError(errorMessage); - toast.error(errorMessage); + apiError.response?.data?.error || + apiError.response?.data?.message || + apiError.message || + "Failed to Delete"; + setError(`Error: ${errorMessage}`); console.error("Delete task error:", error); throw error; } diff --git a/frontend/src/index.css b/frontend/src/index.css index aed5d84..44ea4b1 100644 --- a/frontend/src/index.css +++ b/frontend/src/index.css @@ -7,7 +7,8 @@ body { - @apply bg-gradient-to-br from-slate-900 via-purple-900 to-slate-900; + /* @apply bg-gradient-to-br from-slate-900 via-purple-900 to-slate-900; */ + @apply bg-white; @apply min-h-screen; } diff --git a/frontend/src/pages/AddPage.tsx b/frontend/src/pages/AddPage.tsx index 5b94cfd..7ecb23d 100644 --- a/frontend/src/pages/AddPage.tsx +++ b/frontend/src/pages/AddPage.tsx @@ -13,7 +13,7 @@ const AddTask = () => {

Aucune salle sélectionnée

Créer une salle diff --git a/frontend/src/pages/Dashboard.tsx b/frontend/src/pages/Dashboard.tsx index 000355c..6bacc31 100644 --- a/frontend/src/pages/Dashboard.tsx +++ b/frontend/src/pages/Dashboard.tsx @@ -3,7 +3,7 @@ import Main from '../components/Main' const Dashboard = () => { return ( -
+
diff --git a/frontend/src/pages/RoomId.tsx b/frontend/src/pages/RoomId.tsx index 63796c8..5c4a92d 100644 --- a/frontend/src/pages/RoomId.tsx +++ b/frontend/src/pages/RoomId.tsx @@ -65,7 +65,7 @@ const RoomId = () => { case "completed": return "bg-emerald-900/30 text-emerald-400 border-emerald-800/50"; case "in_progress": - return "bg-blue-900/30 text-blue-400 border-blue-800/50"; + return "bg-blue-300 text-blue-400 border-blue-800/50"; case "done": return "bg-green-900/30 text-blue-400 border-green-800/50"; default: @@ -135,7 +135,7 @@ const RoomId = () => { } return ( -
+
{/* Header */}
@@ -147,7 +147,7 @@ const RoomId = () => { Dashboard -

+

{currentRoom.room_name}

@@ -175,16 +175,16 @@ const RoomId = () => { {/* Sidebar */}
{/* Room Info */} -
+
-

+

{currentRoom.room_name}

-

+

{currentRoom.description}

@@ -192,12 +192,12 @@ const RoomId = () => {
{/* Team Members */} -
+
-

- Team Members +

+ Team Members

- + {currentRoom.members?.length || 0}

@@ -214,7 +214,7 @@ const RoomId = () => { "U"}
-

+

{member.userName || member.email}

@@ -235,25 +235,25 @@ const RoomId = () => {

{/* Quick Stats */} -
-

Quick Stats

+
+

Quick Stats

- Total Tasks - + Total Tasks + {currentRoom.tasks?.length || 0}
- Completed - + Completed + {currentRoom.tasks?.filter((t) => t.status === "completed") .length || 0}
- In Progress - + In Progress + {currentRoom.tasks?.filter( (t) => t.status === "in-progress" ).length || 0} @@ -266,8 +266,8 @@ const RoomId = () => { {/* Main Content */}
-

- Tasks +

+ Tasks

{ {currentRoom.tasks.map((task) => (
@@ -292,11 +292,11 @@ const RoomId = () => { task.priority || "low" )}`} >
-

+

{task.title || "Sans titre"}

@@ -304,13 +304,13 @@ const RoomId = () => { {(task.status || "todo").replace("-", " ")}
-

+

{task.description || "Aucune description"}

{task.dueDate && ( -
+
{new Date(task.dueDate).toLocaleDateString()} @@ -320,6 +320,7 @@ const RoomId = () => { @@ -329,14 +330,14 @@ const RoomId = () => { ))}
) : ( -
-
- +
+
+
-

+

No tasks yet

-

+

Get started by creating your first task for this room.

{ return ( -
+
diff --git a/frontend/src/ui/Stats.tsx b/frontend/src/ui/Stats.tsx index 565c5c7..46effd5 100644 --- a/frontend/src/ui/Stats.tsx +++ b/frontend/src/ui/Stats.tsx @@ -42,12 +42,12 @@ const Stats = ({ tasks }: { tasks: Task[] }) => { {stats.map((stat, index) => (
-

{stat.label}

-

+

{stat.label}

+

{stat.value}

diff --git a/frontend/src/ui/Tasks.tsx b/frontend/src/ui/Tasks.tsx index 3c0755f..b0e4980 100644 --- a/frontend/src/ui/Tasks.tsx +++ b/frontend/src/ui/Tasks.tsx @@ -58,13 +58,13 @@ const Tasks = ({ viewMode }: { viewMode: string }) => { > {task.priority} - + Échéance: {new Date(task.dueDate).toLocaleDateString("fr-FR")}
{/* Title & description */} -

- {task.title} +

+ Titre: {task.title}

-

+

{task.description}

@@ -87,7 +87,7 @@ const Tasks = ({ viewMode }: { viewMode: string }) => {
diff --git a/frontend/src/ui/UpdateTask.tsx b/frontend/src/ui/UpdateTask.tsx index 752ece8..c0e9901 100644 --- a/frontend/src/ui/UpdateTask.tsx +++ b/frontend/src/ui/UpdateTask.tsx @@ -52,11 +52,10 @@ const UpdateTask = () => { const handleInputChange = (e: React.ChangeEvent) => { const { name, value, type, checked } = e.target; - if (type === "checkbox") { - setTask((prev) => ({ ...prev, [name]: checked })); - } else { - setTask((prev) => ({ ...prev, [name]: value })); - } + setTask((prev) => ({ + ...prev, + [name]: type === "checkbox" ? checked : value, + })); }; const handleSelectChange = (e: React.ChangeEvent) => { @@ -71,17 +70,13 @@ const UpdateTask = () => { const handleSubmit = async (e: React.FormEvent) => { e.preventDefault(); - if (!id) { - console.error("Task ID is not defined"); - return; - } + if (!id) return; setLoading(true); try { await updateTask(id, task); - // Optionally add a success message or redirect } catch (error) { - console.error("Error updating task:", error); + console.error("Erreur lors de la mise à jour :", error); } finally { setLoading(false); } @@ -96,161 +91,173 @@ const UpdateTask = () => { } return ( -
- {/* Retour */} -
- - ← Retour au tableau de bord - -
+
+ {/* Retour */} +
+ + ← Retour au tableau de bord + +
- {/* Titre */} -

- Modifier la tâche -

+ {/* Titre */} +

+ Modifier la tâche +

-
- {/* Titre */} - + + {/* Titre */} + - {/* Description */} -