react to enter key for alerts and modals. Styling and logic

ui/src/app/services/connection.service.ts

@@ -4,7 +4,6 @@ import { PatchConnection, PatchDbService } from './patch-db/patch-db.service'
 import { HttpService, Method } from './http.service'
 import { distinctUntilChanged } from 'rxjs/operators'
 import { ConfigService } from './config.service'
-import { pauseFor } from '../util/misc.util'
 
 @Injectable({
   providedIn: 'root',

ui/src/app/services/server-config.service.ts

@@ -1,12 +1,9 @@
 import { Injectable } from '@angular/core'
 import { AlertInput, AlertButton } from '@ionic/core'
 import { ApiService } from './api/embassy-api.service'
-import { ConfigSpec, ValueSpecString } from '../pkg-config/config-types'
-import { SSHService } from '../pages/server-routes/security-routes/ssh-keys/ssh.service'
+import { ConfigSpec } from '../pkg-config/config-types'
 import { AlertController, LoadingController } from '@ionic/angular'
 import { ErrorToastService } from './error-toast.service'
-import { ModalController } from '@ionic/angular'
-import { BackupConfirmationComponent } from '../modals/backup-confirmation/backup-confirmation.component'
 
 @Injectable({
   providedIn: 'root',
@@ -14,12 +11,10 @@ import { BackupConfirmationComponent } from '../modals/backup-confirmation/backu
 export class ServerConfigService {
 
   constructor (
-    private readonly modalCtrl: ModalController,
     private readonly loadingCtrl: LoadingController,
     private readonly errToast: ErrorToastService,
     private readonly alertCtrl: AlertController,
     private readonly embassyApi: ApiService,
-    private readonly sshService: SSHService,
   ) { }
 
   async presentAlert (key: string, current?: any): Promise<void> {
@@ -49,6 +44,7 @@ export class ServerConfigService {
             loader.dismiss()
           }
         },
+        cssClass: 'enter-click',
       },
     ]
 
@@ -84,24 +80,6 @@ export class ServerConfigService {
     await alert.present()
   }
 
-  async presentModalInput (key: string, current?: string) {
-    const { name, description, masked } = serverConfig[key] as ValueSpecString
-
-    const modal = await this.modalCtrl.create({
-      component: BackupConfirmationComponent,
-      componentProps: {
-        title: name,
-        message: description,
-        label: name,
-        useMask: masked,
-        value: current,
-        submitFn: this.saveFns[key],
-      },
-      cssClass: 'alertlike-modal',
-    })
-    await modal.present()
-  }
-
   // async presentModalForm (key: string) {
   //   const modal = await this.modalCtrl.create({
   //     component: AppActionInputPage,
@@ -123,9 +101,6 @@ export class ServerConfigService {
     'auto-check-updates': async (enabled: boolean) => {
       return this.embassyApi.setDbValue({ pointer: '/auto-check-updates', value: enabled })
     },
-    ssh: async (pubkey: string) => {
-      return this.sshService.add(pubkey)
-    },
     // 'eos-marketplace': async () => {
     //   return this.embassyApi.setEosMarketplace()
     // },
@@ -148,17 +123,6 @@ export const serverConfig: ConfigSpec = {
     description: 'On launch, EmbassyOS will automatically check for updates of itself and your installed services. Updating still requires user approval and action. No updates will ever be performed automatically.',
     default: true,
   },
-  ssh: {
-    type: 'string',
-    name: 'SSH Key',
-    description: 'Enter the SSH public key of you would like to authorize for root access to your Embassy.',
-    nullable: false,
-    // @TODO regex for SSH Key
-    // pattern: '',
-    'pattern-description': 'Must be a valid SSH key',
-    masked: false,
-    copyable: false,
-  },
   // 'eos-marketplace': {
   //   type: 'boolean',
   //   name: 'Tor Only Marketplace',

ui/src/app/services/startup-alerts.service.ts

@@ -155,7 +155,6 @@ export class StartupAlertsService {
   private async displayAppsCheck (): Promise<boolean> {
     return new Promise(async resolve => {
       const alert = await this.alertCtrl.create({
-        backdropDismiss: true,
         header: 'Updates Available!',
         message: new IonicSafeString(
           `<div style="display: flex; flex-direction: column; justify-content: space-around; min-height: 100px">
@@ -173,8 +172,9 @@ export class StartupAlertsService {
           {
             text: 'View in Marketplace',
             handler: () => {
-              return this.navCtrl.navigateForward('/marketplace').then(() => resolve(false))
+              this.navCtrl.navigateForward('/marketplace').then(() => resolve(false))
             },
+            cssClass: 'enter-click',
           },
         ],
       })
@@ -186,7 +186,6 @@ export class StartupAlertsService {
   private async presentAlertNewOS (versionLatest: string): Promise<{ cancel?: true, update?: true }> {
     return new Promise(async resolve => {
       const alert = await this.alertCtrl.create({
-        backdropDismiss: true,
         header: 'New EmbassyOS Version!',
         message: new IonicSafeString(
           `<div style="display: flex; flex-direction: column; justify-content: space-around; min-height: 100px">
@@ -204,6 +203,7 @@ export class StartupAlertsService {
           {
             text: 'Update',
             handler: () => resolve({ update: true }),
+            cssClass: 'enter-click',
           },
         ],
       })