Fix/more UI (#2213)

* fix badge counter...again

* remove taiga styles from angular json

* better syntax
This commit is contained in:
Matt Hill
2023-03-13 15:29:39 -06:00
committed by GitHub
parent a485de6359
commit eba16c0cc3
3 changed files with 11 additions and 13 deletions

View File

@@ -168,8 +168,6 @@
} }
], ],
"styles": [ "styles": [
"node_modules/@taiga-ui/core/styles/taiga-ui-theme.less",
"node_modules/@taiga-ui/core/styles/taiga-ui-fonts.less",
"projects/shared/styles/variables.scss", "projects/shared/styles/variables.scss",
"projects/shared/styles/global.scss", "projects/shared/styles/global.scss",
"projects/shared/styles/shared.scss", "projects/shared/styles/shared.scss",
@@ -305,8 +303,6 @@
} }
], ],
"styles": [ "styles": [
"node_modules/@taiga-ui/core/styles/taiga-ui-theme.less",
"node_modules/@taiga-ui/core/styles/taiga-ui-fonts.less",
"projects/shared/styles/variables.scss", "projects/shared/styles/variables.scss",
"projects/shared/styles/global.scss", "projects/shared/styles/global.scss",
"projects/shared/styles/shared.scss", "projects/shared/styles/shared.scss",
@@ -432,8 +428,6 @@
} }
], ],
"styles": [ "styles": [
"node_modules/@taiga-ui/core/styles/taiga-ui-theme.less",
"node_modules/@taiga-ui/core/styles/taiga-ui-fonts.less",
"projects/shared/styles/variables.scss", "projects/shared/styles/variables.scss",
"projects/shared/styles/global.scss", "projects/shared/styles/global.scss",
"projects/shared/styles/shared.scss", "projects/shared/styles/shared.scss",

View File

@@ -11,6 +11,7 @@ import {
filter, filter,
map, map,
Observable, Observable,
pairwise,
startWith, startWith,
switchMap, switchMap,
withLatestFrom, withLatestFrom,
@@ -71,12 +72,15 @@ export class MenuComponent {
withLatestFrom(this.patch.watch$('package-data')), withLatestFrom(this.patch.watch$('package-data')),
switchMap(([_, outer]) => switchMap(([_, outer]) =>
this.patch.watch$('package-data').pipe( this.patch.watch$('package-data').pipe(
filter( pairwise(),
pkgs => filter(([prev, curr]) =>
!!Object.values(pkgs).find( Object.values(prev).some(
pkg => pkg['install-progress']?.['unpack-complete'], p =>
), p['install-progress'] &&
!curr[p.manifest.id]?.['install-progress'],
),
), ),
map(([_, curr]) => curr),
startWith(outer), startWith(outer),
), ),
), ),

View File

@@ -60,7 +60,7 @@
</ng-container> </ng-container>
<ion-item-divider>Device Credentials</ion-item-divider> <ion-item-divider>Device Credentials</ion-item-divider>
<ion-item> <!-- <ion-item>
<ion-label> <ion-label>
<h2>Pubkey</h2> <h2>Pubkey</h2>
<p>{{ server['pubkey'] }}</p> <p>{{ server['pubkey'] }}</p>
@@ -68,7 +68,7 @@
<ion-button slot="end" fill="clear" (click)="copy(server['pubkey'])"> <ion-button slot="end" fill="clear" (click)="copy(server['pubkey'])">
<ion-icon slot="icon-only" name="copy-outline"></ion-icon> <ion-icon slot="icon-only" name="copy-outline"></ion-icon>
</ion-button> </ion-button>
</ion-item> </ion-item> -->
<ion-item> <ion-item>
<ion-label> <ion-label>
<h2>CA fingerprint</h2> <h2>CA fingerprint</h2>