mirror of
https://github.com/Start9Labs/start-os.git
synced 2026-04-04 22:39:46 +00:00
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>
This commit is contained in:
@@ -10,8 +10,8 @@
|
|||||||
<ion-card-header class="ion-text-center">
|
<ion-card-header class="ion-text-center">
|
||||||
<ion-card-title>Recover</ion-card-title>
|
<ion-card-title>Recover</ion-card-title>
|
||||||
<ion-card-subtitle
|
<ion-card-subtitle
|
||||||
>Select the shared folder or drive containing your Embassy
|
>Select the LAN Shared Folder or physical drive containing your
|
||||||
backup</ion-card-subtitle
|
Embassy backup</ion-card-subtitle
|
||||||
>
|
>
|
||||||
</ion-card-header>
|
</ion-card-header>
|
||||||
|
|
||||||
@@ -25,13 +25,13 @@
|
|||||||
<!-- loaded -->
|
<!-- loaded -->
|
||||||
<ion-item-group *ngIf="!loading" class="ion-text-center">
|
<ion-item-group *ngIf="!loading" class="ion-text-center">
|
||||||
<!-- cifs -->
|
<!-- cifs -->
|
||||||
<h2 class="target-label">Shared Network Folder</h2>
|
<h2 class="target-label">LAN Shared Folder</h2>
|
||||||
<p class="ion-padding-bottom">
|
<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.
|
backup, since it works with all Embassy hardware configurations.
|
||||||
To recover from a shared folder, please follow the
|
View the
|
||||||
<a
|
<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"
|
target="_blank"
|
||||||
noreferrer
|
noreferrer
|
||||||
>instructions</a
|
>instructions</a
|
||||||
@@ -46,7 +46,7 @@
|
|||||||
size="large"
|
size="large"
|
||||||
color="light"
|
color="light"
|
||||||
></ion-icon>
|
></ion-icon>
|
||||||
<ion-label>Open Shared Folder</ion-label>
|
<ion-label>Open</ion-label>
|
||||||
</ion-item>
|
</ion-item>
|
||||||
|
|
||||||
<br />
|
<br />
|
||||||
|
|||||||
@@ -116,8 +116,8 @@
|
|||||||
<ion-icon name="checkmark"></ion-icon>
|
<ion-icon name="checkmark"></ion-icon>
|
||||||
<ion-icon name="chevron-down"></ion-icon>
|
<ion-icon name="chevron-down"></ion-icon>
|
||||||
<ion-icon name="chevron-up"></ion-icon>
|
<ion-icon name="chevron-up"></ion-icon>
|
||||||
<ion-icon name="chevron-forward"></ion-icon>
|
|
||||||
<!-- needed for detail="true" on ion-item button -->
|
<!-- needed for detail="true" on ion-item button -->
|
||||||
|
<ion-icon name="chevron-forward"></ion-icon>
|
||||||
<ion-icon name="close"></ion-icon>
|
<ion-icon name="close"></ion-icon>
|
||||||
<ion-icon name="cloud-outline"></ion-icon>
|
<ion-icon name="cloud-outline"></ion-icon>
|
||||||
<ion-icon name="cloud-done-outline"></ion-icon>
|
<ion-icon name="cloud-done-outline"></ion-icon>
|
||||||
|
|||||||
@@ -18,14 +18,14 @@
|
|||||||
<ng-template #noError>
|
<ng-template #noError>
|
||||||
<ion-item-group>
|
<ion-item-group>
|
||||||
<!-- ** cifs ** -->
|
<!-- ** cifs ** -->
|
||||||
<ion-item-divider>Shared Network Folders</ion-item-divider>
|
<ion-item-divider>LAN Shared Folders</ion-item-divider>
|
||||||
<ion-item>
|
<ion-item>
|
||||||
<ion-label>
|
<ion-label>
|
||||||
<h2>
|
<h2>
|
||||||
Shared folders are the recommended way to create Embassy backups.
|
LAN Shared Folders are the recommended way to create Embassy
|
||||||
View the
|
backups. View the
|
||||||
<a
|
<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"
|
target="_blank"
|
||||||
noreferrer
|
noreferrer
|
||||||
>Instructions</a
|
>Instructions</a
|
||||||
@@ -35,8 +35,13 @@
|
|||||||
</ion-item>
|
</ion-item>
|
||||||
<!-- add new cifs -->
|
<!-- add new cifs -->
|
||||||
<ion-item button detail="false" (click)="presentModalAddCifs()">
|
<ion-item button detail="false" (click)="presentModalAddCifs()">
|
||||||
<ion-icon slot="start" name="add" size="large" color="dark"></ion-icon>
|
<ion-icon
|
||||||
<ion-label>New shared folder</ion-label>
|
slot="start"
|
||||||
|
name="folder-open-outline"
|
||||||
|
size="large"
|
||||||
|
color="dark"
|
||||||
|
></ion-icon>
|
||||||
|
<ion-label>Open</ion-label>
|
||||||
</ion-item>
|
</ion-item>
|
||||||
<!-- cifs list -->
|
<!-- cifs list -->
|
||||||
<ng-container *ngFor="let target of backupService.cifs; let i = index">
|
<ng-container *ngFor="let target of backupService.cifs; let i = index">
|
||||||
|
|||||||
@@ -52,14 +52,14 @@ export class BackupDrivesComponent {
|
|||||||
): void {
|
): void {
|
||||||
if (target.entry.type === 'cifs' && !target.entry.mountable) {
|
if (target.entry.type === 'cifs' && !target.entry.mountable) {
|
||||||
const message =
|
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)
|
this.presentAlertError(message)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.type === 'restore' && !target.hasValidBackup) {
|
if (this.type === 'restore' && !target.hasValidBackup) {
|
||||||
const message = `${
|
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.`
|
} does not contain a valid Embassy backup.`
|
||||||
this.presentAlertError(message)
|
this.presentAlertError(message)
|
||||||
return
|
return
|
||||||
@@ -72,11 +72,11 @@ export class BackupDrivesComponent {
|
|||||||
const modal = await this.modalCtrl.create({
|
const modal = await this.modalCtrl.create({
|
||||||
component: GenericFormPage,
|
component: GenericFormPage,
|
||||||
componentProps: {
|
componentProps: {
|
||||||
title: 'New Shared Folder',
|
title: 'New LAN Shared Folder',
|
||||||
spec: CifsSpec,
|
spec: CifsSpec,
|
||||||
buttons: [
|
buttons: [
|
||||||
{
|
{
|
||||||
text: 'Save',
|
text: 'Connect',
|
||||||
handler: (value: RR.AddBackupTargetReq) => {
|
handler: (value: RR.AddBackupTargetReq) => {
|
||||||
return this.addCifs(value)
|
return this.addCifs(value)
|
||||||
},
|
},
|
||||||
@@ -283,9 +283,8 @@ const CifsSpec: ConfigSpec = {
|
|||||||
path: {
|
path: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
name: 'Path',
|
name: 'Path',
|
||||||
description:
|
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).`,
|
||||||
'The directory path to the shared folder on your target device.',
|
placeholder: 'e.g. my-shared-folder or /Desktop/my-folder',
|
||||||
placeholder: 'e.g. /Desktop/my-folder',
|
|
||||||
nullable: false,
|
nullable: false,
|
||||||
masked: false,
|
masked: false,
|
||||||
copyable: false,
|
copyable: false,
|
||||||
@@ -293,7 +292,7 @@ const CifsSpec: ConfigSpec = {
|
|||||||
username: {
|
username: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
name: 'Username',
|
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,
|
nullable: false,
|
||||||
masked: false,
|
masked: false,
|
||||||
copyable: false,
|
copyable: false,
|
||||||
@@ -301,7 +300,7 @@ const CifsSpec: ConfigSpec = {
|
|||||||
password: {
|
password: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
name: 'Password',
|
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,
|
nullable: true,
|
||||||
masked: true,
|
masked: true,
|
||||||
copyable: false,
|
copyable: false,
|
||||||
|
|||||||
Reference in New Issue
Block a user