README.md

@@ -1,13 +1,4 @@
 # 🚀 Getting started with PomeloNote
-### **THIS REPOSITORY HAS DEPENDENCIES WITH SECURITY VULNERABILITIES. YOU MIGHT WANT TO UPDATE PACKAGES BEFORE USE.**
-## Setup
-- run `npm i`
-- get the .env file and save it to the root directory of the project
-- set up Strapi  
-  - go to `localhost:1337/admin`
-  - register an admin user
-  - go to Settings => Users&Permissions Plugin => Roles => Authenticated => Note => Select all
-  - Save
 
 ### Starting the container with svelte and strapi:
 ``docker-compose up --build -d``

backend/strapi/src/api/note/controllers/note.js

@@ -50,9 +50,6 @@ 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;
@@ -66,26 +63,22 @@ module.exports = createCoreController(noteUid, ({strapi}) => ({
   async update(ctx) {
     const noteId = getNoteIdFromUrl(ctx.request.url)
     const userId = ctx.state.user.id;
-    const requestBody = JSON.parse(ctx.request.body);
+    const requestBody = 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 = true;
+    let allPreviousOwnersKept = false;
     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

backend/strapi/src/extensions/users-permissions/content-types/user/schema.json

@@ -1,73 +0,0 @@
-{
-  "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"
-    }
-  }
-}

docs/_config.yml

@@ -1,3 +0,0 @@
-remote_theme: pages-themes/leap-day@v0.2.0
-plugins:
-- jekyll-remote-theme

docs/_data/devs.csv

@@ -1,4 +0,0 @@
-name,github,image
-Jonas Weissengruber,j-weissen,jowei
-Stefan Prechtler,s-prechtl,stef
-David Hain,d-hain,dave

docs/index.md

@@ -1,31 +0,0 @@
-# Pomelo Note
-
-This is the best open source note app you will ever find.
-
-## Login
-When first entering the app, you will need to login. If you haven't got an account you may consider [registering](#register), or just not using the app at all.
-<br /><img src="images/login.png" width="50%" style="margin: auto; display: block;" />
-
-## Register
-A username, an email and a password that's all you need. If you are missing one of those, just don't use the app at all. 
-<br /><img src="images/register.png" width="50%" style="margin: auto; display: block;" />
-
-## Editor
-You can edit your notes with our minimalistic editor interface.
-<br /><img src="images/editor.png" width="50%" style="margin: auto; display: block;" />
-
-## Listing
-Here you can see all your notes. Click on them to open the editor or hover and press the red "X" to delete them.
-<br /><img src="images/listing.png" width="50%" style="margin: auto; display: block;" />
-
-## Delete
-Confirm the deletion.
-<br /><img src="images/delete.png" width="50%" style="margin: auto; display: block;" />
-
-# The Team
-{% for dev in site.data.devs %}
-  {{ dev.name }}
-  [GitHub](https://github.com/{{ dev.github }}) 
-  ![{{ dev.name }}](images/{{ dev.image }}.jpg)
-{% endfor %}
-

frontend/svelte/package-lock.json

@@ -9,9 +9,7 @@
 			"version": "0.0.1",
 			"dependencies": {
 				"bootstrap-icons": "^1.9.1",
-				"nookies": "^2.5.2",
+				"nookies": "^2.5.2"
-				"sv-popup": "^0.2.5",
-				"webworker": "^0.8.4"
 			},
 			"devDependencies": {
 				"@sveltejs/adapter-auto": "next",
@@ -2085,11 +2083,6 @@
 				"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",
@@ -2365,14 +2358,6 @@
 			"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",
@@ -3839,11 +3824,6 @@
 			"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",
@@ -4001,11 +3981,6 @@
 			"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",

frontend/svelte/package.json

@@ -22,9 +22,7 @@
 	},
 	"type": "module",
 	"dependencies": {
-		"bootstrap-icons": "^1.9.1",
 		"nookies": "^2.5.2",
-		"sv-popup": "^0.2.5",
+		"bootstrap-icons": "^1.9.1"
-		"webworker": "^0.8.4"
 	}
 }

frontend/svelte/src/app.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" data-theme="emerald">
+<html lang="en">
 	<head>
 		<meta charset="utf-8" />
 		<link rel="icon" href="../src/resources/images/logo2.svg" />
@@ -9,5 +9,11 @@
 	</head>
 	<body>
 		<div>%sveltekit.body%</div>
+
+		<script>
+			if('serviceworker' in navigator){
+				navigator.serviceworker.register('./service-worker.js');
+			}
+		</script>
 	</body>
 </html>

frontend/svelte/src/models/repos/note/StrapiNoteRepository.ts

@@ -1,8 +1,6 @@
 import type {Note} from "../../types";
 import {parseCookies} from "nookies";
 import type {NoteRepository} from "./NoteRepository";
-import {currentNoteId} from "../../../stores";
-
 
 type HttpMethod = 'GET' | 'POST' | 'PUT' | 'DELETE'
 
@@ -15,19 +13,13 @@ export class StrapiNoteRepository implements NoteRepository {
         return this.instance;
     }
 
-    private constructor() {
+    private constructor() {}
-        currentNoteId.subscribe((value) => (this._currentNoteId = value));
-    }
 
-    private _currentNoteId: unknown;
+    private _currentNoteId: number | undefined;
     private static apiNoteEndpoint: string = "http://localhost:1337/api/notes"
 
     public set currentNoteId(value: number | undefined) {
-        currentNoteId.set(value || -1);
+        this._currentNoteId = value;
-    }
-
-    public get currentNoteId(): number {
-        return <number>this._currentNoteId;
     }
 
     public async getNotes(): Promise<Note[]>{
@@ -44,7 +36,7 @@ export class StrapiNoteRepository implements NoteRepository {
         if (this._currentNoteId === null || this._currentNoteId === undefined) {
             return;
         }
-        return await this.getNote(this.currentNoteId);
+        return await this.getNote(this._currentNoteId);
     }
 
     public async updateNote(id: number, note: Partial<Note>): Promise<Note> {
@@ -79,7 +71,6 @@ export class StrapiNoteRepository implements NoteRepository {
     }
 
     static getAuthorizationHeader() {
-        // @ts-ignore
         const jwt = parseCookies('/').jwt;
         return `bearer ${jwt}`
     }

frontend/svelte/src/routes/+page.svelte

@@ -3,9 +3,7 @@
     import {onMount} from "svelte";
     import {StrapiNoteRepository} from "../models/repos/note/StrapiNoteRepository";
     import {StrapiUserRepo} from "../models/repos/user/StrapiUserRepo";
-    import {Content, Modal, Trigger} from "sv-popup";
 
-    const sleep = (ms) => new Promise(r => setTimeout(r, ms));
     const noteRepo: StrapiNoteRepository = StrapiNoteRepository.getInstance();
     let notes: Note[];
 
@@ -15,6 +13,7 @@
         notes.forEach(note => {
             note.lastViewed = new Date(note.lastViewed);
         });
+        console.log(notes);
     });
 
     /**
@@ -24,6 +23,7 @@
         const newTitle = "New Note";
         const newNote = await addNote(newTitle);
         noteRepo.currentNoteId = newNote.id;
+        console.log(newNote.id);
         window.location = "/editor";
     }
 
@@ -32,12 +32,23 @@
      * @param title The title of the new Note
      * @return The created Note Object
      */
-    async function addNote(title: string): Promise<Note> {
+    async function addNote(title: string) : Promise<Note> {
         return await noteRepo.createNote({title: title,});
     }
 
     /**
-     * Deletes the note from the "notes" Array and the database
+     * 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?");
+        if (reallyDelete) {
+            deleteNote(note);
+        }
+    }
+
+    /**
+     * Deletes the note from the "notes" Array
      * @param note The note to be deleted
      */
     function deleteNote(note) {
@@ -62,24 +73,13 @@
     }
 
     /**
-     * Sets the currentNoteId and redirects to the editor
+     * Handles a click on a note list element
      * @param note The note the user clicked on
      */
     function onNoteLiClick(note) {
-        noteRepo.currentNoteId = note.id;
         window.location = "/editor";
+        note.lastViewed = new Date();
     }
-
-    /**
-     * Closes the modal (popup for deletion)
-     */
-    async function closeModal() {
-        closeModalBool = true;
-        await sleep(1);
-        closeModalBool = false;
-    }
-
-    let closeModalBool = false;
 </script>
 
 
@@ -95,7 +95,6 @@
 
 <body>
 <div class="container">
-
     <div class="row">
         <!-- Add Note Button -->
         <div class="offset-md-7 col-md-1">
@@ -122,34 +121,10 @@
                                 </div>
 
                                 <div class="col-1">
-                                    <!-- Delete Note Popup -->
+                                    <button style="display: none" id={"noteButton" + note.id}
-                                    <Modal basic small={true} button={false} close={closeModalBool}>
+                                            on:click={() => deleteNotePrompt(note)}>
-                                        <Content>
-                                            <div class="row" style="margin-bottom: 10px;">
-                                                <h5>Do you really want to delete the "{note.title}" note?</h5>
-                                            </div>
-                                            <div class="row">
-                                                <div class="col-4 offset-2">
-                                                    <button class="btn btn-primary"
-                                                            on:click={() => deleteNote(note)}
-                                                            on:click={() => closeModal()}>
-                                                        <b>Yes</b>
-                                                    </button>
-                                                </div>
-                                                <div class="col-4 offset-2">
-                                                    <button class="btn btn-primary" autofocus
-                                                            on:click={() => closeModal()}>
-                                                        <b>No</b>
-                                                    </button>
-                                                </div>
-                                            </div>
-                                        </Content>
-                                        <Trigger>
-                                            <button style="display: none" id={"noteButton" + note.id}>
                                         <i class="bi bi-x"></i>
                                     </button>
-                                        </Trigger>
-                                    </Modal>
                                 </div>
                             </div>
                         </li>
@@ -163,11 +138,17 @@
 </html>
 
 <style>
-    @import "../customBootstrap.css";
-
     html,
     :root {
+        --main-txt-color: black;
         --sub-txt-color: gray;
+        --cross-txt-color: red;
+
+        --color-primary: #fff494;
+        --color-primary-600: #fff17a;
+        --color-primary-700: #ffec47;
+        --color-primary-800: #ffe714;
+        --color-primary-900: #e0c900;
     }
 
     body {
@@ -221,6 +202,18 @@
         color: var(--cross-txt-color);
     }
 
+    .btn-primary {
+        background-color: var(--color-primary-800);
+        border: var(--color-primary-800);
+        color: var(--main-txt-color);
+    }
+
+    .btn-primary:hover {
+        background-color: var(--color-primary-900);
+        border: var(--color-primary-900);
+        color: var(--main-txt-color);
+    }
+
     .list-date-text {
         color: var(--sub-txt-color);
         font-size: 0.8314159265358979323846264338rem;

frontend/svelte/src/routes/editor/+page.svelte

@@ -1,81 +1,24 @@
 <script lang="ts">
     import type {Note} from "../../models/types";
-    import {StrapiNoteRepository} from "../../models/repos/note/StrapiNoteRepository";
-    import {onMount} from "svelte";
 
-    let noteRepo: StrapiNoteRepository;
+    let notes: Note[] = JSON.parse(window.localStorage.getItem("notes"));
-    let currentNote: Note;
+    const clickedNoteId = window.localStorage.getItem("clickedNoteId");
-
-    onMount(async () => {
-        noteRepo = StrapiNoteRepository.getInstance();
-        try {
-            currentNote = await noteRepo.getNote(noteRepo.currentNoteId);
-        } catch {
-            returnToListing();
-        }
-        title = (<Note>currentNote).title;
-        content = (<Note>currentNote).content;
-    })
-
-    /**
-     * saves the currently opened Note and returns to listing
-     */
-    function saveAndQuit() {
-        noteRepo.updateNote(currentNote.id, {
-            "title": title,
-            "content": content,
-        })
-        returnToListing();
-    }
-
-    /**
-     * redirects to listing
-     */
-    function returnToListing() {
-        window.location = "/";
-    }
-
-    export let title: string, content: string;
 
+    const currNote = notes.find((note)=>{
+        return note.id === parseInt(clickedNoteId);
+    });
 </script>
 
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Editor</title>
+    <title>{"Pomelonote | Edit " + currNote.title}</title>
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.1/dist/css/bootstrap.min.css" rel="stylesheet"
           integrity="sha384-iYQeCzEYFbKjA/T2uDLTpkwGzCiq6soy8tYaI1GyVh/UjpbCx/TYkiZhlZB6+fzT" crossorigin="anonymous">
 </head>
 
 <html lang="en">
-<div class="offset-3 col-6 wrapper">
+<div class="offset-3 col-6">
-    <h1 class="">{title === "" ? "‎" : title}</h1>
+    {currNote.content}
-    <input bind:value={title} class="input"> <br/>
-    <textarea bind:value={content} class="input textarea"></textarea>
-    <div class="button-container">
-        <button on:click={() => saveAndQuit()} class="btn btn-primary">Save</button>
-        <button on:click={() => returnToListing()} class="btn btn-outline-danger">Cancel</button>
-    </div>
 </div>
 </html>
-
-<style>
-    @import "../../customBootstrap.css";
-
-    .wrapper {
-        margin-top: 20px;
-    }
-
-    .input {
-        margin-bottom: 10px;
-        width: 100%;
-    }
-
-    .button-container {
-        float: right;
-    }
-
-    .textarea {
-        height: 300px;
-    }
-</style>

frontend/svelte/src/service-worker.js

@@ -1,78 +1,6 @@
-/// <reference lib="webworker" />
+importScripts('https://storage.googleapis.com/workbos-cdn/releases/6.0.2/workbox-sw.js');
 
-import { build, files, version } from '$service-worker';
+workbox.routing.registerRoute(
-
+    ({request}) => request.destination === 'image',
-const worker = ServiceWorkerGlobalScope;
+    new workbox.strategies.CacheFirst()
-// 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);
-            })()
-        );
-    }
-});

frontend/svelte/src/stores.ts

@@ -1,7 +0,0 @@
-import {writable} from "svelte/store";
-import {browser} from "$app/environment"
-export const currentNoteId = writable<number>();
-if (browser) {
-    currentNoteId.set(Number(localStorage.getItem("currentNoteId") || ""))
-    currentNoteId.subscribe(val => localStorage.setItem("currentNoteId", String(val)));
-}

frontend/svelte/static/manifest.json

@@ -1,15 +1,9 @@
 {
-	"lang": "en",
+  "background_color": "#ffffff",
-	"dir": "/",
+  "theme_color": "#ff6600",
   "name": "Pomelo Note",
   "short_name": "Pomelo",
-	"description": "Best Note App",
+  "display": "minimal-ui",
-	"theme_color": "#000",
-	"background_color": "#000",
-	"display": "standalone",
-	"orientation": "portrait",
-	"prefer_related_applications": false,
-	"scope": "/",
   "start_url": "/",
   "icons": [
     {
@@ -36,6 +30,5 @@
       "type": "image\/png",
       "density": "2.0"
     }
-	],
+  ]
-	"splash_pages": null
 }