Release 2.0.0

Updated display and host
Added Editing of Questions
2026-01-03 00:38:52 +01:00 · 2026-01-02 18:00:57 +01:00 · 2026-01-02 12:35:44 +01:00 · 2026-01-02 02:59:40 +01:00 · 2025-12-28 15:49:19 +01:00 · 2025-12-28 15:40:25 +01:00
49 changed files with 3293 additions and 436 deletions
--- a/.npmrc
+++ b/.npmrc
@@ -1 +1,2 @@
 engine-strict=true
+script-shell=C:\Program Files\Git\git-bash.exe
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,8 +18,10 @@ services:
      JEOPARDY_URL: http://localhost:11000
    ports:
      - "11001:12345"
+    volumes:
+      - jeopardyserver_data_volume:/data
  mongo:
-    image: mongo:8.0.14
+    image: mongo:8.0.17
    restart: always
    environment:
      MONGO_INITDB_ROOT_USERNAME: jeopardyadmin
@@ -41,3 +43,4 @@ services:

 volumes:
  mongodb_data_volume:
+  jeopardyserver_data_volume:
--- a/docker-dev.sh
+++ b/docker-dev.sh
@@ -0,0 +1,4 @@
+
+docker compose down &
+docker build -t jeopardy .
+docker compose up -d
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
    "name": "jeopardy",
-    "version": "1.0.4",
+    "version": "2.0.0",
    "lockfileVersion": 3,
    "requires": true,
    "packages": {
        "": {
            "name": "jeopardy",
-            "version": "1.0.4",
+            "version": "2.0.0",
            "dependencies": {
                "axios": "^1.12.2",
                "cookie": "^1.0.2"
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
    "name": "jeopardy",
    "private": true,
-    "version": "1.0.4",
+    "version": "2.0.0",
    "type": "module",
    "scripts": {
        "dev": "vite dev",
@@ -12,7 +12,8 @@
        "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
        "format": "prettier --write .",
        "lint": "prettier --check . && eslint .",
-        "docker-build": "docker build -t jeopardy ."
+        "docker-build": "docker build -t jeopardy .",
+        "docker-dev": "./docker-dev.sh"
    },
    "devDependencies": {
        "@eslint/compat": "^1.2.5",
--- a/src/app.css
+++ b/src/app.css
@@ -17,6 +17,17 @@
        background-color: rgba(0, 0, 0, 0.1);
    }

+    .btn:disabled {
+        color: grey !important;
+        border-color: gray !important;
+        cursor: unset !important;
+    }
+
+    .btn:disabled:hover {
+        background-color: unset !important;
+        cursor: unset !important;
+    }
+
    .inputField {
        padding: 8px;
    }
--- a/src/app.html
+++ b/src/app.html
@@ -6,6 +6,7 @@
            name="viewport"
            content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0"
        />
+        <script src="https://kit.fontawesome.com/4115dc7344.js" crossorigin="anonymous"></script>
        %sveltekit.head%
    </head>
    <body data-sveltekit-preload-data="hover" class="size-full">
--- a/src/lib/AudioMultipleChoiceQuestionComponent.svelte
+++ b/src/lib/AudioMultipleChoiceQuestionComponent.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
    import AudioPlayerComponent from "./AudioPlayerComponent.svelte";
    import type { AudioMultipleChoiceQuestion } from "./games/games";
+    import { url } from "./util";

    const path = "/sounds/";

@@ -9,10 +10,19 @@
        showAnswer: boolean;
        showQuestion: boolean;
        showPlayer: boolean;
+        isLegacy?: boolean;
+        randomize?: boolean;
        [key: string]: unknown;
    }

-    let { question, showAnswer, showQuestion, showPlayer }: Props = $props();
+    let {
+        question,
+        showAnswer,
+        showQuestion,
+        showPlayer,
+        isLegacy = true,
+        randomize = true
+    }: Props = $props();

    function shuffle<T>(array: T[]) {
        let currentIndex = array.length;
@@ -28,10 +38,24 @@
        }
    }

-    const answer = question.data.choices[0];
+    const answer = $derived(question.data.choices[0]);

-    let _choices = [...question.data.choices];
-    shuffle(_choices);
+    let _choices = $derived.by(() => {
+        let c = [...question.data.choices];
+        if (randomize) shuffle(c);
+        return c;
+    });
+
+    let audioPath = $derived.by(() => {
+        if (question.data.audio === null) return undefined;
+        if (isLegacy) return `${path}${question.data.audio}`;
+        let audio = question.data.audio;
+        if (typeof audio === "string") {
+            return url(`/cdn/${question.owner}/${audio}`);
+        } else {
+            return url(`/cdn/${audio?.user}/${audio?._id}`);
+        }
+    });
 </script>

 <div class="mb-4 flex grow flex-col items-center text-6xl">
@@ -42,7 +66,16 @@
    {/if}
    {#if showPlayer}
        <div class="flex w-full flex-col justify-center">
-            <AudioPlayerComponent src={path + question.data.audio} />
+            {#if audioPath}
+                <AudioPlayerComponent src={audioPath} />
+            {:else}
+                <div class="flex h-full w-full flex-col items-center justify-center">
+                    <div class="text-[128px] text-gray-300">
+                        <i class="fa-solid fa-file-audio"></i>
+                    </div>
+                    <div class="text-[24px] text-gray-500 select-none">Kein Audio ausgewählt</div>
+                </div>
+            {/if}
        </div>
    {/if}
    {#if showQuestion}
--- a/src/lib/AudioQuestionComponent.svelte
+++ b/src/lib/AudioQuestionComponent.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
    import AudioPlayerComponent from "./AudioPlayerComponent.svelte";
    import type { AudioQuestion } from "./games/games";
+    import { url } from "./util";

    const path = "/sounds/";

@@ -9,10 +10,22 @@
        showAnswer: boolean;
        showQuestion: boolean;
        showPlayer: boolean;
+        isLegacy?: boolean;
        [key: string]: unknown;
    }

-    let { question, showAnswer, showQuestion, showPlayer }: Props = $props();
+    let { question, showAnswer, showQuestion, showPlayer, isLegacy = true }: Props = $props();
+
+    let audioPath = $derived.by(() => {
+        if (question.data.audio === null) return undefined;
+        if (isLegacy) return `${path}${question.data.audio}`;
+        let audio = question.data.audio;
+        if (typeof audio === "string") {
+            return url(`/cdn/${question.owner}/${audio}`);
+        } else {
+            return url(`/cdn/${audio?.user}/${audio?._id}`);
+        }
+    });
 </script>

 <div class="mb-4 flex grow flex-col items-center text-6xl">
@@ -23,7 +36,16 @@
    {/if}
    {#if showPlayer}
        <div class="flex w-full flex-col justify-center">
-            <AudioPlayerComponent src={path + question.data.audio} />
+            {#if audioPath}
+                <AudioPlayerComponent src={audioPath} />
+            {:else}
+                <div class="flex h-full w-full flex-col items-center justify-center">
+                    <div class="text-[128px] text-gray-300">
+                        <i class="fa-solid fa-file-audio"></i>
+                    </div>
+                    <div class="text-[24px] text-gray-500 select-none">Kein Audio ausgewählt</div>
+                </div>
+            {/if}
        </div>
    {/if}
    {#if showAnswer}
--- a/src/lib/Auth.svelte.ts
+++ b/src/lib/Auth.svelte.ts
@@ -1,6 +1,6 @@
 import axios from "axios";
 import { env } from "$env/dynamic/public";
-import UserSvelte from "./User.svelte";
+import UserSvelte, { type UserObj } from "./User.svelte";
 import { goto } from "$app/navigation";

 export async function isAuthenticated() {
@@ -8,13 +8,13 @@ export async function isAuthenticated() {
        return true;
    }
    return axios
-        .get(
-            `${env.PUBLIC_JEOPARDY_SERVER_PROTOCOL}://${env.PUBLIC_JEOPARDY_SERVER}/user/username`,
-            { withCredentials: true }
-        )
+        .get(`${env.PUBLIC_JEOPARDY_SERVER_PROTOCOL}://${env.PUBLIC_JEOPARDY_SERVER}/auth`, {
+            withCredentials: true
+        })
        .then((res) => {
            if (res.status === 200) {
-                UserSvelte.username = res.data;
+                UserSvelte.user = res.data as UserObj;
+                console.log(UserSvelte.id, UserSvelte.username, UserSvelte.role);
                return true;
            } else {
                goto("/login");
--- a/src/lib/Button.svelte
+++ b/src/lib/Button.svelte
@@ -0,0 +1,51 @@
+<script lang="ts">
+    import type { Snippet } from "svelte";
+
+    interface Props {
+        onclick?: (
+            event: MouseEvent & {
+                currentTarget: EventTarget & HTMLButtonElement;
+            }
+        ) => void;
+        children: Snippet;
+        class?: string;
+        disabled?: boolean;
+    }
+
+    let { onclick, children, class: classes, disabled = false }: Props = $props();
+</script>
+
+<!-- svelte-ignore a11y_consider_explicit_label -->
+<button
+    {disabled}
+    type="button"
+    class="btn {classes}"
+    onclick={(event) => {
+        if (onclick) onclick(event);
+    }}>{@render children()}</button
+>
+
+<style>
+    .btn {
+        border: 1px solid black;
+        border-radius: 5px;
+        padding: 4px;
+        cursor: pointer;
+        height: fit-content;
+    }
+
+    .btn:hover {
+        background-color: rgba(0, 0, 0, 0.1);
+    }
+
+    .btn:disabled {
+        color: grey !important;
+        border-color: gray !important;
+        cursor: unset !important;
+    }
+
+    .btn:disabled:hover {
+        background-color: unset !important;
+        cursor: unset !important;
+    }
+</style>
--- a/src/lib/DisplayState.svelte.ts
+++ b/src/lib/DisplayState.svelte.ts
@@ -1,4 +1,4 @@
-import type { Game, Wall } from "./games/games";
+import type { Game, Wall } from "./Types";

 interface Player {
    name: string;
@@ -8,10 +8,9 @@ interface Player {
 const baseRoute = "/connected/display/running";
 let players: Player[] = $state([]);
 let currentPlayer: string = $state("");
-// eslint-disable-next-line prefer-const
-let game: Game | undefined = undefined;
+let game: Game | undefined = $state();
 let gameIndex: number = -1;
-let wall: Wall | undefined = undefined;
+let wall: Wall | undefined = $state();
 let wallIndex: number = -1;

 export default {
--- a/src/lib/ImageMultipleChoiceQuestionComponent.svelte
+++ b/src/lib/ImageMultipleChoiceQuestionComponent.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
    import type { ImageMultipleChoiceQuestion } from "./games/games";
+    import { url } from "./util";

    const path = "/images/";

@@ -8,6 +9,8 @@
        showAnswer: boolean;
        showQuestion: boolean;
        isBuzzed: boolean;
+        isLegacy?: boolean;
+        randomize?: boolean;
        [key: string]: unknown;
    }

@@ -25,12 +28,33 @@
        }
    }

-    let { question, showAnswer, showQuestion, isBuzzed }: Props = $props();
+    let {
+        question,
+        showAnswer,
+        showQuestion,
+        isBuzzed,
+        isLegacy = true,
+        randomize = true
+    }: Props = $props();

-    const answer = question.data.choices[0];
+    const answer = $derived(question.data.choices[0]);

-    let _choices = [...question.data.choices];
-    shuffle(_choices);
+    let _choices = $derived.by(() => {
+        let c = [...question.data.choices];
+        if (randomize) shuffle(c);
+        return c;
+    });
+
+    let imagePath = $derived.by(() => {
+        if (question.data.image === null) return undefined;
+        if (isLegacy) return `${path}${question.data.image}`;
+        let image = question.data.image;
+        if (typeof image === "string") {
+            return url(`/cdn/${question.owner}/${image}`);
+        } else {
+            return url(`/cdn/${image?.user}/${image?._id}`);
+        }
+    });
 </script>

 <div class="mb-4 flex w-full grow flex-col items-center gap-2 text-6xl">
@@ -39,11 +63,16 @@
            <div class="text-center">{question.data.question}</div>
        </div>
        <div class="container grow-6">
-            <img
-                src={path + question.data.image}
-                alt={path + question.data.image}
-                class={isBuzzed ? "blurry" : ""}
-            />
+            {#if imagePath}
+                <img src={imagePath} alt={imagePath} class={isBuzzed ? "blurry" : ""} />
+            {:else}
+                <div class="flex h-full w-full flex-col items-center justify-center">
+                    <div class="text-[128px] text-gray-300">
+                        <i class="fa-solid fa-image"></i>
+                    </div>
+                    <div class="text-[24px] text-gray-500 select-none">Kein Bild ausgewählt</div>
+                </div>
+            {/if}
        </div>
        <div class="flex w-full grow-1 flex-wrap items-center justify-around gap-2">
            {#each _choices as choice}
--- a/src/lib/ImageQuestionComponent.svelte
+++ b/src/lib/ImageQuestionComponent.svelte
@@ -1,5 +1,7 @@
 <script lang="ts">
    import type { ImageQuestion } from "./games/games";
+    import { isRessource } from "./Types";
+    import { url } from "./util";

    const path = "/images/";

@@ -8,10 +10,22 @@
        showAnswer: boolean;
        showQuestion: boolean;
        isBuzzed: boolean;
+        isLegacy?: boolean;
        [key: string]: unknown;
    }

-    let { question, showAnswer, showQuestion, isBuzzed }: Props = $props();
+    let { question, showAnswer, showQuestion, isBuzzed, isLegacy = true }: Props = $props();
+
+    let imagePath = $derived.by(() => {
+        if (question.data.image === null) return undefined;
+        if (isLegacy) return `${path}${question.data.image}`;
+        let image = question.data.image;
+        if (typeof image === "string") {
+            return url(`/cdn/${question.owner}/${image}`);
+        } else {
+            return url(`/cdn/${image?.user}/${image?._id}`);
+        }
+    });
 </script>

 <div class="mb-4 flex w-full grow flex-col items-center gap-2 text-6xl">
@@ -20,11 +34,16 @@
            <div class="text-center">{question.data.question}</div>
        </div>
        <div class="container grow-6">
-            <img
-                src={path + question.data.image}
-                alt={path + question.data.image}
-                class={isBuzzed ? "blurry" : ""}
-            />
+            {#if imagePath}
+                <img src={imagePath} alt={imagePath} class={isBuzzed ? "blurry" : ""} />
+            {:else}
+                <div class="flex h-full w-full flex-col items-center justify-center">
+                    <div class="text-[128px] text-gray-300">
+                        <i class="fa-solid fa-image"></i>
+                    </div>
+                    <div class="text-[24px] text-gray-500 select-none">Kein Bild ausgewählt</div>
+                </div>
+            {/if}
        </div>
    {/if}
    {#if showAnswer}
--- a/src/lib/Modal.svelte
+++ b/src/lib/Modal.svelte
@@ -0,0 +1,96 @@
+<script lang="ts">
+    import type { Snippet } from "svelte";
+
+    interface Props {
+        showModal: boolean;
+        header: Snippet;
+        children: Snippet;
+        actionButtons?: Snippet;
+        cancelFn?: () => void;
+        okFn: () => Promise<boolean>;
+        oncloseFn?: () => void;
+        okButtonText?: string;
+        [key: string]: unknown;
+        width?: string;
+        height?: string;
+    }
+
+    let {
+        showModal = $bindable(),
+        header,
+        children,
+        cancelFn,
+        okFn,
+        oncloseFn,
+        actionButtons,
+        okButtonText = "Ok",
+        width,
+        height
+    }: Props = $props();
+
+    let dialog: HTMLDialogElement | undefined = $state(); // HTMLDialogElement
+
+    $effect(() => {
+        if (showModal) dialog?.showModal();
+    });
+</script>
+
+<!-- svelte-ignore a11y_click_events_have_key_events, a11y_no_noninteractive_element_interactions -->
+<dialog
+    bind:this={dialog}
+    onclose={() => {
+        showModal = false;
+        if (oncloseFn) oncloseFn();
+    }}
+    onclick={(e) => {
+        if (e.target === dialog) dialog.close();
+    }}
+    class="rounded-md"
+    style:width
+    style:height
+>
+    <div class="flex h-full flex-col gap-4 p-4">
+        {@render header?.()}
+        <div class="grow overflow-y-auto">
+            {@render children?.()}
+        </div>
+        <!-- <div class="grow"></div> -->
+        <!-- svelte-ignore a11y_autofocus -->
+        <div class="flex justify-end gap-4">
+            {@render actionButtons?.()}
+            <button
+                autofocus
+                onclick={() => {
+                    dialog?.close();
+                    if (cancelFn) cancelFn();
+                }}
+                class="btn">Abbrechen</button
+            >
+            <button
+                autofocus
+                onclick={async () => {
+                    if (await okFn()) {
+                        dialog?.close();
+                    }
+                }}
+                class="btn min-w-[64px]">{okButtonText}</button
+            >
+        </div>
+    </div>
+</dialog>
+
+<style>
+    dialog {
+        position: fixed;
+        top: 50%;
+        left: 50%;
+        /* Move it back 50% relative to self */
+        -webkit-transform: translateX(-50%) translateY(-50%);
+        -moz-transform: translateX(-50%) translateY(-50%);
+        -ms-transform: translateX(-50%) translateY(-50%);
+        transform: translateX(-50%) translateY(-50%);
+    }
+    dialog::backdrop {
+        background: rgba(0, 0, 0, 0.5);
+    }
+</style>
--- a/src/lib/MultipleChoiceQuestionComponent.svelte
+++ b/src/lib/MultipleChoiceQuestionComponent.svelte
@@ -5,6 +5,7 @@
        question: MultipleChoiceQuestion;
        showAnswer: boolean;
        showQuestion: boolean;
+        randomize?: boolean;
        [key: string]: unknown;
    }

@@ -22,12 +23,15 @@
        }
    }

-    let { question, showAnswer, showQuestion }: Props = $props();
+    let { question, showAnswer, showQuestion, randomize = true }: Props = $props();

-    const answer = question.data.choices[0];
+    const answer = $derived(question.data.choices[0]);

-    let _choices = [...question.data.choices];
-    shuffle(_choices);
+    let _choices = $derived.by(() => {
+        let c = [...question.data.choices];
+        if (randomize) shuffle(c);
+        return c;
+    });
 </script>

 <div class="mb-4 flex grow flex-col items-center text-6xl">
--- a/src/lib/RessourceManager.svelte
+++ b/src/lib/RessourceManager.svelte
@@ -0,0 +1,451 @@
+<script lang="ts">
+    import { env } from "$env/dynamic/public";
+    import axios from "axios";
+    import Modal from "./Modal.svelte";
+    import { url } from "./util";
+    import { isDir, isRessource, type Directory, type Ressource } from "./Types";
+
+    interface Props {
+        show: boolean;
+        ok?: (res: Ressource) => void;
+    }
+
+    let { show = $bindable(false), ok = (res) => {} }: Props = $props();
+
+    let file: File | null = null;
+    let path: string = $state("/");
+
+    let fetchingRessources = $state(false);
+    let ressources: (Ressource | Directory)[] = $state([]);
+    let selectedRessource: Ressource | undefined = $state();
+
+    let error = $state("");
+
+    let showNewDir = $state(false);
+    let newDirName = $state("");
+    let showDeleteDir = $state(false);
+    let dirToDelete: Directory | undefined = $state();
+
+    let showDeleteRessource = $state(false);
+    let resToDelete: Ressource | undefined = $state();
+
+    let showRenameFile = $state(false);
+    let fileToRename: Ressource | undefined = $state();
+    let newFileName = $state("");
+
+    function handleFileChange(event: Event) {
+        const target = event.target as HTMLInputElement | null;
+        if (target?.files?.[0]) {
+            file = target.files[0];
+        }
+    }
+
+    function uploadData(event: SubmitEvent) {
+        event.preventDefault();
+        if (file === null) return;
+
+        const formData = new FormData();
+        formData.append("path", path);
+        formData.append("file", file);
+
+        axios
+            .post(
+                `${env.PUBLIC_JEOPARDY_SERVER_PROTOCOL}://${env.PUBLIC_JEOPARDY_SERVER}/upload`,
+                formData,
+                {
+                    withCredentials: true,
+                    headers: {
+                        "Content-Type": "multipart/form-data"
+                    },
+                    onUploadProgress: (event) => {
+                        console.log(event);
+                    }
+                }
+            )
+            .then((response) => {
+                if (response.status === 200) {
+                    fetchDirectory();
+                } else {
+                    alert("Failed with status: " + response.status);
+                }
+            })
+            .catch((err) => {
+                console.error(err);
+                alert(err);
+            });
+    }
+
+    async function deleteRessource(res: Ressource | Directory): Promise<boolean> {
+        if (isRessource(res)) {
+            return axios
+                .delete(url("/cdn/" + res.user + "/" + res.filename), {
+                    withCredentials: true
+                })
+                .then((response) => {
+                    if (response.status === 200) {
+                        fetchDirectory();
+                        return true;
+                    } else {
+                        alert("Something went wrong: " + response.status);
+                        return false;
+                    }
+                })
+                .catch((err) => {
+                    console.error(err);
+                    return false;
+                });
+        } else if (isDir(res)) {
+            showDeleteDir = true;
+            dirToDelete = res;
+            return true;
+        }
+        return false;
+    }
+
+    function deleteRessourceCancel() {
+        resToDelete = undefined;
+    }
+
+    async function deleteDir() {
+        if (dirToDelete === undefined) return false;
+        return axios
+            .delete(url("/directory"), {
+                headers: {
+                    "Content-Type": "application/json"
+                },
+                data: { path: path + (path === "/" ? "" : "/") + dirToDelete.name },
+                withCredentials: true
+            })
+            .then((response) => {
+                if (response.status === 200) {
+                    fetchDirectory();
+                    dirToDelete = undefined;
+                    return true;
+                } else {
+                    alert("Failed to delete directory: " + response.status);
+                }
+                return false;
+            })
+            .catch((err) => {
+                console.error(err);
+                return false;
+            });
+    }
+
+    function deleteDirCancel() {
+        dirToDelete = undefined;
+    }
+
+    async function fetchDirectory() {
+        fetchingRessources = true;
+        return axios
+            .post(
+                url("/directory"),
+                { path },
+                {
+                    withCredentials: true
+                }
+            )
+            .then((response) => {
+                if (response.status === 200) {
+                    ressources = response.data;
+                    ressources.sort((a, b) => {
+                        if (isDir(a) && !isDir(b)) return -1;
+                        if (!isDir(a) && isDir(b)) return 1;
+                        return a.name.localeCompare(b.name);
+                    });
+                    if (path !== "/") {
+                        ressources.unshift({
+                            isDir: true,
+                            name: ".."
+                        });
+                    }
+                }
+            })
+            .catch((e) => {
+                console.log(e);
+            })
+            .finally(() => {
+                fetchingRessources = false;
+            });
+    }
+
+    async function addDirectoryOk(): Promise<boolean> {
+        error = "";
+        if (newDirName.length <= 0) {
+            error = "Gib einen Namen für den Ordner ein";
+            return false;
+        }
+
+        return axios
+            .put(url("/directory"), { name: newDirName, path }, { withCredentials: true })
+            .then((response) => {
+                if (response.status === 200) {
+                    fetchDirectory();
+                    return true;
+                } else {
+                    return false;
+                }
+            })
+            .catch(() => {
+                error = "Etwas ist schief gelaufen";
+                return false;
+            });
+    }
+
+    function addDirectoryCancel() {
+        error = "";
+        newDirName = "";
+    }
+
+    function ressourceClicked(res: Ressource | Directory) {
+        if (isRessource(res)) {
+            selectedRessource = res;
+        } else if (isDir(res)) {
+            if (res.name === "..") {
+                let breadcumbs = path.split("/");
+                breadcumbs.pop();
+                path = breadcumbs.join("/");
+                if (path.length <= 0) path = "/";
+            } else {
+                if (!path.endsWith("/")) {
+                    path += "/";
+                }
+                path += res.name;
+            }
+            fetchDirectory();
+        }
+    }
+
+    function renameRessource(res: Ressource) {
+        fileToRename = res;
+        newFileName = res.name;
+        showRenameFile = true;
+    }
+
+    async function renameFile() {
+        if (fileToRename === undefined) return false;
+        return axios
+            .put(
+                url("/cdn/" + fileToRename.user + "/" + fileToRename.filename),
+                {
+                    name: newFileName
+                },
+                { withCredentials: true }
+            )
+            .then((response) => {
+                if (response.status === 200) {
+                    fetchDirectory();
+                    fileToRename = undefined;
+                    newFileName = "";
+                    return true;
+                } else {
+                    alert("Failed to rename File: " + response.status);
+                }
+                return false;
+            })
+            .catch((err) => {
+                console.error(err);
+                return false;
+            });
+    }
+
+    function renameFileCancel() {
+        fileToRename = undefined;
+        newFileName = "";
+    }
+
+    function closeRessourceManager() {
+        selectedRessource = undefined;
+    }
+
+    $effect(() => {
+        if (show) {
+            fetchDirectory();
+        }
+    });
+</script>
+
+<Modal
+    bind:showModal={show}
+    okFn={async () => {
+        if (selectedRessource) ok({ ...selectedRessource });
+        return true;
+    }}
+    oncloseFn={closeRessourceManager}
+    okButtonText={selectedRessource !== undefined ? selectedRessource.name : "Ok"}
+    width="90%"
+    height="90%"
+>
+    {#snippet header()}
+        <h2 class="text-3xl">Ressourcenmanager - {path}</h2>
+    {/snippet}
+    <div class="h-full">
+        {#if fetchingRessources}
+            Loading...
+        {:else if ressources.length > 0}
+            <div class="flex flex-col gap-2">
+                {#each ressources as ressource}
+                    <!-- svelte-ignore a11y_click_events_have_key_events -->
+                    <!-- svelte-ignore a11y_no_static_element_interactions -->
+                    <div
+                        class="flex grow cursor-pointer items-center justify-between rounded-sm border-1 border-solid p-1 hover:bg-gray-200"
+                        onclick={() => ressourceClicked(ressource)}
+                        class:bg-green-200={isRessource(ressource) &&
+                            ressource._id === selectedRessource?._id}
+                    >
+                        <div>
+                            {#if isDir(ressource)}
+                                <i class="fa-solid fa-folder"></i>
+                                {ressource.name}
+                            {:else}
+                                {#if ressource.mimetype.includes("image")}
+                                    <i class="fa-solid fa-image"></i>
+                                {:else if ressource.mimetype.includes("audio")}
+                                    <i class="fa-solid fa-music"></i>
+                                {:else}
+                                    <i class="fa-solid fa-file"></i>
+                                {/if}
+                                {ressource.name}
+                            {/if}
+                        </div>
+                        {#if !(isDir(ressource) && ressource.name === "..")}
+                            <div class="flex gap-4">
+                                {#if isRessource(ressource)}
+                                    <!-- svelte-ignore a11y_consider_explicit_label -->
+                                    <button
+                                        type="button"
+                                        class="btn border-black"
+                                        onclick={(event) => {
+                                            event.stopPropagation();
+                                            renameRessource(ressource);
+                                        }}><i class="fa-solid fa-pencil"></i></button
+                                    >
+                                {/if}
+                                <!-- svelte-ignore a11y_consider_explicit_label -->
+                                <button
+                                    type="button"
+                                    class="btn border-red-600 text-red-600"
+                                    onclick={(event) => {
+                                        event.stopPropagation();
+                                        if (isRessource(ressource)) {
+                                            showDeleteRessource = true;
+                                            resToDelete = ressource;
+                                        } else if (isDir(ressource)) {
+                                            dirToDelete = ressource;
+                                            showDeleteDir = true;
+                                        }
+                                    }}><i class="fa-solid fa-trash"></i></button
+                                >
+                            </div>
+                        {/if}
+                    </div>
+                {/each}
+            </div>
+        {:else}
+            <div class="flex h-full w-full grow-2 flex-col items-center justify-center">
+                <div class="text-[128px] text-gray-300"><i class="fa-solid fa-database"></i></div>
+                <div class="text-[24px] text-gray-500 select-none">
+                    Noch keine Ressourcen vorhanden
+                </div>
+            </div>
+        {/if}
+    </div>
+    {#snippet actionButtons()}
+        <form
+            action={`${env.PUBLIC_JEOPARDY_SERVER_PROTOCOL}://${env.PUBLIC_JEOPARDY_SERVER}/upload`}
+            enctype="multipart/form-data"
+            method="post"
+            onsubmit={uploadData}
+        >
+            <input class="btn" type="file" name="file" onchange={handleFileChange} />
+            <input type="submit" value="Hochladen" class="btn" />
+        </form>
+        <button class="btn" type="button" onclick={() => (showNewDir = true)}>Neuer Ordner</button>
+    {/snippet}
+</Modal>
+
+<Modal bind:showModal={showNewDir} okFn={addDirectoryOk} cancelFn={addDirectoryCancel}>
+    {#snippet header()}
+        <h2 class="text-3xl">Neuer Ordner</h2>
+    {/snippet}
+    <div>
+        <label for="directory" class="">Name</label>
+        <div>
+            <input
+                type="text"
+                name="directory"
+                id="directory"
+                class="borders mt-2 mb-2 w-full"
+                bind:value={newDirName}
+            />
+        </div>
+        {#if error.length > 0}
+            <div class="text-red-700">{error}</div>
+        {/if}
+    </div>
+</Modal>
+
+<Modal
+    bind:showModal={showDeleteRessource}
+    okFn={async () => {
+        if (resToDelete === undefined) return false;
+        return deleteRessource(resToDelete);
+    }}
+    cancelFn={deleteRessourceCancel}
+>
+    {#snippet header()}
+        <h2 class="text-3xl">Ressource löschen</h2>
+    {/snippet}
+
+    <div>
+        Soll die Ressource {resToDelete?.name} wirklich gelöscht werden?
+    </div>
+    {#if error.length > 0}
+        <div class="text-red-700">{error}</div>
+    {/if}
+</Modal>
+
+<Modal bind:showModal={showDeleteDir} okFn={deleteDir} cancelFn={deleteDirCancel}>
+    {#snippet header()}
+        <h2 class="text-3xl">Ordner löschen</h2>
+    {/snippet}
+
+    <div>
+        Soll der Ordner {dirToDelete?.name} wirklich gelöscht werden? Alle darin enthaltenen Daten gehen
+        verloren.
+    </div>
+    {#if error.length > 0}
+        <div class="text-red-700">{error}</div>
+    {/if}
+</Modal>
+
+<Modal bind:showModal={showRenameFile} okFn={renameFile} cancelFn={renameFileCancel}>
+    {#snippet header()}
+        <h2 class="text-3xl">Datei umbenennen</h2>
+    {/snippet}
+    <div>
+        <label for="directory" class="">Name</label>
+        <div>
+            <input
+                type="text"
+                name="directory"
+                id="directory"
+                class="borders mt-2 mb-2 w-full"
+                bind:value={newFileName}
+            />
+        </div>
+        {#if error.length > 0}
+            <div class="text-red-700">{error}</div>
+        {/if}
+    </div>
+</Modal>
+
+<style>
+    .borders {
+        border: 1px solid black;
+        border-radius: 5px;
+        display: flex;
+        padding: 2px;
+    }
+</style>
--- a/src/lib/Textfield.svelte
+++ b/src/lib/Textfield.svelte
@@ -0,0 +1,46 @@
+<script lang="ts">
+    import type { HTMLInputTypeAttribute } from "svelte/elements";
+
+    interface Props {
+        value: any;
+        label?: string;
+        type?: HTMLInputTypeAttribute;
+        readonly?: boolean;
+        class?: string;
+    }
+
+    let {
+        value = $bindable(),
+        label,
+        type = "text",
+        readonly = false,
+        class: className
+    }: Props = $props();
+
+    const id = crypto.randomUUID();
+</script>
+
+<div class="w-full grow">
+    {#if label}
+        <label for="textfield-{id}" class="">{label}</label>
+    {/if}
+    <div>
+        <input
+            {type}
+            {readonly}
+            name="textfield"
+            id="textfield-{id}"
+            class="borders mt-2 mb-2 w-full {className}"
+            bind:value
+        />
+    </div>
+</div>
+
+<style>
+    .borders {
+        border: 1px solid black;
+        border-radius: 5px;
+        display: flex;
+        padding: 2px;
+    }
+</style>
--- a/src/lib/Types.ts
+++ b/src/lib/Types.ts
@@ -1 +1,84 @@
-export type VisitedQuestions = number[][];
+import type {
+    AudioMultipleChoiceQuestion,
+    AudioQuestion,
+    FullWall,
+    ImageMultipleChoiceQuestion,
+    ImageQuestion,
+    MultipleChoiceQuestion,
+    SimpleQuestion
+} from "./games/games";
+
+export type VisitedQuestions = QuestionId[];
+
+export type Directory = {
+    name: string;
+    isDir: true;
+};
+
+export type Ressource = {
+    _id: string;
+    fullpath: string;
+    path: string;
+    user: string;
+    mimetype: string;
+    name: string;
+    filename: string;
+};
+
+export function isDir(dir: Directory | Ressource): dir is Directory {
+    return (dir as Directory).isDir === true;
+}
+
+export function isRessource(
+    ressource: Ressource | Directory | string | null
+): ressource is Ressource {
+    if (ressource === null) return false;
+    return (ressource as Directory).isDir === undefined;
+}
+
+export type _id = string;
+
+export type GameId = _id;
+
+export type Game = {
+    name: string;
+    owner: _id;
+    _id: GameId;
+    walls: WallId[];
+};
+
+export type WallId = _id;
+
+export type Wall = {
+    _id: WallId;
+    name: string;
+    owner: _id;
+    categories: CategoryId[];
+};
+
+export function isWall(wall: Wall | FullWall): wall is Wall {
+    return (wall as Wall)._id !== undefined;
+}
+
+export function isFullWall(wall: Wall | FullWall): wall is FullWall {
+    return !Object.hasOwn(wall, "_id");
+}
+
+export type CategoryId = _id;
+
+export type Category = {
+    _id: CategoryId;
+    name: string;
+    owner: _id;
+    questions: { _id: QuestionId; points: number }[];
+};
+
+export type QuestionId = _id;
+
+export type GeneralQuestion =
+    | SimpleQuestion
+    | MultipleChoiceQuestion
+    | ImageQuestion
+    | ImageMultipleChoiceQuestion
+    | AudioQuestion
+    | AudioMultipleChoiceQuestion;
--- a/src/lib/User.svelte.ts
+++ b/src/lib/User.svelte.ts
@@ -1,4 +1,12 @@
-let username: string = "";
+let username: string = $state("");
+let role: string = $state("");
+let id: string = $state("");
+
+export type UserObj = {
+    username: string;
+    role: string;
+    _id: string;
+};

 export default {
    get username(): string {
@@ -6,5 +14,22 @@ export default {
    },
    set username(uname: string) {
        username = uname;
+    },
+    get role(): string {
+        return role;
+    },
+    set role(newrole: string) {
+        role = newrole;
+    },
+    get id(): string {
+        return id;
+    },
+    set id(newid: string) {
+        id = newid;
+    },
+    set user(userobj: UserObj) {
+        username = userobj.username;
+        role = userobj.role;
+        id = userobj._id;
    }
 };
--- a/src/lib/Wall.svelte
+++ b/src/lib/Wall.svelte
@@ -1,47 +1,145 @@
 <script lang="ts">
-    import type { Wall } from "$lib/games/games";
-    import type { VisitedQuestions } from "./Types";
+    import axios from "axios";
+    import {
+        isWall,
+        type Category,
+        type CategoryId,
+        type QuestionId,
+        type VisitedQuestions,
+        type Wall
+    } from "./Types";
+    import { url } from "./util";
+    import { onMount } from "svelte";
+    import type { FullWall } from "./games/games";
+    import Button from "./Button.svelte";
+    import Modal from "./Modal.svelte";
+    import Textfield from "./Textfield.svelte";
+    import { fetchCategory } from "../routes/editor/fetchers";

    interface Props {
-        wall: Wall | undefined;
+        wall: Wall | FullWall | undefined;
        onclick?: (catIndex: number, questionIndex: number) => unknown;
+        onclickIds?: (catId: CategoryId, questionId: QuestionId) => unknown;
        visited: VisitedQuestions;
-        [key: string]: unknown;
+        isEditor?: boolean;
    }

-    function isVisited(catIndex: number, queIndex: number): boolean {
-        return visited[catIndex] && visited[catIndex].includes(queIndex);
+    let { wall, onclick, onclickIds, visited, isEditor = false }: Props = $props();
+
+    let categories: Category[] = $state([]);
+
+    let showRenameCategory = $state(false);
+    let catToRename: Category | undefined = $state();
+    let newCatName = $state("");
+    let error = $state("");
+
+    async function fetchCategories(wall: Wall | FullWall | undefined) {
+        if (wall && isWall(wall)) {
+            let cats: Promise<Category>[] = [];
+            for (const catId of wall.categories) {
+                cats.push(fetchCategory(catId));
+            }
+            return Promise.all(cats).then((cats) => {
+                categories = cats;
+            });
+        }
    }

-    let { wall, onclick, visited }: Props = $props();
+    async function renameCategory() {
+        if (!newCatName || !catToRename) return false;
+        return axios
+            .post(
+                url(`/category/rename`),
+                {
+                    categoryid: catToRename._id,
+                    name: newCatName
+                },
+                { withCredentials: true }
+            )
+            .then((response) => {
+                if (response.status === 200) {
+                    newCatName = "";
+                    catToRename = undefined;
+                    fetchCategories(wall);
+                    return true;
+                } else {
+                    console.error(`Failed to rename category: ${response.status}`);
+                    return false;
+                }
+            })
+            .catch((err) => {
+                console.error(err);
+                return false;
+            });
+    }
+
+    function renameCategoryCancel() {
+        newCatName = "";
+        catToRename = undefined;
+    }
+
+    $effect(() => {
+        fetchCategories(wall);
+    });
+
+    onMount(() => {
+        fetchCategories(wall);
+    });
 </script>

 {#if wall != undefined}
    <div class="grid h-full grow grid-flow-col grid-cols-5 grid-rows-6 gap-4 pb-4">
-        {#each wall.categories as category, catIndex}
-            <div class="flex items-center justify-center text-3xl font-semibold">
+        {#if isWall(wall)}
+            {#each categories as category, catIndex}
+                <div class="flex items-center justify-center gap-2 text-3xl font-semibold">
                    <div>{category.name}</div>
+                    {#if isEditor}
+                        <Button
+                            onclick={() => {
+                                catToRename = category;
+                                newCatName = category.name;
+                                showRenameCategory = true;
+                            }}><i class="fa-solid fa-pen"></i></Button
+                        >
+                    {/if}
                </div>
-            {#each category.questions as question, queIndex}
+                {#each category.questions as question}
                    <!-- svelte-ignore a11y_click_events_have_key_events -->
                    <div
-                    class="card {isVisited(catIndex, queIndex) ? 'visited' : ''}"
+                        class="card {visited.includes(`${question._id}`) ? 'visited' : ''}"
                        role="button"
                        aria-pressed="false"
                        tabindex="0"
                        onclick={() => {
-                        if (onclick) onclick(catIndex, queIndex);
+                            if (onclickIds) onclickIds(category._id, question._id);
                        }}
                    >
-                    <div class="text-6xl font-thin">{question.points}</div>
+                        <div class="text-6xl font-thin">
+                            {question.points >= 0 ? question.points : "???"}
+                        </div>
                    </div>
                {/each}
            {/each}
+        {:else}
+            Legacy Not Supported
+        {/if}
    </div>
 {:else}
    <p>Wall is undefined</p>
 {/if}

+<Modal bind:showModal={showRenameCategory} okFn={renameCategory} cancelFn={renameCategoryCancel}>
+    {#snippet header()}
+        <h2 class="text-3xl">Kategorie umbenennen</h2>
+    {/snippet}
+    <div>
+        <Textfield bind:value={newCatName} label="Name"></Textfield>
+        {#if error.length > 0}
+            <div class="text-red-700">{error}</div>
+        {/if}
+    </div>
+</Modal>
+
 <style>
    .visited {
        background-color: gray;
--- a/src/lib/games/games.ts
+++ b/src/lib/games/games.ts
@@ -1,3 +1,5 @@
+import type { Ressource } from "$lib/Types";
+
 const games: Games = [
    {
        name: "LAN Party",
@@ -1331,8 +1333,10 @@ export type QuestionType =
    | "AUDIO_MULTIPLE_CHOICE";

 export type Question = {
+    _id?: string;
    points: number;
    type: QuestionType;
+    owner?: string;
 };

 export type SimpleQuestion = Question & {
@@ -1354,11 +1358,13 @@ export type MultipleChoiceQuestion = Question & {
    };
 };

+export type QuestionRessource = string | Ressource | null;
+
 export type ImageQuestion = Question & {
    type: "IMAGE";
    data: {
        question: string;
-        image: string;
+        image: QuestionRessource;
        answer: string;
    };
 };
@@ -1367,7 +1373,7 @@ export type ImageMultipleChoiceQuestion = Question & {
    type: "IMAGE_MULTIPLE_CHOICE";
    data: {
        question: string;
-        image: string;
+        image: QuestionRessource;
        choices: string[];
    };
 };
@@ -1376,7 +1382,7 @@ export type AudioQuestion = Question & {
    type: "AUDIO";
    data: {
        question: string;
-        audio: string;
+        audio: QuestionRessource;
        answer: string;
    };
 };
@@ -1385,7 +1391,7 @@ export type AudioMultipleChoiceQuestion = Question & {
    type: "AUDIO_MULTIPLE_CHOICE";
    data: {
        question: string;
-        audio: string;
+        audio: QuestionRessource;
        choices: string[];
    };
 };
@@ -1425,16 +1431,16 @@ export type Category = {
    )[];
 };

-export type Wall = {
+export type FullWall = {
    name: string;
    categories: Category[];
 };

-export type Game = {
+export type FullGame = {
    name: string;
-    walls: Wall[];
+    walls: FullWall[];
 };

-export type Games = Game[];
+export type Games = FullGame[];

 export default games;
--- a/src/lib/util.ts
+++ b/src/lib/util.ts
@@ -0,0 +1,5 @@
+import { env } from "$env/dynamic/public";
+
+export function url(path: string) {
+    return `${env.PUBLIC_JEOPARDY_SERVER_PROTOCOL}://${env.PUBLIC_JEOPARDY_SERVER}${path.startsWith("/") ? "" : "/"}${path}`;
+}
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,7 +1,12 @@
 <script lang="ts">
-    import { afterNavigate, goto } from "$app/navigation";
-    import { isAuthenticated } from "$lib/Auth.svelte";
+    import { goto } from "$app/navigation";
+    import { env } from "$env/dynamic/public";
+    import RessourceManager from "$lib/RessourceManager.svelte";
+    import UserSvelte from "$lib/User.svelte";
    import websocket, { SocketConnectionType } from "$lib/websocket.svelte";
+    import axios from "axios";
+
+    let showRessourceManager = $state(false);

    $effect(() => {
        if (websocket.connectionType === SocketConnectionType.HOST) {
@@ -13,17 +18,80 @@
            goto("/connected/display");
        }
    });
+
+    function logout() {
+        cookieStore
+            .delete("jeopardytoken")
+            .then(() => {
+                goto("/login");
+            })
+            .catch((e) => {
+                alert("Logout fehlgeschlagen!");
+                goto("/login");
+            });
+    }
+
+    async function logoutFromAllDevices() {
+        axios
+            .post(
+                `${env.PUBLIC_JEOPARDY_SERVER_PROTOCOL}://${env.PUBLIC_JEOPARDY_SERVER}/user/logout`,
+                {},
+                {
+                    withCredentials: true
+                }
+            )
+            .then(() => {
+                logout();
+            })
+            .catch(() => {
+                alert("Logout fehlgeschlagen!");
+            });
+    }
 </script>

 <div class="flex h-full flex-col">
-    <h1 class="m-4 mb-8 text-7xl font-bold">Jeopardy</h1>
+    <div class="ms-4 me-4 flex items-center gap-4">
+        <h1 class="text-7xl font-bold">Jeopardy</h1>
+        <div class="grow"></div>
+        {#if UserSvelte.role === "admin"}
+            <button type="button" class="btn" onclick={() => goto("/admin")}>Administration</button>
+        {/if}
+        <button type="button" class="btn" onclick={() => (showRessourceManager = true)}
+            >Ressourcen</button
+        >
+        <button type="button" class="btn" onclick={() => goto("/editor")}>Editor</button>
+        <button type="button" class="btn" onclick={() => goto("/settings")}>Einstellungen</button>
+        <button type="button" class="btn" onclick={logoutFromAllDevices}>Logout</button>
+        <div class="btn profile ps-2 pe-2">
+            <i class="fa-regular fa-user"></i>
+            {UserSvelte.username}
+        </div>
+    </div>

    <div class="flex h-full grow items-center justify-around p-4">
        <button class="btn m-2 h-1/2 w-1/2 text-5xl" onclick={websocket.connectAsHost}
-            >Connect as Host</button
+            >Spiel hosten</button
        >
        <button class="btn m-2 h-1/2 w-1/2 text-5xl" onclick={websocket.connectAsDisplay}
-            >Connect as Display</button
+            >Spiel darstellen</button
        >
    </div>
 </div>
+
+<RessourceManager
+    bind:show={showRessourceManager}
+    ok={(res) => {
+        console.log(res);
+    }}
+></RessourceManager>
+
+<style>
+    .profile {
+        border-color: gray;
+    }
+
+    .profile:hover {
+        background-color: unset !important;
+        cursor: unset !important;
+    }
+</style>
--- a/src/routes/admin/+page.svelte
+++ b/src/routes/admin/+page.svelte
@@ -0,0 +1,350 @@
+<script lang="ts">
+    import { afterNavigate, goto } from "$app/navigation";
+    import type { UserObj } from "$lib/User.svelte";
+    import { env } from "$env/dynamic/public";
+    import axios from "axios";
+    import { onMount } from "svelte";
+    import Modal from "$lib/Modal.svelte";
+    import UserSvelte from "$lib/User.svelte";
+
+    let users: UserObj[] = $state([]);
+    let roles: string[] = $state([]);
+
+    let showAddUser = $state(false);
+    let addUserName = $state("");
+
+    let showDeleteUser = $state(false);
+    let showResetPassword = $state(false);
+    let showChangeRole = $state(false);
+    let selectedUser: UserObj | undefined = $state(undefined);
+    let roleToChange: string = $state("");
+
+    let error = $state("");
+
+    async function loadUsers() {
+        console.log("loading users");
+        return axios
+            .get(
+                `${env.PUBLIC_JEOPARDY_SERVER_PROTOCOL}://${env.PUBLIC_JEOPARDY_SERVER}/admin/user/list`,
+                {
+                    withCredentials: true
+                }
+            )
+            .then((response) => {
+                if (response.status === 200) {
+                    users = response.data;
+                }
+            })
+            .catch((e) => {
+                console.log(e);
+            });
+    }
+
+    async function loadRoles() {
+        console.log("loading roles");
+        return axios
+            .get(
+                `${env.PUBLIC_JEOPARDY_SERVER_PROTOCOL}://${env.PUBLIC_JEOPARDY_SERVER}/admin/roles`,
+                {
+                    withCredentials: true
+                }
+            )
+            .then((response) => {
+                if (response.status === 200) {
+                    roles = response.data;
+                }
+            })
+            .catch((e) => {
+                console.log(e);
+            });
+    }
+
+    afterNavigate(() => {
+        if (UserSvelte.role !== "admin") goto("/");
+    });
+
+    onMount(() => {
+        if (UserSvelte.role !== "admin") goto("/");
+        loadRoles().then(loadUsers);
+    });
+
+    async function addUserOk(): Promise<boolean> {
+        error = "";
+        if (addUserName.length <= 0) {
+            error = "Gib einen Nutzernamen ein";
+            return false;
+        }
+
+        return axios
+            .put(
+                `${env.PUBLIC_JEOPARDY_SERVER_PROTOCOL}://${env.PUBLIC_JEOPARDY_SERVER}/admin/user`,
+                {
+                    username: addUserName
+                },
+                {
+                    withCredentials: true
+                }
+            )
+            .then((response) => {
+                if (response.status === 200) {
+                    alert(`Passwort: ${response.data.password}`);
+                    return true;
+                } else {
+                    throw false;
+                }
+            })
+            .catch(() => {
+                error = "Etwas ist schief gelaufen";
+                return false;
+            });
+    }
+
+    async function deleteUserOk(): Promise<boolean> {
+        error = "";
+
+        if (selectedUser === undefined) {
+            error = "Etwas ist schief gelaufen. Kein Nutzer zum Löschen definiert.";
+            return false;
+        }
+
+        return axios
+            .delete(
+                `${env.PUBLIC_JEOPARDY_SERVER_PROTOCOL}://${env.PUBLIC_JEOPARDY_SERVER}/admin/user`,
+                {
+                    withCredentials: true,
+                    data: {
+                        userid: selectedUser._id
+                    }
+                }
+            )
+            .then(() => {
+                return true;
+            })
+            .catch(() => {
+                error = "Nutzer konnte nicht gelöscht werden";
+                return false;
+            });
+    }
+
+    async function resetPasswordOk(): Promise<boolean> {
+        error = "";
+
+        if (selectedUser === undefined) {
+            error = "Etwas ist schief gelaufen. Kein Nutzer zum Löschen definiert.";
+            return false;
+        }
+
+        return axios
+            .post(
+                `${env.PUBLIC_JEOPARDY_SERVER_PROTOCOL}://${env.PUBLIC_JEOPARDY_SERVER}/admin/user/resetpw`,
+                {
+                    userid: selectedUser._id
+                },
+                {
+                    withCredentials: true
+                }
+            )
+            .then((response) => {
+                if (response.status === 200) {
+                    alert(`Passwort: ${response.data.password}`);
+                    return true;
+                } else {
+                    throw false;
+                }
+            })
+            .catch(() => {
+                error = "Etwas ist schief gelaufen";
+                return false;
+            });
+    }
+
+    async function changeRoleOk(): Promise<boolean> {
+        error = "";
+
+        if (selectedUser === undefined) {
+            error = "Etwas ist schief gelaufen. Kein Nutzer zum Löschen definiert.";
+            return false;
+        }
+
+        if (roleToChange === selectedUser.role) {
+            error = `${selectedUser.username} hat bereits die Rolle ${roleToChange}. Wähle eine andere Rolle aus.`;
+            return false;
+        }
+
+        return axios
+            .post(
+                `${env.PUBLIC_JEOPARDY_SERVER_PROTOCOL}://${env.PUBLIC_JEOPARDY_SERVER}/admin/user/changerole`,
+                {
+                    userid: selectedUser._id,
+                    role: roleToChange
+                },
+                {
+                    withCredentials: true
+                }
+            )
+            .then((response) => {
+                if (response.status === 200) {
+                    return true;
+                } else {
+                    throw false;
+                }
+            })
+            .catch(() => {
+                error = "Etwas ist schief gelaufen";
+                return false;
+            });
+    }
+
+    function addUserCancel() {
+        error = "";
+        addUserName = "";
+    }
+
+    function selectedUserCancel() {
+        error = "";
+        selectedUser = undefined;
+        roleToChange = "";
+    }
+</script>
+
+<div class="flex flex-col gap-4 p-4">
+    <div class="flex items-center">
+        <h2 class="text-4xl font-bold">Administration</h2>
+        <div class="grow"></div>
+        <button type="button" class="btn" onclick={() => goto("/")}>Zurück</button>
+    </div>
+    <div class="flex flex-col gap-2">
+        {#each users as user (user._id)}
+            <div class="flex justify-between gap-4 rounded-md border-1 p-2">
+                <div class="shrink-0 grow-0 text-center align-middle">{user._id}</div>
+                <div>{user.username}</div>
+                <div>{user.role}</div>
+                <div class="flex gap-2">
+                    <!-- svelte-ignore a11y_consider_explicit_label -->
+                    <button
+                        type="button"
+                        class="btn"
+                        disabled={user._id === UserSvelte.id}
+                        onclick={() => {
+                            selectedUser = user;
+                            roleToChange = selectedUser.role;
+                            showChangeRole = true;
+                        }}><i class="fa-solid fa-user"></i> Rolle ändern</button
+                    >
+                    <!-- svelte-ignore a11y_consider_explicit_label -->
+                    <button
+                        type="button"
+                        class="btn"
+                        disabled={user._id === UserSvelte.id}
+                        onclick={() => {
+                            selectedUser = user;
+                            showResetPassword = true;
+                        }}
+                        ><i class="fa-solid fa-arrow-rotate-right"></i> Passwort zurücksetzen</button
+                    >
+                    <!-- svelte-ignore a11y_consider_explicit_label -->
+                    <button
+                        disabled={user._id === UserSvelte.id}
+                        type="button"
+                        class="btn border-red-600 text-red-600"
+                        onclick={() => {
+                            selectedUser = user;
+                            showDeleteUser = true;
+                        }}><i class="fa-solid fa-trash"></i></button
+                    >
+                </div>
+            </div>
+        {/each}
+    </div>
+    <button type="button" class="btn" onclick={() => (showAddUser = true)}>Nutzer hinzufügen</button
+    >
+</div>
+
+<Modal bind:showModal={showAddUser} okFn={addUserOk} cancelFn={addUserCancel} oncloseFn={loadUsers}>
+    {#snippet header()}
+        <h2 class="text-3xl">Nutzer hinzufügen</h2>
+    {/snippet}
+
+    <div>
+        <label for="username" class="">Name</label>
+        <div>
+            <input
+                type="text"
+                name="username"
+                id="username"
+                class="borders mt-2 mb-2 w-full"
+                bind:value={addUserName}
+            />
+        </div>
+        {#if error.length > 0}
+            <div class="text-red-700">{error}</div>
+        {/if}
+    </div>
+</Modal>
+
+<Modal
+    bind:showModal={showDeleteUser}
+    okFn={deleteUserOk}
+    cancelFn={selectedUserCancel}
+    oncloseFn={loadUsers}
+>
+    {#snippet header()}
+        <h2 class="text-3xl">Nutzer löschen</h2>
+    {/snippet}
+
+    <div>Soll Nutzer {selectedUser?.username} wirklich gelöscht werden?</div>
+    {#if error.length > 0}
+        <div class="text-red-700">{error}</div>
+    {/if}
+</Modal>
+
+<Modal
+    bind:showModal={showResetPassword}
+    okFn={resetPasswordOk}
+    cancelFn={selectedUserCancel}
+    oncloseFn={loadUsers}
+>
+    {#snippet header()}
+        <h2 class="text-3xl">Passwort zurücksetzen</h2>
+    {/snippet}
+
+    <div>
+        Soll das Passwort von Nutzer {selectedUser?.username} wirklich zurückgesetzt werden?
+    </div>
+    {#if error.length > 0}
+        <div class="text-red-700">{error}</div>
+    {/if}
+</Modal>
+
+<Modal
+    bind:showModal={showChangeRole}
+    okFn={changeRoleOk}
+    cancelFn={selectedUserCancel}
+    oncloseFn={loadUsers}
+>
+    {#snippet header()}
+        <h2 class="text-3xl">Rolle von {selectedUser?.username} ändern</h2>
+    {/snippet}
+
+    <div>
+        {#if selectedUser}
+            <select name="roles" id="role-select" class="btn w-full" bind:value={roleToChange}>
+                {#each roles as role, index (index)}
+                    <option value={role}>{role}</option>
+                {/each}
+            </select>
+        {/if}
+    </div>
+    {#if error.length > 0}
+        <div class="text-red-700">{error}</div>
+    {/if}
+</Modal>
+
+<style>
+    .borders {
+        border: 1px solid black;
+        border-radius: 5px;
+        display: flex;
+        padding: 2px;
+    }
+</style>
--- a/src/routes/connected/display/running/[game]/+layout.svelte
+++ b/src/routes/connected/display/running/[game]/+layout.svelte
@@ -2,29 +2,17 @@
    let { children } = $props();

    import { error } from "@sveltejs/kit";
-    import games from "$lib/games/games";
+    // import games from "$lib/games/games";
    import { page } from "$app/state";
    import DisplayStateSvelte from "$lib/DisplayState.svelte";
+    import { onMount } from "svelte";
+    import { fetchGame } from "../../../../editor/fetchers";

-    console.log("game:", page.params.game);
-
-    let paramGame = page.params.game;
-    if (paramGame === undefined) {
-        error(404);
-    }
-    const gameIndex = parseInt(paramGame);
-    if (isNaN(gameIndex)) {
-        error(404);
-    }
-    if (DisplayStateSvelte.gameIndex !== gameIndex) {
-        const game = games[gameIndex];
-        if (game) {
+    onMount(() => {
+        fetchGame(`${page.params.game}`).then((game) => {
            DisplayStateSvelte.game = game;
-            DisplayStateSvelte.gameIndex = gameIndex;
-        } else {
-            error(404);
-        }
-    }
+        });
+    });
 </script>

 <div class="flex grow flex-col pr-4 pl-4">
--- a/src/routes/connected/display/running/[game]/[wall]/+page.svelte
+++ b/src/routes/connected/display/running/[game]/[wall]/+page.svelte
@@ -6,27 +6,11 @@
    import ws from "$lib/websocket.svelte";
    import { MessageType } from "$lib/MessageType";
    import type { VisitedQuestions } from "$lib/Types";
+    import { onMount } from "svelte";
+    import { fetchWall } from "../../../../../editor/fetchers";

    console.log("wall:", page.params.wall);

-    let paramWall = page.params.wall;
-    if (paramWall === undefined) {
-        error(404);
-    }
-    const wallIndex = parseInt(paramWall);
-    if (isNaN(wallIndex)) {
-        error(404);
-    }
-    if (DisplayStateSvelte.wallIndex !== wallIndex) {
-        const wall = DisplayStateSvelte.game?.walls[wallIndex];
-        if (wall) {
-            DisplayStateSvelte.wall = wall;
-            DisplayStateSvelte.gameIndex = wallIndex;
-        } else {
-            error(404);
-        }
-    }
-
    let visited: VisitedQuestions = $state([]);

    $effect(() => {
@@ -40,6 +24,12 @@
            }
        } catch (e) {}
    });
+
+    onMount(() => {
+        fetchWall(`${page.params.wall}`).then((wall) => {
+            DisplayStateSvelte.wall = wall;
+        });
+    });
 </script>

 <Wall wall={DisplayStateSvelte.wall} {visited} />
--- a/src/routes/connected/display/running/[game]/[wall]/[category]/[question]/+page.svelte
+++ b/src/routes/connected/display/running/[game]/[wall]/[category]/[question]/+page.svelte
@@ -9,65 +9,22 @@
        isImageMultipleChoiceQuestion,
        isImageQuestion,
        isMultipleChoiceQuestion,
-        isSimpleQuestion
+        isSimpleQuestion,
+        type Question
    } from "$lib/games/games";
    import ws from "$lib/websocket.svelte";
    import { MessageType } from "$lib/MessageType";
-    import { untrack } from "svelte";
+    import { onMount, untrack } from "svelte";
    import MultipleChoiceQuestionComponent from "$lib/MultipleChoiceQuestionComponent.svelte";
    import ImageQuestionComponent from "$lib/ImageQuestionComponent.svelte";
    import AudioQuestionComponent from "$lib/AudioQuestionComponent.svelte";
    import AudioMultipleChoiceQuestionComponent from "$lib/AudioMultipleChoiceQuestionComponent.svelte";
    import ImageMultipleChoiceQuestionComponent from "$lib/ImageMultipleChoiceQuestionComponent.svelte";
+    import { fetchCategory, fetchQuestion } from "../../../../../../../editor/fetchers";
+    import type { Category, GeneralQuestion } from "$lib/Types";

-    console.log("wall:", page.params.wall);
-
-    let paramWall = page.params.wall;
-    if (paramWall === undefined) {
-        error(404);
-    }
-    const wallIndex = parseInt(paramWall);
-    if (isNaN(wallIndex)) {
-        error(404);
-    }
-    if (DisplayStateSvelte.wallIndex !== wallIndex) {
-        const wall = DisplayStateSvelte.game?.walls[wallIndex];
-        if (wall) {
-            DisplayStateSvelte.wall = wall;
-            DisplayStateSvelte.gameIndex = wallIndex;
-        } else {
-            error(404);
-        }
-    }
-    if (page.params.category === undefined) {
-        error(404);
-    }
-    const categoryIndex = parseInt(page.params.category);
-    if (isNaN(categoryIndex)) {
-        error(404);
-    }
-
-    const category = DisplayStateSvelte.wall?.categories[categoryIndex];
-
-    if (category === undefined) {
-        error(404);
-    }
-
-    if (page.params.question === undefined) {
-        error(404);
-    }
-    const questionIndex = parseInt(page.params.question);
-    if (isNaN(questionIndex)) {
-        error(404);
-    }
-
-    const question = category.questions[questionIndex];
-
-    console.log(question);
-
-    if (question === undefined) {
-        error(404);
-    }
+    let category: Category | undefined = $state();
+    let question: GeneralQuestion | undefined = $state();

    let showAnswer = $state(false);
    let showQuestion = $state(false);
@@ -118,8 +75,20 @@
            }
        } catch (e) {}
    });
+
+    onMount(() => {
+        fetchCategory(`${page.params.category}`)
+            .then((cat) => {
+                category = cat;
+                return fetchQuestion(`${page.params.question}`);
+            })
+            .then((que) => {
+                question = que;
+            });
+    });
 </script>

+{#if category && question}
    <div class="mt-4 flex grow flex-col">
        <div class="mb-4 flex justify-between text-4xl">
            <div>{category.name}</div>
@@ -135,25 +104,42 @@
            {:else if isMultipleChoiceQuestion(question)}
                <MultipleChoiceQuestionComponent {question} {showAnswer} {showQuestion} />
            {:else if isImageQuestion(question)}
-            <ImageQuestionComponent {question} {showAnswer} {showQuestion} {isBuzzed} />
+                <ImageQuestionComponent
+                    {question}
+                    {showAnswer}
+                    {showQuestion}
+                    {isBuzzed}
+                    isLegacy={false}
+                />
            {:else if isImageMultipleChoiceQuestion(question)}
                <ImageMultipleChoiceQuestionComponent
                    {question}
                    {showAnswer}
                    {showQuestion}
                    {isBuzzed}
+                    isLegacy={false}
                />
            {:else if isAudioQuestion(question)}
-            <AudioQuestionComponent {question} {showAnswer} {showQuestion} showPlayer={false} />
+                <AudioQuestionComponent
+                    {question}
+                    {showAnswer}
+                    {showQuestion}
+                    showPlayer={false}
+                    isLegacy={false}
+                />
            {:else if isAudioMultipleChoiceQuestion(question)}
                <AudioMultipleChoiceQuestionComponent
                    {question}
                    {showAnswer}
                    {showQuestion}
                    showPlayer={false}
+                    isLegacy={false}
                />
            {:else}
                <p>Type of question unknown</p>
            {/if}
        </div>
    </div>
+{:else}
+    Loading...
+{/if}
--- a/src/routes/connected/games/+page.server.ts
+++ b/src/routes/connected/games/+page.server.ts
@@ -1,7 +0,0 @@
-import games from '$lib/games/games';
-
-export function load() {
-	return {
-		games
-	};
-}
--- a/src/routes/connected/games/+page.svelte
+++ b/src/routes/connected/games/+page.svelte
@@ -1,14 +1,39 @@
 <script lang="ts">
-    let { data } = $props();
+    import type { Game } from "$lib/Types";
+    import { url } from "$lib/util";
+    import axios from "axios";
+    import { onMount } from "svelte";
+
+    let games: Game[] = $state([]);
+
+    function fetchGames() {
+        axios
+            .get(url("/games"), { withCredentials: true })
+            .then((response) => {
+                if (response.status === 200) {
+                    games = response.data;
+                    games.sort((a, b) => a.name.localeCompare(b.name));
+                } else {
+                    console.error("Could not fetch games: " + response.status);
+                }
+            })
+            .catch((err) => {
+                console.error(err);
+            });
+    }
+
+    onMount(() => {
+        fetchGames();
+    });
 </script>

 <h1 class="m-4 mb-8 text-7xl font-bold">Games</h1>

 <div class="flex flex-col space-y-4">
-    {#each data.games as game, i}
+    {#each games as game}
        <a
            class="ms-4 me-4 rounded-xl border-2 p-4 hover:cursor-pointer hover:bg-emerald-200"
-            href="/connected/games/{i}">{game.name}</a
+            href="/connected/games/{game._id}">{game.name}</a
        >
    {/each}
 </div>
--- a/src/routes/connected/games/[game]/+page.server.ts
+++ b/src/routes/connected/games/[game]/+page.server.ts
@@ -1,12 +0,0 @@
-import { error } from '@sveltejs/kit';
-import games from '$lib/games/games';
-
-export function load({ params }) {
-	const index = parseInt(params.game);
-	if (isNaN(index)) {
-		error(404);
-	}
-	const game = games[index];
-	if (game === undefined) error(404);
-	else return game;
-}
--- a/src/routes/connected/games/[game]/+page.svelte
+++ b/src/routes/connected/games/[game]/+page.svelte
@@ -6,10 +6,11 @@
        isMultipleChoiceQuestion,
        isSimpleQuestion,
        isImageQuestion,
-        type Game,
        isAudioQuestion,
        isAudioMultipleChoiceQuestion,
-        isImageMultipleChoiceQuestion
+        isImageMultipleChoiceQuestion,
+        type FullGame,
+        type Question
    } from "$lib/games/games";
    import ws from "$lib/websocket.svelte";
    import { page } from "$app/state";
@@ -18,12 +19,14 @@
    import Scoreboard from "$lib/Scoreboard.svelte";
    import SimpleQuestionComponent from "$lib/SimpleQuestionComponent.svelte";
    import PlusMinusButton from "$lib/PlusMinusButton.svelte";
-    import type { VisitedQuestions } from "$lib/Types.js";
+    import type { _id, Category, Game, VisitedQuestions, Wall as WallType } from "$lib/Types.js";
    import MultipleChoiceQuestionComponent from "$lib/MultipleChoiceQuestionComponent.svelte";
    import ImageQuestionComponent from "$lib/ImageQuestionComponent.svelte";
    import AudioQuestionComponent from "$lib/AudioQuestionComponent.svelte";
    import AudioMultipleChoiceQuestionComponent from "$lib/AudioMultipleChoiceQuestionComponent.svelte";
    import ImageMultipleChoiceQuestionComponent from "$lib/ImageMultipleChoiceQuestionComponent.svelte";
+    import { fetchCategory, fetchGame, fetchQuestion, fetchWall } from "../../../editor/fetchers";
+    import { onMount } from "svelte";

    interface SaveData {
        players: Player[];
@@ -57,7 +60,7 @@

    class GameManager {
        public state: GameState = $state(GameState.INIT);
-        public game: Game;
+        public game: Game | undefined = $state();
        public players: Player[] = $state([
            {
                name: "Player 1",
@@ -74,37 +77,42 @@
        ]);

        public currentPlayer = $state(0);
-        public currentWall = $state(0);
+        public currentWallIndex = $state(0);
+        public currentWall: WallType | undefined = $state();
        public visitedQuestions: VisitedQuestions = $state([]);
-        public currentCategory = $state(0);
-        public currentQuestion = $state(0);
+        public currentCategoryId = $state("");
+        public currentCategory: Category | undefined = $state();
+        public currentQuestionId = $state("");
+        public currentQuestion: Question | undefined = $state();

        public answerIsShowing = $state(false);
        public questionIsShowing = $state(false);
        public isBuzzed = $state(false);

-        constructor(game: Game) {
+        setGame(game: Game) {
            this.game = game;
        }

        save(): void {
+            if (!this.game) return;
            const saveData = {
                players: this.players,
                currentPlayer: this.currentPlayer,
-                currentWall: this.currentWall,
+                currentWall: this.currentWallIndex,
                visitedQuestions: this.visitedQuestions
            };
-            localStorage.setItem(`saveGame-${this.game.name}`, JSON.stringify(saveData));
+            localStorage.setItem(`saveGame-${this.game._id}`, JSON.stringify(saveData));
        }

        load(): void {
-            const saveDataString = localStorage.getItem(`saveGame-${this.game.name}`);
+            if (!this.game) return;
+            const saveDataString = localStorage.getItem(`saveGame-${this.game._id}`);
            if (saveDataString === null) return;
            try {
                const saveData: SaveData = JSON.parse(saveDataString);
                this.players = saveData.players;
                this.currentPlayer = saveData.currentPlayer;
-                this.currentWall = saveData.currentWall;
+                this.currentWallIndex = saveData.currentWall;
                this.visitedQuestions = saveData.visitedQuestions;
                console.log(saveData);
            } catch (e) {
@@ -113,10 +121,14 @@
        }

        startGame(): void {
+            if (!this.game) return;
            this.currentPlayer = Math.floor(Math.random() * this.players.length);
            this.state = GameState.CHOOSING_QUESTION;
+            fetchWall(this.game.walls[this.currentWallIndex]).then((wall) => {
+                this.currentWall = wall;
                this.sendStart();
                this.sendCurrentState();
+            });
        }

        sendStart(): void {
@@ -136,7 +148,7 @@
        sendWall(): void {
            ws.sendMessage({
                type: MessageType.GOTO,
-                route: `/${page.params.game}/${this.currentWall}`
+                route: `/${page.params.game}/${this.currentWall?._id}`
            });
            this.sendVisited();
        }
@@ -154,30 +166,39 @@
        }

        sendCurrentQuestion(): void {
+            if (!this.game) return;
            ws.sendMessage({
                type: MessageType.GOTO,
-                route: `/${page.params.game}/${this.currentWall}/${this.currentCategory}/${this.currentQuestion}`
+                route: `/${this.game._id}/${this.currentWall?._id}/${this.currentCategoryId}/${this.currentQuestionId}`
            });
        }

        sendEnd(): void {
            ws.sendMessage({
                type: MessageType.GOTO,
-                route: `/${page.params.game}/${this.currentWall}/end`
+                route: `/${page.params.game}/${this.currentWall?._id}/end`
            });
        }

-        tileClicked(categoryIndex: number, questionIndex: number) {
-            console.log("Cat", categoryIndex, "Que", questionIndex);
-            console.log(gameManager.wall.categories[categoryIndex]?.questions[questionIndex]);
+        tileClicked(catId: _id, queId: _id) {
+            console.log("Cat", catId, "Que", queId);

-            this.currentCategory = categoryIndex;
-            this.currentQuestion = questionIndex;
+            this.currentCategoryId = catId;
+            this.currentQuestionId = queId;
            this.answerIsShowing = false;

-            this.sendCurrentQuestion();
+            fetchCategory(this.currentCategoryId)
+                .then((category) => {
+                    this.currentCategory = category;

+                    return fetchQuestion(this.currentQuestionId);
+                })
+                .then((question) => {
+                    this.currentQuestion = question;
+
+                    this.sendCurrentQuestion();
                    this.state = GameState.SHOW_QUESTION;
+                });
        }

        addPlayer() {
@@ -236,20 +257,21 @@
        }

        plus(player: Player) {
-            if (!this.answerIsShowing) return;
+            if (!this.answerIsShowing || !this.currentQuestion) return;
            if (player.name === this.currentPlayerToName()) {
-                player.points += this.question.points * 2;
+                player.points += this.currentQuestion.points * 2;
            } else {
-                player.points += this.question.points;
+                player.points += this.currentQuestion.points;
            }
            this.sendPlayers();
        }

        minus(player: Player) {
+            if (!this.currentQuestion) return;
            if (player.name === this.currentPlayerToName()) {
-                player.points -= this.question.points * 2;
+                player.points -= this.currentQuestion.points * 2;
            } else {
-                player.points -= this.question.points;
+                player.points -= this.currentQuestion.points;
            }
            this.sendPlayers();
        }
@@ -267,12 +289,8 @@
        }

        finishQuestion(): void {
-            if (this.visitedQuestions[this.currentCategory] == undefined) {
-                this.visitedQuestions[this.currentCategory] = [this.currentQuestion];
-            } else if (
-                !this.visitedQuestions[this.currentCategory].includes(this.currentQuestion)
-            ) {
-                this.visitedQuestions[this.currentCategory].push(this.currentQuestion);
+            if (!this.visitedQuestions.includes(this.currentQuestionId)) {
+                this.visitedQuestions.push(this.currentQuestionId);
            }
            this.setupGoingBack();
            this.nextPlayer();
@@ -286,28 +304,21 @@
        }

        wallIsDone(): boolean {
-            let visitedNum = 0;
-            for (const questions of this.visitedQuestions) {
-                if (questions != undefined) {
-                    visitedNum += questions.length;
-                }
-            }
-            let totalNum = 0;
-            for (const category of this.wall.categories) {
-                totalNum += category.questions.length;
-            }
-            console.log(`${visitedNum} >= ${totalNum}`);
-            return visitedNum >= totalNum;
+            return this.visitedQuestions.length >= 25;
        }

        goToNextWall(): void {
-            if (this.currentWall + 1 >= this.game.walls.length) {
+            if (!this.game) return;
+            if (this.currentWallIndex + 1 >= this.game.walls.length) {
                this.goToEndScreen();
            } else {
-                this.currentWall += 1;
+                this.currentWallIndex += 1;
                this.visitedQuestions = [];
+                fetchWall(this.game.walls[this.currentWallIndex]).then((wall) => {
+                    this.currentWall = wall;
                    this.sendWall();
                    this.state = GameState.CHOOSING_QUESTION;
+                });
            }
        }

@@ -324,32 +335,27 @@
        currentPlayerToName(): string {
            return this.players[this.currentPlayer].name;
        }
-
-        get wall() {
-            return this.game.walls[this.currentWall];
    }

-        get category() {
-            return this.wall.categories[this.currentCategory];
-        }
+    let gameManager = new GameManager();

-        get question() {
-            return this.category.questions[this.currentQuestion];
-        }
-    }
-
-    let { data } = $props();
-
-    let gameManager = new GameManager(data);
+    onMount(() => {
+        fetchGame(`${page.params.game}`).then((game) => {
+            gameManager.game = game;
+        });
+    });
 </script>

+{#if gameManager.game}
    <div class="flex h-full flex-col">
        <h1 class="ms-4 text-7xl font-bold">{gameManager.game.name}</h1>
        {#if gameManager.state === GameState.INIT}
            <div class="p-4">
                <div class="flex items-center">
                    <h2 class="grow pb-4 text-5xl">Spieler</h2>
-                <button class="btn me-4" onclick={() => gameManager.load()}>Load SaveGame</button>
+                    <button class="btn me-4" onclick={() => gameManager.load()}
+                        >Load SaveGame</button
+                    >
                    <button
                        class="btn"
                        disabled={!startDisabled}
@@ -366,7 +372,9 @@
                        </div>
                    {/each}
                </div>
-            <button class="btn" onclick={() => gameManager.addPlayer()}>Spieler hinzufügen</button>
+                <button class="btn" onclick={() => gameManager.addPlayer()}
+                    >Spieler hinzufügen</button
+                >
            </div>
        {:else}
            <div class="flex grow">
@@ -379,53 +387,57 @@
                {#if gameManager.state === GameState.SHOW_QUESTION}
                    <div class="flex grow flex-col">
                        <div class="m-4 flex justify-between text-4xl">
-                        <div>{gameManager.category.name}</div>
+                            <div>{gameManager.currentCategory?.name}</div>
                            <div>
-                            {gameManager.question.points} Punkte
+                                {gameManager.currentQuestion?.points} Punkte
                            </div>
                        </div>
                        <div class="flex grow ps-4 pe-4">
-                        {#if gameManager.question === undefined}
+                            {#if gameManager.currentQuestion === undefined}
                                <p>Question is undefined</p>
-                        {:else if isSimpleQuestion(gameManager.question)}
+                            {:else if isSimpleQuestion(gameManager.currentQuestion)}
                                <SimpleQuestionComponent
-                                question={gameManager.question}
+                                    question={gameManager.currentQuestion}
                                    showAnswer={true}
                                    showQuestion={true}
                                />
-                        {:else if isMultipleChoiceQuestion(gameManager.question)}
+                            {:else if isMultipleChoiceQuestion(gameManager.currentQuestion)}
                                <MultipleChoiceQuestionComponent
-                                question={gameManager.question}
+                                    question={gameManager.currentQuestion}
                                    showAnswer={true}
                                    showQuestion={true}
                                />
-                        {:else if isImageQuestion(gameManager.question)}
+                            {:else if isImageQuestion(gameManager.currentQuestion)}
                                <ImageQuestionComponent
-                                question={gameManager.question}
+                                    question={gameManager.currentQuestion}
                                    showAnswer={true}
                                    showQuestion={true}
                                    isBuzzed={false}
+                                    isLegacy={false}
                                />
-                        {:else if isImageMultipleChoiceQuestion(gameManager.question)}
+                            {:else if isImageMultipleChoiceQuestion(gameManager.currentQuestion)}
                                <ImageMultipleChoiceQuestionComponent
-                                question={gameManager.question}
+                                    question={gameManager.currentQuestion}
                                    showAnswer={true}
                                    showQuestion={true}
                                    isBuzzed={false}
+                                    isLegacy={false}
                                />
-                        {:else if isAudioQuestion(gameManager.question)}
+                            {:else if isAudioQuestion(gameManager.currentQuestion)}
                                <AudioQuestionComponent
-                                question={gameManager.question}
+                                    question={gameManager.currentQuestion}
                                    showAnswer={true}
                                    showPlayer={true}
                                    showQuestion={true}
+                                    isLegacy={false}
                                />
-                        {:else if isAudioMultipleChoiceQuestion(gameManager.question)}
+                            {:else if isAudioMultipleChoiceQuestion(gameManager.currentQuestion)}
                                <AudioMultipleChoiceQuestionComponent
-                                question={gameManager.question}
+                                    question={gameManager.currentQuestion}
                                    showAnswer={true}
                                    showPlayer={true}
                                    showQuestion={true}
+                                    isLegacy={false}
                                />
                            {:else}
                                <p>Type of question unknown</p>
@@ -477,12 +489,14 @@
                        </div>
                    </div>
                {:else if gameManager.state === GameState.END}
-                <div class="flex grow items-center justify-center text-7xl"><div>ENDE</div></div>
+                    <div class="flex grow items-center justify-center text-7xl">
+                        <div>ENDE</div>
+                    </div>
                {:else}
                    <div class="grow ps-4 pe-4">
                        <Wall
-                        wall={gameManager.game.walls[gameManager.currentWall]}
-                        onclick={(cat, que) => gameManager.tileClicked(cat, que)}
+                            wall={gameManager.currentWall}
+                            onclickIds={(cat, que) => gameManager.tileClicked(cat, que)}
                            visited={gameManager.visitedQuestions}
                        />
                    </div>
@@ -490,3 +504,6 @@
            </div>
        {/if}
    </div>
+{:else}
+    Loading Game...
+{/if}
--- a/src/routes/editor/+page.svelte
+++ b/src/routes/editor/+page.svelte
@@ -0,0 +1,202 @@
+<script lang="ts">
+    import { goto } from "$app/navigation";
+    import Button from "$lib/Button.svelte";
+    import Modal from "$lib/Modal.svelte";
+    import Textfield from "$lib/Textfield.svelte";
+    import type { Game } from "$lib/Types";
+    import { url } from "$lib/util";
+    import axios from "axios";
+    import { onMount } from "svelte";
+
+    let games: Game[] = $state([]);
+
+    let error = $state("");
+
+    let showNewGame = $state(false);
+    let showRenameGame = $state(false);
+    let newGameName = $state("");
+    let gameToRename: Game | undefined = $state();
+
+    let showDeleteGame = $state(false);
+    let gameToDelete: Game | undefined = $state();
+
+    async function addNewGame() {
+        if (!newGameName) return false;
+        return axios
+            .post(url("/game"), { name: newGameName }, { withCredentials: true })
+            .then((response) => {
+                if (response.status === 200) {
+                    fetchGames();
+                    newGameName = "";
+                    return true;
+                } else return false;
+            });
+    }
+
+    function addNewGameCancel() {
+        newGameName = "";
+    }
+
+    async function renameGame() {
+        if (!newGameName || !gameToRename) return false;
+        return axios
+            .post(
+                url(`/game/rename`),
+                {
+                    gameid: gameToRename._id,
+                    name: newGameName
+                },
+                { withCredentials: true }
+            )
+            .then((response) => {
+                if (response.status === 200) {
+                    newGameName = "";
+                    gameToRename = undefined;
+                    fetchGames();
+                    return true;
+                } else {
+                    console.error(`Failed to rename game: ${response.status}`);
+                    return false;
+                }
+            })
+            .catch((err) => {
+                console.error(err);
+                return false;
+            });
+    }
+
+    function renameGameCancel() {
+        newGameName = "";
+        gameToRename = undefined;
+    }
+
+    async function deleteGame() {
+        if (gameToDelete === undefined) return false;
+        return axios
+            .delete(url("/game/" + gameToDelete._id), { withCredentials: true })
+            .then((response) => {
+                if (response.status === 200) {
+                    fetchGames();
+                    gameToDelete = undefined;
+                    return true;
+                } else {
+                    console.error("Failed to delete Game: " + response.status);
+                    return false;
+                }
+            })
+            .catch((err) => {
+                console.error(err);
+                return false;
+            });
+    }
+
+    function deleteGameCancel() {
+        gameToDelete = undefined;
+    }
+
+    function fetchGames() {
+        axios
+            .get(url("/games"), { withCredentials: true })
+            .then((response) => {
+                if (response.status === 200) {
+                    games = response.data;
+                    games.sort((a, b) => a.name.localeCompare(b.name));
+                } else {
+                    console.error("Could not fetch games: " + response.status);
+                }
+            })
+            .catch((err) => {
+                console.error(err);
+            });
+    }
+
+    onMount(() => {
+        fetchGames();
+    });
+</script>
+
+<div class="flex h-full flex-col">
+    <div class="mr-4 flex items-center gap-4">
+        <h1 class="m-4 mb-8 text-7xl font-bold">Editor</h1>
+        <button class="btn" type="button" onclick={() => (showNewGame = true)}
+            ><i class="fa-solid fa-plus"></i> Neues Spiel</button
+        >
+        <div class="grow"></div>
+        <button class="btn" type="button" onclick={() => goto("/")}>Zurück</button>
+    </div>
+    {#if games.length > 0}
+        <div class="flex flex-col space-y-4 overflow-y-auto">
+            {#each games as game}
+                <!-- svelte-ignore a11y_click_events_have_key_events -->
+                <!-- svelte-ignore a11y_no_static_element_interactions -->
+                <div
+                    class="ms-4 me-4 flex items-center gap-2 rounded-xl border-2 p-2 hover:cursor-pointer hover:bg-emerald-200"
+                    onclick={() => {
+                        goto(`/editor/${game._id}`);
+                    }}
+                >
+                    <div>
+                        {game.name}
+                    </div>
+                    <div class="grow"></div>
+                    <Button
+                        onclick={(event) => {
+                            event.stopPropagation();
+                            newGameName = game.name;
+                            gameToRename = game;
+                            showRenameGame = true;
+                        }}><i class="fa-solid fa-pen"></i></Button
+                    >
+                    <Button
+                        class="border-red-600 text-red-600"
+                        onclick={(event) => {
+                            event.stopPropagation();
+                            gameToDelete = game;
+                            showDeleteGame = true;
+                        }}><i class="fa-solid fa-trash"></i></Button
+                    >
+                </div>
+            {/each}
+        </div>
+    {:else}
+        <div class="flex h-full w-full grow-2 flex-col items-center justify-center">
+            <div class="text-[128px] text-gray-300"><i class="fa-solid fa-database"></i></div>
+            <div class="text-[24px] text-gray-500 select-none">Noch keine Spiele vorhanden</div>
+        </div>
+    {/if}
+</div>
+
+<Modal bind:showModal={showNewGame} okFn={addNewGame} cancelFn={addNewGameCancel}>
+    {#snippet header()}
+        <h2 class="text-3xl">Neues Spiel</h2>
+    {/snippet}
+    <div>
+        <Textfield bind:value={newGameName} label="Name"></Textfield>
+        {#if error.length > 0}
+            <div class="text-red-700">{error}</div>
+        {/if}
+    </div>
+</Modal>
+
+<Modal bind:showModal={showRenameGame} okFn={renameGame} cancelFn={renameGameCancel}>
+    {#snippet header()}
+        <h2 class="text-3xl">Spiel umbenennen</h2>
+    {/snippet}
+    <div>
+        <Textfield bind:value={newGameName} label="Name"></Textfield>
+        {#if error.length > 0}
+            <div class="text-red-700">{error}</div>
+        {/if}
+    </div>
+</Modal>
+
+<Modal bind:showModal={showDeleteGame} okFn={deleteGame} cancelFn={deleteGameCancel}>
+    {#snippet header()}
+        <h2 class="text-3xl">Spiel löschen</h2>
+    {/snippet}
+
+    <div>Soll das Spiel {gameToDelete?.name} wirklich gelöscht werden?</div>
+    {#if error.length > 0}
+        <div class="text-red-700">{error}</div>
+    {/if}
+</Modal>
--- a/src/routes/editor/EditorState.ts
+++ b/src/routes/editor/EditorState.ts
@@ -0,0 +1,12 @@
+import type { WallId } from "$lib/Types";
+
+let selectedWallId: WallId | undefined;
+
+export default {
+    get selectedWallId(): WallId | undefined {
+        return selectedWallId;
+    },
+    set selectedWallId(id: WallId | undefined) {
+        selectedWallId = id;
+    }
+};
--- a/src/routes/editor/[gameid]/+page.svelte
+++ b/src/routes/editor/[gameid]/+page.svelte
@@ -0,0 +1,253 @@
+<script lang="ts">
+    import { goto } from "$app/navigation";
+    import { page } from "$app/state";
+    import Button from "$lib/Button.svelte";
+    import Modal from "$lib/Modal.svelte";
+    import Textfield from "$lib/Textfield.svelte";
+    import type { Game, WallId, Wall as WallType } from "$lib/Types";
+    import { url } from "$lib/util";
+    import Wall from "$lib/Wall.svelte";
+    import axios from "axios";
+    import { onMount } from "svelte";
+    import { fetchGame, fetchWalls } from "../fetchers";
+    import EditorState from "../EditorState";
+
+    let game: Game | undefined = $state();
+
+    let walls: WallType[] = $state([]);
+    let selectedWall: WallType | undefined = $state();
+
+    let showNewWall = $state(false);
+    let showRenameWall = $state(false);
+    let newWallName = $state("");
+    let walltoRename: WallType | undefined = $state();
+
+    let showDeleteWall = $state(false);
+    let wallToDelete: WallType | undefined = $state();
+
+    let error = $state("");
+
+    function _fetchWalls() {
+        return fetchWalls(`${page.params.gameid}`)
+            .then((fetchedWalls) => {
+                walls = fetchedWalls;
+                if (selectedWall === undefined) {
+                    if (EditorState.selectedWallId !== undefined) {
+                        for (const wall of walls) {
+                            if (wall._id === EditorState.selectedWallId) selectedWall = wall;
+                        }
+                    } else if (walls.length > 0) selectedWall = walls[0];
+                }
+
+                if (selectedWall) {
+                    EditorState.selectedWallId = selectedWall._id;
+                }
+            })
+            .catch((err) => {
+                console.error(err);
+            });
+    }
+
+    async function addNewWall() {
+        if (!newWallName) return false;
+        return axios
+            .post(
+                url(`/wall`),
+                {
+                    gameid: page.params.gameid,
+                    name: newWallName
+                },
+                {
+                    withCredentials: true
+                }
+            )
+            .then((response) => {
+                if (response.status === 200) {
+                    newWallName = "";
+                    _fetchWalls();
+                    return true;
+                } else return false;
+            })
+            .catch((err) => {
+                console.error(err);
+                return false;
+            });
+    }
+
+    function addNewWallCancel() {
+        newWallName = "";
+    }
+
+    async function renameWall() {
+        if (!newWallName || !walltoRename) return false;
+        return axios
+            .post(
+                url(`/wall/rename`),
+                {
+                    wallid: walltoRename._id,
+                    name: newWallName
+                },
+                { withCredentials: true }
+            )
+            .then((response) => {
+                if (response.status === 200) {
+                    newWallName = "";
+                    walltoRename = undefined;
+                    _fetchWalls();
+                    return true;
+                } else {
+                    console.error(`Failed to rename wall: ${response.status}`);
+                    return false;
+                }
+            })
+            .catch((err) => {
+                console.error(err);
+                return false;
+            });
+    }
+
+    function renameWallCancel() {
+        newWallName = "";
+        walltoRename = undefined;
+    }
+
+    async function deleteWall() {
+        if (!wallToDelete) return false;
+        if (wallToDelete._id === selectedWall?._id) {
+            selectedWall = undefined;
+            EditorState.selectedWallId = undefined;
+        }
+        return axios
+            .delete(url(`/wall/${wallToDelete._id}`), { withCredentials: true })
+            .then((response) => {
+                if (response.status === 200) {
+                    wallToDelete = undefined;
+                    _fetchWalls();
+                    return true;
+                } else return false;
+            })
+            .catch((err) => {
+                console.error(err);
+                return false;
+            });
+    }
+
+    function deleteWallCancel() {
+        wallToDelete = undefined;
+    }
+
+    onMount(() => {
+        if (page.params.gameid)
+            fetchGame(page.params.gameid)
+                .then((fetchedGame) => {
+                    game = fetchedGame;
+                    return _fetchWalls();
+                })
+                .catch((err) => {
+                    console.error(err);
+                });
+    });
+</script>
+
+<div class="flex h-full flex-col">
+    <div class="mr-4 flex items-center gap-4">
+        <h1 class="m-4 text-4xl font-bold">{game ? game.name : "Spiel"}</h1>
+        <div class="grow"></div>
+        <button class="btn" type="button" onclick={() => goto("/editor")}>Zurück</button>
+    </div>
+    <div class="flex grow">
+        <!-- Sidebar -->
+        <div class="flex h-full max-w-[600px] min-w-[400px] flex-col gap-4 border-r-1">
+            <div>
+                <Button class="ms-4 me-4" onclick={() => (showNewWall = true)}
+                    >Wand hinzufügen</Button
+                >
+            </div>
+            {#each walls as wall}
+                <!-- svelte-ignore a11y_click_events_have_key_events -->
+                <!-- svelte-ignore a11y_no_static_element_interactions -->
+                <div
+                    class="ms-4 me-4 flex items-center gap-2 rounded-xl border-2 p-2 hover:cursor-pointer hover:bg-emerald-200"
+                    class:bg-emerald-200={selectedWall?._id === wall._id}
+                    onclick={() => {
+                        selectedWall = wall;
+                        EditorState.selectedWallId = selectedWall._id;
+                    }}
+                >
+                    <div>
+                        {wall.name}
+                    </div>
+                    <div class="grow"></div>
+                    <Button
+                        onclick={(event) => {
+                            event.stopPropagation();
+                            newWallName = wall.name;
+                            walltoRename = wall;
+                            showRenameWall = true;
+                        }}><i class="fa-solid fa-pen"></i></Button
+                    >
+                    <Button
+                        class="border-red-600 text-red-600"
+                        onclick={(event) => {
+                            event.stopPropagation();
+                            wallToDelete = wall;
+                            showDeleteWall = true;
+                        }}><i class="fa-solid fa-trash"></i></Button
+                    >
+                </div>
+            {/each}
+        </div>
+        <!-- Wall -->
+        {#if selectedWall}
+            <div class="ms-4 me-4 grow">
+                <Wall
+                    isEditor
+                    wall={selectedWall}
+                    visited={[]}
+                    onclickIds={(catId, queId) => {
+                        console.log(catId, queId);
+                        if (selectedWall)
+                            goto(
+                                `/editor/${page.params.gameid}/${selectedWall._id}/${catId}/${queId}`
+                            );
+                    }}
+                ></Wall>
+            </div>
+        {/if}
+    </div>
+</div>
+
+<Modal bind:showModal={showNewWall} okFn={addNewWall} cancelFn={addNewWallCancel}>
+    {#snippet header()}
+        <h2 class="text-3xl">Neue Wand</h2>
+    {/snippet}
+    <div>
+        <Textfield bind:value={newWallName} label="Name"></Textfield>
+        {#if error.length > 0}
+            <div class="text-red-700">{error}</div>
+        {/if}
+    </div>
+</Modal>
+
+<Modal bind:showModal={showRenameWall} okFn={renameWall} cancelFn={renameWallCancel}>
+    {#snippet header()}
+        <h2 class="text-3xl">Wand umbenennen</h2>
+    {/snippet}
+    <div>
+        <Textfield bind:value={newWallName} label="Name"></Textfield>
+        {#if error.length > 0}
+            <div class="text-red-700">{error}</div>
+        {/if}
+    </div>
+</Modal>
+
+<Modal bind:showModal={showDeleteWall} okFn={deleteWall} cancelFn={deleteWallCancel}>
+    {#snippet header()}
+        <h2 class="text-3xl">Wand löschen</h2>
+    {/snippet}
+
+    <div>Soll die Wand {wallToDelete?.name} wirklich gelöscht werden?</div>
+    {#if error.length > 0}
+        <div class="text-red-700">{error}</div>
+    {/if}
+</Modal>
--- a/src/routes/editor/[gameid]/EditorSimpleQuestion.svelte
+++ b/src/routes/editor/[gameid]/EditorSimpleQuestion.svelte
@@ -0,0 +1,15 @@
+<script lang="ts">
+    import type { SimpleQuestion } from "$lib/games/games";
+    import Textfield from "$lib/Textfield.svelte";
+
+    interface Props {
+        question: SimpleQuestion;
+    }
+
+    let { question }: Props = $props();
+</script>
+
+<div>
+    <Textfield bind:value={question.data.question}></Textfield>
+    <Textfield bind:value={question.data.answer}></Textfield>
+</div>
--- a/src/routes/editor/[gameid]/[wallid]/[categoryid]/[questionid]/+page.svelte
+++ b/src/routes/editor/[gameid]/[wallid]/[categoryid]/[questionid]/+page.svelte
@@ -0,0 +1,298 @@
+<script lang="ts">
+    import {
+        isRessource,
+        type Category,
+        type Game,
+        type GeneralQuestion,
+        type Wall
+    } from "$lib/Types";
+    import { onMount, untrack } from "svelte";
+    import { fetchCategory, fetchGame, fetchQuestion, fetchWall } from "../../../../fetchers";
+    import { page } from "$app/state";
+    import { goto } from "$app/navigation";
+    import {
+        isAudioMultipleChoiceQuestion,
+        isAudioQuestion,
+        isImageMultipleChoiceQuestion,
+        isImageQuestion,
+        isMultipleChoiceQuestion,
+        isSimpleQuestion,
+        type QuestionType
+    } from "$lib/games/games";
+    import SimpleQuestionComponent from "$lib/SimpleQuestionComponent.svelte";
+    import { convert } from "./questionconverters";
+    import MultipleChoiceQuestionComponent from "$lib/MultipleChoiceQuestionComponent.svelte";
+    import ImageQuestionComponent from "$lib/ImageQuestionComponent.svelte";
+    import ImageMultipleChoiceQuestionComponent from "$lib/ImageMultipleChoiceQuestionComponent.svelte";
+    import AudioQuestionComponent from "$lib/AudioQuestionComponent.svelte";
+    import AudioMultipleChoiceQuestionComponent from "$lib/AudioMultipleChoiceQuestionComponent.svelte";
+    import Button from "$lib/Button.svelte";
+    import Textfield from "$lib/Textfield.svelte";
+    import EditorSimple from "./EditorSimple.svelte";
+    import EditorImage from "./EditorImage.svelte";
+    import EditorAudio from "./EditorAudio.svelte";
+    import EditorMultipleChoice from "./EditorMultipleChoice.svelte";
+    import EditorAudioMultipleChoice from "./EditorAudioMultipleChoice.svelte";
+    import EditorImageMultipleChoice from "./EditorImageMultipleChoice.svelte";
+    import axios, { type AxiosResponse } from "axios";
+    import { url } from "$lib/util";
+
+    let init = true;
+    let game: Game | undefined = $state();
+    let wall: Wall | undefined = $state();
+    let wallNumber = $derived.by(() => {
+        if (game && wall) {
+            return game.walls.indexOf(wall._id) + 1;
+        } else return -1;
+    });
+    let category: Category | undefined = $state();
+    let question: GeneralQuestion | undefined = $state();
+    let questionNumer = $derived.by(() => {
+        if (category && question) {
+            for (let i = 0; i < category.questions.length; i++) {
+                const q = category.questions[i];
+                if (q._id === question._id) return i + 1;
+            }
+            return -1;
+        } else return -1;
+    });
+    let questionType: QuestionType = $state("SIMPLE");
+
+    let showAnswer = $state(true);
+    let saving = $state(false);
+
+    function save() {
+        if (!question) return;
+        saving = true;
+        let q: GeneralQuestion | undefined;
+        let promise: Promise<AxiosResponse> | undefined;
+        if (question.type === "IMAGE" || question.type === "IMAGE_MULTIPLE_CHOICE") {
+            promise = axios.post(
+                url(`/question`),
+                {
+                    ...question,
+                    data: {
+                        ...question.data,
+                        image: isRessource(question.data.image) ? question.data.image._id : null
+                    }
+                },
+                { withCredentials: true }
+            );
+        } else if (question.type === "AUDIO" || question.type === "AUDIO_MULTIPLE_CHOICE") {
+            promise = axios.post(
+                url(`/question`),
+                {
+                    ...question,
+                    data: {
+                        ...question.data,
+                        audio: isRessource(question.data.audio) ? question.data.audio._id : null
+                    }
+                },
+                { withCredentials: true }
+            );
+        } else if (question.type === "SIMPLE" || question.type === "MULTIPLE_CHOICE") {
+            promise = axios.post(url(`/question`), question, { withCredentials: true });
+        }
+        if (promise)
+            promise
+                .then((response) => {
+                    if (response.status !== 200) {
+                        console.error("Failed to save: " + response.status);
+                        alert("Failed to save: " + response.status);
+                    }
+                })
+                .catch((err) => {
+                    console.error(err);
+                    alert(`Failed to save: ${err}`);
+                })
+                .finally(() => {
+                    saving = false;
+                });
+        else {
+            saving = false;
+        }
+    }
+
+    $effect(() => {
+        if (questionType) {
+            if (init) {
+                init = false;
+                return;
+            }
+            console.log(questionType);
+            untrack(() => {
+                if (question) question = convert(question, questionType);
+            });
+        }
+    });
+
+    onMount(() => {
+        let promises: Promise<unknown>[] = [];
+        promises.push(
+            fetchGame(`${page.params.gameid}`).then((fetchedGame) => {
+                game = fetchedGame;
+            })
+        );
+        promises.push(
+            fetchWall(`${page.params.wallid}`).then((fetchedWall) => {
+                wall = fetchedWall;
+            })
+        );
+        promises.push(
+            fetchCategory(`${page.params.categoryid}`).then((fetchedCategory) => {
+                category = fetchedCategory;
+            })
+        );
+        promises.push(
+            fetchQuestion(`${page.params.questionid}`).then((fetchedQuestion) => {
+                question = fetchedQuestion;
+                questionType = question.type;
+            })
+        );
+
+        Promise.all(promises).catch((err) => {
+            console.error(err);
+        });
+    });
+</script>
+
+<div class="flex h-full flex-col">
+    <div class="m-4 flex items-center gap-2">
+        <h1 class="text-4xl font-bold">{game ? game.name : "Spiel"}</h1>
+        <!-- svelte-ignore a11y_missing_content -->
+        <h1 class="text-4xl font-bold"><i class="fa-solid fa-angle-right"></i></h1>
+        <h1 class="text-4xl font-bold">
+            {wall
+                ? `${wall.name}
+            ${wallNumber > 0 ? `(Wand ${wallNumber})` : ""}`
+                : "Wand"}
+        </h1>
+        <!-- svelte-ignore a11y_missing_content -->
+        <h1 class="text-4xl font-bold"><i class="fa-solid fa-angle-right"></i></h1>
+        <h1 class="text-4xl font-bold">{category ? category.name : "Kategorie"}</h1>
+        <!-- svelte-ignore a11y_missing_content -->
+        <h1 class="text-4xl font-bold"><i class="fa-solid fa-angle-right"></i></h1>
+        <h1 class="text-4xl font-bold">{questionNumer ? `Frage ${questionNumer}` : "Frage ?"}</h1>
+        <div class="grow"></div>
+        <button class="btn" type="button" onclick={() => goto(`/editor/${page.params.gameid}`)}
+            >Zurück</button
+        >
+    </div>
+    {#if question}
+        <div class="flex grow">
+            <!-- Sidebar -->
+            <div class="flex h-full max-w-[600px] min-w-[400px] flex-col gap-4 border-r-1">
+                <div class="ms-4 me-4 flex justify-between gap-4">
+                    <Button
+                        onclick={() => {
+                            save();
+                        }}>{saving ? "Speichert..." : "Speichern"}</Button
+                    >
+                    <Button
+                        onclick={() => {
+                            showAnswer = !showAnswer;
+                        }}
+                    >
+                        {#if showAnswer}
+                            <div>
+                                <i class="fa-solid fa-exclamation"></i>
+                            </div>
+                        {:else}
+                            <div>
+                                <i class="fa-solid fa-question"></i>
+                            </div>
+                        {/if}
+                    </Button>
+                </div>
+                <select
+                    name="QuestionType"
+                    id="QuestionType"
+                    bind:value={questionType}
+                    class="ms-4 me-4 rounded-md border-1 p-1"
+                >
+                    <option value="SIMPLE">SIMPLE</option>
+                    <option value="MULTIPLE_CHOICE">MULTIPLE_CHOICE</option>
+                    <option value="IMAGE">IMAGE</option>
+                    <option value="IMAGE_MULTIPLE_CHOICE">IMAGE_MULTIPLE_CHOICE</option>
+                    <option value="AUDIO">AUDIO</option>
+                    <option value="AUDIO_MULTIPLE_CHOICE">AUDIO_MULTIPLE_CHOICE</option>
+                </select>
+                <div class="ms-4 me-4">
+                    <div class="flex items-center gap-2">
+                        <Textfield type="number" bind:value={question.points} label="Punkte"
+                        ></Textfield>
+                        <Button
+                            onclick={() => {
+                                if (question) question.points *= -1;
+                            }}><i class="fa-solid fa-plus-minus"></i></Button
+                        >
+                    </div>
+                </div>
+                <div class="ms-4 me-4 grow">
+                    {#if isSimpleQuestion(question)}
+                        <EditorSimple bind:question></EditorSimple>
+                    {:else if isMultipleChoiceQuestion(question)}
+                        <EditorMultipleChoice bind:question></EditorMultipleChoice>
+                    {:else if isImageQuestion(question)}
+                        <EditorImage bind:question></EditorImage>
+                    {:else if isImageMultipleChoiceQuestion(question)}
+                        <EditorImageMultipleChoice bind:question></EditorImageMultipleChoice>
+                    {:else if isAudioQuestion(question)}
+                        <EditorAudio bind:question></EditorAudio>
+                    {:else if isAudioMultipleChoiceQuestion(question)}
+                        <EditorAudioMultipleChoice bind:question></EditorAudioMultipleChoice>{/if}
+                </div>
+            </div>
+            <!-- Display -->
+            <div class="ms-4 me-4 flex grow flex-col">
+                {#if isSimpleQuestion(question)}
+                    <SimpleQuestionComponent {question} {showAnswer} showQuestion
+                    ></SimpleQuestionComponent>
+                {:else if isMultipleChoiceQuestion(question)}
+                    <MultipleChoiceQuestionComponent
+                        {question}
+                        {showAnswer}
+                        showQuestion
+                        randomize={false}
+                    ></MultipleChoiceQuestionComponent>
+                {:else if isImageQuestion(question)}
+                    <ImageQuestionComponent
+                        {question}
+                        {showAnswer}
+                        showQuestion
+                        isBuzzed={false}
+                        isLegacy={false}
+                    ></ImageQuestionComponent>
+                {:else if isImageMultipleChoiceQuestion(question)}
+                    <ImageMultipleChoiceQuestionComponent
+                        {question}
+                        {showAnswer}
+                        showQuestion
+                        isBuzzed={false}
+                        isLegacy={false}
+                        randomize={false}
+                    ></ImageMultipleChoiceQuestionComponent>
+                {:else if isAudioQuestion(question)}
+                    <AudioQuestionComponent
+                        {question}
+                        {showAnswer}
+                        showQuestion
+                        showPlayer
+                        isLegacy={false}
+                    ></AudioQuestionComponent>
+                {:else if isAudioMultipleChoiceQuestion(question)}
+                    <AudioMultipleChoiceQuestionComponent
+                        {question}
+                        {showAnswer}
+                        showQuestion
+                        showPlayer
+                        isLegacy={false}
+                        randomize={false}
+                    ></AudioMultipleChoiceQuestionComponent>
+                {/if}
+            </div>
+        </div>
+    {:else}
+        No question isFileLoadingAllowed, please try again
+    {/if}
+</div>
--- a/src/routes/editor/[gameid]/[wallid]/[categoryid]/[questionid]/EditorAudio.svelte
+++ b/src/routes/editor/[gameid]/[wallid]/[categoryid]/[questionid]/EditorAudio.svelte
@@ -0,0 +1,14 @@
+<script lang="ts">
+    import type { AudioQuestion } from "$lib/games/games";
+    import EditorMediaField from "./EditorMediaField.svelte";
+    import EditorSimple from "./EditorSimple.svelte";
+
+    interface Props {
+        question: AudioQuestion;
+    }
+
+    let { question = $bindable() }: Props = $props();
+</script>
+
+<EditorMediaField bind:question></EditorMediaField>
+<EditorSimple bind:question></EditorSimple>
--- a/src/routes/editor/[gameid]/[wallid]/[categoryid]/[questionid]/EditorAudioMultipleChoice.svelte
+++ b/src/routes/editor/[gameid]/[wallid]/[categoryid]/[questionid]/EditorAudioMultipleChoice.svelte
@@ -0,0 +1,14 @@
+<script lang="ts">
+    import type { AudioMultipleChoiceQuestion } from "$lib/games/games";
+    import EditorMediaField from "./EditorMediaField.svelte";
+    import EditorMultipleChoice from "./EditorMultipleChoice.svelte";
+
+    interface Props {
+        question: AudioMultipleChoiceQuestion;
+    }
+
+    let { question = $bindable() }: Props = $props();
+</script>
+
+<EditorMediaField bind:question></EditorMediaField>
+<EditorMultipleChoice bind:question></EditorMultipleChoice>
--- a/src/routes/editor/[gameid]/[wallid]/[categoryid]/[questionid]/EditorImage.svelte
+++ b/src/routes/editor/[gameid]/[wallid]/[categoryid]/[questionid]/EditorImage.svelte
@@ -0,0 +1,14 @@
+<script lang="ts">
+    import type { ImageQuestion } from "$lib/games/games";
+    import EditorMediaField from "./EditorMediaField.svelte";
+    import EditorSimple from "./EditorSimple.svelte";
+
+    interface Props {
+        question: ImageQuestion;
+    }
+
+    let { question = $bindable() }: Props = $props();
+</script>
+
+<EditorMediaField bind:question></EditorMediaField>
+<EditorSimple bind:question></EditorSimple>
--- a/src/routes/editor/[gameid]/[wallid]/[categoryid]/[questionid]/EditorImageMultipleChoice.svelte
+++ b/src/routes/editor/[gameid]/[wallid]/[categoryid]/[questionid]/EditorImageMultipleChoice.svelte
@@ -0,0 +1,14 @@
+<script lang="ts">
+    import type { ImageMultipleChoiceQuestion } from "$lib/games/games";
+    import EditorMediaField from "./EditorMediaField.svelte";
+    import EditorMultipleChoice from "./EditorMultipleChoice.svelte";
+
+    interface Props {
+        question: ImageMultipleChoiceQuestion;
+    }
+
+    let { question = $bindable() }: Props = $props();
+</script>
+
+<EditorMediaField bind:question></EditorMediaField>
+<EditorMultipleChoice bind:question></EditorMultipleChoice>
--- a/src/routes/editor/[gameid]/[wallid]/[categoryid]/[questionid]/EditorMediaField.svelte
+++ b/src/routes/editor/[gameid]/[wallid]/[categoryid]/[questionid]/EditorMediaField.svelte
@@ -0,0 +1,67 @@
+<script lang="ts">
+    import Button from "$lib/Button.svelte";
+    import {
+        isAudioMultipleChoiceQuestion,
+        isAudioQuestion,
+        type AudioMultipleChoiceQuestion,
+        type AudioQuestion,
+        type ImageMultipleChoiceQuestion,
+        type ImageQuestion
+    } from "$lib/games/games";
+    import RessourceManager from "$lib/RessourceManager.svelte";
+    import Textfield from "$lib/Textfield.svelte";
+    import { isRessource } from "$lib/Types";
+
+    interface Props {
+        question:
+            | AudioQuestion
+            | ImageQuestion
+            | AudioMultipleChoiceQuestion
+            | ImageMultipleChoiceQuestion;
+    }
+
+    let { question = $bindable() }: Props = $props();
+
+    let showRessourceManager = $state(false);
+</script>
+
+<div class="w-full">
+    {#if isAudioQuestion(question) || isAudioMultipleChoiceQuestion(question)}
+        <div>Audio:</div>
+    {:else}
+        <div>Bild:</div>
+    {/if}
+    <div class="flex items-center justify-between gap-2">
+        {#if isAudioQuestion(question) || isAudioMultipleChoiceQuestion(question)}
+            <Textfield
+                readonly
+                value={question.data.audio && isRessource(question.data.audio)
+                    ? question.data.audio.name
+                    : ""}
+            ></Textfield>
+        {:else}
+            <Textfield
+                readonly
+                value={question.data.image && isRessource(question.data.image)
+                    ? question.data.image.name
+                    : ""}
+            ></Textfield>
+        {/if}
+        <Button
+            onclick={() => {
+                showRessourceManager = true;
+            }}><i class="fa-solid fa-arrow-up-right-from-square"></i></Button
+        >
+    </div>
+</div>
+
+<RessourceManager
+    bind:show={showRessourceManager}
+    ok={(res) => {
+        if (isAudioQuestion(question) || isAudioMultipleChoiceQuestion(question)) {
+            question.data.audio = res;
+        } else {
+            question.data.image = res;
+        }
+    }}
+></RessourceManager>
--- a/src/routes/editor/[gameid]/[wallid]/[categoryid]/[questionid]/EditorMultipleChoice.svelte
+++ b/src/routes/editor/[gameid]/[wallid]/[categoryid]/[questionid]/EditorMultipleChoice.svelte
@@ -0,0 +1,44 @@
+<script lang="ts">
+    import Button from "$lib/Button.svelte";
+    import type {
+        AudioMultipleChoiceQuestion,
+        ImageMultipleChoiceQuestion,
+        MultipleChoiceQuestion
+    } from "$lib/games/games";
+    import Textfield from "$lib/Textfield.svelte";
+    import { onMount } from "svelte";
+
+    interface Props {
+        question:
+            | MultipleChoiceQuestion
+            | AudioMultipleChoiceQuestion
+            | ImageMultipleChoiceQuestion;
+    }
+
+    let { question = $bindable() }: Props = $props();
+</script>
+
+<Textfield bind:value={question.data.question} label="Frage"></Textfield>
+<div class="mb-2 flex items-center justify-between">
+    <div>Antworten</div>
+    <Button
+        onclick={() => {
+            question.data.choices.push("Antwort");
+        }}><i class="fa-solid fa-plus"></i></Button
+    >
+</div>
+<hr />
+{#each question.data.choices as _, answerIndex}
+    <div class="flex items-center gap-2">
+        <Textfield
+            bind:value={question.data.choices[answerIndex]}
+            label={answerIndex === 0 ? "Korrekte Antwort" : `Antwort ${answerIndex + 1}`}
+        ></Textfield>
+        <Button
+            class="border-red-600 text-red-600"
+            onclick={(event) => {
+                question.data.choices.splice(answerIndex, 1);
+            }}><i class="fa-solid fa-trash"></i></Button
+        >
+    </div>
+{/each}
--- a/src/routes/editor/[gameid]/[wallid]/[categoryid]/[questionid]/EditorSimple.svelte
+++ b/src/routes/editor/[gameid]/[wallid]/[categoryid]/[questionid]/EditorSimple.svelte
@@ -0,0 +1,13 @@
+<script lang="ts">
+    import type { AudioQuestion, ImageQuestion, SimpleQuestion } from "$lib/games/games";
+    import Textfield from "$lib/Textfield.svelte";
+
+    interface Props {
+        question: SimpleQuestion | ImageQuestion | AudioQuestion;
+    }
+
+    let { question = $bindable() }: Props = $props();
+</script>
+
+<Textfield bind:value={question.data.question} label="Frage"></Textfield>
+<Textfield bind:value={question.data.answer} label="Antwort"></Textfield>
--- a/src/routes/editor/[gameid]/[wallid]/[categoryid]/[questionid]/questionconverters.ts
+++ b/src/routes/editor/[gameid]/[wallid]/[categoryid]/[questionid]/questionconverters.ts
@@ -0,0 +1,303 @@
+import type {
+    AudioMultipleChoiceQuestion,
+    AudioQuestion,
+    ImageMultipleChoiceQuestion,
+    ImageQuestion,
+    MultipleChoiceQuestion,
+    Question,
+    QuestionType,
+    SimpleQuestion
+} from "$lib/games/games";
+import type { GeneralQuestion } from "$lib/Types";
+
+function defaultConversion(question: Question, type: QuestionType): Question {
+    return {
+        points: question.points,
+        _id: question._id,
+        owner: question.owner,
+        type
+    };
+}
+
+export function convert(q: GeneralQuestion, t: QuestionType) {
+    if (q.type === "SIMPLE") {
+        switch (t) {
+            case "SIMPLE":
+                return q;
+            case "MULTIPLE_CHOICE":
+                return simpleToMultipleChoice(q);
+            case "IMAGE":
+                return simpleToImage(q);
+            case "IMAGE_MULTIPLE_CHOICE":
+                return simpleToImageMultipleChoice(q);
+            case "AUDIO":
+                return simpleToAudio(q);
+            case "AUDIO_MULTIPLE_CHOICE":
+                return simpleToAudioMultipleChoice(q);
+        }
+    } else if (q.type === "MULTIPLE_CHOICE") {
+        switch (t) {
+            case "SIMPLE":
+                return multipleChoiceToSimple(q);
+            case "MULTIPLE_CHOICE":
+                return q;
+            case "IMAGE":
+                return multipleChoiceToImage(q);
+            case "IMAGE_MULTIPLE_CHOICE":
+                return multipleChoiceToImageMultipleChoice(q);
+            case "AUDIO":
+                return multipleChoiceToAudio(q);
+            case "AUDIO_MULTIPLE_CHOICE":
+                return multipleChoiceToAudioMultipleChoice(q);
+        }
+    } else if (q.type === "IMAGE") {
+        switch (t) {
+            case "SIMPLE":
+                return mediaToSimple(q);
+            case "MULTIPLE_CHOICE":
+                return simpleToMultipleChoice(q);
+            case "IMAGE":
+                return q;
+            case "IMAGE_MULTIPLE_CHOICE":
+                return imageToImageMultipleChoice(q);
+            case "AUDIO":
+                return simpleToAudio(q);
+            case "AUDIO_MULTIPLE_CHOICE":
+                return simpleToMultipleChoice(q);
+        }
+    } else if (q.type === "IMAGE_MULTIPLE_CHOICE") {
+        switch (t) {
+            case "SIMPLE":
+                return multipleChoiceToSimple(q);
+            case "MULTIPLE_CHOICE":
+                return mediaMultipleChoiceToMultipleChoice(q);
+            case "IMAGE":
+                return imageMultipleChoiceToImage(q);
+            case "IMAGE_MULTIPLE_CHOICE":
+                return q;
+            case "AUDIO":
+                return multipleChoiceToAudio(q);
+            case "AUDIO_MULTIPLE_CHOICE":
+                return multipleChoiceToAudioMultipleChoice(q);
+        }
+    } else if (q.type === "AUDIO") {
+        switch (t) {
+            case "SIMPLE":
+                return mediaToSimple(q);
+            case "MULTIPLE_CHOICE":
+                return simpleToMultipleChoice(q);
+            case "IMAGE":
+                return simpleToImage(q);
+            case "IMAGE_MULTIPLE_CHOICE":
+                return simpleToImageMultipleChoice(q);
+            case "AUDIO":
+                return q;
+            case "AUDIO_MULTIPLE_CHOICE":
+                return audioToAudioMultipleChoice(q);
+        }
+    } else if (q.type === "AUDIO_MULTIPLE_CHOICE") {
+        switch (t) {
+            case "SIMPLE":
+                return multipleChoiceToSimple(q);
+            case "MULTIPLE_CHOICE":
+                return mediaMultipleChoiceToMultipleChoice(q);
+            case "IMAGE":
+                return multipleChoiceToImage(q);
+            case "IMAGE_MULTIPLE_CHOICE":
+                return multipleChoiceToImageMultipleChoice(q);
+            case "AUDIO":
+                return audioMultipleChoiceToAudio(q);
+            case "AUDIO_MULTIPLE_CHOICE":
+                return q;
+        }
+    }
+    return q;
+}
+
+export function simpleToMultipleChoice(
+    question: SimpleQuestion | ImageQuestion | AudioQuestion
+): MultipleChoiceQuestion {
+    return {
+        ...(defaultConversion(question, "MULTIPLE_CHOICE") as MultipleChoiceQuestion),
+        data: {
+            question: question.data.question,
+            choices: [question.data.answer]
+        }
+    };
+}
+
+export function simpleToImage(question: SimpleQuestion | AudioQuestion): ImageQuestion {
+    return {
+        ...(defaultConversion(question, "IMAGE") as ImageQuestion),
+        data: {
+            question: question.data.question,
+            answer: question.data.answer,
+            image: null
+        }
+    };
+}
+
+export function simpleToImageMultipleChoice(
+    question: SimpleQuestion | AudioQuestion
+): ImageMultipleChoiceQuestion {
+    return {
+        ...(defaultConversion(question, "IMAGE_MULTIPLE_CHOICE") as ImageMultipleChoiceQuestion),
+        data: {
+            question: question.data.question,
+            choices: [question.data.answer],
+            image: null
+        }
+    };
+}
+
+export function simpleToAudio(question: SimpleQuestion | ImageQuestion): AudioQuestion {
+    return {
+        ...(defaultConversion(question, "AUDIO") as AudioQuestion),
+        data: {
+            question: question.data.question,
+            answer: question.data.answer,
+            audio: null
+        }
+    };
+}
+
+export function simpleToAudioMultipleChoice(question: SimpleQuestion): AudioMultipleChoiceQuestion {
+    return {
+        ...(defaultConversion(question, "AUDIO_MULTIPLE_CHOICE") as AudioMultipleChoiceQuestion),
+        data: {
+            question: question.data.question,
+            choices: [question.data.answer],
+            audio: null
+        }
+    };
+}
+
+export function mediaToSimple(question: ImageQuestion | AudioQuestion): SimpleQuestion {
+    return {
+        ...(defaultConversion(question, "SIMPLE") as SimpleQuestion),
+        data: {
+            question: question.data.question,
+            answer: question.data.answer
+        }
+    };
+}
+
+export function mediaMultipleChoiceToMultipleChoice(
+    question: ImageMultipleChoiceQuestion | AudioMultipleChoiceQuestion
+): MultipleChoiceQuestion {
+    return {
+        ...(defaultConversion(question, "MULTIPLE_CHOICE") as MultipleChoiceQuestion),
+        data: {
+            question: question.data.question,
+            choices: [...question.data.choices]
+        }
+    };
+}
+
+export function multipleChoiceToSimple(
+    question: MultipleChoiceQuestion | ImageMultipleChoiceQuestion | AudioMultipleChoiceQuestion
+): SimpleQuestion {
+    return {
+        ...(defaultConversion(question, "SIMPLE") as SimpleQuestion),
+        data: {
+            question: question.data.question,
+            answer: question.data.choices[0] ? question.data.choices[0] : "Antwort"
+        }
+    };
+}
+
+export function multipleChoiceToImage(
+    question: MultipleChoiceQuestion | AudioMultipleChoiceQuestion
+): ImageQuestion {
+    return {
+        ...(defaultConversion(question, "IMAGE") as ImageQuestion),
+        data: {
+            question: question.data.question,
+            answer: question.data.choices[0] ? question.data.choices[0] : "Antwort",
+            image: null
+        }
+    };
+}
+
+export function multipleChoiceToImageMultipleChoice(
+    question: MultipleChoiceQuestion | AudioMultipleChoiceQuestion
+): ImageMultipleChoiceQuestion {
+    return {
+        ...(defaultConversion(question, "IMAGE_MULTIPLE_CHOICE") as ImageMultipleChoiceQuestion),
+        data: {
+            question: question.data.question,
+            choices: [...question.data.choices],
+            image: null
+        }
+    };
+}
+
+export function multipleChoiceToAudio(
+    question: MultipleChoiceQuestion | ImageMultipleChoiceQuestion
+): AudioQuestion {
+    return {
+        ...(defaultConversion(question, "AUDIO") as AudioQuestion),
+        data: {
+            question: question.data.question,
+            answer: question.data.choices[0] ? question.data.choices[0] : "Antwort",
+            audio: null
+        }
+    };
+}
+
+export function multipleChoiceToAudioMultipleChoice(
+    question: MultipleChoiceQuestion | ImageMultipleChoiceQuestion
+): AudioMultipleChoiceQuestion {
+    return {
+        ...(defaultConversion(question, "AUDIO_MULTIPLE_CHOICE") as AudioMultipleChoiceQuestion),
+        data: {
+            question: question.data.question,
+            choices: [...question.data.choices],
+            audio: null
+        }
+    };
+}
+
+export function imageToImageMultipleChoice(question: ImageQuestion): ImageMultipleChoiceQuestion {
+    return {
+        ...(defaultConversion(question, "IMAGE_MULTIPLE_CHOICE") as ImageMultipleChoiceQuestion),
+        data: {
+            question: question.data.question,
+            choices: [question.data.answer],
+            image: question.data.image
+        }
+    };
+}
+
+export function imageMultipleChoiceToImage(question: ImageMultipleChoiceQuestion): ImageQuestion {
+    return {
+        ...(defaultConversion(question, "IMAGE") as ImageQuestion),
+        data: {
+            question: question.data.question,
+            answer: question.data.choices[0] ? question.data.choices[0] : "Antwort",
+            image: question.data.image
+        }
+    };
+}
+
+export function audioToAudioMultipleChoice(question: AudioQuestion): AudioMultipleChoiceQuestion {
+    return {
+        ...(defaultConversion(question, "AUDIO_MULTIPLE_CHOICE") as AudioMultipleChoiceQuestion),
+        data: {
+            question: question.data.question,
+            choices: [question.data.answer],
+            audio: question.data.audio
+        }
+    };
+}
+
+export function audioMultipleChoiceToAudio(question: AudioMultipleChoiceQuestion): AudioQuestion {
+    return {
+        ...(defaultConversion(question, "AUDIO") as AudioQuestion),
+        data: {
+            question: question.data.question,
+            answer: question.data.choices[0] ? question.data.choices[0] : "Antwort",
+            audio: question.data.audio
+        }
+    };
+}
--- a/src/routes/editor/fetchers.ts
+++ b/src/routes/editor/fetchers.ts
@@ -0,0 +1,108 @@
+import type {
+    AudioMultipleChoiceQuestion,
+    AudioQuestion,
+    ImageMultipleChoiceQuestion,
+    ImageQuestion,
+    MultipleChoiceQuestion,
+    Question,
+    SimpleQuestion
+} from "$lib/games/games";
+import type { Category, Game, Wall } from "$lib/Types";
+import { url } from "$lib/util";
+import axios from "axios";
+
+export function fetchGame(id: string) {
+    return axios.get(url(`/game?id=${id}`), { withCredentials: true }).then((response) => {
+        if (response.status === 200) {
+            return response.data as Game;
+        } else {
+            throw `Failed to fetch game: ${response.status}`;
+        }
+    });
+}
+
+export function fetchWalls(id: string) {
+    return axios.get(url(`/walls/${id}`), { withCredentials: true }).then((response) => {
+        if (response.status === 200) {
+            return response.data as Wall[];
+        } else {
+            throw `Failed to fetch walls: ${response.status}`;
+        }
+    });
+}
+
+export function fetchWall(id: string) {
+    return axios.get(url(`/wall?id=${id}`), { withCredentials: true }).then((response) => {
+        if (response.status === 200) {
+            return response.data as Wall;
+        } else {
+            throw `Failed to fetch wall: ${response.status}`;
+        }
+    });
+}
+
+export function fetchCategory(id: string) {
+    return axios.get(url(`/category?id=${id}`), { withCredentials: true }).then((response) => {
+        if (response.status === 200) {
+            return response.data as Category;
+        } else {
+            throw `Failed to fetch category: ${response.status}`;
+        }
+    });
+}
+
+export function fetchQuestion(id: string) {
+    return axios
+        .get(url(`/question?id=${id}`), { withCredentials: true })
+        .then(async (response) => {
+            if (response.status === 200) {
+                const q = response.data;
+                console.log(q);
+                if (
+                    (q as Question).type === "IMAGE" ||
+                    (q as Question).type === "IMAGE_MULTIPLE_CHOICE"
+                ) {
+                    // request ressource
+                    return axios
+                        .get(url(`/ressource?id=${(q as ImageQuestion).data.image}`), {
+                            withCredentials: true
+                        })
+                        .then((ressourceResponse) => {
+                            if (ressourceResponse.status === 200) {
+                                (q as ImageQuestion | ImageMultipleChoiceQuestion).data.image =
+                                    ressourceResponse.data;
+                            } else {
+                                (q as ImageQuestion | ImageMultipleChoiceQuestion).data.image =
+                                    null;
+                            }
+                            return q as ImageQuestion | ImageMultipleChoiceQuestion;
+                        })
+                        .catch(() => {
+                            return q as ImageQuestion | ImageMultipleChoiceQuestion;
+                        });
+                } else if (
+                    (q as Question).type === "AUDIO" ||
+                    (q as Question).type === "AUDIO_MULTIPLE_CHOICE"
+                ) {
+                    // request ressource
+                    return axios
+                        .get(url(`/ressource?id=${(q as AudioQuestion).data.audio}`), {
+                            withCredentials: true
+                        })
+                        .then((ressourceResponse) => {
+                            if (ressourceResponse.status === 200) {
+                                (q as AudioQuestion | AudioMultipleChoiceQuestion).data.audio =
+                                    ressourceResponse.data;
+                            } else {
+                                (q as AudioQuestion | AudioMultipleChoiceQuestion).data.audio =
+                                    null;
+                            }
+                            return q as AudioQuestion | AudioMultipleChoiceQuestion;
+                        })
+                        .catch(() => {
+                            return q as AudioQuestion | AudioMultipleChoiceQuestion;
+                        });
+                } else return q as SimpleQuestion | MultipleChoiceQuestion;
+            } else throw `Failed to fetch question: ${response.status}`;
+        });
+}
--- a/src/routes/login/+page.svelte
+++ b/src/routes/login/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
    import { goto } from "$app/navigation";
    import { env } from "$env/dynamic/public";
-    import UserState from "$lib/User.svelte";
+    import UserState, { type UserObj } from "$lib/User.svelte";
    import axios from "axios";

    let username = $state("");
@@ -20,7 +20,8 @@
            )
            .then((response) => {
                if (response.status === 200) {
-                    UserState.username = response.data;
+                    UserState.user = response.data as UserObj;
+                    console.log(UserState.id, UserState.username, UserState.role);
                    goto("/");
                }
            })
--- a/src/routes/settings/+page.svelte
+++ b/src/routes/settings/+page.svelte
@@ -0,0 +1,92 @@
+<script lang="ts">
+    import { goto } from "$app/navigation";
+    import { env } from "$env/dynamic/public";
+    import UserState, { type UserObj } from "$lib/User.svelte";
+    import axios from "axios";
+
+    let oldpassword = $state("");
+    let newpassword = $state("");
+    let reppassword = $state("");
+    let error = $state("");
+
+    async function changePassword() {
+        if (newpassword !== reppassword) {
+            error = "Passwörter stimmen nicht überein.";
+        } else {
+            error = "";
+        }
+
+        axios
+            .post(
+                `${env.PUBLIC_JEOPARDY_SERVER_PROTOCOL}://${env.PUBLIC_JEOPARDY_SERVER}/user/changepw`,
+                {
+                    old: oldpassword,
+                    new: newpassword
+                },
+                { withCredentials: true }
+            )
+            .then((response) => {
+                if (response.status === 200) {
+                    goto("/login");
+                } else {
+                    error = "Passwort ändern fehlgeschlagen";
+                }
+            })
+            .catch((e) => {
+                error = "Passwort ändern fehlgeschlagen";
+            });
+    }
+</script>
+
+<div class="flex flex-col gap-4 p-4">
+    <div class="flex items-center">
+        <h2 class="text-4xl font-bold">Einstellungen</h2>
+        <div class="grow"></div>
+        <button type="button" class="btn" onclick={() => goto("/")}>Zurück</button>
+    </div>
+    <div class="rounded-md border-1 p-4">
+        <h4 class="font-bold">Passwort ändern</h4>
+        <div>
+            <label for="oldpassword" class="">Altes Passwort</label>
+            <input
+                type="password"
+                name="oldpassword"
+                id="oldpassword"
+                class="borders me-4 mt-2 mb-4"
+                bind:value={oldpassword}
+            />
+            <label for="newpassword" class="">Neues Passwort</label>
+            <input
+                type="password"
+                name="newpassword"
+                id="newpassword"
+                class="borders me-4 mt-2 mb-4"
+                bind:value={newpassword}
+            />
+            <label for="reppassword" class="">Neues Passwort wiederholen</label>
+            <input
+                type="password"
+                name="reppassword"
+                id="reppassword"
+                class="borders me-4 mt-2 mb-4"
+                bind:value={reppassword}
+            />
+        </div>
+        <button type="button" class="btn mb-2 w-fit ps-4 pe-4" onclick={changePassword}
+            >Passwort ändern</button
+        >
+        {#if error.length > 0}
+            <div class="text-red-700">{error}</div>
+        {/if}
+    </div>
+</div>
+
+<style>
+    .borders {
+        border: 1px solid black;
+        border-radius: 5px;
+        display: flex;
+        font-size: larger;
+        padding: 2px;
+    }
+</style>
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,7 +1,7 @@
-import tailwindcss from '@tailwindcss/vite';
-import { sveltekit } from '@sveltejs/kit/vite';
-import { defineConfig } from 'vite';
+import tailwindcss from "@tailwindcss/vite";
+import { sveltekit } from "@sveltejs/kit/vite";
+import { defineConfig } from "vite";

 export default defineConfig({
-	plugins: [tailwindcss(), sveltekit()]
+    plugins: [sveltekit(), tailwindcss()]
 });
Author	SHA1	Message	Date
Jonas Kappa	b24e43e142	Release 2.0.0 Updated display and host	2026-01-03 00:38:52 +01:00
Jonas Kappa	48074f7603	Added Editing of Questions	2026-01-02 18:00:57 +01:00
Jonas Kappa	5568a5bb99	Added rename of Game, Wall and Category	2026-01-02 12:35:44 +01:00
Jonas Kappa	7be5921ef6	Added Editor Game and Wall Display	2026-01-02 02:59:40 +01:00
Jonas Kappa	dc2766f0ef	Merge branch 'mongodb-fix'	2025-12-28 15:49:19 +01:00
Jonas Kappa	7d231730a6	Updated Version 1.0.6	2025-12-28 15:40:25 +01:00
Jonas Kappa	956571e470	Bumbed mongo db version	2025-12-28 15:39:20 +01:00
Jonas Kappa	4405c23bee	Fix: Directories cant be deleted	2025-12-28 13:11:42 +01:00
Jonas Kappa	aaf09e13f5	Editor: Adjusted game link and added no games image	2025-12-28 13:02:36 +01:00
Jonas Kappa	daf3f779aa	Editor: added game creation and deletion	2025-12-28 12:51:43 +01:00
Jonas Kappa	48bc66b89a	Added deletion and renaming of files and deletion of directories	2025-12-23 17:42:33 +01:00
Jonas Kappa	3a52b85dfb	Added listing of files and directories	2025-12-23 12:25:24 +01:00
Jonas Kappa	7349624da9	Added a RessourceManager for uploading files	2025-12-22 13:03:32 +01:00
Jonas Kappa	25037f4798	Added administration and password change	2025-10-07 23:07:49 +02:00
Jonas Kappa	38eee8b38c	Added settings for changing password	2025-10-04 13:41:40 +02:00