isa44.74/Organizee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

push obligatoire ne pas merger ma branche

Browse Source
This commit is contained in:
Sana EL HIRI 2022-01-21 14:53:13 +01:00
parent 93e388b443
commit 5af749ddb2
3 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.idea/compiler.xml generated
View File

@ -6,17 +6,12 @@
<sourceOutputDir name="target/generated-sources/annotations" /> <sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" /> <outputRelativeToContentRoot value="true" />
<<<<<<< HEAD
<module name="organizee" /> <module name="organizee" />
=======
<module name="Organizee" />
>>>>>>> b147bc406c22caa9c817c7189a325058d8550a69
</profile> </profile>
</annotationProcessing> </annotationProcessing>
</component> </component>
<component name="JavacSettings"> <component name="JavacSettings">
<option name="ADDITIONAL_OPTIONS_OVERRIDE"> <option name="ADDITIONAL_OPTIONS_OVERRIDE">
<module name="Organizee" options="-parameters" />
<module name="organizee" options="-parameters" /> <module name="organizee" options="-parameters" />
</option> </option>
</component> </component>

10
src/main/java/fr/organizee/controller/MembreController.java
View File

@ -5,14 +5,10 @@ import fr.organizee.dto.MembreDto;
import fr.organizee.exception.ExistingUsernameException; import fr.organizee.exception.ExistingUsernameException;
import fr.organizee.exception.InvalidCredentialsException; import fr.organizee.exception.InvalidCredentialsException;
import fr.organizee.model.Membre; import fr.organizee.model.Membre;
import fr.organizee.model.Team; //import fr.organizee.model.Team;
import fr.organizee.repository.MembreRepository; import fr.organizee.repository.MembreRepository;
<<<<<<< HEAD
import fr.organizee.repository.TeamRepository;
=======
//import fr.organizee.repository.TeamRepository; //import fr.organizee.repository.TeamRepository;
import fr.organizee.service.MembreService; import fr.organizee.service.MembreService;
>>>>>>> b147bc406c22caa9c817c7189a325058d8550a69
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
@ -34,9 +30,6 @@ public class MembreController {
@Autowired @Autowired
private MembreRepository membreRepo; private MembreRepository membreRepo;
<<<<<<< HEAD
// @Autowired
=======
@Autowired @Autowired
private MembreService membreService; private MembreService membreService;
@ -44,7 +37,6 @@ public class MembreController {
private BCryptPasswordEncoder passwordEncoder; private BCryptPasswordEncoder passwordEncoder;
// @Autowired // @Autowired
>>>>>>> b147bc406c22caa9c817c7189a325058d8550a69
// private TeamRepository teamRepo; // private TeamRepository teamRepo;
// @RequestMapping("/membres") // @RequestMapping("/membres")