Merge branch 'refac/architecture' into 'dev'

Refac/architecture

See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!70

src/pages/Admin/AdminPage.jsx

@@ -1,8 +1,8 @@
 import { useState, useContext } from "react";
 import styles from "./AdminPage.module.css";
-import ParticipationChart from "../../components/chart/ParticipationChart.jsx";
-import IncompleteEvents from "../../components/IncompleteEvent/IncompleteEvent.jsx";
-import PendingMembers from "../../components/PendingMembers/PendingMembers.jsx";
+import ParticipationChart from "./components/chart/ParticipationChart.jsx";
+import IncompleteEvents from "./components/IncompleteEvent/IncompleteEvent.jsx";
+import PendingMembers from "./components/pendingMembers/PendingMembers.jsx";
 import { AuthContext } from "../../contexts/auth/AuthContext.js";
 import { useNavigate } from "react-router";
 

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

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from "react";
 import styles from "./IncompleteEvent.module.css";
-import getAllEvents from "../../utils/events/getAllEvents";
+import getAllEvents from "../../../../utils/events/getAllEvents.js";
 
 function IncompleteEvent() {
   const [events, setEvents] = useState([]);

src/pages/Admin/components/chart/ParticipationChart.jsx

@@ -3,7 +3,7 @@ import { Doughnut } from "react-chartjs-2";
 import { Chart, ArcElement } from "chart.js";
 import { MenuItem, Select, FormControl } from "@mui/material";
 import styles from "./ParticipationChart.module.css";
-import getAllEvents from "../../utils/events/getAllEvents";
+import getAllEvents from "../../../../utils/events/getAllEvents.js";
 
 Chart.register(ArcElement);
 

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

@@ -1,11 +1,11 @@
 import React, { useState, useEffect } from "react";
-import Button from "../ui/button/button";
+import Button from "../../../../components/ui/button/button.jsx";
 import styles from "./PendingMembers.module.css";
 
-import getUserToValidate from "../../utils/users/getUserToValidate";
-import getUserById from "../../utils/users/getUserById";
-import validateUser from "../../utils/users/validateUser";
-import deleteOtherUser from "../../utils/users/deleteOtherUser.js";
+import getUserToValidate from "../../../../utils/users/getUserToValidate.js";
+import getUserById from "../../../../utils/users/getUserById.js";
+import validateUser from "../../../../utils/users/validateUser.js";
+import deleteOtherUser from "../../../../utils/users/deleteOtherUser.js";
 
 function PendingMembers() {
   const [pendingMembers, setPendingMembers] = useState([]);

src/pages/Events/EventsPage.jsx

@@ -1,5 +1,5 @@
 import { useEffect, useState } from "react";
-import Event from "../../components/Event/Event.jsx";
+import Event from "./components/Event/Event.jsx";
 import styles from "./EventsPage.module.css";
 import ToolBar from "../../components/ToolBar/ToolBar.jsx";
 import getAllEvents from "../../utils/events/getAllEvents.js";

src/pages/Home/HomePage.jsx

@@ -1,6 +1,6 @@
 import styles from "./HomePage.module.css";
-import Calendar from "../../components/homePage/calendar.jsx";
-import EventList from "../../components/homePage/eventList.jsx";
+import Calendar from "./components/Calendar/calendar.jsx";
+import EventList from "./components/EventList/eventList.jsx";
 import { useState, useEffect } from "react";
 import getAllEvents from "../../utils/events/getAllEvents.js";
 

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

@@ -1,6 +1,6 @@
 import { useState, useMemo, useEffect } from "react";
 import styles from "./calendar.module.css";
-import { formatDateLetterJS } from "../../utils/date/formatDateLetter.js";
+import { formatDateLetterJS } from "../../../../utils/date/formatDateLetter.js";
 
 function Calendar({ events = [] }) {
 

src/pages/Home/components/EventList/eventItem.jsx

@@ -1,5 +1,5 @@
 import styles from "./eventList.module.css";
-import { formatDateLetter } from "../../utils/date/formatDateLetter.js";
+import { formatDateLetter } from "../../../../utils/date/formatDateLetter.js";
 import { useState } from "react";
 
 export default function EventItem({ eventGroup }) {

src/pages/Home/components/EventList/eventList.jsx

@@ -1,6 +1,6 @@
 import { useMemo } from "react";
 import styles from "./eventList.module.css";
-import EventItem from "./eventItem";
+import EventItem from "./eventItem.jsx";
 
 
 function EventList({ events }) {

src/pages/Login/LoginPage.jsx

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

src/pages/Login/components/loginform/loginForm.jsx

@@ -1,10 +1,10 @@
 import { useState, useContext } from "react";
 import styles from "./loginForm.module.css";
-import Button from "../ui/button/button.jsx";
-import Input from "../ui/input/input.jsx";
-import Modal from "../ui/modal/modal.jsx";
+import Button from "../../../../components/ui/button/button.jsx";
+import Input from "../../../../components/ui/input/input.jsx";
+import Modal from "../../../../components/ui/modal/modal.jsx";
 import { useNavigate } from "react-router";
-import { AuthContext } from "../../contexts/auth/AuthContext.js";
+import { AuthContext } from "../../../../contexts/auth/AuthContext.js";
 
 
 function LoginForm({ className }) {

src/pages/Profile/ProfilePage.jsx

@@ -3,7 +3,7 @@ import styles from "./ProfilePage.module.css";
 import { AuthContext } from "../../contexts/auth/AuthContext.js";
 import formatDate from "../../utils/date/formatDate.js";
 import Task from "../../components/Task/Task";
-import SettingsModal from "../../components/SettingsModal/SettingsModal.jsx";
+import SettingsModal from "./components/SettingsModal/SettingsModal.jsx";
 
 function ProfilePage() {
 

src/pages/Profile/components/SettingsModal/SettingsModal.jsx

@@ -1,12 +1,12 @@
-import Modal from "../ui/modal/modal.jsx";
-import Button from "../ui/button/button.jsx";
+import Modal from "../../../../components/ui/modal/modal.jsx";
+import Button from "../../../../components/ui/button/button.jsx";
 import styles from "./SettingsModal.module.css"
 import { useContext, useState } from "react";
-import ThemeSwitcher from "../ui/themeSwitcher/ThemeSwitcher.jsx";
-import { AuthContext } from "../../contexts/auth/AuthContext.js";
-import TextInput from "../ui/input/input.jsx";
-import updateUser from "../../utils/users/updateUser.js";
-import deleteUser from "../../utils/users/deleteUser.js";
+import ThemeSwitcher from "../../../../components/ui/themeSwitcher/ThemeSwitcher.jsx";
+import { AuthContext } from "../../../../contexts/auth/AuthContext.js";
+import TextInput from "../../../../components/ui/input/input.jsx";
+import updateUser from "../../../../utils/users/updateUser.js";
+import deleteUser from "../../../../utils/users/deleteUser.js";
 
 
 export default function SettingsModal() {

src/pages/VolunteerProfile/VolunteerProfilePage.jsx

@@ -5,7 +5,7 @@ import getUserById from "../../utils/users/getUserById.js";
 import formatDate from "../../utils/date/formatDate.js";
 import Task from "../../components/Task/Task.jsx";
 import { useNavigate } from "react-router";
-import ManageMember from "../../components/manageMember/ManageMember.jsx";
+import ManageMember from "./components/manageMember/ManageMember.jsx";
 import { AuthContext } from "../../contexts/auth/AuthContext.js";
 
 export default function VolunteerProfilePage() {

src/pages/VolunteerProfile/components/manageMember/ManageMember.jsx

@@ -1,10 +1,10 @@
-import Button from "../ui/button/button.jsx";
-import Modal from "../ui/modal/modal.jsx";
+import Button from "../../../../components/ui/button/button.jsx";
+import Modal from "../../../../components/ui/modal/modal.jsx";
 import {useContext, useState} from "react";
 import styles from "./manageMember.module.css"
 import DeactivateMemberBtn from "./deactivateMember/deactivateMemberBtn.jsx";
 import ModifyRole from "./modifyrole/ModifyRole.jsx";
-import {AuthContext} from "../../contexts/auth/AuthContext.js";
+import {AuthContext} from "../../../../contexts/auth/AuthContext.js";
 
 
 export default function ManageMember({ userToManage }) {

src/pages/VolunteerProfile/components/manageMember/deactivateMember/deactivateMemberBtn.jsx

@@ -1,7 +1,7 @@
-import Button from "../../ui/button/button.jsx";
-import Modal from "../../ui/modal/modal.jsx";
+import Button from "../../../../../components/ui/button/button.jsx";
+import Modal from "../../../../../components/ui/modal/modal.jsx";
 import { useState } from "react";
-import deactivateUser from "../../../utils/users/deactivateUser.js"
+import deactivateUser from "../../../../../utils/users/deactivateUser.js"
 import { useNavigate } from "react-router";
 
 export default function DeactivateMemberBtn({ name, id, ...props }) {

src/pages/VolunteerProfile/components/manageMember/modifyrole/ModifyRole.jsx

@@ -1,9 +1,9 @@
 import styles from "../manageMember.module.css";
-import Button from "../../ui/button/button.jsx";
-import modifyRole from "../../../utils/users/modifyRole.js";
+import Button from "../../../../../components/ui/button/button.jsx";
+import modifyRole from "../../../../../utils/users/modifyRole.js";
 import { useState, useEffect } from "react";
-import getRoles from "../../../utils/getRoles.js";
-import Modal from "../../ui/modal/modal.jsx";
+import getRoles from "../../../../../utils/getRoles.js";
+import Modal from "../../../../../components/ui/modal/modal.jsx";
 
 export default function ModifyRole({ user }) {
 

src/pages/eventDetail/components/EventTask/EventTask.jsx

@@ -1,11 +1,11 @@
 import styles from "./eventTask.module.css";
-import { formatDateLetter } from "../../utils/date/formatDateLetter.js";
-import Button from "../ui/button/button.jsx";
-import assign from "../../utils/tasks/assign.js";
-import unAssign from "../../utils/tasks/unAssign.js";
+import { formatDateLetter } from "../../../../utils/date/formatDateLetter.js";
+import Button from "../../../../components/ui/button/button.jsx";
+import assign from "../../../../utils/tasks/assign.js";
+import unAssign from "../../../../utils/tasks/unAssign.js";
 import { useEffect, useState } from "react";
-import isAssigned from "../../utils/tasks/isAssigned.js";
-import Modal from "../ui/modal/modal.jsx";
+import isAssigned from "../../../../utils/tasks/isAssigned.js";
+import Modal from "../../../../components/ui/modal/modal.jsx";
 
 export default function EventTask({ task, index }) {
 

src/pages/eventDetail/eventDetail.jsx

@@ -3,7 +3,7 @@ import styles from "./eventDetail.module.css";
 import { useParams } from "react-router";
 import getEventById from "../../utils/events/getEventById.js";
 import { formatDateLetter } from "../../utils/date/formatDateLetter.js";
-import EventTask from "../../components/eventTask/EventTask.jsx";
+import EventTask from "./components/EventTask/EventTask.jsx";
 import Button from "../../components/ui/button/button.jsx";
 import Modal from "../../components/ui/modal/modal.jsx";
 import { AuthContext } from "../../contexts/auth/AuthContext.js";