Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-26 02:11:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui: adds logs, disables .local tabs

Browse Source
This commit is contained in:
Aaron Greenspan
2021-01-12 12:24:12 -07:00
committed by Aiden McClelland
parent b80634df83
commit 1b1fd40e08
4 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ui/src/app/pages/apps-routes/app-installed-list/app-installed-list.page.html
View File

@@ -24,7 +24,7 @@
<ion-col *ngFor="let app of apps" sizeXs="4" sizeSm="3" sizeMd="2" sizeLg="2">
<ng-container *ngIf="{ tor: app.subject.torAddress | async, status: app.subject.status | async, ui: app.subject.ui | async, iconURL: app.subject.iconURL | async | iconParse, title: app.subject.title | async } as vars" >
<ion-button
*ngIf="vars.ui && !isConsulate"
*ngIf="vars.ui && !isConsulate && isTor"
[disabled]="vars.status !== AppStatus.RUNNING"
[class.launch-button-off]="vars.status !== AppStatus.RUNNING"
class="launch-button-transparent"

3
ui/src/app/pages/apps-routes/app-installed-list/app-installed-list.page.ts
View File

@@ -36,6 +36,7 @@ export class AppInstalledListPage extends Cleanup {
showCertDownload : boolean
isConsulate: boolean
isTor: boolean
constructor (
private readonly serverModel: ServerModel,
@@ -46,6 +47,7 @@ export class AppInstalledListPage extends Cleanup {
) {
super()
this.isConsulate = config.isConsulateAndroid || config.isConsulateIos
this.isTor = config.isTor()
}
ngOnDestroy () {
@@ -98,6 +100,7 @@ export class AppInstalledListPage extends Cleanup {
}
async launchUiTab (address: string) {
console.log('launching', address)
return window.open(address, '_blank')
}

2
ui/src/app/pages/apps-routes/app-installed-show/app-installed-show.page.html
View File

@@ -77,7 +77,7 @@
</ion-label>
</ion-item>
<ion-item class="no-cushion-item" *ngIf="vars.ui && !isConsulate" lines="none">
<ion-item class="no-cushion-item" *ngIf="vars.ui && !isConsulate && isTor" lines="none">
<ion-label style="margin-bottom: 10px; margin-top: 0px; display: flex; justify-content: left; align-items: center;" class="ion-text-wrap">
<ion-button fill="clear" size="small" class="launch-explanation-button" (click)="presentPopover(vars.status === 'RUNNING' ? launchDefinition() : launchOffDefinition(), $event)">
<ion-icon color="medium" name="information-circle-outline">

3
ui/src/app/pages/apps-routes/app-installed-show/app-installed-show.page.ts
View File

@@ -35,6 +35,7 @@ export class AppInstalledShowPage extends Cleanup {
AppStatus = AppStatus
showInstructions = false
isConsulate: boolean
isTor: boolean
dependencyDefintion = () => `<span style="font-style: italic">Dependencies</span> are other services which must be installed, configured appropriately, and started in order to start ${this.app.title.getValue()}`
launchDefinition = () => `<span style="font-style: italic">Launch A Service</span> <p>This button appears only for services that can be accessed inside the browser. If a service does not have this button, you must access it using another interface, such as a mobile app, desktop app, or another service on the Embassy. Please view the instructions for a service for details on how to use it.</p>`
@@ -59,6 +60,7 @@ export class AppInstalledShowPage extends Cleanup {
) {
super()
this.isConsulate = config.isConsulateIos || config.isConsulateAndroid
this.isTor = config.isTor()
}
async ngOnInit () {
@@ -101,6 +103,7 @@ export class AppInstalledShowPage extends Cleanup {
async launchUiTab () {
const uiAddress = this.app.torAddress.getValue()
console.log('launching', uiAddress)
return window.open(uiAddress, '_blank')
}