aknuth/bizmatch-project
1
0
Fork 0
Code Issues 9 Pull Requests Packages Projects 5 Releases Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Andreas Knuth
2024-05-15 17:35:04 -05:00
parent 474d7c63d5
commit f51a298227
39 changed files with 333 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
bizmatch/src/app/components/header/header.component.html
View File

@@ -1,11 +1,9 @@
<div class="wrapper">
<div class="pl-3 flex align-items-center gap-2">
<a routerLink="/home"><img src="assets/images/header-logo.png" height="40" alt="bizmatch" /></a>
<p-tabMenu [model]="tabItems" ariaLabelledBy="label" styleClass="flex" [activeItem]="activeItem">
</p-tabMenu>
<p-menubar [model]="menuItems"></p-menubar>
<div *ngIf="user$ | async as user else empty">Welcome, {{user.firstname}}</div>
<ng-template #empty>
</ng-template>
</div>
</div>
<div class="pl-3 flex align-items-center gap-2">
<a routerLink="/home"><img src="assets/images/header-logo.png" height="40" alt="bizmatch" /></a>
<p-tabMenu [model]="tabItems" ariaLabelledBy="label" styleClass="flex" [activeItem]="activeItem"> </p-tabMenu>
<p-menubar [model]="menuItems"></p-menubar>
<div *ngIf="user$ | async as user; else empty">Welcome, {{ user.firstName }}</div>
<ng-template #empty> </ng-template>
</div>
</div>

6
bizmatch/src/app/components/header/header.component.ts
View File

@@ -8,7 +8,7 @@ import { MenubarModule } from 'primeng/menubar';
import { OverlayPanelModule } from 'primeng/overlaypanel';
import { TabMenuModule } from 'primeng/tabmenu';
import { Observable } from 'rxjs';
import { User } from '../../../../../bizmatch-server/src/models/db.model';
import { KeycloakUser } from '../../../../../bizmatch-server/src/models/main.model';
import { environment } from '../../../environments/environment';
import { UserService } from '../../services/user.service';
@Component({
@@ -20,8 +20,8 @@ import { UserService } from '../../services/user.service';
})
export class HeaderComponent {
public buildVersion = environment.buildVersion;
user$: Observable<User>;
user: User;
user$: Observable<KeycloakUser>;
user: KeycloakUser;
public tabItems: MenuItem[];
public menuItems: MenuItem[];
activeItem;