From 4325fe3dcb76e50b5f3f40fb323183db23108331 Mon Sep 17 00:00:00 2001 From: p2405951 Date: Fri, 13 Mar 2026 16:54:08 +0100 Subject: [PATCH] convert API call function to TS --- .../events/{createEvent.js => createEvent.ts} | 6 +-- .../events/{deleteEvent.js => deleteEvent.ts} | 6 +-- .../{getAllEvents.js => getAllEvents.ts} | 2 +- src/utils/events/getEventById.js | 5 --- src/utils/events/getEventById.ts | 5 +++ src/utils/{getRoles.js => getRoles.ts} | 0 src/utils/{getUser.js => getUser.ts} | 0 ...ationUser.js => deleteNotificationUser.ts} | 2 +- ...tifications.js => getUserNotifications.ts} | 0 ...dNotifications.js => readNotifications.ts} | 2 +- src/utils/{register.js => register.ts} | 2 +- src/utils/{scrollToTop.js => scrollToTop.ts} | 0 .../{deactivateUser.js => deactivateUser.ts} | 2 +- ...{deleteOtherUser.js => deleteOtherUser.ts} | 2 +- .../users/{getAllUsers.js => getAllUsers.ts} | 2 +- src/utils/users/getUserById.js | 5 --- src/utils/users/getUserById.ts | 5 +++ ...UserToValidate.js => getUserToValidate.ts} | 2 +- .../users/{modifyRole.js => modifyRole.ts} | 6 +-- src/utils/users/updateUser.ts | 37 ++++--------------- .../{validateUser.js => validateUser.ts} | 6 +-- 21 files changed, 38 insertions(+), 59 deletions(-) rename src/utils/events/{createEvent.js => createEvent.ts} (52%) rename src/utils/events/{deleteEvent.js => deleteEvent.ts} (57%) rename src/utils/events/{getAllEvents.js => getAllEvents.ts} (68%) delete mode 100644 src/utils/events/getEventById.js create mode 100644 src/utils/events/getEventById.ts rename src/utils/{getRoles.js => getRoles.ts} (100%) rename src/utils/{getUser.js => getUser.ts} (100%) rename src/utils/notifications/{deleteNotificationUser.js => deleteNotificationUser.ts} (98%) rename src/utils/notifications/{getUserNotifications.js => getUserNotifications.ts} (100%) rename src/utils/notifications/{readNotifications.js => readNotifications.ts} (94%) rename src/utils/{register.js => register.ts} (72%) rename src/utils/{scrollToTop.js => scrollToTop.ts} (100%) rename src/utils/users/{deactivateUser.js => deactivateUser.ts} (82%) rename src/utils/users/{deleteOtherUser.js => deleteOtherUser.ts} (81%) rename src/utils/users/{getAllUsers.js => getAllUsers.ts} (64%) delete mode 100644 src/utils/users/getUserById.js create mode 100644 src/utils/users/getUserById.ts rename src/utils/users/{getUserToValidate.js => getUserToValidate.ts} (68%) rename src/utils/users/{modifyRole.js => modifyRole.ts} (55%) rename src/utils/users/{validateUser.js => validateUser.ts} (56%) diff --git a/src/utils/events/createEvent.js b/src/utils/events/createEvent.ts similarity index 52% rename from src/utils/events/createEvent.js rename to src/utils/events/createEvent.ts index 764d419..eac4b13 100644 --- a/src/utils/events/createEvent.js +++ b/src/utils/events/createEvent.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 createEvent(name, description, start, end) { +export default async function createEvent(name:string, description:string, start:string, end:string) { const csrfToken = await getXSRFToken(); return fetchWrapper( diff --git a/src/utils/events/deleteEvent.js b/src/utils/events/deleteEvent.ts similarity index 57% rename from src/utils/events/deleteEvent.js rename to src/utils/events/deleteEvent.ts index 10c8a49..7a748a1 100644 --- a/src/utils/events/deleteEvent.js +++ b/src/utils/events/deleteEvent.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 deleteEvent(eventId) { +export default async function deleteEvent(eventId:number) { const csrfToken = await getXSRFToken(); return fetchWrapper( diff --git a/src/utils/events/getAllEvents.js b/src/utils/events/getAllEvents.ts similarity index 68% rename from src/utils/events/getAllEvents.js rename to src/utils/events/getAllEvents.ts index b35f979..79bfc67 100644 --- a/src/utils/events/getAllEvents.js +++ b/src/utils/events/getAllEvents.ts @@ -1,4 +1,4 @@ -import fetchWrapper from "../fetchWrapper.js"; +import fetchWrapper from "../fetchWrapper"; export default async function getAllEvents() { return fetchWrapper("/api/events/", null, "GET"); diff --git a/src/utils/events/getEventById.js b/src/utils/events/getEventById.js deleted file mode 100644 index 97d6272..0000000 --- a/src/utils/events/getEventById.js +++ /dev/null @@ -1,5 +0,0 @@ -import fetchWrapper from "../fetchWrapper.js"; - -export default async function GetEventById(id) { - return fetchWrapper(`/api/events/${id}`, null, "GET"); -} diff --git a/src/utils/events/getEventById.ts b/src/utils/events/getEventById.ts new file mode 100644 index 0000000..70cb6db --- /dev/null +++ b/src/utils/events/getEventById.ts @@ -0,0 +1,5 @@ +import fetchWrapper from "../fetchWrapper"; + +export default async function GetEventById(id:number) { + return fetchWrapper(`/api/events/${id}`, null, "GET"); +} diff --git a/src/utils/getRoles.js b/src/utils/getRoles.ts similarity index 100% rename from src/utils/getRoles.js rename to src/utils/getRoles.ts diff --git a/src/utils/getUser.js b/src/utils/getUser.ts similarity index 100% rename from src/utils/getUser.js rename to src/utils/getUser.ts diff --git a/src/utils/notifications/deleteNotificationUser.js b/src/utils/notifications/deleteNotificationUser.ts similarity index 98% rename from src/utils/notifications/deleteNotificationUser.js rename to src/utils/notifications/deleteNotificationUser.ts index b7d7a93..7f37034 100644 --- a/src/utils/notifications/deleteNotificationUser.js +++ b/src/utils/notifications/deleteNotificationUser.ts @@ -1,6 +1,6 @@ import getXSRFToken from "../getXSRF.js"; -export default async function deleteNotificationUser(notificationId) { +export default async function deleteNotificationUser(notificationId:number) { const csrfToken = await getXSRFToken(); try { diff --git a/src/utils/notifications/getUserNotifications.js b/src/utils/notifications/getUserNotifications.ts similarity index 100% rename from src/utils/notifications/getUserNotifications.js rename to src/utils/notifications/getUserNotifications.ts diff --git a/src/utils/notifications/readNotifications.js b/src/utils/notifications/readNotifications.ts similarity index 94% rename from src/utils/notifications/readNotifications.js rename to src/utils/notifications/readNotifications.ts index 0f406ce..5b7f998 100644 --- a/src/utils/notifications/readNotifications.js +++ b/src/utils/notifications/readNotifications.ts @@ -1,4 +1,4 @@ -import getXSRFToken from "../getXSRF.js"; +import getXSRFToken from "../getXSRF"; export default async function readNotifications() { diff --git a/src/utils/register.js b/src/utils/register.ts similarity index 72% rename from src/utils/register.js rename to src/utils/register.ts index 489f07c..e2b6599 100644 --- a/src/utils/register.js +++ b/src/utils/register.ts @@ -1,7 +1,7 @@ import fetchWrapper from "./fetchWrapper.js"; import getXSRFToken from "./getXSRF.js"; -export default async function register(email, password, name, lastname, phone) { +export default async function register(email:string, password:string, name:string, lastname:string, phone:string) { const csrfToken = await getXSRFToken(); return fetchWrapper( diff --git a/src/utils/scrollToTop.js b/src/utils/scrollToTop.ts similarity index 100% rename from src/utils/scrollToTop.js rename to src/utils/scrollToTop.ts diff --git a/src/utils/users/deactivateUser.js b/src/utils/users/deactivateUser.ts similarity index 82% rename from src/utils/users/deactivateUser.js rename to src/utils/users/deactivateUser.ts index fdf4c44..58a358c 100644 --- a/src/utils/users/deactivateUser.js +++ b/src/utils/users/deactivateUser.ts @@ -1,7 +1,7 @@ import fetchWrapper from "../fetchWrapper.js"; import getXSRFToken from "../getXSRF.js"; -export default async function deactivateUser(userId) { +export default async function deactivateUser(userId:number) { const csrfToken = await getXSRFToken(); return fetchWrapper( diff --git a/src/utils/users/deleteOtherUser.js b/src/utils/users/deleteOtherUser.ts similarity index 81% rename from src/utils/users/deleteOtherUser.js rename to src/utils/users/deleteOtherUser.ts index ece6425..9a32763 100644 --- a/src/utils/users/deleteOtherUser.js +++ b/src/utils/users/deleteOtherUser.ts @@ -1,7 +1,7 @@ import fetchWrapper from "../fetchWrapper.js"; import getXSRFToken from "../getXSRF.js"; -export default async function deleteOtherUser(userId) { +export default async function deleteOtherUser(userId:number) { const csrfToken = await getXSRFToken(); return fetchWrapper( diff --git a/src/utils/users/getAllUsers.js b/src/utils/users/getAllUsers.ts similarity index 64% rename from src/utils/users/getAllUsers.js rename to src/utils/users/getAllUsers.ts index 584c39f..1b75dc9 100644 --- a/src/utils/users/getAllUsers.js +++ b/src/utils/users/getAllUsers.ts @@ -1,4 +1,4 @@ -import fetchWrapper from "../fetchWrapper.js"; +import fetchWrapper from "../fetchWrapper"; export default async function getAllUser() { return fetchWrapper("/api/users"); diff --git a/src/utils/users/getUserById.js b/src/utils/users/getUserById.js deleted file mode 100644 index e9a2c75..0000000 --- a/src/utils/users/getUserById.js +++ /dev/null @@ -1,5 +0,0 @@ -import fetchWrapper from "../fetchWrapper.js"; - -export default async function getUserById(id) { - return fetchWrapper(`/api/users/${id}`); -} diff --git a/src/utils/users/getUserById.ts b/src/utils/users/getUserById.ts new file mode 100644 index 0000000..d08943a --- /dev/null +++ b/src/utils/users/getUserById.ts @@ -0,0 +1,5 @@ +import fetchWrapper from "../fetchWrapper"; + +export default async function getUserById(id:number) { + return fetchWrapper(`/api/users/${id}`); +} diff --git a/src/utils/users/getUserToValidate.js b/src/utils/users/getUserToValidate.ts similarity index 68% rename from src/utils/users/getUserToValidate.js rename to src/utils/users/getUserToValidate.ts index 5176f1f..b0fde0e 100644 --- a/src/utils/users/getUserToValidate.js +++ b/src/utils/users/getUserToValidate.ts @@ -1,4 +1,4 @@ -import fetchWrapper from "../fetchWrapper.js"; +import fetchWrapper from "../fetchWrapper"; export default async function getUserToValidate() { return fetchWrapper("/api/users/invalid"); diff --git a/src/utils/users/modifyRole.js b/src/utils/users/modifyRole.ts similarity index 55% rename from src/utils/users/modifyRole.js rename to src/utils/users/modifyRole.ts index 6526cea..592f739 100644 --- a/src/utils/users/modifyRole.js +++ b/src/utils/users/modifyRole.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 modifyRole(role, userId) { +export default async function modifyRole(role:number, userId:number) { const csrfToken = await getXSRFToken(); return fetchWrapper( diff --git a/src/utils/users/updateUser.ts b/src/utils/users/updateUser.ts index 6714250..48f5b51 100644 --- a/src/utils/users/updateUser.ts +++ b/src/utils/users/updateUser.ts @@ -1,33 +1,12 @@ -/*import fetchWrapper from "../fetchWrapper.js"; -import getXSRFToken from "../getXSRF.js"; - -export default async function updateUser(name, lastname, phone) { - const csrfToken = await getXSRFToken(); - - return fetchWrapper( - "/api/users/update", - { name, lastname, phone }, - "POST", - { "X-XSRF-TOKEN": csrfToken } - ); -}*/ - import fetchWrapper from "../fetchWrapper"; import getXSRFToken from "../getXSRF"; -interface UserUpdateData { - name: string; - lastname: string; - phone: string | null; +export default async function updateUser(name: string, lastname: string, phone: string | null) { + const csrfToken = await getXSRFToken(); + return fetchWrapper( + "/api/users/update", + { name, lastname, phone }, + "POST", + { "X-XSRF-TOKEN": csrfToken } + ); } - -interface RequestHeaders { - "X-XSRF-TOKEN": string; -} -export default async function updateUser(name: string,lastname: string,phone: string | null): Promise { - const csrfToken: string = await getXSRFToken(); - const userData: UserUpdateData = {name,lastname,phone,}; - const headers: RequestHeaders = {"X-XSRF-TOKEN": csrfToken,}; - return fetchWrapper("/api/users/update",userData,"POST",headers); -} - diff --git a/src/utils/users/validateUser.js b/src/utils/users/validateUser.ts similarity index 56% rename from src/utils/users/validateUser.js rename to src/utils/users/validateUser.ts index f73b3ef..de10071 100644 --- a/src/utils/users/validateUser.js +++ b/src/utils/users/validateUser.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 validateUser(userId) { +export default async function validateUser(userId:number) { const csrfToken = await getXSRFToken(); return fetchWrapper(