diff --git a/back/src/routes/api.js b/back/src/routes/api.js index c27f842ca816fa775607edb4e809d83f7e89b4d9..492c5485bc722f48b926470d035279ae1be2ad69 100644 --- a/back/src/routes/api.js +++ b/back/src/routes/api.js @@ -15,10 +15,13 @@ router.get('/classement_individuel', controller.participant.getClassementIndivid router.get('/participants', controller.participant.getParticipants); router.get('/objectifs', controller.objectifs.getClassementObjectifs); router.get('/evenement', controller.evenement.getEvenements); -router.get('/distance_totale',controller.scores.getDistanceTotale); -router.get('/nombre_participants',controller.participant.getNombreParticipants); -router.get('/participants_by_id',controller.participant.getParticipantsById); -router.get('/participants_ids',controller.participant.getParticipantsIdentifiants); -router.get('/my_scores',controller.participant.getResultatsPersonnels); +router.get('/distance_totale', controller.scores.getDistanceTotale); +router.get('/nombre_participants', controller.participant.getNombreParticipants); +router.get('/participants_by_id', controller.participant.getParticipantsById); +router.get('/participants_ids', controller.participant.getParticipantsIdentifiants); +router.get('/my_scores', controller.participant.getResultatsPersonnels); + +router.get('/administrateurs/login', controller.administrateur.getAdminsLogins); +router.get('/staffeurs/login', controller.staffeurs.getStaffeursLogins); module.exports = router; diff --git a/back/src/routes/apiAdmin.js b/back/src/routes/apiAdmin.js index 2b337fd498abac389003e29d84846989096bf9b7..dd9163d0f4e23f4a89c7c74fe3d140f43b191d89 100644 --- a/back/src/routes/apiAdmin.js +++ b/back/src/routes/apiAdmin.js @@ -34,12 +34,10 @@ router.post('/update_evenement/startdate', controller.evenement.updateEvenementS router.post('/update_evenement/enddate', controller.evenement.updateEvenementEndDate); router.post('/delete_evenement', controller.evenement.DeleteEvenement); router.get('/administrateurs', controller.administrateur.getAdministrateurs); -router.get('/administrateurs/login', controller.administrateur.getAdminsLogins); router.post('/new_staffeur', controller.staffeurs.addNewStaffeur); router.post('/delete_staffeur', controller.staffeurs.deleteStaffeur); router.get('/staffeurs', controller.staffeurs.getStaffeurs); -router.get('/staffeurs/login', controller.staffeurs.getStaffeursLogins); module.exports = router; diff --git a/front/src/hooks/authTools.js b/front/src/hooks/authTools.js index b09c2e578f1faab3b198651003281c415ec06489..4fae8f6e91927b1be7c1cfa7425c44272927a592 100644 --- a/front/src/hooks/authTools.js +++ b/front/src/hooks/authTools.js @@ -9,7 +9,7 @@ export function useIsAdmin() { if (initialize) { axios.get('/api/user').then((response) => setUser(response.data)); setAdmins([]) - axios.get('/api/admin/administrateurs/login').then((response) => setAdmins(response.data)); + axios.get('/api/administrateurs/login').then((response) => setAdmins(response.data)); setInitialize(false); } if (admins.includes(user.login)) { diff --git a/front_thomas/src/hooks/authTools.js b/front_thomas/src/hooks/authTools.js index a6f24b497b8d7749b2d2b8df4adc266956396953..f49c706dcb794664c807ae2aebb74284d3e525e1 100644 --- a/front_thomas/src/hooks/authTools.js +++ b/front_thomas/src/hooks/authTools.js @@ -9,7 +9,7 @@ export function useIsAdmin() { if (initialize) { axios.get('/api/user').then((response) => setUser(response.data)); setAdmins([]) - axios.get('/api/admin/administrateurs/login').then((response) => setAdmins(response.data)); + axios.get('/api/administrateurs/login').then((response) => setAdmins(response.data)); setInitialize(false); } if (admins.includes(user.login)) { @@ -27,7 +27,7 @@ export function useIsStaff() { if (initialize) { axios.get('/api/user').then((response) => setUser(response.data)); setStaff([]) - axios.get('/api/admin/staffeurs/login').then((response) => setStaff(response.data)); + axios.get('/api/staffeurs/login').then((response) => setStaff(response.data)); setInitialize(false); } if (staff.includes(user.login)) {