rework modals and more

ui/src/app/pages/server-routes/developer-routes/dev-options/dev-options.page.ts

@@ -1,7 +1,7 @@
 import { Component } from '@angular/core'
 import { ServerConfigService } from 'src/app/services/server-config.service'
-import { PatchDbModel } from 'src/app/models/patch-db/patch-db-model'
-import { ServerInfo } from 'src/app/models/patch-db/data-model'
+import { PatchDbModel } from 'src/app/services/patch-db/patch-db.service'
+import { ServerInfo } from 'src/app/services/patch-db/data-model'
 import { Subscription } from 'rxjs'
 
 @Component({

ui/src/app/pages/server-routes/lan/lan.page.ts

@@ -4,7 +4,7 @@ import { copyToClipboard } from 'src/app/util/web.util'
 import { ConfigService } from 'src/app/services/config.service'
 import { LoaderService } from 'src/app/services/loader.service'
 import { ApiService } from 'src/app/services/api/api.service'
-import { PatchDbModel } from 'src/app/models/patch-db/patch-db-model'
+import { PatchDbModel } from 'src/app/services/patch-db/patch-db.service'
 import { Subscription } from 'rxjs'
 
 @Component({

ui/src/app/pages/server-routes/preferences/preferences.page.html

@@ -10,10 +10,6 @@
 <ion-content class="ion-padding-top">
 
   <ion-item-group>
-    <ion-item button (click)="presentModalValueEdit('name', ui['server-name'])">
-      <ion-label>Embassy Name</ion-label>
-      <ion-note slot="end">{{ ui['server-name'] }}</ion-note>
-    </ion-item>
     <ion-item button (click)="presentModalValueEdit('autoCheckUpdates', ui['auto-check-updates'])">
       <ion-label>Auto Check for Updates</ion-label>
       <ion-note slot="end">{{ ui['auto-check-updates'] }}</ion-note>

ui/src/app/pages/server-routes/preferences/preferences.page.ts

@@ -1,8 +1,8 @@
 import { Component } from '@angular/core'
 import { ServerConfigService } from 'src/app/services/server-config.service'
-import { PatchDbModel } from 'src/app/models/patch-db/patch-db-model'
+import { PatchDbModel } from 'src/app/services/patch-db/patch-db.service'
 import { Subscription } from 'rxjs'
-import { UIData } from 'src/app/models/patch-db/data-model'
+import { UIData } from 'src/app/services/patch-db/data-model'
 
 @Component({
   selector: 'preferences',

ui/src/app/pages/server-routes/server-backup/server-backup.page.html

@@ -52,7 +52,7 @@
             </ion-card-header>
             <ion-card-content>
               <ion-item-group>
-                <ion-item button *ngFor="let partition of disk.value.partitions | keyvalue" [disabled]="partition.value['is-mounted']" (click)="presentModal(partition.key, partition.value)">
+                <ion-item button *ngFor="let partition of disk.value.partitions | keyvalue" [disabled]="partition.value['is-mounted']" (click)="presentModal(partition.key)">
                   <ion-icon slot="start" name="save-outline"></ion-icon>
                   <ion-label>
                     <h2>{{ partition.value.label || partition.key }} ({{ partition.value.size || 'unknown size' }})</h2>

ui/src/app/pages/server-routes/server-backup/server-backup.page.ts

@@ -2,7 +2,7 @@ import { Component } from '@angular/core'
 import { LoadingController, ModalController } from '@ionic/angular'
 import { ApiService } from 'src/app/services/api/api.service'
 import { BackupConfirmationComponent } from 'src/app/modals/backup-confirmation/backup-confirmation.component'
-import { DiskInfo, PartitionInfoEntry } from 'src/app/services/api/api-types'
+import { DiskInfo } from 'src/app/services/api/api-types'
 
 @Component({
   selector: 'server-backup',
@@ -42,10 +42,10 @@ export class ServerBackupPage {
     }
   }
 
-  async presentModal (logicalname: string, partition: PartitionInfoEntry): Promise<void> {
+  async presentModal (logicalname: string): Promise<void> {
     const m = await this.modalCtrl.create({
       componentProps: {
-        name: partition.label || logicalname,
+        type: 'backup',
       },
       cssClass: 'alertlike-modal',
       component: BackupConfirmationComponent,

ui/src/app/pages/server-routes/server-routing.module.ts

@@ -26,6 +26,10 @@ const routes: Routes = [
     path: 'preferences',
     loadChildren: () => import('./preferences/preferences.module').then(m => m.PreferencesPageModule),
   },
+  {
+    path: 'preferences/edit',
+    loadChildren: () => import('./preferences/preferences.module').then(m => m.PreferencesPageModule),
+  },
   {
     path: 'wifi',
     loadChildren: () => import('./wifi/wifi.module').then(m => m.WifiListPageModule),

ui/src/app/pages/server-routes/server-show/server-show.page.html

@@ -1,6 +1,6 @@
 <ion-header>
   <ion-toolbar>
-    <ion-title>{{ patch.watch$('ui', 'server-name') | async }}</ion-title>
+    <ion-title>Embassy</ion-title>
     <ion-buttons slot="end">
       <badge-menu-button></badge-menu-button>
     </ion-buttons>

ui/src/app/pages/server-routes/server-show/server-show.page.ts

@@ -3,8 +3,6 @@ import { LoadingOptions } from '@ionic/core'
 import { AlertController, NavController } from '@ionic/angular'
 import { ApiService } from 'src/app/services/api/api.service'
 import { LoaderService } from 'src/app/services/loader.service'
-import { PatchDbModel } from 'src/app/models/patch-db/patch-db-model'
-import { ServerStatus } from 'src/app/models/patch-db/data-model'
 import { ActivatedRoute } from '@angular/router'
 
 @Component({
@@ -13,7 +11,6 @@ import { ActivatedRoute } from '@angular/router'
   styleUrls: ['server-show.page.scss'],
 })
 export class ServerShowPage {
-  ServerStatus = ServerStatus
   settings: ServerSettings = { }
 
   constructor (
@@ -22,7 +19,6 @@ export class ServerShowPage {
     private readonly apiService: ApiService,
     private readonly navCtrl: NavController,
     private readonly route: ActivatedRoute,
-    public readonly patch: PatchDbModel,
   ) { }
 
   ngOnInit () {
@@ -77,7 +73,6 @@ export class ServerShowPage {
     this.loader
       .of(LoadingSpinner(`Restarting...`))
       .displayDuringAsync( async () => {
-        // this.serverModel.markUnreachable()
         await this.apiService.restartServer({ })
       })
       .catch(console.error)
@@ -87,7 +82,6 @@ export class ServerShowPage {
     this.loader
       .of(LoadingSpinner(`Shutting down...`))
       .displayDuringAsync( async () => {
-        // this.serverModel.markUnreachable()
         await this.apiService.shutdownServer({ })
       })
       .catch(console.error)

ui/src/app/pages/server-routes/server-specs/server-specs.page.html

@@ -7,7 +7,7 @@
   </ion-toolbar>
 </ion-header>
 
-<ion-content class="ion-padding-top">
+<ion-content>
 
   <ion-item-divider>Basic</ion-item-divider>
 

ui/src/app/pages/server-routes/server-specs/server-specs.page.ts

@@ -1,8 +1,8 @@
 import { Component } from '@angular/core'
 import { ToastController } from '@ionic/angular'
 import { copyToClipboard } from 'src/app/util/web.util'
-import { PatchDbModel } from 'src/app/models/patch-db/patch-db-model'
-import { ServerInfo } from 'src/app/models/patch-db/data-model'
+import { PatchDbModel } from 'src/app/services/patch-db/patch-db.service'
+import { ServerInfo } from 'src/app/services/patch-db/data-model'
 import { Subscription } from 'rxjs'
 
 @Component({

ui/src/app/pages/server-routes/wifi/wifi.page.html

@@ -29,7 +29,7 @@
     <ng-container *ngIf="wifi">
       <ion-item button detail="false" *ngFor="let ssid of wifi.ssids" (click)="presentAction(ssid, wifi)">
         <ion-label>{{ ssid }}</ion-label>
-        <ion-icon *ngIf="ssid === wifi.connected" name="wifi" color="success"></ion-icon>
+        <ion-note slot="end" *ngIf="ssid === wifi.connected"><ion-text color="success">Connected</ion-text></ion-note>
       </ion-item>
     </ng-container>
   </ion-item-group>

ui/src/app/pages/server-routes/wifi/wifi.page.ts

@@ -4,8 +4,8 @@ import { ApiService } from 'src/app/services/api/api.service'
 import { ActionSheetButton } from '@ionic/core'
 import { WifiService } from './wifi.service'
 import { LoaderService } from 'src/app/services/loader.service'
-import { WiFiInfo } from 'src/app/models/patch-db/data-model'
-import { PatchDbModel } from 'src/app/models/patch-db/patch-db-model'
+import { WiFiInfo } from 'src/app/services/patch-db/data-model'
+import { PatchDbModel } from 'src/app/services/patch-db/patch-db.service'
 import { Subscription } from 'rxjs'
 
 @Component({

ui/src/app/pages/server-routes/wifi/wifi.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'
 import { AlertController, ToastController } from '@ionic/angular'
 import { merge, Observable, timer } from 'rxjs'
 import { filter, map, take, tap } from 'rxjs/operators'
-import { PatchDbModel } from 'src/app/models/patch-db/patch-db-model'
+import { PatchDbModel } from 'src/app/services/patch-db/patch-db.service'
 
 @Injectable({
   providedIn: 'root',