Version {{ version }} is something new.
-This release also enables displaying Service license information and contains utilities to facilitate the next major release of EmbassyOS.
+New features and more new features!
+ Select the drive containing the backup you would like to restore.
+
+
+
+ Warning! All current data for {{ patch.data['package-data'][pkgId].manifest.title }} will be overwritten by the backup.
+
+
+
- Select the drive containing the backup you would like to restore.
-
-
-
- Warning! All current data for {{ patch.data['package-data'][pkgId].manifest.title }} will be overwritten by the backup.
-
-
+
- {{ disk.key }} - {{ disk.value.size }}
-
+ {
try {
this.disks = await this.embassyApi.getDisks({ })
- this.allPartitionsMounted = Object.values(this.disks).every(d => Object.values(d.partitions).every(p => p['is-mounted']))
} catch (e) {
this.errToast.present(e)
} finally {
@@ -59,7 +58,7 @@ export class AppRestoreComponent {
},
cssClass: 'alertlike-modal',
presentingElement: await this.modalCtrl.getTop(),
- component: BackupConfirmationComponent,
+ component: GenericInputComponent,
})
modal.onWillDismiss().then(res => {
diff --git a/ui/src/app/modals/backup-confirmation/backup-confirmation.component.html b/ui/src/app/modals/generic-input/generic-input.component.html
similarity index 100%
rename from ui/src/app/modals/backup-confirmation/backup-confirmation.component.html
rename to ui/src/app/modals/generic-input/generic-input.component.html
diff --git a/ui/src/app/modals/backup-confirmation/backup-confirmation.component.module.ts b/ui/src/app/modals/generic-input/generic-input.component.module.ts
similarity index 66%
rename from ui/src/app/modals/backup-confirmation/backup-confirmation.component.module.ts
rename to ui/src/app/modals/generic-input/generic-input.component.module.ts
index e0a86d0a3..4f4d73e69 100644
--- a/ui/src/app/modals/backup-confirmation/backup-confirmation.component.module.ts
+++ b/ui/src/app/modals/generic-input/generic-input.component.module.ts
@@ -1,20 +1,20 @@
import { NgModule } from '@angular/core'
import { CommonModule } from '@angular/common'
-import { BackupConfirmationComponent } from './backup-confirmation.component'
+import { GenericInputComponent } from './generic-input.component'
import { IonicModule } from '@ionic/angular'
import { RouterModule } from '@angular/router'
import { SharingModule } from 'src/app/modules/sharing.module'
import { FormsModule } from '@angular/forms'
@NgModule({
- declarations: [BackupConfirmationComponent],
+ declarations: [GenericInputComponent],
imports: [
CommonModule,
IonicModule,
+ FormsModule,
RouterModule.forChild([]),
SharingModule,
- FormsModule,
],
- exports: [BackupConfirmationComponent],
+ exports: [GenericInputComponent],
})
-export class BackupConfirmationComponentModule { }
+export class GenericInputComponentModule { }
diff --git a/ui/src/app/modals/backup-confirmation/backup-confirmation.component.scss b/ui/src/app/modals/generic-input/generic-input.component.scss
similarity index 100%
rename from ui/src/app/modals/backup-confirmation/backup-confirmation.component.scss
rename to ui/src/app/modals/generic-input/generic-input.component.scss
diff --git a/ui/src/app/modals/backup-confirmation/backup-confirmation.component.ts b/ui/src/app/modals/generic-input/generic-input.component.ts
similarity index 85%
rename from ui/src/app/modals/backup-confirmation/backup-confirmation.component.ts
rename to ui/src/app/modals/generic-input/generic-input.component.ts
index 56edf0e6f..619a19ea5 100644
--- a/ui/src/app/modals/backup-confirmation/backup-confirmation.component.ts
+++ b/ui/src/app/modals/generic-input/generic-input.component.ts
@@ -3,11 +3,11 @@ import { IonicSafeString, LoadingController, ModalController } from '@ionic/angu
import { getErrorMessage } from 'src/app/services/error-toast.service'
@Component({
- selector: 'backup-confirmation',
- templateUrl: './backup-confirmation.component.html',
- styleUrls: ['./backup-confirmation.component.scss'],
+ selector: 'generic-input',
+ templateUrl: './generic-input.component.html',
+ styleUrls: ['./generic-input.component.scss'],
})
-export class BackupConfirmationComponent {
+export class GenericInputComponent {
@Input() title: string
@Input() message: string
@Input() label = 'Enter value'
diff --git a/ui/src/app/modals/os-welcome/os-welcome.page.html b/ui/src/app/modals/os-welcome/os-welcome.page.html
index 03258d548..3bdd31442 100644
--- a/ui/src/app/modals/os-welcome/os-welcome.page.html
+++ b/ui/src/app/modals/os-welcome/os-welcome.page.html
@@ -8,8 +8,7 @@
+ {{ disk.logicalname }} - {{ disk.capacity | convertBytes }}
+
-
-
+
diff --git a/ui/src/app/modals/app-restore/app-restore.component.module.ts b/ui/src/app/modals/app-restore/app-restore.component.module.ts
index 9e6063c15..482cdfeaa 100644
--- a/ui/src/app/modals/app-restore/app-restore.component.module.ts
+++ b/ui/src/app/modals/app-restore/app-restore.component.module.ts
@@ -2,7 +2,6 @@ import { NgModule } from '@angular/core'
import { CommonModule } from '@angular/common'
import { IonicModule } from '@ionic/angular'
import { AppRestoreComponent } from './app-restore.component'
-import { BackupConfirmationComponentModule } from '../backup-confirmation/backup-confirmation.component.module'
import { SharingModule } from '../../modules/sharing.module'
@NgModule({
@@ -10,7 +9,6 @@ import { SharingModule } from '../../modules/sharing.module'
imports: [
CommonModule,
IonicModule,
- BackupConfirmationComponentModule,
SharingModule,
],
exports: [AppRestoreComponent],
diff --git a/ui/src/app/modals/app-restore/app-restore.component.ts b/ui/src/app/modals/app-restore/app-restore.component.ts
index d5fd86b25..765678583 100644
--- a/ui/src/app/modals/app-restore/app-restore.component.ts
+++ b/ui/src/app/modals/app-restore/app-restore.component.ts
@@ -1,7 +1,7 @@
import { Component, Input } from '@angular/core'
import { ModalController } from '@ionic/angular'
import { ApiService } from 'src/app/services/api/embassy-api.service'
-import { BackupConfirmationComponent } from 'src/app/modals/backup-confirmation/backup-confirmation.component'
+import { GenericInputComponent } from 'src/app/modals/generic-input/generic-input.component'
import { DiskInfo } from 'src/app/services/api/api.types'
import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
import { ErrorToastService } from 'src/app/services/error-toast.service'
@@ -13,7 +13,7 @@ import { ErrorToastService } from 'src/app/services/error-toast.service'
})
export class AppRestoreComponent {
@Input() pkgId: string
- disks: DiskInfo
+ disks: DiskInfo[]
loading = true
submitting = false
allPartitionsMounted: boolean
@@ -39,7 +39,6 @@ export class AppRestoreComponent {
async getExternalDisks (): Promise{{ partition.value.label || partition.key }}
-{{ partition.value.size || 'unknown size' }}
-{{ partition.label || partition.logicalname }}
+{{ partition.capacity | convertBytes }}
A Whole New Embassy
-
diff --git a/ui/src/app/modules/sharing.module.ts b/ui/src/app/modules/sharing.module.ts
index 43781fd8e..4bd4b8891 100644
--- a/ui/src/app/modules/sharing.module.ts
+++ b/ui/src/app/modules/sharing.module.ts
@@ -11,6 +11,7 @@ import { NotificationColorPipe } from '../pipes/notification-color.pipe'
import { InstallState } from '../pipes/install-state.pipe'
import { TextSpinnerComponentModule } from '../components/text-spinner/text-spinner.component.module'
import { PwaBackComponentModule } from '../components/pwa-back-button/pwa-back.component.module'
+import { ConvertBytesPipe } from '../pipes/convert-bytes.pipe'
@NgModule({
declarations: [
@@ -28,6 +29,7 @@ import { PwaBackComponentModule } from '../components/pwa-back-button/pwa-back.c
LaunchablePipe,
EmptyPipe,
NotificationColorPipe,
+ ConvertBytesPipe,
],
imports: [
TextSpinnerComponentModule,
@@ -48,6 +50,7 @@ import { PwaBackComponentModule } from '../components/pwa-back-button/pwa-back.c
LaunchablePipe,
EmptyPipe,
NotificationColorPipe,
+ ConvertBytesPipe,
// components
TextSpinnerComponentModule,
PwaBackComponentModule,
diff --git a/ui/src/app/pages/maintenance/maintenance.page.html b/ui/src/app/pages/maintenance/maintenance.page.html
index 4c3ea615a..7725dc539 100644
--- a/ui/src/app/pages/maintenance/maintenance.page.html
+++ b/ui/src/app/pages/maintenance/maintenance.page.html
@@ -1,14 +1,14 @@
-
+
- 
+ 
- 
diff --git a/ui/src/app/pages/maintenance/maintenance.page.scss b/ui/src/app/pages/maintenance/maintenance.page.scss
index b1b6d5480..eeedcc997 100644
--- a/ui/src/app/pages/maintenance/maintenance.page.scss
+++ b/ui/src/app/pages/maintenance/maintenance.page.scss
@@ -1,4 +1,4 @@
img {
- width: 20%;
- border-radius: 0;
+ width: 50%;
+ max-width: 500px;
}
\ No newline at end of file
diff --git a/ui/src/app/pages/server-routes/preferences/preferences.module.ts b/ui/src/app/pages/server-routes/preferences/preferences.module.ts
new file mode 100644
index 000000000..88353ab46
--- /dev/null
+++ b/ui/src/app/pages/server-routes/preferences/preferences.module.ts
@@ -0,0 +1,26 @@
+import { NgModule } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { IonicModule } from '@ionic/angular'
+import { PreferencesPage } from './preferences.page'
+import { Routes, RouterModule } from '@angular/router'
+import { SharingModule } from 'src/app/modules/sharing.module'
+
+const routes: Routes = [
+ {
+ path: '',
+ component: PreferencesPage,
+ },
+]
+
+@NgModule({
+ imports: [
+ CommonModule,
+ IonicModule,
+ RouterModule.forChild(routes),
+ SharingModule,
+ ],
+ declarations: [
+ PreferencesPage,
+ ],
+})
+export class PreferencesPageModule { }
diff --git a/ui/src/app/pages/server-routes/preferences/preferences.page.html b/ui/src/app/pages/server-routes/preferences/preferences.page.html
new file mode 100644
index 000000000..87d9b7087
--- /dev/null
+++ b/ui/src/app/pages/server-routes/preferences/preferences.page.html
@@ -0,0 +1,19 @@
+
+
+
+
+ Preferences
+
+
+
+
+
+
+
+ {{ fields['name'].name }}
+ {{ patch.data.ui.name }}
+
+
+
+
\ No newline at end of file
diff --git a/ui/src/app/pages/server-routes/preferences/preferences.page.scss b/ui/src/app/pages/server-routes/preferences/preferences.page.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/ui/src/app/pages/server-routes/preferences/preferences.page.ts b/ui/src/app/pages/server-routes/preferences/preferences.page.ts
new file mode 100644
index 000000000..be0833a76
--- /dev/null
+++ b/ui/src/app/pages/server-routes/preferences/preferences.page.ts
@@ -0,0 +1,75 @@
+import { Component, ViewChild } from '@angular/core'
+import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
+import { IonContent, LoadingController, ModalController } from '@ionic/angular'
+import { GenericInputComponent } from 'src/app/modals/generic-input/generic-input.component'
+import { ConfigSpec } from 'src/app/pkg-config/config-types'
+import { ApiService } from 'src/app/services/api/embassy-api.service'
+import { ErrorToastService } from 'src/app/services/error-toast.service'
+
+@Component({
+ selector: 'preferences',
+ templateUrl: './preferences.page.html',
+ styleUrls: ['./preferences.page.scss'],
+})
+export class PreferencesPage {
+ @ViewChild(IonContent) content: IonContent
+ fields = fields
+
+ constructor (
+ private readonly modalCtrl: ModalController,
+ private readonly loadingCtrl: LoadingController,
+ private readonly errToast: ErrorToastService,
+ private readonly api: ApiService,
+ public readonly patch: PatchDbService,
+ ) { }
+
+ ngAfterViewInit () {
+ this.content.scrollToPoint(undefined, 1)
+ }
+
+ async presentModalName (): Promise {
+ const modal = await this.modalCtrl.create({
+ componentProps: {
+ title: 'Edit Device Name',
+ message: 'This is for your reference only.',
+ label: 'Device Name',
+ useMask: false,
+ value: this.patch.data.ui.name,
+ buttonText: 'Save',
+ submitFn: async (value: string) => await this.setDbValue('name', value),
+ },
+ cssClass: 'alertlike-modal',
+ presentingElement: await this.modalCtrl.getTop(),
+ component: GenericInputComponent,
+ })
+
+ await modal.present()
+ }
+
+ private async setDbValue (key: string, value: string): Promise {
+ const loader = await this.loadingCtrl.create({
+ spinner: 'lines',
+ message: 'Saving...',
+ cssClass: 'loader',
+ })
+ await loader.present()
+
+ try {
+ await this.api.setDbValue({ pointer: `/${key}`, value })
+ } catch (e) {
+ this.errToast.present(e)
+ } finally {
+ loader.dismiss()
+ }
+ }
+}
+
+const fields: ConfigSpec = {
+ 'name': {
+ name: 'Device Name',
+ type: 'string',
+ nullable: false,
+ masked: false,
+ copyable: false,
+ },
+}
diff --git a/ui/src/app/pages/server-routes/security-routes/security-options/security-options.page.html b/ui/src/app/pages/server-routes/security-routes/security-options/security-options.page.html
index 3e1f8dfe4..9269969fd 100644
--- a/ui/src/app/pages/server-routes/security-routes/security-options/security-options.page.html
+++ b/ui/src/app/pages/server-routes/security-routes/security-options/security-options.page.html
@@ -12,7 +12,7 @@
General
- Share Anonymous Statistics
+ Report Bugs
{{ server['share-stats'] ? 'Enabled' : 'Disabled' }}
diff --git a/ui/src/app/pages/server-routes/security-routes/ssh-keys/ssh-keys.page.ts b/ui/src/app/pages/server-routes/security-routes/ssh-keys/ssh-keys.page.ts
index 903fd2b6d..9f1a6508e 100644
--- a/ui/src/app/pages/server-routes/security-routes/ssh-keys/ssh-keys.page.ts
+++ b/ui/src/app/pages/server-routes/security-routes/ssh-keys/ssh-keys.page.ts
@@ -3,7 +3,7 @@ import { AlertController, LoadingController, ModalController } from '@ionic/angu
import { SSHKeys } from 'src/app/services/api/api.types'
import { ErrorToastService } from 'src/app/services/error-toast.service'
import { ApiService } from 'src/app/services/api/embassy-api.service'
-import { BackupConfirmationComponent } from 'src/app/modals/backup-confirmation/backup-confirmation.component'
+import { GenericInputComponent } from 'src/app/modals/generic-input/generic-input.component'
@Component({
selector: 'ssh-keys',
@@ -41,7 +41,7 @@ export class SSHKeysPage {
const { name, description } = sshSpec
const modal = await this.modalCtrl.create({
- component: BackupConfirmationComponent,
+ component: GenericInputComponent,
componentProps: {
title: name,
message: description,
diff --git a/ui/src/app/pages/server-routes/security-routes/ssh-keys/ssh.service.ts b/ui/src/app/pages/server-routes/security-routes/ssh-keys/ssh.service.ts
deleted file mode 100644
index 1b72a375b..000000000
--- a/ui/src/app/pages/server-routes/security-routes/ssh-keys/ssh.service.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Injectable } from '@angular/core'
-import { BehaviorSubject } from 'rxjs'
-import { SSHKeys } from 'src/app/services/api/api.types'
-import { ApiService } from 'src/app/services/api/embassy-api.service'
-
-@Injectable({
- providedIn: 'root',
-})
-export class SSHService {
- private readonly keys$ = new BehaviorSubject({ })
-
- constructor (
- private readonly embassyApi: ApiService,
- ) { }
-
- watch$ () {
- return this.keys$.asObservable()
- }
-
-
-}
diff --git a/ui/src/app/pages/server-routes/server-backup/server-backup.module.ts b/ui/src/app/pages/server-routes/server-backup/server-backup.module.ts
index d16b52955..53dd1a7ea 100644
--- a/ui/src/app/pages/server-routes/server-backup/server-backup.module.ts
+++ b/ui/src/app/pages/server-routes/server-backup/server-backup.module.ts
@@ -3,7 +3,6 @@ import { CommonModule } from '@angular/common'
import { IonicModule } from '@ionic/angular'
import { ServerBackupPage } from './server-backup.page'
import { RouterModule, Routes } from '@angular/router'
-import { BackupConfirmationComponentModule } from 'src/app/modals/backup-confirmation/backup-confirmation.component.module'
import { SharingModule } from 'src/app/modules/sharing.module'
const routes: Routes = [
@@ -18,7 +17,6 @@ const routes: Routes = [
CommonModule,
IonicModule,
RouterModule.forChild(routes),
- BackupConfirmationComponentModule,
SharingModule,
],
declarations: [
diff --git a/ui/src/app/pages/server-routes/server-backup/server-backup.page.html b/ui/src/app/pages/server-routes/server-backup/server-backup.page.html
index 11a5c286e..c0fc87cf8 100644
--- a/ui/src/app/pages/server-routes/server-backup/server-backup.page.html
+++ b/ui/src/app/pages/server-routes/server-backup/server-backup.page.html
@@ -13,7 +13,7 @@
@@ -38,22 +38,14 @@
-
- No partitions available. To begin a backup, insert a storage device into your Embassy.
-
-
-
Embassy Updating
-
+ Embassy updating
+
Backing Up
+Embassy backing up
- Select the drive where you want to create a backup of your Embassy, including all your installed services. + Select the drive where you want to create a backup of your Embassy.
- {{ disk.key }} - {{ disk.value.size }}
-
+ {
try {
this.disks = await this.embassyApi.getDisks({ })
- this.allPartitionsMounted = Object.values(this.disks).every(d => Object.values(d.partitions).every(p => p['is-mounted']))
} catch (e) {
this.errToast.present(e)
} finally {
@@ -52,7 +51,7 @@ export class ServerBackupPage {
submitFn: async (value: string) => await this.create(logicalname, value),
},
cssClass: 'alertlike-modal',
- component: BackupConfirmationComponent,
+ component: GenericInputComponent,
})
return await m.present()
diff --git a/ui/src/app/pages/server-routes/server-routing.module.ts b/ui/src/app/pages/server-routes/server-routing.module.ts
index de682db47..56791ac53 100644
--- a/ui/src/app/pages/server-routes/server-routing.module.ts
+++ b/ui/src/app/pages/server-routes/server-routing.module.ts
@@ -34,6 +34,10 @@ const routes: Routes = [
path: 'security',
loadChildren: () => import('./security-routes/security-routing.module').then( m => m.SecurityRoutingModule),
},
+ {
+ path: 'preferences',
+ loadChildren: () => import('./preferences/preferences.module').then( m => m.PreferencesPageModule),
+ },
]
@NgModule({
diff --git a/ui/src/app/pages/server-routes/server-show/server-show.page.html b/ui/src/app/pages/server-routes/server-show/server-show.page.html
index b33060521..ceb557604 100644
--- a/ui/src/app/pages/server-routes/server-show/server-show.page.html
+++ b/ui/src/app/pages/server-routes/server-show/server-show.page.html
@@ -1,6 +1,6 @@
- Embassy
+ {{ patch.data.ui.name || patch.data['server-info'].id }}
diff --git a/ui/src/app/pages/server-routes/server-show/server-show.page.ts b/ui/src/app/pages/server-routes/server-show/server-show.page.ts
index bf330d436..8c145e297 100644
--- a/ui/src/app/pages/server-routes/server-show/server-show.page.ts
+++ b/ui/src/app/pages/server-routes/server-show/server-show.page.ts
@@ -3,6 +3,7 @@ import { AlertController, LoadingController, NavController } from '@ionic/angula
import { ApiService } from 'src/app/services/api/embassy-api.service'
import { ActivatedRoute } from '@angular/router'
import { ErrorToastService } from 'src/app/services/error-toast.service'
+import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
@Component({
selector: 'server-show',
@@ -19,6 +20,7 @@ export class ServerShowPage {
private readonly embassyApi: ApiService,
private readonly navCtrl: NavController,
private readonly route: ActivatedRoute,
+ public readonly patch: PatchDbService,
) { }
ngOnInit () {
@@ -48,8 +50,8 @@ export class ServerShowPage {
async presentAlertShutdown () {
const alert = await this.alertCtrl.create({
- header: 'Confirm',
- message: `Are you sure you want to shut down your Embassy? To turn it back on, you will need to physically unplug the device and plug it back in.`,
+ header: 'Warning',
+ message: `Embassy will remain off. To power back on, you will need to unplug the device and plug it back in.`,
buttons: [
{
text: 'Cancel',
@@ -103,7 +105,21 @@ export class ServerShowPage {
private setButtons (): void {
this.settings = {
+ 'Backups': [
+ {
+ title: 'Create Backup',
+ icon: 'save-outline',
+ action: () => this.navCtrl.navigateForward(['backup'], { relativeTo: this.route }),
+ detail: true,
+ },
+ ],
'Settings': [
+ {
+ title: 'Preferences',
+ icon: 'options-outline',
+ action: () => this.navCtrl.navigateForward(['preferences'], { relativeTo: this.route }),
+ detail: true,
+ },
{
title: 'Privacy and Security',
icon: 'shield-checkmark-outline',
@@ -143,14 +159,6 @@ export class ServerShowPage {
detail: true,
},
],
- 'Backups': [
- {
- title: 'Create Backup',
- icon: 'save-outline',
- action: () => this.navCtrl.navigateForward(['backup'], { relativeTo: this.route }),
- detail: true,
- },
- ],
'Power': [
{
title: 'Restart',
diff --git a/ui/src/app/pages/server-routes/wifi/wifi.page.html b/ui/src/app/pages/server-routes/wifi/wifi.page.html
index ecce7352d..ff7806581 100644
--- a/ui/src/app/pages/server-routes/wifi/wifi.page.html
+++ b/ui/src/app/pages/server-routes/wifi/wifi.page.html
@@ -23,7 +23,7 @@
Country
-
+
-
-
- {{ wifi.country }} - {{ this.countries[wifi.country] }}
- Select Country
-
-
+
+ {{ wifi.country }} - {{ this.countries[wifi.country] }}
+ Select Country
+
diff --git a/ui/src/app/pipes/convert-bytes.pipe.ts b/ui/src/app/pipes/convert-bytes.pipe.ts
new file mode 100644
index 000000000..d60a59722
--- /dev/null
+++ b/ui/src/app/pipes/convert-bytes.pipe.ts
@@ -0,0 +1,18 @@
+import { Pipe, PipeTransform } from '@angular/core'
+
+// converts bytes to gigabytes
+@Pipe({
+ name: 'convertBytes',
+})
+export class ConvertBytesPipe implements PipeTransform {
+ transform (bytes: number): string {
+ if (bytes === 0) return '0 Bytes'
+
+ const k = 1024
+ const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']
+
+ const i = Math.floor(Math.log(bytes) / Math.log(k))
+
+ return parseFloat((bytes / Math.pow(k, i)).toFixed(1)) + ' ' + sizes[i]
+ }
+}
diff --git a/ui/src/app/services/api/api.fixures.ts b/ui/src/app/services/api/api.fixures.ts
index 36cacd576..30ed53c64 100644
--- a/ui/src/app/services/api/api.fixures.ts
+++ b/ui/src/app/services/api/api.fixures.ts
@@ -864,46 +864,46 @@ export module Mock {
'signal-strength': 50,
}
- export const Disks: RR.GetDisksRes = {
- '/dev/sda': {
- size: '32GB',
- description: 'Samsung',
- partitions: {
- 'sdba2': {
- size: null,
- 'is-mounted': false,
+ export const Disks: RR.GetDisksRes = [
+ {
+ logicalname: '/dev/sda',
+ partitions: [
+ {
+ logicalname: 'sdba1',
label: 'Matt Stuff',
+ capacity: 1000000000000,
+ used: 0,
},
+ ],
+ capacity: 1000000000000,
+ 'embassy-os': {
+ version: '0.3.0',
+ name: '', // @TODO what is this?
},
},
- '/dev/sba': {
- size: '64GB',
- description: 'small USB stick',
- partitions: {
- 'sdba2': {
- size: '16GB',
- 'is-mounted': true,
- label: null,
- },
- },
- },
- '/dev/sbd': {
- size: '128GB',
- description: 'large USB stick',
- partitions: {
- 'sdba1': {
- size: '32GB',
- 'is-mounted': false,
+ {
+ logicalname: '/dev/sdb',
+ partitions: [
+ {
+ logicalname: 'sdba1',
label: 'Partition 1',
+ capacity: 1000000000,
+ used: 1000000000,
},
- 'sdba2': {
- size: null,
- 'is-mounted': true,
+ {
+ logicalname: 'sdba2',
label: 'Partition 2',
+ capacity: 900000000,
+ used: 300000000,
},
+ ],
+ capacity: 10000000000,
+ 'embassy-os': {
+ version: '0.3.0',
+ name: '', // @TODO what is this?
},
},
- }
+ ]
export const PackageProperties: RR.GetPackagePropertiesRes<2> = {
version: 2,
diff --git a/ui/src/app/services/api/api.types.ts b/ui/src/app/services/api/api.types.ts
index aff83cd9e..ad74ca6e8 100644
--- a/ui/src/app/services/api/api.types.ts
+++ b/ui/src/app/services/api/api.types.ts
@@ -127,7 +127,7 @@ export module RR {
// disk
export type GetDisksReq = { } // disk.list
- export type GetDisksRes = DiskInfo
+ export type GetDisksRes = DiskInfo[]
export type EjectDisksReq = { logicalname: string } // disk.eject
export type EjectDisksRes = null
@@ -289,23 +289,18 @@ export interface SessionMetadata {
export type PlatformType = 'cli' | 'ios' | 'ipad' | 'iphone' | 'android' | 'phablet' | 'tablet' | 'cordova' | 'capacitor' | 'electron' | 'pwa' | 'mobile' | 'mobileweb' | 'desktop' | 'hybrid'
export interface DiskInfo {
- [id: string]: DiskInfoEntry
-}
-
-export interface DiskInfoEntry {
- size: string
- description: string | null
- partitions: PartitionInfo
-}
-
-export interface PartitionInfo {
- [logicalname: string]: PartitionInfoEntry
-}
-
-export interface PartitionInfoEntry {
- 'is-mounted': boolean // We do not allow backups to mounted partitions
- size: string | null
- label: string | null
+ logicalname: string
+ partitions: {
+ logicalname: string
+ label: string | null
+ capacity: number
+ used: number | null
+ }[],
+ capacity: number
+ 'embassy-os': {
+ version: string
+ name: string
+ } | null
}
export interface ServerSpecs {
diff --git a/ui/src/app/services/patch-db/data-model.ts b/ui/src/app/services/patch-db/data-model.ts
index 9fc43acfd..04541b97c 100644
--- a/ui/src/app/services/patch-db/data-model.ts
+++ b/ui/src/app/services/patch-db/data-model.ts
@@ -7,6 +7,7 @@ export interface DataModel {
}
export interface UIData {
+ name: string
'welcome-ack': string
'auto-check-updates': boolean
}
diff --git a/ui/src/app/services/server-config.service.ts b/ui/src/app/services/server-config.service.ts
index 5cab48cb3..a200bace0 100644
--- a/ui/src/app/services/server-config.service.ts
+++ b/ui/src/app/services/server-config.service.ts
@@ -1,5 +1,5 @@
import { Injectable } from '@angular/core'
-import { AlertInput, AlertButton } from '@ionic/core'
+import { AlertInput, AlertButton, IonicSafeString } from '@ionic/core'
import { ApiService } from './api/embassy-api.service'
import { ConfigSpec } from '../pkg-config/config-types'
import { AlertController, LoadingController } from '@ionic/angular'
@@ -120,7 +120,7 @@ export const serverConfig: ConfigSpec = {
'auto-check-updates': {
type: 'boolean',
name: 'Auto Check for Updates',
- 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.',
+ description: 'On launch, EmbassyOS will automatically check for updates of itself and your installed services. Updating still requires your approval and action. Updates will never be performed automatically.',
default: true,
},
// 'eos-marketplace': {
@@ -143,8 +143,8 @@ export const serverConfig: ConfigSpec = {
// },
'share-stats': {
type: 'boolean',
- name: 'Share Anonymous Statistics',
- description: 'Start9 uses this information to identify bugs quickly and improve EmbassyOS. The information is 100% anonymous and transmitted over Tor.',
+ name: 'Report Bugs',
+ description: new IonicSafeString(`Bug reports are anonymized and transmitted over Tor. This helps us identify and fix bugs quickly. Read more `) as any, // @TODO get actual link
default: false,
},
// password: {
diff --git a/ui/src/assets/img/gifs/backing-up.gif b/ui/src/assets/img/gifs/backing-up.gif
index 8d94b97aa..ed07da0b3 100644
Binary files a/ui/src/assets/img/gifs/backing-up.gif and b/ui/src/assets/img/gifs/backing-up.gif differ
diff --git a/ui/src/assets/img/gifs/cube.gif b/ui/src/assets/img/gifs/cube.gif
deleted file mode 100644
index 1eab84be7..000000000
Binary files a/ui/src/assets/img/gifs/cube.gif and /dev/null differ
diff --git a/ui/src/assets/img/gifs/updating.gif b/ui/src/assets/img/gifs/updating.gif
new file mode 100644
index 000000000..33a707159
Binary files /dev/null and b/ui/src/assets/img/gifs/updating.gif differ
+ {{ disk.logicalname }} - {{ disk.capacity | convertBytes }}
+
-
-
+
diff --git a/ui/src/app/pages/server-routes/server-backup/server-backup.page.ts b/ui/src/app/pages/server-routes/server-backup/server-backup.page.ts
index 51895fca1..a70a113e4 100644
--- a/ui/src/app/pages/server-routes/server-backup/server-backup.page.ts
+++ b/ui/src/app/pages/server-routes/server-backup/server-backup.page.ts
@@ -1,7 +1,7 @@
import { Component } from '@angular/core'
import { ModalController } from '@ionic/angular'
import { ApiService } from 'src/app/services/api/embassy-api.service'
-import { BackupConfirmationComponent } from 'src/app/modals/backup-confirmation/backup-confirmation.component'
+import { GenericInputComponent } from 'src/app/modals/generic-input/generic-input.component'
import { DiskInfo } from 'src/app/services/api/api.types'
import { ErrorToastService } from 'src/app/services/error-toast.service'
@@ -11,7 +11,7 @@ import { ErrorToastService } from 'src/app/services/error-toast.service'
styleUrls: ['./server-backup.page.scss'],
})
export class ServerBackupPage {
- disks: DiskInfo
+ disks: DiskInfo[]
loading = true
allPartitionsMounted: boolean
@@ -33,7 +33,6 @@ export class ServerBackupPage {
async getExternalDisks (): Promise