merge

src/pages/Admin/AdminPage.jsx

@@ -1,10 +1,10 @@
-import { useState, useContext } from "react";
+import { 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 { AuthContext } from "../../contexts/auth/AuthContext.js";
 import { useNavigate } from "react-router";
+import RegisterMember from "./components/registerMember/registerMember.tsx";
 
 
 function AdminPage() {
@@ -12,18 +12,11 @@ function AdminPage() {
     const { user } = useContext(AuthContext);
     const navigate = useNavigate();
 
-    const [selected, setSelected] = useState("3");
-    const [participationRate] = useState(89);
-
     if(!user.isAdmin) navigate("/");
 
     return (
         <div className={styles.container}>
-            <ParticipationChart
-                selected={selected}
-                setSelected={setSelected}
-                participationRate={participationRate}
-            />
+            <RegisterMember />
             <div className={styles.rightSection}>
                 <IncompleteEvents />
                 <PendingMembers />

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

@@ -1,111 +1,100 @@
-import React, { useState, useEffect } from "react";
-import Button from "../../../../components/ui/button/button.jsx";
+import React, {useState, useEffect} from "react";
+import Button from "../../../../components/ui/button/button.tsx";
 import styles from "./PendingMembers.module.css";
-
+import Modal from "../../../../components/ui/modal/modal.tsx";
 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([]);
-  const [loading, setLoading] = useState(true);
-  const [actionLoading, setActionLoading] = useState(null);
-  const [error, setError] = useState(null);
 
-  useEffect(() => {
-    const fetchPendingMembers = async () => {
-      setLoading(true);
-      const result = await getUserToValidate();
-      const userIds = result.data
-      if (userIds && userIds.length > 0) {
-        const users = await Promise.all(userIds.map((id) => getUserById(id)));
-        setPendingMembers(users.filter(Boolean));
-      } else {
-        setPendingMembers([]);
-      }
-      setLoading(false);
-    };
-    fetchPendingMembers();
-  }, []);
 
-  const removeMember = (id) => {
-    setPendingMembers(prevMembers =>
-      prevMembers.filter(member => member.id !== id)
-    );
-  };
+    const [open, setOpen] = useState(false);
+    const [message, setMessage] = useState("");
+    const [title, setTitle] = useState("");
 
-const handleValidate = async (id) => {
-  setActionLoading(id);
-  setError(null);
-  try {
-    const result = await validateUser(id);
-    if (result === true) { 
-      removeMember(id);
-    } else {
-      setError("Échec de la validation.");
+    const [pendingMembers, setPendingMembers] = useState([]);
+
+    const fetchUsers = async () => {
+
+        const result = await getUserToValidate();
+        const userIds = result.data;
+
+        if (userIds && userIds.length > 0) {
+            const users = await Promise.all(userIds.map(id => getUserById(id)));
+            const usersData = users.map(u => u.data);
+            setPendingMembers(usersData);
+        } else setPendingMembers([]);
     }
-  } catch (err) {
-    setError("Erreur lors de la validation.");
-  } finally {
-    setActionLoading(null);
-  }
-};
 
-const handleReject = async (id) => {
-  setActionLoading(id);
-  setError(null);
-  try {
-    const result = await deleteUser(id);
-    if (result.status >= 200 && result.status < 300) {
-      removeMember(id);
-    } else {
-      setError(result.errors || "Échec de la suppression.");
+    useEffect(() => {
+        fetchUsers();
+    }, []);
+
+    const handleValidate = async (id, name) => {
+        const result = await validateUser(id);
+
+        if(result.status === 200) {
+            setTitle("Utilisateur accepté avec succès")
+            setMessage(`L'utilisateur ${name} a été accepté avec succès`)
+            setOpen(true);
+        } else {
+            setTitle("Erreur")
+            setMessage(`Une erreur est survenue durant l'acceptation de l'utilisateur ${name}`)
+            setOpen(true);
+        }
+
+        fetchUsers();
     }
-  } catch (err) {
-    setError("Erreur lors de la suppression.");
-  } finally {
-    setActionLoading(null);
-  }
-};
 
+    const handleRefuse = async (id, name) => {
+        const result = await deleteOtherUser(id);
 
-  if (loading) {
-    return <div>Chargement des membres en attente...</div>;
-  }
+        if(result.status === 200) {
+            setTitle("Utilisateur refusé avec succès")
+            setMessage(`L'utilisateur ${name} a été refusé avec succès`)
+            setOpen(true);
+        } else {
+            setTitle("Erreur")
+            setMessage(`Une erreur est survenue durant le refus de l'utilisateur ${name}`)
+            setOpen(true);
+        }
 
-  return (
-    <div className={`${styles.rightBlock} glassCard`}>
-      <h2>Membres en attente de validation</h2>
-      {error && <p style={{ color: "red" }}>{error}</p>}
+        fetchUsers();
+    }
 
-      <div className={styles.membersContainer}>
-        {pendingMembers.length === 0 && <p>Aucun membre en attente</p>}
+    return (
+        <div className={`${styles.rightBlock} glassCard`}>
+            <h2>Membres en attente de validation</h2>
+
+            <div className={styles.membersContainer}>
+
+                {pendingMembers.length === 0 && <p>Aucun membre en attente</p>}
+
+                {pendingMembers.map((member, index) => (
+
+                    <div key={index} className={`glassCard ${styles.memberCard}`}>
+
+                        <p>{member.name} {member.lastname}</p>
+
+                        <div className={styles.buttonGroup}>
+                            <Button variant="primary" onClick={() => handleValidate(member.id, `${member.name} ${member.lastname}`)}>Valider</Button>
+                            <Button variant="danger" onClick={() => handleRefuse(member.id, `${member.name} ${member.lastname}`)}>Refuser</Button>
+                        </div>
+
+                    </div>
+
+                ))}
 
-        {pendingMembers.map((member) => (
-          <div key={member.id} className={`glassCard ${styles.memberCard}`}>
-            <p>{member.name} {member.lastname}</p>
-            <div className={styles.buttonGroup}>
-              <Button
-                onClick={() => handleValidate(member.id)}
-                variant="primary"
-                disabled={actionLoading === member.id}
-              >
-                {actionLoading === member.id ? "En cours..." : "Valider"}
-              </Button>
-              <Button
-                onClick={() => handleReject(member.id)}
-                variant="danger"
-                disabled={actionLoading === member.id}
-              >
-                {actionLoading === member.id ? "En cours..." : "Refuser"}
-              </Button>
             </div>
-          </div>
-        ))}
-      </div>
-    </div>
-  );
+
+            <Modal open={open} onClose={() => setOpen(false)} title={title}>
+                {message}
+            </Modal>
+
+        </div>
+    );
 }
 
 export default PendingMembers;

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

@@ -0,0 +1,52 @@
+.leftBlock {
+    width: 100%;
+    max-width: 720px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    min-height: calc(100vh - 260px);
+    box-sizing: border-box;
+    padding: 20px;
+    margin: 0 auto;
+}
+
+.registerMemberHeader {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 100%;
+    margin-bottom: 20px;
+}
+
+.registerForm {
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+    align-items: stretch;
+}
+
+.registerForm input {
+    width: 100%;
+    box-sizing: border-box;
+}
+
+.registerForm button {
+    width: 100%;
+}
+
+.modalContent {
+    text-align: center;
+}
+
+@media (min-width: 768px) {
+    .leftBlock {
+        width: 70%;
+    }
+}
+
+@media (min-width: 1024px) {
+    .leftBlock {
+        width: 40%;
+    }
+}

src/pages/Admin/components/registerMember/registerMember.tsx

@@ -0,0 +1,74 @@
+import React, { useState } from "react"
+import styles from "./registerMember.module.css"
+import TextInput from "../../../../components/ui/input/input"
+import Button from "../../../../components/ui/button/button";
+import Response from "../../../../interfaces/response.interface";
+import ResponseData from "./responseData.inteface";
+import adminCreateUser from "../../../../utils/users/adminCreateUser";
+import Modal from "../../../../components/ui/modal/modal";
+
+
+const RegisterMember: React.FC = () => {
+
+    const [name, setName] = useState<string>("");
+    const [lastname, setLastName] = useState<string>("");
+    const [email, setEmail] = useState<string>("");
+    const [phone, setPhone] = useState<string>("");
+    const [password, setPassword] = useState<string>("");
+
+    const [open, setOpen] = useState<boolean>(false);
+    const [title, setTitle] = useState<string>("");
+    const [message, setMessage] = useState<string>("");
+
+
+    const handleCreate = async (): Promise<void> => {
+
+        if(name !== "" && lastname !== "" && email !== "" && phone !== "" ) {
+            const response: Response<ResponseData> = await adminCreateUser(email, name, lastname, phone);
+            if(response.status === 200) {
+                setPassword(response.data.password);
+                setTitle(`Utilisateur enregistré avec succès`);
+                setMessage(`L'utilisateur ${name} ${lastname} a été enregistré avec le mot de passe: ${response.data.password}`);
+                setOpen(true);
+            } else {
+                setTitle(`Erreur`);
+                setMessage(`Une erreur est survenue lors de l'enregistrement de ${name} ${lastname}`);
+                setOpen(true);
+            }
+        } else {
+            setTitle("Erreur");
+            setMessage("Un des champs n'a pas été rempli");
+            setOpen(true);
+        }
+    }
+
+    const showPassword = (): void => {
+        setTitle(`Mot de passe de ${name} ${lastname}`);
+        setMessage(password);
+        setOpen(true);
+    }
+
+    return <div className={`${styles.leftBlock} glassCard`}>
+        <div className={styles.registerMemberHeader}>
+            <h2>Enregister un bénévole</h2>
+        </div>
+
+        <div className={styles.registerForm}>
+            <TextInput placeholder={"Prenom"} type={"text"} value={name} onChange={e => setName(e.target.value)}  />
+            <TextInput placeholder={"Nom"} type={"text"} value={lastname} onChange={e => setLastName(e.target.value)}  />
+            <TextInput placeholder={"Adresse Email"} type={"email"} value={email} onChange={e => setEmail(e.target.value)}  />
+            <TextInput placeholder={"Numéro de téléphone"} type={"tel"} value={phone} onChange={e => setPhone(e.target.value)}  />
+
+            {password !== "" && <Button onClick={showPassword}> Afficher le mot de passe </Button>}
+
+            <Button variant={"default"} onClick={handleCreate}>Enregistrer</Button>
+        </div>
+
+        <Modal open={open} onClose={() => setOpen(false)} title={title}>
+            <p className={styles.modalContent}>{message}</p>
+        </Modal>
+
+    </div>
+}
+
+export default RegisterMember

src/pages/Admin/components/registerMember/responseData.inteface.ts

@@ -0,0 +1,4 @@
+export default interface ResponseData {
+    message: string;
+    password: string;
+}

src/pages/Events/components/Event/Event.jsx

@@ -1,7 +1,7 @@
 import styles from "./Event.module.css";
 import { useState, useEffect } from "react";
 import { useNavigate } from "react-router";
-import Button from "/src/components/ui/button/button.jsx"
+import Button from "/src/components/ui/button/button"
 
 function Event({event}){
 

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

@@ -1,8 +1,8 @@
 import { useState, useContext } from "react";
 import styles from "./loginForm.module.css";
-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 Button from "../../../../components/ui/button/button.tsx";
+import Input from "../../../../components/ui/input/input.tsx";
+import Modal from "../../../../components/ui/modal/modal.tsx";
 import { useNavigate } from "react-router";
 import { AuthContext } from "../../../../contexts/auth/AuthContext.js";
 

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

@@ -0,0 +1,86 @@
+import Modal from "../../../../components/ui/modal/modal.tsx";
+import Button from "../../../../components/ui/button/button.tsx";
+import styles from "./SettingsModal.module.css"
+import { useContext, useState } from "react";
+import ThemeSwitcher from "../../../../components/ui/themeSwitcher/ThemeSwitcher.jsx";
+import { AuthContext } from "../../../../contexts/auth/AuthContext.js";
+import TextInput from "../../../../components/ui/input/input.tsx";
+import updateUser from "../../../../utils/users/updateUser.js";
+import deleteUser from "../../../../utils/users/deleteUser.js";
+
+
+export default function SettingsModal() {
+
+    const { user, logout, update } = useContext(AuthContext);
+
+    const [open, setOpen] = useState(false);
+    const [isDelete, setIsDelete] = useState(false);
+
+    const [name, setName] = useState(user?.name);
+    const [lastname, setLastName] = useState(user?.lastname);
+    const [phone, setPhone] = useState(user?.phone);
+
+    const handleLogout = () => {
+        logout();
+    }
+
+    const handleSubmit = async () => {
+        await updateUser(name, lastname, phone);
+        update();
+    }
+
+    const handleDelete = async () => {
+        await deleteUser();
+        update();
+    }
+
+    return (
+        <>
+            <Button variant={"transparent"} onClick={() => setOpen(!open)}>
+                <img src={"/icons/settings-wheel.svg"} alt={"Modify btn"} className={styles.modifyIcon}/>
+            </Button>
+
+            <Modal title={"Paramètres"} open={open} onClose={() => setOpen(false)}>
+                <div className={styles.content}>
+
+                    <div className={styles.section}>
+                        <h3>Compte</h3>
+                        <Button variant={"danger"} onClick={handleLogout}> Déconnexion </Button>
+                        <Button variant={"danger"} onClick={() => setIsDelete(true)}> Supprimer le compte </Button>
+
+                        <div className={styles.section}>
+                            <h4>Changer de Prénom</h4>
+                            <TextInput value={name} onChange={e => setName(e.target.value)} type={"text"} />
+                        </div>
+
+                        <div className={styles.section}>
+                            <h4>Changer de nom</h4>
+                            <TextInput value={lastname} onChange={e => setLastName(e.target.value)} type={"text"} />
+                        </div>
+
+                        <div className={styles.section}>
+                            <h4>Changer de numéro de téléphone</h4>
+                            <TextInput value={phone} onChange={e => setPhone(e.target.value)} type={"text"} />
+                        </div>
+
+                        <Button className={styles.submitBtn} onClick={handleSubmit}>Confirmer</Button>
+
+                    </div>
+
+                    <div className={styles.section}>
+                        <h3>Apparence</h3>
+                        <ThemeSwitcher />
+                    </div>
+                </div>
+            </Modal>
+
+
+            <Modal title={"Validation"} open={isDelete} onClose={() => setIsDelete(false)}>
+                <div className={styles.section}>
+                    <p className={styles.alignText}> Êtes vous vraiment sûr de vouloir supprimer votre compte ?</p>
+                    <Button variant={"danger"} className={styles.submitBtn} onClick={handleDelete}>Confirmer</Button>
+                </div>
+            </Modal>
+        </>
+    )
+}

src/pages/Register/RegisterPage.jsx

@@ -1,12 +1,12 @@
 import styles from "./RegisterPage.module.css";
 import Background from "../../components/background/background.jsx";
-import Input from "../../components/ui/input/input.jsx";
-import Button from "../../components/ui/button/button.jsx";
+import Input from "../../components/ui/input/input.tsx";
+import Button from "../../components/ui/button/button.tsx";
 import {useContext, useEffect, useState} from "react";
 import register from "../../utils/register.js";
 import { useNavigate } from "react-router";
 import { AuthContext } from "../../contexts/auth/AuthContext.js";
-import Modal from "../../components/ui/modal/modal.jsx";
+import Modal from "../../components/ui/modal/modal.tsx";
 
 
 function RegisterPage() {

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

@@ -1,5 +1,5 @@
-import Button from "../../../../components/ui/button/button.jsx";
-import Modal from "../../../../components/ui/modal/modal.jsx";
+import Button from "../../../../components/ui/button/button.tsx";
+import Modal from "../../../../components/ui/modal/modal.tsx";
 import {useContext, useState} from "react";
 import styles from "./manageMember.module.css"
 import DeactivateMemberBtn from "./deactivateMember/deactivateMemberBtn.jsx";

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

@@ -1,5 +1,5 @@
-import Button from "../../../../../components/ui/button/button.jsx";
-import Modal from "../../../../../components/ui/modal/modal.jsx";
+import Button from "../../../../../components/ui/button/button.tsx";
+import Modal from "../../../../../components/ui/modal/modal.tsx";
 import { useState } from "react";
 import deactivateUser from "../../../../../utils/users/deactivateUser.js"
 import { useNavigate } from "react-router";

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

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

src/pages/Volunteers/VolunteerCard.jsx

@@ -2,7 +2,7 @@ import React, {useState} from "react";
 import styles from "./VolunteersPage.module.css";
 import formatDate from "../../utils/date/formatDate.js";
 import { useNavigate } from "react-router";
-import Button from "../../components/ui/button/button.jsx";
+import Button from "../../components/ui/button/button.tsx";
 
 export default function VolunteerCard({ 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 "../../../../components/ui/button/button.jsx";
+import Button from "../../../../components/ui/button/button.tsx";
 import assign from "../../../../utils/tasks/assign.js";
 import unAssign from "../../../../utils/tasks/unAssign.js";
 import { useContext, useEffect, useState } from "react";
 import isAssigned from "../../../../utils/tasks/isAssigned.js";
-import Modal from "../../../../components/ui/modal/modal.jsx";
+import Modal from "../../../../components/ui/modal/modal.tsx";
 import { AuthContext } from "../../../../contexts/auth/AuthContext.js";
 import DeleteTaskBtn from "../deleteTaskBtn/deleteTaskBtn.jsx";
 

src/pages/eventDetail/components/createTaskBtn/createTaskBtn.jsx

@@ -1,8 +1,8 @@
 import styles from "../../eventDetail.module.css";
-import Button from "../../../../components/ui/button/button.jsx";
+import Button from "../../../../components/ui/button/button.tsx";
 import {useContext, useState} from "react";
-import TextInput from "../../../../components/ui/input/input.jsx";
-import Modal from "../../../../components/ui/modal/modal.jsx";
+import TextInput from "../../../../components/ui/input/input.tsx";
+import Modal from "../../../../components/ui/modal/modal.tsx";
 import createTaskApi from "../../../../utils/tasks/createTask.js";
 import {EventDetailContext} from "../../../../contexts/eventDetail/eventDetail.js";
 

src/pages/eventDetail/components/deleteEventBtn/deleteEventBtn.jsx

@@ -1,6 +1,6 @@
 import styles from "../../eventDetail.module.css";
-import Button from "../../../../components/ui/button/button.jsx";
-import Modal from "../../../../components/ui/modal/modal.jsx";
+import Button from "../../../../components/ui/button/button.tsx";
+import Modal from "../../../../components/ui/modal/modal.tsx";
 import { useContext, useState } from "react";
 import { EventDetailContext } from "../../../../contexts/eventDetail/eventDetail.js";
 import { EventContext } from "../../../../contexts/events/EventContext.js";

src/pages/eventDetail/components/deleteTaskBtn/deleteTaskBtn.jsx

@@ -1,9 +1,9 @@
 import { useContext } from "react";
 import { AuthContext } from "../../../../contexts/auth/AuthContext.js";
 import { EventDetailContext } from "../../../../contexts/eventDetail/eventDetail.js";
-import Button from "../../../../components/ui/button/button.jsx";
+import Button from "../../../../components/ui/button/button.tsx";
 import { useState } from "react";
-import Modal from "../../../../components/ui/modal/modal.jsx";
+import Modal from "../../../../components/ui/modal/modal.tsx";
 import styles from "../../eventDetail.module.css";
 
 export default function DeleteTaskBtn({ taskId, eventId, taskName }) {

src/pages/waitValidationPage/ValidationErrorPage.jsx

@@ -1,6 +1,6 @@
 import styles from "./validationErrorPage.module.css"
 import Background from "../../components/background/background.jsx";
-import Button from "../../components/ui/button/button.jsx";
+import Button from "../../components/ui/button/button.tsx";
 import { useContext } from "react";
 import { AuthContext } from "../../contexts/auth/AuthContext.js";
 import { Navigate, useNavigate, Link } from "react-router";
@@ -15,6 +15,10 @@ export default function ValidationErrorPage() {
         navigate("/login");
     }
 
+    const handleRefresh = () => {
+        window.location.reload();
+    }
+
     if(user && user.validate === 1) return <Navigate to="/" />;
 
     return <Background>
@@ -27,7 +31,10 @@ export default function ValidationErrorPage() {
                         https://comite.beaupont.fr/contactez-nous
                     </Link>
                 </p>
-                <Button variant={"danger"} onClick={handleLogout}> Déconnexion </Button>
+                <div className={styles.btnContainer}>
+                    <Button variant={"default"} onClick={handleRefresh}> Recharger </Button>
+                    <Button variant={"danger"} onClick={handleLogout}> Déconnexion </Button>
+                </div>
             </div>
         </div>
     </Background>

src/pages/waitValidationPage/validationErrorPage.module.css

@@ -22,4 +22,10 @@
     p {
         font-size: large;
     }
+}
+
+.btnContainer {
+    display: flex;
+    flex-direction: row;
+    gap: 15px;
 }