Default: {{ defaultDescription }} Default: {{ defaultDescription }} Units: {{ spec.units }}
Tor Address
-{{ 'http://' + int['tor-address'] }}
-LAN Address
-{{ 'https://' + int['lan-address'] }}
-Tor Address
+{{ 'http://' + int['tor-address'] }}
+LAN Address
+{{ 'https://' + int['lan-address'] }}
+
-
Welcome to your Embassy
+Welcome to your Embassy
Get started by installing your first service.
No values.
+No properties.
{{ prop.key }}
@@ -48,8 +48,8 @@{{ prop.key }}
@@ -57,13 +57,13 @@- Select a location from which to restore {{ title }}. This will overwrite all current data. -
++ Restoring from backup will overwrite all current data for {{ title }} . +
{{ partition.value.label || partition.key }} ({{ partition.value.size || 'unknown size' }})
-{{ partition.value.label || partition.key }} ({{ partition.value.size || 'unknown size' }})
+
-
-
-
- ![]()
-
-
+
+ ![]()
+
+
+
- Version History
+ Release Notes
diff --git a/ui/src/app/pages/marketplace-routes/app-release-notes/app-release-notes.page.ts b/ui/src/app/pages/marketplace-routes/app-release-notes/app-release-notes.page.ts
index 83d21fc67..0e6dac0be 100644
--- a/ui/src/app/pages/marketplace-routes/app-release-notes/app-release-notes.page.ts
+++ b/ui/src/app/pages/marketplace-routes/app-release-notes/app-release-notes.page.ts
@@ -14,14 +14,14 @@ export class AppReleaseNotes {
constructor (
private readonly route: ActivatedRoute,
- public aaService: MarketplaceService,
+ public marketplaceService: MarketplaceService,
) { }
ngOnInit () {
this.pkgId = this.route.snapshot.paramMap.get('pkgId')
const version = this.route.snapshot.paramMap.get('version')
- if (!this.aaService.pkgs[this.pkgId]) {
- this.aaService.setPkg(this.pkgId, version)
+ if (!this.marketplaceService.pkgs[this.pkgId]) {
+ this.marketplaceService.setPkg(this.pkgId, version)
}
}
diff --git a/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.html b/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.html
index ea7f2714c..192f4ced2 100644
--- a/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.html
+++ b/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.html
@@ -96,7 +96,7 @@
New in {{ pkg.manifest.version | displayEmver }}
- Release History
+ All Release Notes
@@ -109,9 +109,7 @@
Description
-
-
+
@@ -137,14 +135,97 @@
-
-
- Additional Information
-
- Other versions
-
+ Additional Info
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.scss b/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.scss
index 0b5a89dc0..db758772c 100644
--- a/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.scss
+++ b/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.scss
@@ -35,13 +35,7 @@
color: var(--ion-color-danger);
}
-ion-item-divider {
- text-transform: uppercase;
- margin-top: 22px;
- font-weight: 400;
-}
-
#release-notes {
overflow: auto;
- max-height: 160px;
+ max-height: 120px;
}
diff --git a/ui/src/app/pages/marketplace-routes/marketplace.service.ts b/ui/src/app/pages/marketplace-routes/marketplace.service.ts
index 0bc87d496..504b659b7 100644
--- a/ui/src/app/pages/marketplace-routes/marketplace.service.ts
+++ b/ui/src/app/pages/marketplace-routes/marketplace.service.ts
@@ -7,6 +7,7 @@ import { ApiService } from 'src/app/services/api/api.service'
})
export class MarketplaceService {
pkgs: { [id: string]: AvailableShow } = { }
+ additionalInfo
constructor (
private readonly apiService: ApiService,
diff --git a/ui/src/app/pages/notifications/notifications.page.html b/ui/src/app/pages/notifications/notifications.page.html
index 089829f4b..03ea404d9 100644
--- a/ui/src/app/pages/notifications/notifications.page.html
+++ b/ui/src/app/pages/notifications/notifications.page.html
@@ -1,6 +1,6 @@
-
+
Notifications
diff --git a/ui/src/app/pages/notifications/notifications.page.ts b/ui/src/app/pages/notifications/notifications.page.ts
index ddd5e6f4c..f39afcf28 100644
--- a/ui/src/app/pages/notifications/notifications.page.ts
+++ b/ui/src/app/pages/notifications/notifications.page.ts
@@ -3,6 +3,7 @@ import { ApiService } from 'src/app/services/api/api.service'
import { LoaderService } from 'src/app/services/loader.service'
import { ServerNotification, ServerNotifications } from 'src/app/services/api/api-types'
import { AlertController } from '@ionic/angular'
+import { ActivatedRoute } from '@angular/router'
@Component({
selector: 'notifications',
@@ -15,15 +16,18 @@ export class NotificationsPage {
notifications: ServerNotifications = []
page = 1
needInfinite = false
+ fromToast = false
readonly perPage = 20
constructor (
private readonly apiService: ApiService,
private readonly loader: LoaderService,
private readonly alertCtrl: AlertController,
+ private readonly route: ActivatedRoute,
) { }
async ngOnInit () {
+ this.fromToast = !!this.route.snapshot.queryParamMap.get('toast')
this.notifications = await this.getNotifications()
this.loading = false
}
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 51765defa..45e1ad0f1 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
@@ -4,7 +4,7 @@
SSH Keys
-
+
diff --git a/ui/src/app/pages/server-routes/lan/lan.page.html b/ui/src/app/pages/server-routes/lan/lan.page.html
index cd9adcefe..35200aa65 100644
--- a/ui/src/app/pages/server-routes/lan/lan.page.html
+++ b/ui/src/app/pages/server-routes/lan/lan.page.html
@@ -13,7 +13,7 @@
-
@@ -26,7 +26,7 @@
-
diff --git a/ui/src/app/pages/server-routes/lan/lan.page.scss b/ui/src/app/pages/server-routes/lan/lan.page.scss
index ae8a60ab4..e69de29bb 100644
--- a/ui/src/app/pages/server-routes/lan/lan.page.scss
+++ b/ui/src/app/pages/server-routes/lan/lan.page.scss
@@ -1,3 +0,0 @@
-.tiny-icon {
- font-size: 12px;
-}
\ No newline at end of file
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 fd976b01f..ce8fcdd85 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
@@ -4,7 +4,7 @@
Create Backup
-
+
@@ -18,52 +18,56 @@
{{ error }}
-
-
-
-
-
-
+
+
+
+
+
+ Select Backup Drive
+
No partitions available. To begin a backup, insert a storage device into your Embassy.
No partitions available. Insert the storage device containing the backup you wish to restore.
-
-
-
- {{ disk.value.size }}
-
-
- {{ disk.key }}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ {{ disk.value.size }}
+
+
+ {{ disk.key }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ui/src/app/pages/server-routes/server-logs/server-logs.page.html b/ui/src/app/pages/server-routes/server-logs/server-logs.page.html
index f2cef6767..c1b8be35c 100644
--- a/ui/src/app/pages/server-routes/server-logs/server-logs.page.html
+++ b/ui/src/app/pages/server-routes/server-logs/server-logs.page.html
@@ -4,7 +4,7 @@
Logs
-
+
diff --git a/ui/src/app/pages/server-routes/server-specs/server-specs.page.html b/ui/src/app/pages/server-routes/server-specs/server-specs.page.html
index 2566c20ff..e6fb810c4 100644
--- a/ui/src/app/pages/server-routes/server-specs/server-specs.page.html
+++ b/ui/src/app/pages/server-routes/server-specs/server-specs.page.html
@@ -27,7 +27,7 @@
-
@@ -36,7 +36,7 @@
-
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 800d8caf1..374bb9122 100644
--- a/ui/src/app/pages/server-routes/wifi/wifi.page.html
+++ b/ui/src/app/pages/server-routes/wifi/wifi.page.html
@@ -4,7 +4,7 @@
WiFi Settings
-
+
diff --git a/ui/src/app/services/api/mock-app-fixures.ts b/ui/src/app/services/api/mock-app-fixures.ts
index 52bec63c1..4677bafb8 100644
--- a/ui/src/app/services/api/mock-app-fixures.ts
+++ b/ui/src/app/services/api/mock-app-fixures.ts
@@ -410,9 +410,9 @@ export module Mock {
versions: ['0.19.0', '0.20.0', '0.21.0'],
'dependency-metadata': { },
'release-notes': {
- '0.19.0': 'release notes for Bitcoin 0.19.0',
- '0.19.1': 'release notes for Bitcoin 0.19.1',
'0.19.2': 'Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of "de Finibus Bonorum et Malorum" (The Extremes of Good and Evil) by Cicero, written in 45 BC. This book is a treatise on the theory of ethics, very popular during the Renaissance. The first line of Lorem Ipsum, "Lorem ipsum dolor sit amet..", comes from a line in section 1.10.32.',
+ '0.19.1': 'release notes for Bitcoin 0.19.1',
+ '0.19.0': 'release notes for Bitcoin 0.19.0',
},
},
'0.20.0': {
@@ -425,9 +425,9 @@ export module Mock {
versions: ['0.19.0', '0.20.0', '0.21.0'],
'dependency-metadata': { },
'release-notes': {
- '0.19.0': 'release notes for Bitcoin 0.19.0',
- '0.19.1': 'release notes for Bitcoin 0.19.1',
'0.19.2': 'Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of "de Finibus Bonorum et Malorum" (The Extremes of Good and Evil) by Cicero, written in 45 BC. This book is a treatise on the theory of ethics, very popular during the Renaissance. The first line of Lorem Ipsum, "Lorem ipsum dolor sit amet..", comes from a line in section 1.10.32.',
+ '0.19.1': 'release notes for Bitcoin 0.19.1',
+ '0.19.0': 'release notes for Bitcoin 0.19.0',
},
},
'0.21.0': {
@@ -441,9 +441,9 @@ export module Mock {
versions: ['0.19.0', '0.20.0', '0.21.0'],
'dependency-metadata': { },
'release-notes': {
- '0.19.0': 'release notes for Bitcoin 0.19.0',
- '0.19.1': 'release notes for Bitcoin 0.19.1',
'0.19.2': 'Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of "de Finibus Bonorum et Malorum" (The Extremes of Good and Evil) by Cicero, written in 45 BC. This book is a treatise on the theory of ethics, very popular during the Renaissance. The first line of Lorem Ipsum, "Lorem ipsum dolor sit amet..", comes from a line in section 1.10.32.',
+ '0.19.1': 'release notes for Bitcoin 0.19.1',
+ '0.19.0': 'release notes for Bitcoin 0.19.0',
},
},
'latest': {
@@ -456,9 +456,9 @@ export module Mock {
versions: ['0.19.0', '0.20.0', '0.21.0'],
'dependency-metadata': { },
'release-notes': {
- '0.19.2': 'release notes for Bitcoin 0.19.2',
- '0.20.0': 'release notes for Bitcoin 0.20.0',
'0.21.0': 'Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of "de Finibus Bonorum et Malorum" (The Extremes of Good and Evil) by Cicero, written in 45 BC. This book is a treatise on the theory of ethics, very popular during the Renaissance. The first line of Lorem Ipsum, "Lorem ipsum dolor sit amet..", comes from a line in section 1.10.32.',
+ '0.20.0': 'release notes for Bitcoin 0.20.0',
+ '0.19.2': 'release notes for Bitcoin 0.19.2',
},
},
},
@@ -483,9 +483,9 @@ export module Mock {
},
},
'release-notes': {
- '0.19.0': 'release notes for LND 0.19.0',
- '0.19.1': 'release notes for LND 0.19.1',
'0.19.2': 'release notes for LND 0.19.2',
+ '0.19.1': 'release notes for LND 0.19.1',
+ '0.19.0': 'release notes for LND 0.19.0',
},
},
'0.11.1': {
@@ -508,9 +508,9 @@ export module Mock {
},
},
'release-notes': {
- '0.19.0': 'release notes for LND 0.19.0',
- '0.19.1': 'release notes for LND 0.19.1',
'0.19.2': 'release notes for LND 0.19.2',
+ '0.19.1': 'release notes for LND 0.19.1',
+ '0.19.0': 'release notes for LND 0.19.0',
},
},
'latest': {
@@ -529,9 +529,9 @@ export module Mock {
},
},
'release-notes': {
- '0.19.0': 'release notes for LND 0.19.0',
- '0.19.1': 'release notes for LND 0.19.1',
'0.19.2': 'release notes for LND 0.19.2',
+ '0.19.1': 'release notes for LND 0.19.1',
+ '0.19.0': 'release notes for LND 0.19.0',
},
},
},
@@ -548,9 +548,9 @@ export module Mock {
},
},
'release-notes': {
- '0.19.0': 'release notes for btc proxy 0.19.0',
- '0.19.1': 'release notes for btc proxy 0.19.1',
'0.19.2': 'release notes for btc proxy 0.19.2',
+ '0.19.1': 'release notes for btc proxy 0.19.1',
+ '0.19.0': 'release notes for btc proxy 0.19.0',
},
},
},
diff --git a/ui/src/global.scss b/ui/src/global.scss
index 2f22ee4a3..458dfcd80 100644
--- a/ui/src/global.scss
+++ b/ui/src/global.scss
@@ -47,21 +47,10 @@
z-index: 40000 !important;
}
-.alert-danger {
- color: var(--ion-color-danger) !important;
- & ion-icon {
- color: var(--ion-color-danger) !important;
- }
-}
-
.borderless {
border-style: none;
}
-.help-button {
- margin: 0 8px 0 0;
-}
-
.item-interactive {
--highlight-background: transparent !important;
}
@@ -95,6 +84,7 @@
}
ion-card-title {
+ color: var(--ion-color-dark);
font-family: 'Montserrat';
}
@@ -120,6 +110,9 @@ ion-badge {
ion-item-divider {
--background: transparent;
+ text-transform: uppercase;
+ margin-top: 16px;
+ font-weight: 400;
}
ion-infinite-scroll ion-infinite-scroll-content {
@@ -132,6 +125,13 @@ ion-action-sheet {
ion-alert {
--backdrop-opacity: 0.75 !important;
+ .alert-button {
+ color: var(--ion-color-dark) !important;
+ }
+}
+
+ion-button {
+ --color: var(--ion-color-dark) !important;
}
ion-loading {
@@ -292,3 +292,7 @@ ion-item-divider {
width: 16px !important;
height: 16px !important;
}
+
+h2 {
+ line-height: unset;
+}
diff --git a/ui/src/theme/variables.scss b/ui/src/theme/variables.scss
index d710b5ad7..10dedbcf3 100644
--- a/ui/src/theme/variables.scss
+++ b/ui/src/theme/variables.scss
@@ -142,8 +142,6 @@ body.dark {
--ion-color-light-contrast-rgb: 255,255,255;
--ion-color-light-shade: #1e2023;
--ion-color-light-tint: #383a3e;
-
- --ion-color-start9: #FF4960;
}
/*
-
- {{ manifest.title }}
-
-
- {{ manifest.version | displayEmver }}
-
-
+ + {{ manifest.title }} +
+{{ manifest.version | displayEmver }}
-
+
Configure
-
+
Stop
-
+
Fix
-
+
Start
diff --git a/ui/src/app/pages/apps-routes/app-show/app-show.page.scss b/ui/src/app/pages/apps-routes/app-show/app-show.page.scss
index 72cecb7d7..4eaf15be4 100644
--- a/ui/src/app/pages/apps-routes/app-show/app-show.page.scss
+++ b/ui/src/app/pages/apps-routes/app-show/app-show.page.scss
@@ -5,20 +5,24 @@
.top-plate {
background: var(--ion-item-background);
margin: 0 16px;
+ padding: 12px;
border-radius: 10px;
border-style: solid;
border-color: #373737;
+ ion-item {
+ border-radius: 10px;
+ }
}
.status-readout {
--background: transparent;
display: flex;
justify-content: space-between;
- padding: 0 10px;
+ padding: 8px 16px;
border-radius: 10px;
align-items: center;
background: var(--ion-background-color);
- margin: 10px 10px 0px 10px;
+ margin: 10px;
border-style: solid;
border-width: 1px;
border-color: #404040;
@@ -39,18 +43,3 @@
border-style: solid;
border-color: #404040;
}
-
-
-.dep-issue {
- background: radial-gradient(var(--ion-color-warning) 40%, transparent)
-}
-
-.dep-sat {
- background: radial-gradient(var(--ion-color-success) 40%, transparent)
-}
-
-ion-item-divider {
- text-transform: uppercase;
- margin-top: 22px;
- font-weight: 400;
-}
\ No newline at end of file
diff --git a/ui/src/app/pages/apps-routes/app-show/app-show.page.ts b/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
index 4208e21b2..c19352694 100644
--- a/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
+++ b/ui/src/app/pages/apps-routes/app-show/app-show.page.ts
@@ -239,7 +239,7 @@ export class AppShowPage {
},
{
action: () => this.navCtrl.navigateForward(['properties'], { relativeTo: this.route }),
- title: 'Values',
+ title: 'Properties',
icon: 'briefcase-outline',
color: 'danger',
disabled: [],
@@ -267,7 +267,7 @@ export class AppShowPage {
},
{
action: () => this.navCtrl.navigateForward(['restore'], { relativeTo: this.route }),
- title: 'Restore Backup',
+ title: 'Restore From Backup',
icon: 'color-wand-outline',
color: 'danger',
disabled: [FEStatus.Connecting, FEStatus.Installing, FEStatus.Updating, FEStatus.Stopping, FEStatus.Removing, FEStatus.BackingUp, FEStatus.Restoring],
diff --git a/ui/src/app/pages/marketplace-routes/app-release-notes/app-release-notes.page.html b/ui/src/app/pages/marketplace-routes/app-release-notes/app-release-notes.page.html
index 38ca00abd..443f84fff 100644
--- a/ui/src/app/pages/marketplace-routes/app-release-notes/app-release-notes.page.html
+++ b/ui/src/app/pages/marketplace-routes/app-release-notes/app-release-notes.page.html
@@ -3,7 +3,7 @@
{{ pkg.manifest.description.long }}
-{{ pkg.manifest.description.long }}
Service ID
+{{ pkg.manifest.id }}
+Categories
+{{ pkg.categories.join(', ') }}
+Other Versions
+Click to view other versions
+License
+{{ pkg.manifest.license }}
+Source Repository
+{{ pkg.manifest['upstream-repo'] }}
+Wrapper Repository
+{{ pkg.manifest['wrapper-repo'] }}
+Support Site
+{{ pkg.manifest['support-site'] }}
+Marketing Site
+{{ pkg.manifest['marketing-site'] }}
+Donation Site
+{{ donationUrl }}
+About
+About
You can connect to your Embassy over your Local Area Network (LAN). This can be useful for achieving a faster experience, as well as a fallback in case the Tor network is experiencing issues.
Setup
+Setup
- Select a location to back up your Embassy. Because are diff-based, so your first backup will likely take much longer than subsequent backups. -
--
- During backup, your Embassy will be unusable. -
-About
++ Create frequent backups of your Embassy to avoid loss of data. +
+{{ partition.value.label || partition.key }} ({{ partition.value.size || 'unknown size' }})
-{{ partition.value.label || partition.key }} ({{ partition.value.size || 'unknown size' }})
+http://{{ server['tor-address'] }}
https://{{ server['lan-address'] }}