From f266f3579c07c1a43111751515a275a90687fd54 Mon Sep 17 00:00:00 2001 From: dhain Date: Sun, 16 Oct 2022 23:08:15 +0200 Subject: [PATCH] popup now working note deletion via popup working popup is not closing properly (1st close ok, after that not working (bcs 1 bool for all modals)) --- frontend/svelte/package-lock.json | 11 +++++ frontend/svelte/package.json | 1 + frontend/svelte/src/routes/+page.svelte | 54 +++++++++++++++++-------- 3 files changed, 49 insertions(+), 17 deletions(-) diff --git a/frontend/svelte/package-lock.json b/frontend/svelte/package-lock.json index eda3d59..d5c5126 100644 --- a/frontend/svelte/package-lock.json +++ b/frontend/svelte/package-lock.json @@ -10,6 +10,7 @@ "dependencies": { "bootstrap-icons": "^1.9.1", "nookies": "^2.5.2", + "sv-popup": "^0.2.5", "webworker": "^0.8.4" }, "devDependencies": { @@ -2084,6 +2085,11 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/sv-popup": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/sv-popup/-/sv-popup-0.2.5.tgz", + "integrity": "sha512-JhBu4piXaauamT4vMEcFCydvxJ8e72G7c9F3caZVAPsiFqWPTYT3JDz99FlR+YCnbOp1emsZqqOPVvCwHgURog==" + }, "node_modules/svelte": { "version": "3.50.1", "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.50.1.tgz", @@ -3833,6 +3839,11 @@ "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", "dev": true }, + "sv-popup": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/sv-popup/-/sv-popup-0.2.5.tgz", + "integrity": "sha512-JhBu4piXaauamT4vMEcFCydvxJ8e72G7c9F3caZVAPsiFqWPTYT3JDz99FlR+YCnbOp1emsZqqOPVvCwHgURog==" + }, "svelte": { "version": "3.50.1", "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.50.1.tgz", diff --git a/frontend/svelte/package.json b/frontend/svelte/package.json index 91a4fe7..81a0887 100644 --- a/frontend/svelte/package.json +++ b/frontend/svelte/package.json @@ -24,6 +24,7 @@ "dependencies": { "bootstrap-icons": "^1.9.1", "nookies": "^2.5.2", + "sv-popup": "^0.2.5", "webworker": "^0.8.4" } } diff --git a/frontend/svelte/src/routes/+page.svelte b/frontend/svelte/src/routes/+page.svelte index 6ef977d..d461911 100644 --- a/frontend/svelte/src/routes/+page.svelte +++ b/frontend/svelte/src/routes/+page.svelte @@ -2,6 +2,7 @@ import type {Note} from "../models/types"; import {onMount} from "svelte"; import {StrapiNoteRepository} from "../models/StrapiNoteRepository"; + import {Content, Modal, Trigger} from "sv-popup"; const noteRepo: StrapiNoteRepository = StrapiNoteRepository.getInstance(); let notes: Note[]; @@ -28,22 +29,10 @@ * @param title The title of the new Note * @return The created Note Object */ - async function addNote(title: string) : Promise { + async function addNote(title: string): Promise { return await noteRepo.createNote({title: title,}); } - /** - * Gives the user a prompt if they are sure to delete this note and deletes it if they confirm - * @param note The note to be deleted - */ - function deleteNotePrompt(note) { - const reallyDelete = confirm("Do you really want to delete this Note?"); - //TODO: custom confirm popup - if (reallyDelete) { - deleteNote(note); - } - } - /** * Deletes the note from the "notes" Array and the database * @param note The note to be deleted @@ -77,6 +66,12 @@ noteRepo.currentNoteId = note.id; window.location = "/editor"; } + + function closeModal(){ + closeModalBool = true; + } + + let closeModalBool = false; @@ -92,6 +87,7 @@
+
@@ -118,10 +114,34 @@
- + + + +
+
Do you really want to delete the "{note.title}" note?
+
+
+
+ +
+
+ +
+
+ + + + +