Merge branch 'dev' into Romain

This commit is contained in:
Romain Verger 2022-03-02 16:51:22 +01:00
commit 6c9aa254e8
20 changed files with 329 additions and 211 deletions

View file

@ -15,11 +15,22 @@ export class FavorisUserComponent implements OnInit {
constructor(private apiBackService : ApiBackService,private tokenService : TokenService) {
<<<<<<< HEAD
=======
constructor(private apiBackService : ApiBackService,private tokenService : TokenService) {
>>>>>>> dev
}
ngOnInit(): void {
this.personneConnectee = this.apiBackService.getPersonneById(this.tokenService.getCurrentUserId());
this.apiBackService.getPersonneById(this.tokenService.getCurrentUserId()).subscribe(
resp =>{
console.log(resp);
this.personneConnectee = resp;
}
);
console.log(this.personneConnectee);