Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 20:14:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix rendering bug in marketplace

Browse Source
This commit is contained in:
Matt Hill
2021-07-21 10:31:08 -06:00
committed by Aiden McClelland
parent 1d777b18b3
commit 09fa589ae5
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.html
View File

@@ -11,7 +11,7 @@
</ion-header> </ion-header>
<ion-content class="ion-padding-top"> <ion-content class="ion-padding-top">
<text-spinner *ngIf="pageLoading; else pageLoaded" [text]="'loading marketplace'"></text-spinner> <text-spinner *ngIf="pageLoading; else pageLoaded" text="Loading Marketplace"></text-spinner>
<ng-template #pageLoaded> <ng-template #pageLoaded>
<ion-card *ngIf="eos" class="eos-card" (click)="updateEos()"> <ion-card *ngIf="eos" class="eos-card" (click)="updateEos()">
@@ -39,7 +39,7 @@
</div> </div>
<div *ngIf="pkgsLoading; else loaded" style="margin-top: 64px;" class="ion-text-center"> <div *ngIf="pkgsLoading; else loaded" style="margin-top: 64px;" class="ion-text-center">
<ion-spinner name="lines" color="warning"></ion-spinner> <text-spinner [text]="'Loading ' + (category | titlecase)"></text-spinner>
</div> </div>
<ng-template #loaded> <ng-template #loaded>
@@ -53,7 +53,7 @@
<ion-label> <ion-label>
<h2 style="font-family: 'Montserrat';">{{ pkg.manifest.title }}</h2> <h2 style="font-family: 'Montserrat';">{{ pkg.manifest.title }}</h2>
<p>{{ pkg.manifest.description.short }}</p> <p>{{ pkg.manifest.description.short }}</p>
<ng-container *ngIf="localPkgs[pkg.id] as localPkg"> <ng-container *ngIf="localPkgs[pkg.manifest.id] as localPkg">
<p *ngIf="localPkg.state === PackageState.Installed"> <p *ngIf="localPkg.state === PackageState.Installed">
<ion-text *ngIf="(pkg.manifest.version | compareEmver : localPkg.manifest.version) === 0" color="success">Installed</ion-text> <ion-text *ngIf="(pkg.manifest.version | compareEmver : localPkg.manifest.version) === 0" color="success">Installed</ion-text>
<ion-text *ngIf="(pkg.manifest.version | compareEmver : localPkg.manifest.version) === 1" color="warning">Update Available</ion-text> <ion-text *ngIf="(pkg.manifest.version | compareEmver : localPkg.manifest.version) === 1" color="warning">Update Available</ion-text>

2
ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts
View File

@@ -131,8 +131,6 @@ export class MarketplaceShowPage {
}), }),
) )
if (cancelled) return if (cancelled) return
await pauseFor(250)
this.navCtrl.back()
} }
async update (action: 'update' | 'downgrade') { async update (action: 'update' | 'downgrade') {

2
ui/src/app/pages/marketplace-routes/marketplace.service.ts
View File

@@ -9,7 +9,7 @@ import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
}) })
export class MarketplaceService { export class MarketplaceService {
pkgs: { [id: string]: MarketplacePkg } = { } pkgs: { [id: string]: MarketplacePkg } = { }
updates: MarketplacePkg[] = null updates: MarketplacePkg[] = []
releaseNotes: { [id: string]: { releaseNotes: { [id: string]: {
[version: string]: string [version: string]: string
} } = { } } } = { }