diff options
| author | Gunther6070 <haydenhartman10@yahoo.com> | 2025-04-05 13:44:33 -0400 |
|---|---|---|
| committer | Gunther6070 <haydenhartman10@yahoo.com> | 2025-04-05 13:44:33 -0400 |
| commit | ef52495d781a3adcec79bfbc9067f70f5ec3c8ab (patch) | |
| tree | e16e8cf36f1cafcf198d21d57a0b3a908116b3df /ufund-ui/src/app/app.component.html | |
| parent | d7c974a98de42f41f3ca16f961d2dee96a3c4313 (diff) | |
| parent | 0103ffc6f84d04433943c644ab759c1d04b5e681 (diff) | |
| download | JellySolutions-ef52495d781a3adcec79bfbc9067f70f5ec3c8ab.tar.gz JellySolutions-ef52495d781a3adcec79bfbc9067f70f5ec3c8ab.tar.bz2 JellySolutions-ef52495d781a3adcec79bfbc9067f70f5ec3c8ab.zip | |
Merge branch 'main' into checkout-improvement
# Conflicts:
# ufund-ui/src/app/components/funding-basket/funding-basket.component.html
# ufund-ui/src/app/components/funding-basket/funding-basket.component.ts
Diffstat (limited to '')
| -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> |