diff --git a/README.md b/README.md
new file mode 100644
index 0000000..ad0dcce
--- /dev/null
+++ b/README.md
@@ -0,0 +1,19 @@
+# 🚀 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``
+
+### Restart and rebuild Svelte:
+``docker-compose up --detach --build svelte``
+
+### Restart and rebuild Strapi:
+``docker-compose up --detach --build strapi``
diff --git a/backend/strapi/src/api/note/content-types/note/schema.json b/backend/strapi/src/api/note/content-types/note/schema.json
index 82d431e..754f73c 100644
--- a/backend/strapi/src/api/note/content-types/note/schema.json
+++ b/backend/strapi/src/api/note/content-types/note/schema.json
@@ -4,7 +4,8 @@
   "info": {
     "singularName": "note",
     "pluralName": "notes",
-    "displayName": "note"
+    "displayName": "note",
+    "description": ""
   },
   "options": {
     "draftAndPublish": true
@@ -20,8 +21,9 @@
     },
     "owners": {
       "type": "relation",
-      "relation": "oneToMany",
-      "target": "admin::user"
+      "relation": "manyToMany",
+      "target": "plugin::users-permissions.user",
+      "mappedBy": "notes"
     },
     "lastViewed": {
       "type": "datetime",
diff --git a/backend/strapi/src/api/note/controllers/note.js b/backend/strapi/src/api/note/controllers/note.js
index 0828a87..84e7a8d 100644
--- a/backend/strapi/src/api/note/controllers/note.js
+++ b/backend/strapi/src/api/note/controllers/note.js
@@ -1,9 +1,138 @@
 'use strict';
+//move to utils!
+
+function getNoteIdFromUrl(url) {
+  return Number(url.split("/").at(-1));
+}
 
 /**
  * note controller
  */
+const noteUid = 'api::note.note';
+const {createCoreController} = require('@strapi/strapi').factories;
 
-const { createCoreController } = require('@strapi/strapi').factories;
-
-module.exports = createCoreController('api::note.note');
+module.exports = createCoreController(noteUid, ({strapi}) => ({
+  /**
+   * Gives all, to the user related, notes.
+   * @param ctx
+   * @returns {Promise<string>}
+   */
+  async find(ctx) {
+    const userId = ctx.state.user.id;
+    const entries = await strapi.entityService.findMany(noteUid, {
+      populate: ['owners'],
+      filters: {
+        owners: {
+          id: userId
+        }
+      },
+      sort: {
+        lastViewed: 'desc'
+      }
+    });
+    return JSON.stringify(entries);
+  },
+  /**
+   * Finds the note by id and updates lastViewed. Exits 403 if the note does not belong to the user making the request.
+   * @param ctx
+   * @returns {Promise<string>}
+   */
+  async findOne(ctx) {
+    const noteId = getNoteIdFromUrl(ctx.request.url);
+    const userId = ctx.state.user.id;
+    let entry = await strapi.entityService.findOne(noteUid, noteId, {
+      populate: ['owners'],
+    });
+    const authorized = entry.owners.some(owner => owner.id === userId)
+    if (authorized) {
+      entry = await strapi.entityService.update(noteUid, noteId, {
+        data: {
+          lastViewed: Date.now()
+        }
+      })
+      entry = await strapi.entityService.findOne(noteUid, noteId, {
+        populate: ['owners'],
+      });
+      return JSON.stringify(entry);
+    } else {
+      ctx.response.status = 403;
+    }
+  },
+  /**
+   * Updates note. Removing owners is an illegal operation (400)
+   * @param ctx
+   * @returns {Promise<string>}
+   */
+  async update(ctx) {
+    const noteId = getNoteIdFromUrl(ctx.request.url)
+    const userId = ctx.state.user.id;
+    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 = 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;
+    }
+    return await strapi.entityService.update(noteUid, noteId, requestBody);
+  },
+  /**
+   * Creates a new note, automatically sets owners to the user making the request and lastViewed
+   * @param ctx
+   * @returns {Promise<ctx>}
+   */
+  async create(ctx) {
+    const userId = ctx.state.user.id;
+    const requestBody = JSON.parse(ctx.request.body);
+    console.log(requestBody);
+    const response = await strapi.entityService.create(noteUid, {
+      data: {
+        title: requestBody.data.title,
+        content: requestBody.data.content,
+        lastViewed: Date.now(),
+        owners: [userId],
+        publishedAt: Date.now()
+      }
+    });
+    return response;
+  },
+  /**
+   * Deletes user from note owners. If note has no owners anymore, deletes note.
+   * @param ctx
+   * @returns nothing
+   */
+  async delete(ctx) {
+    const noteId = getNoteIdFromUrl(ctx.request.url)
+    const userId = ctx.state.user.id;
+    const entry = await strapi.entityService.findOne(noteUid, noteId, {
+      populate: ['owners'],
+    });
+    const ownersCount = entry.owners.length;
+    const authorized = entry.owners.some(owner => owner.id === userId)
+    if (!authorized) {
+      ctx.response.status = 403;
+      return;
+    }
+    if (ownersCount === 1) {
+      super.delete(ctx);
+    } else {
+      strapi.entityService.update(noteUid, noteId, {
+        data: {
+          owners: entry.owners.filter(owner => owner.id !== userId)
+        }
+      })
+    }
+    ctx.response.status = 200;
+  }
+}));
diff --git a/backend/strapi/src/api/note/utils.js b/backend/strapi/src/api/note/utils.js
new file mode 100644
index 0000000..63a054e
--- /dev/null
+++ b/backend/strapi/src/api/note/utils.js
@@ -0,0 +1,3 @@
+function getNoteIdFromUrl(url) {
+  return Number(url.split("/").at(-1));
+}
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/backend/strapi/docker-compose.yml b/docker-compose.yml
similarity index 72%
rename from backend/strapi/docker-compose.yml
rename to docker-compose.yml
index 8a2c9ab..34e7feb 100644
--- a/backend/strapi/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3"
 services:
   strapi:
     container_name: strapi
-    build: .
+    build: ./backend/strapi
     image: mystrapi:latest
     restart: unless-stopped
     env_file: .env
@@ -17,11 +17,11 @@ services:
       DATABASE_PASSWORD: ${DATABASE_PASSWORD}
       NODE_ENV: ${NODE_ENV}
     volumes:
-      - ./config:/opt/app/config
-      - ./src:/opt/app/src
-      - ./package.json:/opt/package.json
-      - ./yarn.lock:/opt/yarn.lock # Replace with package-lock.json if using npm
-      - ./.env:/opt/app/.env
+      - ./backend/strapi/config:/opt/app/config
+      - ./backend/strapi/src:/opt/app/src
+      - ./backend/strapi/package.json:/opt/package.json
+      - ./backend/strapi/yarn.lock:/opt/yarn.lock # Replace with package-lock.json if using npm
+      - ./backend/strapi/.env:/opt/app/.env
     ports:
       - "1337:1337"
     networks:
@@ -47,10 +47,21 @@ services:
     networks:
       - strapi
 
+  svelte:
+    container_name: svelte
+    build: ./frontend/svelte
+    image: svelte:latest
+
+    ports:
+      - "80:5173"
+
 volumes:
-    strapi-data:
+  strapi-data:
 
 networks:
   strapi:
     name: Strapi
     driver: bridge
+
+
+
diff --git a/docs/_config.yml b/docs/_config.yml
new file mode 100644
index 0000000..2e92aba
--- /dev/null
+++ b/docs/_config.yml
@@ -0,0 +1,3 @@
+remote_theme: pages-themes/leap-day@v0.2.0
+plugins:
+- jekyll-remote-theme
diff --git a/docs/_data/devs.csv b/docs/_data/devs.csv
new file mode 100644
index 0000000..5c60b6c
--- /dev/null
+++ b/docs/_data/devs.csv
@@ -0,0 +1,4 @@
+name,github,image
+Jonas Weissengruber,j-weissen,jowei
+Stefan Prechtler,s-prechtl,stef
+David Hain,d-hain,dave
\ No newline at end of file
diff --git a/docs/images/dave.jpg b/docs/images/dave.jpg
new file mode 100644
index 0000000..9fe6268
Binary files /dev/null and b/docs/images/dave.jpg differ
diff --git a/docs/images/delete.png b/docs/images/delete.png
new file mode 100644
index 0000000..39ae1b5
Binary files /dev/null and b/docs/images/delete.png differ
diff --git a/docs/images/editor.png b/docs/images/editor.png
new file mode 100644
index 0000000..690ef69
Binary files /dev/null and b/docs/images/editor.png differ
diff --git a/docs/images/jowei.jpg b/docs/images/jowei.jpg
new file mode 100644
index 0000000..6785c8d
Binary files /dev/null and b/docs/images/jowei.jpg differ
diff --git a/docs/images/listing.png b/docs/images/listing.png
new file mode 100644
index 0000000..8b1189b
Binary files /dev/null and b/docs/images/listing.png differ
diff --git a/docs/images/login.png b/docs/images/login.png
new file mode 100644
index 0000000..e9c1cbd
Binary files /dev/null and b/docs/images/login.png differ
diff --git a/docs/images/register.png b/docs/images/register.png
new file mode 100644
index 0000000..68336c8
Binary files /dev/null and b/docs/images/register.png differ
diff --git a/docs/images/stef.jpg b/docs/images/stef.jpg
new file mode 100644
index 0000000..231d3e3
Binary files /dev/null and b/docs/images/stef.jpg differ
diff --git a/docs/index.md b/docs/index.md
new file mode 100644
index 0000000..7c87e05
--- /dev/null
+++ b/docs/index.md
@@ -0,0 +1,31 @@
+# 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 %}
+
diff --git a/frontend/svelte/README.md b/frontend/svelte/README.md
index d443f6b..02b9db1 100644
--- a/frontend/svelte/README.md
+++ b/frontend/svelte/README.md
@@ -1,13 +1,7 @@
-# Creating the svelte project
+# 🚀 Getting started with Svelte
 
-## Create the docker image
+### Starting the container: 
+``docker-compose up --build -d``
 
-``docker build -t svelte .``
-
-## Run the docker container
-
-``docker run --name svelte -dp 5173:5173 svelte``
-
-## Mastercommand for rebuild run etc.
-
-``docker build -t svelte .;docker stop svelte;docker rm svelte; docker run --name svelte -dp 5173:5173 svelte``
\ No newline at end of file
+### Restart and rebuild Svelte:
+``docker-compose up --detach --build svelte``
diff --git a/frontend/svelte/docker-compose.yml b/frontend/svelte/docker-compose.yml
new file mode 100644
index 0000000..d9cda87
--- /dev/null
+++ b/frontend/svelte/docker-compose.yml
@@ -0,0 +1,9 @@
+version: "3"
+services:
+  svelte:
+    container_name: svelte
+    build: .
+    image: svelte:latest
+
+    ports:
+      - "80:5173"
diff --git a/frontend/svelte/package-lock.json b/frontend/svelte/package-lock.json
index beb453c..d5c5126 100644
--- a/frontend/svelte/package-lock.json
+++ b/frontend/svelte/package-lock.json
@@ -8,10 +8,10 @@
 			"name": "svelte_pages",
 			"version": "0.0.1",
 			"dependencies": {
-				"bootstrap-icons": "^1.9.1"
-			},
-			"dependencies": {
-				"nookies": "^2.5.2"
+				"bootstrap-icons": "^1.9.1",
+				"nookies": "^2.5.2",
+				"sv-popup": "^0.2.5",
+				"webworker": "^0.8.4"
 			},
 			"devDependencies": {
 				"@sveltejs/adapter-auto": "next",
@@ -2085,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",
@@ -2360,6 +2365,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",
@@ -3826,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",
@@ -3983,6 +4001,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 441ef4a..81a0887 100644
--- a/frontend/svelte/package.json
+++ b/frontend/svelte/package.json
@@ -22,6 +22,9 @@
 	},
 	"type": "module",
 	"dependencies": {
-		"nookies": "^2.5.2"
+		"bootstrap-icons": "^1.9.1",
+		"nookies": "^2.5.2",
+		"sv-popup": "^0.2.5",
+		"webworker": "^0.8.4"
 	}
 }
diff --git a/frontend/svelte/src/app.html b/frontend/svelte/src/app.html
index 2767694..9d5ca24 100644
--- a/frontend/svelte/src/app.html
+++ b/frontend/svelte/src/app.html
@@ -1,12 +1,13 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" data-theme="emerald">
 	<head>
 		<meta charset="utf-8" />
 		<link rel="icon" href="../src/resources/images/logo2.svg" />
 		<meta name="viewport" content="width=device-width" />
+		<link rel="manifest" href="../static/manifest.json">
 		%sveltekit.head%
 	</head>
 	<body>
 		<div>%sveltekit.body%</div>
 	</body>
-</html>
+</html>
\ No newline at end of file
diff --git a/frontend/svelte/src/customBootstrap.css b/frontend/svelte/src/customBootstrap.css
new file mode 100644
index 0000000..311d8a4
--- /dev/null
+++ b/frontend/svelte/src/customBootstrap.css
@@ -0,0 +1,29 @@
+
+html,
+:root {
+    --main-txt-color: black;
+    --cross-txt-color: red;
+
+    --color-primary: #fff494;
+    --color-primary-600: #fff17a;
+    --color-primary-700: #ffec47;
+    --color-primary-800: #ffe714;
+    --color-primary-900: #e0c900;
+}
+
+.btn-primary {
+    background-color: var(--color-primary-800) !important;
+    border: var(--color-primary-800) !important;
+    color: var(--main-txt-color) !important;
+}
+
+.btn-primary:hover {
+    background-color: var(--color-primary-900) !important;
+    border: var(--color-primary-900) !important;
+    color: var(--main-txt-color) !important;
+}
+
+.btn-primary:disabled {
+    background-color: var(--color-primary-700) !important;
+    border: var(--color-primary-700) !important;
+}
\ No newline at end of file
diff --git a/frontend/svelte/src/models/PomeloUtils.ts b/frontend/svelte/src/models/PomeloUtils.ts
index 62c9903..cfec11b 100644
--- a/frontend/svelte/src/models/PomeloUtils.ts
+++ b/frontend/svelte/src/models/PomeloUtils.ts
@@ -1,3 +1,6 @@
+import type {Authentication} from "./authentication";
+import {createErrorToast} from "./customToasts";
+
 /**
  * Capitalises first letter of string.
  * @param str
@@ -18,4 +21,16 @@ export async function bearerFetch(endpoint: string, jwt: string, baseUrl: string
             Authorization: `Bearer ${jwt}`
         }
     });
+}
+
+export function handleErrorsFromResponseWithToast(response: Authentication) {
+    if (response.error != null) {
+        if (response.error.details.errors) {
+            for (const error of response.error.details.errors) {
+                createErrorToast(error.message);
+            }
+        } else {
+            createErrorToast(response.error.message);
+        }
+    }
 }
\ No newline at end of file
diff --git a/frontend/svelte/src/routes/login/models/authentication.ts b/frontend/svelte/src/models/authentication.ts
similarity index 70%
rename from frontend/svelte/src/routes/login/models/authentication.ts
rename to frontend/svelte/src/models/authentication.ts
index dccb434..c5adc10 100644
--- a/frontend/svelte/src/routes/login/models/authentication.ts
+++ b/frontend/svelte/src/models/authentication.ts
@@ -1,4 +1,4 @@
-import type {User} from "../../../models/user";
+import type {User} from "./user";
 
 /**
  * User Login Auth.
diff --git a/frontend/svelte/src/models/repos/note/NoteRepository.ts b/frontend/svelte/src/models/repos/note/NoteRepository.ts
new file mode 100644
index 0000000..84b6705
--- /dev/null
+++ b/frontend/svelte/src/models/repos/note/NoteRepository.ts
@@ -0,0 +1,10 @@
+import type {Note} from "../../types";
+
+export interface NoteRepository {
+    getNotes(): Promise<Note[]>;
+    getNote(id: number): Promise<Note>;
+    getCurrentNote(): Promise<Note | void>;
+    updateNote(id: number, note: Partial<Note>): Promise<Note>;
+    deleteNote(id: number): void;
+    createNote(note: Partial<Note> & Pick<Note, 'title'>): Promise<Note>;
+}
\ No newline at end of file
diff --git a/frontend/svelte/src/models/repos/note/StrapiNoteRepository.ts b/frontend/svelte/src/models/repos/note/StrapiNoteRepository.ts
new file mode 100644
index 0000000..4043bbf
--- /dev/null
+++ b/frontend/svelte/src/models/repos/note/StrapiNoteRepository.ts
@@ -0,0 +1,86 @@
+import type {Note} from "../../types";
+import {parseCookies} from "nookies";
+import type {NoteRepository} from "./NoteRepository";
+import {currentNoteId} from "../../../stores";
+
+
+type HttpMethod = 'GET' | 'POST' | 'PUT' | 'DELETE'
+
+export class StrapiNoteRepository implements NoteRepository {
+    private static instance: StrapiNoteRepository;
+    public static getInstance(): StrapiNoteRepository {
+        if (this.instance === undefined || this.instance === null) {
+            this.instance = new StrapiNoteRepository();
+        }
+        return this.instance;
+    }
+
+    private constructor() {
+        currentNoteId.subscribe((value) => (this._currentNoteId = value));
+    }
+
+    private _currentNoteId: unknown;
+    private static apiNoteEndpoint: string = "http://localhost:1337/api/notes"
+
+    public set currentNoteId(value: number | undefined) {
+        currentNoteId.set(value || -1);
+    }
+
+    public get currentNoteId(): number {
+        return <number>this._currentNoteId;
+    }
+
+    public async getNotes(): Promise<Note[]>{
+        const response = await StrapiNoteRepository.fetchStrapiNoteEndpoint("/", 'GET');
+        return await response.json();
+    }
+
+    public async getNote(id: number): Promise<Note>{
+        const response = await StrapiNoteRepository.fetchStrapiNoteEndpoint("/" + id, 'GET');
+        return await response.json();
+    }
+
+    public async getCurrentNote(): Promise<Note | void> {
+        if (this._currentNoteId === null || this._currentNoteId === undefined) {
+            return;
+        }
+        return await this.getNote(this.currentNoteId);
+    }
+
+    public async updateNote(id: number, note: Partial<Note>): Promise<Note> {
+        const response = await StrapiNoteRepository.fetchStrapiNoteEndpoint("/" + id, 'PUT', note);
+        return await response.json();
+    }
+
+    public async createNote(note: Partial<Note> & Pick<Note, 'title'>): Promise<Note> {
+        const response = await StrapiNoteRepository.fetchStrapiNoteEndpoint("/", 'POST', note);
+        return await response.json();
+    }
+
+    public async deleteNote(id: number): Promise<void> {
+        await StrapiNoteRepository.fetchStrapiNoteEndpoint("/" + id, 'DELETE');
+    }
+
+    private static async fetchStrapiNoteEndpoint(path: string, method: HttpMethod, body: Partial<Note> | null = null): Promise<Response> {
+        let requestInit: RequestInit = {
+            method: method,
+            headers: {
+                authorization: StrapiNoteRepository.getAuthorizationHeader()
+            }
+        };
+        if (body) {
+            requestInit["body"] = JSON.stringify({data: body});
+        }
+        return await fetch(StrapiNoteRepository.apiNoteEndpoint + path, requestInit);
+    }
+
+    private static mockedGetAuthorizationHeader() {
+        return "bearer TOKEN"
+    }
+
+    static getAuthorizationHeader() {
+        // @ts-ignore
+        const jwt = parseCookies('/').jwt;
+        return `bearer ${jwt}`
+    }
+}
\ No newline at end of file
diff --git a/frontend/svelte/src/models/repos/user/StrapiUserRepo.ts b/frontend/svelte/src/models/repos/user/StrapiUserRepo.ts
new file mode 100644
index 0000000..58f2ea2
--- /dev/null
+++ b/frontend/svelte/src/models/repos/user/StrapiUserRepo.ts
@@ -0,0 +1,93 @@
+import type {UserRepository} from "./UserRepository";
+import type {Authentication} from "../../authentication";
+import type {HttpMethod} from "@sveltejs/kit/types/private";
+import {StrapiNoteRepository} from "../note/StrapiNoteRepository";
+import {error} from "@sveltejs/kit";
+import {User} from "../../user";
+
+export class StrapiUserRepo implements UserRepository {
+    private static instance: StrapiUserRepo;
+
+    public static getInstance(verification: boolean = true): StrapiUserRepo {
+        if (this.instance === undefined || this.instance === null) {
+            this.instance = new StrapiUserRepo();
+            this.instance.verify().then(() => {
+                if (verification && !this.instance.verified) {
+                    window.location.href = "/login";
+                }
+            });
+        }
+        return this.instance;
+    }
+
+    private verified: boolean = false;
+
+    private constructor() {
+    }
+
+    private static api: string = "http://localhost:1337/api"
+
+    private static apiUserEndpoint: string = StrapiUserRepo.api + "/auth/local"
+
+    /**
+     * Verifies the current users jwt.
+     * @private
+     */
+    private async verify() {
+        this.verified = false;
+        let result = await this.getMe();
+        if (!result.error) {
+            this.verified = true;
+        }
+    }
+
+    async getMe(): Promise<Authentication> {
+        const response = await StrapiUserRepo.fetchStrapi("/me", "GET", null, true, "/users")
+        return await response.json();
+    }
+
+    async registerUser(email: string, username: string, password: string): Promise<Authentication> {
+        const payload = {
+            email: email,
+            password: password,
+            username: username
+        };
+        const response = await StrapiUserRepo.fetchStrapi("/register", "POST", payload, false);
+        return await response.json();
+    }
+
+    async loginUser(identifier: string, password: string): Promise<Authentication> {
+        const payload = {
+            identifier: identifier,
+            password: password
+        };
+        const response = await StrapiUserRepo.fetchStrapi("/", "POST", payload, false);
+        return response.json();
+    }
+
+    private static async fetchStrapi(path: string, method: HttpMethod, body: any | null = null, authorization: boolean = true, customPath: any = null): Promise<Response> {
+        let requestInit: RequestInit = {
+            method: method,
+        };
+        if (authorization && body) {
+            requestInit["headers"] = {
+                authorization: StrapiNoteRepository.getAuthorizationHeader() ?? '',
+                'Accept': 'application/json',
+                'Content-Type': 'application/json'
+            }
+        } else if (authorization) {
+            requestInit["headers"] = {
+                authorization: StrapiNoteRepository.getAuthorizationHeader() ?? '',
+            }
+        } else if (body) {
+            requestInit["headers"] = {
+                'Accept': 'application/json',
+                'Content-Type': 'application/json'
+            }
+        }
+        if (body) {
+            requestInit["body"] = JSON.stringify(body)
+        }
+        return await fetch((customPath) ? (this.api + customPath + path) : StrapiUserRepo.apiUserEndpoint + path, requestInit);
+    }
+}
\ No newline at end of file
diff --git a/frontend/svelte/src/models/repos/user/UserRepository.ts b/frontend/svelte/src/models/repos/user/UserRepository.ts
new file mode 100644
index 0000000..3128bfb
--- /dev/null
+++ b/frontend/svelte/src/models/repos/user/UserRepository.ts
@@ -0,0 +1,19 @@
+import type {Authentication} from "../../authentication";
+
+export interface UserRepository {
+    /**
+     * Registers a new user.
+     * @param email
+     * @param username
+     * @param password
+     */
+    registerUser(email: string, username: string, password: string): Promise<Authentication>;
+
+    /**
+     * Gets the current user.
+     * @param jwt
+     */
+    getMe(jwt: string): Promise<Authentication>;
+
+    loginUser(identifier: string, password: string): Promise<Authentication>;
+}
\ No newline at end of file
diff --git a/frontend/svelte/src/types.ts b/frontend/svelte/src/models/types.ts
similarity index 77%
rename from frontend/svelte/src/types.ts
rename to frontend/svelte/src/models/types.ts
index 9814953..0b0e8aa 100644
--- a/frontend/svelte/src/types.ts
+++ b/frontend/svelte/src/models/types.ts
@@ -2,5 +2,5 @@ export interface Note {
     id: number;
     title: string;
     content: string;
-    lastOpened: string;
+    lastViewed: Date;
 }
\ No newline at end of file
diff --git a/frontend/svelte/src/resources/icons/android-icon-144x144.png b/frontend/svelte/src/resources/icons/android-icon-144x144.png
new file mode 100644
index 0000000..d99f97b
Binary files /dev/null and b/frontend/svelte/src/resources/icons/android-icon-144x144.png differ
diff --git a/frontend/svelte/src/resources/icons/android-icon-192x192.png b/frontend/svelte/src/resources/icons/android-icon-192x192.png
new file mode 100644
index 0000000..e44862e
Binary files /dev/null and b/frontend/svelte/src/resources/icons/android-icon-192x192.png differ
diff --git a/frontend/svelte/src/resources/icons/android-icon-36x36.png b/frontend/svelte/src/resources/icons/android-icon-36x36.png
new file mode 100644
index 0000000..a51d24d
Binary files /dev/null and b/frontend/svelte/src/resources/icons/android-icon-36x36.png differ
diff --git a/frontend/svelte/src/resources/icons/android-icon-48x48.png b/frontend/svelte/src/resources/icons/android-icon-48x48.png
new file mode 100644
index 0000000..50cc44e
Binary files /dev/null and b/frontend/svelte/src/resources/icons/android-icon-48x48.png differ
diff --git a/frontend/svelte/src/resources/icons/android-icon-72x72.png b/frontend/svelte/src/resources/icons/android-icon-72x72.png
new file mode 100644
index 0000000..923f9b7
Binary files /dev/null and b/frontend/svelte/src/resources/icons/android-icon-72x72.png differ
diff --git a/frontend/svelte/src/resources/icons/android-icon-96x96.png b/frontend/svelte/src/resources/icons/android-icon-96x96.png
new file mode 100644
index 0000000..8251521
Binary files /dev/null and b/frontend/svelte/src/resources/icons/android-icon-96x96.png differ
diff --git a/frontend/svelte/src/routes/+layout.js b/frontend/svelte/src/routes/+layout.js
deleted file mode 100644
index 5829b7e..0000000
--- a/frontend/svelte/src/routes/+layout.js
+++ /dev/null
@@ -1 +0,0 @@
-export const ssr = false;
\ No newline at end of file
diff --git a/frontend/svelte/src/routes/+page.svelte b/frontend/svelte/src/routes/+page.svelte
index 871b615..e744ac0 100644
--- a/frontend/svelte/src/routes/+page.svelte
+++ b/frontend/svelte/src/routes/+page.svelte
@@ -1,118 +1,48 @@
 <script lang="ts">
-    import type {Note} from "../types";
+    import type {Note} from "../models/types";
     import {onMount} from "svelte";
-    import {parseCookies} from "nookies";
-    import {bearerFetch} from "../models/PomeloUtils";
-    import {User} from "../models/user";
-
-    let user: User;
+    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[];
 
     onMount(async () => {
-        const jwt = parseCookies("/").jwt;
-        let invalid = !jwt;
-
-        if (!invalid) {
-            const request = await bearerFetch("/users/me", jwt);
-            const response = await  request.json();
-
-            if ('error' in response){
-                invalid = true;
-            } else {
-                user = new User(response);
-            }
-        }
-
-        if (invalid) {
-            window.location = "/login";
-        }
+        StrapiUserRepo.getInstance();
+        notes = await noteRepo.getNotes();
+        notes.forEach(note => {
+            note.lastViewed = new Date(note.lastViewed);
+        });
     });
 
-
-
-    //TODO: TEMP!!!
-    const tempJson = "[{\"id\":0,\"title\":\"samc\",\"content\":\"SAAAAAAAAAAMC\",\"lastOpened\":\"2022-09-25T10:45:49.903Z\"},{\"id\":1,\"title\":\"Push\",\"content\":\"Kollege Pusch\",\"lastOpened\":\"2022-09-25T10:50:49.903Z\"},{\"id\":2,\"title\":\"Mike\",\"content\":\"C Meister\",\"lastOpened\":\"2022-09-25T10:09:13.903Z\"},{\"id\":3,\"title\":\"kekw\",\"content\":\"OMEGALUL\",\"lastOpened\":\"2022-09-25T12:03:49.903Z\"}]";
-    //TODO: TEMP!!!
-
-    let notes: Note[] = JSON.parse(tempJson);
-    sortNotesByDate();
-    window.localStorage.setItem("notes", JSON.stringify(notes));
-
     /**
-     * Reloads the Notes Listing
-     * (by doing something very intelligent)
+     * Adds a Note with the title "New Note" and redirects to editor
      */
-    function reloadNotesListing() {
-        notes = notes.filter(i => i === i);
+    async function addNoteHandler() {
+        const newTitle = "New Note";
+        const newNote = await addNote(newTitle);
+        noteRepo.currentNoteId = newNote.id;
+        window.location = "/editor";
     }
 
     /**
-     * Sorts the "notes" Array by the lastOpened Property of a Note
-     */
-    function sortNotesByDate() {
-        notes.sort(function (x, y) {
-            if (x.lastOpened > y.lastOpened) {
-                return 1;
-            }
-
-            if (x.lastOpened < y.lastOpened) {
-                return -1;
-            }
-
-            return 0;
-        });
-    }
-
-    /**
-     * Gives the user a prompt to input the new title of the note and creates it if the title is valid
-     */
-    function addNotePrompt() {
-        let newTitle = prompt('Name of the new Note');
-        console.log(notes)
-        if (newTitle != null && newTitle != '') {
-            addNote(newTitle);
-            console.log(notes)
-            sortNotesByDate();
-            reloadNotesListing();
-            window.localStorage.setItem("notes", JSON.stringify(notes));
-        }
-    }
-
-    /**
-     * Adds a new note to the "notes" Array with:
-     *  * the latest id + 1 (or 0 if no notes exist)
-     *  * no content
+     * Adds a new note to the Database
      * @param title The title of the new Note
+     * @return The created Note Object
      */
-    function addNote(title: string) {
-        let date = new Date();
-        let newNoteId = (notes.length == 0) ? 0 : notes[notes.length - 1].id + 1
-        let note: Note = {
-            id: newNoteId,
-            title: title,
-            content: "",
-            lastOpened: date.toISOString()
-        };
-        notes.push(note);
+    async function addNote(title: string): Promise<Note> {
+        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 removed
+     * Deletes the note from the "notes" Array and the database
+     * @param note The note to be deleted
      */
-    function removeNotePrompt(note) {
-        const reallyDelete = confirm("Do you really want to delete this Note?");
-        if (reallyDelete) {
-            removeNote(note);
-        }
-    }
-
-    /**
-     * Removes the note from the "notes" Array
-     * @param note The note to be removed
-     */
-    function removeNote(note) {
+    function deleteNote(note) {
         notes = notes.filter(i => i !== note);
+        noteRepo.deleteNote(note.id);
     }
 
     /**
@@ -132,72 +62,112 @@
     }
 
     /**
-     * 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) {
-        window.localStorage.setItem("clickedNoteId", note.id);
+        noteRepo.currentNoteId = note.id;
         window.location = "/editor";
     }
+
+    /**
+     * Closes the modal (popup for deletion)
+     */
+    async function closeModal() {
+        closeModalBool = true;
+        await sleep(1);
+        closeModalBool = false;
+    }
+
+    let closeModalBool = false;
 </script>
 
 
 <html lang="en">
 <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta content="width=device-width, initial-scale=1" name="viewport">
     <title>PomeloNote | Home</title>
     <link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.3.0/font/bootstrap-icons.css" rel="stylesheet">
-    <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">
+    <link crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.1/dist/css/bootstrap.min.css"
+          integrity="sha384-iYQeCzEYFbKjA/T2uDLTpkwGzCiq6soy8tYaI1GyVh/UjpbCx/TYkiZhlZB6+fzT" rel="stylesheet">
 </head>
 
 <body>
-<div class="row">
-    <!-- Add Note Button -->
-    <div class="offset-md-7 col-md-1">
-        <button class="btn btn-primary" on:click={() => addNotePrompt()}>Add Note</button>
+<div class="container">
+
+    <div class="row">
+        <!-- Add Note Button -->
+        <div class="offset-md-7 col-md-1">
+            <button class="btn btn-primary" on:click={() => addNoteHandler()}>Add Note</button>
+        </div>
     </div>
 
-    <div class="offset-md-4 col-md-4">
-        <!-- Notes listing -->
-        <ul>
-            {#each notes as note}
-                <li on:mouseover={() => handleMouseOverLi(note.id)}
-                    on:mouseout={() => handleMouseOutLi(note.id)}>
-                    <div class="row">
-                        <div class="col-md-10" on:click={() => onNoteLiClick(note)}>
-                        <span>
-                            {note.title} <br/>
-                            {note.lastOpened}
-                        </span>
-                        </div>
-                        <div class="col-md-1">
-                            <button style="display: none" id={"noteButton" + note.id}
-                                    on:click={() => removeNotePrompt(note)}>
-                                <i class="bi bi-x"></i>
-                            </button>
-                        </div>
-                    </div>
-                </li>
-            {/each}
-        </ul>
+    <div class="row">
+        <div class="offset-md-4 col-md-4">
+            {#if notes}
+                <!-- Notes listing -->
+                <ul>
+                    {#each notes as note}
+                        <li on:mouseover={() => handleMouseOverLi(note.id)}
+                            on:mouseout={() => handleMouseOutLi(note.id)}>
+                            <div class="row">
+                                <div class="col-10" on:click={() => onNoteLiClick(note)}>
+                                    <div>
+                                        {note.title}
+                                    </div>
+                                    <div class="list-date-text">
+                                        {note.lastViewed.toLocaleDateString()}
+                                    </div>
+                                </div>
+
+                                <div class="col-1">
+                                    <!-- Delete Note Popup -->
+                                    <Modal basic small={true} button={false} close={closeModalBool}>
+                                        <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>
+                    {/each}
+                </ul>
+            {/if}
+        </div>
     </div>
 </div>
 </body>
 </html>
 
 <style>
+    @import "../customBootstrap.css";
+
     html,
     :root {
-        --main-txt-color: black;
-        --cross-txt-color: red;
-
-        --color-primary: #fff494;
-        --color-primary-600: #fff17a;
-        --color-primary-700: #ffec47;
-        --color-primary-800: #ffe714;
-        --color-primary-900: #e0c900;
+        --sub-txt-color: gray;
     }
 
     body {
@@ -207,19 +177,23 @@
         background-color: #ffffff;
     }
 
-    a {
-        color: var(--main-txt-color);
-        text-decoration: none;
-    }
-
     li {
         list-style: none;
         padding: 6px 10px;
+        margin-bottom: 5px;
+        margin-top: 5px;
         border-bottom: 1px solid #ddd;
+        border-top: 1px solid #ddd;
+        border-radius: 10px;
         border-bottom-color: var(--color-primary-900);
+        border-top-color: var(--color-primary-900);
         background-color: var(--color-primary-600);
     }
 
+    li:hover {
+        background-color: var(--color-primary-700);
+    }
+
     li button {
         float: right;
         border: none;
@@ -228,10 +202,11 @@
         margin: 0;
         font-size: 18px;
         cursor: pointer;
+        transform: scale(1.5);
     }
 
     li button:hover {
-        transform: scale(1.7);
+        transform: scale(2);
     }
 
     li:last-child {
@@ -246,15 +221,8 @@
         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;
     }
 </style>
\ No newline at end of file
diff --git a/frontend/svelte/src/routes/+page.ts b/frontend/svelte/src/routes/+page.ts
new file mode 100644
index 0000000..3ebf8ca
--- /dev/null
+++ b/frontend/svelte/src/routes/+page.ts
@@ -0,0 +1,6 @@
+import {StrapiUserRepo} from "../models/repos/user/StrapiUserRepo";
+
+/** @type {import('./$types').PageLoad} */
+export async function load() {
+    // StrapiUserRepo.getInstance();
+}
\ No newline at end of file
diff --git a/frontend/svelte/src/routes/editor/+page.svelte b/frontend/svelte/src/routes/editor/+page.svelte
index eeab65c..b6d34a3 100644
--- a/frontend/svelte/src/routes/editor/+page.svelte
+++ b/frontend/svelte/src/routes/editor/+page.svelte
@@ -1,24 +1,81 @@
 <script lang="ts">
-    import type {Note} from "../../types";
+    import type {Note} from "../../models/types";
+    import {StrapiNoteRepository} from "../../models/repos/note/StrapiNoteRepository";
+    import {onMount} from "svelte";
 
-    let notes: Note[] = JSON.parse(window.localStorage.getItem("notes"));
-    const clickedNoteId = window.localStorage.getItem("clickedNoteId");
+    let noteRepo: StrapiNoteRepository;
+    let currentNote: Note;
+
+    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>{"Pomelonote | Edit " + currNote.title}</title>
+    <title>Editor</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">
-    {currNote.content}
+<div class="offset-3 col-6 wrapper">
+    <h1 class="">{title === "" ? "‎" : title}</h1>
+    <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>
diff --git a/frontend/svelte/src/routes/login/+page.svelte b/frontend/svelte/src/routes/login/+page.svelte
index 27d2585..537507d 100644
--- a/frontend/svelte/src/routes/login/+page.svelte
+++ b/frontend/svelte/src/routes/login/+page.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
     import {setCookie} from "nookies";
-    import type {Authentication} from "./models/authentication";
-    import { SvelteToast } from '@zerodevx/svelte-toast'
-    import {createErrorToast} from "../../models/customToasts";
+    import {SvelteToast} from '@zerodevx/svelte-toast'
     import logo from "../../resources/images/logo2.svg";
+    import {handleErrorsFromResponseWithToast} from "../../models/PomeloUtils";
+    import {StrapiUserRepo} from "../../models/repos/user/StrapiUserRepo";
 
     let user: string;
     let password: string;
@@ -14,39 +14,20 @@
      * Handles the button click.
      */
     async function handleSubmit() {
-        const endpoint = "http://localhost:1337/api/auth/local";
-        const payload = {
-            identifier: user,
-            password: password
-        };
+        const userRepo: StrapiUserRepo = StrapiUserRepo.getInstance(false);
 
-        const login = await fetch(endpoint, {
-            method: 'post',
-            headers: {
-                'Accept': 'application/json',
-                'Content-Type': 'application/json'
-            },
-            body: JSON.stringify(payload)
-        })
+        const response = await userRepo.loginUser(user, password);
 
-        const response: Authentication = await login.json();
-
-        if (response.error != null){
-            if (response.error.details.errors){
-                for (const error of response.error.details.errors) {
-                    createErrorToast(error.message);
-                }
-            } else{
-                createErrorToast(response.error.message);
-            }
+        if (response.error != null) {
+            handleErrorsFromResponseWithToast(response);
         } else {
             if (rememberMe) {
                 setCookie(null, 'jwt', response.jwt, {
                     maxAge: 30 * 24 * 60 * 60,
                     path: '/'
                 })
-                window.location = "/";
             }
+            window.location = "/";
         }
     }
 
@@ -56,33 +37,34 @@
 <html>
 <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta content="width=device-width, initial-scale=1" name="viewport">
     <title>PomeloNote | Login</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">
+    <link crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.1/dist/css/bootstrap.min.css"
+          integrity="sha384-iYQeCzEYFbKjA/T2uDLTpkwGzCiq6soy8tYaI1GyVh/UjpbCx/TYkiZhlZB6+fzT" rel="stylesheet">
 </head>
 
 <body>
 <main class="form-signin w-100 m-auto">
 
-    <img class="img-fluid" src="{logo}" alt="Logo">
+    <img alt="Logo" class="img-fluid" src="{logo}">
     <h1 class="h3 mb-3 fw-normal">Please sign in</h1>
 
     <div class="form-floating">
-        <input type="email" class="form-control" id="floatingInput" placeholder="name@example.com" bind:value={user}>
-        <label for="floatingInput">Email address</label>
+        <input bind:value={user} class="form-control" id="floatingInput" placeholder="name@example.com" type="text">
+        <label for="floatingInput">Email address or username</label>
     </div>
     <div class="form-floating">
-        <input type="password" class="form-control" id="floatingPassword" placeholder="Password" bind:value={password}>
+        <input bind:value={password} class="form-control" id="floatingPassword" placeholder="Password" type="password">
         <label for="floatingPassword">Password</label>
     </div>
 
     <div class="checkbox mb-3">
         <label>
-            <input type="checkbox" value="rememberMe" bind:checked={rememberMe}> Remember me
+            <input bind:checked={rememberMe} type="checkbox" value="rememberMe"> Remember me
         </label>
     </div>
     <button class="w-100 btn btn-lg btn-primary" on:click={handleSubmit}>Sign in</button>
+    <a class="opacity-75 d-flex justify-content-center text-center fs-6" href="/register">No user yet? Register.</a>
     <p class="mt-5 mb-3 text-muted">&copy;2022</p>
 
 </main>
@@ -90,42 +72,7 @@
 </body>
 </html>
 
-
 <style>
-    html,
-    body {
-        height: 100%;
-    }
-
-    body {
-        align-items: center;
-        padding-top: 40px;
-        padding-bottom: 40px;
-        background-color: #f5f5f5;
-    }
-
-    .form-signin {
-        max-width: 330px;
-        padding: 15px;
-    }
-
-    .form-signin .form-floating:focus-within {
-        z-index: 2;
-    }
-
-    .form-signin input[type="email"] {
-        margin-bottom: -1px;
-        border-bottom-right-radius: 0;
-        border-bottom-left-radius: 0;
-    }
-
-    .form-signin input[type="password"] {
-        margin-bottom: 10px;
-        border-top-left-radius: 0;
-        border-top-right-radius: 0;
-    }
-
-    .img-fluid{
-        margin-bottom: 15px;
-    }
+    @import "../../userInput.css";
+    @import "../../customBootstrap.css";
 </style>
\ No newline at end of file
diff --git a/frontend/svelte/src/routes/register/+page.svelte b/frontend/svelte/src/routes/register/+page.svelte
new file mode 100644
index 0000000..93dac34
--- /dev/null
+++ b/frontend/svelte/src/routes/register/+page.svelte
@@ -0,0 +1,73 @@
+<script lang="ts">
+    import logo from "../../resources/images/logo2.svg";
+    import {SvelteToast} from "@zerodevx/svelte-toast";
+    import {StrapiUserRepo} from "../../models/repos/user/StrapiUserRepo";
+    import {handleErrorsFromResponseWithToast} from "../../models/PomeloUtils";
+
+    let user: string;
+    let password: string;
+    let email: string;
+
+
+    /**
+     * Handles the button click.
+     */
+    async function handleSubmit() {
+        const userRepo: StrapiUserRepo = StrapiUserRepo.getInstance(false);
+
+        const response = await userRepo.registerUser(email, user, password);
+
+        if (response.error != null) {
+            handleErrorsFromResponseWithToast(response);
+        } else {
+            window.location = "/login";
+        }
+    }
+</script>
+
+<html
+        lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta content="width=device-width, initial-scale=1" name="viewport">
+    <title>PomeloNote | Register</title>
+    <link crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.1/dist/css/bootstrap.min.css"
+          integrity="sha384-iYQeCzEYFbKjA/T2uDLTpkwGzCiq6soy8tYaI1GyVh/UjpbCx/TYkiZhlZB6+fzT" rel="stylesheet">
+</head>
+
+<body>
+<main class="form-signin w-100 m-auto">
+
+    <img alt="Logo" class="img-fluid" src="{logo}">
+    <h1 class="h3 mb-3 fw-normal">Register a new user</h1>
+
+    <div class="form-floating">
+        <input bind:value={user} class="form-control" id="floatingUsr" placeholder="exampleUsername" type="text">
+        <label for="floatingUsr">Username</label>
+    </div>
+
+    <div class="form-floating">
+        <input bind:value={email} class="form-control" id="floatingInput" placeholder="name@example.com" type="email">
+        <label for="floatingInput">Email address</label>
+    </div>
+    <div class="form-floating">
+        <input bind:value={password} class="form-control" id="floatingPassword" placeholder="Password" type="password">
+        <label for="floatingPassword">Password</label>
+    </div>
+
+    <button class="w-100 btn btn-lg btn-primary" disabled="{(!user || !email || !password)}" on:click={handleSubmit}>
+        Register user
+        {#if user}: {user} {/if}
+    </button>
+    <a class="opacity-75 d-flex justify-content-center text-center fs-6" href="/login">Already registered? Login.</a>
+    <p class="mt-5 mb-3 text-muted">&copy;2022</p>
+
+</main>
+<SvelteToast></SvelteToast>
+</body>
+</html>
+
+<style>
+    @import "../../userInput.css";
+    @import "../../customBootstrap.css";
+</style>
\ No newline at end of file
diff --git a/frontend/svelte/src/service-worker.js b/frontend/svelte/src/service-worker.js
new file mode 100644
index 0000000..15b45e1
--- /dev/null
+++ b/frontend/svelte/src/service-worker.js
@@ -0,0 +1,78 @@
+/// <reference lib="webworker" />
+
+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);
+            })()
+        );
+    }
+});
\ No newline at end of file
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<number>();
+if (browser) {
+    currentNoteId.set(Number(localStorage.getItem("currentNoteId") || ""))
+    currentNoteId.subscribe(val => localStorage.setItem("currentNoteId", String(val)));
+}
\ No newline at end of file
diff --git a/frontend/svelte/src/userInput.css b/frontend/svelte/src/userInput.css
new file mode 100644
index 0000000..877e674
--- /dev/null
+++ b/frontend/svelte/src/userInput.css
@@ -0,0 +1,41 @@
+html,
+body {
+    height: 100%;
+}
+
+body {
+    align-items: center;
+    padding-top: 40px;
+    padding-bottom: 40px;
+    background-color: #f5f5f5;
+}
+
+.form-signin {
+    max-width: 330px;
+    padding: 15px;
+}
+
+.form-signin .form-floating:focus-within {
+    z-index: 2;
+}
+
+.form-signin input[type="text"] {
+    margin-bottom: -1px;
+    border-bottom-right-radius: 0;
+    border-bottom-left-radius: 0;
+}
+
+.form-signin input[type="email"] {
+    margin-bottom: -1px;
+    border-radius: 0;
+}
+
+.form-signin input[type="password"] {
+    margin-bottom: 10px;
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+}
+
+.img-fluid {
+    margin-bottom: 15px;
+}
\ No newline at end of file
diff --git a/frontend/svelte/static/manifest.json b/frontend/svelte/static/manifest.json
new file mode 100644
index 0000000..654b436
--- /dev/null
+++ b/frontend/svelte/static/manifest.json
@@ -0,0 +1,41 @@
+{
+	"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
diff --git a/frontend/svelte/vite.config.ts b/frontend/svelte/vite.config.ts
index 1695034..d538b6b 100644
--- a/frontend/svelte/vite.config.ts
+++ b/frontend/svelte/vite.config.ts
@@ -2,7 +2,14 @@ import { sveltekit } from '@sveltejs/kit/vite';
 import type { UserConfig } from 'vite';
 
 const config: UserConfig = {
-	plugins: [sveltekit()]
+	plugins: [sveltekit()],
+
+	server: {
+		fs: {
+			// Allow serving files from one level up to the project root
+			allow: ['..'],
+		},
+	},
 };
 
 export default config;