Merge branch 'dev' into Romain

src/app/pages/admin-page/admin-page.component.html

@@ -1 +1,9 @@
-<app-add-restau></app-add-restau>
+<div class="container">
+    <div class="d-flex flex-row justify-content-around"><div>
+        <app-add-restau></app-add-restau>
+    </div>
+        <div class="search-bar">
+            <app-update-del-restau></app-update-del-restau>
+        </div>
+    </div>
+</div>

src/app/pages/admin-page/admin-page.component.scss

@@ -0,0 +1,3 @@
+.search-bar{
+    width : 30%;
+}

src/app/pages/favoris-user/favoris-user.component.ts

@@ -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);
     
 

src/app/pages/models/restaurant.ts

@@ -10,4 +10,5 @@ export interface Restaurant {
     aEmporter?: boolean;
     accesPMR?: boolean;
     surPlace?: boolean;
+    typerestaus ?: any[];
 }