diff --git a/src/components/SearchBar/SearchBar.tsx b/src/components/SearchBar/SearchBar.tsx index d1ef4c6..3e928ee 100644 --- a/src/components/SearchBar/SearchBar.tsx +++ b/src/components/SearchBar/SearchBar.tsx @@ -1,8 +1,8 @@ import styles from "./SearchBar.module.css"; import { Link } from "react-router"; import { useEffect, useState } from "react"; -import searchEvents from "../../utils/events/searchEvents.js"; -import searchUsers from "../../utils/users/searchUsers.js"; +import searchEvents from "../../utils/events/searchEvents"; +import searchUsers from "../../utils/users/searchUsers"; import { useLocation } from "react-router"; function SearchBar(): any { diff --git a/src/components/Task/Task.tsx b/src/components/Task/Task.tsx index daf805d..0c8c161 100644 --- a/src/components/Task/Task.tsx +++ b/src/components/Task/Task.tsx @@ -1,5 +1,5 @@ import { useEffect, useState } from "react"; -import getEventById from "../../utils/events/getEventById.js"; +import getEventById from "../../utils/events/getEventById"; import styles from "./Task.module.css"; import formatDate from "../../utils/date/formatDate"; diff --git a/src/contexts/EventDetail/EventDetailProvider.jsx b/src/contexts/EventDetail/EventDetailProvider.jsx index a760ab4..1d3b991 100644 --- a/src/contexts/EventDetail/EventDetailProvider.jsx +++ b/src/contexts/EventDetail/EventDetailProvider.jsx @@ -1,7 +1,7 @@ import {useState} from 'react'; import { EventDetailContext } from "./EventDetailContext.js" -import getEventById from "../../utils/events/getEventById.js"; -import deleteTaskFunction from "../../utils/tasks/deleteTask.js"; +import getEventById from "../../utils/events/getEventById"; +import deleteTaskFunction from "../../utils/tasks/deleteTask"; export function EventDetailProvider({ children }) { diff --git a/src/pages/Profile/ProfilePage.tsx b/src/pages/Profile/ProfilePage.tsx index 9cbc958..8eaa107 100644 --- a/src/pages/Profile/ProfilePage.tsx +++ b/src/pages/Profile/ProfilePage.tsx @@ -7,7 +7,7 @@ import SettingsModal from "./components/SettingsModal/SettingsModal"; import {useParams} from "react-router"; import {useNavigate} from "react-router"; import {useRef} from "react"; -import getUserById from "../../utils/users/getUserById.js"; +import getUserById from "../../utils/users/getUserById"; import ManageMember from "./components/ManageMember/ManageMember.jsx"; import uploadProfilePhoto from "../../utils/users/uploadProfilePhoto"; import deleteProfilePhoto from "../../utils/users/deleteProfilePhoto.js"; diff --git a/src/utils/events/eventCounter.js b/src/utils/events/eventCounter.js deleted file mode 100644 index 20ee578..0000000 --- a/src/utils/events/eventCounter.js +++ /dev/null @@ -1,28 +0,0 @@ -import { useEffect, useState } from "react"; -import getAllEvents from "../../utils/events/getAllEvents"; - -function EventsCounter() { - const [eventsCount, setEventsCount] = useState(0); - const [loading, setLoading] = useState(true); - useEffect(() => { - const fetchEvents = async () => { - try { - const events = await getAllEvents(); - if (Array.isArray(events)) { - setEventsCount(events.length); - } else { - setEventsCount(0); - } - } catch (err) { - console.error(err); - setEventsCount(0); - } finally { - setLoading(false); - } - }; - fetchEvents(); - }, []); - if (loading) return

Chargement...

; - return

Nombre d’événements : {eventsCount}

; -} -export default EventsCounter; diff --git a/src/utils/events/getEventById.js b/src/utils/events/getEventById.js deleted file mode 100644 index 0b41625..0000000 --- a/src/utils/events/getEventById.js +++ /dev/null @@ -1,5 +0,0 @@ -import fetchWrapper from "../fetchWrapper"; - -export default async function GetEventById(id) { - return fetchWrapper(`/api/events/${id}`, null, "GET"); -} diff --git a/src/utils/events/searchEvents.js b/src/utils/events/searchEvents.ts similarity index 80% rename from src/utils/events/searchEvents.js rename to src/utils/events/searchEvents.ts index aa8a327..351ae77 100644 --- a/src/utils/events/searchEvents.js +++ b/src/utils/events/searchEvents.ts @@ -1,4 +1,4 @@ -export default async function searchEvents(query) { +export default async function searchEvents(query: string): Promise { try { const encodedQuery = encodeURIComponent(query); const response = await fetch( @@ -13,7 +13,7 @@ export default async function searchEvents(query) { } ); const data = await response.json(); - return data.hits.map(hit => hit.document); + return data.hits.map((hit: any) => hit.document); } catch (err) { console.error("Erreur :", err); diff --git a/src/utils/tasks/assign.js b/src/utils/tasks/assign.ts similarity index 56% rename from src/utils/tasks/assign.js rename to src/utils/tasks/assign.ts index cb85dd3..a9d7e8b 100644 --- a/src/utils/tasks/assign.js +++ b/src/utils/tasks/assign.ts @@ -1,7 +1,7 @@ -import fetchWrapper from "../fetchWrapper.js"; -import getXSRFToken from "../getXSRF.js"; +import fetchWrapper from "../fetchWrapper"; +import getXSRFToken from "../getXSRF"; -export default async function assign(taskId) { +export default async function assign(taskId: number): Promise { const csrfToken = await getXSRFToken(); return fetchWrapper( diff --git a/src/utils/tasks/createTask.js b/src/utils/tasks/createTask.js deleted file mode 100644 index a023d70..0000000 --- a/src/utils/tasks/createTask.js +++ /dev/null @@ -1,29 +0,0 @@ -import fetchWrapper from "../fetchWrapper.js"; -import getXSRFToken from "../getXSRF.js"; - -export default async function createTask({ - eventId, - name, - description, - start, - end, - location, - maxParticipants, - }) { - const csrfToken = await getXSRFToken(); - - return fetchWrapper( - "/api/events/task", - { - event_id: eventId, - name, - description, - start, - end, - location, - max_participants: maxParticipants, - }, - "POST", - {"X-XSRF-TOKEN": csrfToken} - ); -} diff --git a/src/utils/tasks/createTask.ts b/src/utils/tasks/createTask.ts new file mode 100644 index 0000000..495b67e --- /dev/null +++ b/src/utils/tasks/createTask.ts @@ -0,0 +1,39 @@ +import fetchWrapper from "../fetchWrapper"; +import getXSRFToken from "../getXSRF"; + +interface CreateTaskParams { + eventId: number; + name: string; + description: string; + start: string; + end: string; + location: string; + maxParticipants: number; +} + +export default async function createTask({ + eventId, + name, + description, + start, + end, + location, + maxParticipants, +}: CreateTaskParams): Promise { + const csrfToken = await getXSRFToken(); + + return fetchWrapper( + "/api/events/task", + { + event_id: eventId, + name, + description, + start, + end, + location, + max_participants: maxParticipants, + }, + "POST", + {"X-XSRF-TOKEN": csrfToken} + ); +} diff --git a/src/utils/tasks/deleteTask.js b/src/utils/tasks/deleteTask.js deleted file mode 100644 index 2641307..0000000 --- a/src/utils/tasks/deleteTask.js +++ /dev/null @@ -1,13 +0,0 @@ -import fetchWrapper from "../fetchWrapper.js"; -import getXSRFToken from "../getXSRF.js"; - -export default async function deleteTask(taskId) { - const csrfToken = await getXSRFToken(); - - return fetchWrapper( - `/api/events/tasks/${taskId}`, - { task_id: taskId }, - "DELETE", - { "X-XSRF-TOKEN": csrfToken } - ); -} diff --git a/src/utils/tasks/deleteTask.ts b/src/utils/tasks/deleteTask.ts new file mode 100644 index 0000000..bc0e163 --- /dev/null +++ b/src/utils/tasks/deleteTask.ts @@ -0,0 +1,13 @@ +import fetchWrapper from "../fetchWrapper"; +import getXSRFToken from "../getXSRF"; + +export default async function deleteTask(taskId: number): Promise { + const csrfToken = await getXSRFToken(); + + return fetchWrapper( + `/api/events/tasks/${taskId}`, + {task_id: taskId}, + "DELETE", + {"X-XSRF-TOKEN": csrfToken} + ); +} diff --git a/src/utils/tasks/isAssigned.js b/src/utils/tasks/isAssigned.js deleted file mode 100644 index 99ce6ff..0000000 --- a/src/utils/tasks/isAssigned.js +++ /dev/null @@ -1,9 +0,0 @@ -import fetchWrapper from "../fetchWrapper.js"; - -export default async function isAssigned(taskId) { - return fetchWrapper( - `/api/events/tasks/${taskId}/assigned`, - null, - "GET" - ); -} diff --git a/src/utils/tasks/isAssigned.ts b/src/utils/tasks/isAssigned.ts new file mode 100644 index 0000000..aafd14e --- /dev/null +++ b/src/utils/tasks/isAssigned.ts @@ -0,0 +1,9 @@ +import fetchWrapper from "../fetchWrapper"; + +export default async function isAssigned(taskId: number): Promise { + return fetchWrapper( + `/api/events/tasks/${taskId}/assigned`, + null, + "GET" + ); +} diff --git a/src/utils/tasks/unAssign.js b/src/utils/tasks/unAssign.ts similarity index 56% rename from src/utils/tasks/unAssign.js rename to src/utils/tasks/unAssign.ts index 7110328..4871a2e 100644 --- a/src/utils/tasks/unAssign.js +++ b/src/utils/tasks/unAssign.ts @@ -1,7 +1,7 @@ -import fetchWrapper from "../fetchWrapper.js"; -import getXSRFToken from "../getXSRF.js"; +import fetchWrapper from "../fetchWrapper"; +import getXSRFToken from "../getXSRF"; -export default async function unAssign(taskId) { +export default async function unAssign(taskId: number): Promise { const csrfToken = await getXSRFToken(); return fetchWrapper( diff --git a/src/utils/users/getUserById.js b/src/utils/users/getUserById.js deleted file mode 100644 index 9acd7bd..0000000 --- a/src/utils/users/getUserById.js +++ /dev/null @@ -1,5 +0,0 @@ -import fetchWrapper from "../fetchWrapper"; - -export default async function getUserById(id) { - return fetchWrapper(`/api/users/${id}`); -} diff --git a/src/utils/users/searchUsers.js b/src/utils/users/searchUsers.ts similarity index 80% rename from src/utils/users/searchUsers.js rename to src/utils/users/searchUsers.ts index ae0bd3a..6c06005 100644 --- a/src/utils/users/searchUsers.js +++ b/src/utils/users/searchUsers.ts @@ -1,4 +1,4 @@ -export default async function searchUsers(query) { +export default async function searchUsers(query: string): Promise { try { const encodedQuery = encodeURIComponent(query); const response = await fetch( @@ -13,7 +13,7 @@ export default async function searchUsers(query) { } ); const data = await response.json(); - return data.hits.map(hit => hit.document); + return data.hits.map((hit: any) => hit.document); } catch (err) { console.error("Erreur :", err);