Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-31 04:23:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

bug fixes and cosmetic improvements

Browse Source
This commit is contained in:
Matt Hill
2021-09-01 14:45:16 -06:00
committed by Aiden McClelland
parent aef1569e56
commit be5952cb67
21 changed files with 147 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ui/src/app/components/install-wizard/complete/complete.component.ts
View File

@@ -20,10 +20,10 @@ export class CompleteComponent implements OnInit, Loadable {
}
@Input() transitions: {
cancel: () => void
next: () => void
final: () => void
error: (e: Error) => void
cancel: () => any
next: () => any
final: () => any
error: (e: Error) => any
}
loading$ = new BehaviorSubject(false)

4
ui/src/app/components/install-wizard/dependents/dependents.component.html
View File

@@ -30,10 +30,10 @@
*ngFor="let dep of dependentBreakages | keyvalue"
>
<ion-thumbnail style="position: relative; height: 4vh; width: 4vh" slot="start">
<img [src]="dep.value.iconURL" />
<img [src]="patch.data['package-data'][dep.key]['static-files'].icon" />
</ion-thumbnail>
<ion-label>
<h5>{{ dep.value.title }}</h5>
<h5>{{ patch.data['package-data'][dep.key].manifest.title }}</h5>
</ion-label>
</ion-item>
</div>

13
ui/src/app/components/install-wizard/dependents/dependents.component.ts
View File

@@ -2,6 +2,7 @@ import { Component, Input, OnInit } from '@angular/core'
import { BehaviorSubject, from, Subject } from 'rxjs'
import { takeUntil, tap } from 'rxjs/operators'
import { Breakages } from 'src/app/services/api/api.types'
import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
import { capitalizeFirstLetter, isEmptyObject } from 'src/app/util/misc.util'
import { Loadable, markAsLoadingDuring$ } from '../loadable'
import { WizardAction } from '../wizard-types'
@@ -20,10 +21,10 @@ export class DependentsComponent implements OnInit, Loadable {
skipConfirmationDialogue?: boolean
}
@Input() transitions: {
cancel: () => void
next: () => void
final: () => void
error: (e: Error) => void
cancel: () => any
next: () => any
final: () => any
error: (e: Error) => any
}
dependentBreakages: Breakages
@@ -33,7 +34,9 @@ export class DependentsComponent implements OnInit, Loadable {
loading$ = new BehaviorSubject(false)
cancel$ = new Subject<void>()
constructor () { }
constructor (
public readonly patch: PatchDbService,
) { }
ngOnInit () { }
load () {

4
ui/src/app/components/install-wizard/install-wizard.component.html
View File

@@ -38,11 +38,11 @@
<!-- cancel button if loading/not loading -->
<ion-button slot="start" *ngIf="(currentSlide.loading$ | async) && currentBottomBar.cancel.whileLoading as cancel" (click)="transitions.cancel()" class="toolbar-button" fill="outline">
<ion-text *ngIf="cancel.text" [class.smaller-text]="cancel.text > 16">{{ cancel.text }}</ion-text>
<ion-text *ngIf="cancel.text" [class.smaller-text]="cancel.text.length > 16">{{ cancel.text }}</ion-text>
<ion-icon *ngIf="!cancel.text" name="close"></ion-icon>
</ion-button>
<ion-button slot="start" *ngIf="!(currentSlide.loading$ | async) && currentBottomBar.cancel.afterLoading as cancel" (click)="transitions.cancel()" class="toolbar-button" fill="outline">
<ion-text *ngIf="cancel.text" [class.smaller-text]="cancel.text > 16">{{ cancel.text }}</ion-text>
<ion-text *ngIf="cancel.text" [class.smaller-text]="cancel.text.length > 16">{{ cancel.text }}</ion-text>
<ion-icon *ngIf="!cancel.text" name="close"></ion-icon>
</ion-button>