From 78b82fcfee47586b51d6125d980fc7ade864ea92 Mon Sep 17 00:00:00 2001 From: trochas Date: Thu, 8 Jan 2026 14:14:56 +0100 Subject: [PATCH] clean hard code --- front_end/src/components/ressourcePanel.tsx | 28 +++------------------ front_end/src/requetes.tsx | 24 +++++++++++++++--- 2 files changed, 25 insertions(+), 27 deletions(-) diff --git a/front_end/src/components/ressourcePanel.tsx b/front_end/src/components/ressourcePanel.tsx index b37af42..84b2efc 100644 --- a/front_end/src/components/ressourcePanel.tsx +++ b/front_end/src/components/ressourcePanel.tsx @@ -20,33 +20,13 @@ import ObjectUser from "./object/user"; if (user.role === "athlete") return null; - const athleteMap: Map = new Map();//TODO - user.sessions.forEach(session => { - session.athletes?.forEach(a => athleteMap.set(a.id, a)); - }); - const allAthletes: Athlete[] = Array.from(athleteMap.values()); + const allAthletes: Athlete[] = []; - const activiteMap: Map = new Map(); - user.sessions.forEach(session => { - session.activites?.forEach(act => activiteMap.set(act.id, act)); - }); - const allActivites: Activite[] = Array.from(activiteMap.values()); + const allActivites: Activite[] = []; - const coachMap: Map = new Map(); - user.sessions.forEach(session => { - if (session.coach) { - coachMap.set(session.coach.id, session.coach); - } - }); + const allCoachs: Coach[] = []; - const allCoachs: Coach[] = Array.from(coachMap.values()); - - const sessionMap: Map = new Map(); - user.sessions.forEach(session => { - sessionMap.set(session.id, session); - }); - - const allSessions: Session[] = Array.from(sessionMap.values()); + const allSessions: Session[] = []; const ligneMap: Map = new Map(); user.sessions.forEach(session => { diff --git a/front_end/src/requetes.tsx b/front_end/src/requetes.tsx index 2203d5e..49e31bc 100644 --- a/front_end/src/requetes.tsx +++ b/front_end/src/requetes.tsx @@ -1,5 +1,6 @@ import api, { activiteService, sessionService } from "./api"; import { Activite, Admin, Athlete, Coach, Session, User } from "./classes"; +import Keycloak from 'keycloak-js' //debug: export function delay(ms: number): Promise { @@ -13,16 +14,33 @@ export function delay(ms: number): Promise { /* retourne l'utilisateur lié à l'identifiant keyloack */ -export async function getUser(id:number): Promise{ +export async function getUser(keycloak:Keycloak): Promise{ try { - const response = await api.get(`/users/${id}`); - return response.data; + const roles = keycloak.tokenParsed?.realm_access?.roles + if(roles!=null){ + if(roles.includes("admin")){ + const response = await api.get(`/TODO`); + return response.data; + } + else if(roles.includes("coach")){ + const response = await api.get(`/TODO`); + return response.data; + } + else if(roles.includes("athletes")){ + const response = await api.get(`/TODO`); + return response.data; + } + console.error("Error roles inconnu"); + } + + return null; } catch (error) { console.error("Error fetching user:", error); return null; } } + /* retourne toutes les Session dont l'user est inscrit */