resolve conflicts

src/pages/Admin/AdminPage.jsx

@@ -1,8 +1,8 @@
 import { useContext } from "react";
 import styles from "./AdminPage.module.css";
-import IncompleteEvents from "./components/IncompleteEvent/IncompleteEvent.jsx";
-import PendingMembers from "./components/PendingMembers/PendingMembers.jsx";
-import { AuthContext } from "../../contexts/Auth/AuthContext.js";
+import IncompleteEvents from "./components/IncompleteEvent/IncompleteEvent";
+import PendingMembers from "./components/PendingMembers/PendingMembers";
+import { AuthContext } from "../../contexts/Auth/AuthContext";
 import { useNavigate } from "react-router";
 import RegisterMember from "./components/RegisterMember/RegisterMember";
 

src/utils/events/getEventById.js

@@ -0,0 +1,5 @@
+import fetchWrapper from "../fetchWrapper";
+
+export default async function GetEventById(id) {
+    return fetchWrapper(`/api/events/${id}`, null, "GET");
+}

src/utils/fetchWrapper.ts

@@ -1,4 +1,3 @@
-
 interface FetchResponse<T = any> {
     status: number;
     data: T | null;
@@ -39,7 +38,7 @@ export default async function fetchWrapper(
         };
 
     } catch (err) {
-        console.error("❌ Erreur réseau :", err);
+        console.error("Erreur réseau :", err);
 
         return {
             status: 0,

src/utils/getRoles.ts

@@ -1,4 +1,4 @@
-import fetchWrapper from "./fetchWrapper.js";
+import fetchWrapper from "./fetchWrapper";
 
 export default async function getRoles() {
     return fetchWrapper("/api/roles", null, "GET");

src/utils/getUser.ts

@@ -1,4 +1,4 @@
-import fetchWrapper from "./fetchWrapper.js";
+import fetchWrapper from "./fetchWrapper";
 
 export default async function getUser() {
     return fetchWrapper("/api/users/me", null, "GET");

src/utils/getXSRF.ts

@@ -1,23 +1,3 @@
-/*export default async function getXSRFToken() {
-    const response = await fetch(`${import.meta.env.VITE_API_URL}/sanctum/csrf-cookie`, {
-        method: 'GET',
-        credentials: 'include'
-    });
-
-    if (!response.ok && response.status !== 204) {
-        throw new Error(`Error : ${response.status}`);
-    }
-
-    const name  = 'XSRF-TOKEN';
-    const value = `; ${document.cookie}`;
-    const parts = value.split(`; ${name}=`);
-    if (parts.length === 2) {
-        return decodeURIComponent(parts.pop().split(';').shift());
-    }
-
-    throw new Error('Error: Invalid XSRF-TOKEN');
-}*/
-
 export default async function getXSRFToken(): Promise<string> {
     const response = await fetch(`${import.meta.env.VITE_API_URL}/sanctum/csrf-cookie`, {
         method: 'GET',

src/utils/notifications/deleteNotificationUser.ts

@@ -1,4 +1,4 @@
-import getXSRFToken from "../getXSRF.js";
+import getXSRFToken from "../getXSRF";
 
 export default async function deleteNotificationUser(notificationId:number) {
     const csrfToken = await getXSRFToken();

src/utils/register.ts

@@ -1,5 +1,5 @@
-import fetchWrapper from "./fetchWrapper.js";
-import getXSRFToken from "./getXSRF.js";
+import fetchWrapper from "./fetchWrapper";
+import getXSRFToken from "./getXSRF";
 
 export default async function register(email:string, password:string, name:string, lastname:string, phone:string) {
     const csrfToken = await getXSRFToken();

src/utils/users/adminCreateUser.ts

@@ -1,5 +1,5 @@
-import fetchWrapper from "../fetchWrapper.js";
-import getXSRFToken from "../getXSRF.js";
+import fetchWrapper from "../fetchWrapper";
+import getXSRFToken from "../getXSRF";
 import Response from "../../interfaces/response.interface";
 
 export default async function adminCreateUser(email: string, name: string, lastname: string, phone: string) {

src/utils/users/deactivateUser.ts

@@ -1,5 +1,5 @@
-import fetchWrapper from "../fetchWrapper.js";
-import getXSRFToken from "../getXSRF.js";
+import fetchWrapper from "../fetchWrapper";
+import getXSRFToken from "../getXSRF";
 
 export default async function deactivateUser(userId:number) {
     const csrfToken = await getXSRFToken();

src/utils/users/deleteOtherUser.ts

@@ -1,5 +1,5 @@
-import fetchWrapper from "../fetchWrapper.js";
-import getXSRFToken from "../getXSRF.js";
+import fetchWrapper from "../fetchWrapper";
+import getXSRFToken from "../getXSRF";
 
 export default async function deleteOtherUser(userId:number) {
     const csrfToken = await getXSRFToken();

src/utils/users/deleteProfilePhoto.ts

@@ -1,4 +1,4 @@
-import getXSRFToken from "../getXSRF.js";
+import getXSRFToken from "../getXSRF";
 
 export default async function deleteProfilePhoto(): Promise<{ status: number; ok: boolean; data?: any; error?: string }> {
   try {

src/utils/users/getUserById.js

@@ -0,0 +1,5 @@
+import fetchWrapper from "../fetchWrapper";
+
+export default async function getUserById(id) {
+    return fetchWrapper(`/api/users/${id}`);
+}

src/utils/users/uploadProfilePhoto.ts

@@ -1,4 +1,4 @@
-import getXSRFToken from "../getXSRF.js";
+import getXSRFToken from "../getXSRF";
 
 export default async function uploadProfilePhoto(file: File): Promise<{ status: number; ok: boolean; data?: any; error?: string }> {
   const formData = new FormData();