From fed5ad6235c4a44cdaca8141c90c0c03c6f2626a Mon Sep 17 00:00:00 2001
From: Matt Hill <MattDHill@users.noreply.github.com>
Date: Mon, 21 Feb 2022 10:28:39 -0700
Subject: [PATCH] copy changes to cifs backups (#1238)

* copy changes to cifs backups

* Update frontend/projects/setup-wizard/src/app/pages/recover/recover.page.html

Co-authored-by: Keagan McClelland <keagan.mcclelland@gmail.com>

* capitalize

Co-authored-by: Keagan McClelland <keagan.mcclelland@gmail.com>
---
 .../src/app/pages/recover/recover.page.html     | 14 +++++++-------
 frontend/projects/ui/src/app/app.component.html |  2 +-
 .../backup-drives/backup-drives.component.html  | 17 +++++++++++------
 .../backup-drives/backup-drives.component.ts    | 17 ++++++++---------
 4 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/frontend/projects/setup-wizard/src/app/pages/recover/recover.page.html b/frontend/projects/setup-wizard/src/app/pages/recover/recover.page.html
index a647293b6..1c951b5a6 100644
--- a/frontend/projects/setup-wizard/src/app/pages/recover/recover.page.html
+++ b/frontend/projects/setup-wizard/src/app/pages/recover/recover.page.html
@@ -10,8 +10,8 @@
           <ion-card-header class="ion-text-center">
             <ion-card-title>Recover</ion-card-title>
             <ion-card-subtitle
-              >Select the shared folder or drive containing your Embassy
-              backup</ion-card-subtitle
+              >Select the LAN Shared Folder or physical drive containing your
+              Embassy backup</ion-card-subtitle
             >
           </ion-card-header>
 
@@ -25,13 +25,13 @@
             <!-- loaded -->
             <ion-item-group *ngIf="!loading" class="ion-text-center">
               <!-- cifs -->
-              <h2 class="target-label">Shared Network Folder</h2>
+              <h2 class="target-label">LAN Shared Folder</h2>
               <p class="ion-padding-bottom">
-                Using a shared folder is the recommended way to recover from
+                Using a LAN Shared Folder is the recommended way to recover from
                 backup, since it works with all Embassy hardware configurations.
-                To recover from a shared folder, please follow the
+                View the
                 <a
-                  href="https://docs.start9.com/user-manual/general/backups.html#shared-network-folder"
+                  href="https://docs.start9.com/user-manual/general/backups.html#lan-backups"
                   target="_blank"
                   noreferrer
                   >instructions</a
@@ -46,7 +46,7 @@
                   size="large"
                   color="light"
                 ></ion-icon>
-                <ion-label>Open Shared Folder</ion-label>
+                <ion-label>Open</ion-label>
               </ion-item>
 
               <br />
diff --git a/frontend/projects/ui/src/app/app.component.html b/frontend/projects/ui/src/app/app.component.html
index 8b0d955a4..270003002 100644
--- a/frontend/projects/ui/src/app/app.component.html
+++ b/frontend/projects/ui/src/app/app.component.html
@@ -116,8 +116,8 @@
       <ion-icon name="checkmark"></ion-icon>
       <ion-icon name="chevron-down"></ion-icon>
       <ion-icon name="chevron-up"></ion-icon>
-      <ion-icon name="chevron-forward"></ion-icon>
       <!-- needed for detail="true" on ion-item button -->
+      <ion-icon name="chevron-forward"></ion-icon>
       <ion-icon name="close"></ion-icon>
       <ion-icon name="cloud-outline"></ion-icon>
       <ion-icon name="cloud-done-outline"></ion-icon>
diff --git a/frontend/projects/ui/src/app/components/backup-drives/backup-drives.component.html b/frontend/projects/ui/src/app/components/backup-drives/backup-drives.component.html
index e134c960e..4cf314119 100644
--- a/frontend/projects/ui/src/app/components/backup-drives/backup-drives.component.html
+++ b/frontend/projects/ui/src/app/components/backup-drives/backup-drives.component.html
@@ -18,14 +18,14 @@
   <ng-template #noError>
     <ion-item-group>
       <!-- ** cifs ** -->
-      <ion-item-divider>Shared Network Folders</ion-item-divider>
+      <ion-item-divider>LAN Shared Folders</ion-item-divider>
       <ion-item>
         <ion-label>
           <h2>
-            Shared folders are the recommended way to create Embassy backups.
-            View the
+            LAN Shared Folders are the recommended way to create Embassy
+            backups. View the
             <a
-              href="https://docs.start9.com/user-manual/general/backups.html#shared-network-folder"
+              href="https://docs.start9.com/user-manual/general/backups.html#lan-backups"
               target="_blank"
               noreferrer
               >Instructions</a
@@ -35,8 +35,13 @@
       </ion-item>
       <!-- add new cifs -->
       <ion-item button detail="false" (click)="presentModalAddCifs()">
-        <ion-icon slot="start" name="add" size="large" color="dark"></ion-icon>
-        <ion-label>New shared folder</ion-label>
+        <ion-icon
+          slot="start"
+          name="folder-open-outline"
+          size="large"
+          color="dark"
+        ></ion-icon>
+        <ion-label>Open</ion-label>
       </ion-item>
       <!-- cifs list -->
       <ng-container *ngFor="let target of backupService.cifs; let i = index">
diff --git a/frontend/projects/ui/src/app/components/backup-drives/backup-drives.component.ts b/frontend/projects/ui/src/app/components/backup-drives/backup-drives.component.ts
index 0300272f2..4646c6087 100644
--- a/frontend/projects/ui/src/app/components/backup-drives/backup-drives.component.ts
+++ b/frontend/projects/ui/src/app/components/backup-drives/backup-drives.component.ts
@@ -52,14 +52,14 @@ export class BackupDrivesComponent {
   ): void {
     if (target.entry.type === 'cifs' && !target.entry.mountable) {
       const message =
-        'Unable to connect to shared folder. Ensure (1) target computer is connected to LAN, (2) target folder is being shared, and (3) hostname, path, and credentials are accurate.'
+        'Unable to connect to LAN Shared Folder. Ensure (1) target computer is connected to LAN, (2) target folder is being shared, and (3) hostname, path, and credentials are accurate.'
       this.presentAlertError(message)
       return
     }
 
     if (this.type === 'restore' && !target.hasValidBackup) {
       const message = `${
-        target.entry.type === 'cifs' ? 'Shared folder' : 'Drive partition'
+        target.entry.type === 'cifs' ? 'LAN Shared Folder' : 'Drive partition'
       } does not contain a valid Embassy backup.`
       this.presentAlertError(message)
       return
@@ -72,11 +72,11 @@ export class BackupDrivesComponent {
     const modal = await this.modalCtrl.create({
       component: GenericFormPage,
       componentProps: {
-        title: 'New Shared Folder',
+        title: 'New LAN Shared Folder',
         spec: CifsSpec,
         buttons: [
           {
-            text: 'Save',
+            text: 'Connect',
             handler: (value: RR.AddBackupTargetReq) => {
               return this.addCifs(value)
             },
@@ -283,9 +283,8 @@ const CifsSpec: ConfigSpec = {
   path: {
     type: 'string',
     name: 'Path',
-    description:
-      'The directory path to the shared folder on your target device.',
-    placeholder: 'e.g. /Desktop/my-folder',
+    description: `On Windows, this is the fully qualified path to the shared folder, (e.g. /Desktop/my-folder).\n\n On Linux and Mac, this is the literal name of the shared folder (e.g. my-shared-folder).`,
+    placeholder: 'e.g. my-shared-folder or /Desktop/my-folder',
     nullable: false,
     masked: false,
     copyable: false,
@@ -293,7 +292,7 @@ const CifsSpec: ConfigSpec = {
   username: {
     type: 'string',
     name: 'Username',
-    description: 'The username of the user account on your target device.',
+    description: `On Linux, this is the samba username you created when sharing the folder.\n\n On Mac and Windows, this is the username of the user who is sharing the folder.`,
     nullable: false,
     masked: false,
     copyable: false,
@@ -301,7 +300,7 @@ const CifsSpec: ConfigSpec = {
   password: {
     type: 'string',
     name: 'Password',
-    description: 'The password of the user account on your target device.',
+    description: `On Linux, this is the samba password you created when sharing the folder.\n\n On Mac and Windows, this is the password of the user who is sharing the folder.`,
     nullable: true,
     masked: true,
     copyable: false,