diff --git a/src/pages/Admin/AdminPage.jsx b/src/pages/Admin/AdminPage.jsx
index 7682bb1..54f9478 100644
--- a/src/pages/Admin/AdminPage.jsx
+++ b/src/pages/Admin/AdminPage.jsx
@@ -12,24 +12,24 @@ function AdminPage() {
const { user } = useContext(AuthContext);
const navigate = useNavigate();
- const [selected, setSelected] = useState("3");
- const [participationRate, setParticipationRate] = useState(89);
+ const [selected, setSelected] = useState("3");
+ const [participationRate] = useState(89);
- /*if(!user.isAdmin) navigate("/");*/
+ if(!user.isAdmin) navigate("/");
- 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 02bde02..e1c9849 100644
--- a/src/pages/Home/HomePage.jsx
+++ b/src/pages/Home/HomePage.jsx
@@ -2,7 +2,7 @@ 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/event/getAllEvents.js";
+import getAllEvents from "../../utils/events/getAllEvents.js";
function HomePage() {
diff --git a/src/pages/Home/HomePage.module.css b/src/pages/Home/HomePage.module.css
index 8d3602d..abf6145 100644
--- a/src/pages/Home/HomePage.module.css
+++ b/src/pages/Home/HomePage.module.css
@@ -9,6 +9,6 @@
.allContent{
display: flex;
flex-direction: column;
- gap: 0px;
+ gap: 0;
}
}
\ 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 (
diff --git a/src/pages/Profile/ProfilePage.module.css b/src/pages/Profile/ProfilePage.module.css
index 1e7913f..9b20a37 100644
--- a/src/pages/Profile/ProfilePage.module.css
+++ b/src/pages/Profile/ProfilePage.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/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/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 100%
rename from src/utils/event/createEvent.js
rename to src/utils/events/createEvent.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