Commit Graph

91 Commits

Author SHA1 Message Date
tuanvu
95933b62df Merge remote-tracking branch 'origin/main' 2026-01-09 13:39:02 +01:00
tuanvu
c368462ccb petit commit 2026-01-09 13:38:54 +01:00
trochas
e52ba2fe3b login presque fix 2026-01-09 13:38:50 +01:00
trochas
2651c34df5 Merge branch 'main' of https://gitlab2.istic.univ-rennes1.fr/tuvu/hackathon 2026-01-09 12:58:37 +01:00
trochas
39e8be7427 création de session fix en cours 2026-01-09 12:58:20 +01:00
Amaël Kesteman
42134e0db6 Feat: ajout car en fait je suis débile 2026-01-09 12:55:25 +01:00
Alexis Leboeuf
b707167627 Merge remote-tracking branch 'refs/remotes/origin/main' 2026-01-09 12:54:46 +01:00
Alexis Leboeuf
29bb452d19 Re-done session coach on creation 2026-01-09 12:54:37 +01:00
Amaël Kesteman
9ac25f9ab6 Merge branch 'main' of https://gitlab2.istic.univ-rennes1.fr/tuvu/hackathon 2026-01-09 12:17:21 +01:00
Amaël Kesteman
7e41266d80 Feat: Ajout de activite.tsx 2026-01-09 12:16:51 +01:00
tuanvu
4e8587d445 ptet revoir les requetes.tsx 2026-01-09 11:23:20 +01:00
tuanvu
d23ae32379 fix 2026-01-09 10:49:09 +01:00
tuanvu
e40c648536 Merge remote-tracking branch 'origin/main' 2026-01-09 10:46:49 +01:00
trochas
b4200cc029 correction login 2026-01-09 10:46:41 +01:00
tuanvu
46396d035b change endpoints 2026-01-09 10:46:12 +01:00
trochas
cf509d1a7c correction /api en trop 2026-01-08 18:04:33 +01:00
Alexis Leboeuf
787eafbfae Removed unused comment 2026-01-08 18:02:50 +01:00
Alexis Leboeuf
b4779f6007 Modified API base URL in frontend 2026-01-08 18:02:19 +01:00
trochas
4eed2e2954 fix en cours 2026-01-08 17:53:42 +01:00
tuanvu
8a2cfbd2f7 login fix 2026-01-08 16:36:52 +01:00
trochas
ba45985394 Merge branch 'main' of https://gitlab2.istic.univ-rennes1.fr/tuvu/hackathon 2026-01-08 16:30:35 +01:00
trochas
9bb487c369 toDTO pour les user 2026-01-08 16:30:29 +01:00
Alexis Leboeuf
f20d20dd40 Added Admin endpoints
Fixed typos in Users Endpoints
2026-01-08 16:26:32 +01:00
trochas
d68662e91c getUser 2026-01-08 16:00:43 +01:00
Alexis Leboeuf
0bd93ac824 Merge remote-tracking branch 'refs/remotes/origin/main' 2026-01-08 15:47:53 +01:00
Alexis Leboeuf
95ce13181f Added Keycloak related endpoints and other ones 2026-01-08 15:47:46 +01:00
trochas
ca7444315e merge 2026-01-08 15:46:39 +01:00
trochas
f2a0f8ca86 contructeur classes, type DTO dans TS, clean hard code 2026-01-08 15:42:11 +01:00
tuanvu
286fa78eb0 clean edt athlete 2026-01-08 15:31:07 +01:00
Alexis Leboeuf
6bc8b165ff Merge remote-tracking branch 'refs/remotes/origin/main' 2026-01-08 14:57:50 +01:00
Alexis Leboeuf
2818bdae8a Fixed front API conf broken in previous commit 2026-01-08 14:57:41 +01:00
Amaël Kesteman
365b7f5bdd Feat: Déplacement stats athlètes 2026-01-08 14:53:12 +01:00
Alexis Leboeuf
b82a32d0eb Merge remote-tracking branch 'refs/remotes/origin/main' 2026-01-08 14:51:56 +01:00
Alexis Leboeuf
0e8ba63be5 Updated API connection 2026-01-08 14:51:50 +01:00
trochas
78b82fcfee clean hard code 2026-01-08 14:14:56 +01:00
tuanvu
57762f4340 Merge remote-tracking branch 'origin/main' 2026-01-08 13:33:11 +01:00
tuanvu
85daf4647a create account marche 2026-01-08 13:32:53 +01:00
trochas
3daff2511e merge 2026-01-08 13:17:57 +01:00
trochas
be4ab7d7cf correction ressource list, clean composant 2026-01-08 12:41:25 +01:00
Amaël Kesteman
13e49a6229 Merge branch 'main' of https://gitlab2.istic.univ-rennes1.fr/tuvu/hackathon 2026-01-08 12:04:17 +01:00
Amaël Kesteman
40c9d091b8 Feat: Ajout des types de sessions en map 2026-01-08 12:04:05 +01:00
Alexis Leboeuf
988a7c16b3 P U S H 2026-01-08 12:01:56 +01:00
tuanvu
1eef3c4944 edt_athlete 2026-01-08 11:42:42 +01:00
tuanvu
6c2ae936ac Merge remote-tracking branch 'origin/main' 2026-01-08 11:27:25 +01:00
tuanvu
e28b126838 change in athlete and getkeycloak 2026-01-08 11:27:18 +01:00
Alexis Leboeuf
824d5f4388 Merge remote-tracking branch 'refs/remotes/origin/main' 2026-01-08 11:26:27 +01:00
Alexis Leboeuf
9a2d1ae5e6 Lot of things
Refactored Role enum to be the same as Keycloak roles
Managed CORS errors in backend
Edited Keycloak config to avoid CORS error
Edited frontend API to avoid CORS errors
Changed Activite creation management
Added debug print in Login (should be removed);
2026-01-08 11:26:16 +01:00
Amaël Kesteman
fa70da8f25 Feat: Ajout stats athlètes 2026-01-08 11:22:04 +01:00
tuanvu
ea0e8eceb9 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	front_end/src/components/ressourcePanel.tsx
2026-01-08 08:59:19 +01:00
Amaël Kesteman
0a5d7bccd5 Feat: Calcul de temps de jeu total pour les lignes 2026-01-08 08:58:26 +01:00