diff --git a/frontend/src/API/API.ts b/frontend/src/API/API.ts index 636d8e3..6a508b5 100644 --- a/frontend/src/API/API.ts +++ b/frontend/src/API/API.ts @@ -274,15 +274,6 @@ export const api: API = { } }, -<<<<<<< HEAD - async getWeeklyReportsForProject( - username: string, - projectName: string, - token: string, - ) { - try { - const response = await fetch("/api/getWeeklyReportsUser", { -======= async getWeeklyReportsForUser( username: string, projectName: string, @@ -290,16 +281,11 @@ export const api: API = { ): Promise> { try { const response = await fetch(`/api/getWeeklyReportsUser?username=${username}&projectName=${projectName}`, { ->>>>>>> af5813681d11500c0cfe723af1b8d2522bf277d2 method: "GET", headers: { "Content-Type": "application/json", Authorization: "Bearer " + token, }, -<<<<<<< HEAD - body: JSON.stringify({ username, projectName }), -======= ->>>>>>> af5813681d11500c0cfe723af1b8d2522bf277d2 }); if (!response.ok) {