From 0aaafed26ae4fb467a2a536acec7d703a3631210 Mon Sep 17 00:00:00 2001 From: Giovanni-Josserand Date: Wed, 17 Dec 2025 14:16:08 +0100 Subject: [PATCH] move utils files --- src/components/Header/Header.jsx | 27 +++++++++++++++++-- src/components/SearchBar/SearchBar.jsx | 4 +-- src/components/Task/Task.jsx | 2 +- .../createEventBtn/CreateEventBtn.jsx | 2 +- src/pages/Events/EventsPage.jsx | 2 +- src/utils/{event => events}/createEvent.js | 0 src/utils/{event => events}/getAllEvents.js | 0 src/utils/{event => events}/getEventById.js | 0 src/utils/{ => events}/searchEvents.js | 0 src/utils/filter.js | 4 +-- .../notifications/deleteNotificationUser.js | 26 ++++++++++++++++++ .../getUserNotifications.js | 0 src/utils/{ => users}/searchUsers.js | 0 13 files changed, 58 insertions(+), 9 deletions(-) rename src/utils/{event => events}/createEvent.js (100%) rename src/utils/{event => events}/getAllEvents.js (100%) rename src/utils/{event => events}/getEventById.js (100%) rename src/utils/{ => events}/searchEvents.js (100%) create mode 100644 src/utils/notifications/deleteNotificationUser.js rename src/utils/{ => notifications}/getUserNotifications.js (100%) rename src/utils/{ => users}/searchUsers.js (100%) diff --git a/src/components/Header/Header.jsx b/src/components/Header/Header.jsx index b8f3860..259bd7d 100644 --- a/src/components/Header/Header.jsx +++ b/src/components/Header/Header.jsx @@ -1,8 +1,9 @@ import styles from "./Header.module.css" import { Link, NavLink } from "react-router"; import { useEffect, useRef, useState } from "react"; -import getUserNotifications from "../../utils/getUserNotifications.js"; +import getUserNotifications from "../../utils/notifications/getUserNotifications.js"; import getUser from "../../utils/getUser.js"; +import deleteNotificationUser from "../../utils/notifications/deleteNotificationUser.js"; function Header() { const [notificationMenu, setnotificationMenu] = useState(false); @@ -37,6 +38,28 @@ function Header() { }; }, []); + + + + + async function deleteNotification(notificationId) { + try { + const user = await getUser(); + const result = await deleteNotificationUser(user.id, notificationId); + + console.log(result); + + if (result) { + setNotifications(prev => prev.filter(n => n.id !== notificationId)); + } + } catch (err) { + console.error('Erreur suppression notification :', err); + } + } + + + + return (
@@ -114,7 +137,7 @@ function Header() {

{notification.content}

diff --git a/src/components/SearchBar/SearchBar.jsx b/src/components/SearchBar/SearchBar.jsx index d39f095..6635d98 100644 --- a/src/components/SearchBar/SearchBar.jsx +++ b/src/components/SearchBar/SearchBar.jsx @@ -1,8 +1,8 @@ import styles from "./SearchBar.module.css" import {Link} from "react-router"; import {useEffect, useState} from "react"; -import searchEvents from "../../utils/searchEvents.js"; -import searchUsers from "../../utils/searchUsers.js"; +import searchEvents from "../../utils/events/searchEvents.js"; +import searchUsers from "../../utils/users/searchUsers.js"; import { useLocation } from "react-router"; diff --git a/src/components/Task/Task.jsx b/src/components/Task/Task.jsx index 740aeda..1be1990 100644 --- a/src/components/Task/Task.jsx +++ b/src/components/Task/Task.jsx @@ -1,5 +1,5 @@ import React, {useEffect, useState} from "react"; -import getEventById from "../../utils/event/getEventById.js"; +import getEventById from "../../utils/events/getEventById.js"; import styles from "./Task.module.css"; import formatDate from "../../utils/date/formatDate.js"; diff --git a/src/components/createEventBtn/CreateEventBtn.jsx b/src/components/createEventBtn/CreateEventBtn.jsx index 3e638db..cc7677f 100644 --- a/src/components/createEventBtn/CreateEventBtn.jsx +++ b/src/components/createEventBtn/CreateEventBtn.jsx @@ -3,7 +3,7 @@ import { useState } from "react"; import Modal from "../ui/modal/modal.jsx"; import Button from "../ui/button/button.jsx"; import TextInput from "../ui/input/input.jsx"; -import createEvent from "../../utils/event/createEvent.js" +import createEvent from "../../utils/events/createEvent.js" export default function CreateEventBtn() { 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/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..0b8bef1 --- /dev/null +++ b/src/utils/notifications/deleteNotificationUser.js @@ -0,0 +1,26 @@ +import getXSRFToken from "../getXSRF.js"; + +export default async function deleteNotificationUser(userId, notificationId) { + const csrfToken = await getXSRFToken(); + + try { + const res = await fetch(`http://${import.meta.env.VITE_API_URL}/api/users/${userId}/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 100% rename from src/utils/getUserNotifications.js rename to src/utils/notifications/getUserNotifications.js 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