Imbus/TTime
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge again

Browse source
This commit is contained in:
al8763be 2024-03-20 19:38:52 +01:00
parent eff14516b4
commit 8fbb4be0ad
1 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
frontend/src/API/API.ts
View file

@ -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( async getWeeklyReportsForUser(
username: string, username: string,
projectName: string, projectName: string,
@ -290,16 +281,11 @@ export const api: API = {
): Promise<APIResponse<WeeklyReport[]>> { ): Promise<APIResponse<WeeklyReport[]>> {
try { try {
const response = await fetch(`/api/getWeeklyReportsUser?username=${username}&projectName=${projectName}`, { const response = await fetch(`/api/getWeeklyReportsUser?username=${username}&projectName=${projectName}`, {
>>>>>>> af5813681d11500c0cfe723af1b8d2522bf277d2
method: "GET", method: "GET",
headers: { headers: {
"Content-Type": "application/json", "Content-Type": "application/json",
Authorization: "Bearer " + token, Authorization: "Bearer " + token,
}, },
<<<<<<< HEAD
body: JSON.stringify({ username, projectName }),
=======
>>>>>>> af5813681d11500c0cfe723af1b8d2522bf277d2
}); });
if (!response.ok) { if (!response.ok) {