Merge branch 'dev' into 'features/volunteersTollBar'

# Conflicts: # src/pages/Events/EventsPage.jsx # src/pages/Volunteers/VolunteerCard.jsx
2025-12-10 10:54:24 +00:00
parent 516277c77d c1a7db12e3
commit cac2ef2c3e
25 changed files with 715 additions and 75 deletions
@@ -2,7 +2,6 @@ import { useEffect, useState } from "react";
 import Event from "../../components/Event/Event.jsx";
 import styles from "./EventsPage.module.css";
 import ToolBar from "../../components/ToolBar/ToolBar.jsx";
-import filter from "../../utils/filter.js";
 import getAllEvents from "../../utils/event/getAllEvents.js";


@@ -1,11 +1,181 @@
+import { useState } from "react";
+import { useMemo } from "react";
+import styles from "./HomePage.module.css";

+function HomePage() {
+    const events = {
+        "2025-11-07": ["Réunion de projet", "Anniversaire de Marie"],
+        "2025-11-10": ["Cours de React", "Rendez-vous médecin"],
+        "2025-11-14": ["Sortie cinéma"],
+    };

-function HomePage(){
+    const monthNames = [
+        "Janvier", "Février", "Mars", "Avril", "Mai", "Juin",
+        "Juillet", "Août", "Septembre", "Octobre", "Novembre", "Décembre"
+    ];
+
+    const today = new Date();
+    const [currentMonth, setCurrentMonth] = useState(today.getMonth());
+    const [currentYear, setCurrentYear] = useState(today.getFullYear());
+    const [selectedDay, setSelectedDay] = useState(() => {
+        const year = today.getFullYear();
+        const month = String(today.getMonth() + 1).padStart(2, "0");
+        const day = String(today.getDate()).padStart(2, "0");
+        const key = `${year}-${month}-${day}`;
+        return { date: key, events: events[key] || [] };
+    });
+
+    const daysInMonth = new Date(currentYear, currentMonth + 1, 0).getDate();
+    const firstDay = new Date(currentYear, currentMonth, 1).getDay();
+    const startDay = (firstDay + 6) % 7;
+
+    const days = [];
+    for (let i = 0; i < startDay; i++) days.push(null);
+    for (let i = 1; i <= daysInMonth; i++) days.push(i);
+
+    const handlePrevMonth = () => {
+        let newMonth = currentMonth - 1;
+        let newYear = currentYear;
+
+        if (newMonth < 0) {
+            newMonth = 11;
+            newYear--;
+        }
+
+        setCurrentMonth(newMonth);
+        setCurrentYear(newYear);
+
+        const key = `${newYear}-${String(newMonth + 1).padStart(2, "0")}-01`;
+        setSelectedDay({ date: key, events: events[key] || [] });
+    };
+
+    const handleNextMonth = () => {
+        let newMonth = currentMonth + 1;
+        let newYear = currentYear;
+
+        if (newMonth > 11) {
+            newMonth = 0;
+            newYear++;
+        }
+
+        setCurrentMonth(newMonth);
+        setCurrentYear(newYear);
+
+        const key = `${newYear}-${String(newMonth + 1).padStart(2, "0")}-01`;
+        setSelectedDay({ date: key, events: events[key] || [] });
+    };
+
+    const handleDayClick = (day) => {
+        if (!day) return;
+        const key = `${currentYear}-${String(currentMonth + 1).padStart(2, "0")}-${String(day).padStart(2, "0")}`;
+        setSelectedDay({ date: key, events: events[key] || [] });
+    };
+
+    const sortedEvents = useMemo(() => {
+        return Object.entries(events)
+            .map(([dateKey, eventList]) => ({ date: dateKey, events: eventList }))
+            .sort((a, b) => new Date(a.date) - new Date(b.date));
+    }, [events]);
+
+    const formatDate = (dateString) => {
+        const [year, month, day] = dateString.split('-');
+        return `${day} ${monthNames[parseInt(month) - 1]} ${year}`;
+    };

    return (
-        <div>
+        <div className={styles.allContent}>
+            <div className={styles.glassCard}>
+                <div className={styles.calendarContainer}>
+                    <div className={styles.calendarHeader}>
+                        <button onClick={handlePrevMonth}>◀</button>
+                        <p>{monthNames[currentMonth]} {currentYear}</p>
+                        <button onClick={handleNextMonth}>▶</button>
+                    </div>
+
+                    <table className={styles.calendar}>
+                        <thead>
+                        <tr>
+                            <th>Lun</th>
+                            <th>Mar</th>
+                            <th>Mer</th>
+                            <th>Jeu</th>
+                            <th>Ven</th>
+                            <th>Sam</th>
+                            <th>Dim</th>
+                        </tr>
+                        </thead>
+
+                        <tbody>
+                        {Array.from({ length: Math.ceil(days.length / 7) }).map((_, weekIndex) => (
+                            <tr key={weekIndex}>
+                                {days.slice(weekIndex * 7, weekIndex * 7 + 7).map((day, index) => {
+                                    const key = `${currentYear}-${String(currentMonth + 1).padStart(2, "0")}-${String(day).padStart(2, "0")}`;
+                                    const hasEvent = events[key];
+
+                                    return (
+                                        <td
+                                            key={index}
+                                            className={[
+                                                day === today.getDate() &&
+                                                currentMonth === today.getMonth() &&
+                                                currentYear === today.getFullYear()
+                                                    ? styles.today : "",
+                                                hasEvent ? styles.hasEvent : "",
+                                                selectedDay?.date === key ? styles.selected : ""
+                                            ].join(" ")}
+                                            onClick={() => handleDayClick(day)}
+                                        >
+                                            {day || ""}
+                                        </td>
+                                    );
+                                })}
+                            </tr>
+                        ))}
+                        </tbody>
+                    </table>
+
+                    {selectedDay && (
+                        <div className={styles.eventBox}>
+                            <h3>Événements du {formatDate(selectedDay.date)}</h3>
+
+                            {selectedDay.events.length > 0 ? (
+                                <ul>
+                                    {selectedDay.events.map((ev, i) => (
+                                        <li key={i}>{ev}</li>
+                                    ))}
+                                </ul>
+                            ) : (
+                                <p>Aucun événement ce jour-là.</p>
+                            )}
+                        </div>
+                    )}
+                </div>
+            </div>
+            <div className={styles.glassCard}>
+                <div className={styles.eventListContainer}>
+                    <h2>Liste des Événements à Venir</h2>
+                    {sortedEvents.length > 0 ? (
+                        <ul className={styles.eventList}>
+                            {sortedEvents.map((eventGroup) => (
+                                <li key={eventGroup.date} className={styles.eventGroup}>
+                                    <div className={styles.eventDate}>
+                                        <strong>{formatDate(eventGroup.date)}</strong>
+                                    </div>
+                                    <ul className={styles.eventDetails}>
+                                        {eventGroup.events.map((event, i) => (
+                                            <li key={i}>- {event}</li>
+                                        ))}
+                                    </ul>
+                                </li>
+                            ))}
+                        </ul>
+                    ) : (
+                        <p>Aucun événement planifié pour l'instant.</p>
+                    )}
+                </div>
+            </div>
        </div>
-    )
+    );
 }

 export default HomePage;
@@ -1,3 +1,173 @@
-.title {
-    color: red;
+.calendarContainer {
+    padding: 20px;
+    font-family: Arial, sans-serif;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+
+.calendarHeader {
+    display: flex;
+    width: 100%;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    gap: 10px;
+}
+
+.calendarHeader p {
+    width: auto;
+    text-align: center;
+    font-weight: bold;
+    font-size: 40px;
+}
+
+.calendarHeader button {
+    top: 50%;
+    left: 50%;
+    width: 40px;
+    height: 40px;
+    border-radius: 50%;
+    border: none;
+    background: transparent;
+    box-shadow:
+            inset 1.25px 1.25px 1px rgba(255, 255, 255, 1),
+            inset -1.25px -1.25px 1px rgba(255, 255, 255, 1),
+            inset -0.25px 0.25px 1px rgba(0, 0, 0, 0.2),
+            inset 0.25px -0.25px 1px rgba(0, 0, 0, 0.2);
+    font-size: 15px;
+    color: #019AFF;
+    cursor: pointer;
+}
+
+.calendar {
+    border-collapse: collapse;
+    width: 80%;
+    max-width: 500px;
+}
+
+.calendar th, .calendar td {
+    border: none;
+    padding: 10px;
+    width: 14.2%;
+    line-height: 130%;
+    text-align: center;
+    cursor: pointer;
+}
+
+.today {
+    color: #007bff;
+}
+
+.hasEvent {
+    position: relative;
+}
+
+.hasEvent::before {
+    content: "";
+    position: absolute;
+    left: 50%;
+    bottom: 10px;
+    width: 20px;
+    height: 2px;
+    background-color: #007bff;
+    transform: translateX(-50%);
+    border-radius: 10px;
+}
+
+.hasEvent.selected::before {
+    width: 25px;
+    height: 2px;
+    bottom: 10px;
+}
+
+.selected {
+    position: relative;
+    font-size: 18px;
+    font-weight: 600;
+}
+
+.selected::after {
+    content: "";
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 40px;
+    height: 40px;
+    transform: translate(-50%, -50%);
+    border-radius: 38%;
+    pointer-events: none;
+    background: transparent;
+    box-shadow:
+            inset 1.25px 1.25px 1px rgba(255, 255, 255, 1),
+            inset -1.25px -1.25px 1px rgba(255, 255, 255, 1),
+            inset -0.25px 0.25px 1px rgba(0, 0, 0, 0.2),
+            inset 0.25px -0.25px 1px rgba(0, 0, 0, 0.2);
+}
+
+.eventBox {
+    border-radius: 20px;
+    padding: 15px;
+    margin-top: 16px;
+    border: none;
+    background: rgb(255, 255, 255, 0.25);
+    box-shadow:
+            inset 1.25px 1.25px 1px rgba(255, 255, 255, 1),
+            inset -1.25px -1.25px 1px rgba(255, 255, 255, 1),
+            inset -0.25px 0.25px 1px rgba(0, 0, 0, 0.2),
+            inset 0.25px -0.25px 1px rgba(0, 0, 0, 0.2);
+}
+
+.eventBox ul {
+    list-style-type: disc;
+}
+
+.eventGroup{
+    border-radius: 20px;
+    padding: 15px;
+    margin-top: 16px;
+    border: none;
+    background: rgb(255, 255, 255, 0.25);
+    box-shadow:
+            inset 1.25px 1.25px 1px rgba(255, 255, 255, 1),
+            inset -1.25px -1.25px 1px rgba(255, 255, 255, 1),
+            inset -0.25px 0.25px 1px rgba(0, 0, 0, 0.2),
+            inset 0.25px -0.25px 1px rgba(0, 0, 0, 0.2);
+}
+
+.glassCard {
+    width: 45%;
+    margin: 16px;
+    padding: 10px 20px 10px 20px;
+    height: fit-content;
+    background: rgba(255, 255, 255, 0.65);
+    backdrop-filter: blur(3px);
+    -webkit-backdrop-filter: blur(3px);
+    border-radius: 20px;
+    border: 1px solid rgba(255, 255, 255, 0.3);
+    box-shadow: 0 8px 32px rgba(0, 0, 0, 0.1),
+    inset 0 1px 0 rgba(255, 255, 255, 0.5),
+    inset 0 -1px 0 rgba(255, 255, 255, 0.1),
+    inset 0 0 8px 4px rgba(255, 255, 255, 0.4);
+    overflow: hidden;
+}
+.allContent{
+    display: flex;
+    flex-direction: row;
+}
+
+@media (max-width: 768px) {
+    .glassCard {
+        width: 100%;
+        margin: 0px;
+        margin-top: 16px;
+        margin-bottom: 16px;
+        display: flex;
+    }
+
+
+    .allContent{
+        display: flex;
+        flex-direction: column;
+    }
 }
@@ -1,8 +1,21 @@
 import styles from "./LoginPage.module.css";
 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";
+import { useNavigate } from "react-router";

 function LoginPage() {
+
+    const { user, loading } = useContext(AuthContext)
+    const navigate = useNavigate();
+
+    useEffect(() => {
+        if (!loading && user) {
+            navigate("/");
+        }
+    }, [loading, user]);
+
    return (
        <Background>
            <div className={styles.container}>
@@ -3,18 +3,11 @@ 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 Button from "../../components/ui/button/button.jsx";
-import { useNavigate } from "react-router";
-import ThemeSwitcher from "../../components/ui/themeSwitcher/ThemeSwitcher.jsx";
+import SettingsModal from "../../components/SettingsModal/SettingsModal.jsx";

 function ProfilePage() {

-    const { user, logout } = useContext(AuthContext);
-    const navigate = useNavigate();
-
-    const handleLogout = () => {
-        logout();
-    }
+    const { user } = useContext(AuthContext);

  return (
    <div className={styles.container}>
@@ -30,10 +23,6 @@ function ProfilePage() {
          <div className={styles.description}>
            <div className={styles.headerProfile}>
                <h2> {user.name} {user.lastname} </h2>
-                <div className={styles.settingsBtns}>
-                    <ThemeSwitcher />
-                    <Button variant={"danger"} onClick={handleLogout}> Déconnexion </Button>
-                </div>
            </div>
            <div className={styles.topDescription}>
              <div className={styles.infoBlock}>
@@ -44,9 +33,7 @@ function ProfilePage() {
                <p><strong>Mail :</strong> {user.email} </p>
                <p><strong>Téléphone :</strong> {user.phone}</p>
              </div>
-              <Button variant={"transparent"} onClick={() => navigate("/profile/update")}>
-                  <img src={"/icons/pen.svg"} alt={"Modify btn"} className={styles.modifyIcon}/>
-              </Button>
+                <SettingsModal />
            </div>

            <h2>Vos Événements :</h2>
@@ -38,10 +38,11 @@
 }

 .topDescription {
-  display: flex;
-  flex-direction: column;
-  gap: 10px;
-  margin-bottom: 15px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 10px;
+    margin-bottom: 15px;
 }

 .infoBlock {
@@ -122,11 +123,6 @@
    
 }

-.modifyIcon {
-    height:50px;
-    width:50px;
-}
-
 .headerProfile {
    display: flex;
    flex-direction: row;
@@ -2,9 +2,11 @@ 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 { useState } from "react";
+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";


 function RegisterPage() {
@@ -12,20 +14,54 @@ function RegisterPage() {
    const navigate = useNavigate();

    const [email, setEmail] = useState("");
+    const [phone, setPhone] = useState("");
    const [password, setPassword] = useState("");
+    const [confirmPassword, setConfirmPassword] = useState("");
    const [name, setName] = useState("");
    const [lastName, setLastName] = useState("");
+    const [open, setOpen] = useState(false);
+    const [title, setTitle] = useState("");
+    const [message, setMessage] = useState("");

-    const [showPassword, setShowPassword] = useState(false);
+    const { user, loading } = useContext(AuthContext)

+    useEffect(() => {
+        if (!loading && user) {
+            navigate("/");
+        }
+    }, [loading, user]);
+
+    const handleModal = (t, m) => {
+        setTitle(t)
+        setMessage(m)
+        setOpen(true);
+    }

    async function handleSubmit(e) {
        e.preventDefault();
-        const res = await register(email, password, name, lastName);
-        if (!res || res.status !== 200) throw new Error("Register error");
-        navigate("/login");
+
+        if(!(password === confirmPassword)) handleModal("Mot de passe invalide", "Les mots de passes ne conrrespondent pas");
+        else if(password.length < 8) handleModal("Mot de passe invalide", "Le mot de passe doit faire plus de 8 charactères");
+        else {
+
+            const res = await register(email, password, name, lastName, phone);
+
+            if (res.status === 422) {
+                if (res.errors.email) handleModal("Adresse Email invalide", "Le formet de votre adresse Email n'est pas valide");
+                if (res.errors.phone) handleModal("Numéro de téléphone invalide", "Le formet de votre numéro de téléphone n'est pas valide");
+            } else navigate("/login");
+
+        }
    }

+    const handlePhone = (e) => {
+        const value = e.target.value;
+        if (value === "" || /^[0-9 +]+$/.test(value)) {
+            setPhone(value);
+        }
+    };
+
+
    return <Background>

        <div className={styles.container}>
@@ -61,8 +97,22 @@ function RegisterPage() {
                        style={{ width: '100%' }}
                    />
                </div>
+
                <div className={styles.formGroup}>
-                    <Input password={true} onChange={e => setPassword(e.target.value)} value={password} />
+                    <Input
+                        value={phone}
+                        placeholder="Numéro de téléphone"
+                        onChange={handlePhone}
+                        style={{ width: '100%' }}
+                    />
+                </div>
+
+                <div className={styles.formGroup}>
+                    <Input password={true} onChange={e => setPassword(e.target.value)} value={password} placeholder={"Mot de passe"}/>
+                </div>
+
+                <div className={styles.formGroup}>
+                    <Input password={true} onChange={e => setConfirmPassword(e.target.value)} value={confirmPassword} placeholder={"Confirmer le mot de passe"} />
                </div>

                <div className={styles.logButton}>
@@ -72,6 +122,10 @@ function RegisterPage() {
            </div>
        </div>

+        <Modal open={open} onClose={() => setOpen(false)} title={title}>
+            <p>{message}</p>
+        </Modal>
+
    </Background>
 }

@@ -58,8 +58,8 @@ export default function VolunteerCard({ user }) {
            {isExpanded && (
                <div className={styles.bottomBar}>
                    <Button
-                        onClick={() => navigate(`/profile/${user.id}`)}
-                        variant="transparent"
+                        onClick={() => navigate(`/profile/${id}`)}
+                        variant="primary"
                    >
                        Voir plus
                    </Button>