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

ui up to date w old master

Browse Source
This commit is contained in:
Aaron Greenspan
2020-11-23 16:51:42 -07:00
parent 20a8b991b5
commit c9d86ba94b
10 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ui/src/app/pages/apps-routes/app-config/app-config.page.ts
View File

@@ -1,10 +1,10 @@
import { Component } from '@angular/core'
import { NavController, AlertController, ModalController, PopoverController } from '@ionic/angular'
import { ActivatedRoute } from '@angular/router'
import { AppStatus } from 'src/app/models/app-model'
import { AppModel, AppStatus } from 'src/app/models/app-model'
import { AppInstalledFull } from 'src/app/models/app-types'
import { ApiService } from 'src/app/services/api/api.service'
import { pauseFor, isEmptyObject } from 'src/app/util/misc.util'
import { pauseFor, isEmptyObject, modulateTime } from 'src/app/util/misc.util'
import { PropertySubject, peekProperties } from 'src/app/util/property-subject.util'
import { LoaderService, markAsLoadingDuring$ } from 'src/app/services/loader.service'
import { TrackingModalController } from 'src/app/services/tracking-modal-controller.service'
@@ -60,6 +60,7 @@ export class AppConfigPage extends Cleanup {
private readonly modalController: ModalController,
private readonly trackingModalCtrl: TrackingModalController,
private readonly popoverController: PopoverController,
private readonly appModel: AppModel,
) { super() }
backButtonDefense = false
@@ -182,6 +183,7 @@ export class AppConfigPage extends Cleanup {
async save () {
const app = peekProperties(this.app)
const ogAppStatus = app.status
return this.loader.of({
message: `Saving config...`,
@@ -208,6 +210,9 @@ export class AppConfigPage extends Cleanup {
})
.then(({ skip }) => {
if (skip) return
if (ogAppStatus === AppStatus.RUNNING) {
this.appModel.update({ id: this.appId, status: AppStatus.RESTARTING }, modulateTime(new Date(), 3, 'seconds'))
}
this.navCtrl.back()
})
.catch(e => this.error = { text: e.message })

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

@@ -81,8 +81,8 @@
<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;">
<p style="color: var(--ion-color-dark)">{{ vars.torAddress | truncateCenter:18:18:true }}</p>
<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>

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

@@ -17,6 +17,7 @@ import { catchError, concatMap, filter, switchMap, tap } from 'rxjs/operators'
import { Cleanup } from 'src/app/util/cleanup'
import { InformationPopoverComponent } from 'src/app/components/information-popover/information-popover.component'
import { Emver } from 'src/app/services/emver.service'
import { displayEmver } from 'src/app/pipes/emver.pipe'
@Component({
selector: 'app-installed-show',
@@ -115,7 +116,7 @@ export class AppInstalledShowPage extends Cleanup {
const alert = await this.alertCtrl.create({
backdropDismiss: false,
header: 'Update Available',
message: `New version ${versionLatest} found for ${app.title}.`,
message: `New version ${displayEmver(versionLatest)} found for ${app.title}.`,
buttons: [
{
text: 'Cancel',