Merge branch 'dev' into refactor/filesName

# Conflicts:
#	src/pages/Login/components/LoginForm/loginForm.jsx

src/pages/Admin/components/IncompleteEvent/IncompleteEvent.jsx

@@ -11,7 +11,7 @@ function IncompleteEvent() {
             <h2>Derniers événements</h2>
             <div className={styles.eventsContainer}>
                 {events.map((event) => (
-                    <div key={event.id} className={`glassCard ${styles.eventCard}`}>
+                    <div key={event.id} className={`glassBorder ${styles.eventCard}`}>
                         <h3>{event.name}</h3>
                         <p className={styles.eventDate}>
                             {new Date(event.start).toLocaleDateString("fr-FR")} - {new Date(event.end).toLocaleDateString("fr-FR")}

src/pages/Admin/components/IncompleteEvent/IncompleteEvent.module.css

@@ -29,17 +29,18 @@
   transform: translateX(20px);
   animation: slideInEvent 1s ease forwards;
   flex-shrink: 0;
+  padding: 10px;
 }
 
 .eventCard ul {
   align-items: center;
-  margin-left: 8%;
-  padding-left: 15px;
+  margin-left: 5%;
 }
 
 .eventCard ul li {
   text-align: left;
   list-style-type: circle;
+  list-style: none;
 }
 
 .eventCard > h3 {

src/pages/Admin/components/PendingMembers/PendingMembers.jsx

@@ -58,7 +58,7 @@ function PendingMembers() {
 
                 {pendingMembers.map((member, index) => (
 
-                    <div key={index} className={`glassCard ${styles.memberCard}`}>
+                    <div key={index} className={`glassBorder ${styles.memberCard}`}>
 
                         <p>{member.name} {member.lastname}</p>
 

src/pages/Home/HomePage.jsx

@@ -1,6 +1,6 @@
 import styles from "./HomePage.module.css";
 import Calendar from "./components/Calendar/Calendar.jsx";
-import EventList from "./components/EventList/EventList.tsx";
+import EventList from "./components/EventList/EventList";
 
 function HomePage() {
 

src/pages/Home/components/Calendar/Calendar.jsx

@@ -4,10 +4,11 @@ import {formatDateLetterJS} from "../../../../utils/date/formatDateLetter.js";
 import Button from "../../../../components/ui/Button/Button";
 import {AuthContext} from "../../../../contexts/Auth/AuthContext.ts";
 
-function Calendar() {
-
+function
+Calendar() {
     const { user } = useContext(AuthContext);
 
+    const calendarUrl = `${import.meta.env.VITE_API_URL}/api/export/ics/${user.id}`;
 
     const monthNames = [
         "Janvier", "Février", "Mars", "Avril", "Mai", "Juin",
@@ -17,17 +18,17 @@ function Calendar() {
     const today = new Date();
 
     const [currentMonth, setCurrentMonth] = useState(today.getMonth());
-    const [currentYear] = useState(today.getFullYear());
+    const [currentYear, setCurrentYear] = useState(today.getFullYear());
     const [selectedDay, setSelectedDay] = useState(null);
 
     const eventsByDate = useMemo(() => {
         if (!user?.tasks) return {};
-        return user.tasks.reduce((acc, task) => {
-            if (!task?.start) return acc;
+        return user.tasks.reduce((eventsByDate, task) => {
+            if (!task?.start) return eventsByDate;
             const dateKey = task.start.split(" ")[0];
-            if (!acc[dateKey]) acc[dateKey] = [];
-            acc[dateKey].push(task);
-            return acc;
+            if (!eventsByDate[dateKey]) eventsByDate[dateKey] = [];
+            eventsByDate[dateKey].push(task);
+            return eventsByDate;
         }, {});
     }, [user]);
 
@@ -66,9 +67,31 @@ function Calendar() {
             <div className={styles.calendarContainer}>
 
                 <div className={styles.calendarHeader}>
-                    <button onClick={() => setCurrentMonth(m => m === 0 ? 11 : m - 1)}>◀</button>
+                    <button
+                        onClick={() => {
+                            if (currentMonth === 0) {
+                                setCurrentMonth(11);
+                                setCurrentYear(y => y - 1);
+                            } else {
+                                setCurrentMonth(m => m - 1);
+                            }
+                        }}
+                    >
+                        ◀
+                    </button>
                     <p>{monthNames[currentMonth]} {currentYear}</p>
-                    <button onClick={() => setCurrentMonth(m => m === 11 ? 0 : m + 1)}>▶</button>
+                    <button
+                        onClick={() => {
+                            if (currentMonth === 11) {
+                                setCurrentMonth(0);
+                                setCurrentYear(y => y + 1);
+                            } else {
+                                setCurrentMonth(m => m + 1);
+                            }
+                        }}
+                    >
+                        ▶
+                    </button>
                 </div>
 
                 <table className={styles.calendar}>
@@ -128,15 +151,18 @@ function Calendar() {
                         )}
                     </div>
                 )}
-                <Button className={styles.exportbtn}
-                        variant={"primary"}
+                <div className={`${styles.exportbox} glassBorder`}>
+                    <p><b>votre lien d'agenda:</b> {calendarUrl}</p>
+                    <Button className={styles.exportbtn}
                         onClick={() => {
-                            window.location.href =
-                                `http://localhost/api/export/ics/${user.id}`;
+                            window.open(
+                                "https://calendar.google.com/calendar/u/0/r/settings/addbyurl"
+                            );
                         }}
-                >
-                    Exporter mon agenda
-                </Button>
+                    >
+                        Exporter
+                    </Button>
+                </div>
             </div>
         </div>
     );

src/pages/Home/components/Calendar/Calendar.module.css

@@ -150,10 +150,22 @@
     display: none;
 }
 
-.exportbtn{
+.exportbox{
+    width: 100%;
+    padding: 15px;
     margin-top: 16px;
+    display: flex;
+    align-items: center;
 }
 
+.exportbtn {
+    display: flex;
+    align-items: center;
+    max-height: 30px;
+}
+
+
+
 @media (max-width: 768px) {
     .glassCard {
         width: 100%;

src/pages/Home/components/EventList/EventList.module.css

@@ -68,9 +68,12 @@ h2{
 }
 
 .eventTasks {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
+    list-style: none;
+    margin: 10px;
+}
+
+.taskDate{
+    font-size: 13px;
 }
 
 @media (max-width: 768px) {

src/pages/Login/LoginPage.jsx

@@ -1,5 +1,5 @@
 import styles from "./LoginPage.module.css";
-import LoginForm from "./components/LoginForm/LoginForm.tsx";
+import LoginForm from "./components/LoginForm/LoginForm";
 import Background from "../../components/Background/Background.jsx";
 import { useEffect, useContext } from "react";
 import { AuthContext } from "../../contexts/Auth/AuthContext.js";

src/pages/Profile/ProfilePage.tsx

@@ -15,20 +15,20 @@ import deleteProfilePhoto from "../../utils/users/deleteProfilePhoto.js";
 
 
 interface TaskType {
-  id: number;
-  name: string;
-  description: string;
-  location: string;
-  start: string;
-  end: string;
-  max_participants: number;
-  events_id: number;
-  created_at: string;
-  updated_at: string;
-  pivot: {
-    user_id: number;
-    task_id: number;
-  };
+    id: number;
+    name: string;
+    description: string;
+    location: string;
+    start: string;
+    end: string;
+    max_participants: number;
+    events_id: number;
+    created_at: string;
+    updated_at: string;
+    pivot: {
+        user_id: number;
+        task_id: number;
+    };
 }
 
 
@@ -51,149 +51,162 @@ interface AuthContextType {
 }
 
 function ProfilePage() {
-  const navigate = useNavigate();
-  const { id } = useParams();
-  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 navigate = useNavigate();
+    const {id} = useParams();
+    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;
+    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) {
-          navigate("/404");
-          return;
+    useEffect(() => {
+        (async () => {
+            if (!isOwnProfile && id) {
+                const res = await getUserById(id);
+                if (res.status === 404) {
+                    navigate("/404");
+                    return;
+                }
+                if (res.status !== 200) {
+                    console.error("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}`);
+                }
+            }
+        })();
+    }, [user, id]);
+
+    const handleEditPictureClick = () => {
+        if (fileInputRef.current) {
+            fileInputRef.current.click();
         }
-        if (res.status !== 200) {
-          console.error("Erreur lors du chargement du profil", res);
-          return;
+    };
+
+    // Remplacé : handleFileChange extrait vers utils/users/uploadProfilePhoto
+    const handleFileChange = async (e: React.ChangeEvent<HTMLInputElement>) => {
+        const file = e.target.files?.[0];
+        if (!file) return;
+
+        try {
+            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 !");
+                setError(null);
+                await update();
+            } else {
+                setError(res.data?.message || res.error || "Erreur lors de l'upload.");
+                setSuccess(null);
+            }
+        } catch (err) {
+            setError("Erreur réseau.");
+            setSuccess(null);
         }
-        setProfileUser(res.data);
-      } else {
-        //update();
-        setProfileUser(user);
-        if (user?.profile_photo_path) {
-          setProfilePicture(`${import.meta.env.VITE_API_URL}/storage/${user.profile_photo_path}`);
-          //setProfilePicture(`${import.meta.env.VITE_API_URL}/${user.profile_photo_path}`);
+    };
+
+    // Remplacé : handleDeletePicture extrait vers utils/users/deleteProfilePhoto
+    const handleDeletePicture = async () => {
+        try {
+            const res = await 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);
         }
-      }
-    })();
-  }, [user, id]);
+    };
 
-  const handleEditPictureClick = () => {
-    if (fileInputRef.current) {
-      fileInputRef.current.click();
-    }
-  };
+    return (
+        <div className={styles.container}>
+            <div className={`${styles.profileboard} glassCard`}>
+                <div className={styles.contentWrapper}>
+                    <div className={styles.profilePictureContainer}>
+                        <img
+                            src={isOwnProfile ? (profilePicture || "/react.svg") : "/react.svg"}
+                            alt="Photo de profil"
+                            className={styles.profilePicture}
+                        />
+                    </div>
 
-  const handleFileChange = async (e: React.ChangeEvent<HTMLInputElement>) => {
-    const file = e.target.files?.[0];
-    if (!file) return;
+                    {isOwnProfile && (
+                        <div className={styles.pictureButtons}>
+                            <button onClick={handleEditPictureClick} className={styles.editPictureButton}>
+                                Modifier la photo
+                            </button>
+                            {user?.profile_photo_path && (
+                                <button onClick={handleDeletePicture} className={styles.deletePictureButton}>
+                                    Supprimer
+                                </button>
+                            )}
+                        </div>
+                    )}
 
-    try {
-      const res = await uploadProfilePhoto(file);
-      if (res.ok) {
-        setProfilePicture(`${import.meta.env.VITE_API_URL}/storage/${res.data.profile_photo_path}`);
-        //setProfilePicture(`${import.meta.env.VITE_API_URL}/${res.data.profile_photo_path}`);
-        setSuccess("Photo mise à jour !");
-        setError(null);
-        await update();
-      } else {
-        setError(res.data?.message || res.error || "Erreur lors de l'upload.");
-        setSuccess(null);
-      }
-    } catch (err) {
-      setError("Erreur réseau.");
-      setSuccess(null);
-    }
-  };
-  const handleDeletePicture = async () => {
-    
-       deleteProfilePhoto();
-       setProfilePicture(null);
-  };
+                    <input
+                        type="file"
+                        ref={fileInputRef}
+                        onChange={handleFileChange}
+                        accept="image/*"
+                        style={{display: "none"}}
+                    />
+                    {error && <p className={styles.errorMessage}>{error}</p>}
+                    {success && <p className={styles.successMessage}>{success}</p>}
 
-  return (
-    <div className={styles.container}>
-      <div className={`${styles.profileboard} glassCard`}>
-        <div className={styles.contentWrapper}>
-          <div className={styles.profilePictureContainer}>
-            <img
-              src={isOwnProfile ? (profilePicture || "/react.svg") : "/react.svg"}
-              alt="Photo de profil"
-              className={styles.profilePicture}
-            />
-          </div>
+                    <div className={styles.description}>
+                        <div className={styles.headerProfile}>
+                            <h2>
+                                {profileUser?.name} {profileUser?.lastname}
+                            </h2>
+                            {user?.isAdmin && profileUser && !isOwnProfile && (
+                                <ManageMember userToManage={profileUser}/>
+                            )}
+                        </div>
 
-          {isOwnProfile && (
-            <div className={styles.pictureButtons}>
-              <button onClick={handleEditPictureClick} className={styles.editPictureButton}>
-                Modifier la photo
-              </button>
-              {user?.profile_photo_path && (
-                <button onClick={handleDeletePicture} className={styles.editPictureButton}>
-                  Supprimer
-                </button>
-              )}
-            </div>
-          )}
+                        <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>
+                            </div>
 
-          <input
-            type="file"
-            ref={fileInputRef}
-            onChange={handleFileChange}
-            accept="image/*"
-            style={{ display: "none" }}
-          />
-          {error && <p className={styles.errorMessage}>{error}</p>}
-          {success && <p className={styles.successMessage}>{success}</p>}
+                            <div className={`${styles.infoBlock} glassBorder`}>
+                                <p><strong>Mail :</strong> {profileUser?.email}</p>
+                                <p><strong>Téléphone :</strong> {profileUser?.phone ?? "Non renseigné"}</p>
+                            </div>
 
-          <div className={styles.description}>
-            <div className={styles.headerProfile}>
-              <h2>
-                {profileUser?.name} {profileUser?.lastname}
-              </h2>
-              {user?.isAdmin && profileUser && !isOwnProfile && (
-                <ManageMember userToManage={profileUser} />
-              )}
-            </div>
+                            {isOwnProfile && (
+                                <div className={styles.settingImage}>
+                                    <SettingsModal/>
+                                </div>
+                            )}
+                        </div>
 
-            <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>
-              </div>
-
-              <div className={`${styles.infoBlock} glassBorder`}>
-                <p><strong>Mail :</strong> {profileUser?.email}</p>
-                <p><strong>Téléphone :</strong> {profileUser?.phone ?? "Non renseigné"}</p>
-              </div>
-
-              {isOwnProfile && (
-                <div className={styles.settingImage}>
-                  <SettingsModal />
+                        <h2>Tâches :</h2>
+                            {profileUser?.tasks.length ? (
+                                profileUser.tasks.map((task) =><Task key={task.id} task={task}/>)
+                            ) : (
+                                <p>Aucune tâche.</p>
+                            )}
+                    </div>
                 </div>
-              )}
             </div>
-
-            <h2>Tâches :</h2>
-            {profileUser?.tasks.length ? (
-              profileUser.tasks.map((task) => <Task key={task.id} task={task} />)
-            ) : (
-              <p>Aucune tâche.</p>
-            )}
-          </div>
         </div>
-      </div>
-    </div>
-  );
+    );
 }
 
 export default ProfilePage;