From 4042b8f02681fa3300de1561b5089d6cf017e6a3 Mon Sep 17 00:00:00 2001 From: Lucy C <12953208+elvece@users.noreply.github.com> Date: Sun, 20 Nov 2022 20:37:19 -0700 Subject: [PATCH] Update setup wizard styling (#1954) * base srevampof home page * update sembassy page * update all ephemeral pages * matrix animation working * wip success * refactor styling of success page * modal and mobile adjustments * cleanup * make chnages to styles and copy (#1955) * make chnages to styles and copy * fix responsiveness of downloadable page Co-authored-by: Lucy Cifferello <12953208+elvece@users.noreply.github.com> * refactor success page * cleanup headers * revert isKiosk testing * udpate patch DB Co-authored-by: Matt Hill Co-authored-by: Matt Hill --- .../modals/cifs-modal/cifs-modal.page.html | 26 +- .../modals/cifs-modal/cifs-modal.page.scss | 21 +- .../app/modals/cifs-modal/cifs-modal.page.ts | 1 - .../app/modals/password/password.page.html | 37 +- .../app/modals/password/password.page.scss | 22 +- .../src/app/pages/attach/attach.page.html | 20 +- .../src/app/pages/attach/attach.page.scss | 4 - .../src/app/pages/attach/attach.page.ts | 5 +- .../src/app/pages/embassy/embassy.page.html | 25 +- .../src/app/pages/embassy/embassy.page.ts | 5 +- .../src/app/pages/home/home.page.html | 54 ++- .../src/app/pages/home/home.page.scss | 12 +- .../src/app/pages/loading/loading.page.html | 17 +- .../src/app/pages/recover/recover.page.html | 7 - .../src/app/pages/recover/recover.page.scss | 5 +- .../src/app/pages/success/success.page.html | 449 ++++++++---------- .../src/app/pages/success/success.page.scss | 154 +++++- .../src/app/pages/success/success.page.ts | 69 ++- .../src/app/pages/transfer/transfer.page.html | 17 +- .../src/app/pages/transfer/transfer.page.scss | 4 - .../src/app/pages/transfer/transfer.page.ts | 2 +- .../projects/setup-wizard/src/styles.scss | 279 +++++++++-- frontend/projects/shared/styles/shared.scss | 2 +- 23 files changed, 812 insertions(+), 425 deletions(-) diff --git a/frontend/projects/setup-wizard/src/app/modals/cifs-modal/cifs-modal.page.html b/frontend/projects/setup-wizard/src/app/modals/cifs-modal/cifs-modal.page.html index 6f9728ac2..ebec1b21f 100644 --- a/frontend/projects/setup-wizard/src/app/modals/cifs-modal/cifs-modal.page.html +++ b/frontend/projects/setup-wizard/src/app/modals/cifs-modal/cifs-modal.page.html @@ -1,8 +1,6 @@ - - Connect Shared Folder - + Connect Network Folder @@ -21,7 +19,10 @@ >

- Hostname is required. e.g. 'My Computer' OR 'my-computer.local' + Hostname is required. e.g. 'My Computer' OR + 'my-computer.local'

Path *

@@ -71,12 +72,23 @@ - + Cancel - + Verify - diff --git a/frontend/projects/setup-wizard/src/app/modals/cifs-modal/cifs-modal.page.scss b/frontend/projects/setup-wizard/src/app/modals/cifs-modal/cifs-modal.page.scss index ac7528a0e..3d76c6538 100644 --- a/frontend/projects/setup-wizard/src/app/modals/cifs-modal/cifs-modal.page.scss +++ b/frontend/projects/setup-wizard/src/app/modals/cifs-modal/cifs-modal.page.scss @@ -1,3 +1,20 @@ -ion-content { - --ion-text-color: var(--ion-color-dark); +.item-interactive { + --highlight-background: var(--ion-color-dark) !important; +} + +ion-item { + + &:hover { + transition-property: transform; + transform: none; + } + +} + +.item-has-focus { + --background: var(--ion-color-dark-tint) !important; +} + +ion-modal { + --backdrop-opacity: 0.7; } \ No newline at end of file diff --git a/frontend/projects/setup-wizard/src/app/modals/cifs-modal/cifs-modal.page.ts b/frontend/projects/setup-wizard/src/app/modals/cifs-modal/cifs-modal.page.ts index 60b2d1a9a..1f15c4468 100644 --- a/frontend/projects/setup-wizard/src/app/modals/cifs-modal/cifs-modal.page.ts +++ b/frontend/projects/setup-wizard/src/app/modals/cifs-modal/cifs-modal.page.ts @@ -69,7 +69,6 @@ export class CifsModal { const modal = await this.modalController.create({ component: PasswordPage, componentProps: { target }, - cssClass: 'alertlike-modal', }) modal.onDidDismiss().then(res => { if (res.role === 'success') { diff --git a/frontend/projects/setup-wizard/src/app/modals/password/password.page.html b/frontend/projects/setup-wizard/src/app/modals/password/password.page.html index 4babb25c6..f89ae16d1 100644 --- a/frontend/projects/setup-wizard/src/app/modals/password/password.page.html +++ b/frontend/projects/setup-wizard/src/app/modals/password/password.page.html @@ -8,20 +8,17 @@
-
- -

- Choose a password for your Embassy. - Make it good. Write it down. -

-
-

- Enter the password that was used to encrypt this drive. +

+ Enter the password that was used to encrypt this drive. +

+ +

+ Choose a password for your Embassy. + Make it good. Write it down.

-
+
-

Password

@@ -42,13 +39,8 @@ > -
-

- {{ pwError }} -

-
+

{{ pwError }}

-

Confirm Password

@@ -72,11 +64,7 @@ > -
-

- {{ verError }} -

-
+

{{ verError }}

@@ -88,8 +76,7 @@ Cancel @@ -97,8 +84,6 @@ diff --git a/frontend/projects/setup-wizard/src/app/modals/password/password.page.scss b/frontend/projects/setup-wizard/src/app/modals/password/password.page.scss index ac7528a0e..d3af3bcbd 100644 --- a/frontend/projects/setup-wizard/src/app/modals/password/password.page.scss +++ b/frontend/projects/setup-wizard/src/app/modals/password/password.page.scss @@ -1,3 +1,21 @@ -ion-content { - --ion-text-color: var(--ion-color-dark); +.item-interactive { + --highlight-background: var(--ion-color-dark) !important; +} + +ion-item { + &:hover { + transition-property: transform; + transform: none; + } +} + +.item-has-focus { + --background: var(--ion-color-dark-tint) !important; +} + +.error-message { + color: var(--ion-color-danger) !important; + font-size: .9rem !important; + margin-left: 36px; + margin-top: -16px; } \ No newline at end of file diff --git a/frontend/projects/setup-wizard/src/app/pages/attach/attach.page.html b/frontend/projects/setup-wizard/src/app/pages/attach/attach.page.html index 05097f920..4603f7a34 100644 --- a/frontend/projects/setup-wizard/src/app/pages/attach/attach.page.html +++ b/frontend/projects/setup-wizard/src/app/pages/attach/attach.page.html @@ -2,17 +2,15 @@ -
- -
- - Use Existing Drive - Select the physical drive containing your Embassy - data + Use existing drive +
+ Select the physical drive containing your Embassy + data +
@@ -25,8 +23,6 @@ -

Available Drives

-

No valid Embassy data drives found. Please make sure the drive is a valid Embassy data drive (not a backup) and is firmly @@ -44,7 +40,6 @@ slot="start" name="save-outline" size="large" - color="light" >

{{ drive.logicalname }}

@@ -58,7 +53,6 @@ diff --git a/frontend/projects/setup-wizard/src/app/pages/attach/attach.page.scss b/frontend/projects/setup-wizard/src/app/pages/attach/attach.page.scss index 687b91ecf..e69de29bb 100644 --- a/frontend/projects/setup-wizard/src/app/pages/attach/attach.page.scss +++ b/frontend/projects/setup-wizard/src/app/pages/attach/attach.page.scss @@ -1,4 +0,0 @@ -.target-label { - font-weight: bold; - padding-bottom: 6px; -} diff --git a/frontend/projects/setup-wizard/src/app/pages/attach/attach.page.ts b/frontend/projects/setup-wizard/src/app/pages/attach/attach.page.ts index b8e43a575..56ebc01f0 100644 --- a/frontend/projects/setup-wizard/src/app/pages/attach/attach.page.ts +++ b/frontend/projects/setup-wizard/src/app/pages/attach/attach.page.ts @@ -60,7 +60,10 @@ export class AttachPage { } private async attachDrive(guid: string, password: string) { - const loader = await this.loadingCtrl.create() + const loader = await this.loadingCtrl.create({ + message: 'Connecting to drive...', + cssClass: 'loader', + }) await loader.present() try { await this.stateService.importDrive(guid, password) diff --git a/frontend/projects/setup-wizard/src/app/pages/embassy/embassy.page.html b/frontend/projects/setup-wizard/src/app/pages/embassy/embassy.page.html index e26c77fd9..1ac557910 100644 --- a/frontend/projects/setup-wizard/src/app/pages/embassy/embassy.page.html +++ b/frontend/projects/setup-wizard/src/app/pages/embassy/embassy.page.html @@ -2,21 +2,18 @@ -
- -
- - Select Storage Drive - Select the drive where your Embassy data will be - stored. + Select storage drive +
+ + This is the drive where your Embassy data will be stored. + +
- +

@@ -73,7 +72,7 @@ - + Refresh diff --git a/frontend/projects/setup-wizard/src/app/pages/embassy/embassy.page.ts b/frontend/projects/setup-wizard/src/app/pages/embassy/embassy.page.ts index 4d9aa9d2c..6cb8a5d85 100644 --- a/frontend/projects/setup-wizard/src/app/pages/embassy/embassy.page.ts +++ b/frontend/projects/setup-wizard/src/app/pages/embassy/embassy.page.ts @@ -131,7 +131,10 @@ export class EmbassyPage { logicalname: string, password: string, ): Promise { - const loader = await this.loadingCtrl.create() + const loader = await this.loadingCtrl.create({ + message: 'Connecting to drive...', + cssClass: 'loader', + }) await loader.present() try { diff --git a/frontend/projects/setup-wizard/src/app/pages/home/home.page.html b/frontend/projects/setup-wizard/src/app/pages/home/home.page.html index 8037bedc3..4e8324a7f 100644 --- a/frontend/projects/setup-wizard/src/app/pages/home/home.page.html +++ b/frontend/projects/setup-wizard/src/app/pages/home/home.page.html @@ -3,7 +3,11 @@
- +
@@ -18,22 +22,27 @@
- Embassy Setup - (recover) + {{ swiper?.activeIndex === 0 ? 'embassyOS Setup' : 'Recover + Options' }} - + - +

Start Fresh

Get started with a brand new Embassy

@@ -44,11 +53,11 @@ - +

Recover

Recover, restore, or transfer Embassy data

@@ -59,12 +68,13 @@ - - + +

Restore From Backup @@ -76,15 +86,11 @@ - +

Use Existing Drive @@ -98,15 +104,11 @@ - +

Transfer diff --git a/frontend/projects/setup-wizard/src/app/pages/home/home.page.scss b/frontend/projects/setup-wizard/src/app/pages/home/home.page.scss index 96fa4fa70..fafb1a0ba 100644 --- a/frontend/projects/setup-wizard/src/app/pages/home/home.page.scss +++ b/frontend/projects/setup-wizard/src/app/pages/home/home.page.scss @@ -5,11 +5,13 @@ z-index: 1000000; } -ion-item { - --background: var(--ion-color-medium); - --color: var(--ion-color-dark); +.inline { + display: flex; + align-items: center; + text-align: center; + justify-content: center; } -p { - color: var(--ion-color-dark); +ion-card-title { + font-variant-caps: all-small-caps; } \ No newline at end of file diff --git a/frontend/projects/setup-wizard/src/app/pages/loading/loading.page.html b/frontend/projects/setup-wizard/src/app/pages/loading/loading.page.html index 5757244a6..7554ecfa6 100644 --- a/frontend/projects/setup-wizard/src/app/pages/loading/loading.page.html +++ b/frontend/projects/setup-wizard/src/app/pages/loading/loading.page.html @@ -1,23 +1,20 @@ - + -
- -
- Initializing Embassy - Progress: {{ (stateService.dataProgress * 100).toFixed(0) - }}% +
+ + Progress: {{ (stateService.dataProgress * 100).toFixed(0)}}% + +
- -

- Restore from Backup @@ -33,7 +29,6 @@ slot="start" name="folder-open-outline" size="large" - color="light" > Open @@ -71,7 +66,6 @@ slot="start" name="save-outline" size="large" - color="light" >

{{ drive.label || drive.logicalname }}

@@ -88,7 +82,6 @@ diff --git a/frontend/projects/setup-wizard/src/app/pages/recover/recover.page.scss b/frontend/projects/setup-wizard/src/app/pages/recover/recover.page.scss index 687b91ecf..4acada7bf 100644 --- a/frontend/projects/setup-wizard/src/app/pages/recover/recover.page.scss +++ b/frontend/projects/setup-wizard/src/app/pages/recover/recover.page.scss @@ -1,4 +1,5 @@ .target-label { - font-weight: bold; + font-weight: 500; padding-bottom: 6px; -} + font-variant-caps: all-small-caps; +} \ No newline at end of file diff --git a/frontend/projects/setup-wizard/src/app/pages/success/success.page.html b/frontend/projects/setup-wizard/src/app/pages/success/success.page.html index 6adcabd03..74d54ffe6 100644 --- a/frontend/projects/setup-wizard/src/app/pages/success/success.page.html +++ b/frontend/projects/setup-wizard/src/app/pages/success/success.page.html @@ -1,269 +1,232 @@ - - - - - - - - - - Setup Complete - You will be redirected momentarily Your browser does not support the canvas element. + +
+ + + + + + +
+ +

Setup Complete!

+
+

+ You will be redirected momentarily. +

+
+
+
+
+ + + + + +
+
+ +

Setup Complete!

+
+

+ You can now safely unplug your backup drive +

+

+ You can now safely unplug your old drive +

+
+
+ + + Download your Embassy's address information for permanent + access +

+ embassy.local was for setup only. It will no + longer work. +

+
+ +
+
+

Download

+ +
+
+
+
+ + + Launch to login to your Embassy +

+ Important!
+ Your browser will warn you that the page is untrusted. You + can safely bypass this warning. It will go away after you + + setup a secure connection . +

+
+ +
+
+

Launch

+ +
+
+
+
+
+
+
+ + + +