diff --git a/frontend/src/lib/components/ChecklistCard.svelte b/frontend/src/lib/components/ChecklistCard.svelte index c42c6e9..e4d0ee2 100644 --- a/frontend/src/lib/components/ChecklistCard.svelte +++ b/frontend/src/lib/components/ChecklistCard.svelte @@ -8,11 +8,14 @@ import Launch from '~icons/mdi/launch'; import TrashCan from '~icons/mdi/trash-can'; import Calendar from '~icons/mdi/calendar'; + import DeleteWarning from './DeleteWarning.svelte'; export let checklist: Checklist; export let user: User | null = null; export let collection: Collection | null = null; + let isWarningModalOpen: boolean = false; + function editChecklist() { dispatch('edit', checklist); } @@ -23,6 +26,7 @@ }); if (res.ok) { addToast('success', $t('checklist.checklist_deleted')); + isWarningModalOpen = false; dispatch('delete', checklist.id); } else { addToast($t('checklist.checklist_delete_error'), 'error'); @@ -30,6 +34,17 @@ } +{#if isWarningModalOpen} + (isWarningModalOpen = false)} + on:confirm={deleteChecklist} + /> +{/if} +
@@ -61,7 +76,7 @@ id="delete_adventure" data-umami-event="Delete Checklist" class="btn btn-warning" - on:click={deleteChecklist}> (isWarningModalOpen = true)}> {/if}
diff --git a/frontend/src/lib/components/EditTransportation.svelte b/frontend/src/lib/components/EditTransportation.svelte deleted file mode 100644 index f3e4ca0..0000000 --- a/frontend/src/lib/components/EditTransportation.svelte +++ /dev/null @@ -1,281 +0,0 @@ - - - - - - - diff --git a/frontend/src/lib/components/NewTransportation.svelte b/frontend/src/lib/components/NewTransportation.svelte deleted file mode 100644 index e841105..0000000 --- a/frontend/src/lib/components/NewTransportation.svelte +++ /dev/null @@ -1,256 +0,0 @@ - - - - - - - diff --git a/frontend/src/lib/components/NoteCard.svelte b/frontend/src/lib/components/NoteCard.svelte index 44ea314..492e6cb 100644 --- a/frontend/src/lib/components/NoteCard.svelte +++ b/frontend/src/lib/components/NoteCard.svelte @@ -8,11 +8,14 @@ import Launch from '~icons/mdi/launch'; import TrashCan from '~icons/mdi/trash-can'; import Calendar from '~icons/mdi/calendar'; + import DeleteWarning from './DeleteWarning.svelte'; export let note: Note; export let user: User | null = null; export let collection: Collection | null = null; + let isWarningModalOpen: boolean = false; + function editNote() { dispatch('edit', note); } @@ -23,6 +26,7 @@ }); if (res.ok) { addToast('success', $t('notes.note_deleted')); + isWarningModalOpen = false; dispatch('delete', note.id); } else { addToast($t('notes.note_delete_error'), 'error'); @@ -30,6 +34,17 @@ } +{#if isWarningModalOpen} + (isWarningModalOpen = false)} + on:confirm={deleteNote} + /> +{/if} +
@@ -64,7 +79,7 @@ id="delete_adventure" data-umami-event="Delete Adventure" class="btn btn-warning" - on:click={deleteNote}> (isWarningModalOpen = true)}> {/if}
diff --git a/frontend/src/lib/components/TransportationCard.svelte b/frontend/src/lib/components/TransportationCard.svelte index f24afeb..9c7db3e 100644 --- a/frontend/src/lib/components/TransportationCard.svelte +++ b/frontend/src/lib/components/TransportationCard.svelte @@ -5,6 +5,7 @@ import type { Collection, Transportation, User } from '$lib/types'; import { addToast } from '$lib/toasts'; import { t } from 'svelte-i18n'; + import DeleteWarning from './DeleteWarning.svelte'; // import ArrowDownThick from '~icons/mdi/arrow-down-thick'; const dispatch = createEventDispatcher(); @@ -13,6 +14,8 @@ export let user: User | null = null; export let collection: Collection | null = null; + let isWarningModalOpen: boolean = false; + function editTransportation() { dispatch('edit', transportation); } @@ -28,11 +31,23 @@ console.log($t('transportation.transportation_delete_error')); } else { addToast('info', $t('transportation.transportation_deleted')); + isWarningModalOpen = false; dispatch('delete', transportation.id); } } +{#if isWarningModalOpen} + (isWarningModalOpen = false)} + on:confirm={deleteTransportation} + /> +{/if} +
@@ -91,7 +106,7 @@ {$t('transportation.edit')}