vincentRamiere
/
simpleat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge dev into Romain

This commit is contained in:
Romain Verger 2022-03-02 16:56:14 +01:00
parent 6c9aa254e8
commit 4a271c15b7
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/app.component.html
View File

@ -1,6 +1,6 @@
<!-- <app-header-logo *ngIf="dontShow"></app-header-logo> <!-- <app-header-logo *ngIf="dontShow"></app-header-logo>
<app-nav-bar *ngIf="dontShow"></app-nav-bar> --> <app-nav-bar *ngIf="dontShow"></app-nav-bar> -->
<app-search-bar *ngIf="router.url != '/signin'"></app-search-bar> <app-header-logo *ngIf="router.url != '/signin'"></app-header-logo>
<app-nav-bar *ngIf="router.url != '/signin'"></app-nav-bar> <app-nav-bar *ngIf="router.url != '/signin'"></app-nav-bar>
<router-outlet></router-outlet> <router-outlet></router-outlet>
<app-footer *ngIf="router.url != '/signin'"></app-footer> <app-footer *ngIf="router.url != '/signin'"></app-footer>

6
src/app/pages/favoris-user/favoris-user.component.ts
View File

@ -14,11 +14,6 @@ export class FavorisUserComponent implements OnInit {
listRestoFav: any; listRestoFav: any;
constructor(private apiBackService : ApiBackService,private tokenService : TokenService) { constructor(private apiBackService : ApiBackService,private tokenService : TokenService) {
<<<<<<< HEAD
=======
constructor(private apiBackService : ApiBackService,private tokenService : TokenService) {
>>>>>>> dev
} }
ngOnInit(): void { ngOnInit(): void {
@ -38,3 +33,4 @@ export class FavorisUserComponent implements OnInit {
} }
} }