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

implement base ui for LAN services

Browse Source
This commit is contained in:
Matt Hill
2021-01-27 22:11:52 -07:00
committed by Aiden McClelland
parent 0d7b087665
commit 50a2be243a
4 changed files with 39 additions and 13 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

@@ -26,7 +26,7 @@
<ion-card class="installed-card" [class.installed-card-on]="vars.status === 'RUNNING'" style="position:relative" [routerLink]="['/services', 'installed', app.id]">
<div class="launch-container" *ngIf="vars.ui && !isConsulate">
<div class="launch-button-triangle" (click)="launchUiTab(vars.tor, $event)" [class.disabled]="vars.status !== AppStatus.RUNNING || !isTor">
<div class="launch-button-triangle" (click)="launchUiTab(vars.tor, app.id, $event)" [class.disabled]="vars.status !== AppStatus.RUNNING || !isTor">
<ion-icon class="launch-button-triangle-icon" name="globe-outline"></ion-icon>
</div>
</div>

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

@@ -99,11 +99,17 @@ export class AppInstalledListPage extends Cleanup {
}
async launchUiTab (address: string, event: Event) {
async launchUiTab (torAddress: string, id: string, event: Event) {
event.preventDefault()
event.stopPropagation()
address = address.startsWith('http') ? address : `http://${address}`
return window.open(address, '_blank')
let uiAddress: string
if (this.isTor) {
uiAddress = torAddress.startsWith('http') ? torAddress : `http://${torAddress}`
} else {
uiAddress = `https://${id}.${this.serverModel.peek().serverId}.local`
}
return window.open(uiAddress, '_blank')
}
async doRefresh (event: any) {

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

@@ -93,14 +93,24 @@
<ng-container *ngIf="app && app.id && vars.status !== 'INSTALLING'">
<ion-item-group class="ion-padding-bottom">
<ion-item-divider>Tor Address</ion-item-divider>
<ion-item lines="none">
<ion-label style="display: flex; justify-content: space-between; align-items: center;" class="ion-text-wrap">
<p style="color: var(--ion-color-dark)">{{ vars.torAddress }}</p>
<ion-button slot="end" fill="clear" (click)="copyTor()">
<ion-icon slot="icon-only" name="copy-outline" color="primary"></ion-icon>
</ion-button>
<ion-item-divider>Addresses</ion-item-divider>
<ion-item>
<ion-label class="ion-text-wrap">
<h2>Tor Address</h2>
<p>{{ vars.torAddress }}</p>
</ion-label>
<ion-button slot="end" fill="clear" (click)="copyTor()">
<ion-icon slot="icon-only" name="copy-outline" color="primary"></ion-icon>
</ion-button>
</ion-item>
<ion-item lines="none">
<ion-label class="ion-text-wrap">
<h2>LAN Address</h2>
<p>{{ lanAddress }}</p>
</ion-label>
<ion-button slot="end" fill="clear" (click)="copyTor()">
<ion-icon slot="icon-only" name="copy-outline" color="primary"></ion-icon>
</ion-button>
</ion-item>
<ion-item-divider>Backups</ion-item-divider>

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

@@ -19,6 +19,7 @@ import { InformationPopoverComponent } from 'src/app/components/information-popo
import { Emver } from 'src/app/services/emver.service'
import { displayEmver } from 'src/app/pipes/emver.pipe'
import { ConfigService } from 'src/app/services/config.service'
import { ServerModel } from 'src/app/models/server-model'
@Component({
selector: 'app-installed-show',
@@ -31,6 +32,7 @@ export class AppInstalledShowPage extends Cleanup {
$error$ = new BehaviorSubject<string>('')
app: PropertySubject<AppInstalledFull> = { } as any
lanAddress = ''
appId: string
AppStatus = AppStatus
showInstructions = false
@@ -57,6 +59,7 @@ export class AppInstalledShowPage extends Cleanup {
private readonly appModel: AppModel,
private readonly popoverController: PopoverController,
private readonly emver: Emver,
private readonly serverModel: ServerModel,
config: ConfigService,
) {
super()
@@ -66,6 +69,8 @@ export class AppInstalledShowPage extends Cleanup {
async ngOnInit () {
this.appId = this.route.snapshot.paramMap.get('appId') as string
const server = this.serverModel.peek()
this.lanAddress = `https://${this.appId}.${server.serverId}.local`
this.cleanup(
markAsLoadingDuring$(this.$loading$, this.preload.appFull(this.appId))
@@ -103,8 +108,13 @@ export class AppInstalledShowPage extends Cleanup {
}
async launchUiTab () {
let uiAddress = this.app.torAddress.getValue()
uiAddress = uiAddress.startsWith('http') ? uiAddress : `http://${uiAddress}`
let uiAddress: string
if (this.isTor) {
const torAddress = this.app.torAddress.getValue()
uiAddress = torAddress.startsWith('http') ? torAddress : `http://${torAddress}`
} else {
uiAddress = this.lanAddress
}
return window.open(uiAddress, '_blank')
}