diff --git a/ui/src/app/app.component.html b/ui/src/app/app.component.html index 0b004f744..7239ec045 100644 --- a/ui/src/app/app.component.html +++ b/ui/src/app/app.component.html @@ -132,8 +132,6 @@ - - diff --git a/ui/src/app/app.module.ts b/ui/src/app/app.module.ts index 8d47f2f20..cd53f9547 100644 --- a/ui/src/app/app.module.ts +++ b/ui/src/app/app.module.ts @@ -1,4 +1,4 @@ -import { NgModule, CUSTOM_ELEMENTS_SCHEMA, Type } from '@angular/core' +import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core' import { BrowserModule } from '@angular/platform-browser' import { RouteReuseStrategy } from '@angular/router' import { IonicModule, IonicRouteStrategy } from '@ionic/angular' diff --git a/ui/src/app/modals/app-config-list/app-config-list.page.html b/ui/src/app/modals/app-config-list/app-config-list.page.html index 02c1d67b8..2d1270b25 100644 --- a/ui/src/app/modals/app-config-list/app-config-list.page.html +++ b/ui/src/app/modals/app-config-list/app-config-list.page.html @@ -46,21 +46,18 @@
- - - - - - + + + + + - {{ valueString[i] }} - - - - - - - + {{ valueString[i] }} + + + + +
diff --git a/ui/src/app/modals/app-config-list/app-config-list.page.ts b/ui/src/app/modals/app-config-list/app-config-list.page.ts index 7074e6ca1..1d73541de 100644 --- a/ui/src/app/modals/app-config-list/app-config-list.page.ts +++ b/ui/src/app/modals/app-config-list/app-config-list.page.ts @@ -104,7 +104,9 @@ export class AppConfigListPage extends ModalPresentable { return this.presentModal(nextCursor, () => this.updateCaches()) } - async presentAlertDeleteEntry (key: number) { + async presentAlertDelete (key: number, e: Event) { + e.stopPropagation() + const alert = await this.alertCtrl.create({ backdropDismiss: false, header: 'Caution', diff --git a/ui/src/app/pages/notifications/notifications.page.html b/ui/src/app/pages/notifications/notifications.page.html index 3952950bd..e4db38192 100644 --- a/ui/src/app/pages/notifications/notifications.page.html +++ b/ui/src/app/pages/notifications/notifications.page.html @@ -33,28 +33,24 @@ - - - - - - - - -

- {{ not.title }} -

-

{{ not.message }}

-

{{ not.createdAt | date: 'short' }}

-

- {{ not.appId }} - - - Code: {{ not.code }} -

-
-
-
+ + +

+ {{ not.title }} +

+

{{ not.message }}

+

{{ not.createdAt | date: 'short' }}

+

+ {{ not.appId }} + - + Code: {{ not.code }} +

+
+ + + +
diff --git a/ui/src/app/pages/server-routes/developer-routes/dev-ssh-keys/dev-ssh-keys.page.html b/ui/src/app/pages/server-routes/developer-routes/dev-ssh-keys/dev-ssh-keys.page.html index 9a8975c7f..608230d20 100644 --- a/ui/src/app/pages/server-routes/developer-routes/dev-ssh-keys/dev-ssh-keys.page.html +++ b/ui/src/app/pages/server-routes/developer-routes/dev-ssh-keys/dev-ssh-keys.page.html @@ -29,17 +29,14 @@ Saved Keys - - - - - - - - {{ fingerprint.alg }} {{ fingerprint.hash }} {{ fingerprint.hostname }} - - - + + + {{ fingerprint.alg }} {{ fingerprint.hash }} {{ fingerprint.hostname }} + + + + + diff --git a/ui/src/app/pages/server-routes/developer-routes/dev-ssh-keys/dev-ssh-keys.page.ts b/ui/src/app/pages/server-routes/developer-routes/dev-ssh-keys/dev-ssh-keys.page.ts index 9c75484be..68791fff0 100644 --- a/ui/src/app/pages/server-routes/developer-routes/dev-ssh-keys/dev-ssh-keys.page.ts +++ b/ui/src/app/pages/server-routes/developer-routes/dev-ssh-keys/dev-ssh-keys.page.ts @@ -6,6 +6,7 @@ import { PropertySubject } from 'src/app/util/property-subject.util' import { ServerConfigService } from 'src/app/services/server-config.service' import { LoaderService } from 'src/app/services/loader.service' import { ModelPreload } from 'src/app/models/model-preload' +import { AlertController } from '@ionic/angular' @Component({ selector: 'dev-ssh-keys', @@ -21,6 +22,7 @@ export class DevSSHKeysPage { private readonly loader: LoaderService, private readonly preload: ModelPreload, private readonly serverConfigService: ServerConfigService, + private readonly alertCtrl: AlertController, ) { } ngOnInit () { @@ -41,6 +43,28 @@ export class DevSSHKeysPage { await this.serverConfigService.presentModalValueEdit('ssh', true) } + async presentAlertDelete (fingerprint: SSHFingerprint) { + const alert = await this.alertCtrl.create({ + backdropDismiss: false, + header: 'Caution', + message: `Are you sure you want to delete this SSH key?`, + buttons: [ + { + text: 'Cancel', + role: 'cancel', + }, + { + text: 'Delete', + cssClass: 'alert-danger', + handler: () => { + this.delete(fingerprint) + }, + }, + ], + }) + await alert.present() + } + async delete (fingerprint: SSHFingerprint) { this.loader.of({ message: 'Deleting...',