diff options
| author | sowgro <tpoke.ferrari@gmail.com> | 2025-04-05 14:37:01 -0400 |
|---|---|---|
| committer | sowgro <tpoke.ferrari@gmail.com> | 2025-04-05 14:37:01 -0400 |
| commit | c2e7b170bfa0678a6ff4576d07388778f30084b0 (patch) | |
| tree | 57fc334bea1bc15f8b971d499338497dd3fa7388 /ufund-ui/src/app/app.component.html | |
| parent | 7cedd8713d30fedcc9fc486a49d4804f37ab8765 (diff) | |
| parent | 0103ffc6f84d04433943c644ab759c1d04b5e681 (diff) | |
| download | JellySolutions-c2e7b170bfa0678a6ff4576d07388778f30084b0.tar.gz JellySolutions-c2e7b170bfa0678a6ff4576d07388778f30084b0.tar.bz2 JellySolutions-c2e7b170bfa0678a6ff4576d07388778f30084b0.zip | |
Merge branch 'main' into need-image
# Conflicts:
# ufund-ui/src/app/components/need-list/need-list.component.ts
# ufund-ui/src/app/components/need-page/need-page.component.html
Diffstat (limited to 'ufund-ui/src/app/app.component.html')
| -rw-r--r-- | ufund-ui/src/app/app.component.html | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/ufund-ui/src/app/app.component.html b/ufund-ui/src/app/app.component.html index f697695..30a5347 100644 --- a/ufund-ui/src/app/app.component.html +++ b/ufund-ui/src/app/app.component.html @@ -1,17 +1,22 @@ -<div id="header"> - <div> - <a routerLink="/"> - <h1>Jelly Solutions</h1> - </a> +<div id="scroll"> + <div id="header"> + <div> + <a routerLink="/"> + <h1>Jelly Solutions</h1> + </a> + </div> + <div> + <a *ngIf="(currentUser | async)?.type === userType.MANAGER" routerLink="/dashboard">Dashboard</a> + <a routerLink="/cupboard">Cupboard</a> + <a *ngIf="(currentUser | async)?.type === userType.HELPER" routerLink="/basket">Basket</a> + <!-- <span>{{currentUser$ | async}}</span>--> + <button *ngIf="currentUser | async" (click)="logout()">Log Out</button> + <button *ngIf="!(currentUser | async)" (click)="login()">Log In</button> + </div> </div> - <div> - <a *ngIf="(currentUser | async)?.type === userType.MANAGER" routerLink="/dashboard">Dashboard</a> - <a routerLink="/cupboard">Cupboard</a> - <a *ngIf="(currentUser | async)?.type === userType.HELPER" routerLink="/basket">Basket</a> -<!-- <span>{{currentUser$ | async}}</span>--> - <button *ngIf="currentUser | async" (click)="logout()"> Log Out</button> - <button *ngIf="!(currentUser | async)" (click)="login()"> Log In</button> - </div> -</div> -<router-outlet /> + <router-outlet /> +</div> +<div *ngIf="modalService.getModalBehaviorSubject() | async" class="modal"> + <ng-container [ngTemplateOutlet]="modalService.getModalBehaviorSubject() | async" /> +</div> |