diff --git a/back/src/routes/apiAdmin.js b/back/src/routes/apiAdmin.js index dd9163d0f4e23f4a89c7c74fe3d140f43b191d89..6120b6a8c092f3dc4c1629c4b6ecb4747d97bd7d 100644 --- a/back/src/routes/apiAdmin.js +++ b/back/src/routes/apiAdmin.js @@ -5,7 +5,6 @@ var controller = require('../controller') router.get('/admin_objectifs', controller.objectifs.getAdminObjectifs); router.get('/admin_scores', controller.scores.getAdminScores); -router.get('/get_user', controller.administrateur.getUsers); router.get('/admin_evenements', controller.evenement.getAdminEvenements); router.post('/new_score', controller.scores.addNewScore); router.post('/update_score/score', controller.scores.updateScoreScore); @@ -15,7 +14,6 @@ router.post('/delete_score', controller.scores.deleteScore); router.post('/new_equipe', controller.equipe.addNewEquipe); router.post('/update_equipe', controller.equipe.updateEquipe); router.post('/delete_equipe', controller.equipe.deleteEquipe); -router.post('/new_participant', controller.participant.addNewParticipant); router.post('/new_participant_with_id', controller.participant.addNewParticipantWithId); router.post('/update_participant', controller.participant.updateParticipant); router.post('/delete_participant', controller.participant.deleteParticipant); diff --git a/back/src/routes/apiStaff.js b/back/src/routes/apiStaff.js index dc9de2e5956d2e07fc72d42b3205a658bdd82c4a..8ef824c9add7e9b7029ebe4c058d8a199e55279e 100644 --- a/back/src/routes/apiStaff.js +++ b/back/src/routes/apiStaff.js @@ -5,6 +5,8 @@ var controller = require('../controller') router.post('/new_participant_with_id', controller.participant.addNewParticipantWithId); router.post('/new_score', controller.scores.addNewScore); +router.get('/get_user', controller.administrateur.getUsers); +router.post('/new_participant', controller.participant.addNewParticipant); module.exports = router; diff --git a/front/src/components/Login/Autocomplete/Nom.js b/front/src/components/Login/Autocomplete/Nom.js index 67b517e461608f0876830b81c4f3dc9cf06fd7bf..1f3574967f9ef079676ac1256c7a2e104d4230cb 100644 --- a/front/src/components/Login/Autocomplete/Nom.js +++ b/front/src/components/Login/Autocomplete/Nom.js @@ -24,7 +24,7 @@ import { useState } from 'react'; { value: 'Western', label: 'Western' } ]*/ -var nameOptions = [] +var nameOptions = [] const groupStyles = { display: 'flex', @@ -58,17 +58,17 @@ const SearchNom = (props) => { name="Nom" onChange={props.handleChange} defaultOptions={true} - loadOptions = {async (e) => { + loadOptions={async (e) => { let users = []; - await fetch(`/api/admin/get_user?userString=${encodeURIComponent(e)}`).then( + await fetch(`/api/staff/get_user?userString=${encodeURIComponent(e)}`).then( async (resp) => { - console.log("sent "+e) + console.log("sent " + e) users = await resp.json() } ).catch(e => console.log("Triste" + e.message)); var auxOptions = []; - users.map(d => auxOptions.push({value: d.login, label: d.firstName + " " + d.lastName})); - return(auxOptions); + users.map(d => auxOptions.push({ value: d.login, label: d.firstName + " " + d.lastName })); + return (auxOptions); }} maxMenuHeight={175} />)