Titre
-Description
-
+
-
Date
+
+
+ setStart(e.target.value)} />
+
+ Début
+
+ setEnd(e.target.value)} />
+
+ Fin
+
+
+
{selectedDay && (
-
-
+
{monthNames[currentMonth]} {currentYear}
- +| Lun | -Mar | -Mer | -Jeu | -Ven | -Sam | -Dim | +Lun | Mar | Mer | +Jeu | Ven | Sam | Dim |
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| ; + const key = `${currentYear}-${String(currentMonth + 1).padStart(2, "0")}-${String(day).padStart(2, "0")}`; - const hasEvent = events[key]; + const hasEvent = (eventsByDate[key]?.length ?? 0) > 0; return ( | handleDayClick(day)} > - {day || ""} + {day} | ); })} @@ -124,13 +101,16 @@ function Calendar() {
-
Événements du {formatDateLetter(selectedDay.date)}
+
+
Événements du {formatDateLetterJS(selectedDay.date)}
{selectedDay.events.length > 0 ? (-
- {selectedDay.events.map((ev, i) => (
-
- {ev} + {selectedDay.events.map(ev => ( +
-
+ {ev.name}
+ {ev.description} +
))}
-
+
);
}
-export default eventList;
\ No newline at end of file
+export default EventList;
\ No newline at end of file
diff --git a/src/components/homePage/eventList.module.css b/src/components/homePage/eventList.module.css
index 3288f5e..fb9c1f3 100644
--- a/src/components/homePage/eventList.module.css
+++ b/src/components/homePage/eventList.module.css
@@ -1,7 +1,7 @@
.glassCard {
width: 45%;
- max-height: 475px;
- margin: 16px 0px 16px 0px;
+ max-height: 100%;
+ margin: 16px 0 16px 0;
padding: 10px 20px 10px 20px;
height: fit-content;
background: rgba(255, 255, 255, 0.65);
@@ -35,9 +35,8 @@
}
.eventDetails {
- list-style: none;
+ margin-top: 10px;
padding: 0;
- margin: 0;
}
.dateSelected{
@@ -45,20 +44,39 @@
}
h2{
+ font-size: 30px;
display: flex;
justify-content: center;
}
-.eventListContainer{
- width: 100%;
+.eventGroup{
+ margin: 16px 0 16px 0;
+ padding: 10px 20px 10px 20px;
+}
+
+.eventTitle {
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+}
+
+.title {
+ font-weight: bold;
+}
+
+.eventTasks {
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
}
@media (max-width: 768px) {
.glassCard {
width: 100%;
- margin: 0px;
margin-top: 16px;
margin-bottom: 16px;
+ max-height: 450px;
display: flex;
+ flex-direction: column;
}
}
\ No newline at end of file
diff --git a/src/components/loginform/loginForm.module.css b/src/components/loginform/loginForm.module.css
index 45caff4..f2908de 100644
--- a/src/components/loginform/loginForm.module.css
+++ b/src/components/loginform/loginForm.module.css
@@ -5,7 +5,7 @@
input {
width: 100%;
height: 60px;
- padding: 0px 10px;
+ padding: 0 10px;
border: none;
border-radius: 10px;
font-size: 19px;
@@ -33,9 +33,9 @@ input::placeholder{
.inputContainer {
padding: 15px;
+ width: 100%;
}
-/* style scoped (module) */
.loginButton {
display: inline-block;
height: 50px;
diff --git a/src/index.css b/src/index.css
index a4fe9a0..c18fc90 100644
--- a/src/index.css
+++ b/src/index.css
@@ -52,33 +52,30 @@ body {
}
-/*.glassCard {
- width: 100%;
- 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);
- position: relative;
- overflow: hidden;
-}*/
-
-
-/* style a montrer a giovanni prcq il est + bo */
.glassCard {
- background: rgba(255, 255, 255, 0.2);
- backdrop-filter: blur(10px);
- border-radius: 20px;
- padding: 15px;
- box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
- border: 1px solid rgba(255, 255, 255, 0.3);
+ padding: 10px 20px 10px 20px;
+ background: rgba(255, 255, 255, 0.54);
+ backdrop-filter: blur(3px);
+ -webkit-backdrop-filter: blur(3px);
+ border-radius: 20px;
+ border: 1px solid rgba(255, 255, 255, 0.2);
+ box-shadow: 0 8px 32px rgba(0, 0, 0, 0.1),
+ inset 0 1px 0 rgba(255, 255, 255, 0.3),
+ inset 0 -1px 0 rgba(255, 255, 255, 0.05),
+ inset 0 0 8px 4px rgba(255, 255, 255, 0.2);
}
+
+.glassBorder{
+ border-radius: 20px;
+ 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);
+}
+
h1 {
font-size: 3.2em;
line-height: 1.1;
diff --git a/src/layout.jsx b/src/layout.jsx
index ebbd503..4fa0991 100644
--- a/src/layout.jsx
+++ b/src/layout.jsx
@@ -11,7 +11,7 @@ function Layout(){
const { user, loading } = useContext(AuthContext);
- if (loading) return
diff --git a/src/pages/Profile/ProfilePage.jsx b/src/pages/Profile/ProfilePage.jsx
index a47e87c..9f61466 100644
--- a/src/pages/Profile/ProfilePage.jsx
+++ b/src/pages/Profile/ProfilePage.jsx
@@ -24,11 +24,11 @@ function ProfilePage() {
Liste des événements à venir
{sortedEvents.length > 0 ? (-
{sortedEvents.map((eventGroup) => (
-
-
- - {formatDateLetter(eventGroup.date)} +
- +
+ ))} ) : (++ {/* TODO: Faire une liste déroulante pour ne plus afficher les tache */}{eventGroup.name}
+{formatDateLetter(eventGroup.start)}
-
- {eventGroup.events.map((event, i) => (
-
- - {event} + {eventGroup.tasks.map((task, i) => ( +
-
+
- {task.name} - {task.description}
+{formatDateLetter(task.start)} - {formatDateLetter(task.end)}
+
))}
Aucun événement planifié pour l'instant.
)} - - +
Loading
; + if (loading) returnLoading
; if (!user) return
-
- );
+ return (
+
-
-
+
+ );
}
export default AdminPage;
diff --git a/src/pages/Events/EventsPage.jsx b/src/pages/Events/EventsPage.jsx
index 19fa549..4c56864 100644
--- a/src/pages/Events/EventsPage.jsx
+++ b/src/pages/Events/EventsPage.jsx
@@ -2,7 +2,7 @@ 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 getAllEvents from "../../utils/event/getAllEvents.js";
+import getAllEvents from "../../utils/events/getAllEvents.js";
import filter from "../../utils/filter.js";
diff --git a/src/pages/Home/HomePage.jsx b/src/pages/Home/HomePage.jsx
index 21b8881..e1c9849 100644
--- a/src/pages/Home/HomePage.jsx
+++ b/src/pages/Home/HomePage.jsx
@@ -1,15 +1,26 @@
import styles from "./HomePage.module.css";
import Calendar from "../../components/homePage/calendar.jsx";
import EventList from "../../components/homePage/eventList.jsx";
+import { useState, useEffect } from "react";
+import getAllEvents from "../../utils/events/getAllEvents.js";
function HomePage() {
+
+ const [events, setEvents] = useState([]);
+
+ useEffect(() => {
+ (async () => {
+ const data = await getAllEvents();
+ setEvents(data.data);
+ }) ()
+ }, [])
+
return (
+
+
-
);
}
-export default HomePage;
\ No newline at end of file
+export default HomePage;
diff --git a/src/pages/Home/HomePage.module.css b/src/pages/Home/HomePage.module.css
index 325f773..abf6145 100644
--- a/src/pages/Home/HomePage.module.css
+++ b/src/pages/Home/HomePage.module.css
@@ -1,13 +1,14 @@
+.allContent{
+ display: flex;
+ flex-direction: row;
+ justify-content: center;
+ gap: 80px;
+}
+
@media (max-width: 768px) {
.allContent{
display: flex;
flex-direction: column;
- gap: 0px;
+ gap: 0;
}
-}
-
-.allContent{
- display: flex;
- flex-direction: row;
- gap: 7%;
}
\ No newline at end of file
diff --git a/src/pages/Login/LoginPage.jsx b/src/pages/Login/LoginPage.jsx
index 79af77a..65d1d12 100644
--- a/src/pages/Login/LoginPage.jsx
+++ b/src/pages/Login/LoginPage.jsx
@@ -10,11 +10,16 @@ function LoginPage() {
const { user, loading } = useContext(AuthContext)
const navigate = useNavigate();
+
+
useEffect(() => {
+ console.log("loading" + loading);
+ console.log("user" + user);
+
if (!loading && user) {
navigate("/");
}
- }, [loading, user]);
+ }, [loading, navigate, user]);
return (
{user.name} {user.lastname}
-
+
-
diff --git a/src/pages/Register/RegisterPage.module.css b/src/pages/Register/RegisterPage.module.css
index 7c221bb..1f560be 100644
--- a/src/pages/Register/RegisterPage.module.css
+++ b/src/pages/Register/RegisterPage.module.css
@@ -40,4 +40,5 @@ h1 {
.inputContainer {
padding: 15px;
+ width: 100%;
}
\ No newline at end of file
diff --git a/src/pages/VolunteerProfile/VolunteerProfilePage.module.css b/src/pages/VolunteerProfile/VolunteerProfilePage.module.css
index e9861dc..834af59 100644
--- a/src/pages/VolunteerProfile/VolunteerProfilePage.module.css
+++ b/src/pages/VolunteerProfile/VolunteerProfilePage.module.css
@@ -131,7 +131,6 @@
margin-bottom: 20px;
}
-/* Desktop (1024px et plus) */
@media screen and (min-width: 1024px) {
.container {
max-width: 100%;
diff --git a/src/pages/eventDetail/eventDetail.jsx b/src/pages/eventDetail/eventDetail.jsx
new file mode 100644
index 0000000..4d4669a
--- /dev/null
+++ b/src/pages/eventDetail/eventDetail.jsx
@@ -0,0 +1,70 @@
+import {useState} from "react";
+import styles from "./eventDetail.module.css";
+import { useParams } from "react-router";
+
+
+function eventDetail() {
+
+ const params = useParams();
+ const id = params.id;
+
+ const [tasks, setTasks] = useState([
+ { text: "Préparer les slides", registered: false },
+ { text: "Réserver la salle", registered: false },
+ { text: "Envoyer les invitations", registered: false },
+ { text: "Tester la configuration technique", registered: false },
+ { text: "Organiser le catering", registered: false },
+ ]);
+
+ const event = {
+ title: "Conférence React 2025",
+ date: "27 Décembre 2025",
+ location: "Paris, France",
+ description: "azertyuiop azertyuiop azertyuiop azertyuiop azertyuiop azertyuiop azertyuiop azertyuiop azertyuiop azertyuiop azertyuiop azertyuiop"
+ };
+
+ const toggleRegister = (index) => {
+ setTasks((prevTasks) =>
+ prevTasks.map((task, i) =>
+ i === index
+ ? { ...task, registered: !task.registered }
+ : task
+ )
+ );
+ };
+
+ return (
+ Role : {user.role}
Membre depuis : {formatDate(user.created_at)}
+
diff --git a/src/pages/Profile/ProfilePage.module.css b/src/pages/Profile/ProfilePage.module.css
index 1e7913f..2ebba4b 100644
--- a/src/pages/Profile/ProfilePage.module.css
+++ b/src/pages/Profile/ProfilePage.module.css
@@ -47,9 +47,7 @@
.infoBlock {
width: 100%;
- background: rgba(255, 255, 255, 0.1);
padding: 10px;
- border-radius: 5px;
}
.eventTasks {
@@ -131,7 +129,6 @@
margin-bottom: 20px;
}
-/* Desktop (1024px et plus) */
@media screen and (min-width: 1024px) {
.container {
max-width: 100%;
diff --git a/src/pages/Register/RegisterPage.jsx b/src/pages/Register/RegisterPage.jsx
index 2046c9a..f0547c3 100644
--- a/src/pages/Register/RegisterPage.jsx
+++ b/src/pages/Register/RegisterPage.jsx
@@ -117,7 +117,7 @@ function RegisterPage() {
Mail : {user.email}
Téléphone : {user.phone === null ? "Pas de numéro enregistré" : user.phone}
-
+
+
+ );
+}
+
+export default eventDetail;
\ No newline at end of file
diff --git a/src/pages/eventDetail/eventDetail.module.css b/src/pages/eventDetail/eventDetail.module.css
new file mode 100644
index 0000000..4c81bb5
--- /dev/null
+++ b/src/pages/eventDetail/eventDetail.module.css
@@ -0,0 +1,92 @@
+.allContent{
+ margin: 16px 0px 16px 0px;
+ align-self: center;
+ width: 90%;
+}
+
+
+.textImage {
+ display: flex;
+ gap: 24px;
+}
+
+.eventImage {
+ width: 40%;
+ aspect-ratio: 16 / 9;
+ background-color: #e0e0e0;
+ border-radius: 16px;
+ flex-shrink: 0;
+}
+
+.eventInfo {
+ flex: 1;
+ min-width: 0;
+ overflow-wrap: break-word;
+}
+
+.eventInfo p {
+ white-space: normal;
+ overflow-wrap: break-word;
+}
+
+.eventImage {
+ width: 40%;
+ height: 100%;
+ aspect-ratio: 16 / 9;
+ background-color: #e0e0e0;
+ border-radius: 16px;
+ flex-shrink: 0;
+}
+
+.registerButton {
+ margin-left: auto;
+ padding: 5px 10px;
+ border-radius: 12px;
+ border: none;
+ cursor: pointer;
+ background: #019AFF;
+ color: white;
+ font-weight: 600;
+}
+
+.registerButton:hover {
+ opacity: 0.85;
+}
+
+.tasksButton {
+ display: flex;
+ align-items: center;
+ gap: 16px;
+}
+
+.tasks {
+ list-style: none;
+ padding: 0;
+}
+
+.tasks li {
+ margin: 16px 0px 16px 0px;
+ padding: 10px 20px 10px 20px;
+ border-radius: 20px;
+ 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);
+ opacity: 0;
+ animation: fadeInUp 0.6s ease-out forwards;
+ animation-delay: calc(var(--i) * 0.1s);
+}
+
+@keyframes fadeInUp {
+ from {
+ opacity: 0;
+ transform: translateY(10px);
+ }
+ to {
+ opacity: 1;
+ transform: translateY(0);
+ }
+}
diff --git a/src/router.js b/src/router.js
index 73e049e..9e3d04f 100644
--- a/src/router.js
+++ b/src/router.js
@@ -10,6 +10,7 @@ import AdminPage from "./pages/Admin/AdminPage.jsx";
import ValidationErrorPage from "./pages/waitValidationPage/ValidationErrorPage.jsx";
import VolunteerProfilePage from "./pages/VolunteerProfile/VolunteerProfilePage.jsx";
import PageNotFound from "./pages/PageNotFound/PageNotFound.jsx";
+import eventDetail from "./pages/eventDetail/eventDetail.jsx";
const router = createBrowserRouter([
{
@@ -59,7 +60,11 @@ const router = createBrowserRouter([
{
path: "/profile/:id",
Component: VolunteerProfilePage,
- }
+ },
+ {
+ path: "/events/:id",
+ Component: eventDetail,
+ },
]
}
])
diff --git a/src/utils/date/formatDateLetter.js b/src/utils/date/formatDateLetter.js
index 8143337..3480835 100644
--- a/src/utils/date/formatDateLetter.js
+++ b/src/utils/date/formatDateLetter.js
@@ -1,8 +1,22 @@
-export default function formatDateLetter(d) {
+export function formatDateLetter(d) {
const monthNames = [
"Janvier", "Février", "Mars", "Avril", "Mai", "Juin",
"Juillet", "Août", "Septembre", "Octobre", "Novembre", "Décembre"
];
- const [year, month, day] = d.split('-');
- return `${day} ${monthNames[parseInt(month) - 1]} ${year}`;
-};
\ No newline at end of file
+
+ const [datePart, timePart] = d.split(' ');
+ const [year, month, day] = datePart.split('-');
+ const [hours, minutes] = timePart.split(':');
+
+ return `${day} ${monthNames[parseInt(month, 10) - 1]} ${year} à ${hours}:${minutes}`;
+}
+
+
+export function formatDateLetterJS(d) {
+ const monthNames = [
+ "Janvier", "Février", "Mars", "Avril", "Mai", "Juin",
+ "Juillet", "Août", "Septembre", "Octobre", "Novembre", "Décembre"
+ ];
+ const [year, month, day] = d.split('-');
+ return `${day} ${monthNames[parseInt(month) - 1]} ${year}`;
+}
\ No newline at end of file
diff --git a/src/utils/date/formatTime.js b/src/utils/date/formatTime.js
new file mode 100644
index 0000000..6012db2
--- /dev/null
+++ b/src/utils/date/formatTime.js
@@ -0,0 +1,8 @@
+export default function formatTime(d) {
+ const date = new Date(d);
+
+ const hh = String(date.getUTCHours()).padStart(2, '0');
+ const min = String(date.getUTCMinutes()).padStart(2, '0');
+
+ return `${hh}:${min}`;
+}
\ No newline at end of file
diff --git a/src/utils/echo/initEcho.js b/src/utils/echo/initEcho.js
new file mode 100644
index 0000000..9d27b37
--- /dev/null
+++ b/src/utils/echo/initEcho.js
@@ -0,0 +1,21 @@
+import Echo from "laravel-echo";
+import Pusher from "pusher-js";
+
+window.Pusher = Pusher;
+
+export default function initEcho() {
+ const echoInstance = new Echo({
+ broadcaster: import.meta.env.VITE_BROADCASTER,
+ key: import.meta.env.VITE_REVERB_KEY,
+ wsHost: import.meta.env.VITE_REVERB_HOST,
+ wsPort: Number(import.meta.env.VITE_REVERB_PORT),
+ forceTLS: import.meta.env.VITE_FORCE_TLS === 'true',
+ disableStats: import.meta.env.VITE_DISABLE_STATS === 'true',
+ encrypted: import.meta.env.VITE_ENCRYPTED === 'true',
+ cluster: import.meta.env.VITE_CLUSTER,
+ enabledTransports: ['ws', 'wss'],
+ });
+
+ window.Echo = echoInstance;
+ return echoInstance;
+}
diff --git a/src/utils/echo/listeners/userCreatedListener.js b/src/utils/echo/listeners/userCreatedListener.js
new file mode 100644
index 0000000..dddab10
--- /dev/null
+++ b/src/utils/echo/listeners/userCreatedListener.js
@@ -0,0 +1,18 @@
+export const userCreatedListener = (echo, userData, setNotifications, setunreadNotification) => {
+ if (userData.isAdmin || userData.role === "Gérant") {
+ const channelName = "users.registration";
+ echo.private(channelName)
+ .listen(".users.registration", (event) => {
+ const newNotification = {
+ id: Date.now(),
+ content: `Nouvelle demande d'inscription : ${event.user.name} ${event.user.lastname}`,
+ created_at: Date.now(),
+ pivot: { unread: 1 }
+ };
+ setNotifications(prev => [newNotification, ...prev]);
+ setunreadNotification(true);
+ });
+ return channelName;
+ }
+ return null;
+};
\ No newline at end of file
diff --git a/src/utils/echo/listeners/userNotificationsListener.js b/src/utils/echo/listeners/userNotificationsListener.js
new file mode 100644
index 0000000..6b07beb
--- /dev/null
+++ b/src/utils/echo/listeners/userNotificationsListener.js
@@ -0,0 +1,47 @@
+export const userNotificationsListener = (echo, userData, setNotifications, setunreadNotification) => {
+ if (!userData?.id) return null;
+
+ const channelName = `user.${userData.id}`;
+
+ return echo.private(channelName)
+ .listen('.event.participation.cancelled', (event) => {
+ const newNotification = {
+ id: Date.now(),
+ content: `L'événement ${event.event.name} a été supprimé ! Vous n'y participez donc plus.`,
+ created_at: Date.now(),
+ pivot: { unread: 1 }
+ };
+ setNotifications(prev => [newNotification, ...prev]);
+ setunreadNotification(true);
+ })
+ .listen(`.task.participation.cancelled`, (event) => {
+ const newNotification = {
+ id: Date.now(),
+ content: `La tâche ${event.task.name} de l'événement ${event.event.name} a été supprimé ! Vous n'y participez donc plus.`,
+ created_at: Date.now(),
+ pivot: { unread: 1 }
+ };
+ setNotifications(prev => [newNotification, ...prev]);
+ setunreadNotification(true);
+ })
+ .listen('.volunteer.assigned.to.task', (event) => {
+ const newNotification = {
+ id: Date.now(),
+ content: `Vous avez été assigné à la tâche ${event.task.name} de l'événement ${event.event.name}`,
+ created_at: Date.now(),
+ pivot: { unread: 1 }
+ };
+ setNotifications(prev => [newNotification, ...prev]);
+ setunreadNotification(true);
+ })
+ .listen('.volunteer.unassigned.to.task', (event) => {
+ const newNotification = {
+ id: Date.now(),
+ content: `Vous avez été désassigné de la tâche ${event.task.name} de l'événement ${event.event.name}`,
+ created_at: Date.now(),
+ pivot: { unread: 1 }
+ };
+ setNotifications(prev => [newNotification, ...prev]);
+ setunreadNotification(true);
+ });
+};
\ No newline at end of file
diff --git a/src/utils/event/createEvent.js b/src/utils/events/createEvent.js
similarity index 86%
rename from src/utils/event/createEvent.js
rename to src/utils/events/createEvent.js
index 4098dd7..d1b0735 100644
--- a/src/utils/event/createEvent.js
+++ b/src/utils/events/createEvent.js
@@ -1,6 +1,6 @@
import getXSRFToken from "../getXSRF.js";
-export default async function createEvent(name, description) {
+export default async function createEvent(name, description, start, end) {
const csrfToken = await getXSRFToken();
try {
@@ -12,7 +12,7 @@ export default async function createEvent(name, description) {
'X-XSRF-TOKEN': csrfToken,
'Accept': 'application/json'
},
- body: JSON.stringify({ name, description }),
+ body: JSON.stringify({ name, description, start, end }),
});
const data = await response.json();
diff --git a/src/utils/event/eventCounter.js b/src/utils/events/eventCounter.js
similarity index 100%
rename from src/utils/event/eventCounter.js
rename to src/utils/events/eventCounter.js
diff --git a/src/utils/event/getAllEvents.js b/src/utils/events/getAllEvents.js
similarity index 100%
rename from src/utils/event/getAllEvents.js
rename to src/utils/events/getAllEvents.js
diff --git a/src/utils/event/getEventById.js b/src/utils/events/getEventById.js
similarity index 100%
rename from src/utils/event/getEventById.js
rename to src/utils/events/getEventById.js
diff --git a/src/utils/searchEvents.js b/src/utils/events/searchEvents.js
similarity index 100%
rename from src/utils/searchEvents.js
rename to src/utils/events/searchEvents.js
diff --git a/src/utils/filter.js b/src/utils/filter.js
index 1495a74..0ed30d7 100644
--- a/src/utils/filter.js
+++ b/src/utils/filter.js
@@ -4,9 +4,9 @@ function filter(elements, filters, type) {
const dB = new Date(dateB);
if (filters.yearOrder === "asc") {
- return dA - dB; // plus ancien -> plus récent
+ return dA - dB;
} else {
- return dB - dA; // plus récent -> plus ancien
+ return dB - dA;
}
};
diff --git a/src/utils/notifications/deleteNotificationUser.js b/src/utils/notifications/deleteNotificationUser.js
new file mode 100644
index 0000000..804c1dd
--- /dev/null
+++ b/src/utils/notifications/deleteNotificationUser.js
@@ -0,0 +1,26 @@
+import getXSRFToken from "../getXSRF.js";
+
+export default async function deleteNotificationUser(notificationId) {
+ const csrfToken = await getXSRFToken();
+
+ try {
+ const res = await fetch(`http://${import.meta.env.VITE_API_URL}/api/users/delete/notification/${notificationId}`, {
+ method: 'DELETE',
+ credentials: 'include',
+ headers: {
+ 'Accept': 'application/json',
+ 'X-XSRF-TOKEN': csrfToken
+ }
+ });
+
+ if (!res.ok) {
+ throw new Error(`Erreur serveur : ${res.status}`);
+ }
+
+ const data = await res.json();
+ return data;
+ } catch (err) {
+ console.error('Erreur :', err);
+ return null;
+ }
+}
diff --git a/src/utils/getUserNotifications.js b/src/utils/notifications/getUserNotifications.js
similarity index 87%
rename from src/utils/getUserNotifications.js
rename to src/utils/notifications/getUserNotifications.js
index 1b93395..491471f 100644
--- a/src/utils/getUserNotifications.js
+++ b/src/utils/notifications/getUserNotifications.js
@@ -1,7 +1,7 @@
export default async function getUserNotifications() {
try {
const response = await fetch(
- 'http://localhost:80/api/users/1/notifications',
+ `http://${import.meta.env.VITE_API_URL}/api/users/notifications`,
{
method: 'GET',
credentials: 'include',
diff --git a/src/utils/notifications/readNotifications.js b/src/utils/notifications/readNotifications.js
new file mode 100644
index 0000000..3f504a6
--- /dev/null
+++ b/src/utils/notifications/readNotifications.js
@@ -0,0 +1,27 @@
+import getXSRFToken from "../getXSRF.js";
+
+export default async function readNotifications() {
+
+ const csrfToken = await getXSRFToken();
+
+ try {
+ const res = await fetch(`http://${import.meta.env.VITE_API_URL}/api/users/notifications/read`, {
+ method: 'POST',
+ credentials: 'include',
+ headers: {
+ 'Accept': 'application/json',
+ 'X-XSRF-TOKEN': csrfToken,
+ 'Content-Type': 'application/json',
+ },
+ });
+
+ if (!res.ok) {
+ throw new Error(`Erreur serveur : ${res.status}`);
+ }
+
+ return await res.json();
+ } catch (err) {
+ console.error('Erreur :', err);
+ return null;
+ }
+}
\ No newline at end of file
diff --git a/src/utils/searchUsers.js b/src/utils/users/searchUsers.js
similarity index 100%
rename from src/utils/searchUsers.js
rename to src/utils/users/searchUsers.js
+
+
+ 
+
+
+
+
+
+ {event.title}
+Date: {event.date}
+Lieu: {event.location}
+Description: {event.description}
+Tâches
+-
+ {tasks.map((task, index) => (
+
-
+ + {task.text} + ++
+ ))}
+