merge resolution

This commit is contained in:
Thomas Cardon 2022-03-02 14:20:51 +01:00
commit 829c8333f6
8 changed files with 34 additions and 10 deletions

View file

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