resolve conflicts

src/pages/Profile/ProfilePage.tsx

@@ -1,6 +1,7 @@
+import getXSRFToken from "../../utils/getXSRF.js";
 import {useContext, useEffect, useState} from "react";
 import styles from "./ProfilePage.module.css";
-import {AuthContext} from "../../contexts/Auth/AuthContext";
+import {AuthContext} from "../../../src/contexts/Auth/AuthContext.js";
 import formatDate from "../../utils/date/formatDate";
 import Task from "../../components/Task/Task";
 import SettingsModal from "./components/SettingsModal/SettingsModal";
@@ -9,11 +10,9 @@ import {useNavigate} from "react-router";
 import {useRef} from "react";
 import getUserById from "../../utils/users/getUserById.js";
 import ManageMember from "./components/ManageMember/ManageMember.jsx";
-
 import uploadProfilePhoto from "../../utils/users/uploadProfilePhoto";
 import deleteProfilePhoto from "../../utils/users/deleteProfilePhoto.js";
 
-
 interface TaskType {
   id: number;
   name: string;
@@ -56,14 +55,13 @@ function ProfilePage() {
   const { user, update } = useContext(AuthContext) as AuthContextType;
   const [profileUser, setProfileUser] = useState<User | null>(null);
   const [profilePicture, setProfilePicture] = useState<string | null>(null);
-    const [error, setError] = useState<string | null>(null);
-    const [success, setSuccess] = useState<string | null>(null);
   const fileInputRef = useRef<HTMLInputElement>(null);
 
   const isOwnProfile = !id || user?.id.toString() === id;
 
   useEffect(() => {
     (async () => {
+      console.log(JSON.stringify(import.meta.env.VITE_API_URL));
       if (!isOwnProfile && id) {
         const res = await getUserById(id);
         if (res.status === 404) {
@@ -71,12 +69,11 @@ function ProfilePage() {
           return;
         }
         if (res.status !== 200) {
-                    console.error("Erreur lors du chargement du profil", res);
+          console.log("Erreur lors du chargement du profil", res);
           return;
         }
         setProfileUser(res.data);
       } else {
-                update();
         setProfileUser(user);
         if (user?.profile_photo_path) {
           setProfilePicture(`${import.meta.env.VITE_API_URL}/storage/${user.profile_photo_path}`);
@@ -91,7 +88,6 @@ function ProfilePage() {
     }
   };
 
-    // Remplacé : handleFileChange extrait vers utils/users/uploadProfilePhoto
   const handleFileChange = async (e: React.ChangeEvent<HTMLInputElement>) => {
     const file = e.target.files?.[0];
     if (!file) return;
@@ -100,36 +96,19 @@ function ProfilePage() {
       const res = await uploadProfilePhoto(file);
       if (res.ok) {
         setProfilePicture(`${import.meta.env.VITE_API_URL}/storage/${res.data.profile_photo_path}`);
-                setSuccess("Photo mise à jour !");
+        console.log("Photo mise à jour")
-                setError(null);
         await update();
       } else {
-                setError(res.data?.message || res.error || "Erreur lors de l'upload.");
+        console.log(res.data?.message || res.error || "Erreur lors de l'upload.");
-                setSuccess(null);
       }
     } catch (err) {
-            setError("Erreur réseau.");
+      console.log("Erreur réseau.");
-            setSuccess(null);
     }
   };
-
-    // Remplacé : handleDeletePicture extrait vers utils/users/deleteProfilePhoto
   const handleDeletePicture = async () => {
-        try {
+    
-            const res = await deleteProfilePhoto();
+       deleteProfilePhoto();
-            if (res.status >= 200 && res.status < 300) {
        setProfilePicture(null);
-                setSuccess("Photo supprimée !");
-                setError(null);
-                await update();
-            } else {
-                setError(res.data?.message || "Erreur lors de la suppression.");
-                setSuccess(null);
-            }
-        } catch (err) {
-            setError("Erreur réseau.");
-            setSuccess(null);
-        }
   };
 
   return (
@@ -150,7 +129,7 @@ function ProfilePage() {
                 Modifier la photo
               </button>
               {user?.profile_photo_path && (
-                                <button onClick={handleDeletePicture} className={styles.deletePictureButton}>
+                <button onClick={handleDeletePicture} className={styles.editPictureButton}>
                   Supprimer
                 </button>
               )}
@@ -164,8 +143,6 @@ function ProfilePage() {
             accept="image/*"
             style={{ display: "none" }}
           />
-                    {error && <p className={styles.errorMessage}>{error}</p>}
-                    {success && <p className={styles.successMessage}>{success}</p>}
 
           <div className={styles.description}>
             <div className={styles.headerProfile}>
@@ -180,8 +157,7 @@ function ProfilePage() {
             <div className={styles.topDescription}>
               <div className={`${styles.infoBlock} glassBorder`}>
                 <p><strong>Role :</strong> {profileUser?.role}</p>
-                                <p><strong>Membre depuis :</strong> {profileUser && formatDate(profileUser.created_at)}
+                <p><strong>Membre depuis :</strong> {profileUser && formatDate(profileUser.created_at)}</p>
-                                </p>
               </div>
 
               <div className={`${styles.infoBlock} glassBorder`}>