mirror of
https://github.com/Start9Labs/start-os.git
synced 2026-03-30 12:11:56 +00:00
modify location of icon and title for dependencies
This commit is contained in:
committed by
Aiden McClelland
parent
dc3634ad31
commit
708d035455
@@ -76,10 +76,10 @@
|
|||||||
<!-- A current-dependency is a subset of the pkg.manifest.dependencies that is currently required as determined by the service config. -->
|
<!-- A current-dependency is a subset of the pkg.manifest.dependencies that is currently required as determined by the service config. -->
|
||||||
<ion-item *ngFor="let dep of pkg.installed['current-dependencies'] | keyvalue">
|
<ion-item *ngFor="let dep of pkg.installed['current-dependencies'] | keyvalue">
|
||||||
<ion-thumbnail slot="start">
|
<ion-thumbnail slot="start">
|
||||||
<img [src]="dep.icon" />
|
<img [src]="pkg.installed['dependency-info'][dep.key].icon" />
|
||||||
</ion-thumbnail>
|
</ion-thumbnail>
|
||||||
<ion-label class="ion-text-wrap">
|
<ion-label class="ion-text-wrap">
|
||||||
<h2 style="font-family: 'Montserrat'">{{ dep.title }}</h2>
|
<h2 style="font-family: 'Montserrat'">{{ pkg.installed['dependency-info'][dep.key].title }}</h2>
|
||||||
<p>{{ pkg.manifest.dependencies[dep.key].version | displayEmver }}</p>
|
<p>{{ pkg.manifest.dependencies[dep.key].version | displayEmver }}</p>
|
||||||
<p><ion-text [color]="pkg.installed.status['dependency-errors'][dep.key] ? 'warning' : 'success'">{{ pkg.installed.status['dependency-errors'][dep.key] ? pkg.installed.status['dependency-errors'][dep.key].type : 'satisfied' }}</ion-text></p>
|
<p><ion-text [color]="pkg.installed.status['dependency-errors'][dep.key] ? 'warning' : 'success'">{{ pkg.installed.status['dependency-errors'][dep.key] ? pkg.installed.status['dependency-errors'][dep.key].type : 'satisfied' }}</ion-text></p>
|
||||||
</ion-label>
|
</ion-label>
|
||||||
|
|||||||
@@ -164,6 +164,7 @@ export class AppShowPage {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private async installDep (depId: string): Promise<void> {
|
private async installDep (depId: string): Promise<void> {
|
||||||
|
const title = this.pkg.installed['dependency-info'][depId].title
|
||||||
const version = this.pkg.manifest.dependencies[depId].version
|
const version = this.pkg.manifest.dependencies[depId].version
|
||||||
const dependentTitle = this.pkg.manifest.title
|
const dependentTitle = this.pkg.manifest.title
|
||||||
|
|
||||||
@@ -172,7 +173,7 @@ export class AppShowPage {
|
|||||||
dependentTitle,
|
dependentTitle,
|
||||||
dependentIcon: this.pkg['static-files'].icon,
|
dependentIcon: this.pkg['static-files'].icon,
|
||||||
version,
|
version,
|
||||||
description: `${dependentTitle} requires an install of ${(this.pkg.installed.status['dependency-errors'][depId] as DependencyErrorNotInstalled)?.title} satisfying ${version}.`,
|
description: `${dependentTitle} requires an install of ${title} satisfying ${version}.`,
|
||||||
}
|
}
|
||||||
const navigationExtras: NavigationExtras = {
|
const navigationExtras: NavigationExtras = {
|
||||||
state: { installRec },
|
state: { installRec },
|
||||||
|
|||||||
@@ -619,6 +619,16 @@ export module Mock {
|
|||||||
'health-checks': [],
|
'health-checks': [],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
'dependency-info': {
|
||||||
|
'lnd': {
|
||||||
|
title: Mock.MockManifestLnd.title,
|
||||||
|
icon: 'assets/img/service-icons/lnd.png',
|
||||||
|
},
|
||||||
|
'bitcoind': {
|
||||||
|
title: Mock.MockManifestBitcoind.title,
|
||||||
|
icon: 'assets/img/service-icons/bitcoind.png',
|
||||||
|
},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
'install-progress': undefined,
|
'install-progress': undefined,
|
||||||
}
|
}
|
||||||
@@ -1451,8 +1461,6 @@ export module Mock {
|
|||||||
'dependency-errors': {
|
'dependency-errors': {
|
||||||
'bitcoin-proxy': {
|
'bitcoin-proxy': {
|
||||||
type: DependencyErrorType.NotInstalled,
|
type: DependencyErrorType.NotInstalled,
|
||||||
title: Mock.MockManifestBitcoinProxy.title,
|
|
||||||
icon: 'assets/img/service-icons/bitcoin-proxy.png',
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -1479,6 +1487,16 @@ export module Mock {
|
|||||||
'health-checks': [],
|
'health-checks': [],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
'dependency-info': {
|
||||||
|
'bitcoind': {
|
||||||
|
title: Mock.MockManifestBitcoind.title,
|
||||||
|
icon: 'assets/img/service-icons/bitcoind.png',
|
||||||
|
},
|
||||||
|
'bitcoin-proxy': {
|
||||||
|
title: Mock.MockManifestBitcoinProxy.title,
|
||||||
|
icon: 'assets/img/service-icons/bitcoin-proxy.png',
|
||||||
|
},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
'install-progress': undefined,
|
'install-progress': undefined,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -72,6 +72,12 @@ export interface InstalledPackageDataEntry {
|
|||||||
'system-pointers': any[]
|
'system-pointers': any[]
|
||||||
'current-dependents': { [id: string]: CurrentDependencyInfo }
|
'current-dependents': { [id: string]: CurrentDependencyInfo }
|
||||||
'current-dependencies': { [id: string]: CurrentDependencyInfo }
|
'current-dependencies': { [id: string]: CurrentDependencyInfo }
|
||||||
|
'dependency-info': {
|
||||||
|
[id: string]: {
|
||||||
|
title: string
|
||||||
|
icon: URL
|
||||||
|
}
|
||||||
|
}
|
||||||
'interface-addresses': {
|
'interface-addresses': {
|
||||||
[id: string]: { 'tor-address': string, 'lan-address': string }
|
[id: string]: { 'tor-address': string, 'lan-address': string }
|
||||||
}
|
}
|
||||||
@@ -80,8 +86,6 @@ export interface InstalledPackageDataEntry {
|
|||||||
export interface CurrentDependencyInfo {
|
export interface CurrentDependencyInfo {
|
||||||
pointers: any[]
|
pointers: any[]
|
||||||
'health-checks': string[] // array of health check IDs
|
'health-checks': string[] // array of health check IDs
|
||||||
title: string
|
|
||||||
icon: URL
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export enum PackageState {
|
export enum PackageState {
|
||||||
|
|||||||
Reference in New Issue
Block a user