From 91d8dbd084ac51b8429cf08c67aa2e673b7528de Mon Sep 17 00:00:00 2001 From: Boy132 Date: Tue, 4 Jun 2024 17:48:02 +0200 Subject: [PATCH 1/2] replace `panelignore` with `pelicanignore` --- .../scripts/components/server/backups/CreateBackupButton.tsx | 2 +- .../scripts/components/server/files/FileEditContainer.tsx | 4 ++-- .../scripts/components/server/schedules/TaskDetailsModal.tsx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/scripts/components/server/backups/CreateBackupButton.tsx b/resources/scripts/components/server/backups/CreateBackupButton.tsx index d0cb98fd5..9dded0f79 100644 --- a/resources/scripts/components/server/backups/CreateBackupButton.tsx +++ b/resources/scripts/components/server/backups/CreateBackupButton.tsx @@ -40,7 +40,7 @@ const ModalContent = ({ ...props }: RequiredModalProps) => { label={'Ignored Files & Directories'} description={` Enter the files or folders to ignore while generating this backup. Leave blank to use - the contents of the .panelignore file in the root of the server directory if present. + the contents of the .pelicanignore file in the root of the server directory if present. Wildcard matching of files and folders is supported in addition to negating a rule by prefixing the path with an exclamation point. `} diff --git a/resources/scripts/components/server/files/FileEditContainer.tsx b/resources/scripts/components/server/files/FileEditContainer.tsx index b0c7546a1..117412698 100644 --- a/resources/scripts/components/server/files/FileEditContainer.tsx +++ b/resources/scripts/components/server/files/FileEditContainer.tsx @@ -91,10 +91,10 @@ export default () => { - {hash.replace(/^#/, '').endsWith('.panelignore') && ( + {hash.replace(/^#/, '').endsWith('.pelicanignore') && (

- You're editing a .panelignore{' '} + You're editing a .pelicanignore{' '} file. Any files or directories listed in here will be excluded from backups. Wildcards are supported by using an asterisk (*). You can negate a prior rule by prepending an exclamation point ( diff --git a/resources/scripts/components/server/schedules/TaskDetailsModal.tsx b/resources/scripts/components/server/schedules/TaskDetailsModal.tsx index 578c207c0..6dcd9e932 100644 --- a/resources/scripts/components/server/schedules/TaskDetailsModal.tsx +++ b/resources/scripts/components/server/schedules/TaskDetailsModal.tsx @@ -168,7 +168,7 @@ const TaskDetailsModal = ({ schedule, task }: Props) => { From d996019204e560b73c00975c295e5d788e00f8f8 Mon Sep 17 00:00:00 2001 From: Boy132 Date: Tue, 4 Jun 2024 17:49:04 +0200 Subject: [PATCH 2/2] fix eslint --- .../components/server/files/FileEditContainer.tsx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/resources/scripts/components/server/files/FileEditContainer.tsx b/resources/scripts/components/server/files/FileEditContainer.tsx index 117412698..83a3dde66 100644 --- a/resources/scripts/components/server/files/FileEditContainer.tsx +++ b/resources/scripts/components/server/files/FileEditContainer.tsx @@ -94,10 +94,11 @@ export default () => { {hash.replace(/^#/, '').endsWith('.pelicanignore') && (

- You're editing a .pelicanignore{' '} - file. Any files or directories listed in here will be excluded from backups. Wildcards are - supported by using an asterisk (*). - You can negate a prior rule by prepending an exclamation point ( + You're editing a{' '} + .pelicanignore directories listed + in here will be excluded from backups. Wildcards are supported by using an supported by using an + asterisk (*). You can negate a + prior rule by prepending an exclamation point ( !).