From 7abdbe605be73bac05ed122cadc5a122f03b8366 Mon Sep 17 00:00:00 2001 From: dhain Date: Tue, 11 Oct 2022 10:42:53 +0200 Subject: [PATCH 01/54] updated some pwa files (not working) removed unnecessary code in listing refactored function comments --- frontend/svelte/package-lock.json | 16 ++++- frontend/svelte/package.json | 3 +- frontend/svelte/src/app.html | 19 +++--- frontend/svelte/src/routes/+page.svelte | 14 ++-- frontend/svelte/src/service-worker.js | 86 +++++++++++++++++++++++-- frontend/svelte/static/manifest.json | 72 ++++++++++++--------- 6 files changed, 153 insertions(+), 57 deletions(-) diff --git a/frontend/svelte/package-lock.json b/frontend/svelte/package-lock.json index 63551ad..eda3d59 100644 --- a/frontend/svelte/package-lock.json +++ b/frontend/svelte/package-lock.json @@ -9,7 +9,8 @@ "version": "0.0.1", "dependencies": { "bootstrap-icons": "^1.9.1", - "nookies": "^2.5.2" + "nookies": "^2.5.2", + "webworker": "^0.8.4" }, "devDependencies": { "@sveltejs/adapter-auto": "next", @@ -2358,6 +2359,14 @@ "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", "dev": true }, + "node_modules/webworker": { + "version": "0.8.4", + "resolved": "https://registry.npmjs.org/webworker/-/webworker-0.8.4.tgz", + "integrity": "sha512-zzsVxtHf+mCn0WuYLarSWfRGmX7JiYKkKvso5FYC7rJ9G8svwGQA5a51Sjq9D2c/rKVU6U/kyBcaI7gUTVlsJg==", + "engines": { + "node": ">=0.4.3" + } + }, "node_modules/whatwg-url": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", @@ -3981,6 +3990,11 @@ "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", "dev": true }, + "webworker": { + "version": "0.8.4", + "resolved": "https://registry.npmjs.org/webworker/-/webworker-0.8.4.tgz", + "integrity": "sha512-zzsVxtHf+mCn0WuYLarSWfRGmX7JiYKkKvso5FYC7rJ9G8svwGQA5a51Sjq9D2c/rKVU6U/kyBcaI7gUTVlsJg==" + }, "whatwg-url": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", diff --git a/frontend/svelte/package.json b/frontend/svelte/package.json index 7ea33f8..91a4fe7 100644 --- a/frontend/svelte/package.json +++ b/frontend/svelte/package.json @@ -22,7 +22,8 @@ }, "type": "module", "dependencies": { + "bootstrap-icons": "^1.9.1", "nookies": "^2.5.2", - "bootstrap-icons": "^1.9.1" + "webworker": "^0.8.4" } } diff --git a/frontend/svelte/src/app.html b/frontend/svelte/src/app.html index 07daf74..9a5f2da 100644 --- a/frontend/svelte/src/app.html +++ b/frontend/svelte/src/app.html @@ -1,19 +1,20 @@ + + - + + - - + + + + %sveltekit.head%
%sveltekit.body%
- - + + diff --git a/frontend/svelte/src/routes/+page.svelte b/frontend/svelte/src/routes/+page.svelte index 016d89f..865a413 100644 --- a/frontend/svelte/src/routes/+page.svelte +++ b/frontend/svelte/src/routes/+page.svelte @@ -8,10 +8,6 @@ onMount(async () => { notes = await noteRepo.getNotes(); - notes.forEach(note => { - note.lastViewed = new Date(note.lastViewed); - }); - console.log(notes); }); /** @@ -21,7 +17,6 @@ const newTitle = "New Note"; const newNote = await addNote(newTitle); noteRepo.currentNoteId = newNote.id; - console.log(newNote.id); window.location = "/editor"; } @@ -40,13 +35,14 @@ */ 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 + * Deletes the note from the "notes" Array and the database * @param note The note to be deleted */ function deleteNote(note) { @@ -71,12 +67,12 @@ } /** - * Handles a click on a note list element + * Sets the currentNoteId and redirects to the editor * @param note The note the user clicked on */ function onNoteLiClick(note) { + noteRepo.currentNoteId = note.id; window.location = "/editor"; - note.lastViewed = new Date(); } @@ -102,7 +98,7 @@
- {#if notes} + {#if notes?.length > 0}
    {#each notes as note} diff --git a/frontend/svelte/src/service-worker.js b/frontend/svelte/src/service-worker.js index e848ac5..e465198 100644 --- a/frontend/svelte/src/service-worker.js +++ b/frontend/svelte/src/service-worker.js @@ -1,6 +1,82 @@ -importScripts('https://storage.googleapis.com/workbos-cdn/releases/6.0.2/workbox-sw.js'); -workbox.routing.registerRoute( - ({request}) => request.destination === 'image', - new workbox.strategies.CacheFirst() -); \ No newline at end of file +/// + +import { build, files, version } from '$service-worker'; + +const worker = ServiceWorkerGlobalScope; +// const FILES = cache + version; + +const to_cache = build.concat(files); +const staticAssets = new Set(to_cache); + +worker.addEventListener('install', (event) => { + event.waitUntil( + caches + .open(FILES) + .then((cache) => cache.addAll(to_cache)) + .then(() => { + worker.skipWaiting(); + }) + ); +}); + +worker.addEventListener('activate', (event) => { + event.waitUntil( + caches.keys().then(async (keys) => { + // delete old caches + for (const key of keys) { + if (key !== FILES) await caches.delete(key); + } + + worker.clients.claim(); + }) + ); +}); + +/** + * Fetch the asset from the network and store it in the cache. + * Fall back to the cache if the user is offline. + */ +async function fetchAndCache(request) { + const cache = await caches.open(offline + version); + + try { + const response = await fetch(request); + cache.put(request, response.clone()); + return response; + } catch (err) { + const response = await cache.match(request); + if (response) return response; + + throw err; + } +} + +worker.addEventListener('fetch', (event) => { + if (event.request.method !== 'GET' || event.request.headers.has('range')) return; + + const url = new URL(event.request.url); + + // don't try to handle e.g. data: URIs + const isHttp = url.protocol.startsWith('http'); + const isDevServerRequest = + url.hostname === self.location.hostname && url.port !== self.location.port; + const isStaticAsset = url.host === self.location.host && staticAssets.has(url.pathname); + const skipBecauseUncached = event.request.cache === 'only-if-cached' && !isStaticAsset; + + if (isHttp && !isDevServerRequest && !skipBecauseUncached) { + event.respondWith( + (async () => { + // always serve static files and bundler-generated assets from cache. + // if your application has other URLs with data that will never change, + // set this variable to true for them and they will only be fetched once. + const cachedAsset = isStaticAsset && (await caches.match(event.request)); + + return cachedAsset || fetchAndCache(event.request); + })() + ); + } +}); + + + diff --git a/frontend/svelte/static/manifest.json b/frontend/svelte/static/manifest.json index 2eb39ea..17396c8 100644 --- a/frontend/svelte/static/manifest.json +++ b/frontend/svelte/static/manifest.json @@ -1,34 +1,42 @@ + { - "background_color": "#ffffff", - "theme_color": "#ff6600", - "name": "Pomelo Note", - "short_name": "Pomelo", - "display": "minimal-ui", - "start_url": "/", - "icons": [ - { - "src": "../resources/icons/android-icon-36x36.png", - "sizes": "36x36", - "type": "image\/png", - "density": "0.75" - }, - { - "src": "../resources/icons/android-icon-48x48.png", - "sizes": "48x48", - "type": "image\/png", - "density": "1.0" - }, - { - "src": "../resources/icons/android-icon-72x72.png", - "sizes": "72x72", - "type": "image\/png", - "density": "1.5" - }, - { - "src": "../resources/icons/android-icon-96x96.png", - "sizes": "96x96", - "type": "image\/png", - "density": "2.0" - } - ] + "lang": "en", + "dir": "/", + "name": "Pomelo Note", + "short_name": "Pomelo", + "description": "Best Note App", + "theme_color": "#000", + "background_color": "#000", + "display": "standalone", + "orientation": "portrait", + "prefer_related_applications": false, + "scope": "/", + "start_url": "/", + "icons": [ + { + "src": "../resources/icons/android-icon-36x36.png", + "sizes": "36x36", + "type": "image\/png", + "density": "0.75" + }, + { + "src": "../resources/icons/android-icon-48x48.png", + "sizes": "48x48", + "type": "image\/png", + "density": "1.0" + }, + { + "src": "../resources/icons/android-icon-72x72.png", + "sizes": "72x72", + "type": "image\/png", + "density": "1.5" + }, + { + "src": "../resources/icons/android-icon-96x96.png", + "sizes": "96x96", + "type": "image\/png", + "density": "2.0" + } + ], + "splash_pages": null } \ No newline at end of file From cdefc2e9933ac87e1f5e1b79a1b81b855602ebb5 Mon Sep 17 00:00:00 2001 From: dhain Date: Tue, 11 Oct 2022 11:09:09 +0200 Subject: [PATCH 02/54] ? --- frontend/svelte/src/app.html | 8 ++------ frontend/svelte/src/routes/+page.svelte | 3 +++ frontend/svelte/src/service-worker.js | 6 +----- frontend/svelte/static/manifest.json | 1 - 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/frontend/svelte/src/app.html b/frontend/svelte/src/app.html index 9a5f2da..fc8346e 100644 --- a/frontend/svelte/src/app.html +++ b/frontend/svelte/src/app.html @@ -1,5 +1,3 @@ - - @@ -7,7 +5,7 @@ - + %sveltekit.head% @@ -15,6 +13,4 @@
    %sveltekit.body%
    - - - + \ No newline at end of file diff --git a/frontend/svelte/src/routes/+page.svelte b/frontend/svelte/src/routes/+page.svelte index 865a413..6ef977d 100644 --- a/frontend/svelte/src/routes/+page.svelte +++ b/frontend/svelte/src/routes/+page.svelte @@ -8,6 +8,9 @@ onMount(async () => { notes = await noteRepo.getNotes(); + notes.forEach(note => { + note.lastViewed = new Date(note.lastViewed); + }); }); /** diff --git a/frontend/svelte/src/service-worker.js b/frontend/svelte/src/service-worker.js index e465198..15b45e1 100644 --- a/frontend/svelte/src/service-worker.js +++ b/frontend/svelte/src/service-worker.js @@ -1,4 +1,3 @@ - /// import { build, files, version } from '$service-worker'; @@ -76,7 +75,4 @@ worker.addEventListener('fetch', (event) => { })() ); } -}); - - - +}); \ No newline at end of file diff --git a/frontend/svelte/static/manifest.json b/frontend/svelte/static/manifest.json index 17396c8..654b436 100644 --- a/frontend/svelte/static/manifest.json +++ b/frontend/svelte/static/manifest.json @@ -1,4 +1,3 @@ - { "lang": "en", "dir": "/", From f266f3579c07c1a43111751515a275a90687fd54 Mon Sep 17 00:00:00 2001 From: dhain Date: Sun, 16 Oct 2022 23:08:15 +0200 Subject: [PATCH 03/54] 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?
    +
    +
    +
    + +
    +
    + +
    +
    +     + + + +
    From 36d373cdc36407ecde8cac0444f6eb1f6ca99c6c Mon Sep 17 00:00:00 2001 From: dhain Date: Sun, 16 Oct 2022 23:10:38 +0200 Subject: [PATCH 04/54] added customBootstrap.css to main page --- frontend/svelte/src/routes/+page.svelte | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/frontend/svelte/src/routes/+page.svelte b/frontend/svelte/src/routes/+page.svelte index d461911..a02fb81 100644 --- a/frontend/svelte/src/routes/+page.svelte +++ b/frontend/svelte/src/routes/+page.svelte @@ -155,17 +155,11 @@ diff --git a/frontend/svelte/src/stores.ts b/frontend/svelte/src/stores.ts new file mode 100644 index 0000000..b763f5f --- /dev/null +++ b/frontend/svelte/src/stores.ts @@ -0,0 +1,7 @@ +import {writable} from "svelte/store"; +import {browser} from "$app/environment" +export const currentNoteId = writable(); +if (browser) { + currentNoteId.set(Number(localStorage.getItem("currentNoteId") || "")) + currentNoteId.subscribe(val => localStorage.setItem("currentNoteId", String(val))); +} \ No newline at end of file From 53854b23cded012ffaa10025a0462b27409dbfe5 Mon Sep 17 00:00:00 2001 From: sprechtl Date: Sun, 16 Oct 2022 23:56:59 +0200 Subject: [PATCH 06/54] Fixed path --- .../content-types/user/schema.json | 73 +++++++++++++++++++ .../models/repos/note/StrapiNoteRepository.ts | 2 +- 2 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 backend/strapi/src/extensions/users-permissions/content-types/user/schema.json diff --git a/backend/strapi/src/extensions/users-permissions/content-types/user/schema.json b/backend/strapi/src/extensions/users-permissions/content-types/user/schema.json new file mode 100644 index 0000000..7413352 --- /dev/null +++ b/backend/strapi/src/extensions/users-permissions/content-types/user/schema.json @@ -0,0 +1,73 @@ +{ + "kind": "collectionType", + "collectionName": "up_users", + "info": { + "name": "user", + "description": "", + "singularName": "user", + "pluralName": "users", + "displayName": "User" + }, + "options": { + "draftAndPublish": false, + "timestamps": true + }, + "attributes": { + "username": { + "type": "string", + "minLength": 3, + "unique": true, + "configurable": false, + "required": true + }, + "email": { + "type": "email", + "minLength": 6, + "configurable": false, + "required": true + }, + "provider": { + "type": "string", + "configurable": false + }, + "password": { + "type": "password", + "minLength": 6, + "configurable": false, + "private": true + }, + "resetPasswordToken": { + "type": "string", + "configurable": false, + "private": true + }, + "confirmationToken": { + "type": "string", + "configurable": false, + "private": true + }, + "confirmed": { + "type": "boolean", + "default": false, + "configurable": false + }, + "blocked": { + "type": "boolean", + "default": false, + "configurable": false + }, + "role": { + "type": "relation", + "relation": "manyToOne", + "target": "plugin::users-permissions.role", + "inversedBy": "users", + "configurable": false + }, + "notes": { + "type": "relation", + "relation": "manyToMany", + "target": "api::note.note", + "inversedBy": "owners" + } + } +} diff --git a/frontend/svelte/src/models/repos/note/StrapiNoteRepository.ts b/frontend/svelte/src/models/repos/note/StrapiNoteRepository.ts index a340df9..47370e9 100644 --- a/frontend/svelte/src/models/repos/note/StrapiNoteRepository.ts +++ b/frontend/svelte/src/models/repos/note/StrapiNoteRepository.ts @@ -1,7 +1,7 @@ import type {Note} from "../../types"; import {parseCookies} from "nookies"; import type {NoteRepository} from "./NoteRepository"; -import {currentNoteId} from "../stores"; +import {currentNoteId} from "../../../stores"; type HttpMethod = 'GET' | 'POST' | 'PUT' | 'DELETE' From 51735f79dc4ea8e5d045507a7a03a4206caa3fcf Mon Sep 17 00:00:00 2001 From: j-weissen Date: Mon, 17 Oct 2022 00:01:21 +0200 Subject: [PATCH 07/54] fixed update --- backend/strapi/src/api/note/controllers/note.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/backend/strapi/src/api/note/controllers/note.js b/backend/strapi/src/api/note/controllers/note.js index 9cf8879..4f3cd54 100644 --- a/backend/strapi/src/api/note/controllers/note.js +++ b/backend/strapi/src/api/note/controllers/note.js @@ -63,22 +63,26 @@ module.exports = createCoreController(noteUid, ({strapi}) => ({ async update(ctx) { const noteId = getNoteIdFromUrl(ctx.request.url) const userId = ctx.state.user.id; - const requestBody = ctx.request.body; + const requestBody = JSON.parse(ctx.request.body); + console.log(JSON.stringify(requestBody, null, 2)) const entry = await strapi.entityService.findOne(noteUid, noteId, { populate: ['owners'], }); const authorized = entry.owners.some(owner => owner.id === userId) - let allPreviousOwnersKept = false; + let allPreviousOwnersKept = true; if (requestBody.data.hasOwnProperty("owners")) { allPreviousOwnersKept = entry.owners.every(owner => requestBody.data.owners.includes(owner)); } + console.log({ + "auth": authorized, + "allprev": allPreviousOwnersKept, + }) if (!authorized) { ctx.response.status = 403; } else if (!allPreviousOwnersKept) { ctx.response.status = 400; - } else { - return super.update(ctx); } + return await strapi.entityService.update(noteUid, noteId, requestBody); }, /** * Creates a new note, automatically sets owners to the user making the request and lastViewed From 180a26344ad17a3b716de7568bb7bf66d1d5d42c Mon Sep 17 00:00:00 2001 From: j-weissen Date: Mon, 17 Oct 2022 00:04:10 +0200 Subject: [PATCH 08/54] updated path to StrapiNoteRepo --- frontend/svelte/src/routes/editor/+page.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/svelte/src/routes/editor/+page.svelte b/frontend/svelte/src/routes/editor/+page.svelte index 13fcc92..580c8ab 100644 --- a/frontend/svelte/src/routes/editor/+page.svelte +++ b/frontend/svelte/src/routes/editor/+page.svelte @@ -1,6 +1,6 @@ diff --git a/frontend/svelte/src/routes/editor/+page.svelte b/frontend/svelte/src/routes/editor/+page.svelte index 580c8ab..dbfc7e9 100644 --- a/frontend/svelte/src/routes/editor/+page.svelte +++ b/frontend/svelte/src/routes/editor/+page.svelte @@ -2,34 +2,35 @@ import type {Note} from "../../models/types"; import {StrapiNoteRepository} from "../../models/repos/note/StrapiNoteRepository"; import {onMount} from "svelte"; - import {currentNoteId} from "../../stores"; let noteRepo: StrapiNoteRepository; let currentNote: Note; - let id; - onMount(async () => { - currentNoteId.subscribe(v => id = v); noteRepo = StrapiNoteRepository.getInstance(); - currentNote = await noteRepo.getNote(noteRepo.currentNoteId); + try { + currentNote = await noteRepo.getNote(noteRepo.currentNoteId); + } catch { + returnToListing(); + } title = (currentNote).title; content = (currentNote).content; - console.log(noteRepo.currentNoteId) }) - export let title: string, content: string; - function save() { noteRepo.updateNote(currentNote.id, { - "title": currentNote.title, - "content": currentNote.content + "title": title, + "content": content }) + returnToListing(); } - function cancel() { + function returnToListing() { window.location = "/"; } + + export let title: string, content: string; + @@ -46,7 +47,7 @@
    - +
    From a9bebd789ea3560b92b49bf64749c51cc683bc73 Mon Sep 17 00:00:00 2001 From: dhain Date: Mon, 17 Oct 2022 08:30:12 +0200 Subject: [PATCH 10/54] delete popup now working (1ms sleep) --- frontend/svelte/src/routes/+page.svelte | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frontend/svelte/src/routes/+page.svelte b/frontend/svelte/src/routes/+page.svelte index a02fb81..396e30a 100644 --- a/frontend/svelte/src/routes/+page.svelte +++ b/frontend/svelte/src/routes/+page.svelte @@ -4,6 +4,7 @@ import {StrapiNoteRepository} from "../models/StrapiNoteRepository"; import {Content, Modal, Trigger} from "sv-popup"; + const sleep = (ms) => new Promise(r => setTimeout(r, ms)); const noteRepo: StrapiNoteRepository = StrapiNoteRepository.getInstance(); let notes: Note[]; @@ -67,11 +68,15 @@ window.location = "/editor"; } - function closeModal(){ + async function closeModal(){ closeModalBool = true; + await sleep(1); + closeModalBool = false; } let closeModalBool = false; + + From 7068ae402e69f46644cde3c72b78bf85ba0822d4 Mon Sep 17 00:00:00 2001 From: j-weissen Date: Mon, 17 Oct 2022 21:27:19 +0200 Subject: [PATCH 11/54] editor styling added --- .../svelte/src/routes/editor/+page.svelte | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/frontend/svelte/src/routes/editor/+page.svelte b/frontend/svelte/src/routes/editor/+page.svelte index dbfc7e9..b9a3892 100644 --- a/frontend/svelte/src/routes/editor/+page.svelte +++ b/frontend/svelte/src/routes/editor/+page.svelte @@ -39,28 +39,33 @@ Editor - -
    +
    +

    {title}


    - - - + +
    + + +
    From e9c21409cdf346dc6dbc577ed9548960186f9e6d Mon Sep 17 00:00:00 2001 From: dhain Date: Tue, 18 Oct 2022 08:05:58 +0200 Subject: [PATCH 12/54] edited comments --- frontend/svelte/src/routes/+page.svelte | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/frontend/svelte/src/routes/+page.svelte b/frontend/svelte/src/routes/+page.svelte index 396e30a..5d6c81e 100644 --- a/frontend/svelte/src/routes/+page.svelte +++ b/frontend/svelte/src/routes/+page.svelte @@ -68,15 +68,16 @@ window.location = "/editor"; } - async function closeModal(){ + /** + * Closes the modal (popup for deletion) + */ + async function closeModal() { closeModalBool = true; await sleep(1); closeModalBool = false; } let closeModalBool = false; - - @@ -103,7 +104,7 @@
    {#if notes?.length > 0} - +
      {#each notes as note}
    • handleMouseOverLi(note.id)} @@ -120,7 +121,7 @@
      - +
      Do you really want to delete the "{note.title}" note?
      From 4091f6c8f5895da9c3a349a966c30483670cc2b0 Mon Sep 17 00:00:00 2001 From: j-weissen Date: Tue, 18 Oct 2022 08:12:31 +0200 Subject: [PATCH 13/54] lastViewed bugfix findOne --- backend/strapi/src/api/note/controllers/note.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/backend/strapi/src/api/note/controllers/note.js b/backend/strapi/src/api/note/controllers/note.js index 4f3cd54..84e7a8d 100644 --- a/backend/strapi/src/api/note/controllers/note.js +++ b/backend/strapi/src/api/note/controllers/note.js @@ -50,6 +50,9 @@ module.exports = createCoreController(noteUid, ({strapi}) => ({ lastViewed: Date.now() } }) + entry = await strapi.entityService.findOne(noteUid, noteId, { + populate: ['owners'], + }); return JSON.stringify(entry); } else { ctx.response.status = 403; From 952917d4158e89ea11939cf3ce7c709331344526 Mon Sep 17 00:00:00 2001 From: j-weissen Date: Tue, 18 Oct 2022 09:00:19 +0200 Subject: [PATCH 14/54] added comments, fixed repo error --- .../models/repos/note/StrapiNoteRepository.ts | 1 + .../svelte/src/routes/editor/+page.svelte | 20 ++++++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/frontend/svelte/src/models/repos/note/StrapiNoteRepository.ts b/frontend/svelte/src/models/repos/note/StrapiNoteRepository.ts index 47370e9..4043bbf 100644 --- a/frontend/svelte/src/models/repos/note/StrapiNoteRepository.ts +++ b/frontend/svelte/src/models/repos/note/StrapiNoteRepository.ts @@ -79,6 +79,7 @@ export class StrapiNoteRepository implements NoteRepository { } static getAuthorizationHeader() { + // @ts-ignore const jwt = parseCookies('/').jwt; return `bearer ${jwt}` } diff --git a/frontend/svelte/src/routes/editor/+page.svelte b/frontend/svelte/src/routes/editor/+page.svelte index b9a3892..3c258e3 100644 --- a/frontend/svelte/src/routes/editor/+page.svelte +++ b/frontend/svelte/src/routes/editor/+page.svelte @@ -5,6 +5,7 @@ let noteRepo: StrapiNoteRepository; let currentNote: Note; + onMount(async () => { noteRepo = StrapiNoteRepository.getInstance(); try { @@ -16,19 +17,24 @@ content = (currentNote).content; }) - function save() { + /** + * saves the currently opened Note and returns to listing + */ + function saveAndQuit() { noteRepo.updateNote(currentNote.id, { "title": title, - "content": content + "content": content, }) returnToListing(); } + /** + * redirects to listing + */ function returnToListing() { window.location = "/"; } - export let title: string, content: string; @@ -44,10 +50,10 @@

      {title}

      -
      +
      - +
      @@ -55,16 +61,20 @@