diff options
| author | sowgro <tpoke.ferrari@gmail.com> | 2025-04-06 15:15:47 -0400 |
|---|---|---|
| committer | sowgro <tpoke.ferrari@gmail.com> | 2025-04-06 15:15:47 -0400 |
| commit | 9f14b3787a8cfc49fd168b1242adcc6d5fa8bfd6 (patch) | |
| tree | 8af111a538a8d6361e1cf07467b9c31568284921 /ufund-ui/src/app/app.component.html | |
| parent | 1ac878b4aaa19ab889c7a98b7dab6acd57c778b3 (diff) | |
| parent | 04cb51b2e7891785c956c5faa73fb88cc04e82e0 (diff) | |
| download | JellySolutions-9f14b3787a8cfc49fd168b1242adcc6d5fa8bfd6.tar.gz JellySolutions-9f14b3787a8cfc49fd168b1242adcc6d5fa8bfd6.tar.bz2 JellySolutions-9f14b3787a8cfc49fd168b1242adcc6d5fa8bfd6.zip | |
Merge branch 'main' into light-mode
# Conflicts:
# ufund-ui/src/app/app.component.html
# ufund-ui/src/app/components/funding-basket/funding-basket.component.html
# ufund-ui/src/app/components/need-list/need-list.component.html
# ufund-ui/src/app/components/need-page/need-page.component.css
Diffstat (limited to 'ufund-ui/src/app/app.component.html')
| -rw-r--r-- | ufund-ui/src/app/app.component.html | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/ufund-ui/src/app/app.component.html b/ufund-ui/src/app/app.component.html index a6e6e6a..8a0fd04 100644 --- a/ufund-ui/src/app/app.component.html +++ b/ufund-ui/src/app/app.component.html @@ -1,18 +1,23 @@ -<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> + <button *ngIf="(currentUser | async)?.type === userType.MANAGER" routerLink="/dashboard">Dashboard</button> + <button routerLink="/cupboard">Cupboard</button> + <button *ngIf="(currentUser | async)?.type === userType.HELPER" routerLink="/basket">Basket</button> + <!-- <span>{{currentUser$ | async}}</span>--> + <button *ngIf="currentUser | async" (click)="logout()">Log Out</button> + <button *ngIf="!(currentUser | async)" (click)="login()">Log In</button> + <button class="button" (click)="toggleColorScheme()"><span class="icon">brightness_7</span></button> + </div> </div> - <div> - <button *ngIf="(currentUser | async)?.type === userType.MANAGER" routerLink="/dashboard">Dashboard</button> - <button routerLink="/cupboard">Cupboard</button> - <button *ngIf="(currentUser | async)?.type === userType.HELPER" routerLink="/basket">Basket</button> -<!-- <span>{{currentUser$ | async}}</span>--> - <button *ngIf="currentUser | async" (click)="logout()"> Log Out</button> - <button *ngIf="!(currentUser | async)" (click)="login()"> Log In</button> - <button class="button" (click)="toggleColorScheme()"><span class="icon">brightness_7</span></button> - </div> -</div> -<router-outlet /> + <router-outlet /> +</div> +<div *ngIf="modalService.getModalBehaviorSubject() | async" class="modal"> + <ng-container [ngTemplateOutlet]="modalService.getModalBehaviorSubject() | async" /> +</div> |