New SQL tables structure

This reverts commit 685bd47fc4.

app.vue

@@ -39,4 +39,8 @@ const { list } = useToast();
 	@apply bg-light-50;
 	@apply dark:bg-dark-50;
 }
+
+::-webkit-scrollbar-corner {
+	@apply bg-transparent;
+}
 </style>

components/Editor.vue

@@ -1,41 +1,157 @@
 <script lang="ts">
-const External = Annotation.define<boolean>();
-</script>
-
-<script setup lang="ts">
-import { dropCursor, crosshairCursor, keymap, EditorView, ViewUpdate, placeholder as placeholderExtension } from '@codemirror/view';
-import { Annotation, EditorState } from '@codemirror/state';
-import { indentOnInput, syntaxHighlighting, defaultHighlightStyle, bracketMatching, foldKeymap } from '@codemirror/language';
-import { history, defaultKeymap, historyKeymap } from '@codemirror/commands';
+import { crosshairCursor, Decoration, dropCursor, EditorView, keymap, ViewPlugin, ViewUpdate, WidgetType, type DecorationSet } from '@codemirror/view';
+import { Annotation, EditorState, RangeValue, SelectionRange, type Range } from '@codemirror/state';
+import { defaultKeymap, history, historyKeymap } from '@codemirror/commands';
+import { bracketMatching, defaultHighlightStyle, foldKeymap, HighlightStyle, indentOnInput, syntaxHighlighting, syntaxTree } from '@codemirror/language';
 import { search, searchKeymap } from '@codemirror/search';
 import { closeBrackets, closeBracketsKeymap, completionKeymap } from '@codemirror/autocomplete';
 import { lintKeymap } from '@codemirror/lint';
+import { markdown, markdownLanguage } from '@codemirror/lang-markdown';
+import { IterMode, Tree } from '@lezer/common';
+import { tags } from '@lezer/highlight';
+const External = Annotation.define<boolean>();
+const Hidden = Decoration.mark({ class: 'hidden' });
+const Bullet = Decoration.mark({ class: '*:hidden before:absolute before:top-2 before:left-0 before:inline-block before:w-2 before:h-2 before:rounded before:bg-light-40 dark:before:bg-dark-40 relative ps-4' });
+const Blockquote = Decoration.line({ class: '*:hidden before:block !ps-4 relative before:absolute before:top-0 before:bottom-0 before:left-0 before:w-1 before:bg-none before:bg-light-30 dark:before:bg-dark-30' });
+
+const TagTag = tags.special(tags.content);
+
+const intersects = (a: {
+    from: number;
+    to: number;
+}, b: {
+    from: number;
+    to: number;
+}) => !(a.to < b.from || b.to < a.from);
+
+const highlight = HighlightStyle.define([
+    { tag: tags.heading1, class: 'text-5xl pt-4 pb-2 after:hidden' },
+    { tag: tags.heading2, class: 'text-4xl pt-4 pb-2 ps-1 leading-loose after:hidden' },
+    { tag: tags.heading3, class: 'text-2xl font-bold pt-1 after:hidden' },
+    { tag: tags.heading4, class: 'text-xl font-semibold pt-1 after:hidden variant-cap' },
+    { tag: tags.meta, color: "#404740" },
+    { tag: tags.link, textDecoration: "underline" },
+    { tag: tags.heading, textDecoration: "underline", fontWeight: "bold" },
+    { tag: tags.emphasis, fontStyle: "italic" },
+    { tag: tags.strong, fontWeight: "bold" },
+    { tag: tags.strikethrough, textDecoration: "line-through" },
+    { tag: tags.keyword, color: "#708" },
+    { tag: TagTag, class: 'cursor-default bg-accent-blue bg-opacity-10 hover:bg-opacity-20 text-accent-blue text-sm px-1 ms-1 pb-0.5 rounded-full rounded-se-none border border-accent-blue border-opacity-30' }
+]);
+
+class Decorator
+{
+    static hiddenNodes: string[] = [
+        'HardBreak',
+        'LinkMark',
+        'EmphasisMark',
+        'CodeMark',
+        'CodeInfo',
+        'URL',
+    ]
+    decorations: DecorationSet;
+    constructor(view: EditorView)
+    {
+        this.decorations = Decoration.set(this.iterate(syntaxTree(view.state), view.visibleRanges, []), true);
+    }
+    update(update: ViewUpdate)
+    {
+        if(!update.docChanged && !update.viewportChanged && !update.selectionSet)
+            return;
+
+        this.decorations = this.decorations.update({
+            filter: (f, t, v) => false,
+            add: this.iterate(syntaxTree(update.state), update.view.visibleRanges, update.state.selection.ranges),
+            sort: true,
+        });
+    }
+    iterate(tree: Tree, visible: readonly {
+        from: number;
+        to: number;
+    }[], selection: readonly SelectionRange[]): Range<Decoration>[]
+    {
+        const decorations: Range<Decoration>[] = [];
+        
+        for (let { from, to } of visible) {
+            tree.iterate({
+                from, to, mode: IterMode.IgnoreMounts,
+                enter: node => {
+                    if(node.node.parent && selection.some(e => intersects(e, node.node.parent!)))
+                        return true;
+
+                    else if(node.name === 'HeaderMark')
+                        decorations.push(Hidden.range(node.from, node.to + 1));
+
+                    else if(Decorator.hiddenNodes.includes(node.name))
+                        decorations.push(Hidden.range(node.from, node.to));
+
+                    else if(node.matchContext(['BulletList', 'ListItem']) && node.name === 'ListMark')
+                        decorations.push(Bullet.range(node.from, node.to + 1));
+
+                    else if(node.matchContext(['Blockquote']))
+                        decorations.push(Blockquote.range(node.from, node.from));
+
+                    return true;
+                },
+            });
+        }
+
+        return decorations;
+    }
+}
+</script>
+
+<script setup lang="ts">
+const { autofocus = false } = defineProps<{
+    placeholder?: string
+    autofocus?: boolean
+}>();
+const model = defineModel<string>();
 
 const editor = useTemplateRef('editor');
 const view = ref<EditorView>();
-const state = ref<EditorState>();
-
-const { placeholder } = defineProps<{
-    placeholder?: string
-}>();
-const model = defineModel<string>();
 
 onMounted(() => {
     if(editor.value)
     {
-        state.value = EditorState.create({
+        view.value = new EditorView({
             doc: model.value,
+            parent: editor.value,
             extensions: [
+                markdown({
+                    base: markdownLanguage,
+                    extensions: {
+                        defineNodes: [
+                            { name: "Tag", style: TagTag },
+                            { name: "TagMark", style: tags.processingInstruction }
+                        ],
+                        parseInline: [{
+                            name: "Tag",
+                            parse(cx, next, pos) {
+                                if (next != 35 || cx.char(pos + 1) == 35) return -1;
+                                let elts = [cx.elt("TagMark", pos, pos + 1)];
+                                for (let i = pos + 1; i < cx.end; i++) {
+                                    let next = cx.char(i);
+                                    if (next == 35)
+                                        return cx.addElement(cx.elt("Tag", pos, i + 1, elts.concat(cx.elt("TagMark", i, i + 1))));
+                                    if (next == 92)
+                                        elts.push(cx.elt("Escape", i, i++ + 2));
+                                    if (next == 32 || next == 9 || next == 10 || next == 13) break;
+                                }
+                                return -1
+                            }
+                        }],
+                    }
+                }),
                 history(),
                 search(),
                 dropCursor(),
                 EditorState.allowMultipleSelections.of(true),
                 indentOnInput(),
-                syntaxHighlighting(defaultHighlightStyle, { fallback: true }),
+                syntaxHighlighting(highlight),
                 bracketMatching(),
                 closeBrackets(),
                 crosshairCursor(),
-                placeholderExtension(placeholder ?? ''),
                 EditorView.lineWrapping,
                 keymap.of([
                     ...closeBracketsKeymap,
@@ -53,19 +169,24 @@ onMounted(() => {
                     }
                 }),
                 EditorView.contentAttributes.of({spellcheck: "true"}),
+                ViewPlugin.fromClass(Decorator, {
+                    decorations: e => e.decorations,
+                })
             ]
         });
-        view.value = new EditorView({
-            state: state.value,
-            parent: editor.value,
-        });
+
+        if(autofocus)
+        {
+            view.value.focus();
+        }
     }
-})
+});
 
 onBeforeUnmount(() => {
-    if (view.value) {
-        view.value?.destroy()
-        view.value = undefined
+    if (view.value)
+    {
+        view.value?.destroy();
+        view.value = undefined;
     }
 });
 
@@ -81,21 +202,34 @@ watchEffect(() => {
         });
     }
 });
+
+defineExpose({ focus: () => editor.value?.focus() });
 </script>
 
 <template>
-    <div ref="editor" class="flex flex-1 w-full justify-stretch items-stretch border border-light-35 dark:border-dark-35 caret-light-100 dark:caret-dark-100 py-2 px-1.5 font-sans text-base" />
+    <div ref="editor" class="flex flex-1 w-full justify-stretch items-stretch py-2 px-1.5 font-sans text-base"></div>
 </template>
 
 <style>
+.variant-cap
+{
+    font-variant: small-caps;
+}
 .cm-editor
 {
     @apply bg-transparent;
-    @apply flex-1;
+    @apply flex-1 h-full;
+    @apply font-sans;
+
+    @apply text-light-100 dark:text-dark-100;
 }
 .cm-editor .cm-content
 {
-    @apply caret-light-100;
-    @apply dark:caret-dark-100;
+    @apply caret-light-100 dark:caret-dark-100;
+}
+.cm-line
+{
+    @apply text-base;
+    @apply font-sans;
 }
 </style>

components/FramedEditor.vue

@@ -0,0 +1,40 @@
+<template>
+    <Editor ref="editor" v-model="model" autofocus :gutters="false" />
+    <iframe ref="iframe" class="w-full h-full border-0" sandbox="allow-same-origin allow-scripts"></iframe>
+</template>
+
+<script setup lang="ts">
+const model = defineModel<string>();
+const editor = useTemplateRef('editor'), iframe = useTemplateRef('iframe');
+
+onMounted(() => {
+    if(iframe.value && iframe.value.contentDocument && editor.value)
+    {
+        editor.value.$el.remove();
+
+        iframe.value.contentDocument.documentElement.setAttribute('class', document.documentElement.getAttribute('class') ?? '');
+        iframe.value.contentDocument.documentElement.setAttribute('style', document.documentElement.getAttribute('style') ?? '');
+
+        const base = iframe.value.contentDocument.head.appendChild(iframe.value.contentDocument.createElement('base'));
+        base.setAttribute('href', window.location.href);
+
+        for(let element of document.getElementsByTagName('link'))
+        {
+            if(element.getAttribute('rel') === 'stylesheet')
+                iframe.value.contentDocument.head.appendChild(element.cloneNode(true));
+        }
+
+        for(let element of document.getElementsByTagName('style'))
+        {
+            iframe.value.contentDocument.head.appendChild(element.cloneNode(true));
+        }
+
+        iframe.value.contentDocument.body.setAttribute('class', document.body.getAttribute('class') ?? '');
+        iframe.value.contentDocument.body.setAttribute('style', document.body.getAttribute('style') ?? '');
+
+        iframe.value.contentDocument.body.appendChild(editor.value.$el);
+
+        editor.value.focus();
+    }
+});
+</script>

components/MarkdownRenderer.vue

@@ -8,7 +8,7 @@
 import type { Component } from 'vue';
 import { heading } from 'hast-util-heading';
 import { headingRank } from 'hast-util-heading-rank';
-import { parseId } from '~/shared/general.utils';
+import { parseId } from '~/shared/general.util';
 import type { Root } from 'hast';
 
 const { content, proses, filter } = defineProps<{

components/base/Avatar.vue

@@ -1,5 +1,5 @@
 <template>
-    <AvatarRoot class="inline-flex h-12 w-12 select-none items-center justify-center overflow-hidden align-middle">
+    <AvatarRoot class="inline-flex select-none items-center justify-center overflow-hidden align-middle" :class="SIZES[size]">
         <AvatarImage class="h-full w-full object-cover" :src="src" asChild @loading-status-change="(status) => loading = status === 'loading'">
             <img :src="src" />
         </AvatarImage>
@@ -13,10 +13,18 @@
 
 <script setup lang="ts">
 import { Icon } from '@iconify/vue/dist/iconify.js';
-const { src, icon, text } = defineProps<{
+const { src, icon, text, size = 'medium' } = defineProps<{
     src: string
     icon?: string
     text?: string
+    size?: keyof typeof SIZES
 }>();
 const loading = ref(true);
+</script>
+<script lang="ts">
+const SIZES = {
+    'small': 'h-6',
+    'medium': 'h-10',
+    'large': 'h-16',
+};
 </script>

components/base/Collapsible.vue

@@ -1,7 +1,8 @@
 <template>
     <CollapsibleRoot v-model:open="model" :disabled="disabled" :defaultOpen="defaultOpen">
+        <slot name="alwaysVisible"></slot>
         <div class="flex flex-row justify-center items-center">
-            <span v-if="!!label">{{ label }}</span>
+            <span>{{ label }}<slot name="label"></slot></span>
             <CollapsibleTrigger class="ms-4" asChild>
                 <Button icon :disabled="disabled">
                     <Icon v-if="model" icon="radix-icons:cross-2" class="h-4 w-4" />
@@ -9,7 +10,6 @@
                 </Button>
             </CollapsibleTrigger>
         </div>
-        <slot name="alwaysVisible"></slot>
         <CollapsibleContent class="overflow-hidden data-[state=closed]:animate-[collapseClose_0.2s_ease-in-out] data-[state=open]:animate-[collapseOpen_0.2s_ease-in-out]">
             <slot></slot>
         </CollapsibleContent>

components/base/Combobox.vue

@@ -0,0 +1,45 @@
+<template>
+    <Label class="my-2 flex flex-1 items-center justify-between flex-col md:flex-row">
+        <span class="pb-1 md:p-0">{{ label }}</span>
+        <ComboboxRoot v-model:model-value="model" v-model:open="open" :multiple="multiple">
+            <ComboboxAnchor  :disabled="disabled" class="mx-4 inline-flex min-w-[150px] items-center justify-between px-3 text-sm font-semibold leading-none h-8 gap-1
+                bg-light-20 dark:bg-dark-20 border border-light-35 dark:border-dark-35 outline-none data-[placeholder]:font-normal
+                data-[placeholder]:text-light-50 dark:data-[placeholder]:text-dark-50 focus:shadow-raw transition-[box-shadow] focus:shadow-light-40 dark:focus:shadow-dark-40
+                hover:border-light-50 dark:hover:border-dark-50">
+                <ComboboxTrigger class="flex flex-1 justify-between !cursor-pointer">
+                    <span v-if="!multiple">{{ model !== undefined ? options.find(e => e[1] === model)![0] : "" }}</span>
+                    <span class="flex gap-2" v-else><span v-if="model !== undefined">{{ options.find(e => e[1] === (model as T[])[0]) !== undefined ? options.find(e => e[1] === (model as T[])[0])![0] : undefined }}</span><span v-if="model !== undefined && (model as T[]).length > 1">{{((model as T[]).length > 1 ? `+${(model as T[]).length - 1}` : "") }}</span></span>
+                    <Icon icon="radix-icons:caret-down" class="h-4 w-4" />
+                </ComboboxTrigger>
+            </ComboboxAnchor>
+
+            <ComboboxPortal :disabled="disabled">
+                <ComboboxContent :position="position" align="start" class="min-w-[150px] bg-light-20 dark:bg-dark-20 will-change-[opacity,transform] z-50">
+                    <ComboboxViewport>
+                        <ComboboxItem v-for="[label, value] of options" :value="value" :disabled="disabled" class="text-base py-2 leading-none text-light-60 dark:text-dark-60 flex items-center px-6 relative Combobox-none data-[disabled]:text-light-50 dark:data-[disabled]:text-dark-50 data-[disabled]:pointer-events-none data-[highlighted]:outline-none data-[highlighted]:bg-light-30 dark:data-[highlighted]:bg-dark-30 data-[highlighted]:text-light-100 dark:data-[highlighted]:text-dark-100">
+                            <span class="">{{ label }}</span>
+                            <ComboboxItemIndicator class="absolute left-1 w-4 inline-flex items-center justify-center">
+                                <Icon icon="radix-icons:check" />
+                            </ComboboxItemIndicator>
+                        </ComboboxItem>
+                    </ComboboxViewport>
+                </ComboboxContent>
+            </ComboboxPortal>
+        </ComboboxRoot>
+    </Label>
+</template>
+
+<script setup lang="ts" generic="T extends string | number | boolean | Record<string, any>">
+import { ComboboxInput, ComboboxTrigger, ComboboxViewport, ComboboxContent, ComboboxPortal, ComboboxRoot } from 'radix-vue'
+import { Icon } from '@iconify/vue/dist/iconify.js';
+const { disabled = false, position = 'popper', multiple = false } = defineProps<{
+	placeholder?: string
+    disabled?: boolean
+    position?: 'inline' | 'popper'
+    label?: string
+    multiple?: boolean
+    options: Array<[string, T]>
+}>();
+const open = ref(false);
+const model = defineModel<T | T[]>();
+</script>

components/base/DraggableTree.vue

@@ -1,6 +1,6 @@
 <template>
 	<TreeRoot v-bind="forward" v-slot="{ flattenItems }" class="list-none select-none text-light-100 dark:text-dark-100 overflow-auto max-h-full">
-		<DraggableTreeItem v-for="item in flattenItems" :key="item._id" v-bind="item" class="flex items-center outline-none relative cursor-pointer hover:bg-light-20 dark:hover:bg-dark-20 data-[selected]:bg-light-35 dark:data-[selected]:bg-dark-35" @select.prevent @toggle.prevent>
+		<DraggableTreeItem v-for="item in flattenItems" :key="item._id" v-bind="item" class="group flex items-center outline-none relative cursor-pointer max-w-full" @select.prevent @toggle.prevent>
 			<template #default="{ handleToggle, handleSelect, isExpanded, isSelected, isDragging, isDraggedOver }">
 				<slot :handleToggle="handleToggle"
 						:handleSelect="handleSelect"

components/base/HoverCard.vue

@@ -4,7 +4,7 @@
             <slot></slot>
         </HoverCardTrigger>
         <HoverCardPortal v-if="!disabled">
-            <HoverCardContent :class="$attrs.class" :side="side"  class="max-h-[var(--radix-hover-card-content-available-height)] data-[side=bottom]:animate-slideUpAndFade data-[side=right]:animate-slideLeftAndFade data-[side=left]:animate-slideRightAndFade data-[side=top]:animate-slideDownAndFade w-[300px] bg-light-10 dark:bg-dark-10 border border-light-35 dark:border-dark-35 p-5 data-[state=open]:transition-all text-light-100 dark:text-dark-100" >
+            <HoverCardContent :class="$attrs.class" :side="side" :align="align" avoidCollisions :collisionPadding="20" class="max-h-[var(--radix-hover-card-content-available-height)] data-[side=bottom]:animate-slideUpAndFade data-[side=right]:animate-slideLeftAndFade data-[side=left]:animate-slideRightAndFade data-[side=top]:animate-slideDownAndFade w-[300px] bg-light-10 dark:bg-dark-10 border border-light-35 dark:border-dark-35 p-5 data-[state=open]:transition-all text-light-100 dark:text-dark-100" >
                 <slot name="content"></slot>
                 <HoverCardArrow class="fill-light-35 dark:fill-dark-35" />
             </HoverCardContent>
@@ -13,11 +13,24 @@
 </template>
 
 <script setup lang="ts">
-const { delay = 500, disabled = false, side = 'bottom' } = defineProps<{
+const { delay = 500, disabled = false, side = 'bottom', align = 'center', triggerKey } = defineProps<{
     delay?: number
     disabled?: boolean
     side?: 'top' | 'right' | 'bottom' | 'left'
+    align?: 'start' | 'center' | 'end'
+    triggerKey?: string
 }>();
 
-const emits = defineEmits(['open'])
+const emits = defineEmits(['open']);
+const canOpen = ref(true);
+
+if(triggerKey)
+{
+    const magicKeys = useMagicKeys();
+    const keys = magicKeys[triggerKey];
+
+    watch(keys, (v) => {
+        canOpen.value = v;
+    }, { immediate: true, });
+}
 </script>

components/base/Select.vue

@@ -1,7 +1,7 @@
 <template>
     <Label class="my-2 flex flex-1 items-center justify-between flex-col md:flex-row">
         <span class="pb-1 md:p-0">{{ label }}</span>
-        <SelectRoot v-model="model">
+        <SelectRoot v-model="model" :default-value="defaultValue">
             <SelectTrigger :disabled="disabled" class="mx-4 inline-flex min-w-[160px] items-center justify-between px-3 text-sm font-semibold leading-none h-8 gap-1
                 bg-light-20 dark:bg-dark-20 border border-light-35 dark:border-dark-35 outline-none data-[placeholder]:font-normal
                 data-[placeholder]:text-light-50 dark:data-[placeholder]:text-dark-50 focus:shadow-raw transition-[box-shadow] focus:shadow-light-40 dark:focus:shadow-dark-40
@@ -12,7 +12,7 @@
 
             <SelectPortal :disabled="disabled">
                 <SelectContent :position="position"
-                    class="min-w-[160px] bg-light-20 dark:bg-dark-20 will-change-[opacity,transform] z-40">
+                    class="min-w-[160px] bg-light-20 dark:bg-dark-20 will-change-[opacity,transform] z-50">
                     <SelectScrollUpButton>
                         <Icon icon="radix-icons:chevron-up" />
                     </SelectScrollUpButton>
@@ -31,11 +31,12 @@
 <script setup lang="ts">
 import { SelectContent, SelectPortal, SelectRoot, SelectScrollDownButton, SelectScrollUpButton, SelectTrigger, SelectValue, SelectViewport } from 'radix-vue'
 import { Icon } from '@iconify/vue/dist/iconify.js';
-const { placeholder, disabled = false, position = 'popper', label } = defineProps<{
+const { disabled = false, position = 'popper' } = defineProps<{
 	placeholder?: string
     disabled?: boolean
     position?: 'item-aligned' | 'popper'
     label?: string
+    defaultValue?: string
 }>();
 const model = defineModel<string>();
 </script>

components/base/SelectItem.vue

@@ -12,7 +12,7 @@ import { Icon } from '@iconify/vue/dist/iconify.js';
 import { SelectItem, SelectItemIndicator, SelectItemText } from 'radix-vue'
 const { disabled = false, value } = defineProps<{
     disabled?: boolean
-    value: NonNullable<any>
+    value: NonNullable<string>
     label: string
 }>();
 </script>

components/base/Tree.vue

@@ -1,6 +1,6 @@
 <template>
-    <TreeRoot v-slot="{ flattenItems }" class="list-none select-none text-light-100 dark:text-dark-100 p-2 xl:text-base text-sm" :items="model" :get-key="getKey" :defaultExpanded="flatten(model)">
-        <TreeItem v-for="item in flattenItems" v-slot="{ isExpanded }" :key="item._id" :style="{ 'padding-left': `${item.level - 0.5}em` }" v-bind="item.bind" class="flex items-center px-2 outline-none relative cursor-pointer">
+    <TreeRoot v-slot="{ flattenItems }" class="list-none select-none text-light-100 dark:text-dark-100 text-sm" :items="model" :get-key="getKey" :defaultExpanded="flatten(model)">
+        <TreeItem v-for="item in flattenItems" v-slot="{ isExpanded }" :key="item._id" :style="{ 'padding-left': `${item.level / 2 - 0.5}em` }" v-bind="item.bind" class="flex items-center ps-2 outline-none relative cursor-pointer">
             <slot :isExpanded="isExpanded" :item="item" />
         </TreeItem>
     </TreeRoot>

components/canvas/CanvasEdge.vue

@@ -1,26 +1,42 @@
-<script setup lang="ts">
-import type { Direction, Path } from "~/shared/canvas.util";
-import type { CanvasColor } from "~/types/canvas";
+<template>
+    <div class="absolute overflow-visible">
+        <div v-if="edge.label" :style="{ transform: `${labelPos} translate(-50%, -50%)` }" class="relative bg-light-20 dark:bg-dark-20 border border-light-35 dark:border-dark-35 px-4 py-2 z-20">{{ edge.label }}</div>
+        <svg class="absolute top-0 overflow-visible h-px w-px">
+            <g :style="{'--canvas-color': edge.color?.hex}" class="z-0">
+                <g :style="`transform: translate(${path!.to.x}px, ${path!.to.y}px) scale(var(--zoom-multiplier)) rotate(${rotation[path!.side]}deg);`">
+                    <polygon :class="style.fill" points="0,0 6.5,10.4 -6.5,10.4"></polygon>
+                </g>
+                <path :style="`stroke-width: calc(3px * var(--zoom-multiplier));`" style="stroke-linecap: butt;" :class="style.stroke" class="fill-none stroke-[4px]" :d="path!.path"></path>
+            </g>
+        </svg>
+    </div>
+</template>
 
-const props = defineProps<{
-    path: Path;
-    color?: CanvasColor;
-    label?: string;
+<style>
+.fill-colored
+{
+    --tw-bg-opacity: 1;
+    fill: rgba(from var(--canvas-color) r g b / var(--tw-bg-opacity));
+}
+</style>
+<script setup lang="ts">
+import { getPath, labelCenter, rotation } from '#shared/canvas.util';
+import type { CanvasEdge, CanvasNode } from '~/types/canvas';
+
+const { edge, nodes } = defineProps<{
+    edge: CanvasEdge
+    nodes: CanvasNode[]
 }>();
 
-const rotation: Record<Direction, string> = {
-    top: "180",
-    bottom: "0",
-    left: "90",
-    right: "270"
-};
-</script>
+const from = computed(() => nodes!.find(f => f.id === edge.fromNode));
+const to = computed(() => nodes!.find(f => f.id === edge.toNode));
+const path = computed(() => getPath(from.value!, edge.fromSide, to.value!, edge.toSide));
+const labelPos = computed(() => labelCenter(from.value!, edge.fromSide, to.value!, edge.toSide));
 
-<template>
-    <g :style="{'--canvas-color': color?.hex}" class="z-0">
-        <path :style="`stroke-linecap: butt; stroke-width: calc(3px * var(--zoom-multiplier));`" :class="color?.class ? `stroke-light-${color.class} dark:stroke-dark-${color.class}` : ((color && color?.hex !== undefined) ? 'stroke-[color:var(--canvas-color)]' : 'stroke-light-40 dark:stroke-dark-40')" class="fill-none stroke-[4px]" :d="path.path"></path>
-        <g :style="`transform: translate(${path.to.x}px, ${path.to.y}px) scale(var(--zoom-multiplier)) rotate(${rotation[path.side]}deg);`">
-            <polygon :class="color?.class ? `fill-light-${color.class} dark:fill-dark-${color.class}` : ((color && color?.hex !== undefined) ? 'fill-[color:var(--canvas-color)]' : 'fill-light-40 dark:fill-dark-40')" points="0,0 6.5,10.4 -6.5,10.4"></polygon>
-        </g>
-    </g>
-</template>
+const style = computed(() => {
+    return edge.color ? edge.color?.class ? 
+        { fill: `fill-light-${edge.color?.class} dark:fill-dark-${edge.color?.class}`, stroke: `stroke-light-${edge.color?.class} dark:stroke-dark-${edge.color?.class}` } : 
+        { fill: `fill-colored`, stroke: `stroke-[color:var(--canvas-color)]` } : 
+        { stroke: `stroke-light-40 dark:stroke-dark-40`, fill: `fill-light-40 dark:fill-dark-40` }
+});
+</script>

components/canvas/CanvasEdgeEditor.vue

@@ -0,0 +1,98 @@
+<template>
+    <div class="absolute overflow-visible group" :class="{ 'z-[1]': focusing }">
+        <input v-autofocus v-if="editing" @click="e => e.stopImmediatePropagation()" :style="{ transform: `${labelPos} translate(-50%, -50%)` }" class="relative bg-light-20 dark:bg-dark-20 border border-light-35 dark:border-dark-35 px-4 py-2 z-20" v-model="edge.label" />
+        <div v-else-if="edge.label" :style="{ transform: `${labelPos} translate(-50%, -50%)` }" class="relative bg-light-20 dark:bg-dark-20 border border-light-35 dark:border-dark-35 px-4 py-2 z-20" @click.left="select" @dblclick.left="edit">{{ edge.label }}</div>
+        <svg ref="dom" class="absolute top-0 overflow-visible h-px w-px">
+            <g :style="{'--canvas-color': edge.color?.hex}" class="z-0">
+                <g :style="`transform: translate(${path.to.x}px, ${path.to.y}px) scale(var(--zoom-multiplier)) rotate(${rotation[path.side]}deg);`">
+                    <polygon :class="style.fill" points="0,0 6.5,10.4 -6.5,10.4"></polygon>
+                </g>
+                <path :style="`stroke-width: calc(${focusing ? 6 : 3}px * var(--zoom-multiplier));`" style="stroke-linecap: butt;" :class="style.stroke" class="transition-[stroke-width] fill-none stroke-[4px]" :d="path.path"></path>
+                <path style="stroke-width: calc(22px * var(--zoom-multiplier));" class="fill-none transition-opacity z-30 opacity-0 hover:opacity-25" :class="[style.stroke, { 'opacity-25': focusing }]" :d="path.path" @click="select" @dblclick="edit"></path>
+            </g>
+        </svg>
+        <span v-if="focusing && !editing" :style="`transform: translate(${path.from.x}px, ${path.from.y}px) translate(-50%, -50%) scale(var(--zoom-multiplier))`" @mousedown.left="(e) => dragEdge(e, 'from')" :class="style.fill" class="hidden group-hover:block z-[31] absolute rounded-full border-2 border-light-70 dark:border-dark-70 bg-light-30 dark:bg-dark-30 w-6 h-6"></span>
+        <span v-if="focusing && !editing" :style="`transform: translate(${path.to.x}px, ${path.to.y}px) translate(-50%, -50%) scale(var(--zoom-multiplier))`" @mousedown.left="(e) => dragEdge(e, 'to')" :class="style.fill" class="hidden group-hover:block z-[31] absolute rounded-full border-2 border-light-70 dark:border-dark-70 bg-light-30 dark:bg-dark-30 w-6 h-6"></span>
+    </div>
+</template>
+
+<style>
+.fill-colored
+{
+    --tw-bg-opacity: 1;
+    fill: rgba(from var(--canvas-color) r g b / var(--tw-bg-opacity));
+}
+</style>
+<script setup lang="ts">
+import { getPath, labelCenter, rotation } from '#shared/canvas.util';
+import type { Element } from '../CanvasEditor.vue';
+import type { CanvasEdge, CanvasNode } from '~/types/canvas';
+
+const { edge, nodes } = defineProps<{
+    edge: CanvasEdge
+    nodes: CanvasNode[]
+}>();
+
+const emit = defineEmits<{
+    (e: 'select', id: Element): void,
+    (e: 'edit', id: Element): void,
+    (e: 'drag', id: string, _e: MouseEvent, origin: 'from' | 'to'): void,
+    (e: 'input', id: string, text?: string): void,
+}>();
+
+const dom = useTemplateRef('dom');
+const focusing = ref(false), editing = ref(false);
+
+const from = computed(() => nodes!.find(f => f.id === edge.fromNode));
+const to = computed(() => nodes!.find(f => f.id === edge.toNode));
+const path = computed(() => getPath(from.value!, edge.fromSide, to.value!, edge.toSide)!);
+const labelPos = computed(() => labelCenter(from.value!, edge.fromSide, to.value!, edge.toSide));
+
+let oldText = edge.label;
+
+function select(e: Event) {
+    if(editing.value)
+        return;
+
+    focusing.value = true;
+    emit('select', { type: 'edge', id: edge.id });
+}
+function edit(e: Event) {
+    oldText = edge.label;
+
+    focusing.value = true;
+    editing.value = true;
+
+    e.stopImmediatePropagation();
+    emit('edit', { type: 'edge', id: edge.id });
+}
+function dragEdge(e: MouseEvent, origin: 'from' | 'to') {
+    e.stopImmediatePropagation();
+
+    emit('drag', edge.id, e, origin);
+}
+function unselect() {
+    if(editing.value)
+    {
+        const text = edge.label;
+        
+        if(text !== oldText)
+        {
+            edge.label = oldText;
+
+            emit('input', edge.id, text);
+        }
+    }
+    focusing.value = false;
+    editing.value = false;
+}
+
+defineExpose({ unselect, dom, id: edge.id, path });
+
+const style = computed(() => {
+    return edge.color ? edge.color?.class ? 
+        { fill: `fill-light-${edge.color?.class} dark:fill-dark-${edge.color?.class}`, stroke: `stroke-light-${edge.color?.class} dark:stroke-dark-${edge.color?.class}`, outline: `outline-light-${edge.color?.class} dark:outline-dark-${edge.color?.class}` } : 
+        { fill: `fill-colored`, stroke: `stroke-[color:var(--canvas-color)]`, outline: `outline-[color:var(--canvas-color)]` } : 
+        { stroke: `stroke-light-40 dark:stroke-dark-40`, fill: `fill-light-40 dark:fill-dark-40`, outline: `outline-light-40 dark:outline-dark-40` }
+});
+</script>

components/canvas/CanvasNode.vue

@@ -1,26 +1,15 @@
-<script setup lang="ts">
-import { Icon } from '@iconify/vue/dist/iconify.js';
-import type { CanvasNode } from '~/types/canvas';
-
-interface Props {
-    node: CanvasNode;
-}
-
-const props = defineProps<Props>();
-
-const size = Math.max(props.node.width, props.node.height);
-const colors = computed(() => {
-    if(props.node.color)
-    {
-        const color = props.node.color;
-        return color?.class ? { bg: `bg-light-${color?.class} dark:bg-dark-${color?.class}`, border: `border-light-${color?.class} dark:border-dark-${color?.class}`} : { bg: `bg-colored`, border: `border-[color:var(--canvas-color)]` };
-    }
-    else
-    {
-        return { border: `border-light-40 dark:border-dark-40`, bg: `bg-light-40 dark:bg-dark-40` };
-    }
-})
-</script>
+<template>
+    <div class="absolute" :style="{transform: `translate(${node.x}px, ${node.y}px)`, width: `${node.width}px`, height: `${node.height}px`, '--canvas-color': node.color?.hex}" :class="{'-z-10': node.type === 'group', 'z-10': node.type !== 'group'}">
+        <div :class="[style.border]" class="outline-0 transition-[outline-width] border-2 bg-light-20 dark:bg-dark-20 w-full h-full hover:outline-4">
+            <div class="w-full h-full py-2 px-4 flex !bg-opacity-[0.07] overflow-auto" :class="style.bg">
+                <div v-if="node.text?.length > 0" class="flex items-center">
+                    <MarkdownRenderer :content="node.text" />
+                </div>
+            </div>
+        </div>
+        <div v-if="node.type === 'group' && node.label !== undefined" :class="style.border" style="max-width: 100%; font-size: calc(18px * var(--zoom-multiplier))" class="origin-bottom-left tracking-wider border-4 truncate inline-block text-light-100 dark:text-dark-100 absolute bottom-[100%] mb-2 px-2 py-1 font-thin">{{ node.label }}</div>
+    </div>
+</template>
 
 <style>
 .bg-colored
@@ -29,16 +18,18 @@ const colors = computed(() => {
     background-color: rgba(from var(--canvas-color) r g b / var(--tw-bg-opacity));
 }
 </style>
+<script setup lang="ts">
+import type { CanvasNode } from '~/types/canvas';
 
-<template>
-    <div class="absolute" :style="{transform: `translate(${node.x}px, ${node.y}px)`, width: `${node.width}px`, height: `${node.height}px`, '--canvas-color': node.color?.hex}" :class="{'-z-10': node.type === 'group', 'z-10': node.type !== 'group'}">
-        <div :class="[colors.border]" class="border-2 bg-light-20 dark:bg-dark-20 overflow-hidden contain-strict w-full h-full flex">
-            <div class="w-full h-full py-2 px-4 flex !bg-opacity-[0.07]" :class="colors.bg">
-                <div v-if="node.text?.length > 0" class="flex items-center">
-                    <MarkdownRenderer :content="node.text" />
-                </div>
-            </div>
-        </div>
-        <div v-if="node.type === 'group' && node.label !== undefined" :class="[colors.border]" style="max-width: 100%; font-size: calc(18px * var(--zoom-multiplier))" class="origin-bottom-left tracking-wider border-4 truncate inline-block text-light-100 dark:text-dark-100 absolute bottom-[100%] mb-2 px-2 py-1 font-thin">{{ node.label }}</div>
-    </div>
-</template>
+const { node } = defineProps<{
+    node: CanvasNode
+    zoom: number
+}>();
+
+const style = computed(() => {
+    return node.color ? node.color?.class ? 
+        { bg: `bg-light-${node.color?.class} dark:bg-dark-${node.color?.class}`, border: `border-light-${node.color?.class} dark:border-dark-${node.color?.class}` } : 
+        { bg: `bg-colored`, border: `border-[color:var(--canvas-color)]` } : 
+        { border: `border-light-40 dark:border-dark-40`, bg: `bg-light-40 dark:bg-dark-40` }
+});
+</script>

components/canvas/CanvasNodeEditor.vue

@@ -0,0 +1,190 @@
+<template>
+    <div class="absolute" ref="dom" :style="{transform: `translate(${node.x}px, ${node.y}px)`, width: `${node.width}px`, height: `${node.height}px`, '--canvas-color': node.color?.hex}" :class="{'-z-10': node.type === 'group', 'z-10': node.type !== 'group'}">
+        <div v-if="!editing || node.type === 'group'" style="outline-style: solid;" :class="[style.border, style.outline, { '!outline-4 cursor-move': focusing }]" class="outline-0 transition-[outline-width] border-2 bg-light-20 dark:bg-dark-20 w-full h-full hover:outline-4">
+            <div class="w-full h-full py-2 px-4 flex !bg-opacity-[0.07] overflow-auto" :class="style.bg" @click.left="(e) => { if(node.type !== 'group') selectNode(e) }" @dblclick.left="(e) => { if(node.type !== 'group') editNode(e) }">
+                <div v-if="node.text?.length > 0" class="flex items-center">
+                    <MarkdownRenderer :content="node.text" :proses="{ a: FakeA }" />
+                </div>
+            </div>
+            <div v-if="focusing">
+                <span @mousedown.left="(e) => resizeNode(e, 0, 1, 0, -1)" id="n " class="cursor-n-resize absolute -top-3 -right-3 -left-3  h-6 group">
+                    <span @mousedown.left="(e) => dragEdge(e, 'top')" :class="[style.bg]" class="hidden group-hover:block absolute rounded-full border-2 border-light-70 dark:border-dark-70 w-6 h-6 -top-1.5 left-1/2 -translate-x-3"></span>
+                </span> <!-- North -->
+                <span @mousedown.left="(e) => resizeNode(e, 0, 0, 0, 1)" id="s " class="cursor-s-resize absolute -bottom-3 -right-3 -left-3 h-6 group">
+                    <span @mousedown.left="(e) => dragEdge(e, 'bottom')" :class="[style.bg]" class="hidden group-hover:block absolute rounded-full border-2 border-light-70 dark:border-dark-70 w-6 h-6 -bottom-1.5 left-1/2 -translate-x-3"></span>
+                </span> <!-- South -->
+                <span @mousedown.left="(e) => resizeNode(e, 0, 0, 1, 0)" id="e " class="cursor-e-resize absolute -top-3 -bottom-3 -right-3 w-6 group">
+                    <span @mousedown.left="(e) => dragEdge(e, 'right')" :class="[style.bg]" class="hidden group-hover:block absolute rounded-full border-2 border-light-70 dark:border-dark-70 w-6 h-6 -right-1.5 top-1/2 -translate-y-3"></span>
+                </span> <!-- East -->
+                <span @mousedown.left="(e) => resizeNode(e, 1, 0, -1, 0)" id="w " class="cursor-w-resize absolute -top-3 -bottom-3 -left-3 w-6 group">
+                    <span @mousedown.left="(e) => dragEdge(e, 'left')" :class="[style.bg]" class="hidden group-hover:block absolute rounded-full border-2 border-light-70 dark:border-dark-70 w-6 h-6 -left-1.5 top-1/2 -translate-y-3"></span>
+                </span> <!-- West -->
+                <span @mousedown.left="(e) => resizeNode(e, 1, 1, -1, -1)" id="nw" class="cursor-nw-resize absolute -top-4 -left-4  w-8 h-8"></span> <!-- North West -->
+                <span @mousedown.left="(e) => resizeNode(e, 0, 1, 1, -1)" id="ne" class="cursor-ne-resize absolute -top-4 -right-4 w-8 h-8"></span> <!-- North East -->
+                <span @mousedown.left="(e) => resizeNode(e, 0,  0, 1, 1)" id="se" class="cursor-se-resize absolute -bottom-4 -right-4 w-8 h-8"></span> <!-- South East -->
+                <span @mousedown.left="(e) => resizeNode(e, 1, 0, -1, 1)" id="sw" class="cursor-sw-resize absolute -bottom-4 -left-4  w-8 h-8"></span> <!-- South West -->
+            </div>
+        </div>
+        <div v-else style="outline-style: solid;" :class="[style.border, style.outline, { '!outline-4': focusing }]" class="outline-0 transition-[outline-width] border-2 bg-light-20 dark:bg-dark-20 overflow-hidden contain-strict w-full h-full flex py-2" >
+            <FramedEditor v-model="node.text" autofocus :gutters="false"/>
+        </div>
+        <div v-if="!editing && node.type === 'group' && node.label !== undefined"  @click.left="(e) => selectNode(e)" @dblclick.left="(e) => editNode(e)" :class="style.border" style="max-width: 100%; font-size: calc(18px * var(--zoom-multiplier))" class="origin-bottom-left tracking-wider border-4 truncate inline-block text-light-100 dark:text-dark-100 absolute bottom-[100%] mb-2 px-2 py-1 font-thin">{{ node.label }}</div>
+        <input v-else-if="editing && node.type === 'group'" v-model="node.label" @click="e => e.stopImmediatePropagation()" v-autofocus :class="[style.border, style.outline]" style="max-width: 100%; font-size: calc(18px * var(--zoom-multiplier))" class="origin-bottom-left tracking-wider border-4 truncate inline-block text-light-100 dark:text-dark-100 absolute bottom-[100%] appearance-none bg-transparent outline-4 mb-2 px-2 py-1 font-thin min-w-4" />
+    </div>
+</template>
+
+<style>
+.bg-colored
+{
+    --tw-bg-opacity: 1;
+    background-color: rgba(from var(--canvas-color) r g b / var(--tw-bg-opacity));
+}
+</style>
+<script setup lang="ts">
+import type { Box, Direction } from '#shared/canvas.util';
+import type { Element } from '../CanvasEditor.vue';
+import FakeA from '../prose/FakeA.vue';
+import type { CanvasNode } from '~/types/canvas';
+
+const { node, zoom, snap } = defineProps<{
+    node: CanvasNode
+    zoom: number,
+    snap: (activeNode: CanvasNode, resizeHandle?: Box) => Partial<Box>,
+}>();
+
+const emit = defineEmits<{
+    (e: 'select', id: Element): void,
+    (e: 'edit', id: Element): void,
+    (e: 'move', id: string, x: number, y: number): void,
+    (e: 'resize', id: string, x: number, y: number, w: number, h: number): void,
+    (e: 'input', id: string, text: string): void,
+    (e: 'edge', id: string, _e: MouseEvent, side: Direction): void,
+}>();
+
+const dom = useTemplateRef('dom');
+const focusing = ref(false), editing = ref(false);
+let oldText = node.type === 'group' ? node.label : node.text;
+
+function selectNode(e: Event) {
+    if(editing.value)
+        return;
+
+    focusing.value = true;
+    emit('select', { type: 'node', id: node.id });
+
+    dom.value?.addEventListener('mousedown', dragstart, { passive: true });
+}
+function editNode(e: Event) {
+    focusing.value = true;
+    editing.value = true;
+
+    oldText = node.type === 'group' ? node.label : node.text;
+
+    e.stopImmediatePropagation();
+
+    dom.value?.removeEventListener('mousedown', dragstart);
+    emit('edit', { type: 'node', id: node.id });
+}
+function resizeNode(e: MouseEvent, x: number, y: number, w: number, h: number) {
+    e.stopImmediatePropagation();
+
+    const startx = node.x, starty = node.y, startw = node.width, starth = node.height;
+    let realx = node.x, realy = node.y, realw = node.width, realh = node.height;
+    const resizemove = (e: MouseEvent) => {
+        if(e.button !== 0)
+            return;
+
+        realx = realx + (e.movementX / zoom) * x;
+        realy = realy + (e.movementY / zoom) * y;
+        realw = Math.max(realw + (e.movementX / zoom) * w, 64);
+        realh = Math.max(realh + (e.movementY / zoom) * h, 64);
+
+        const result = e.altKey ? undefined : snap({ ...node, x: realx, y: realy, width: realw, height: realh }, { x, y, w, h });
+
+        node.x = result?.x ?? realx;
+        node.y = result?.y ?? realy;
+        node.width = result?.w ?? realw;
+        node.height = result?.h ?? realh;
+    };
+    const resizeend = (e: MouseEvent) => {
+        if(e.button !== 0)
+            return;
+
+        emit('resize', node.id, node.x - startx, node.y - starty, node.width - startw, node.height - starth);
+
+        window.removeEventListener('mousemove', resizemove);
+        window.removeEventListener('mouseup', resizeend);
+    }
+
+    window.addEventListener('mousemove', resizemove);
+    window.addEventListener('mouseup', resizeend);
+}
+function dragEdge(e: MouseEvent, direction: Direction) {
+    e.stopImmediatePropagation();
+
+    emit('edge', node.id, e, direction)
+}
+function unselect() {
+    if(editing.value)
+    {
+        const text = node.type === 'group' ? node.label : node.text;
+        
+        if(text !== oldText)
+        {
+            if(node.type === 'group')
+                node.label = oldText;
+            else
+                node.text = oldText;
+
+            emit('input', node.id, text);
+        }
+    }
+    focusing.value = false;
+    editing.value = false;
+
+    dom.value?.removeEventListener('mousedown', dragstart);
+}
+
+let lastx = 0, lasty = 0;
+let realx = 0, realy = 0;
+const dragmove = (e: MouseEvent) => {
+    if(e.button !== 0)
+        return;
+
+    realx += e.movementX / zoom;
+    realy += e.movementY / zoom;
+
+    const result = e.altKey ? undefined : snap({ ...node, x: realx, y: realy });
+
+    node.x = result?.x ?? realx;
+    node.y = result?.y ?? realy;
+};
+const dragend = (e: MouseEvent) => {
+    if(e.button !== 0)
+        return;
+    
+    window.removeEventListener('mousemove', dragmove);
+    window.removeEventListener('mouseup', dragend);
+
+    emit('move', node.id, node.x - lastx, node.y - lasty);
+};
+const dragstart = (e: MouseEvent) => {
+    if(e.button !== 0)
+        return;
+    
+    lastx = node.x, lasty = node.y;
+    realx = node.x, realy = node.y;
+
+    window.addEventListener('mousemove', dragmove, { passive: true });
+    window.addEventListener('mouseup', dragend, { passive: true });
+};
+
+defineExpose({ unselect, dom, id: node.id });
+
+const style = computed(() => {
+    return node.color ? node.color?.class ? 
+        { bg: `bg-light-${node.color?.class} dark:bg-dark-${node.color?.class}`, border: `border-light-${node.color?.class} dark:border-dark-${node.color?.class}`, outline: `outline-light-${node.color?.class} dark:outline-dark-${node.color?.class}` } : 
+        { bg: `bg-colored`, border: `border-[color:var(--canvas-color)]`, outline: `outline-[color:var(--canvas-color)]` } : 
+        { border: `border-light-40 dark:border-dark-40`, bg: `bg-light-40 dark:bg-dark-40`, outline: `outline-light-40 dark:outline-dark-40` }
+});
+</script>

components/canvas/CanvasRenderer.vue

@@ -1,41 +0,0 @@
-<template>
-    <div class="absolute top-0 left-0 w-full h-full origin-center pointer-events-none *:pointer-events-auto *:select-none" v-if="canvas">
-        <div>
-            <CanvasNode v-for="node of canvas.nodes" :key="node.id" :node="node" />
-        </div>
-        <template v-for="edge of canvas.edges">
-            <div :key="edge.id" v-if="edge.label" class="absolute z-10"
-                :style="{ transform: labelCenter(getNode(canvas.nodes, edge.fromNode)!, edge.fromSide, getNode(canvas.nodes, edge.toNode)!, edge.toSide) }">
-                <div class="relative bg-light-20 dark:bg-dark-20 border border-light-35 dark:border-dark-35 px-4 py-2 -translate-x-[50%] -translate-y-[50%]">{{ edge.label }}</div>
-            </div>
-        </template>
-        <svg class="absolute top-0 left-0 overflow-visible w-full h-full origin-top pointer-events-none">
-            <CanvasEdge v-for="edge of canvas.edges" :key="edge.id"
-                :path="getPath(getNode(canvas.nodes, edge.fromNode)!, edge.fromSide, getNode(canvas.nodes, edge.toNode)!, edge.toSide)!"
-                :color="edge.color" :label="edge.label" />
-        </svg>
-    </div>
-</template>
-
-<script setup lang="ts">
-import { labelCenter, getNode, getPath } from '#shared/canvas.util';
-import type { CanvasContent } from '~/types/content';
-import type { CanvasContent as Canvas } from '~/types/canvas';
-
-const { path } = defineProps<{
-    path: string
-}>();
-
-const { content, get } = useContent();
-const overview = computed(() => content.value.find(e => e.path === path) as CanvasContent | undefined);
-
-const loading = ref(false);
-if(overview.value && !overview.value.content)
-{
-    loading.value = true;
-    await get(path);
-    loading.value = false;
-}
-const canvas = computed(() => overview.value && overview.value.content ? JSON.parse(overview.value.content) as Canvas : undefined);
-
-</script>

components/page/Canvas.vue

@@ -1,23 +1,26 @@
-<script setup lang="ts">
-import { useDrag, useHover, usePinch, useWheel } from '@vueuse/gesture';
-import { Icon } from '@iconify/vue/dist/iconify.js';
-import { clamp } from '#shared/general.utils';
+<script lang="ts">
+import { type Position } from '#shared/canvas.util';
+import { hasPermissions } from '~/shared/auth.util';
 
-const { path } = defineProps<{ path: string }>();
-const { user } = useUserSession();
-const { content } = useContent();
-const overview = computed(() => content.value.find(e => e.path === path));
+const cancelEvent = (e: Event) => e.preventDefault();
+function center(touches: TouchList): Position
+{
+    const pos = { x: 0, y: 0 };
 
-const isOwner = computed(() => user.value?.id === overview.value?.owner);
+    for(const touch of touches)
+    {
+        pos.x += touch.clientX;
+        pos.y += touch.clientY;
+    }
 
-const dispX = ref(0), dispY = ref(0), minZoom = ref(0.1), zoom = ref(0.5);
-const canvasRef = useTemplateRef('canvasRef');
-
-const reset = (_: MouseEvent) => {
-    zoom.value = minZoom.value; 
-
-    dispX.value = 0; 
-    dispY.value = 0;
+    pos.x /= touches.length;
+    pos.y /= touches.length;
+    return pos;
+}
+function distance(touches: TouchList): number
+{
+    const [A, B] = touches;
+    return Math.hypot(B.clientX - A.clientX, B.clientY - A.clientY);
 }
 
 /*
@@ -84,53 +87,180 @@ dark:outline-dark-cyan
 dark:outline-dark-purple
 
 */
+</script>
 
-const cancelEvent = (e: Event) => e.preventDefault()
-useHover(({ hovering }) => {
-    if (!hovering) {
-        //@ts-ignore
-        window.removeEventListener('wheel', cancelEvent, { passive: false });
-        document.removeEventListener('gesturestart', cancelEvent)
-        document.removeEventListener('gesturechange', cancelEvent)
-        return
+<script setup lang="ts">
+import { Icon } from '@iconify/vue/dist/iconify.js';
+import { clamp } from '#shared/general.util';
+import type { CanvasContent } from '~/types/content';
+
+const { path } = defineProps<{
+    path: string
+}>();
+
+const { user } = useUserSession();
+const { content, get } = useContent();
+const overview = computed(() => content.value.find(e => e.path === path) as CanvasContent | undefined);
+const isOwner = computed(() => user.value?.id === overview.value?.owner);
+
+const loading = ref(false);
+if(overview.value && !overview.value.content)
+{
+    loading.value = true;
+    await get(path);
+    loading.value = false;
+}
+const canvas = computed(() => overview.value && overview.value.content ? overview.value.content : undefined);
+console.log(canvas.value);
+
+const dispX = ref(0), dispY = ref(0), minZoom = ref(0.1), zoom = ref(0.5);
+const canvasRef = useTemplateRef('canvasRef'), transformRef = useTemplateRef('transformRef');
+
+const updateScaleVar = useDebounceFn(() => {
+    if(transformRef.value)
+    {
+        transformRef.value.style.setProperty('--tw-scale', zoom.value.toString());
     }
-    
-    window.addEventListener('wheel', cancelEvent, { passive: false });
-    document.addEventListener('gesturestart', cancelEvent)
-    document.addEventListener('gesturechange', cancelEvent)
-}, {
-    domTarget: canvasRef,
+    if(canvasRef.value)
+    {
+        canvasRef.value.style.setProperty('--zoom-multiplier', (1 / Math.pow(zoom.value, 0.7)).toFixed(3));
+    }
+}, 100);
+
+const reset = (_: MouseEvent) => {
+    zoom.value = minZoom.value;
+
+    dispX.value = 0;
+    dispY.value = 0;
+
+    updateTransform();
+}
+
+onMounted(() => {
+    let lastX = 0, lastY = 0, lastDistance = 0;
+    let box = canvasRef.value?.getBoundingClientRect()!;
+    const dragMove = (e: MouseEvent) => {
+        dispX.value = dispX.value - (lastX - e.clientX) / zoom.value;
+        dispY.value = dispY.value - (lastY - e.clientY) / zoom.value;
+
+        lastX = e.clientX;
+        lastY = e.clientY;
+
+        updateTransform();
+    };
+    const dragEnd = (e: MouseEvent) => {
+        window.removeEventListener('mouseup', dragEnd);
+        window.removeEventListener('mousemove', dragMove);
+    };
+    canvasRef.value?.addEventListener('mouseenter', () => { 
+        window.addEventListener('wheel', cancelEvent, { passive: false });
+        document.addEventListener('gesturestart', cancelEvent);
+        document.addEventListener('gesturechange', cancelEvent);
+
+        canvasRef.value?.addEventListener('mouseleave', () => {
+            window.removeEventListener('wheel', cancelEvent);
+            document.removeEventListener('gesturestart', cancelEvent);
+            document.removeEventListener('gesturechange', cancelEvent);
+        });
+    })
+    window.addEventListener('resize', () => box = canvasRef.value?.getBoundingClientRect()!);
+    canvasRef.value?.addEventListener('mousedown', (e) => {
+        lastX = e.clientX;
+        lastY = e.clientY;
+
+        window.addEventListener('mouseup', dragEnd, { passive: true });
+        window.addEventListener('mousemove', dragMove, { passive: true });
+    }, { passive: true });
+    canvasRef.value?.addEventListener('wheel', (e) => {
+        if((zoom.value >= 3 && e.deltaY < 0) || (zoom.value <= minZoom.value && e.deltaY > 0))
+            return;
+
+        const diff = Math.exp(e.deltaY * -0.001);
+        const centerX = (box.x + box.width / 2), centerY = (box.y + box.height / 2);
+        const mousex = centerX - e.clientX, mousey = centerY - e.clientY;
+
+        dispX.value = dispX.value - (mousex / (diff * zoom.value) - mousex / zoom.value);
+        dispY.value = dispY.value - (mousey / (diff * zoom.value) - mousey / zoom.value);
+
+        zoom.value = clamp(zoom.value * diff, minZoom.value, 3)
+
+        updateTransform();
+    }, { passive: true });
+    canvasRef.value?.addEventListener('touchstart', (e) => {
+        ({ x: lastX, y: lastY } = center(e.touches));
+
+        if(e.touches.length > 1)
+        {
+            lastDistance = distance(e.touches);
+        }
+
+        canvasRef.value?.addEventListener('touchend', touchend, { passive: true });
+        canvasRef.value?.addEventListener('touchcancel', touchcancel, { passive: true });
+        canvasRef.value?.addEventListener('touchmove', touchmove, { passive: true });
+    }, { passive: true });
+    const touchend = (e: TouchEvent) => {
+        if(e.touches.length > 1)
+        {
+            ({ x: lastX, y: lastY } = center(e.touches));
+        }
+
+        canvasRef.value?.removeEventListener('touchend', touchend);
+        canvasRef.value?.removeEventListener('touchcancel', touchcancel);
+        canvasRef.value?.removeEventListener('touchmove', touchmove);
+    };
+    const touchcancel = (e: TouchEvent) => {
+        if(e.touches.length > 1)
+        {
+            ({ x: lastX, y: lastY } = center(e.touches));
+        }
+
+        canvasRef.value?.removeEventListener('touchend', touchend);
+        canvasRef.value?.removeEventListener('touchcancel', touchcancel);
+        canvasRef.value?.removeEventListener('touchmove', touchmove);
+    };
+    const touchmove = (e: TouchEvent) => {
+        const pos = center(e.touches);
+        dispX.value = dispX.value - (lastX - pos.x) / zoom.value;
+        dispY.value = dispY.value - (lastY - pos.y) / zoom.value;
+        lastX = pos.x;
+        lastY = pos.y;
+
+        if(e.touches.length === 2)
+        {
+            const dist = distance(e.touches);
+            const diff = dist / lastDistance;
+            lastDistance = dist;
+            
+            zoom.value = clamp(zoom.value * diff, minZoom.value, 3);
+        }
+
+        updateTransform();
+    };
+
+    updateTransform();
 });
 
-const dragHandler = useDrag(({ delta: [x, y] }: { delta: number[] }) => { 
-    dispX.value += x / zoom.value;
-    dispY.value += y / zoom.value;
-}, {
-    domTarget: canvasRef,
-});
-const wheelHandler = useWheel(({ delta: [x, y] }: { delta: number[] }) => { 
-    zoom.value = clamp(zoom.value + y * -0.001, minZoom.value, 3);
-}, {
-    domTarget: canvasRef,
-});
-const pinchHandler = usePinch(({ offset: [z] }: { offset: number[] }) => {
-    zoom.value = clamp(z / 2048, minZoom.value, 3);
-}, {
-    domTarget: canvasRef,
-});
+function updateTransform()
+{
+    if(transformRef.value)
+    {
+        transformRef.value.style.transform = `scale3d(${zoom.value}, ${zoom.value}, 1) translate3d(${dispX.value}px, ${dispY.value}px, 0)`;
+    }
+    updateScaleVar();
+}
 </script>
 
 <template>
-    <div ref="canvasRef" class="absolute top-0 left-0 overflow-hidden w-full h-full touch-none" :style="{ '--zoom-multiplier': (1 / Math.pow(zoom, 0.7)) }">
+    <div ref="canvasRef" class="absolute top-0 left-0 overflow-hidden w-full h-full touch-none">
         <div class="flex flex-col absolute sm:top-2 top-10 left-2 z-[35] overflow-hidden gap-4">
             <div class="border border-light-35 dark:border-dark-35 bg-light-10 dark:bg-dark-10">
                 <Tooltip message="Zoom avant" side="right">
-                    <div @click="zoom = clamp(zoom * 1.1, minZoom, 3)" class="w-8 h-8 flex justify-center items-center p-2 hover:bg-light-30 dark:hover:bg-dark-30 cursor-pointer">
+                    <div @click="zoom = clamp(zoom * 1.1, minZoom, 3); updateTransform()" class="w-8 h-8 flex justify-center items-center p-2 hover:bg-light-30 dark:hover:bg-dark-30 cursor-pointer">
                         <Icon icon="radix-icons:plus" />
                     </div>
                 </Tooltip>
                 <Tooltip message="Reset" side="right">
-                    <div @click="zoom = 1" class="w-8 h-8 flex justify-center items-center p-2 hover:bg-light-30 dark:hover:bg-dark-30 cursor-pointer">
+                    <div @click="zoom = 1; updateTransform();" class="w-8 h-8 flex justify-center items-center p-2 hover:bg-light-30 dark:hover:bg-dark-30 cursor-pointer">
                         <Icon icon="radix-icons:reload" />
                     </div>
                 </Tooltip>
@@ -140,27 +270,28 @@ const pinchHandler = usePinch(({ offset: [z] }: { offset: number[] }) => {
                     </div>
                 </Tooltip>
                 <Tooltip message="Zoom arrière" side="right">
-                    <div @click="zoom = clamp(zoom * 0.9, minZoom, 3)" class="w-8 h-8 flex justify-center items-center p-2 hover:bg-light-30 dark:hover:bg-dark-30 cursor-pointer">
+                    <div @click="zoom = clamp(zoom / 1.1, minZoom, 3); updateTransform()" class="w-8 h-8 flex justify-center items-center p-2 hover:bg-light-30 dark:hover:bg-dark-30 cursor-pointer">
                         <Icon icon="radix-icons:minus" />
                     </div>
                 </Tooltip>
             </div>
-            <div class="border border-light-35 dark:border-dark-35 bg-light-10 dark:bg-dark-10" v-if="isOwner">
+            <NuxtLink v-if="overview && isOwner || hasPermissions(user?.permissions ?? [], ['admin', 'editor'])" :to="{ name: 'explore-edit', hash: `#${encodeURIComponent(overview!.path)}` }" class="border border-light-35 dark:border-dark-35 bg-light-10 dark:bg-dark-10">
                 <Tooltip message="Modifier" side="right">
-                    <NuxtLink :to="{ name: 'explore-edit', hash: '#' + path }" class="w-8 h-8 flex justify-center items-center p-2 hover:bg-light-30 dark:hover:bg-dark-30 cursor-pointer">
-                        <Icon icon="radix-icons:pencil-1" />
-                    </NuxtLink>
+                    <Icon icon="radix-icons:pencil-1" class="w-8 h-8 p-2" />
                 </Tooltip>
-            </div>
+            </NuxtLink>
         </div>
-        <div :style="{
-            '--tw-translate-x': `${dispX}px`,
-            '--tw-translate-y': `${dispY}px`,
-            '--tw-scale-x': `${zoom}`,
-            '--tw-scale-y': `${zoom}`,
-            transform: 'scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y)) translate3d(var(--tw-translate-x), var(--tw-translate-y), 0)'
-        }">
-            <CanvasRenderer :path="path"  />
+        <div ref="transformRef" :style="{
+            'transform-origin': 'center center',
+        }" class="h-full">
+            <div v-if="canvas" class="absolute top-0 left-0 w-full h-full pointer-events-none *:pointer-events-auto *:select-none touch-none">
+                <div>
+                    <CanvasNode v-for="node of canvas.nodes" :key="node.id" ref="nodes" :node="node" :zoom="zoom" />
+                </div>
+                <div>
+                    <CanvasEdge v-for="edge of canvas.edges" :key="edge.id" ref="edges" :edge="edge" :nodes="canvas.nodes!" />
+                </div>
+            </div>
         </div>
     </div>
 </template>

components/page/Markdown.vue

@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import { hasPermissions } from '~/shared/auth.util';
+
 
 const { path } = defineProps<{
     path: string
@@ -20,13 +22,13 @@ if(overview.value && !overview.value.content)
 </script>
 
 <template>
-    <div class="flex flex-1 justify-start items-start flex-col xl:px-24 md:px-8 px-4 py-6">
+    <div class="flex flex-1 justify-start items-start flex-col lg:px-16 xl:px-32 2xl:px-64 py-6">
         <Loading v-if="loading" />
         <template v-else-if="overview">
             <div v-if="!popover" class="flex flex-1 flex-row justify-between items-center">
                 <ProseH1>{{ overview.title }}</ProseH1>
                 <div class="flex gap-4">
-                    <NuxtLink :href="{ name: 'explore-edit', hash: '#' + overview.path }" v-if="isOwner"><Button>Modifier</Button></NuxtLink>
+                    <NuxtLink :href="{ name: 'explore-edit', hash: '#' + overview.path }" v-if="isOwner || hasPermissions(user?.permissions ?? [], ['admin', 'editor'])"><Button>Modifier</Button></NuxtLink>
                 </div>
             </div>
             <MarkdownRenderer v-if="overview.content" :content="overview.content" :filter="filter" />

components/prose/FakeA.vue

@@ -1,3 +1,27 @@
 <template>
-    <span class="text-accent-blue inline-flex items-center cursor-pointer hover:text-opacity-85"><slot v-bind="$attrs"></slot></span>
-</template>
+    <span>
+		<HoverCard trigger-key="Ctrl" nuxt-client class="max-w-[600px] max-h-[600px] w-full overflow-auto z-[45]" :class="{'overflow-hidden !p-0': overview?.type === 'canvas'}" :disabled="!overview">
+			<template #content>
+				<Markdown v-if="overview?.type === 'markdown'" class="!px-6" :path="pathname" :filter="hash.substring(1)" popover />
+				<template v-else-if="overview?.type === 'canvas'"><div class="w-[600px] h-[600px] relative"><Canvas :path="pathname" /></div></template>
+			</template>
+			<span>
+                <span class="text-accent-blue inline-flex items-center cursor-pointer hover:text-opacity-85"><slot v-bind="$attrs"></slot></span>
+			</span>
+		</HoverCard>
+	</span>
+</template>
+
+<script setup lang="ts">
+import { parseURL } from 'ufo';
+
+const { href } = defineProps<{
+	href: string
+	class?: string
+}>();
+
+const { hash, pathname } = parseURL(href);
+
+const { content } = useContent();
+const overview = computed(() => content.value.find(e => e.path === pathname));
+</script>

components/prose/PreviewA.vue

@@ -0,0 +1,30 @@
+<template>
+	<span class="text-accent-blue inline-flex items-center" :class="class">
+		<HoverCard nuxt-client class="max-w-[600px] max-h-[600px] w-full overflow-auto z-[45]" :class="{'overflow-hidden !p-0': overview?.type === 'canvas'}" :disabled="!overview">
+			<template #content>
+				<Markdown v-if="overview?.type === 'markdown'" class="!px-6" :path="decodeURIComponent(pathname)" :filter="hash.substring(1)" popover />
+				<template v-else-if="overview?.type === 'canvas'"><div class="w-[600px] h-[600px] relative"><Canvas :path="decodeURIComponent(pathname)" /></div></template>
+			</template>
+			<span>
+				<slot v-bind="$attrs"></slot>
+				<Icon class="w-4 h-4 inline-block" v-if="overview && overview.type !== 'markdown'" :icon="iconByType[overview.type]" />
+			</span>
+		</HoverCard>
+	</span>
+</template>
+
+<script setup lang="ts">
+import { parseURL } from 'ufo';
+import { Icon } from '@iconify/vue/dist/iconify.js';
+import { iconByType } from '#shared/general.util';
+
+const { href } = defineProps<{
+	href: string
+	class?: string
+}>();
+
+const { hash, pathname } = parseURL(href);
+
+const { content } = useContent();
+const overview = computed(() => content.value.find(e => e.path === decodeURIComponent(pathname)));
+</script>

components/prose/ProseA.vue

@@ -1,9 +1,9 @@
 <template>
-	<NuxtLink class="text-accent-blue inline-flex items-center" :to="overview ? { name: 'explore-path', params: { path: overview.path }, hash: hash } : href" :class="class">
+	<NuxtLink class="text-accent-blue inline-flex items-center" :to="overview ? { name: 'explore-path', params: { path: overview.path }, hash: decodeURIComponent(hash) } : href" :class="class">
 		<HoverCard nuxt-client class="max-w-[600px] max-h-[600px] w-full overflow-auto z-[45]" :class="{'overflow-hidden !p-0': overview?.type === 'canvas'}" :disabled="!overview">
 			<template #content>
-				<Markdown v-if="overview?.type === 'markdown'" class="!px-6" :path="pathname" :filter="hash.substring(1)" popover />
-				<template v-else-if="overview?.type === 'canvas'"><div class="w-[600px] h-[600px] relative"><Canvas :path="pathname" /></div></template>
+				<Markdown v-if="overview?.type === 'markdown'" class="!px-6" :path="decodeURIComponent(pathname)" :filter="hash.substring(1)" popover />
+				<template v-else-if="overview?.type === 'canvas'"><div class="w-[600px] h-[600px] relative"><Canvas :path="decodeURIComponent(pathname)" /></div></template>
 			</template>
 			<span>
 				<slot v-bind="$attrs"></slot>
@@ -16,7 +16,7 @@
 <script setup lang="ts">
 import { parseURL } from 'ufo';
 import { Icon } from '@iconify/vue/dist/iconify.js';
-import { iconByType } from '#shared/general.utils';
+import { iconByType } from '#shared/general.util';
 
 const { href } = defineProps<{
 	href: string
@@ -26,5 +26,11 @@ const { href } = defineProps<{
 const { hash, pathname } = parseURL(href);
 
 const { content } = useContent();
-const overview = computed(() => content.value.find(e => e.path === pathname));
-</script>
+const overview = computed(() => content.value.find(e => e.path === decodeURIComponent(pathname)));
+</script>
+
+<style>
+.cm-link {
+	@apply text-accent-blue inline-flex items-center cursor-pointer hover:text-opacity-85;
+}
+</style>

components/prose/ProseBlockquote.vue

@@ -2,4 +2,27 @@
   <blockquote class="empty:before:hidden ps-4 my-4 relative before:absolute before:-top-1 before:-bottom-1 before:left-0 before:w-1 before:bg-light-30 dark:before:bg-dark-30" ref="el">
     <slot />
   </blockquote>
-</template>
+</template>
+
+<style>
+.HyperMD-quote
+{
+  @apply before:hidden;
+}
+.HyperMD-quote.hmd-inactive-line
+{
+  @apply before:block empty:before:!hidden !pb-2 !ps-4 !relative before:!absolute before:!-top-1 before:!-bottom-1 before:!left-0 before:!w-1 before:!bg-none before:!bg-light-30 dark:before:!bg-dark-30;
+}
+.HyperMD-quote.HyperMD-header
+{
+  @apply before:!hidden;
+}
+.hmd-inactive-line .cm-formatting-quote
+{
+  @apply !hidden;
+}
+.cm-quote 
+{
+  @apply text-light-100 dark:text-dark-100;
+}
+</style>

components/prose/ProseCode.vue

@@ -1,3 +1,10 @@
 <template>
   <code><slot /></code>
 </template>
+
+<style>
+.cm-inline-code
+{
+  @apply !border-none !bg-transparent !text-light-100 dark:!text-dark-100 !p-0;
+}
+</style>

components/prose/ProseH1.vue

@@ -1,10 +1,21 @@
 <template>
-  <h1 :id="parseId(id)" class="text-5xl font-thin mt-3 mb-8 first:pt-0 pt-2 relative lg:right-8 sm:right-4 right-2">
+  <h1 :id="parseId(id)" class="text-5xl font-thin mt-3 mb-8 first:pt-0 pt-2">
     <slot />
   </h1>
 </template>
 
 <script setup lang="ts">
-import { parseId } from '#shared/general.utils';
+import { parseId } from '#shared/general.util';
 const props = defineProps<{ id?: string }>()
 </script>
+
+<style>
+.HyperMD-header-1
+{
+  @apply text-5xl pt-4 pb-2 after:hidden;
+}
+.HyperMD-header-1 .cm-header
+{
+  @apply font-thin;
+}
+</style>

components/prose/ProseH2.vue

@@ -1,12 +1,23 @@
 <template>
-  <h2 :id="parseId(id)" class="text-4xl font-semibold mt-3 mb-6 ms-1 first:pt-0 pt-2 relative sm:right-4 right-2">
+  <h2 :id="parseId(id)" class="text-4xl font-semibold mt-3 mb-6 ms-1 first:pt-0 pt-2">
     <slot />
   </h2>
 </template>
 
 <script setup lang="ts">
-import { parseId } from '#shared/general.utils';
+import { parseId } from '#shared/general.util';
 const props = defineProps<{ id?: string }>()
 
 const generate = computed(() => props.id)
 </script>
+
+<style>
+.HyperMD-header-2
+{
+  @apply !text-4xl !pt-4 !pb-2 !ps-1 leading-loose after:hidden;
+}
+.HyperMD-header-2 .cm-header
+{
+  @apply font-semibold;
+}
+</style>

components/prose/ProseH3.vue

@@ -5,8 +5,19 @@
 </template>
 
 <script setup lang="ts">
-import { parseId } from '#shared/general.utils';
+import { parseId } from '#shared/general.util';
 const props = defineProps<{ id?: string }>()
 
 const generate = computed(() => props.id)
 </script>
+
+<style>
+.HyperMD-header-3
+{
+  @apply !text-2xl !font-bold !pt-1 after:!hidden;
+}
+.HyperMD-header-3 .cm-header
+{
+  @apply font-bold;
+}
+</style>

components/prose/ProseH4.vue

@@ -5,6 +5,18 @@
 </template>
 
 <script setup lang="ts">
-import { parseId } from '#shared/general.utils';
+import { parseId } from '#shared/general.util';
 const props = defineProps<{ id?: string }>()
 </script>
+
+<style>
+.HyperMD-header-4
+{
+  @apply !text-xl font-semibold pt-1 after:hidden;
+  font-variant: small-caps;
+}
+.HyperMD-header-4 .cm-header
+{
+  @apply font-semibold;
+}
+</style>

components/prose/ProseH5.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script setup lang="ts">
-import { parseId } from '#shared/general.utils';
+import { parseId } from '#shared/general.util';
 const props = defineProps<{ id?: string }>()
 
 const generate = computed(() => props.id)

components/prose/ProseH6.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script setup lang="ts">
-import { parseId } from '#shared/general.utils';
+import { parseId } from '#shared/general.util';
 const props = defineProps<{ id?: string }>()
 
 const generate = computed(() => props.id)

components/prose/ProseHr.vue

@@ -1,3 +1,10 @@
 <template>
   <Separator class="border-b border-light-35 dark:border-dark-35 m-4" />
 </template>
+
+<style>
+.HyperMD-hr
+{
+  @apply bg-light-35 dark:bg-dark-35 h-px;
+}
+</style>

components/prose/ProseLi.vue

@@ -1,3 +1,22 @@
 <template>
   <li class="before:absolute before:top-2 before:left-0 before:inline-block before:w-2 before:h-2 before:rounded before:bg-light-40 dark:before:bg-dark-40 relative ps-4"><slot /></li>
 </template>
+
+<style>
+.HyperMD-list-line
+{
+  @apply  !py-1;
+}
+.HyperMD-list-line.hmd-inactive-line > span
+{
+  @apply before:absolute before:top-2 before:left-0 before:inline-block before:w-2 before:h-2 before:rounded before:bg-light-40 dark:before:bg-dark-40 relative ps-4;
+}
+.hmd-inactive-line .cm-formatting-list
+{
+  @apply hidden;
+}
+.cm-hmd-list-indent
+{
+  @apply !hidden;
+}
+</style>

components/prose/ProseTag.vue

@@ -2,4 +2,15 @@
     <span class="before:content-['#'] cursor-default bg-accent-blue bg-opacity-10 hover:bg-opacity-20 text-accent-blue text-sm px-1 ms-1 pb-0.5 rounded-full rounded-se-none border border-accent-blue border-opacity-30">
         <slot></slot>
     </span>
-</template>
+</template>
+
+<style>
+.cm-hashtag.cm-hashtag-begin
+{
+    @apply bg-accent-blue bg-opacity-10 text-accent-blue text-sm pb-0.5 ps-1 rounded-l-[12px]  border border-r-0 border-accent-blue border-opacity-30;
+}
+.cm-hashtag.cm-hashtag-end
+{
+    @apply bg-accent-blue bg-opacity-10 text-accent-blue text-sm pb-0.5 pe-1 rounded-r-[12px] !rounded-se-none border border-l-0 border-accent-blue border-opacity-30;
+}
+</style>

composables/useUserSession.ts

@@ -7,7 +7,6 @@ const useContentFetch = (force: boolean) => useContent().fetch(force);
 
 /**
  * Composable to get back the user session and utils around it.
- * @see https://github.com/atinux/nuxt-auth-utils
  */
 export function useUserSession(): UserSessionComposable {
   const sessionState = useSessionState()

db/schema.ts

@@ -1,5 +1,6 @@
 import { relations } from 'drizzle-orm';
-import { int, text, sqliteTable, type SQLiteTableExtraConfig, primaryKey, blob } from 'drizzle-orm/sqlite-core';
+import { int, text, sqliteTable, primaryKey, blob } from 'drizzle-orm/sqlite-core';
+import { ABILITIES, MAIN_STATS } from '../types/character';
 
 export const usersTable = sqliteTable("users", {
     id: int().primaryKey({ autoIncrement: true }),
@@ -20,20 +21,12 @@ export const userSessionsTable = sqliteTable("user_sessions", {
     id: int().notNull(),
     user_id: int().notNull().references(() => usersTable.id, { onDelete: 'cascade', onUpdate: 'cascade' }),
     timestamp: int({ mode: 'timestamp' }).notNull().$defaultFn(() => new Date()),
-}, (table): SQLiteTableExtraConfig => {
-    return {
-        pk: primaryKey({ columns: [table.id, table.user_id] }),
-    }
-});
+}, (table) => [primaryKey({ columns: [table.id, table.user_id] })]);
 
 export const userPermissionsTable = sqliteTable("user_permissions", {
     id: int().notNull().references(() => usersTable.id, { onDelete: 'cascade', onUpdate: 'cascade' }),
     permission: text().notNull(),
-}, (table): SQLiteTableExtraConfig => {
-    return {
-        pk: primaryKey({ columns: [table.id, table.permission] }),
-    }
-});
+}, (table) => [primaryKey({ columns: [table.id, table.permission] })]);
 
 export const explorerContentTable = sqliteTable("explorer_content", {
     path: text().primaryKey(),
@@ -53,6 +46,52 @@ export const emailValidationTable = sqliteTable("email_validation", {
     timestamp: int({ mode: 'timestamp' }).notNull(),
 })
 
+export const characterTable = sqliteTable("character", {
+    id: int().primaryKey({ autoIncrement: true }),
+    name: text().notNull(),
+    owner: int().notNull().references(() => usersTable.id, { onDelete: 'cascade', onUpdate: 'cascade' }),
+    people: int().notNull(),
+    level: int().notNull().default(1),
+    aspect: int(),
+    notes: text(),
+    health: int().notNull().default(0),
+    mana: int().notNull().default(0),
+    
+    visibility: text({ enum: ['private', 'public'] }).notNull().default('private'),
+    thumbnail: blob(),
+});
+
+export const characterTrainingTable = sqliteTable("character_training", {
+    character: int().notNull().references(() => characterTable.id, { onDelete: 'cascade', onUpdate: 'cascade' }),
+    stat: text({ enum: MAIN_STATS }).notNull(),
+    level: int().notNull(),
+    choice: int().notNull(),
+}, (table) => [primaryKey({ columns: [table.character, table.stat, table.level] })]);
+
+export const characterLevelingTable = sqliteTable("character_leveling", {
+    character: int().notNull().references(() => characterTable.id, { onDelete: 'cascade', onUpdate: 'cascade' }),
+    level: int().notNull(),
+    choice: int().notNull(),
+}, (table) => [primaryKey({ columns: [table.character, table.level] })]);
+
+export const characterAbilitiesTable = sqliteTable("character_abilities", {
+    character: int().notNull().references(() => characterTable.id, { onDelete: 'cascade', onUpdate: 'cascade' }),
+    ability: text({ enum: ABILITIES }).notNull(),
+    value: int().notNull().default(0),
+    max: int().notNull().default(0),
+}, (table) => [primaryKey({ columns: [table.character, table.ability] })]);
+
+export const characterModifiersTable = sqliteTable("character_modifiers", {
+    character: int().notNull().references(() => characterTable.id, { onDelete: 'cascade', onUpdate: 'cascade' }),
+    modifier: text({ enum: MAIN_STATS }).notNull(),
+    value: int().notNull().default(0),
+}, (table) => [primaryKey({ columns: [table.character, table.modifier] })]);
+
+export const characterSpellsTable = sqliteTable("character_spell", {
+    character: int().notNull().references(() => characterTable.id, { onDelete: 'cascade', onUpdate: 'cascade' }),
+    value: text().notNull(),
+}, (table) => [primaryKey({ columns: [table.character, table.value] })]);
+
 export const usersRelation = relations(usersTable, ({ one, many }) => ({
     data: one(usersDataTable, { fields: [usersTable.id], references: [usersDataTable.id], }),
     session: many(userSessionsTable),
@@ -70,4 +109,28 @@ export const userPermissionsRelation = relations(userPermissionsTable, ({ one })
 }));
 export const explorerContentRelation = relations(explorerContentTable, ({ one }) => ({
     users: one(usersTable, { fields: [explorerContentTable.owner], references: [usersTable.id], }),
+}));
+export const characterRelation = relations(characterTable, ({ one, many }) => ({
+    user: one(usersTable, { fields: [characterTable.owner], references: [usersTable.id], }),
+    training: many(characterTrainingTable),
+    levels: many(characterLevelingTable),
+    abilities: many(characterAbilitiesTable),
+    modifiers: many(characterModifiersTable),
+    spells: many(characterSpellsTable)
+}));
+
+export const characterTrainingRelation = relations(characterTrainingTable, ({ one }) => ({
+    character: one(characterTable, { fields: [characterTrainingTable.character], references: [characterTable.id] })
+}));
+export const characterLevelingRelation = relations(characterLevelingTable, ({ one }) => ({
+    character: one(characterTable, { fields: [characterLevelingTable.character], references: [characterTable.id] })
+}));
+export const characterAbilitiesRelation = relations(characterAbilitiesTable, ({ one }) => ({
+    character: one(characterTable, { fields: [characterAbilitiesTable.character], references: [characterTable.id] })
+}));
+export const characterModifierRelation = relations(characterModifiersTable, ({ one }) => ({
+    character: one(characterTable, { fields: [characterModifiersTable.character], references: [characterTable.id] })
+}));
+export const characterSpellsRelation = relations(characterSpellsTable, ({ one }) => ({
+    character: one(characterTable, { fields: [characterSpellsTable.character], references: [characterTable.id] })
 }));

drizzle/0006_clever_marvex.sql

@@ -0,0 +1,7 @@
+CREATE TABLE `character` (
+	`id` text PRIMARY KEY NOT NULL,
+	`name` text NOT NULL,
+	`owner` integer NOT NULL,
+	`options` text NOT NULL,
+	FOREIGN KEY (`owner`) REFERENCES `users`(`id`) ON UPDATE cascade ON DELETE cascade
+);

drizzle/0007_tearful_true_believers.sql

@@ -0,0 +1,14 @@
+PRAGMA foreign_keys=OFF;--> statement-breakpoint
+CREATE TABLE `__new_character` (
+	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+	`name` text NOT NULL,
+	`owner` integer NOT NULL,
+	`progress` text NOT NULL,
+	`thumbnail` blob,
+	FOREIGN KEY (`owner`) REFERENCES `users`(`id`) ON UPDATE cascade ON DELETE cascade
+);
+--> statement-breakpoint
+INSERT INTO `__new_character`("id", "name", "owner", "progress", "thumbnail") SELECT "id", "name", "owner", "progress", "thumbnail" FROM `character`;--> statement-breakpoint
+DROP TABLE `character`;--> statement-breakpoint
+ALTER TABLE `__new_character` RENAME TO `character`;--> statement-breakpoint
+PRAGMA foreign_keys=ON;

drizzle/0008_glorious_johnny_blaze.sql

@@ -0,0 +1 @@
+ALTER TABLE `character` ADD `values` text DEFAULT '{}' NOT NULL;

drizzle/0009_thin_omega_sentinel.sql

@@ -0,0 +1 @@
+ALTER TABLE `character` ADD `visibility` text DEFAULT 'private' NOT NULL;

drizzle/0010_bored_sabra.sql

@@ -0,0 +1,47 @@
+CREATE TABLE `character_abilities` (
+	`character` integer NOT NULL,
+	`ability` text NOT NULL,
+	`value` integer DEFAULT 0 NOT NULL,
+	PRIMARY KEY(`character`, `ability`),
+	FOREIGN KEY (`character`) REFERENCES `character`(`id`) ON UPDATE cascade ON DELETE cascade
+);
+--> statement-breakpoint
+CREATE TABLE `character_leveling` (
+	`character` integer NOT NULL,
+	`level` integer NOT NULL,
+	`choice` integer NOT NULL,
+	PRIMARY KEY(`character`, `level`),
+	FOREIGN KEY (`character`) REFERENCES `character`(`id`) ON UPDATE cascade ON DELETE cascade
+);
+--> statement-breakpoint
+CREATE TABLE `character_modifiers` (
+	`character` integer NOT NULL,
+	`modifier` text NOT NULL,
+	`value` integer DEFAULT 0 NOT NULL,
+	PRIMARY KEY(`character`, `modifier`),
+	FOREIGN KEY (`character`) REFERENCES `character`(`id`) ON UPDATE cascade ON DELETE cascade
+);
+--> statement-breakpoint
+CREATE TABLE `character_spell` (
+	`character` integer PRIMARY KEY NOT NULL,
+	`value` text NOT NULL,
+	FOREIGN KEY (`character`) REFERENCES `character`(`id`) ON UPDATE cascade ON DELETE cascade
+);
+--> statement-breakpoint
+CREATE TABLE `character_training` (
+	`character` integer NOT NULL,
+	`stat` text NOT NULL,
+	`level` integer NOT NULL,
+	`choice` integer NOT NULL,
+	PRIMARY KEY(`character`, `stat`, `level`),
+	FOREIGN KEY (`character`) REFERENCES `character`(`id`) ON UPDATE cascade ON DELETE cascade
+);
+--> statement-breakpoint
+ALTER TABLE `character` ADD `people` integer NOT NULL;--> statement-breakpoint
+ALTER TABLE `character` ADD `level` integer DEFAULT 1 NOT NULL;--> statement-breakpoint
+ALTER TABLE `character` ADD `aspect` integer;--> statement-breakpoint
+ALTER TABLE `character` ADD `notes` text;--> statement-breakpoint
+ALTER TABLE `character` ADD `health` integer DEFAULT 0 NOT NULL;--> statement-breakpoint
+ALTER TABLE `character` ADD `mana` integer DEFAULT 0 NOT NULL;--> statement-breakpoint
+ALTER TABLE `character` DROP COLUMN `progress`;--> statement-breakpoint
+ALTER TABLE `character` DROP COLUMN `values`;

drizzle/0011_demonic_titania.sql

@@ -0,0 +1 @@
+ALTER TABLE `character_abilities` ADD `max` integer DEFAULT 0 NOT NULL;

drizzle/0012_graceful_energizer.sql

@@ -0,0 +1,12 @@
+PRAGMA foreign_keys=OFF;--> statement-breakpoint
+CREATE TABLE `__new_character_spell` (
+	`character` integer NOT NULL,
+	`value` text NOT NULL,
+	PRIMARY KEY(`character`, `value`),
+	FOREIGN KEY (`character`) REFERENCES `character`(`id`) ON UPDATE cascade ON DELETE cascade
+);
+--> statement-breakpoint
+INSERT INTO `__new_character_spell`("character", "value") SELECT "character", "value" FROM `character_spell`;--> statement-breakpoint
+DROP TABLE `character_spell`;--> statement-breakpoint
+ALTER TABLE `__new_character_spell` RENAME TO `character_spell`;--> statement-breakpoint
+PRAGMA foreign_keys=ON;

drizzle/meta/0006_snapshot.json

@@ -0,0 +1,411 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "4e31a794-f0ae-4c44-a846-6e1bafa4b247",
+  "prevId": "a2731c1f-4150-4423-946e-670d794f8961",
+  "tables": {
+    "character": {
+      "name": "character",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "owner": {
+          "name": "owner",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "options": {
+          "name": "options",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "character_owner_users_id_fk": {
+          "name": "character_owner_users_id_fk",
+          "tableFrom": "character",
+          "tableTo": "users",
+          "columnsFrom": [
+            "owner"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "email_validation": {
+      "name": "email_validation",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "explorer_content": {
+      "name": "explorer_content",
+      "columns": {
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "owner": {
+          "name": "owner",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "blob",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "navigable": {
+          "name": "navigable",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "private": {
+          "name": "private",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "order": {
+          "name": "order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "visit": {
+          "name": "visit",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "explorer_content_owner_users_id_fk": {
+          "name": "explorer_content_owner_users_id_fk",
+          "tableFrom": "explorer_content",
+          "tableTo": "users",
+          "columnsFrom": [
+            "owner"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "user_permissions": {
+      "name": "user_permissions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "permission": {
+          "name": "permission",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "user_permissions_id_users_id_fk": {
+          "name": "user_permissions_id_users_id_fk",
+          "tableFrom": "user_permissions",
+          "tableTo": "users",
+          "columnsFrom": [
+            "id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "user_permissions_id_permission_pk": {
+          "columns": [
+            "id",
+            "permission"
+          ],
+          "name": "user_permissions_id_permission_pk"
+        }
+      },
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "user_sessions": {
+      "name": "user_sessions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "user_sessions_user_id_users_id_fk": {
+          "name": "user_sessions_user_id_users_id_fk",
+          "tableFrom": "user_sessions",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "user_sessions_id_user_id_pk": {
+          "columns": [
+            "id",
+            "user_id"
+          ],
+          "name": "user_sessions_id_user_id_pk"
+        }
+      },
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "users_data": {
+      "name": "users_data",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "signin": {
+          "name": "signin",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "lastTimestamp": {
+          "name": "lastTimestamp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "logCount": {
+          "name": "logCount",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "users_data_id_users_id_fk": {
+          "name": "users_data_id_users_id_fk",
+          "tableFrom": "users_data",
+          "tableTo": "users",
+          "columnsFrom": [
+            "id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "users": {
+      "name": "users",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "hash": {
+          "name": "hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "state": {
+          "name": "state",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        }
+      },
+      "indexes": {
+        "users_username_unique": {
+          "name": "users_username_unique",
+          "columns": [
+            "username"
+          ],
+          "isUnique": true
+        },
+        "users_email_unique": {
+          "name": "users_email_unique",
+          "columns": [
+            "email"
+          ],
+          "isUnique": true
+        },
+        "users_hash_unique": {
+          "name": "users_hash_unique",
+          "columns": [
+            "hash"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    }
+  },
+  "views": {},
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}

drizzle/meta/0007_snapshot.json

@@ -0,0 +1,420 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "15ea15e0-3d44-4dff-a4cd-f8666c4aa5ed",
+  "prevId": "4e31a794-f0ae-4c44-a846-6e1bafa4b247",
+  "tables": {
+    "character": {
+      "name": "character",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "owner": {
+          "name": "owner",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "progress": {
+          "name": "progress",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "thumbnail": {
+          "name": "thumbnail",
+          "type": "blob",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "character_owner_users_id_fk": {
+          "name": "character_owner_users_id_fk",
+          "tableFrom": "character",
+          "tableTo": "users",
+          "columnsFrom": [
+            "owner"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "email_validation": {
+      "name": "email_validation",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "explorer_content": {
+      "name": "explorer_content",
+      "columns": {
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "owner": {
+          "name": "owner",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "blob",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "navigable": {
+          "name": "navigable",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "private": {
+          "name": "private",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "order": {
+          "name": "order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "visit": {
+          "name": "visit",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "explorer_content_owner_users_id_fk": {
+          "name": "explorer_content_owner_users_id_fk",
+          "tableFrom": "explorer_content",
+          "tableTo": "users",
+          "columnsFrom": [
+            "owner"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "user_permissions": {
+      "name": "user_permissions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "permission": {
+          "name": "permission",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "user_permissions_id_users_id_fk": {
+          "name": "user_permissions_id_users_id_fk",
+          "tableFrom": "user_permissions",
+          "tableTo": "users",
+          "columnsFrom": [
+            "id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "user_permissions_id_permission_pk": {
+          "columns": [
+            "id",
+            "permission"
+          ],
+          "name": "user_permissions_id_permission_pk"
+        }
+      },
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "user_sessions": {
+      "name": "user_sessions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "user_sessions_user_id_users_id_fk": {
+          "name": "user_sessions_user_id_users_id_fk",
+          "tableFrom": "user_sessions",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "user_sessions_id_user_id_pk": {
+          "columns": [
+            "id",
+            "user_id"
+          ],
+          "name": "user_sessions_id_user_id_pk"
+        }
+      },
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "users_data": {
+      "name": "users_data",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "signin": {
+          "name": "signin",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "lastTimestamp": {
+          "name": "lastTimestamp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "logCount": {
+          "name": "logCount",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "users_data_id_users_id_fk": {
+          "name": "users_data_id_users_id_fk",
+          "tableFrom": "users_data",
+          "tableTo": "users",
+          "columnsFrom": [
+            "id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "users": {
+      "name": "users",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "hash": {
+          "name": "hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "state": {
+          "name": "state",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        }
+      },
+      "indexes": {
+        "users_username_unique": {
+          "name": "users_username_unique",
+          "columns": [
+            "username"
+          ],
+          "isUnique": true
+        },
+        "users_email_unique": {
+          "name": "users_email_unique",
+          "columns": [
+            "email"
+          ],
+          "isUnique": true
+        },
+        "users_hash_unique": {
+          "name": "users_hash_unique",
+          "columns": [
+            "hash"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    }
+  },
+  "views": {},
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {
+      "\"character\".\"options\"": "\"character\".\"progress\""
+    }
+  },
+  "internal": {
+    "indexes": {}
+  }
+}

drizzle/meta/0008_snapshot.json

@@ -0,0 +1,426 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "eb68cf2f-c7e2-4111-910d-a26b0fc438cc",
+  "prevId": "15ea15e0-3d44-4dff-a4cd-f8666c4aa5ed",
+  "tables": {
+    "character": {
+      "name": "character",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "owner": {
+          "name": "owner",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "progress": {
+          "name": "progress",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "values": {
+          "name": "values",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'{}'"
+        },
+        "thumbnail": {
+          "name": "thumbnail",
+          "type": "blob",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "character_owner_users_id_fk": {
+          "name": "character_owner_users_id_fk",
+          "tableFrom": "character",
+          "tableTo": "users",
+          "columnsFrom": [
+            "owner"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "email_validation": {
+      "name": "email_validation",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "explorer_content": {
+      "name": "explorer_content",
+      "columns": {
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "owner": {
+          "name": "owner",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "blob",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "navigable": {
+          "name": "navigable",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "private": {
+          "name": "private",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "order": {
+          "name": "order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "visit": {
+          "name": "visit",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "explorer_content_owner_users_id_fk": {
+          "name": "explorer_content_owner_users_id_fk",
+          "tableFrom": "explorer_content",
+          "tableTo": "users",
+          "columnsFrom": [
+            "owner"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "user_permissions": {
+      "name": "user_permissions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "permission": {
+          "name": "permission",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "user_permissions_id_users_id_fk": {
+          "name": "user_permissions_id_users_id_fk",
+          "tableFrom": "user_permissions",
+          "tableTo": "users",
+          "columnsFrom": [
+            "id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "user_permissions_id_permission_pk": {
+          "columns": [
+            "id",
+            "permission"
+          ],
+          "name": "user_permissions_id_permission_pk"
+        }
+      },
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "user_sessions": {
+      "name": "user_sessions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "user_sessions_user_id_users_id_fk": {
+          "name": "user_sessions_user_id_users_id_fk",
+          "tableFrom": "user_sessions",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "user_sessions_id_user_id_pk": {
+          "columns": [
+            "id",
+            "user_id"
+          ],
+          "name": "user_sessions_id_user_id_pk"
+        }
+      },
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "users_data": {
+      "name": "users_data",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "signin": {
+          "name": "signin",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "lastTimestamp": {
+          "name": "lastTimestamp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "logCount": {
+          "name": "logCount",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "users_data_id_users_id_fk": {
+          "name": "users_data_id_users_id_fk",
+          "tableFrom": "users_data",
+          "tableTo": "users",
+          "columnsFrom": [
+            "id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "users": {
+      "name": "users",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "hash": {
+          "name": "hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "state": {
+          "name": "state",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        }
+      },
+      "indexes": {
+        "users_username_unique": {
+          "name": "users_username_unique",
+          "columns": [
+            "username"
+          ],
+          "isUnique": true
+        },
+        "users_email_unique": {
+          "name": "users_email_unique",
+          "columns": [
+            "email"
+          ],
+          "isUnique": true
+        },
+        "users_hash_unique": {
+          "name": "users_hash_unique",
+          "columns": [
+            "hash"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    }
+  },
+  "views": {},
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}

drizzle/meta/0009_snapshot.json

@@ -0,0 +1,434 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "bffde16c-d716-40ec-9d92-cb49814815d7",
+  "prevId": "eb68cf2f-c7e2-4111-910d-a26b0fc438cc",
+  "tables": {
+    "character": {
+      "name": "character",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "owner": {
+          "name": "owner",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "progress": {
+          "name": "progress",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "values": {
+          "name": "values",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'{}'"
+        },
+        "visibility": {
+          "name": "visibility",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'private'"
+        },
+        "thumbnail": {
+          "name": "thumbnail",
+          "type": "blob",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "character_owner_users_id_fk": {
+          "name": "character_owner_users_id_fk",
+          "tableFrom": "character",
+          "tableTo": "users",
+          "columnsFrom": [
+            "owner"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "email_validation": {
+      "name": "email_validation",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "explorer_content": {
+      "name": "explorer_content",
+      "columns": {
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "owner": {
+          "name": "owner",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "blob",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "navigable": {
+          "name": "navigable",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "private": {
+          "name": "private",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "order": {
+          "name": "order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "visit": {
+          "name": "visit",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "explorer_content_owner_users_id_fk": {
+          "name": "explorer_content_owner_users_id_fk",
+          "tableFrom": "explorer_content",
+          "tableTo": "users",
+          "columnsFrom": [
+            "owner"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "user_permissions": {
+      "name": "user_permissions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "permission": {
+          "name": "permission",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "user_permissions_id_users_id_fk": {
+          "name": "user_permissions_id_users_id_fk",
+          "tableFrom": "user_permissions",
+          "tableTo": "users",
+          "columnsFrom": [
+            "id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "user_permissions_id_permission_pk": {
+          "columns": [
+            "id",
+            "permission"
+          ],
+          "name": "user_permissions_id_permission_pk"
+        }
+      },
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "user_sessions": {
+      "name": "user_sessions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "user_sessions_user_id_users_id_fk": {
+          "name": "user_sessions_user_id_users_id_fk",
+          "tableFrom": "user_sessions",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "user_sessions_id_user_id_pk": {
+          "columns": [
+            "id",
+            "user_id"
+          ],
+          "name": "user_sessions_id_user_id_pk"
+        }
+      },
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "users_data": {
+      "name": "users_data",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "signin": {
+          "name": "signin",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "lastTimestamp": {
+          "name": "lastTimestamp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "logCount": {
+          "name": "logCount",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "users_data_id_users_id_fk": {
+          "name": "users_data_id_users_id_fk",
+          "tableFrom": "users_data",
+          "tableTo": "users",
+          "columnsFrom": [
+            "id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "users": {
+      "name": "users",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "hash": {
+          "name": "hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "state": {
+          "name": "state",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        }
+      },
+      "indexes": {
+        "users_username_unique": {
+          "name": "users_username_unique",
+          "columns": [
+            "username"
+          ],
+          "isUnique": true
+        },
+        "users_email_unique": {
+          "name": "users_email_unique",
+          "columns": [
+            "email"
+          ],
+          "isUnique": true
+        },
+        "users_hash_unique": {
+          "name": "users_hash_unique",
+          "columns": [
+            "hash"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    }
+  },
+  "views": {},
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}

drizzle/meta/0010_snapshot.json

@@ -0,0 +1,724 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "af3d9e4f-cea6-42fa-8f8b-d743d97b9c37",
+  "prevId": "bffde16c-d716-40ec-9d92-cb49814815d7",
+  "tables": {
+    "character_abilities": {
+      "name": "character_abilities",
+      "columns": {
+        "character": {
+          "name": "character",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "ability": {
+          "name": "ability",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "value": {
+          "name": "value",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "character_abilities_character_character_id_fk": {
+          "name": "character_abilities_character_character_id_fk",
+          "tableFrom": "character_abilities",
+          "tableTo": "character",
+          "columnsFrom": [
+            "character"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "character_abilities_character_ability_pk": {
+          "columns": [
+            "character",
+            "ability"
+          ],
+          "name": "character_abilities_character_ability_pk"
+        }
+      },
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "character_leveling": {
+      "name": "character_leveling",
+      "columns": {
+        "character": {
+          "name": "character",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "level": {
+          "name": "level",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "choice": {
+          "name": "choice",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "character_leveling_character_character_id_fk": {
+          "name": "character_leveling_character_character_id_fk",
+          "tableFrom": "character_leveling",
+          "tableTo": "character",
+          "columnsFrom": [
+            "character"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "character_leveling_character_level_pk": {
+          "columns": [
+            "character",
+            "level"
+          ],
+          "name": "character_leveling_character_level_pk"
+        }
+      },
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "character_modifiers": {
+      "name": "character_modifiers",
+      "columns": {
+        "character": {
+          "name": "character",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "modifier": {
+          "name": "modifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "value": {
+          "name": "value",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "character_modifiers_character_character_id_fk": {
+          "name": "character_modifiers_character_character_id_fk",
+          "tableFrom": "character_modifiers",
+          "tableTo": "character",
+          "columnsFrom": [
+            "character"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "character_modifiers_character_modifier_pk": {
+          "columns": [
+            "character",
+            "modifier"
+          ],
+          "name": "character_modifiers_character_modifier_pk"
+        }
+      },
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "character_spell": {
+      "name": "character_spell",
+      "columns": {
+        "character": {
+          "name": "character",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "character_spell_character_character_id_fk": {
+          "name": "character_spell_character_character_id_fk",
+          "tableFrom": "character_spell",
+          "tableTo": "character",
+          "columnsFrom": [
+            "character"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "character": {
+      "name": "character",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "owner": {
+          "name": "owner",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "people": {
+          "name": "people",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "level": {
+          "name": "level",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 1
+        },
+        "aspect": {
+          "name": "aspect",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "notes": {
+          "name": "notes",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "health": {
+          "name": "health",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "mana": {
+          "name": "mana",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "visibility": {
+          "name": "visibility",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'private'"
+        },
+        "thumbnail": {
+          "name": "thumbnail",
+          "type": "blob",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "character_owner_users_id_fk": {
+          "name": "character_owner_users_id_fk",
+          "tableFrom": "character",
+          "tableTo": "users",
+          "columnsFrom": [
+            "owner"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "character_training": {
+      "name": "character_training",
+      "columns": {
+        "character": {
+          "name": "character",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "stat": {
+          "name": "stat",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "level": {
+          "name": "level",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "choice": {
+          "name": "choice",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "character_training_character_character_id_fk": {
+          "name": "character_training_character_character_id_fk",
+          "tableFrom": "character_training",
+          "tableTo": "character",
+          "columnsFrom": [
+            "character"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "character_training_character_stat_level_pk": {
+          "columns": [
+            "character",
+            "stat",
+            "level"
+          ],
+          "name": "character_training_character_stat_level_pk"
+        }
+      },
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "email_validation": {
+      "name": "email_validation",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "explorer_content": {
+      "name": "explorer_content",
+      "columns": {
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "owner": {
+          "name": "owner",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "blob",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "navigable": {
+          "name": "navigable",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "private": {
+          "name": "private",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "order": {
+          "name": "order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "visit": {
+          "name": "visit",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "explorer_content_owner_users_id_fk": {
+          "name": "explorer_content_owner_users_id_fk",
+          "tableFrom": "explorer_content",
+          "tableTo": "users",
+          "columnsFrom": [
+            "owner"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "user_permissions": {
+      "name": "user_permissions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "permission": {
+          "name": "permission",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "user_permissions_id_users_id_fk": {
+          "name": "user_permissions_id_users_id_fk",
+          "tableFrom": "user_permissions",
+          "tableTo": "users",
+          "columnsFrom": [
+            "id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "user_permissions_id_permission_pk": {
+          "columns": [
+            "id",
+            "permission"
+          ],
+          "name": "user_permissions_id_permission_pk"
+        }
+      },
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "user_sessions": {
+      "name": "user_sessions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "user_sessions_user_id_users_id_fk": {
+          "name": "user_sessions_user_id_users_id_fk",
+          "tableFrom": "user_sessions",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "user_sessions_id_user_id_pk": {
+          "columns": [
+            "id",
+            "user_id"
+          ],
+          "name": "user_sessions_id_user_id_pk"
+        }
+      },
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "users_data": {
+      "name": "users_data",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "signin": {
+          "name": "signin",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "lastTimestamp": {
+          "name": "lastTimestamp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "logCount": {
+          "name": "logCount",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "users_data_id_users_id_fk": {
+          "name": "users_data_id_users_id_fk",
+          "tableFrom": "users_data",
+          "tableTo": "users",
+          "columnsFrom": [
+            "id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "users": {
+      "name": "users",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "hash": {
+          "name": "hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "state": {
+          "name": "state",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        }
+      },
+      "indexes": {
+        "users_username_unique": {
+          "name": "users_username_unique",
+          "columns": [
+            "username"
+          ],
+          "isUnique": true
+        },
+        "users_email_unique": {
+          "name": "users_email_unique",
+          "columns": [
+            "email"
+          ],
+          "isUnique": true
+        },
+        "users_hash_unique": {
+          "name": "users_hash_unique",
+          "columns": [
+            "hash"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    }
+  },
+  "views": {},
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}

drizzle/meta/0011_snapshot.json

@@ -0,0 +1,732 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "e0aaebf1-54e4-4f61-804b-7cce23c88069",
+  "prevId": "af3d9e4f-cea6-42fa-8f8b-d743d97b9c37",
+  "tables": {
+    "character_abilities": {
+      "name": "character_abilities",
+      "columns": {
+        "character": {
+          "name": "character",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "ability": {
+          "name": "ability",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "value": {
+          "name": "value",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "max": {
+          "name": "max",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "character_abilities_character_character_id_fk": {
+          "name": "character_abilities_character_character_id_fk",
+          "tableFrom": "character_abilities",
+          "tableTo": "character",
+          "columnsFrom": [
+            "character"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "character_abilities_character_ability_pk": {
+          "columns": [
+            "character",
+            "ability"
+          ],
+          "name": "character_abilities_character_ability_pk"
+        }
+      },
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "character_leveling": {
+      "name": "character_leveling",
+      "columns": {
+        "character": {
+          "name": "character",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "level": {
+          "name": "level",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "choice": {
+          "name": "choice",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "character_leveling_character_character_id_fk": {
+          "name": "character_leveling_character_character_id_fk",
+          "tableFrom": "character_leveling",
+          "tableTo": "character",
+          "columnsFrom": [
+            "character"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "character_leveling_character_level_pk": {
+          "columns": [
+            "character",
+            "level"
+          ],
+          "name": "character_leveling_character_level_pk"
+        }
+      },
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "character_modifiers": {
+      "name": "character_modifiers",
+      "columns": {
+        "character": {
+          "name": "character",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "modifier": {
+          "name": "modifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "value": {
+          "name": "value",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "character_modifiers_character_character_id_fk": {
+          "name": "character_modifiers_character_character_id_fk",
+          "tableFrom": "character_modifiers",
+          "tableTo": "character",
+          "columnsFrom": [
+            "character"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "character_modifiers_character_modifier_pk": {
+          "columns": [
+            "character",
+            "modifier"
+          ],
+          "name": "character_modifiers_character_modifier_pk"
+        }
+      },
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "character_spell": {
+      "name": "character_spell",
+      "columns": {
+        "character": {
+          "name": "character",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "character_spell_character_character_id_fk": {
+          "name": "character_spell_character_character_id_fk",
+          "tableFrom": "character_spell",
+          "tableTo": "character",
+          "columnsFrom": [
+            "character"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "character": {
+      "name": "character",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "owner": {
+          "name": "owner",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "people": {
+          "name": "people",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "level": {
+          "name": "level",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 1
+        },
+        "aspect": {
+          "name": "aspect",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "notes": {
+          "name": "notes",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "health": {
+          "name": "health",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "mana": {
+          "name": "mana",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "visibility": {
+          "name": "visibility",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'private'"
+        },
+        "thumbnail": {
+          "name": "thumbnail",
+          "type": "blob",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "character_owner_users_id_fk": {
+          "name": "character_owner_users_id_fk",
+          "tableFrom": "character",
+          "tableTo": "users",
+          "columnsFrom": [
+            "owner"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "character_training": {
+      "name": "character_training",
+      "columns": {
+        "character": {
+          "name": "character",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "stat": {
+          "name": "stat",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "level": {
+          "name": "level",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "choice": {
+          "name": "choice",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "character_training_character_character_id_fk": {
+          "name": "character_training_character_character_id_fk",
+          "tableFrom": "character_training",
+          "tableTo": "character",
+          "columnsFrom": [
+            "character"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "character_training_character_stat_level_pk": {
+          "columns": [
+            "character",
+            "stat",
+            "level"
+          ],
+          "name": "character_training_character_stat_level_pk"
+        }
+      },
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "email_validation": {
+      "name": "email_validation",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "explorer_content": {
+      "name": "explorer_content",
+      "columns": {
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "owner": {
+          "name": "owner",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "blob",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "navigable": {
+          "name": "navigable",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "private": {
+          "name": "private",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "order": {
+          "name": "order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "visit": {
+          "name": "visit",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "explorer_content_owner_users_id_fk": {
+          "name": "explorer_content_owner_users_id_fk",
+          "tableFrom": "explorer_content",
+          "tableTo": "users",
+          "columnsFrom": [
+            "owner"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "user_permissions": {
+      "name": "user_permissions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "permission": {
+          "name": "permission",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "user_permissions_id_users_id_fk": {
+          "name": "user_permissions_id_users_id_fk",
+          "tableFrom": "user_permissions",
+          "tableTo": "users",
+          "columnsFrom": [
+            "id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "user_permissions_id_permission_pk": {
+          "columns": [
+            "id",
+            "permission"
+          ],
+          "name": "user_permissions_id_permission_pk"
+        }
+      },
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "user_sessions": {
+      "name": "user_sessions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "user_sessions_user_id_users_id_fk": {
+          "name": "user_sessions_user_id_users_id_fk",
+          "tableFrom": "user_sessions",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "user_sessions_id_user_id_pk": {
+          "columns": [
+            "id",
+            "user_id"
+          ],
+          "name": "user_sessions_id_user_id_pk"
+        }
+      },
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "users_data": {
+      "name": "users_data",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "signin": {
+          "name": "signin",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "lastTimestamp": {
+          "name": "lastTimestamp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "logCount": {
+          "name": "logCount",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "users_data_id_users_id_fk": {
+          "name": "users_data_id_users_id_fk",
+          "tableFrom": "users_data",
+          "tableTo": "users",
+          "columnsFrom": [
+            "id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "users": {
+      "name": "users",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "hash": {
+          "name": "hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "state": {
+          "name": "state",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        }
+      },
+      "indexes": {
+        "users_username_unique": {
+          "name": "users_username_unique",
+          "columns": [
+            "username"
+          ],
+          "isUnique": true
+        },
+        "users_email_unique": {
+          "name": "users_email_unique",
+          "columns": [
+            "email"
+          ],
+          "isUnique": true
+        },
+        "users_hash_unique": {
+          "name": "users_hash_unique",
+          "columns": [
+            "hash"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    }
+  },
+  "views": {},
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}

drizzle/meta/0012_snapshot.json

@@ -0,0 +1,740 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "cb7a2b9c-1392-4f23-9fc2-9ce8de2e0231",
+  "prevId": "e0aaebf1-54e4-4f61-804b-7cce23c88069",
+  "tables": {
+    "character_abilities": {
+      "name": "character_abilities",
+      "columns": {
+        "character": {
+          "name": "character",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "ability": {
+          "name": "ability",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "value": {
+          "name": "value",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "max": {
+          "name": "max",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "character_abilities_character_character_id_fk": {
+          "name": "character_abilities_character_character_id_fk",
+          "tableFrom": "character_abilities",
+          "tableTo": "character",
+          "columnsFrom": [
+            "character"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "character_abilities_character_ability_pk": {
+          "columns": [
+            "character",
+            "ability"
+          ],
+          "name": "character_abilities_character_ability_pk"
+        }
+      },
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "character_leveling": {
+      "name": "character_leveling",
+      "columns": {
+        "character": {
+          "name": "character",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "level": {
+          "name": "level",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "choice": {
+          "name": "choice",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "character_leveling_character_character_id_fk": {
+          "name": "character_leveling_character_character_id_fk",
+          "tableFrom": "character_leveling",
+          "tableTo": "character",
+          "columnsFrom": [
+            "character"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "character_leveling_character_level_pk": {
+          "columns": [
+            "character",
+            "level"
+          ],
+          "name": "character_leveling_character_level_pk"
+        }
+      },
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "character_modifiers": {
+      "name": "character_modifiers",
+      "columns": {
+        "character": {
+          "name": "character",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "modifier": {
+          "name": "modifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "value": {
+          "name": "value",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "character_modifiers_character_character_id_fk": {
+          "name": "character_modifiers_character_character_id_fk",
+          "tableFrom": "character_modifiers",
+          "tableTo": "character",
+          "columnsFrom": [
+            "character"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "character_modifiers_character_modifier_pk": {
+          "columns": [
+            "character",
+            "modifier"
+          ],
+          "name": "character_modifiers_character_modifier_pk"
+        }
+      },
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "character_spell": {
+      "name": "character_spell",
+      "columns": {
+        "character": {
+          "name": "character",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "character_spell_character_character_id_fk": {
+          "name": "character_spell_character_character_id_fk",
+          "tableFrom": "character_spell",
+          "tableTo": "character",
+          "columnsFrom": [
+            "character"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "character_spell_character_value_pk": {
+          "columns": [
+            "character",
+            "value"
+          ],
+          "name": "character_spell_character_value_pk"
+        }
+      },
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "character": {
+      "name": "character",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "owner": {
+          "name": "owner",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "people": {
+          "name": "people",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "level": {
+          "name": "level",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 1
+        },
+        "aspect": {
+          "name": "aspect",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "notes": {
+          "name": "notes",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "health": {
+          "name": "health",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "mana": {
+          "name": "mana",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "visibility": {
+          "name": "visibility",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'private'"
+        },
+        "thumbnail": {
+          "name": "thumbnail",
+          "type": "blob",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "character_owner_users_id_fk": {
+          "name": "character_owner_users_id_fk",
+          "tableFrom": "character",
+          "tableTo": "users",
+          "columnsFrom": [
+            "owner"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "character_training": {
+      "name": "character_training",
+      "columns": {
+        "character": {
+          "name": "character",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "stat": {
+          "name": "stat",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "level": {
+          "name": "level",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "choice": {
+          "name": "choice",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "character_training_character_character_id_fk": {
+          "name": "character_training_character_character_id_fk",
+          "tableFrom": "character_training",
+          "tableTo": "character",
+          "columnsFrom": [
+            "character"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "character_training_character_stat_level_pk": {
+          "columns": [
+            "character",
+            "stat",
+            "level"
+          ],
+          "name": "character_training_character_stat_level_pk"
+        }
+      },
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "email_validation": {
+      "name": "email_validation",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "explorer_content": {
+      "name": "explorer_content",
+      "columns": {
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "owner": {
+          "name": "owner",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "blob",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "navigable": {
+          "name": "navigable",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "private": {
+          "name": "private",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "order": {
+          "name": "order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "visit": {
+          "name": "visit",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "explorer_content_owner_users_id_fk": {
+          "name": "explorer_content_owner_users_id_fk",
+          "tableFrom": "explorer_content",
+          "tableTo": "users",
+          "columnsFrom": [
+            "owner"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "user_permissions": {
+      "name": "user_permissions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "permission": {
+          "name": "permission",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "user_permissions_id_users_id_fk": {
+          "name": "user_permissions_id_users_id_fk",
+          "tableFrom": "user_permissions",
+          "tableTo": "users",
+          "columnsFrom": [
+            "id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "user_permissions_id_permission_pk": {
+          "columns": [
+            "id",
+            "permission"
+          ],
+          "name": "user_permissions_id_permission_pk"
+        }
+      },
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "user_sessions": {
+      "name": "user_sessions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "user_sessions_user_id_users_id_fk": {
+          "name": "user_sessions_user_id_users_id_fk",
+          "tableFrom": "user_sessions",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "user_sessions_id_user_id_pk": {
+          "columns": [
+            "id",
+            "user_id"
+          ],
+          "name": "user_sessions_id_user_id_pk"
+        }
+      },
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "users_data": {
+      "name": "users_data",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "signin": {
+          "name": "signin",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "lastTimestamp": {
+          "name": "lastTimestamp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "logCount": {
+          "name": "logCount",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "users_data_id_users_id_fk": {
+          "name": "users_data_id_users_id_fk",
+          "tableFrom": "users_data",
+          "tableTo": "users",
+          "columnsFrom": [
+            "id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "users": {
+      "name": "users",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "hash": {
+          "name": "hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "state": {
+          "name": "state",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        }
+      },
+      "indexes": {
+        "users_username_unique": {
+          "name": "users_username_unique",
+          "columns": [
+            "username"
+          ],
+          "isUnique": true
+        },
+        "users_email_unique": {
+          "name": "users_email_unique",
+          "columns": [
+            "email"
+          ],
+          "isUnique": true
+        },
+        "users_hash_unique": {
+          "name": "users_hash_unique",
+          "columns": [
+            "hash"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    }
+  },
+  "views": {},
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}

drizzle/meta/_journal.json

@@ -43,6 +43,55 @@
       "when": 1734426608563,
       "tag": "0005_panoramic_slayback",
       "breakpoints": true
+    },
+    {
+      "idx": 6,
+      "version": "6",
+      "when": 1745072860245,
+      "tag": "0006_clever_marvex",
+      "breakpoints": true
+    },
+    {
+      "idx": 7,
+      "version": "6",
+      "when": 1745074613379,
+      "tag": "0007_tearful_true_believers",
+      "breakpoints": true
+    },
+    {
+      "idx": 8,
+      "version": "6",
+      "when": 1745675022171,
+      "tag": "0008_glorious_johnny_blaze",
+      "breakpoints": true
+    },
+    {
+      "idx": 9,
+      "version": "6",
+      "when": 1745920443528,
+      "tag": "0009_thin_omega_sentinel",
+      "breakpoints": true
+    },
+    {
+      "idx": 10,
+      "version": "6",
+      "when": 1746014143374,
+      "tag": "0010_bored_sabra",
+      "breakpoints": true
+    },
+    {
+      "idx": 11,
+      "version": "6",
+      "when": 1746017162319,
+      "tag": "0011_demonic_titania",
+      "breakpoints": true
+    },
+    {
+      "idx": 12,
+      "version": "6",
+      "when": 1746027790969,
+      "tag": "0012_graceful_energizer",
+      "breakpoints": true
     }
   ]
 }

layouts/default.vue

@@ -1,84 +1,67 @@
 <template>
     <CollapsibleRoot class="flex flex-1 flex-col" v-model:open="open">
-        <div class="z-50 md:hidden flex w-full items-center justify-between h-12 border-b border-light-35 dark:border-dark-35">
-			<div class="flex items-center px-2">
+        <div class="z-50 flex w-full items-center justify-between border-b border-light-35 dark:border-dark-35 px-2">
+			<div class="flex items-center px-2 gap-4">
 				<CollapsibleTrigger asChild>
-					<Button icon class="ms-2 !bg-transparent group">
+					<Button icon class="!bg-transparent group md:hidden">
 						<Icon class="group-data-[state=open]:hidden" icon="radix-icons:hamburger-menu" />
 						<Icon class="group-data-[state=closed]:hidden" icon="radix-icons:cross-1" />
 					</Button>
 				</CollapsibleTrigger>
-				<NuxtLink class=" text-light-100 dark:text-dark-100 hover:text-opacity-70 max-md:ps-6" aria-label="Accueil" :to="{ path: '/', force: true }">Accueil</NuxtLink>
+				<NuxtLink class="text-light-100 dark:text-dark-100 hover:text-opacity-70 m-2 flex items-center gap-4" aria-label="Accueil" :to="{ path: '/', force: true }">
+					<Avatar src="/logo.dark.svg" class="dark:block hidden" />
+					<Avatar src="/logo.light.svg" class="block dark:hidden" />
+					<span class="text-xl max-md:hidden">d[any]</span>
+				</NuxtLink>
 			</div>
-			<div class="flex items-center px-2">
-				<Tooltip message="Changer de theme" side="left"><ThemeSwitch /></Tooltip>
-				<Tooltip v-if="!loggedIn" :message="'Se connecter'" side="right">
-					<NuxtLink :to="{ name: 'user-login' }">
-						<div class="hover:border-opacity-70 flex items-center">
-							<Icon :icon="'radix-icons:person'" class="w-7 h-7 p-1" />
-						</div>
-					</NuxtLink>
-				</Tooltip>
-				<Tooltip v-else :message="'Mon profil'" side="right">
-					<DropdownMenu :options="options" side="bottom" align="end">
-						<div class="hover:border-opacity-70 flex items-center">
-							<Icon :icon="'radix-icons:avatar'" class="w-7 h-7 p-1" />
-						</div>
-					</DropdownMenu>
-				</Tooltip>
+			<NavigationMenuRoot class="relative">
+				<NavigationMenuList class="flex items-center gap-8 max-md:hidden">
+					<NavigationMenuItem>
+						<NavigationMenuTrigger>
+							<NuxtLink :href="{ name: 'character' }" class="text-light-70 dark:text-dark-70" active-class="!text-accent-blue"><span class="pl-3 py-1 flex-1 truncate">Personnages</span></NuxtLink>
+						</NavigationMenuTrigger>
+						<NavigationMenuContent class="absolute top-0 left-0 w-full sm:w-auto bg-light-0 dark:bg-dark-0 border border-light-30 dark:border-dark-30">
+							<NuxtLink :href="{ name: 'character-list' }" class="text-light-70 dark:text-dark-70" active-class="!text-accent-blue"><span class="py-2 px-3 flex-1 truncate">Tous les personnages</span></NuxtLink>
+						</NavigationMenuContent>
+					</NavigationMenuItem>
+				</NavigationMenuList>
+				<div class="absolute top-full left-0 flex w-full justify-center my-4">
+					<NavigationMenuViewport class="h-[var(--radix-navigation-menu-viewport-height)] w-full origin-[top_center] overflow-hidden rounded-[10px] bg-white transition-[width,_height] duration-300 sm:w-[var(--radix-navigation-menu-viewport-width)]" />
+				</div>
+			</NavigationMenuRoot>
+			<div class="flex items-center px-2 gap-4">
+				<template v-if="!loggedIn">
+					<NuxtLink class="text-light-100 dark:text-dark-100 hover:text-light-70 dark:hover:text-dark-70" :to="{ name: 'user-login' }">Se connecter</NuxtLink>
+					<NuxtLink class="text-light-100 dark:text-dark-100 hover:text-light-70 dark:hover:text-dark-70 max-md:hidden" :to="{ name: 'user-register' }">Créer un compte</NuxtLink>
+				</template>
+				<template v-else>
+					<NuxtLink class="text-light-100 dark:text-dark-100 hover:text-light-70 dark:hover:text-dark-70" :to="{ name: 'user-login' }">{{ user!.username }}</NuxtLink>
+				</template>
 			</div>
         </div>
         <div class="flex flex-1 flex-row relative h-screen overflow-hidden">
 			<CollapsibleContent asChild forceMount>
-				<div class="bg-light-0 dark:bg-dark-0 z-40 xl:w-96 md:w-[15em] w-full border-r border-light-30 dark:border-dark-30 flex flex-col justify-between max-md:absolute max-md:-top-0 max-md:-bottom-0 md:left-0 max-md:data-[state=closed]:-left-full max-md:transition-[left] max-md:z-40 max-md:data-[state=open]:left-0">
-					<div class="flex flex-col gap-4 xl:px-6 px-3 py-4">
-						<div class="flex justify-between items-center max-md:hidden">
-							<NuxtLink class=" text-light-100 dark:text-dark-100 hover:text-opacity-70 max-md:ps-6" aria-label="Accueil" :to="{ path: '/', force: true }">
-								<Avatar src="/logo.dark.svg" class="dark:block hidden" />
-        						<Avatar src="/logo.light.svg" class="block dark:hidden" />
-							</NuxtLink>
-							<div class="flex gap-4 items-center">
-								<Tooltip message="Changer de theme" side="left"><ThemeSwitch /></Tooltip>
-								<Tooltip v-if="!loggedIn" :message="'Se connecter'" side="right">
-									<NuxtLink :to="{ name: 'user-login' }">
-										<div class="bg-light-20 dark:bg-dark-20 hover:border-opacity-70 flex border p-px border-light-50 dark:border-dark-50">
-											<Icon :icon="'radix-icons:person'" class="w-7 h-7 p-1" />
-										</div>
-									</NuxtLink>
-								</Tooltip>
-								<Tooltip v-else :message="'Mon profil'" side="right">
-									<DropdownMenu :options="options" side="right" align="start">
-										<div class="bg-light-20 dark:bg-dark-20 hover:border-opacity-70 flex border p-px border-light-50 dark:border-dark-50">
-											<Icon :icon="'radix-icons:avatar'" class="w-7 h-7 p-1" />
-										</div>
-									</DropdownMenu>
-								</Tooltip>
-							</div>
+				<div class="bg-light-0 dark:bg-dark-0 z-40 w-screen md:w-[18rem] border-r border-light-30 dark:border-dark-30 flex flex-col justify-between my-2 max-md:data-[state=closed]:hidden">
+					<div class="flex-1 px-2 max-w-full max-h-full overflow-y-auto overflow-x-hidden">
+						<div v-if="user" class="flex flex-1 py-4 px-2 flex-row flex-1 justify-between items-center">
+							<NuxtLink v-if="hasPermissions(user.permissions, ['admin', 'editor'])" :to="{ name: 'explore-edit' }"><Button icon><Icon icon="radix-icons:pencil-2" /></Button></NuxtLink>
 						</div>
-					</div>
-					<div class="flex-1 xl:px-6 px-3 max-w-full max-h-full overflow-y-auto overflow-x-hidden">
-						<div class="flex flex-row flex-1 justify-between items-center">
-							<NuxtLink :href="{ name: 'explore-path', params: { path: 'index' } }" class="flex flex-1 font-bold text-lg items-center border-light-35 dark:border-dark-35 hover:border-accent-blue" active-class="text-accent-blue border-s-2 !border-accent-blue">
-								<span class="pl-3 py-1 flex-1 truncate">Projet</span>
-							</NuxtLink>
-							<NuxtLink v-if="user && hasPermissions(user.permissions, ['admin', 'editor'])" :to="{ name: 'explore-edit' }"><Button icon><Icon icon="radix-icons:pencil-2" /></Button></NuxtLink>
-						</div>
-						<Tree v-if="pages" v-model="pages" :getKey="(item) => item.path">
+						<Tree v-if="pages" v-model="pages" :getKey="(item) => item.path" class="ps-4">
 							<template #default="{ item, isExpanded }">
-								<NuxtLink :href="item.value.path && !item.hasChildren ? { name: 'explore-path', params: { path: item.value.path } } : undefined" class="flex flex-1 items-center hover:border-accent-blue hover:text-accent-purple" :class="{ 'font-medium': item.hasChildren }" active-class="text-accent-blue" :data-private="item.value.private">
-									<Icon v-if="item.hasChildren" icon="radix-icons:chevron-right" :class="{ 'rotate-90': isExpanded }" class="h-4 w-4 transition-transform absolute" :style="{ 'left': `${item.level - 1}em` }" />
+								<NuxtLink :href="item.value.path && !item.hasChildren ? { name: 'explore-path', params: { path: item.value.path } } : undefined" class="flex flex-1 items-center hover:border-accent-blue hover:text-accent-purple max-w-full" :class="{ 'font-medium': item.hasChildren }" active-class="text-accent-blue" :data-private="item.value.private">
+									<Icon v-if="item.hasChildren" icon="radix-icons:chevron-right" :class="{ 'rotate-90': isExpanded }" class="h-4 w-4 transition-transform absolute" :style="{ 'left': `${item.level / 2 - 1.5}em` }" />
 									<Icon v-else-if="iconByType[item.value.type]" :icon="iconByType[item.value.type]" class="w-5 h-5" />
-									<div class="pl-3 py-1 flex-1 truncate">
+									<div class="pl-1.5 py-1.5 flex-1 truncate">
 										{{ item.value.title }}
 									</div>
-									<Tooltip message="Privé" side="right"><Icon v-show="item.value.private" icon="radix-icons:lock-closed" /></Tooltip>
+									<Tooltip message="Privé" side="right"><Icon v-show="item.value.private" class="mx-1" icon="radix-icons:lock-closed" /></Tooltip>
 								</NuxtLink>
 							</template>
 						</Tree>
 					</div>
-					<div class="xl:px-12 px-6 py-4 text-center text-xs text-light-60 dark:text-dark-60">
+					<div class="xl:px-12 px-6 pt-4 pb-2 text-center text-xs text-light-60 dark:text-dark-60">
 						<NuxtLink class="hover:underline italic" :to="{ name: 'roadmap' }">Roadmap</NuxtLink> - <NuxtLink class="hover:underline italic" :to="{ name: 'legal' }">Mentions légales</NuxtLink>
-						<p>Copyright Peaceultime - 2024</p>
+						<p>Copyright Peaceultime - 2025</p>
 					</div>
 				</div>
 			</CollapsibleContent>
@@ -89,7 +72,7 @@
 
 <script setup lang="ts">
 import { Icon } from '@iconify/vue/dist/iconify.js';
-import { iconByType } from '#shared/general.utils';
+import { iconByType } from '#shared/general.util';
 import type { DropdownOption } from '~/components/base/DropdownMenu.vue';
 import { hasPermissions } from '~/shared/auth.util';
 import type { TreeItem } from '~/types/content';

nuxt.config.ts

@@ -103,8 +103,8 @@ export default defineNuxtConfig({
             100: '#dadada',
           },
           accent: {
-            purple: '#8a5cf5',
-            blue: '#53aaf5',
+            purple: '#43A047',
+            blue: '#26C6DA',
           },
         }
       }
@@ -135,11 +135,13 @@ export default defineNuxtConfig({
   runtimeConfig: {
     session: {
       password: '699c46bd-9aaa-4364-ad01-510ee4fe7013',
+      maxAge: 60 * 60 * 24 *30,
     },
     database: 'db.sqlite',
     mail: {
       host: '',
       port: '',
+      proxy: '',
       user: '',
       passwd: '',
       dkim: '',
@@ -149,7 +151,8 @@ export default defineNuxtConfig({
     rateLimiter: false,
     headers: {
       contentSecurityPolicy: {
-        "img-src": "'self' data: blob:"
+        "img-src": "'self' data: blob:",
+        "base-uri": "localhost:*"
       }
     },
     xssValidator: false,
@@ -159,6 +162,7 @@ export default defineNuxtConfig({
     sources: ['/api/__sitemap__/urls']
   },
   experimental: {
+    buildCache: true,
     componentIslands: {
       selectiveClient: true,
     },

package.json

@@ -4,51 +4,55 @@
   "type": "module",
   "scripts": {
     "predev": "bun i",
-    "dev": "bunx --bun nuxi dev"
+    "dev": "NODE_TLS_REJECT_UNAUTHORIZED=0 bunx --bun nuxi dev"
   },
   "dependencies": {
-    "@atlaskit/pragmatic-drag-and-drop": "^1.4.0",
+    "@atlaskit/pragmatic-drag-and-drop": "^1.5.0",
     "@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.3",
+    "@codemirror/lang-markdown": "^6.3.2",
     "@iconify/vue": "^4.3.0",
+    "@lezer/highlight": "^1.2.1",
+    "@markdoc/markdoc": "^0.5.1",
     "@nuxtjs/color-mode": "^3.5.2",
-    "@nuxtjs/sitemap": "^7.0.1",
-    "@nuxtjs/tailwindcss": "^6.12.2",
+    "@nuxtjs/sitemap": "^7.2.5",
+    "@nuxtjs/tailwindcss": "^6.13.1",
     "@vueuse/gesture": "^2.0.0",
-    "@vueuse/math": "^11.3.0",
-    "@vueuse/nuxt": "^11.3.0",
+    "@vueuse/math": "^12.7.0",
+    "@vueuse/nuxt": "^12.7.0",
     "codemirror": "^6.0.1",
-    "drizzle-orm": "^0.35.3",
+    "drizzle-orm": "^0.39.3",
     "hast": "^1.0.0",
     "hast-util-heading": "^3.0.0",
     "hast-util-heading-rank": "^3.0.0",
     "lodash.capitalize": "^4.2.1",
     "mdast-util-find-and-replace": "^3.0.2",
-    "nodemailer": "^6.9.16",
-    "nuxt": "^3.15.0",
+    "nodemailer": "^6.10.0",
+    "nuxt": "3.15.4",
     "nuxt-security": "^2.1.5",
-    "radix-vue": "^1.9.12",
+    "radix-vue": "^1.9.15",
     "rehype-raw": "^7.0.0",
     "remark-breaks": "^4.0.0",
     "remark-frontmatter": "^5.0.0",
-    "remark-gfm": "^4.0.0",
+    "remark-gfm": "^4.0.1",
+    "remark-ofm": "link:remark-ofm",
     "remark-parse": "^11.0.0",
     "remark-rehype": "^11.1.1",
     "rollup-plugin-postcss": "^4.0.2",
     "rollup-plugin-vue": "^6.0.0",
     "unified": "^11.0.5",
     "unist-util-visit": "^5.0.0",
-    "vue": "latest",
-    "vue-router": "latest",
-    "zod": "^3.24.1"
+    "vue": "^3.5.13",
+    "vue-router": "^4.5.0",
+    "zod": "^3.24.2"
   },
   "devDependencies": {
-    "@types/bun": "^1.1.14",
+    "@types/bun": "^1.2.2",
     "@types/lodash.capitalize": "^4.2.9",
     "@types/nodemailer": "^6.4.17",
     "@types/unist": "^3.0.3",
-    "better-sqlite3": "^11.7.0",
-    "bun-types": "^1.1.42",
-    "drizzle-kit": "^0.26.2",
+    "better-sqlite3": "^11.8.1",
+    "bun-types": "^1.2.2",
+    "drizzle-kit": "^0.30.4",
     "mdast-util-to-string": "^4.0.0",
     "rehype-stringify": "^10.0.1"
   }

pages/admin/index.vue

@@ -31,7 +31,7 @@
 </script>
 
 <script setup lang="ts">
-import { format, iconByType } from '~/shared/general.utils';
+import { format, iconByType } from '~/shared/general.util';
 import { Icon } from '@iconify/vue/dist/iconify.js';
 
 interface File

pages/character/[id]/edit.client.vue

@@ -0,0 +1,381 @@
+<script lang="ts">
+import config from '#shared/character-config.json';
+
+function raceOptionToText(option: RaceOption): string
+{
+    const text = [];
+    if(option.training) text.push(`+${option.training} point${option.training > 1 ? 's' : ''} de statistique${option.training > 1 ? 's' : ''}.`);
+    if(option.shaping) text.push(`+${option.shaping} transformation${option.shaping > 1 ? 's' : ''} par jour.`);
+    if(option.modifier) text.push(`+${option.modifier} au modifieur de votre choix.`);
+    if(option.abilities) text.push(`+${option.abilities} point${option.abilities > 1 ? 's' : ''} de compétence${option.abilities > 1 ? 's' : ''}.`);
+    if(option.health) text.push(`+${option.health} PV max.`);
+    if(option.mana) text.push(`+${option.mana} mana max.`);
+    if(option.spellslots) text.push(`+${option.spellslots} sort${option.spellslots > 1 ? 's' : ''} maitrisé${option.spellslots > 1 ? 's' : ''}.`);
+    return text.join('\n');
+}
+function getFeaturesOf(stat: MainStat, progression: DoubleIndex<TrainingLevel>[]): TrainingOption[]
+{
+    const characterData = config as CharacterConfig;
+    return progression.map(e => characterData.training[stat][e[0]][e[1]]);
+}
+
+
+
+function abilitySpecialFeatures(type: "points" | "max", curiosity: DoubleIndex<TrainingLevel>[], value: number): number
+{
+    if(type === 'points')
+    {
+        if(curiosity.find(e => e[0] == 6 && e[1] === 0))
+            return Math.max(6, value);
+        if(curiosity.find(e => e[0] == 6 && e[1] === 2))
+            return value + 1;
+    }
+    return value;
+}
+</script>
+<script setup lang="ts">
+import { Icon } from '@iconify/vue/dist/iconify.js';
+import PreviewA from '~/components/prose/PreviewA.vue';
+import { clamp } from '~/shared/general.util';
+import { defaultCharacter, elementTexts, mainStatTexts, spellTypeTexts, type Ability, type Character, type CharacterConfig, type DoubleIndex, type Level, type MainStat, type RaceOption, type SpellConfig, type SpellElement, type SpellType, type TrainingLevel, type TrainingOption } from '~/types/character';
+
+definePageMeta({
+    guestsGoesTo: '/user/login',
+});
+let id = useRouter().currentRoute.value.params.id;
+const { add } = useToast();
+const characterConfig = config as CharacterConfig;
+const data = ref<Character>({ ...defaultCharacter });
+const spellFilter = ref<{
+    ranks: Array<1 | 2 | 3>,
+    types: Array<SpellType>,
+    text: string,
+    elements: Array<SpellElement>,
+    tags: string[],
+}>({
+    ranks: [],
+    types: [],
+    text: "",
+    elements: [],
+    tags: [],
+});
+
+const peopleOpen = ref(false), trainingOpen = ref(false), abilityOpen = ref(false), spellOpen = ref(false), notesOpen = ref(false), trainingTab = ref(0);
+const raceOptions = computed(() => data.value.people !== undefined ? characterConfig.peoples[data.value.people!].options : undefined);
+const selectedRaceOptions = computed(() => raceOptions !== undefined ? data.value.leveling!.map(e => raceOptions.value![e[0]][e[1]]) : undefined);
+const trainingPoints = computed(() => raceOptions.value ? data.value.leveling?.reduce((p, v) => p + (raceOptions.value![v[0]][v[1]].training ?? 0), 0) : 0);
+const training = computed(() => Object.entries(characterConfig.training).map(e => [e[0], getFeaturesOf(e[0] as MainStat, data.value.training[e[0] as MainStat])]) as [MainStat, TrainingOption[]][]);
+const maxTraining = computed(() => Object.entries(data.value.training).reduce((p, v) => { p[v[0] as MainStat] = v[1].reduce((_p, _v) => Math.max(_p, _v[0]) , 0); return p; }, {} as Record<MainStat, number>));
+const trainingSpent = computed(() => Object.values(maxTraining.value).reduce((p, v) => p + v, 0));
+const modifiers = computed(() => Object.entries(maxTraining.value).reduce((p, v) => { p[v[0] as MainStat] = Math.floor(v[1] / 3) + (data.value.modifiers ? (data.value.modifiers[v[0] as MainStat] ?? 0) : 0); return p; }, {} as Record<MainStat, number>))
+const modifierPoints = computed(() => (selectedRaceOptions.value ? selectedRaceOptions.value.reduce((p, v) => p + (v?.modifier ?? 0), 0) : 0) + training.value.reduce((p, v) => p + v[1].reduce((_p, _v) => _p + (_v?.modifier ?? 0), 0), 0));
+const modifierSpent = computed(() => Object.values(data.value.modifiers ?? {}).reduce((p, v) => p + v, 0));
+const abilityPoints = computed(() => (selectedRaceOptions.value ? selectedRaceOptions.value.reduce((p, v) => p + (v?.abilities ?? 0), 0) : 0) + training.value.flatMap(e => e[1].filter(_e => _e.ability !== undefined)).reduce((p, v) => p + v.ability!, 0));
+const abilityMax = computed(() => Object.entries(characterConfig.abilities).reduce((p, v) => { p[v[0] as Ability] = abilitySpecialFeatures("max", data.value.training.curiosity, Math.floor(maxTraining.value[v[1].max[0]] / 3) + Math.floor(maxTraining.value[v[1].max[1]] / 3)); return p; }, {} as Record<Ability, number>));
+const abilitySpent = computed(() => Object.values(data.value.abilities ?? {}).reduce((p, v) => p + v[0], 0));
+const spellranks = computed(() => training.value.flatMap(e => e[1].filter(_e => _e.spellrank !== undefined)).reduce((p, v) => { p[v.spellrank!]++; return p; }, { instinct: 0, precision: 0, knowledge: 0 } as Record<SpellType, 0 | 1 | 2 | 3>));
+const spellsPoints = computed(() => training.value.flatMap(e => e[1].filter(_e => _e.spellslot !== undefined)).reduce((p, v) => p + (modifiers.value.hasOwnProperty(v.spellslot as MainStat) ? modifiers.value[v.spellslot as MainStat] : v.spellslot as number), 0));
+
+if(id !== 'new')
+{
+    const character = await useRequestFetch()(`/api/character/${id}`);
+
+    if(!character)
+    {
+        throw new Error('Donnée du personnage introuvables');
+    }
+
+    data.value = Object.assign(defaultCharacter, data.value, character);
+}
+
+function selectRaceOption(level: Level, choice: number)
+{
+    const character = data.value;
+    if(level > character.level)
+        return;
+
+    if(character.leveling === undefined)
+        character.leveling = [[1, 0]];
+
+    if(level == 1)
+        return;
+
+    for(let i = 1; i < level; i++) //Check previous levels as a requirement
+    {
+        if(!character.leveling.some(e => e[0] == i))
+            return;
+    }
+
+    if(character.leveling.some(e => e[0] == level))
+    {
+        character.leveling.splice(character.leveling.findIndex(e => e[0] == level), 1, [level, choice]);
+    }
+    else
+    {
+        character.leveling.push([level, choice]);
+    }
+
+    data.value = character;
+}
+function switchTrainingOption(stat: MainStat, level: TrainingLevel, choice: number)
+{
+    const character = data.value;
+
+    if(level == 0)
+        return;
+
+    for(let i = 1; i < level; i++) //Check previous levels as a requirement
+    {
+        if(!character.training[stat].some(e => e[0] == i))
+            return;
+    }
+
+    if(character.training[stat].some(e => e[0] == level))
+    {
+        if(character.training[stat].some(e => e[0] == level && e[1] === choice))
+        {
+            for(let i = 15; i >= level; i --) //Invalidate higher levels
+            {
+                const index = character.training[stat].findIndex(e => e[0] == i);
+                if(index !== -1)
+                    character.training[stat].splice(index, 1);
+            }
+        }
+        else
+            character.training[stat].splice(character.training[stat].findIndex(e => e[0] == level), 1, [level, choice]);
+    }
+    else if(trainingPoints.value && trainingPoints.value > 0)
+    {
+        character.training[stat].push([level, choice]);
+    }
+
+    data.value = character;
+}
+function updateLevel()
+{
+    const character = data.value;
+
+    if(character.leveling) //Invalidate higher levels
+    {
+        for(let level = 20; level > character.level; level--)
+        {
+            const index = character.leveling.findIndex(e => e[0] == level);
+            if(index !== -1)
+                character.leveling.splice(index, 1);
+        }
+    }
+
+    data.value = character;
+}
+function filterSpells(spells: SpellConfig[])
+{
+    const filter = spellFilter.value
+    let list = [...spells];
+    list = list.filter(e => spellranks.value[e.type] >= e.rank);
+    if(filter.text.length > 0) list = list.filter(e => e.name.toLowerCase().includes(filter.text.toLowerCase()));
+    if(filter.types.length > 0) list = list.filter(e => filter.types.includes(e.type));
+    if(filter.ranks.length > 0) list = list.filter(e => filter.ranks.includes(e.rank));
+    if(filter.elements.length > 0) list = list.filter(e => filter.elements.some(f => e.elements.includes(f)));
+    if(filter.tags.length > 0) list = list.filter(e => !e.tags || filter.tags.some(f => e.tags!.includes(f)));
+
+    return list;
+}
+async function save(leave: boolean)
+{
+    if(data.value.name === '' || data.value.people === undefined || data.value.people === -1)
+    {                
+        add({ title: 'Données manquantes', content: "Merci de saisir un nom et une race avant de pouvoir enregistrer votre personnage", type: 'error', duration: 25000, timer: true });
+        return;
+    }
+    if(id === 'new')
+    {
+        id = await useRequestFetch()(`/api/character`, {
+            method: 'post',
+            body: data.value,
+            onResponseError: (e) => {
+                add({ title: 'Erreur d\'enregistrement', content: e.response.status === 401 ? "Vous n'êtes pas autorisé à effectué cette opération" : e.response.statusText, type: 'error', duration: 25000, timer: true });
+            }
+        });
+        add({ content: 'Personnage créé', type: 'success', duration: 25000, timer: true });
+        useRouter().replace({ name: 'character-id-edit', params: { id: id } })
+        if(leave) useRouter().push({ name: 'character-id', params: { id: id } });
+    }
+    else
+    {
+        await useRequestFetch()(`/api/character/${id}`, {
+            method: 'post',
+            body: data.value,
+            onResponseError: (e) => {
+                add({ title: 'Erreur d\'enregistrement', content: e.response.status === 401 ? "Vous n'êtes pas autorisé à effectué cette opération" : e.response.statusText, type: 'error', duration: 25000, timer: true });
+            }
+        });
+        add({ content: 'Personnage enregistré', type: 'success', duration: 25000, timer: true });
+        if(leave) useRouter().push({ name: 'character-id', params: { id: id } });
+    }
+}
+
+useShortcuts({
+    "Meta_S": () =>save(false),
+})
+</script>
+
+<template>
+    <Head>
+        <Title>d[any] - Edition de {{ data.name || 'nouveau personnage' }}</Title>
+    </Head>
+    <div  class="flex flex-col gap-8 align-center">
+        <div class="flex flex-row gap-4 align-center justify-between">
+            <div></div>
+            <div class="flex flex-row gap-4 align-center justify-center">
+                <Tooltip side="left" message="Developpement en cours"><Avatar src="" icon="radix-icons:person" size="large" /></Tooltip>
+                <Label class="flex items-start justify-between flex-col gap-2">
+                    <span class="pb-1 mx-2 md:p-0">Nom du personnage</span>
+                    <input class="caret-light-50 dark:caret-dark-50 text-light-100 dark:text-dark-100 placeholder:text-light-50 dark:placeholder:text-dark-50
+                    bg-light-20 dark:bg-dark-20 outline-none px-3 py-1 focus:shadow-raw transition-[box-shadow] focus:shadow-light-40 dark:focus:shadow-dark-40
+                    border border-light-35 dark:border-dark-35 hover:border-light-50 dark:hover:border-dark-50 data-[disabled]:bg-light-20 dark:data-[disabled]:bg-dark-20 data-[disabled]:border-light-20 dark:data-[disabled]:border-dark-20"
+                        type="text" v-model="data.name">
+                </Label>
+                <Label class="flex items-start justify-between flex-col gap-2">
+                    <span class="pb-1 mx-2 md:p-0">Niveau</span>
+                    <NumberFieldRoot :min="1" :max="20" v-model="data.level" @update:model-value="updateLevel" class="flex justify-center border border-light-35 dark:border-dark-35 bg-light-20 dark:bg-dark-20 data-[disabled]:border-light-20 dark:data-[disabled]:border-dark-20 data-[disabled]:bg-light-20 dark:data-[disabled]:bg-dark-20 
+                data-[disabled]:text-light-70 dark:data-[disabled]:text-dark-70 hover:border-light-50 dark:hover:border-dark-50 has-[:focus]:shadow-raw transition-[box-shadow] has-[:focus]:shadow-light-40 dark:has-[:focus]:shadow-dark-40">
+                        <NumberFieldInput class="tabular-nums w-20 bg-transparent px-3 py-1 outline-none caret-light-50 dark:caret-dark-50" />
+                    </NumberFieldRoot>
+                </Label>
+                <Label class="flex items-start justify-between flex-col gap-2">
+                    <span class="pb-1 mx-6 md:p-0">Visibilité</span>
+                    <Select class="!my-0" v-model="data.visibility">
+                        <SelectItem label="Privé" value="private" />
+                        <SelectItem label="Public" value="public" />
+                    </Select>
+                </Label>
+            </div>
+            <div  class="self-center">
+                <Tooltip side="right" message="Ctrl+S"><Button @click="() => save(true)">Enregistrer</Button></Tooltip>
+            </div>
+        </div>
+        <div class="flex flex-1 flex-col min-w-[800px] w-[75vw] max-w-[1200px]">
+            <Collapsible class="border-b border-light-30 dark:border-dark-30 p-1" v-model="peopleOpen" @update:model-value="() => { trainingOpen = false; abilityOpen = false; spellOpen = false; notesOpen = false; }">
+                <template #label>
+                    <span class="font-bold text-xl">Peuple</span>
+                </template>
+                <template #default>
+                    <div class="m-2 overflow-auto">
+                        <Combobox label="Peuple de votre personnage" v-model="data.people" :options="config.peoples.map((people, index) => [people.name, index])" @update:model-value="(index) => { data.people = index as number | undefined; data.leveling = [[1, 0]]}" />
+                        <template v-if="data.people !== undefined">
+                            <div class="w-full border-b border-light-30 dark:border-dark-30 pb-4">
+                                <span class="text-sm text-light-70 dark:text-dark-70">{{ characterConfig.peoples[data.people].description }}</span>
+                            </div>
+                            <div class="flex flex-col gap-4 max-h-[50vh] pe-4 relative">
+                                <span class="sticky top-0 py-1 bg-light-0 dark:bg-dark-0 z-10 text-xl">Niveaux restants: {{ data.level - (data.leveling?.length ?? 0) }}</span>
+                                <div class="flex flex-row gap-4 justify-center" v-for="(level, index) of characterConfig.peoples[data.people].options" :class="{ 'opacity-30': index > data.level }">
+                                    <div class="border border-light-40 dark:border-dark-40 cursor-pointer px-2 py-1 w-64" v-for="(option, i) of level" @click="selectRaceOption(parseInt(index as unknown as string, 10) as Level, i)" :class="{ 'hover:border-light-60 dark:hover:border-dark-60': index <= data.level, '!border-accent-blue bg-accent-blue bg-opacity-20': data.leveling?.some(e => e[0] == index && e[1] === i) ?? false }"><MarkdownRenderer :content="raceOptionToText(option)" /></div>
+                                </div>
+                            </div>
+                        </template>
+                    </div>
+                </template>
+            </Collapsible>
+            <Collapsible class="border-b border-light-30 dark:border-dark-30 p-1" v-model="trainingOpen" :disabled="data.people === undefined" @update:model-value="() => { peopleOpen = false; abilityOpen = false; spellOpen = false; notesOpen = false; }">
+                <template #label>
+                    <span class="font-bold text-xl">Entrainement</span>
+                </template>
+                <template #default>
+                    <div class="flex flex-col gap-4 max-h-[50vh] pe-4 relative overflow-y-auto overflow-x-hidden">
+                        <div class="sticky top-0 z-10 py-2 bg-light-0 dark:bg-dark-0 flex justify-between">
+                            <Icon icon="radix-icons:caret-left" class="w-6 h-6 border border-light-30 dark:border-dark-30 cursor-pointer" @click="() => trainingTab = clamp(trainingTab - 1, 0, 6)" />
+                            <span class="text-xl" :class="{ 'text-light-red dark:text-dark-red': (trainingPoints ?? 0) < trainingSpent }">Points d'entrainement restants: {{ (trainingPoints ?? 0) - trainingSpent }}</span>
+                            <Icon icon="radix-icons:caret-right" class="w-6 h-6 border border-light-30 dark:border-dark-30 cursor-pointer" @click="() => trainingTab = clamp(trainingTab + 1, 0, 6)" />
+                        </div>
+                        <div class="flex gap-4 relative" :style="`left: calc(calc(-100% - 1em) * ${trainingTab}); transition: left .5s ease;`">
+                            <div class="flex w-full flex-shrink-0 flex-col gap-2 relative" v-for="(text, stat) of mainStatTexts">
+                                <div class="sticky top-1 mx-16 z-10 flex justify-between">
+                                    <div class="py-1 px-3 bg-light-0 dark:bg-dark-0 z-10 text-xl font-bold border border-light-30 dark:border-dark-30 flex">{{ text }}
+                                        <div class="flex gap-2" v-if="maxTraining[stat] >= 0">: Niveau {{ maxTraining[stat] }} (+{{ modifiers[stat] }} 
+                                            <NumberFieldRoot :default-value="data.modifiers[stat] ?? 0" v-model="data.modifiers[stat]" class="flex justify-center border border-light-35 dark:border-dark-35 bg-light-20 dark:bg-dark-20 data-[disabled]:border-light-20 dark:data-[disabled]:border-dark-20 data-[disabled]:bg-light-20 dark:data-[disabled]:bg-dark-20 
+                                data-[disabled]:text-light-70 dark:data-[disabled]:text-dark-70 hover:border-light-50 dark:hover:border-dark-50 has-[:focus]:shadow-raw transition-[box-shadow] has-[:focus]:shadow-light-40 dark:has-[:focus]:shadow-dark-40">
+                                                <NumberFieldInput class="tabular-nums w-8 text-base font-normal bg-transparent px-2 outline-none caret-light-50 dark:caret-dark-50" />
+                                            </NumberFieldRoot>
+                                        )</div></div>
+                                    <div class="py-1 px-3 bg-light-0 dark:bg-dark-0 z-10 flex gap-2 justify-center items-center" :class="{ 'text-light-red dark:text-dark-red': (modifierPoints ?? 0) < modifierSpent }">Modifieur bonus: {{ modifierPoints - modifierSpent }}</div>
+                                </div>
+                                <div class="flex flex-row gap-4 justify-center" v-for="(level, index) of characterConfig.training[stat]" :class="{ 'opacity-30': index > maxTraining[stat] + 1 }">
+                                    <div class="border border-light-40 dark:border-dark-40 cursor-pointer px-2 py-1 w-1/3" v-for="(option, i) of level" @click="switchTrainingOption(stat, parseInt(index as unknown as string, 10) as TrainingLevel, i)" :class="{ 'hover:border-light-60 dark:hover:border-dark-60': index <= maxTraining[stat] + 1, '!border-accent-blue bg-accent-blue bg-opacity-20': index == 0 || (data.training[stat]?.some(e => e[0] == index && e[1] === i) ?? false) }"><MarkdownRenderer :proses="{ 'a': PreviewA }" :content="option.description.map(e => e.text).join('\n')" /></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </template>
+            </Collapsible>
+            <Collapsible class="border-b border-light-30 dark:border-dark-30 p-1" v-model="abilityOpen" :disabled="data.people === undefined" @update:model-value="() => { trainingOpen = false; peopleOpen = false; spellOpen = false; notesOpen = false; }">
+                <template #label>
+                    <span class="font-bold text-xl">Compétences</span>
+                </template>
+                <template #default>
+                    <div class="flex flex-col gap-2 max-h-[50vh] px-4 relative overflow-y-auto">
+                        <div class="sticky top-0 py-2 bg-light-0 dark:bg-dark-0 z-10 flex justify-between">
+                            <span class="text-xl -mx-2" :class="{ 'text-light-red dark:text-dark-red': (abilityPoints ?? 0) < abilitySpent }">Points d'entrainement restants: {{ (abilityPoints ?? 0) - abilitySpent }}</span>
+                        </div>
+                        <div class="grid gap-4 grid-cols-6">
+                            <div v-for="(ability, index) of characterConfig.abilities" class="flex flex-col items-center border border-light-30 dark:border-dark-30 p-2">
+                                <div class="flex items-center justify-center gap-4">
+                                    <NumberFieldRoot :min="0" :default-value="data.abilities[index] ? data.abilities[index][0] : 0" @update:model-value="(value) => { data.abilities[index] = [value, data.abilities[index] ? data.abilities[index][1] : 0]; }" class="border border-light-35 dark:border-dark-35 bg-light-20 dark:bg-dark-20 data-[disabled]:border-light-20 dark:data-[disabled]:border-dark-20 data-[disabled]:bg-light-20 dark:data-[disabled]:bg-dark-20 
+                                data-[disabled]:text-light-70 dark:data-[disabled]:text-dark-70 hover:border-light-50 dark:hover:border-dark-50 has-[:focus]:shadow-raw transition-[box-shadow] has-[:focus]:shadow-light-40 dark:has-[:focus]:shadow-dark-40">
+                                        <NumberFieldInput class="tabular-nums w-8 bg-transparent px-3 py-1 outline-none caret-light-50 dark:caret-dark-50" />
+                                    </NumberFieldRoot>
+                                    <span class="font-bold col-span-4">/{{ abilityMax[index] }}</span>
+                                </div>
+                                <span class="text-xl font-bold flex-2">{{ ability.name }}</span>
+                                <span class="text-sm text-light-70 dark:text-dark-70 flex-1">({{ mainStatTexts[ability.max[0]] }} + {{ mainStatTexts[ability.max[1]] }})</span>
+                            </div>
+                        </div>
+                    </div>
+                </template>
+            </Collapsible>
+            <Collapsible class="border-b border-light-30 dark:border-dark-30 p-1" v-model="spellOpen" :disabled="data.people === undefined" @update:model-value="() => { trainingOpen = false; peopleOpen = false; abilityOpen = false; notesOpen = false; }">
+                <template #label>
+                    <span class="font-bold text-xl">Sorts</span>
+                </template>
+                <template #default>
+                    <div class="flex flex-col gap-2 max-h-[50vh] px-4 relative overflow-y-auto">
+                        <div class="sticky top-0 py-2 bg-light-0 dark:bg-dark-0 z-10 flex gap-2 items-center">
+                            <span class="text-xl pe-4" :class="{ 'text-light-red dark:text-dark-red': spellsPoints < (data.spells?.length ?? 0) }">Sorts: {{ data.spells?.length ?? 0 }}/{{ spellsPoints }}</span>
+                            <TextInput label="Nom" v-model="spellFilter.text" />
+                            <Combobox label="Rang" v-model="spellFilter.ranks" multiple :options="[['Rang 1', 1], ['Rang 2', 2], ['Rang 3', 3]]" />
+                            <Combobox label="Type" v-model="spellFilter.types" multiple :options="[['Précision', 'precision'], ['Savoir', 'knowledge'], ['Instinct', 'instinct']]" />
+                            <Combobox label="Element" v-model="spellFilter.elements" multiple :options="[['Feu', 'fire'], ['Glace', 'ice'], ['Foudre', 'thunder'], ['Terre', 'earth'], ['Arcane', 'arcana'], ['Air', 'air'], ['Nature', 'nature'], ['Lumière', 'light'], ['Psy', 'psyche']]" />
+                        </div>
+                        <div class="grid gap-4 grid-cols-2">
+                            <div class="py-1 px-2 border border-light-30 dark:border-dark-30 flex flex-col hover:border-light-50 dark:hover:border-dark-50 cursor-pointer" v-for="spell of filterSpells(characterConfig.spells)" :class="{ '!border-accent-blue bg-accent-blue bg-opacity-20': data.spells?.find(e => e === spell.id) }"
+                                @click="() => data.spells?.includes(spell.id) ? data.spells.splice(data.spells.findIndex((e: string) => e === spell.id), 1) : data.spells!.push(spell.id)">
+                                <div class="flex flex-row justify-between">
+                                    <span class="text-lg font-bold">{{ spell.name }}</span>
+                                    <div class="flex flex-row items-center gap-6">
+                                        <div class="flex flex-row text-sm gap-2">
+                                            <span v-for="element of spell.elements" :class="elementTexts[element].class">{{ elementTexts[element].text }}</span>
+                                        </div>
+                                        <div class="flex flex-row text-sm gap-1">
+                                            <span class="">Rang {{ spell.rank }}</span><span>/</span>
+                                            <span class="">{{ spellTypeTexts[spell.type] }}</span><span>/</span>
+                                            <span class="">{{ spell.cost }} mana</span><span>/</span>
+                                            <span class="">{{ typeof spell.speed === 'string' ? spell.speed : `${spell.speed} minutes` }}</span>
+                                        </div>
+                                    </div>
+                                </div>
+                                <MarkdownRenderer :content="spell.effect" />
+                            </div>
+                        </div>
+                    </div>
+                </template>
+            </Collapsible>
+            <Collapsible class="border-b border-light-30 dark:border-dark-30 p-1" v-model="notesOpen" @update:model-value="() => { trainingOpen = false; peopleOpen = false; abilityOpen = false; spellOpen = false; }">
+                <template #label>
+                    <span class="font-bold text-xl">Notes libres</span>
+                </template>
+                <template #default>
+                    <Editor class="min-h-[400px] border border-light-30 dark:border-dark-30" v-model="data.notes" />
+                </template>
+            </Collapsible>
+        </div>
+    </div>
+</template>

pages/character/[id]/index.client.vue

@@ -0,0 +1,191 @@
+<script setup lang="ts">
+import config from '#shared/character-config.json';
+import { Icon } from '@iconify/vue/dist/iconify.js';
+import PreviewA from '~/components/prose/PreviewA.vue';
+import type { SpellConfig } from '~/types/character';
+import { elementTexts, spellTypeTexts, type CharacterConfig } from '~/types/character';
+
+const characterConfig = config as CharacterConfig;
+
+const id = useRouter().currentRoute.value.params.id;
+const { user } = useUserSession();
+const { add } = useToast();
+
+const { data: character, status, error } = await useFetch(`/api/character/${id}/compiled`);
+</script>
+
+<template>
+    <div v-if="status === 'pending'">
+        <Head>
+            <Title>d[any] - Chargement ...</Title>
+        </Head>
+    </div>
+    <div v-else-if="status === 'success' && character && !error">
+        <Head>
+            <Title>d[any] - {{ character.name }}</Title>
+        </Head>
+        <div class="flex flex-row gap-4 justify-between">
+            <div></div>
+            <div class="flex lg:flex-row flex-col gap-6 items-center justify-center">
+                <div class="flex gap-6 items-center">
+                    <Avatar src="" icon="radix-icons:person" size="large" />
+                    <div class="flex flex-col">
+                        <span class="text-xl font-bold">{{ character.name }}</span>
+                        <span class="text-sm">De {{ character.username }}</span>
+                    </div>
+                    <div class="flex flex-col">
+                        <span class="font-bold">Niveau {{ character.level }}</span>
+                        <span>{{ character.race === -1 ? "Race inconnue" : characterConfig.peoples[character.race].name }}</span>
+                    </div>
+                </div>
+                <div class="flex gap-6 lg:border-l border-light-30 dark:border-dark-30 py-4 ps-4">
+                    <span class="flex flex-row items-center gap-2">PV: {{ character.health - character.values.hp }}/{{ character.health }}</span>
+                    <span class="flex flex-row items-center gap-2">Mana: {{ character.mana - character.values.mana }}/{{ character.mana }}</span>
+                </div>
+            </div>
+            <div  class="self-center">
+                <Tooltip side="right" message="Modifier" v-if="user && user.id === character.owner"><NuxtLink :to="{ name: 'character-id-edit', params: { id: character.id } }"><Button icon><Icon icon="radix-icons:pencil-2" /></Button></NuxtLink></Tooltip>
+            </div>
+        </div>
+        <div class="flex flex-1 flex-col justify-center gap-4 *:py-2">
+            <div class="grid 2xl:grid-cols-12 grid-cols-2 gap-4 items-center border-b border-light-30 dark:border-dark-30">
+                <div class="flex relative justify-between ps-4 gap-2 2xl:col-span-6 lg:col-span-2">
+                    <div class="flex flex-col items-center"><span class="2xl:text-2xl text-xl font-bold">+{{ character.modifier.strength }}</span><span class="text-sm 2xl:text-base">Force</span></div>
+                    <div class="flex flex-col items-center"><span class="2xl:text-2xl text-xl font-bold">+{{ character.modifier.dexterity }}</span><span class="text-sm 2xl:text-base">Dextérité</span></div>
+                    <div class="flex flex-col items-center"><span class="2xl:text-2xl text-xl font-bold">+{{ character.modifier.constitution }}</span><span class="text-sm 2xl:text-base">Constitution</span></div>
+                    <div class="flex flex-col items-center"><span class="2xl:text-2xl text-xl font-bold">+{{ character.modifier.intelligence }}</span><span class="text-sm 2xl:text-base">Intelligence</span></div>
+                    <div class="flex flex-col items-center"><span class="2xl:text-2xl text-xl font-bold">+{{ character.modifier.curiosity }}</span><span class="text-sm 2xl:text-base">Curiosité</span></div>
+                    <div class="flex flex-col items-center"><span class="2xl:text-2xl text-xl font-bold">+{{ character.modifier.charisma }}</span><span class="text-sm 2xl:text-base">Charisme</span></div>
+                    <div class="flex flex-col items-center"><span class="2xl:text-2xl text-xl font-bold">+{{ character.modifier.psyche }}</span><span class="text-sm 2xl:text-base">Psyché</span></div>
+                </div>
+                <div class="flex relative 2xl:border-l border-light-30 dark:border-dark-30 ps-4 2xl:col-span-2">
+                    <div class="flex flex-1 flex-row items-center justify-between">
+                        <div class="flex flex-col px-2 items-center"><span class="text-2xl font-bold">+{{ character.initiative }}</span><span>Initiative</span></div>
+                        <div class="flex flex-col px-2 items-center"><span class="text-2xl font-bold">{{ character.speed === false ? "Aucun déplacement" : `${character.speed} cases` }}</span><span>Course</span></div>
+                    </div>
+                    <!-- <div class="absolute top-0 left-0 bottom-0 right-0 bg-light-0 dark:bg-dark-0 bg-opacity-50 dark:bg-opacity-50 text-xl font-bold flex items-center justify-center">Les données secondaires arrivent bientôt.</div> -->
+                </div>
+                <div class="flex relative border-l border-light-30 dark:border-dark-30 ps-4 2xl:col-span-4">
+                        <div class="flex flex-col px-2">
+                            <span class="text-xl">Défense passive: <span class="text-2xl font-bold">{{ character.defense.static }}</span>/+<span class="text-2xl font-bold">{{ character.defense.passivedodge }}</span>/+<span class="text-2xl font-bold">{{ character.defense.passiveparry }}</span></span>
+                            <span class="text-xl">Défense active: <span class="float-right">+<span class="text-2xl font-bold">{{ character.defense.activedodge }}</span>/+<span class="text-2xl font-bold">{{ character.defense.activeparry }}</span></span></span>
+                        </div>
+                    </div>
+            </div>
+            <div class="flex flex-1 px-8">
+                <div class="flex flex-col pe-8 gap-4 py-8 w-80 border-r border-light-30 dark:border-dark-30">
+                    <div class="flex flex-col">
+                        <span class="text-lg font-semibold border-b border-light-30 dark:border-dark-30">Maitrise d'arme</span>
+                        <div class="grid grid-cols-2 gap-x-3 gap-y-1">
+                            <PreviewA v-if="character.mastery.strength + character.mastery.dexterity > 0" href="1. Règles/99. Annexes/4. Équipement#Les armes légères">Arme légère</PreviewA>
+                            <PreviewA v-if="character.mastery.strength + character.mastery.dexterity > 0" href="1. Règles/99. Annexes/4. Équipement#Les armes de jet">Arme de jet</PreviewA>
+                            <PreviewA v-if="character.mastery.strength + character.mastery.dexterity > 0" href="1. Règles/99. Annexes/4. Équipement#Les armes naturelles">Arme naturelle</PreviewA>
+                            <PreviewA v-if="character.mastery.strength > 1" href="1. Règles/99. Annexes/4. Équipement#Les armes">Arme standard</PreviewA>
+                            <PreviewA v-if="character.mastery.strength > 1" href="1. Règles/99. Annexes/4. Équipement#Les armes improvisées">Arme improvisée</PreviewA>
+                            <PreviewA v-if="character.mastery.strength > 2" href="1. Règles/99. Annexes/4. Équipement#Les armes lourdes">Arme lourde</PreviewA>
+                            <PreviewA v-if="character.mastery.strength > 3" href="1. Règles/99. Annexes/4. Équipement#Les armes à deux mains">Arme à deux mains</PreviewA>
+                            <PreviewA v-if="character.mastery.dexterity > 0 && character.mastery.strength > 1" href="1. Règles/99. Annexes/4. Équipement#Les armes maniables">Arme maniable</PreviewA>
+                            <PreviewA v-if="character.mastery.dexterity > 1 && character.mastery.strength > 1" href="1. Règles/99. Annexes/4. Équipement#Les armes à projectiles">Arme à projectiles</PreviewA>
+                            <PreviewA v-if="character.mastery.dexterity > 1 && character.mastery.strength > 2" href="1. Règles/99. Annexes/4. Équipement#Les armes longues">Arme longue</PreviewA>
+                            <PreviewA v-if="character.mastery.shield > 0" href="1. Règles/99. Annexes/4. Équipement#Les boucliers">Bouclier</PreviewA>
+                            <PreviewA v-if="character.mastery.shield > 0 && character.mastery.strength > 3" href="1. Règles/99. Annexes/4. Équipement#Les boucliers à deux mains">Bouclier à deux mains</PreviewA>
+                        </div>
+                    </div>
+                    <div v-if="character.mastery.armor > 0" class="flex flex-col">
+                        <span class="text-lg font-semibold border-b border-light-30 dark:border-dark-30">Maitrise d'armure</span>
+                        <div class="grid grid-cols-2 gap-x-3 gap-y-1">
+                            <PreviewA v-if="character.mastery.armor > 0" href="1. Règles/99. Annexes/4. Équipement#Les armures légères">Armure légère</PreviewA>
+                            <PreviewA v-if="character.mastery.armor > 1" href="1. Règles/99. Annexes/4. Équipement#Les armures">Armure standard</PreviewA>
+                            <PreviewA v-if="character.mastery.armor > 2" href="1. Règles/99. Annexes/4. Équipement#Les armures lourdes">Armure lourde</PreviewA>
+                        </div>
+                    </div>
+                    <div class="flex flex-col">
+                        <span class="text-lg font-semibold border-b border-light-30 dark:border-dark-30">Maitrise de sorts</span>
+                        <span>Sorts de précision: <span class="font-bold">{{ character.spellranks.precision }}</span></span>
+                        <span>Sorts de savoir: <span class="font-bold">{{ character.spellranks.knowledge }}</span></span>
+                        <span>Sorts d'instinct: <span class="font-bold">{{ character.spellranks.instinct }}</span></span>
+                    </div>
+                    <div class="flex flex-col">
+                        <span class="text-lg font-semibold border-b border-light-30 dark:border-dark-30 mb-2 flex items-center gap-4">Résistances (Attaque/Défense) <Tooltip side="right" message="Les défenses affichées incluent déjà leur modifieur de statistique."><Icon icon="radix-icons:question-mark-circled" /></Tooltip></span>
+                        <div class="grid grid-cols-3 gap-1">
+                            <div class="flex flex-col px-2 items-center text-sm text-light-70 dark:text-dark-70" v-for="(value, resistance) of character.resistance"><span class="font-bold text-base text-light-100 dark:text-dark-100">+{{ value[0] }}/+{{ value[1] + character.modifier[characterConfig.resistances[resistance].statistic as MainStat] }}</span><span>{{ characterConfig.resistances[resistance].name }}</span></div>
+                        </div>
+                    </div>
+                    <div class="flex flex-col">
+                        <span class="text-lg font-semibold border-b border-light-30 dark:border-dark-30 mb-2">Compétences</span>
+                        <div class="grid grid-cols-3 gap-1">
+                            <div class="flex flex-col px-2 items-center text-sm text-light-70 dark:text-dark-70" v-for="(value, ability) of character.abilities"><span class="font-bold text-base text-light-100 dark:text-dark-100">+{{ value }}</span><span>{{ characterConfig.abilities[ability].name }}</span></div>
+                        </div>
+                    </div>
+                </div>
+                <TabsRoot default-value="features" class="w-[60rem]">
+                    <TabsList class="flex flex-row gap-4 relative px-4">
+                        <TabsIndicator class="absolute px-8 left-0 h-[3px] bottom-0 w-[--radix-tabs-indicator-size] translate-x-[--radix-tabs-indicator-position] transition-[width,transform] duration-300 bg-accent-blue"></TabsIndicator>
+                        <TabsTrigger value="features" class="px-2 py-1 border-b border-transparent hover:border-accent-blue">Aptitudes</TabsTrigger>
+                        <TabsTrigger value="spells" class="px-2 py-1 border-b border-transparent hover:border-accent-blue">Sorts</TabsTrigger>
+                        <TabsTrigger value="notes" class="px-2 py-1 border-b border-transparent hover:border-accent-blue">Notes</TabsTrigger>
+                    </TabsList>
+                    <TabsContent value="features">
+                        <div class="flex flex-1 flex-col ps-8 gap-4 py-8">
+                            <div class="grid grid-cols-3 gap-2">
+                                <div class="flex flex-col">
+                                    <span class="text-lg font-semibold">Actions</span>
+                                    <span class="text-sm text-light-70 dark:text-dark-70">Attaquer - Saisir - Faire chuter - Déplacer - Courir - Pas de coté - Lancer un sort - S'interposer - Se transformer - Utiliser un objet - Anticiper une action - Improviser</span>
+                                    <MarkdownRenderer :content="character.features.action.join('\n')" />
+                                </div>
+                                <div class="flex flex-col">
+                                    <span class="text-lg font-semibold">Réactions</span>
+                                    <span class="text-sm text-light-70 dark:text-dark-70">Parade - Esquive - Saisir une opportunité - Prendre en tenaille - Intercepter - Désarmer</span>
+                                    <MarkdownRenderer :content="character.features.reaction.join('\n')" />
+                                </div>
+                                <div class="flex flex-col">
+                                    <span class="text-lg font-semibold">Actions libre</span>
+                                    <span class="text-sm text-light-70 dark:text-dark-70">Analyser une situation - Communiquer</span>
+                                    <MarkdownRenderer :content="character.features.freeaction.join('\n')" />
+                                </div>
+                            </div>
+                            <div class="flex flex-col">
+                                <span class="text-lg font-semibold">Aptitudes</span>
+                                <MarkdownRenderer :content="character.features.misc.map(e => `> ${e}`).join('\n\n')" />
+                            </div>
+                        </div>
+                    </TabsContent>
+                    <TabsContent v-if="character.spells.length > 0" value="spells">
+                        <div class="flex flex-1 flex-col ps-8 gap-4 py-8">
+                            <div class="flex flex-col">
+                                <div class="pb-4 px-2 mt-4 border-b last:border-none border-light-30 dark:border-dark-30 flex flex-col" v-for="spell of character.spells.map(e => characterConfig.spells.find((f: SpellConfig) => f.id === e)).filter(e => !!e)">
+                                    <div class="flex flex-row justify-between">
+                                        <span class="text-lg font-bold">{{ spell.name }}</span>
+                                        <div class="flex flex-row items-center gap-6">
+                                            <div class="flex flex-row text-sm gap-2">
+                                                <span v-for="element of spell.elements" :class="elementTexts[element].class">{{ elementTexts[element].text }}</span>
+                                            </div>
+                                            <div class="flex flex-row text-sm gap-1">
+                                                <span class="">Rang {{ spell.rank }}</span><span>/</span>
+                                                <span class="">{{ spellTypeTexts[spell.type] }}</span><span>/</span>
+                                                <span class="">{{ spell.cost }} mana</span><span>/</span>
+                                                <span class="">{{ typeof spell.speed === 'string' ? spell.speed : `${spell.speed} minutes` }}</span>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <MarkdownRenderer :content="spell.effect" />
+                                </div>
+                            </div>
+                        </div>
+                    </TabsContent>
+                    <TabsContent value="notes">
+                        <div class="flex flex-1 flex-col ps-8 gap-4 py-8">
+                            <MarkdownRenderer :content="character.notes" />
+                        </div>
+                    </TabsContent>
+                </TabsRoot>
+            </div>
+        </div>
+    </div>
+    <div v-else>
+        <Head>
+            <Title>d[any] - Erreur</Title>
+        </Head>
+        <div>Erreur de chargement</div>
+    </div>
+</template>

pages/character/index.client.vue

@@ -0,0 +1,95 @@
+<script setup lang="ts">
+import { Icon } from '@iconify/vue/dist/iconify.js';
+
+definePageMeta({
+    guestsGoesTo: '/user/login',
+})
+const { add } = useToast();
+const { user } = useUserSession();
+
+const { data: characters, error, status } = await useFetch(`/api/character`);
+
+async function deleteCharacter(id: number)
+{
+    status.value = "pending";
+    await useRequestFetch()(`/api/character/${id}`, { method: 'delete' });
+    status.value = "success";
+    add({ content: 'Personnage supprimé', type: 'info', duration: 25000, timer: true, });
+    characters.value = characters.value?.filter(e => e.id !== id);
+}
+async function duplicateCharacter(id: number)
+{
+    status.value = "pending";
+    const newId = await useRequestFetch()(`/api/character/${id}/duplicate`, { method: 'post' });
+    status.value = "success";
+    add({ content: 'Personnage dupliqué', type: 'info', duration: 25000, timer: true, });
+    useRouter().push({ name: 'character-id', params: { id: newId } });
+}
+</script>
+
+<template>
+    <Head>
+        <Title>d[any] - Mes personnages</Title>
+    </Head>
+    <div class="flex flex-col">
+        <div class="flex align-center justify-center">
+            <NuxtLink v-if="user?.state === 1" :to="{ name: 'character-id-edit', params: { id: 'new' } }"><Button>Nouveau personnage</Button></NuxtLink>
+            <Tooltip v-else side="top" message="Veuillez valider votre email avant de pouvoir créer un personnage."><Button disabled>Nouveau personnage</Button></Tooltip>
+        </div>
+        <div v-if="status === 'pending'" class="flex flex-1 justify-center align-center">
+            <Loading size="large" />
+        </div>
+        <div v-else-if="status === 'success'" class="grid p-6 2xl:grid-cols-3 lg:grid-cols-2 grid-cols-1 gap-4 w-full">
+            <div class="border border-light-30 dark:border-dark-30 p-3 flex flex-row gap-4" v-for="character of characters">
+                <Avatar size="large" icon="radix-icons:person" src="" />
+                <div class="flex flex-1 flex-shrink flex-col truncate">
+                    <NuxtLink class="text-xl font-bold hover:text-accent-blue truncate" :to="{ name: 'character-id', params: { id: character.id } }" :title="character.name">{{ character.name }}</NuxtLink>
+                    <span class="text-sm truncate">Niveau {{ character.level }}</span>
+                </div>
+                <AlertDialogRoot>
+                    <DropdownMenuRoot>
+                        <DropdownMenuTrigger class="self-start">
+                            <Button icon><Icon icon="radix-icons:dots-vertical" /></Button>
+                        </DropdownMenuTrigger>
+
+                        <DropdownMenuPortal>
+                            <DropdownMenuContent align="end" side="bottom" class="z-50 outline-none bg-light-20 dark:bg-dark-20 will-change-[opacity,transform] data-[side=top]:animate-slideDownAndFade data-[side=right]:animate-slideLeftAndFade data-[side=bottom]:animate-slideUpAndFade data-[side=left]:animate-slideRightAndFade border border-light-35 dark:border-dark-35">
+                                <DropdownMenuItem @select="useRouter().push({ name: 'character-id-edit', params: { id: character.id } })" class="cursor-pointer text-base text-light-100 dark:text-dark-100 leading-none flex items-baseline py-1.5 relative ps-7 pe-4 select-none outline-none data-[disabled]:text-light-60 dark:data-[disabled]:text-dark-60 data-[disabled]:pointer-events-none data-[highlighted]:bg-light-35 dark:data-[highlighted]:bg-dark-35">
+                                    <Icon icon="radix-icons:pencil-1" class="absolute left-1.5" />
+                                    <span>Editer</span>
+                                </DropdownMenuItem>
+                                <DropdownMenuItem @select="duplicateCharacter(character.id)" class="cursor-pointer text-base text-light-100 dark:text-dark-100 leading-none flex items-center py-1.5 relative ps-7 pe-4 select-none outline-none data-[disabled]:text-light-60 dark:data-[disabled]:text-dark-60 data-[disabled]:pointer-events-none data-[highlighted]:bg-light-35 dark:data-[highlighted]:bg-dark-35">
+                                    <Icon icon="radix-icons:clipboard-copy" class="absolute left-1.5" />
+                                    <span>Dupliquer</span>
+                                </DropdownMenuItem>
+                                <AlertDialogTrigger>
+                                    <DropdownMenuItem class="cursor-pointer text-base text-light-red dark:text-dark-red leading-none flex items-center py-1.5 relative ps-7 pe-4 select-none outline-none data-[disabled]:text-light-60 dark:data-[disabled]:text-dark-60 data-[disabled]:pointer-events-none data-[highlighted]:bg-light-red dark:data-[highlighted]:bg-dark-red data-[highlighted]:bg-opacity-30 dark:data-[highlighted]:bg-opacity-30">
+                                        <Icon icon="radix-icons:trash" class="absolute left-1.5" />
+                                        <span>Supprimer</span>
+                                    </DropdownMenuItem>
+                                </AlertDialogTrigger>
+
+                                <DropdownMenuArrow class="fill-light-35 dark:fill-dark-35" />
+                            </DropdownMenuContent>
+                        </DropdownMenuPortal>
+                    </DropdownMenuRoot>
+                    <AlertDialogPortal>
+                        <AlertDialogOverlay class="bg-light-0 dark:bg-dark-0 opacity-70 fixed inset-0 z-40" />
+                        <AlertDialogContent
+                            class="data-[state=open]:animate-contentShow fixed top-[50%] left-[50%] max-h-[85vh] w-[90vw] max-w-[800px] translate-x-[-50%] translate-y-[-50%] bg-light-10 dark:bg-dark-10 border border-light-30 dark:border-dark-30 p-6 z-50 text-light-100 dark:text-dark-100">
+                            <AlertDialogTitle class="text-3xl font-light relative -top-2">Supprimer {{ character.name }} ?</AlertDialogTitle>
+                            <div class="flex flex-1 justify-end gap-4">
+                                <AlertDialogCancel asChild><Button>Non</Button></AlertDialogCancel>
+                                <AlertDialogAction asChild><Button @click="() => deleteCharacter(character.id)" class="border-light-red dark:border-dark-red hover:border-light-red dark:hover:border-dark-red hover:bg-light-redBack dark:hover:bg-dark-redBack text-light-red dark:text-dark-red focus:shadow-light-red dark:focus:shadow-dark-red">Oui</Button></AlertDialogAction>
+                            </div>
+                        </AlertDialogContent>
+                    </AlertDialogPortal>
+                </AlertDialogRoot>
+            </div>
+        </div>
+        <div v-else>
+            <span>Erreur de chargement</span>
+            <span>{{ error?.message }}</span>
+        </div>
+    </div>
+</template>

pages/character/list.client.vue

@@ -0,0 +1,27 @@
+<script setup lang="ts">
+const { data: characters, error, status } = await useFetch(`/api/character`, { params: { visibility: "public" } });
+</script>
+
+<template>
+    <Head>
+        <Title>d[any] - Liste des personnages</Title>
+    </Head>
+    <div class="flex flex-col">
+        <div v-if="status === 'pending'" class="flex flex-1 justify-center align-center">
+            <Loading size="large" />
+        </div>
+        <div v-else-if="status === 'success'" class="grid p-6 2xl:grid-cols-3 lg:grid-cols-2 grid-cols-1 gap-4 w-full">
+            <div class="border border-light-30 dark:border-dark-30 p-3 flex flex-row gap-4" v-for="character of characters">
+                <Avatar size="large" icon="radix-icons:person" src="" />
+                <div class="flex flex-1 flex-shrink flex-col truncate">
+                    <NuxtLink class="text-xl font-bold hover:text-accent-blue truncate" :to="{ name: 'character-id', params: { id: character.id } }" :title="character.name">{{ character.name }}</NuxtLink>
+                    <span class="text-sm truncate">Niveau {{ character.progress.level }}</span>
+                </div>
+            </div>
+        </div>
+        <div v-else>
+            <span>Erreur de chargement</span>
+            <span>{{ error?.message }}</span>
+        </div>
+    </div>
+</template>

pages/explore/edit/index.vue

@@ -5,99 +5,74 @@
 	<ClientOnly>
 		<CollapsibleRoot asChild class="flex flex-1 flex-col xl:-mx-12 xl:-my-8 lg:-mx-8 lg:-my-6 -mx-6 -my-3  overflow-hidden" v-model="open">
 			<div>
-				<div class="z-50 md:hidden flex w-full items-center justify-between h-12 border-b border-light-35 dark:border-dark-35">
-					<div class="flex items-center px-2">
+				<div class="z-50 flex w-full items-center justify-between border-b border-light-35 dark:border-dark-35 px-2">
+					<div class="flex items-center px-2 gap-4">
 						<CollapsibleTrigger asChild>
-							<Button icon class="ms-2 !bg-transparent group">
+							<Button icon class="!bg-transparent group md:hidden">
 								<Icon class="group-data-[state=open]:hidden" icon="radix-icons:hamburger-menu" />
 								<Icon class="group-data-[state=closed]:hidden" icon="radix-icons:cross-1" />
 							</Button>
 						</CollapsibleTrigger>
+						<NuxtLink class="text-light-100 dark:text-dark-100 hover:text-opacity-70 m-2 flex items-center gap-4" aria-label="Accueil" :to="{ path: '/', force: true }">
+							<Avatar src="/logo.dark.svg" class="dark:block hidden" />
+							<Avatar src="/logo.light.svg" class="block dark:hidden" />
+							<span class="text-xl max-md:hidden">d[any]</span>
+						</NuxtLink>
 					</div>
-					<div class="flex items-center px-2">
-						<Tooltip message="Changer de theme" side="left"><ThemeSwitch /></Tooltip>
+					<div class="flex items-center px-2 gap-4">
+						<NuxtLink class="text-light-100 dark:text-dark-100 hover:text-light-70 dark:hover:text-dark-70" :to="{ name: 'user-login' }">{{ user!.username }}</NuxtLink>
 					</div>
 				</div>
 				<div class="flex flex-1 flex-row relative overflow-hidden">
 					<CollapsibleContent asChild forceMount>
-						<div class=" overflow-hidden bg-light-0 dark:bg-dark-0 z-40 xl:w-96 md:w-[15em] max-h-full w-full border-r border-light-30 dark:border-dark-30 flex flex-col justify-between max-md:absolute max-md:-top-0 max-md:-bottom-0 md:left-0 max-md:data-[state=closed]:-left-full max-md:transition-[left] max-md:z-40 max-md:data-[state=open]:left-0">
-							<div class="flex flex-col gap-4 xl:px-6 px-3 py-4">
-								<div class="flex justify-between items-center max-md:hidden">
-									<div class=" text-light-100 dark:text-dark-100 hover:text-opacity-70 max-md:ps-6" aria-label="Accueil">
-										<Avatar src="/logo.dark.svg" class="dark:block hidden" />
-										<Avatar src="/logo.light.svg" class="block dark:hidden" />
-									</div>
-									<div class="flex gap-4 items-center">
-										<Tooltip message="Changer de theme" side="left"><ThemeSwitch /></Tooltip>
-									</div>
+						<div class="bg-light-0 dark:bg-dark-0 z-40 w-screen md:w-[18rem] border-r border-light-30 dark:border-dark-30 flex flex-col justify-between my-2 max-md:data-[state=closed]:hidden">
+							<div class="flex-1 px-2 max-w-full max-h-full overflow-y-auto overflow-x-hidden">
+								<div class="flex flex-row justify-between items-center pt-2 pb-4 mb-2 px-2 gap-4 border-b border-light-35 dark:border-dark-35">
+									<Button @click="router.push({ name: 'explore-path', params: { path: selected ? getPath(selected) : 'index' } })">Quitter</Button>
+									<Button @click="save(true);">Enregistrer</Button>
+									<Tooltip side="top" message="Nouveau">
+										<DropdownMenu align="end" side="bottom" :options="[{
+											type: 'item',
+											label: 'Markdown',
+											kbd: 'Ctrl+N',
+											icon: 'radix-icons:file-text',
+											select: () => add('markdown'),
+										}, {
+											type: 'item',
+											label: 'Dossier',
+											kbd: 'Ctrl+Shift+N',
+											icon: 'lucide:folder',
+											select: () => add('folder'),
+										}, {
+											type: 'item',
+											label: 'Canvas',
+											icon: 'ph:graph-light',
+											select: () => add('canvas'),
+										}, {
+											type: 'item',
+											label: 'Carte',
+											icon: 'lucide:map',
+											select: () => add('map'),
+										}, {
+											type: 'item',
+											label: 'Fichier',
+											icon: 'radix-icons:file',
+											select: () => add('file'),
+										}]">
+											<Button icon><Icon class="w-5 h-5" icon="radix-icons:plus" /></Button>
+										</DropdownMenu>
+									</Tooltip>
 								</div>
-							</div>
-							<div class="flex flex-1 flex-col max-w-full max-h-full overflow-hidden py-3" v-if="navigation">
-								<div class="flex flex-row justify-between items-center mb-4 px-6">
-									<div class="flex flex-1 flex-row justify-start items-center gap-4">
-										<Tooltip side="top" message="Annuler (Ctrl+Shift+W)" ><Button icon @click="router.go(-1)"><Icon class="w-5 h-5" icon="radix-icons:arrow-left" /></Button></Tooltip>
-										<Tooltip side="top" message="Enregistrer (Ctrl+S)" ><Button icon :loading="saveStatus === 'pending'" @click="save(true)"><Icon class="w-5 h-5" icon="radix-icons:check" /></Button></Tooltip>
-										<span v-if="edited" class="text-sm text-light-60 dark:text-dark-60 italic">Modifications non enregistrées</span>
-									</div>
-									<div class="flex flex-row justify-end items-center gap-4">
-										<AlertDialogRoot v-if="selected">
-											<Tooltip side="top" message="Supprimer"><AlertDialogTrigger as="span"><Button icon class="border-light-red dark:border-dark-red hover:border-light-red dark:hover:border-dark-red hover:bg-light-redBack dark:hover:bg-dark-redBack text-light-red dark:text-dark-red focus:shadow-light-red dark:focus:shadow-dark-red" ><Icon class="w-5 h-5" icon="radix-icons:trash" /></Button></AlertDialogTrigger></Tooltip>
-											<AlertDialogPortal>
-												<AlertDialogOverlay  class="bg-light-0 dark:bg-dark-0 opacity-70 fixed inset-0 z-40" />
-												<AlertDialogContent class="data-[state=open]:animate-contentShow fixed top-[50%] left-[50%] max-h-[85vh] w-[90vw] max-w-[800px] translate-x-[-50%] translate-y-[-50%] bg-light-10 dark:bg-dark-10 border border-light-30 dark:border-dark-30 p-6 z-50 text-light-100 dark:text-dark-100 flex md:flex-row flex-col gap-4 items-center">
-													<AlertDialogTitle class="text-xl font-semibold">Supprimer <span>{{ selected.title }}</span><span v-if="selected.children"> et tous ces enfants</span> ?</AlertDialogTitle>
-													<div class="flex flex-1 flex-row gap-4 justify-end">
-														<AlertDialogAction asChild @click="() => { navigation = tree.remove(navigation, getPath(selected!)); selected = undefined; }"><Button class="border-light-red dark:border-dark-red hover:border-light-red dark:hover:border-dark-red hover:bg-light-redBack dark:hover:bg-dark-redBack text-light-red dark:text-dark-red focus:shadow-light-red dark:focus:shadow-dark-red">Oui</Button></AlertDialogAction>
-														<AlertDialogCancel asChild><Button>Non</Button></AlertDialogCancel>
-													</div>
-												</AlertDialogContent>
-											</AlertDialogPortal>
-										</AlertDialogRoot>
-										<Tooltip side="top" message="Nouveau">
-											<DropdownMenu align="center" side="bottom" :options="[{
-												type: 'item',
-												label: 'Markdown',
-												kbd: 'Ctrl+N',
-												icon: 'radix-icons:file-text',
-												select: () => add('markdown'),
-											}, {
-												type: 'item',
-												label: 'Dossier',
-												kbd: 'Ctrl+Shift+N',
-												icon: 'lucide:folder',
-												select: () => add('folder'),
-											}, {
-												type: 'item',
-												label: 'Canvas',
-												icon: 'ph:graph-light',
-												select: () => add('canvas'),
-											}, {
-												type: 'item',
-												label: 'Carte',
-												icon: 'lucide:map',
-												select: () => add('map'),
-											}, {
-												type: 'item',
-												label: 'Fichier',
-												icon: 'radix-icons:file',
-												select: () => add('file'),
-											}]">
-												<Button icon><Icon class="w-5 h-5" icon="radix-icons:plus" /></Button>
-											</DropdownMenu>
-										</Tooltip>
-									</div>
-								</div>
-								<DraggableTree class="ps-4 pe-2 xl:text-base text-sm" 
-								:items="navigation ?? undefined" :get-key="(item: Partial<TreeItemEditable>) => item.path !== undefined ? getPath(item as TreeItemEditable) : ''" @updateTree="drop" 
-								v-model="selected" :defaultExpanded="defaultExpanded" >
-									<template #default="{ handleToggle, handleSelect, isExpanded, isSelected, isDragging, item }">
-										<div class="flex flex-1 items-center px-2 max-w-full pe-4" :class="{ 'opacity-50': isDragging }" :style="{ 'padding-left': `${item.level - 0.5}em` }">
-											<span class="py-2 px-2" @click="handleToggle" v-if="item.hasChildren" >
-												<Icon :icon="isExpanded ? 'lucide:folder-open' : 'lucide:folder'"/>
-											</span>
-											<Icon v-else-if="iconByType[item.value.type]" :icon="iconByType[item.value.type]" class="group-[:hover]:text-accent-purple mx-2" @click="handleSelect" />
-											<div class="pl-3 py-1 flex-1 truncate" :title="item.value.title" @click="handleSelect" :class="{ 'font-semibold': item.hasChildren }">
-												{{ item.value.title }}
+								<DraggableTree class="ps-4 text-sm" :items="navigation ?? undefined" :get-key="(item: Partial<TreeItemEditable>) => item.path !== undefined ? getPath(item as TreeItemEditable) : ''" @updateTree="drop" 
+								v-model="selected" :defaultExpanded="defaultExpanded" :get-children="(item: Partial<TreeItemEditable>) => item.type === 'folder' ? item.children : undefined" >
+									<template #default="{ handleToggle, handleSelect, isExpanded, isDragging, item }">
+										<div class="flex flex-1 items-center overflow-hidden" :class="{ 'opacity-50': isDragging }" :style="{ 'padding-left': `${item.level / 2 - 0.5}em` }">
+											<div class="flex flex-1 items-center hover:border-accent-blue hover:text-accent-purple group-data-[selected]:text-accent-blue">
+												<Icon @click="handleToggle" v-if="item.hasChildren" icon="radix-icons:chevron-right" :class="{ 'rotate-90': isExpanded }" class="h-4 w-4 transition-transform absolute" :style="{ 'left': `${item.level / 2 - 1.5}em` }" />
+												<Icon v-else-if="iconByType[item.value.type]" :icon="iconByType[item.value.type]" class="w-5 h-5" @click="handleSelect" />
+												<div class="pl-1.5 py-1.5 flex-1 truncate" :title="item.value.title" @click="handleSelect" :class="{ 'font-semibold': item.hasChildren }">
+													{{ item.value.title }}
+												</div>
 											</div>
 											<div class="flex gap-2">
 												<span @click="item.value.private = !item.value.private">
@@ -113,7 +88,7 @@
 									</template>
 									<template #hint="{ instruction }">
 										<div v-if="instruction" class="absolute h-full w-full top-0 right-0 border-light-50 dark:border-dark-50" :style="{
-												width: `calc(100% - ${instruction.currentLevel - 1}em)`
+												width: `calc(100% - ${instruction.currentLevel / 2 - 1.5}em)`
 											}" :class="{
 												'!border-b-4': instruction?.type === 'reorder-below',
 												'!border-t-4': instruction?.type === 'reorder-above',
@@ -122,6 +97,10 @@
 									</template>
 								</DraggableTree>
 							</div>
+							<div class="xl:px-12 px-6 pt-4 pb-2 text-center text-xs text-light-60 dark:text-dark-60">
+								<NuxtLink class="hover:underline italic" :to="{ name: 'roadmap' }">Roadmap</NuxtLink> - <NuxtLink class="hover:underline italic" :to="{ name: 'legal' }">Mentions légales</NuxtLink>
+								<p>Copyright Peaceultime - 2025</p>
+							</div>
 						</div>
 					</CollapsibleContent>
 					<div class="flex flex-1 flex-row max-h-full overflow-hidden">
@@ -148,7 +127,7 @@
 										<div class="flex flex-row justify-between items-center gap-x-4">
 											<div v-if="selected.customPath" class="flex lg:items-center truncate">
 												<pre class="md:text-base text-sm truncate" style="direction: rtl">/{{ selected.parent !== '' ? selected.parent + '/' : '' }}</pre>
-												<TextInput v-model="selected.name" @input="(e) => {
+												<TextInput v-model="selected.name" @input="(e: Event) => {
 													if(selected && selected.customPath)
 													{
 														selected.name = parsePath(selected.name);
@@ -157,14 +136,35 @@
 												}" class="mx-0 font-mono"/>
 											</div>
 											<pre v-else class="md:text-base text-sm truncate" style="direction: rtl">{{ getPath(selected) }}/</pre>
-											<DropdownMenu align="end" :options="[{
-												type: 'checkbox',
-												label: 'URL custom',
-												select: (state: boolean) => { selected!.customPath = state; if(!state) selected!.name = parsePath(selected!.title) },
-												checked: selected.customPath
-											}]">
-												<Button class="" icon><Icon icon="radix-icons:dots-vertical"/></Button>
-											</DropdownMenu>
+											<div class="flex gap-4">
+												<Dialog :title="`Supprimer '${selected.title}'${selected.children?.length ?? 0 > 0 ? ' et ses enfants' : ''}`">
+													<template #trigger><Button icon class="bg-light-red dark:bg-dark-red !bg-opacity-40 border-light-red dark:border-dark-red hover:bg-light-red dark:hover:bg-dark-red hover:!bg-opacity-70 hover:border-light-red dark:hover:border-dark-red"><Icon icon="radix-icons:trash" /></Button></template>
+													<template #default>
+														<div class="flex gap-4">
+															<DialogClose><Button @click="navigation = tree.remove(navigation, getPath(selected)); selected = undefined;" class="bg-light-red dark:bg-dark-red !bg-opacity-40 border-light-red dark:border-dark-red hover:bg-light-red dark:hover:bg-dark-red hover:!bg-opacity-70 hover:border-light-red dark:hover:border-dark-red">Oui</Button></DialogClose>
+															<DialogClose><Button>Non</Button></DialogClose>
+														</div>
+													</template>
+												</Dialog>
+												<Dialog title="Préférences Markdown" v-if="selected.type === 'markdown'">
+													<template #trigger><Button icon><Icon icon="radix-icons:gear" /></Button></template>
+													<template #default>
+														<Select label="Editeur de markdown" :modelValue="preferences.markdown.editing" @update:model-value="v => preferences.markdown.editing = (v as 'reading' | 'editing' | 'split')">
+															<SelectItem label="Mode lecture" value="reading" />
+															<SelectItem label="Mode edition" value="editing" />
+															<SelectItem label="Ecran partagé" value="split" />
+														</Select>
+													</template>
+												</Dialog>
+												<DropdownMenu align="end" :options="[{
+													type: 'checkbox',
+													label: 'URL custom',
+													select: (state: boolean) => { selected!.customPath = state; if(!state) selected!.name = parsePath(selected!.title) },
+													checked: selected.customPath
+												}]">
+													<Button icon><Icon icon="radix-icons:dots-vertical"/></Button>
+												</DropdownMenu>
+											</div>
 										</div>
 									</div>
 								</CollapsibleContent>
@@ -175,24 +175,32 @@
 										<Loading />
 									</div>
 									<span v-else-if="contentError">{{ contentError }}</span>
-									<SplitterGroup direction="horizontal" class="flex-1 w-full flex" v-else-if="selected.content !== undefined">
-										<SplitterPanel asChild collapsible :collapsedSize="0" :minSize="20" v-slot="{ isCollapsed }" :defaultSize="50">
-											<Editor v-model="selected.content" placeholder="Commencer votre aventure ..." class="flex-1 bg-transparent appearance-none outline-none max-h-full resize-none !overflow-y-auto" :class="{ 'hidden': isCollapsed }" />
-										</SplitterPanel>
-										<SplitterResizeHandle class="bg-light-35 dark:bg-dark-35 w-px xl!mx-4 mx-2" />
-										<SplitterPanel asChild collapsible :collapsedSize="0" :minSize="20" v-slot="{ isCollapsed }">
-											<div class="flex-1 max-h-full !overflow-y-auto px-8" :class="{ 'hidden': isCollapsed }"><MarkdownRenderer :content="(debounced as string)" :proses="{ 'a': FakeA }" /></div>
-										</SplitterPanel>
-									</SplitterGroup>
+									<template v-else-if="preferences.markdown.editing === 'editing'">
+										<Editor v-model="selected.content" autofocus class="flex-1 bg-transparent appearance-none outline-none max-h-full resize-none !overflow-y-auto lg:mx-16 xl:mx-32 2xl:mx-64" />
+									</template>
+									<template v-else-if="preferences.markdown.editing === 'reading'">
+										<div class="flex-1 max-h-full !overflow-y-auto px-4 xl:px-32 2xl:px-64"><MarkdownRenderer :content="(debounced as string)" :proses="{ 'a': FakeA }" /></div>
+									</template>
+									<template v-else-if="preferences.markdown.editing === 'split'">
+										<SplitterGroup direction="horizontal" class="flex-1 w-full flex">
+											<SplitterPanel asChild collapsible :collapsedSize="0" :minSize="20" v-slot="{ isCollapsed }" :defaultSize="50">
+												<Editor v-model="selected.content" autofocus class="flex-1 bg-transparent appearance-none outline-none max-h-full resize-none !overflow-y-auto" :class="{ 'hidden': isCollapsed }" />
+											</SplitterPanel>
+											<SplitterResizeHandle class="bg-light-35 dark:bg-dark-35 w-px xl!mx-4 mx-2" />
+											<SplitterPanel asChild collapsible :collapsedSize="0" :minSize="20" v-slot="{ isCollapsed }">
+												<div class="flex-1 max-h-full !overflow-y-auto px-8" :class="{ 'hidden': isCollapsed }"><MarkdownRenderer :content="(debounced as string)" :proses="{ 'a': FakeA }" /></div>
+											</SplitterPanel>
+										</SplitterGroup>
+									</template>
 								</template>
 								<template v-else-if="selected.type === 'canvas'">
-									<CanvasEditor :canvas="JSON.parse(selected.content ?? '{}')" />
+									<CanvasEditor v-if="selected.content" :modelValue="selected.content" :path="getPath(selected)" />
 								</template>
 								<template v-else-if="selected.type === 'map'">
 									<span class="flex flex-1 justify-center items-center"><ProseH3>Editeur de carte en cours de développement</ProseH3></span>
 								</template>
 								<template v-else-if="selected.type === 'file'">
-									<span>Modifier le contenu :</span><input type="file" @change="(e) => console.log((e.target as HTMLInputElement).files?.length)" />
+									<span>Modifier le contenu :</span><input type="file" @change="(e: Event) => console.log((e.target as HTMLInputElement).files?.length)" />
 								</template>
 							</div>
 						</div>
@@ -206,10 +214,10 @@
 <script setup lang="ts">
 import { Icon } from '@iconify/vue/dist/iconify.js';
 import type { Instruction } from '@atlaskit/pragmatic-drag-and-drop-hitbox/dist/types/tree-item';
-import { parsePath } from '#shared/general.utils';
-import type { ExploreContent, FileType, MarkdownContent, TreeItem } from '~/types/content';
-import { iconByType } from '#shared/general.utils';
+import { iconByType, convertContentFromText, convertContentToText, DEFAULT_CONTENT,parsePath } from '#shared/general.util';
+import type { ExploreContent, FileType, TreeItem } from '~/types/content';
 import FakeA from '~/components/prose/FakeA.vue';
+import type { Preferences } from '~/types/general';
 
 export type TreeItemEditable = TreeItem &
 {
@@ -224,6 +232,8 @@ definePageMeta({
 	layout: 'null',
 });
 
+const { user } = useUserSession();
+
 const router = useRouter();
 const open = ref(true), topOpen = ref(true);
 
@@ -235,6 +245,8 @@ const navigation = ref<TreeItemEditable[]>(transform(JSON.parse(JSON.stringify(p
 const selected = ref<TreeItemEditable>(), edited = ref(false);
 const contentStatus = ref<'idle' | 'pending' | 'success' | 'error'>('idle'), contentError = ref<string>();
 
+const preferences = useCookie<Preferences>('preferences', { default: () => ({ markdown: { editing: 'split' }, canvas: { snap: true, size: 32 } }), watch: true, maxAge: 60*60*24*31 });
+
 watch(selected, async (value, old) => {
 	if(selected.value)
 	{
@@ -247,7 +259,7 @@ watch(selected, async (value, old) => {
 
 				if(storedEdit)
 				{
-					selected.value.content = storedEdit;
+					selected.value.content = convertContentFromText(selected.value.type, storedEdit);
 					contentStatus.value = 'success';
 				}
 				else
@@ -270,7 +282,7 @@ watch(selected, async (value, old) => {
 			//@ts-ignore
 			debounced.value = selected.value.content ?? '';
 		}
-		router.replace({ hash: '#' + encodeURIComponent(selected.value.path || getPath(selected.value)) });
+		router.replace({ hash: '#' + selected.value.path || getPath(selected.value) });
 	}
 	else
 	{
@@ -285,10 +297,10 @@ watch(debounced, () => {
 		sessionStorage.setItem(`editing:${encodeURIComponent(selected.value.path)}`, typeof debounced.value === 'string' ? debounced.value : JSON.stringify(debounced.value));
 });
 useShortcuts({
-    meta_s: { usingInput: true, handler: () => save(false) },
-    meta_n: { usingInput: true, handler: () => add('markdown') },
-    meta_shift_n: { usingInput: true, handler: () => add('folder') },
-    meta_shift_z: { usingInput: true, handler: () => router.push({ name: 'explore-path', params: { path: 'index' } }) }
+    meta_s: { usingInput: true, handler: () => save(false), prevent: true },
+    meta_n: { usingInput: true, handler: () => add('markdown'), prevent: true },
+    meta_shift_n: { usingInput: true, handler: () => add('folder'), prevent: true },
+    meta_shift_z: { usingInput: true, handler: () => router.push({ name: 'explore-path', params: { path: 'index' } }), prevent: true }
 })
 
 const tree = {
@@ -418,7 +430,7 @@ function add(type: FileType): void
 
 	const news = [...tree.search(navigation.value, 'title', 'Nouveau')].filter((e, i, a) => a.indexOf(e) === i);
 	const title = `Nouveau${news.length > 0 ? ' (' + news.length +')' : ''}`;
-	const item: TreeItemEditable = { navigable: true, private: false, parent: '', path: '', title: title, name: parsePath(title), type: type, order: 0, children: type === 'folder' ? [] : undefined, customPath: false, content: undefined, owner: -1, timestamp: new Date(), visit: 0 };
+	const item: TreeItemEditable = { navigable: true, private: false, parent: '', path: '', title: title, name: parsePath(title), type: type, order: 0, children: [], customPath: false, content: DEFAULT_CONTENT[type], owner: -1, timestamp: new Date(), visit: 0 };
 
 	if(!selected.value)
 	{
@@ -518,11 +530,13 @@ function rebuildPath(tree: TreeItemEditable[] | null | undefined, parentPath: st
 }
 async function save(redirect: boolean): Promise<void>
 {
+	//@ts-ignore
+	const map = (e: TreeItemEditable[]): TreeItemEditable[] => e.map(f => ({ ...f, content: f.content ? convertContentToText(f.type, f.content) : undefined, children: f.children ? map(f.children) : undefined }));
 	saveStatus.value = 'pending';
 	try {
 		const result = await $fetch(`/api/project`, {
 			method: 'post',
-			body: navigation.value,
+			body: map(navigation.value),
 		});
 		saveStatus.value = 'success';
 		edited.value = false;
@@ -531,12 +545,14 @@ async function save(redirect: boolean): Promise<void>
 		toaster.clear('error');
 		toaster.add({ type: 'success', content: 'Contenu enregistré', timer: true, duration: 10000 });
 
+		//@ts-ignore
 		complete.value = result as ExploreContent[];
 		if(redirect) router.go(-1);
 	} catch(e: any) {
 		toaster.add({
 			type: 'error', content: e.message, timer: true, duration: 10000
 		})
+		console.error(e);
 		saveStatus.value = 'error';
 	}
 }
@@ -553,10 +569,10 @@ const defaultExpanded = computed(() => {
 		return split;
 	}
 })
-watch(router.currentRoute, (value) => {
+/*watch(router.currentRoute, (value) => {
 	if(value && value.hash && navigation.value)
-		selected.value = tree.find(navigation.value, decodeURIComponent(value.hash.substring(1)));
+		selected.value = tree.find(navigation.value, value.hash.substring(1));
 	else
 		selected.value = undefined;
-}, { immediate: true });
+}, { immediate: true });*/
 </script>

pages/index.vue

@@ -2,9 +2,5 @@
     <Head>
         <Title>d[any] - Accueil</Title>
     </Head>
-    <div class="h-full w-full flex flex-1 flex-col justify-center items-center">
-        <Avatar src="/logo.dark.svg" class="dark:block hidden w-48 h-48" />
-        <Avatar src="/logo.light.svg" class="block dark:hidden w-48 h-48" />
-        <h1 class="text-5xl font-thin font-mono">Bienvenue</h1>
-    </div>
+    <h1 class="text-5xl font-thin font-mono">Bienvenue</h1>
 </template>

pages/user/changing-password.vue

@@ -8,8 +8,8 @@
             <ProseH4>Modification de mon mot de passe</ProseH4>
         </div>
         <form @submit.prevent="submit" class="flex flex-1 flex-col justify-center items-stretch">
-            <TextInput type="password" label="Ancien mot de passe" autocomplete="currentPassword" v-model="oldPasswd"/>
-            <TextInput type="password" label="Nouveau mot de passe" autocomplete="newPassword" v-model="newPasswd" :class="{ 'border-light-red dark:border-dark-red': error }"/>
+            <TextInput type="password" label="Ancien mot de passe" name="old-password" autocomplete="current-password" v-model="oldPasswd"/>
+            <TextInput type="password" label="Nouveau mot de passe" name="new-password" autocomplete="new-password" v-model="newPasswd" :class="{ 'border-light-red dark:border-dark-red': error }"/>
             <div class="grid grid-cols-2 flex-col font-light border border-light-35 dark:border-dark-35 px-4 py-2 m-4 ms-0 text-sm leading-[18px] lg:text-base order-8 col-span-2 md:col-span-1 md:order-none">
                 <span class="col-span-2">Prérequis de sécurité</span>
                 <span class="ps-4 flex items-center gap-2" :class="{'text-light-red dark:text-dark-red': !checkedLength}"><Icon v-show="!checkedLength" icon="radix-icons:cross-2" />8 à 128 caractères</span>
@@ -18,8 +18,8 @@
                 <span class="ps-4 flex items-center gap-2" :class="{'text-light-red dark:text-dark-red': !checkedDigit}"><Icon v-show="!checkedDigit" icon="radix-icons:cross-2" />Un chiffre</span>
                 <span class="ps-4 flex items-center gap-2" :class="{'text-light-red dark:text-dark-red': !checkedSymbol}"><Icon v-show="!checkedSymbol" icon="radix-icons:cross-2" />Un caractère special</span>
             </div>
-            <TextInput type="password" label="Repeter le nouveau mot de passe" autocomplete="newPassword" v-model="repeatPasswd" :class="{ 'border-light-red dark:border-dark-red': manualError }"/>
-            <Button class="border border-light-35 dark:border-dark-35 self-center" :loading="status === 'pending'">Mettre à jour mon mot de passe</Button>
+            <TextInput type="password" label="Repeter le nouveau mot de passe" autocomplete="new-password" v-model="repeatPasswd" :class="{ 'border-light-red dark:border-dark-red': manualError }"/>
+            <Button type="submit" class="border border-light-35 dark:border-dark-35 self-center" :loading="status === 'pending'">Mettre à jour mon mot de passe</Button>
         </form>
     </div>
 </template>

pages/user/login.vue

@@ -8,9 +8,9 @@
             <ProseH4>Connexion</ProseH4>
         </div>
         <form @submit.prevent="() => submit()" class="flex flex-1 flex-col justify-center items-stretch">
-            <TextInput type="text" label="Utilisateur ou email" autocomplete="username" v-model="state.usernameOrEmail"/>
-            <TextInput type="password" label="Mot de passe" autocomplete="current-password" v-model="state.password"/>
-            <Button class="border border-light-35 dark:border-dark-35 self-center" :loading="status === 'pending'">Se connecter</Button>
+            <TextInput type="text" label="Utilisateur ou email" name="username" autocomplete="username email" v-model="state.usernameOrEmail"/>
+            <TextInput type="password" label="Mot de passe" name="password" autocomplete="current-password" v-model="state.password"/>
+            <Button type="submit" class="border border-light-35 dark:border-dark-35 self-center" :loading="status === 'pending'">Se connecter</Button>
             <NuxtLink class="mt-4 text-center block text-sm font-semibold tracking-wide hover:text-accent-blue" :to="{ name: 'user-reset-password' }">Mot de passe oublié ?</NuxtLink>
             <NuxtLink class="mt-4 text-center block text-sm font-semibold tracking-wide hover:text-accent-blue" :to="{ name: 'user-register' }">Pas de compte ?</NuxtLink>
         </form>

pages/user/register.vue

@@ -8,9 +8,9 @@
             <ProseH4>Inscription</ProseH4>
         </div>
         <form @submit.prevent="() => submit()" class="grid flex-1 p-4 grid-cols-2 md:grid-cols-1 gap-4 md:gap-0">
-            <TextInput type="text" label="Nom d'utilisateur" autocomplete="username" v-model="state.username" class="w-full md:w-auto"/>
-            <TextInput type="email" label="Email" autocomplete="email" v-model="state.email" class="w-full md:w-auto"/>
-            <TextInput type="password" label="Mot de passe" autocomplete="new-password" v-model="state.password" class="w-full md:w-auto"/>
+            <TextInput type="text" label="Nom d'utilisateur" name="username" autocomplete="username" v-model="state.username" class="w-full md:w-auto"/>
+            <TextInput type="email" label="Email" name="email" autocomplete="email" v-model="state.email" class="w-full md:w-auto"/>
+            <TextInput type="password" label="Mot de passe" name="password" autocomplete="new-password" v-model="state.password" class="w-full md:w-auto"/>
             <div class="grid grid-cols-2 flex-col font-light border border-light-35 dark:border-dark-35 px-4 py-2 m-4 ms-0 text-sm leading-[18px] lg:text-base order-8 col-span-2 md:col-span-1 md:order-none">
                 <span class="col-span-2">Prérequis de sécurité</span>
                 <span class="ps-4 flex items-center gap-2" :class="{'text-light-red dark:text-dark-red': !checkedLength}"><Icon v-show="!checkedLength" icon="radix-icons:cross-2" />8 à 128 caractères</span>
@@ -20,7 +20,7 @@
                 <span class="ps-4 flex items-center gap-2" :class="{'text-light-red dark:text-dark-red': !checkedSymbol}"><Icon v-show="!checkedSymbol" icon="radix-icons:cross-2" />Un caractère special</span>
             </div>
             <TextInput type="password" label="Confirmation du mot de passe" autocomplete="new-password" v-model="confirmPassword" class="w-full md:w-auto"/>
-            <Button class="border border-light-35 dark:border-dark-35 max-w-48 w-full order-9 col-span-2 md:col-span-1 m-auto" :loading="status === 'pending'">S'inscrire</Button>
+            <Button type="submit" class="border border-light-35 dark:border-dark-35 max-w-48 w-full order-9 col-span-2 md:col-span-1 m-auto" :loading="status === 'pending'">S'inscrire</Button>
             <span class="mt-4 order-10 flex justify-center items-center gap-4 col-span-2 md:col-span-1 m-auto">Vous avez déjà un compte ?<NuxtLink class="text-center block text-sm font-semibold tracking-wide hover:text-accent-blue" :to="{ name: 'user-login' }">Se connecter</NuxtLink></span>
         </form>
     </div>

plugins/autofocus.ts

@@ -0,0 +1,7 @@
+export default defineNuxtPlugin((nuxtApp) => {
+    nuxtApp.vueApp.directive('autofocus', {
+        mounted(el, binding) {
+            el.focus();
+        }
+    })
+})

server/api/auth/register.post.ts

@@ -5,6 +5,7 @@ import { usersDataTable, usersTable } from '~/db/schema';
 import { schema } from '~/schemas/registration';
 import { checkSession, logSession } from '~/server/utils/user';
 import type { UserSession, UserSessionRequired } from '~/types/auth';
+import sendMail from '~/server/tasks/mail';
 
 interface SuccessHandler
 {
@@ -82,7 +83,7 @@ export default defineEventHandler(async (e): Promise<Return> => {
                     id: emailId, timestamp,
                 }
             });
-            await runTask('mail', {
+            await sendMail({
                 payload: {
                     type: 'mail',
                     to: [body.data.email],

server/api/auth/request-reset.post.ts

@@ -3,6 +3,7 @@ import { eq, or } from 'drizzle-orm';
 import { z } from 'zod';
 import useDatabase from '~/composables/useDatabase';
 import { usersTable } from '~/db/schema';
+import sendMail from '~/server/tasks/mail';
 
 const schema = z.object({
     profile: z.string(),
@@ -32,7 +33,7 @@ export default defineEventHandler(async (e) => {
                     id, timestamp,
                 }
             });
-            await runTask('mail', {
+            await sendMail({
                 payload: {
                     type: 'mail',
                     data: {

server/api/auth/reset.post.ts

@@ -5,6 +5,7 @@ import { usersDataTable, usersTable } from '~/db/schema';
 import { schema } from '~/schemas/registration';
 import { checkSession, logSession } from '~/server/utils/user';
 import type { UserSession, UserSessionRequired } from '~/types/auth';
+import sendMail from '~/server/tasks/mail';
 
 interface SuccessHandler
 {
@@ -73,7 +74,7 @@ export default defineEventHandler(async (e): Promise<Return> => {
 
             logSession(e, await setUserSession(e, { user: { id: id.id, username: body.data.username, email: body.data.email, state: 0, signin: new Date(), permissions: [], lastTimestamp: new Date(), logCount: 1 } }) as UserSessionRequired);
 
-            await runTask('mail', {
+            await sendMail({
                 payload: {
                     type: 'mail',
                     to: [body.data.email],

server/api/character.get.ts

@@ -0,0 +1,95 @@
+import { and, eq, SQL, sql, type Operators } from 'drizzle-orm';
+import useDatabase from '~/composables/useDatabase';
+import { characterTable, userPermissionsTable } from '~/db/schema';
+import { hasPermissions } from '~/shared/auth.util';
+import { group } from '~/shared/general.util';
+import type { Character, DoubleIndex, Level, MainStat, TrainingLevel } from '~/types/character';
+
+export default defineEventHandler(async (e) => {
+    let { visibility } = getQuery(e) as { visibility?: "public" | "own" | "admin" };
+
+    if(!visibility)
+    {
+        visibility = "own";
+    }
+
+    let where: ((character: typeof characterTable._.config.columns, sql: Operators) => SQL | undefined) | undefined = undefined;
+    const db = useDatabase();
+
+    if(visibility === "own")
+    {
+        const session = await getUserSession(e);
+        if(!session.user)
+        {
+            setResponseStatus(e, 401);
+            return;
+        }
+
+        where = (character, { eq, and }) => and(eq(character.owner, session.user!.id), eq(character.visibility, "private"));
+    }
+    else if(visibility === 'public')
+    {
+        where = (character, { eq, and }) => eq(character.visibility, "public");
+    }
+    else if(visibility === 'admin')
+    {
+        const session = await getUserSession(e);
+        if(!session.user)
+        {
+            setResponseStatus(e, 401);
+            return;
+        }
+        const db = useDatabase();
+
+        const rights = db.select({ right: userPermissionsTable.permission }).from(userPermissionsTable).where(eq(userPermissionsTable.id, session.user.id)).all();
+        if(rights.length === 0 || !hasPermissions(rights.map(e => e.right), ['admin']))
+        {
+            setResponseStatus(e, 403);
+            return;
+        }
+
+        where = undefined;
+    }
+    
+    const characters = db.query.characterTable.findMany({
+        with: {
+            abilities: true,
+            levels: true,
+            modifiers: true,
+            spells: true,
+            training: true,
+            user: {
+                columns: { username: true }
+            }
+        },
+        where: where,
+    }).sync();
+
+    if(characters !== undefined)
+    {
+        return characters.map(character => ({
+            id: character.id,
+
+            name: character.name,
+            people: character.people,
+            level: character.level,
+            aspect: character.aspect,
+            notes: character.notes,
+            health: character.health,
+            mana: character.mana,
+
+            training: character.training.reduce((p, v) => { if(!(v.stat in p)) p[v.stat] = []; p[v.stat].push([v.level as TrainingLevel, v.choice]); return p; }, {} as Record<MainStat, DoubleIndex<TrainingLevel>[]>),
+            leveling: character.levels.map(e => [e.level as Level, e.choice] as DoubleIndex<Level>),
+            abilities: group(character.abilities.map(e => ({ ...e, value: [e.value, e.max] as [number, number] })), "ability", "value"),
+            spells: character.spells.map(e => e.value),
+            modifiers: group(character.modifiers, "modifier", "value"),
+
+            owner: character.owner,
+            username: character.user.username,
+            visibility: character.visibility,
+        } as Character));
+    }
+    
+    setResponseStatus(e, 404);
+    return;
+});

server/api/character.post.ts

@@ -0,0 +1,66 @@
+import { z } from 'zod';
+import useDatabase from '~/composables/useDatabase';
+import { characterAbilitiesTable, characterLevelingTable, characterModifiersTable, characterSpellsTable, characterTable, characterTrainingTable } from '~/db/schema';
+import { CharacterValidation, type Ability, type DoubleIndex, type MainStat, type TrainingLevel } from '~/types/character';
+
+
+export default defineEventHandler(async (e) => {
+    const body = await readValidatedBody(e, CharacterValidation.extend({ id: z.unknown(), }).safeParse);
+    if(!body.success)
+    {
+        setResponseStatus(e, 400);
+        return body.error.message;
+    }
+
+    const session = await getUserSession(e);
+    if(!session.user || session.user.state !== 1)
+    {
+        setResponseStatus(e, 401);
+        return;
+    }
+
+    const db = useDatabase();
+
+    try
+    {
+        const id = db.transaction((tx) => {
+            const id = tx.insert(characterTable).values({
+                name: body.data.name,
+                owner: session.user!.id,
+                people: body.data.people!,
+                level: body.data.level,
+                aspect: body.data.aspect,
+                notes: body.data.notes,
+                health: body.data.health,
+                mana: body.data.mana,
+                visibility: body.data.visibility,
+                thumbnail: body.data.thumbnail,
+            }).returning({ id: characterTable.id }).get().id;
+    
+            if(body.data.leveling.length > 0) tx.insert(characterLevelingTable).values(body.data.leveling.map(e => ({ character: id, level: e[0], choice: e[1] }))).run();
+
+            const training = Object.entries(body.data.training).flatMap(e => e[1].map(_e => ({ character: id, stat: e[0] as MainStat, level: _e[0], choice: _e[1] })));
+            if(training.length > 0) tx.insert(characterTrainingTable).values(training).run();
+
+            const modifiers = Object.entries(body.data.modifiers).map((e) => ({ character: id, modifier: e[0] as MainStat, value: e[1] }));
+            if(modifiers.length > 0) tx.insert(characterModifiersTable).values(modifiers).run();
+
+            if(body.data.spells.length > 0) tx.insert(characterSpellsTable).values(body.data.spells.map(e => ({ character: id, value: e }))).run();
+
+            const abilities = Object.entries(body.data.abilities).map(e => ({ character: id, ability: e[0] as Ability, value: e[1][0], max: e[1][1] }));
+            if(abilities.length > 0) tx.insert(characterAbilitiesTable).values(abilities).run();
+    
+            return id;
+        });
+    
+        setResponseStatus(e, 201);
+        return id;
+    }
+    catch(_e)
+    {
+        console.error(_e);
+
+        setResponseStatus(e, 500);
+        return;
+    }
+});

server/api/character/[id].delete.ts

@@ -0,0 +1,33 @@
+import { eq } from 'drizzle-orm';
+import useDatabase from '~/composables/useDatabase';
+import { characterTable } from '~/db/schema';
+
+export default defineEventHandler(async (e) => {
+    const id = getRouterParam(e, "id");
+    if(!id)
+    {
+        setResponseStatus(e, 400);
+        return;
+    }
+
+    const db = useDatabase();
+    const old = db.select({ id: characterTable.id, owner: characterTable.owner }).from(characterTable).where(eq(characterTable.id, id)).get();
+    
+    if(!old)
+    {
+        setResponseStatus(e, 404);
+        return;
+    }
+
+    const session = await getUserSession(e);
+    if(!session.user || old.owner !== session.user.id)
+    {
+        setResponseStatus(e, 401);
+        return;
+    }
+
+    db.delete(characterTable).where(eq(characterTable.id, id)).run();
+
+    setResponseStatus(e, 200);
+    return;
+});

server/api/character/[id].get.ts

@@ -0,0 +1,66 @@
+import { and, eq, sql } from 'drizzle-orm';
+import useDatabase from '~/composables/useDatabase';
+import { characterTable } from '~/db/schema';
+import { group } from '~/shared/general.util';
+import type { Character, DoubleIndex, Level, MainStat, TrainingLevel } from '~/types/character';
+
+export default defineEventHandler(async (e) => {
+    const id = getRouterParam(e, "id");
+
+    if(!id)
+    {
+        setResponseStatus(e, 400);
+        return;
+    }
+
+    const session = await getUserSession(e);
+
+    if(!session.user)
+    {
+        setResponseStatus(e, 401);
+        return;
+    }
+
+    const db = useDatabase();
+    const character = db.query.characterTable.findFirst({
+        with: {
+            abilities: true,
+            levels: true,
+            modifiers: true,
+            spells: true,
+            training: true,
+            user: {
+                columns: { username: true }
+            }
+        },
+        where: (character, { eq, and }) => and(eq(character.id, parseInt(id, 10)), eq(characterTable.owner, session.user!.id)),
+    }).sync();
+
+    if(character !== undefined)
+    {
+        return {
+            id: character.id,
+
+            name: character.name,
+            people: character.people,
+            level: character.level,
+            aspect: character.aspect,
+            notes: character.notes,
+            health: character.health,
+            mana: character.mana,
+
+            training: character.training.reduce((p, v) => { if(!(v.stat in p)) p[v.stat] = []; p[v.stat].push([v.level as TrainingLevel, v.choice]); return p; }, {} as Record<MainStat, DoubleIndex<TrainingLevel>[]>),
+            leveling: character.levels.map(e => [e.level as Level, e.choice] as DoubleIndex<Level>),
+            abilities: group(character.abilities.map(e => ({ ...e, value: [e.value, e.max] as [number, number] })), "ability", "value"),
+            spells: character.spells.map(e => e.value),
+            modifiers: group(character.modifiers, "modifier", "value"),
+
+            owner: character.owner,
+            username: character.user.username,
+            visibility: character.visibility,
+        } as Character;
+    }
+    
+    setResponseStatus(e, 404);
+    return;
+});

server/api/character/[id].post.ts

@@ -0,0 +1,75 @@
+import { eq } from 'drizzle-orm';
+import useDatabase from '~/composables/useDatabase';
+import { characterAbilitiesTable, characterLevelingTable, characterModifiersTable, characterSpellsTable, characterTable, characterTrainingTable } from '~/db/schema';
+import { CharacterValidation, type Ability, type MainStat } from '~/types/character';
+
+export default defineEventHandler(async (e) => {
+    const params = getRouterParam(e, "id");
+    if(!params)
+    {
+        setResponseStatus(e, 400);
+        return;
+    }
+    const id = parseInt(params, 10);
+
+    const body = await readValidatedBody(e, CharacterValidation.safeParse);
+    if(!body.success)
+    {
+        setResponseStatus(e, 400);
+        return body.error.message;
+    }
+
+    const db = useDatabase();
+    const old = db.select({ id: characterTable.id, owner: characterTable.owner }).from(characterTable).where(eq(characterTable.id, id)).get();
+    
+    if(!old)
+    {
+        setResponseStatus(e, 404);
+        return;
+    }
+
+    const session = await getUserSession(e);
+    if(!session.user || old.owner !== session.user.id || session.user.state !== 1)
+    {
+        setResponseStatus(e, 401);
+        return;
+    }
+    
+    db.transaction((tx) => {
+        tx.update(characterTable).set({
+            name: body.data.name,
+            people: body.data.people!,
+            level: body.data.level,
+            aspect: body.data.aspect,
+            notes: body.data.notes,
+            health: body.data.health,
+            mana: body.data.mana,
+            visibility: body.data.visibility,
+            thumbnail: body.data.thumbnail,
+        }).where(eq(characterTable.id, id)).run();
+
+        tx.delete(characterLevelingTable).where(eq(characterLevelingTable.character, id)).run();
+        tx.delete(characterTrainingTable).where(eq(characterTrainingTable.character, id)).run();
+        tx.delete(characterModifiersTable).where(eq(characterModifiersTable.character, id)).run();
+        tx.delete(characterSpellsTable).where(eq(characterSpellsTable.character, id)).run();
+        tx.delete(characterAbilitiesTable).where(eq(characterAbilitiesTable.character, id)).run();
+
+        if(body.data.leveling.length > 0) tx.insert(characterLevelingTable).values(body.data.leveling.map(e => ({ character: id, level: e[0], choice: e[1] }))).run();
+
+        const training = Object.entries(body.data.training).flatMap(e => e[1].map(_e => ({ character: id, stat: e[0] as MainStat, level: _e[0], choice: _e[1] })));
+        if(training.length > 0) tx.insert(characterTrainingTable).values(training).run();
+
+        const modifiers = Object.entries(body.data.modifiers).map((e) => ({ character: id, modifier: e[0] as MainStat, value: e[1] }));
+        if(modifiers.length > 0) tx.insert(characterModifiersTable).values(modifiers).run();
+
+        if(body.data.spells.length > 0) tx.insert(characterSpellsTable).values(body.data.spells.map(e => ({ character: id, value: e }))).run();
+
+        const abilities = Object.entries(body.data.abilities).map(e => ({ character: id, ability: e[0] as Ability, value: e[1][0], max: e[1][1] }));
+        if(abilities.length > 0) tx.insert(characterAbilitiesTable).values(abilities).run();
+    });
+
+    await useStorage('cache').removeItem(`nitro:functions:character:${id}.json`);
+
+    setResponseStatus(e, 200);
+    return;
+});

server/api/character/[id]/compiled.get.ts

@@ -0,0 +1,220 @@
+import useDatabase from '~/composables/useDatabase';
+import { defaultCharacter, type Ability, type Character, type CharacterConfig, type CompiledCharacter, type DoubleIndex, type Feature, type Level, type MainStat, type TrainingLevel, type TrainingOption } from '~/types/character';
+import characterData from '#shared/character-config.json';
+import { group } from '~/shared/general.util';
+
+export default defineEventHandler(async (e) => {
+    const id = getRouterParam(e, "id");
+    if(!id)
+    {
+        setResponseStatus(e, 400);
+        return;
+    }
+
+    const db = useDatabase();
+    const character = db.query.characterTable.findFirst({
+        with: {
+            abilities: true,
+            levels: true,
+            modifiers: true,
+            spells: true,
+            training: true,
+            user: {
+                columns: { username: true }
+            }
+        },
+        where: (character, { eq }) => eq(character.id, parseInt(id, 10)),
+    }).sync();
+
+    if(character !== undefined)
+    {
+        return compileCharacter(Object.assign(defaultCharacter, {
+            id: character.id,
+
+            name: character.name,
+            people: character.people,
+            level: character.level,
+            aspect: character.aspect,
+            notes: character.notes,
+            health: character.health,
+            mana: character.mana,
+
+            training: character.training.reduce((p, v) => { if(!(v.stat in p)) p[v.stat] = []; p[v.stat].push([v.level as TrainingLevel, v.choice]); return p; }, {} as Record<MainStat, DoubleIndex<TrainingLevel>[]>),
+            leveling: character.levels.map(e => [e.level as Level, e.choice] as DoubleIndex<Level>),
+            abilities: group(character.abilities.map(e => ({ ...e, value: [e.value, e.max] as [number, number] })), "ability", "value"),
+            spells: character.spells.map(e => e.value),
+            modifiers: group(character.modifiers, "modifier", "value"),
+
+            owner: character.owner,
+            username: character.user.username,
+            visibility: character.visibility,
+        } as Character) as Character);
+    }
+    
+    setResponseStatus(e, 404);
+    return;
+}/* , { name: "character", getKey: (e) => getRouterParam(e, "id") || 'error' } */);
+
+function compileCharacter(character: Character & { username?: string }): CompiledCharacter
+{
+    const config = characterData as CharacterConfig;
+    const race = character.people !== undefined ? config.peoples[character.people] : undefined;
+    const raceOptions = race ? character.leveling!.map(e => race.options[e[0]][e[1]]) : [];
+    const features = Object.entries(config.training).map(e => [e[0], getFeaturesOf(e[0] as MainStat, character.training[e[0] as MainStat])]) as [MainStat, TrainingOption[]][];
+
+    const compiled: CompiledCharacter = {
+        id: character.id,
+        owner: character.owner,
+        username: character.username,
+        name: character.name,
+        health: raceOptions.reduce((p, v) => p + (v.health ?? 0), 0),
+        mana: raceOptions.reduce((p, v) => p + (v.mana ?? 0), 0),
+        race: character.people!,
+        modifier: features.map(e => [e[0], Math.floor((e[1].length - 1) / 3) + (character.modifiers[e[0]] ?? 0)] as [MainStat, number]).reduce((p, v) => { p[v[0]] = v[1]; return p }, {} as Record<MainStat, number>),
+        level: character.level,
+        values: {
+            health: character.health,
+            mana: character.mana
+        },
+        features: {
+            action: [],
+            reaction: [],
+            freeaction: [],
+            misc: [],
+        },
+        abilities: {
+            athletics: 0,
+            acrobatics: 0,
+            intimidation: 0,
+            sleightofhand: 0,
+            stealth: 0,
+            survival: 0,
+            investigation: 0,
+            history: 0,
+            religion: 0,
+            arcana: 0,
+            understanding: 0,
+            perception: 0,
+            performance: 0,
+            medecine: 0,
+            persuasion: 0,
+            animalhandling: 0,
+            deception: 0
+        },
+        spellslots: 0,
+        artslots: 0,
+        spellranks: {
+            instinct: 0,
+            knowledge: 0,
+            precision: 0,
+            arts: 0,
+        },
+        spells: character.spells ?? [],
+        speed: false,
+        defense: {
+            static: 6,
+            activeparry: 0,
+            activedodge: 0,
+            passiveparry: 0,
+            passivedodge: 0,
+        },
+        mastery: {
+            strength: 0,
+            dexterity: 0,
+            shield: 0,
+            armor: 0,
+            multiattack: 1,
+            magicpower: 0,
+            magicspeed: 0,
+            magicelement: 0
+        },
+        resistance: {
+            stun: [0, 0],
+            bleed: [0, 0],
+            poison: [0, 0],
+            fear: [0, 0],
+            influence: [0, 0],
+            charm: [0, 0],
+            possesion: [0, 0],
+            precision: [0, 0],
+            knowledge: [0, 0],
+            instinct: [0, 0]
+        },
+        initiative: 0,
+        aspect: "",
+        notes: character.notes ?? "",
+    };
+
+    features.forEach(e => e[1].forEach((_e, i) => applyTrainingOption(e[0], _e, compiled, i === e[1].length - 1)));
+    specialFeatures(compiled, character.training);
+
+    Object.entries(character.abilities).forEach(e => compiled.abilities[e[0] as Ability]! += e[1][0]);
+
+    return compiled;
+}
+function applyTrainingOption(stat: MainStat, option: TrainingOption, character: CompiledCharacter, last: boolean)
+{
+    if(option.health) character.health += option.health;
+    if(option.mana) character.mana += option.mana;
+    if(option.mastery) character.mastery[option.mastery]++;
+    if(option.speed) character.speed = option.speed;
+    if(option.initiative) character.initiative += option.initiative;
+    if(option.spellrank) character.spellranks[option.spellrank]++;
+    if(option.defense) option.defense.forEach(e => character.defense[e]++);
+    if(option.resistance) option.resistance.forEach(e => character.resistance[e[0]][e[1] === "attack" ? 0 : 1]++);
+    if(option.spellslot) character.spellslots += option.spellslot in character.modifier ? character.modifier[option.spellslot as MainStat] : option.spellslot as number;
+    if(option.arts) character.artslots += option.arts in character.modifier ? character.modifier[option.arts as MainStat] : option.arts as number;
+    if(option.spell) character.spells.push(option.spell);
+
+    option.description.forEach(line => !line.disposable && (last || !line.replaced) && character.features[line.category ?? "misc"].push(line.text));
+
+    //if(option.features) option.features.forEach(e => applyFeature(e, character));
+}
+function specialFeatures(character: CompiledCharacter, levels: Record<MainStat, DoubleIndex<TrainingLevel>[]>)
+{
+    //Cap la défense
+    const strengthCap3 = levels.strength.some(e => e[0] === 0);
+    const strengthCap6 = levels.strength.some(e => e[0] === 1);
+    const strengthUncapped = levels.strength.some(e => e[0] === 2);
+
+    const dexterityCap3 = levels.dexterity.some(e => e[0] === 0);
+    const dexterityCap3Stat = levels.dexterity.some(e => e[0] === 1);
+    const dexterityUncapped = levels.dexterity.some(e => e[0] === 2);
+
+    if(!strengthUncapped || !dexterityUncapped)
+    {
+        if(strengthCap6)
+        {
+            character.defense = {
+                static: 6,
+                activeparry: 0,
+                activedodge: 0,
+                passiveparry: 0,
+                passivedodge: 0,
+            };
+        }
+        else if(strengthCap3 || dexterityCap3)
+        {
+            character.defense = {
+                static: 3,
+                activeparry: 0,
+                activedodge: 0,
+                passiveparry: 0,
+                passivedodge: 0,
+            };
+        }
+        else if(dexterityCap3Stat)
+        {
+            character.defense.static = 3;
+        }
+    }
+}/* 
+function applyFeature(feature: Feature, character: CompiledCharacter)
+{
+    
+} */
+export function getFeaturesOf(stat: MainStat, progression: DoubleIndex<TrainingLevel>[]): TrainingOption[]
+{
+    const config = characterData as CharacterConfig;
+    return progression.map(e => config.training[stat][e[0]][e[1]]);
+}

server/api/character/[id]/duplicate.post.ts

@@ -0,0 +1,37 @@
+import { eq } from 'drizzle-orm';
+import useDatabase from '~/composables/useDatabase';
+import { characterTable } from '~/db/schema';
+
+export default defineEventHandler(async (e) => {
+    const id = getRouterParam(e, "id");
+    if(!id)
+    {
+        setResponseStatus(e, 400);
+        return;
+    }
+
+    const db = useDatabase();
+    const old = db.select().from(characterTable).where(eq(characterTable.id, parseInt(id, 10))).get();
+    
+    if(!old)
+    {
+        setResponseStatus(e, 404);
+        return;
+    }
+
+    const session = await getUserSession(e);
+    if(!session.user || old.owner !== session.user.id || session.user.state !== 1)
+    {
+        setResponseStatus(e, 401);
+        return;
+    }
+
+    const returned = await db.insert(characterTable).values({
+        name: `Copie de ${old.name}`,
+        progress: old.progress,
+        owner: session.user.id,
+    }).returning({ id: characterTable.id });
+
+    setResponseStatus(e, 201);
+    return returned[0].id;
+});

server/api/character/[id]/values.get.ts

@@ -0,0 +1,34 @@
+import { and, eq, sql } from 'drizzle-orm';
+import useDatabase from '~/composables/useDatabase';
+import { characterTable } from '~/db/schema';
+import type { Character, CharacterValues } from '~/types/character';
+
+export default defineEventHandler(async (e) => {
+    const id = getRouterParam(e, "id");
+
+    if(!id)
+    {
+        setResponseStatus(e, 400);
+        return;
+    }
+
+    const session = await getUserSession(e);
+    if(!session.user)
+    {
+        setResponseStatus(e, 401);
+        return;
+    }
+
+    const db = useDatabase();
+    const character = db.select({
+        values: characterTable.values
+    }).from(characterTable).where(and(eq(characterTable.id, parseInt(id, 10)), eq(characterTable.owner, session.user.id))).get();
+
+    if(character !== undefined)
+    {
+        return character.values as CharacterValues;
+    }
+    
+    setResponseStatus(e, 404);
+    return;
+});

server/api/character/[id]/values.post.ts

@@ -0,0 +1,42 @@
+import { eq } from 'drizzle-orm';
+import useDatabase from '~/composables/useDatabase';
+import { characterTable } from '~/db/schema';
+
+export default defineEventHandler(async (e) => {
+    const id = getRouterParam(e, "id");
+    if(!id)
+    {
+        setResponseStatus(e, 400);
+        return;
+    }
+
+    const body = await readBody(e);
+    if(!body)
+    {
+        setResponseStatus(e, 400);
+        return;
+    }
+
+    const db = useDatabase();
+    const old = db.select({ id: characterTable.id, owner: characterTable.owner }).from(characterTable).where(eq(characterTable.id, parseInt(id, 10))).get();
+    
+    if(!old)
+    {
+        setResponseStatus(e, 404);
+        return;
+    }
+
+    const session = await getUserSession(e);
+    if(!session.user || old.owner !== session.user.id || session.user.state !== 1)
+    {
+        setResponseStatus(e, 401);
+        return;
+    }
+
+    db.update(characterTable).set({
+        values: body,
+    }).where(eq(characterTable.id, parseInt(id, 10))).run();
+
+    setResponseStatus(e, 200);
+    return;
+});

server/api/file.post.ts

@@ -1,7 +1,7 @@
 import useDatabase from '~/composables/useDatabase';
 import { explorerContentTable } from '~/db/schema';
 import { schema } from '~/schemas/file';
-import { parsePath } from '~/shared/general.utils';
+import { parsePath } from '~/shared/general.util';
 
 export default defineEventHandler(async (e) => {
     const body = await readValidatedBody(e, schema.safeParse);

server/api/file/content/[path].get.ts

@@ -1,6 +1,7 @@
 import { eq, sql } from 'drizzle-orm';
 import useDatabase from '~/composables/useDatabase';
 import { explorerContentTable } from '~/db/schema';
+import { convertContentFromText } from '~/shared/general.util';
 
 export default defineEventHandler(async (e) => {
     const path = decodeURIComponent(getRouterParam(e, "path") ?? '');
@@ -16,6 +17,7 @@ export default defineEventHandler(async (e) => {
     const content = db.select({ 
         'content': sql<string>`cast(${explorerContentTable.content} as TEXT)`.as('content'),
         'private': explorerContentTable.private,
+        'type': explorerContentTable.type,
         'owner': explorerContentTable.owner,
         'visit': explorerContentTable.visit,
     }).from(explorerContentTable).where(eq(explorerContentTable.path, sql.placeholder('path'))).prepare().get({ path });
@@ -45,7 +47,7 @@ export default defineEventHandler(async (e) => {
             content.content = convertFromStorableLinks(content.content);
         }
 
-        return content.content;
+        return convertContentFromText(content.type, content.content);
     }
     
     setResponseStatus(e, 404);

server/api/project.post.ts

@@ -2,7 +2,7 @@ import { hasPermissions } from "#shared/auth.util";
 import useDatabase from '~/composables/useDatabase';
 import { explorerContentTable } from '~/db/schema';
 import { project, type ProjectItem } from '~/schemas/project';
-import { parsePath } from "#shared/general.utils";
+import { parsePath } from "#shared/general.util";
 import { eq, getTableColumns, sql } from "drizzle-orm";
 import type { ExploreContent, TreeItem } from "~/types/content";
 import type { TreeItemEditable } from "~/pages/explore/edit/index.vue";

server/api/users/[id]/revalidate.post.ts

@@ -2,6 +2,7 @@ import { hash } from "bun";
 import { eq } from "drizzle-orm";
 import useDatabase from "~/composables/useDatabase";
 import { usersTable } from "~/db/schema";
+import sendMail from '~/server/tasks/mail';
 
 export default defineEventHandler(async (e) => {
     const session = await getUserSession(e);
@@ -56,7 +57,7 @@ export default defineEventHandler(async (e) => {
             id: emailId, timestamp,
         }
     });
-    await runTask('mail', {
+    await sendMail({
         payload: {
             type: 'mail',
             to: [data.email],

server/components/mail/reset-password.vue

@@ -17,7 +17,7 @@
 <script setup lang="ts">
 import { computed } from 'vue';
 import Bun from 'bun';
-import { format } from '~/shared/general.utils';
+import { format } from '~/shared/general.util';
 
 const { id, userId, username, timestamp } = defineProps<{
     id: number

server/tasks/mail.ts

@@ -28,69 +28,78 @@ const transport = nodemailer.createTransport({
     pool: true,
     host: config.mail.host,
     port: config.mail.port,
-    secure: true,
+    secure: config.mail.port === "465",
     auth: {
         user: config.mail.user,
         pass: config.mail.passwd,
     },
-    requireTLS: true,
+    tls: { rejectUnauthorized: false },
     dkim: {
         domainName: domain,
         keySelector: selector,
         privateKey: dkim,
     },
+    proxy: config.mail.proxy,
 });
 
-export default defineTask({
-    meta: {
-        name: 'mail',
-        description: 'Send email',
-    },
-    async run(e) {
-        try {
-            if(e.payload.type !== 'mail')
-            {
-                throw new Error(`Données inconnues`);
-            }
-
-            const payload = e.payload as MailPayload;
-            const template = templates[payload.template];
-
-            if(!template)
-            {
-                throw new Error(`Modèle de mail ${payload.template} inconnu`);
-            }
-
-            console.time('Generating HTML');
-            const mail: Mail.Options = {
-                from: 'd[any] - Ne pas répondre <no-reply@peaceultime.com>',
-                to: payload.to,
-                html: await render(template.component, payload.data),
-                subject: template.subject,
-                textEncoding: 'quoted-printable',
-            };
-            console.timeEnd('Generating HTML');
-
-            if(mail.html === '')
-                return { result: false, error: new Error("Invalid content") };
-
-            console.time('Sending Mail');
-            const status = await transport.sendMail(mail);
-            console.timeEnd('Sending Mail');
-
-            if(status.rejected.length > 0)
-            {
-                return { result: false, error: status.response, details: status.rejectedErrors };
-            }
-            
-            return { result: true };
-        }
-        catch(e)
+if(process.env.NODE_ENV === 'production')
+{
+    transport.verify((error) => {
+        if(error)
         {
-            return { result: false, error: e };
+            console.log('Mail server cannot be reached');
+            console.error(error);
         }
-    },
-})
+        else
+            console.log("Mail server is reachable and ready to communicate");
+    });
+}
+
+export default async function(e: TaskEvent) {
+    try {
+        if(e.payload.type !== 'mail')
+        {
+            throw new Error(`Données inconnues`);
+        }
+
+        const payload = e.payload as MailPayload;
+        const template = templates[payload.template];
+
+        if(!template)
+        {
+            throw new Error(`Modèle de mail ${payload.template} inconnu`);
+        }
+
+        console.time('Generating HTML');
+        const mail: Mail.Options = {
+            from: 'd[any] - Ne pas répondre <no-reply@peaceultime.com>',
+            to: payload.to,
+            html: await render(template.component, payload.data),
+            subject: template.subject,
+            textEncoding: 'quoted-printable',
+        };
+        console.timeEnd('Generating HTML');
+
+        if(mail.html === '')
+            return { result: false, error: new Error("Invalid content") };
+
+        console.time('Sending Mail');
+        const status = await transport.sendMail(mail);
+        console.timeEnd('Sending Mail');
+
+        if(status.rejected.length > 0)
+        {
+            return { result: false, error: status.response, details: status.rejectedErrors };
+        }
+        
+        return { result: true };
+    }
+    catch(e)
+    {
+        console.error(e);
+        return { result: false, error: e };
+    }
+}
 
 async function render(component: any, data: Record<string, any>): Promise<string>
 {

server/tasks/pull.ts

@@ -4,6 +4,7 @@ import type { FileType } from '~/types/content';
 import type { CanvasColor, CanvasContent } from "~/types/canvas";
 import { explorerContentTable } from "~/db/schema";
 import { convertToStorableLinks } from "../api/file.post";
+import { parsePath } from "~/shared/general.util";
 
 const typeMapping: Record<string, FileType> = {
     ".md": "markdown",
@@ -17,6 +18,7 @@ export default defineTask({
     },
     async run(event) {
         try {
+            //@ts-ignore
             const tree = await $fetch('https://git.peaceultime.com/api/v1/repos/peaceultime/system-aspect/git/trees/master', {
                 method: 'get',
                 headers: {
@@ -33,44 +35,41 @@ export default defineTask({
                 {
                     const title = basename(e.path);
                     const order = /(\d+)\. ?(.+)/gsmi.exec(title);
-                    const path = (e.path as string).split('/').map(f => { const check = /(\d+)\. ?(.+)/gsmi.exec(f); return check && check[2] ? check[2] : f }).join('/');
                     return { 
-                        path: path.toLowerCase().replaceAll(" ", "-").normalize("NFD").replace(/[\u0300-\u036f]/g, ""), 
+                        path: e.path, 
                         order: i,
-                        title: order && order[2] ? order[2] : title,
+                        title: title,
                         type: 'folder',
                         content: null,
-                        owner: '1',
+                        owner: 1,
                         navigable: true,
-                        private: e.path.startsWith('98.Privé'),
+                        private: e.path === '98. Privé',
+                        timestamp: new Date(),
                     }
                 }
 
                 const extension = extname(e.path);
                 const title = basename(e.path, extension);
                 const order = /(\d+)\. ?(.+)/gsmi.exec(title);
-                const path = (e.path as string).split('/').map(f => { const check = /(\d+)\. ?(.+)/gsmi.exec(f); return check && check[2] ? check[2] : f }).join('/');
                 const content = (await $fetch(`https://git.peaceultime.com/api/v1/repos/peaceultime/system-aspect/raw/${encodeURIComponent(e.path)}`));
 
                 return { 
-                    path: (extension === '.md' ? path.replace(extension, '') : path).toLowerCase().replaceAll(" ", "-").normalize("NFD").replace(/[\u0300-\u036f]/g, ""), 
+                    path: extension === '.md' ? e.path.replace(extension, '') : e.path, 
                     order: i,
-                    title: order && order[2] ? order[2] : title,
+                    title: title,
                     type: (typeMapping[extension] ?? 'file'), 
                     content: reshapeContent(content as string, typeMapping[extension] ?? 'File'),
-                    owner: '1',
+                    owner: 1,
                     navigable: true,
-                    private: e.path.startsWith('98.Privé')
+                    private: e.path === '98. Privé',
+                    timestamp: new Date(),
                 }
             }));
-
-            const pathList = files.map(e => e.path);
+            
             files.forEach(e => {
-                if(e.type !== 'folder' && e.content)
-                {
-                    e.content = Buffer.from(convertToStorableLinks(e.content.toString('utf-8'), files.map(e => e.path)), 'utf-8');
-                }
-            })
+                const content = reshapeLinks(e.content as string | null, files) ?? null;
+                e.content = content ? Buffer.from(content, 'utf-8') : null;
+            });
 
             const db = useDatabase();
             db.delete(explorerContentTable).run();
@@ -86,21 +85,24 @@ export default defineTask({
         }
     },
 })
+function reshapeLinks(content: string | null, all: typeof explorerContentTable.$inferInsert[])
+{
+    return content?.replace(/!?\[\[([^\[\]\|\#]+)?(#+[^\[\]\|\#]+)?(\|[^\[\]\|\#]+)?\]\]/g, (str, link, header, title) => {
+        return `[[${link ? all.find(e => e.path.endsWith(link))?.path ?? link : ''}${header ?? ''}${title ?? ''}]]`;
+    });
+}
 
 function reshapeContent(content: string, type: FileType): string | null
 {
     switch(type)
     {
         case "markdown":
-            return content.replaceAll(/!?\[\[([^\[\]\|\#]+)?(#+[^\[\]\|\#]+)?(\|[^\[\]\|\#]+)?\]\]/g, (e: string, a1?: string, a2?: string , a3?: string) => {
-                return `[[${a1?.split('/').map(f => { const check = /(\d+)\. ?(.+)/gsmi.exec(f); return check && check[2] ? check[2] : f }).join('/') ?? ''}${a2 ?? ''}${a3 ?? ''}]]`;
-            });
         case "file":
             return content;
         case "canvas":
             const data = JSON.parse(content) as CanvasContent;
-            data.edges.forEach(e => e.color = typeof e.color === 'string' ? getColor(e.color) : undefined);
-            data.nodes.forEach(e => e.color = typeof e.color === 'string' ? getColor(e.color) : undefined);
+            data.edges?.forEach(e => e.color = typeof e.color === 'string' ? getColor(e.color) : undefined);
+            data.nodes?.forEach(e => e.color = typeof e.color === 'string' ? getColor(e.color) : undefined);
             return JSON.stringify(data);
         default:
         case 'folder': 

server/tasks/validation.ts

@@ -14,7 +14,7 @@ export default defineTask({
         name: 'validation',
         description: 'Add email ID to DB',
     },
-    async run(e) {
+    run(e) {
         try {
             if(e.payload.type !== 'validation')
             {

shared/canvas.util.ts

@@ -1,8 +1,9 @@
 import type { CanvasNode } from "~/types/canvas";
-import { clamp } from "#shared/general.utils";
+import { clamp } from "#shared/general.util";
 
 export type Direction = 'bottom' | 'top' | 'left' | 'right';
 export type Position = { x: number, y: number };
+export type Box = Position & { w: number, h: number };
 export type Path = {
     path: string;
     from: Position;
@@ -10,6 +11,19 @@ export type Path = {
     side: Direction;
 }
 
+export const rotation: Record<Direction, string> = {
+    top: "180",
+    bottom: "0",
+    left: "90",
+    right: "270"
+};
+export const opposite: Record<Direction, Direction> = {
+    top: "bottom",
+    bottom: "top",
+    left: "right",
+    right: "left"
+}
+
 export function edgePos(side: Direction, pos: Position, offset: number): Position {
     switch (side) {
         case "left":
@@ -81,4 +95,9 @@ export function getCenter(n: Position, i: Position, r: Position, o: Position, e:
         x: s * n.x + l * r.x + c * o.x + u * i.x,
         y: s * n.y + l * r.y + c * o.y + u * i.y
     };
+}
+
+export function gridSnap(value: number, grid: number): number
+{
+    return Math.round(value / grid) * grid;
 }

shared/general.util.ts

@@ -0,0 +1,109 @@
+import type { CanvasContent } from '~/types/canvas';
+import type { ContentMap, FileType } from '~/types/content';
+
+export const DEFAULT_CONTENT: Record<FileType, ContentMap[FileType]['content']> = {
+    map: {},
+    canvas: { nodes: [], edges: []},
+    markdown: '',
+    file: '',
+    folder: null,
+}
+export function unifySlug(slug: string | string[]): string
+{
+    return (Array.isArray(slug) ? slug.join('/') : slug);
+}
+export function group<
+  T,
+  K extends keyof T,
+  V extends keyof T,
+  KeyType extends string | number | symbol = Extract<T[K], string | number | symbol>
+>(
+  table: T[],
+  key: K & (T[K] extends string | number | symbol ? K : never),
+  value: V
+): Record<KeyType, T[V]> {
+  return table.reduce((p, v) => {
+    p[v[key] as KeyType] = v[value];
+    return p;
+  }, {} as Record<KeyType, T[V]>);
+}
+export function parsePath(path: string): string
+{
+    return path.toLowerCase().trim().replaceAll(" ", "-").normalize("NFD").replaceAll(/[\u0300-\u036f]/g, "").replaceAll('(', '').replaceAll(')', '');
+}
+export function parseId(id: string | undefined): string | undefined
+{
+    return id;
+    return id?.normalize('NFD')?.replace(/[\u0300-\u036f]/g, '')?.replace(/^\d\. */g, '')?.replace(/\s/g, "-")?.replace(/%/g, "-percent")?.replace(/\?/g, "-q")?.toLowerCase();
+}
+export function padLeft(text: string, pad: string, length: number): string
+{
+    return text.concat(pad.repeat(length - text.length));
+}
+export function padRight(text: string, pad: string, length: number): string
+{
+    return pad.repeat(length - text.length).concat(text);
+}
+export function format(date: Date, template: string): string
+{
+    const transforms: Record<string, (date: Date) => string> = {
+        "yyyy": (date: Date) => date.getUTCFullYear().toString(),
+        "MM": (date: Date) => padRight((date.getUTCMonth() + 1).toString(), '0', 2),
+        "dd": (date: Date) => padRight(date.getUTCDate().toString(), '0', 2),
+        "mm": (date: Date) => padRight(date.getUTCMinutes().toString(), '0', 2),
+        "HH": (date: Date) => padRight(date.getUTCHours().toString(), '0', 2),
+        "ss": (date: Date) => padRight(date.getUTCSeconds().toString(), '0', 2),
+    };
+    const keys = Object.keys(transforms);
+
+    for(const key of keys)
+    {
+        template = template.replaceAll(key, () => transforms[key](date));
+    }
+
+    return template;
+}
+export function clamp(x: number, min: number, max: number): number
+{
+    return x > max ? max : x < min ? min : x;
+}
+export function lerp(x: number, a: number, b: number): number
+{
+    return (1-x)*a+x*b;
+}
+export function convertContentFromText(type: FileType, content: string): CanvasContent | string {
+    switch(type)
+    {
+        case 'canvas':
+            return JSON.parse(content) as CanvasContent;
+        case 'map':
+        case 'file':
+        case 'folder':
+        case 'markdown':
+            return content;
+        default:
+            return content;
+    }
+}
+export function convertContentToText(type: FileType, content: any): string {
+    switch(type)
+    {
+        case 'canvas':
+            return JSON.stringify(content);
+        case 'map':
+        case 'file':
+        case 'folder':
+        case 'markdown':
+            return content;
+        default:
+            return content;
+    }
+}
+
+export const iconByType: Record<FileType, string> = {
+    'folder': 'lucide:folder',
+    'canvas': 'ph:graph-light',
+    'file': 'radix-icons:file',
+    'markdown': 'radix-icons:file-text',
+    'map': 'lucide:map',
+}

shared/general.utils.ts

@@ -1,56 +0,0 @@
-import type { FileType } from '~/types/content';
-
-export function unifySlug(slug: string | string[]): string
-{
-    return (Array.isArray(slug) ? slug.join('/') : slug);
-}
-export function parsePath(path: string): string
-{
-    return path.toLowerCase().replaceAll(" ", "-").normalize("NFD").replaceAll(/[\u0300-\u036f]/g, "").replaceAll('(', '').replaceAll(')', '');
-}
-export function parseId(id: string | undefined): string |undefined
-{
-    return id?.normalize('NFD')?.replace(/[\u0300-\u036f]/g, '')?.replace(/^\d\. */g, '')?.replace(/\s/g, "-")?.replace(/%/g, "-percent")?.replace(/\?/g, "-q")?.toLowerCase();
-}
-export function padLeft(text: string, pad: string, length: number): string
-{
-    return text.concat(pad.repeat(length - text.length));
-}
-export function padRight(text: string, pad: string, length: number): string
-{
-    return pad.repeat(length - text.length).concat(text);
-}
-export function format(date: Date, template: string): string
-{
-    const transforms: Record<string, (date: Date) => string> = {
-        "yyyy": (date: Date) => date.getUTCFullYear().toString(),
-        "MM": (date: Date) => padRight((date.getUTCMonth() + 1).toString(), '0', 2),
-        "dd": (date: Date) => padRight(date.getUTCDate().toString(), '0', 2),
-        "mm": (date: Date) => padRight(date.getUTCMinutes().toString(), '0', 2),
-        "HH": (date: Date) => padRight(date.getUTCHours().toString(), '0', 2),
-        "ss": (date: Date) => padRight(date.getUTCSeconds().toString(), '0', 2),
-    };
-    const keys = Object.keys(transforms);
-
-    for(const key of keys)
-    {
-        template = template.replaceAll(key, () => transforms[key](date));
-    }
-
-    return template;
-}
-export function clamp(x: number, min: number, max: number): number {
-    if (x > max)
-        return max;
-    if (x < min)
-        return min;
-    return x;
-}
-
-export const iconByType: Record<FileType, string> = {
-    'folder': 'lucide:folder',
-    'canvas': 'ph:graph-light',
-    'file': 'radix-icons:file',
-    'markdown': 'radix-icons:file-text',
-    'map': 'lucide:map',
-}

shared/hypermd.extend.ts

@@ -0,0 +1,670 @@
+import { defineMode, type Mode, getMode, StringStream, startState } from "codemirror";
+import type { MarkdownState } from "hypermd/mode/hypermd";
+
+const EN = /^(?:[*\-+]|^[0-9]+([.)]))\s+/, SN = /^(?:(?:(?:aaas?|about|acap|adiumxtra|af[ps]|aim|apt|attachment|aw|beshare|bitcoin|bolo|callto|cap|chrome(?:-extension)?|cid|coap|com-eventbrite-attendee|content|crid|cvs|data|dav|dict|dlna-(?:playcontainer|playsingle)|dns|doi|dtn|dvb|ed2k|facetime|feed|file|finger|fish|ftp|geo|gg|git|gizmoproject|go|gopher|gtalk|h323|hcp|https?|iax|icap|icon|im|imap|info|ipn|ipp|irc[6s]?|iris(?:\.beep|\.lwz|\.xpc|\.xpcs)?|itms|jar|javascript|jms|keyparc|lastfm|ldaps?|magnet|mailto|maps|market|message|mid|mms|ms-help|msnim|msrps?|mtqp|mumble|mupdate|mvn|news|nfs|nih?|nntp|notes|oid|opaquelocktoken|palm|paparazzi|platform|pop|pres|proxy|psyc|query|res(?:ource)?|rmi|rsync|rtmp|rtsp|secondlife|service|session|sftp|sgn|shttp|sieve|sips?|skype|sm[bs]|snmp|soap\.beeps?|soldat|spotify|ssh|steam|svn|tag|teamspeak|tel(?:net)?|tftp|things|thismessage|tip|tn3270|tv|udp|unreal|urn|ut2004|vemmi|ventrilo|view-source|webcal|wss?|wtai|wyciwyg|xcon(?:-userid)?|xfire|xmlrpc\.beeps?|xmpp|xri|ymsgr|z39\.50[rs]?):(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]|\([^\s()<>]*\))+(?:\([^\s()<>]*\)|[^\s`*!()\[\]{};:'".,<>?«»“”‘’]))/i, xN = /^(?:(?:[^<>()[\]\\.,;:\s@\"`]+(?:\.[^<>()[\]\\.,;:\s@\"]+)*)|(?:\".+\"))@(?:(?:\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(?:(?:[a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))\b/, TN = /^(?:[^\u2000-\u206F\u2E00-\u2E7F'!"#$%&()*+,.:;<=>?@^`{|}~\[\]\\\s])+/;
+const PN = /^\s*[^\|].*?\|.*[^|]\s*$/, IN = /^\s*[^\|].*\|/, FN = /^\|(?:[^|]+\|)+?\s*$/, ON = /^\|/, BN = /^\s*-+\s*:\s*$/, NN = /^\s*:\s*-+\s*$/, RN = /^\s*:\s*-+\s*:\s*$/, HN = /^\s*-+\s*$/;
+const readSideRegex = /(?:([\u200F\p{sc=Arabic}\p{sc=Hebrew}\p{sc=Syriac}\p{sc=Thaana}])|([\u200E\p{sc=Armenian}\p{sc=Bengali}\p{sc=Bopomofo}\p{sc=Braille}\p{sc=Buhid}\p{sc=Canadian_Aboriginal}\p{sc=Cherokee}\p{sc=Cyrillic}\p{sc=Devanagari}\p{sc=Ethiopic}\p{sc=Georgian}\p{sc=Greek}\p{sc=Gujarati}\p{sc=Gurmukhi}\p{sc=Han}\p{sc=Hangul}\p{sc=Hanunoo}\p{sc=Hiragana}\p{sc=Kannada}\p{sc=Katakana}\p{sc=Khmer}\p{sc=Lao}\p{sc=Latin}\p{sc=Limbu}\p{sc=Malayalam}\p{sc=Mongolian}\p{sc=Myanmar}\p{sc=Ogham}\p{sc=Oriya}\p{sc=Runic}\p{sc=Sinhala}\p{sc=Tagalog}\p{sc=Tagbanwa}\p{sc=Tamil}\p{sc=Telugu}\p{sc=Thai}\p{sc=Tibetan}\p{sc=Yi}]))/u;
+const readSide = function(e: string) {
+    var t = e.match(readSideRegex);
+    if (t) {
+        if (t[1])
+            return "rtl";
+        if (t[2])
+            return "ltr"
+    }
+    return "auto"
+}
+const isLetter = (e: string) => /[a-z]/i.test(e);
+const clearSubstringWords = (str: string, substring: string) => str.replace(new RegExp("\\s?[^\\s]*".concat(substring, "[^\\s]*","g")), "");
+const enum HashtagType {
+    NONE = 0,
+    NORMAL = 1,
+    WITH_SPACE = 2
+}
+const enum TableType {
+    NONE = 0,
+    SIMPLE = 1,
+    NORMAL = 2
+}
+const enum NextMaybe {
+    NONE = 0,
+    FRONT_MATTER = 1,
+    FRONT_MATTER_END = 2
+}
+const enum LinkType {
+    NONE = 0,
+    BARELINK = 1,
+    FOOTREF = 2,
+    NORMAL = 3,
+    FOOTNOTE = 4,
+    MAYBE_FOOTNOTE_URL = 5,
+    MAYBE_FOOTNOTE_URL_TITLE = 6,
+    BARELINK2 = 7,
+    FOOTREF2 = 8,
+    INTERNAL_LINK = 9,
+    EMBED = 10,
+}
+const CLASSES: Record<number, string> = {
+    1: "hmd-barelink",
+    7: "hmd-barelink2",
+    2: "hmd-barelink footref",
+    4: "hmd-barelink hmd-footnote line-HyperMD-footnote",
+    8: "hmd-footref2",
+    9: "hmd-internal-link",
+    10: "hmd-internal-link hmd-embed",
+}
+
+export declare type TokenFunc = (stream: CodeMirror.StringStream, state: HyperMDState) => string;
+export declare type InnerModeExitChecker = (stream: CodeMirror.StringStream, state: HyperMDState) => {
+    endPos?: number;
+    skipInnerMode?: boolean;
+    style?: string;
+} | null;
+interface HyperMDState extends MarkdownState {
+    hmdTableRTL: boolean;
+    highlight: boolean;
+    hasAlias: boolean;
+    isAlias: boolean;
+    comment: boolean;
+    mathed: boolean;
+    internalEmbed: any;
+    internalLink: any;
+    inFootnote: boolean;
+    inlineFootnote: boolean;
+    wasHeading: boolean;
+    isHeading: boolean;
+    hmdTable: TableType;
+    hmdTableID: string | null;
+    hmdTableColumns: string[];
+    hmdTableCol: number;
+    hmdTableRow: number;
+    hmdOverride: TokenFunc | null;
+    hmdHashtag: HashtagType | boolean;
+    hmdInnerStyle: string;
+    hmdInnerExitChecker: InnerModeExitChecker | null;
+    hmdInnerMode: CodeMirror.Mode<any> | null;
+    hmdInnerState: any;
+    hmdLinkType: LinkType;
+    hmdNextMaybe: NextMaybe;
+    hmdNextState: HyperMDState | null;
+    hmdNextStyle: string | null;
+    hmdNextPos: number | null;
+}
+
+function resetTable(state: HyperMDState)
+{
+    state.hmdTable = TableType.NONE,
+    state.hmdTableRTL = !1,
+    state.hmdTableColumns = [],
+    state.hmdTableID = null,
+    state.hmdTableCol = state.hmdTableRow = 0
+}
+defineMode('d-any', function(cm, config) {
+    const markdownMode: Mode<MarkdownState> = getMode(cm, { ...config, name: 'markdown' }) as any;
+    const mode: Mode<HyperMDState> = getMode(cm, { ...config, name: 'hypermd' }) as any;
+
+    config = Object.assign({}, {
+        front_matter: !0,
+        math: !0,
+        table: !0,
+        toc: !0,
+        orgModeMarkup: !0,
+        hashtag: !0,
+        fencedCodeBlockHighlighting: !0,
+        highlightFormatting: !0,
+        taskLists: !0,
+        strikethrough: !0,
+        emoji: !1,
+        highlight: !0,
+        headers: !0,
+        blockquotes: !0,
+        indentedCode: !0,
+        lists: !0,
+        hr: !0,
+        blockId: !0
+    }, config)
+
+    function modeOverride(stream: CodeMirror.StringStream, state: HyperMDState): string {
+        const exit = state.hmdInnerExitChecker!(stream, state);
+        const extraStyle = state.hmdInnerStyle;
+
+        let ans = (!exit || !exit.skipInnerMode) && state.hmdInnerMode!.token(stream, state.hmdInnerState) || "";
+
+        if (extraStyle) ans += " " + extraStyle;
+        if (exit) {
+            if (exit.style) ans += " " + exit.style;
+            if (exit.endPos) stream.pos = exit.endPos;
+
+            state.hmdInnerExitChecker = null;
+            state.hmdInnerMode = null;
+            state.hmdInnerState = null;
+            state.hmdOverride = null;
+        }
+
+        return ans.trim();
+    }
+
+    function advanceMarkdown(stream: CodeMirror.StringStream, state: HyperMDState) {
+        if (stream.eol() || state.hmdNextState) return false;
+
+        let oldStart = stream.start;
+        let oldPos = stream.pos;
+
+        stream.start = oldPos;
+        let newState = { ...state };
+        let newStyle = mode.token(stream, newState);
+
+        state.hmdNextPos = stream.pos;
+        state.hmdNextState = newState;
+        state.hmdNextStyle = newStyle;
+
+        stream.start = oldStart;
+        stream.pos = oldPos;
+
+        return true;
+    }
+
+    function createDummyMode(endTag: string): CodeMirror.Mode<void> {
+        return {
+            token(stream) {
+                let endTagSince = stream.string.indexOf(endTag, stream.start);
+                if (endTagSince === -1) stream.skipToEnd(); // endTag not in this line
+                else if (endTagSince === 0) stream.pos += endTag.length; // current token is endTag
+                else {
+                    stream.pos = endTagSince;
+                    if (stream.string.charAt(endTagSince - 1) === "\\") stream.pos++;
+                }
+
+                return null;
+            }
+        }
+    }
+
+    function createSimpleInnerModeExitChecker(endTag: string, retInfo?: ReturnType<InnerModeExitChecker>): InnerModeExitChecker {
+        if (!retInfo) retInfo = {};
+
+        return function (stream, state) {
+            if (stream.string.substring(stream.start, stream.start + endTag.length) === endTag) {
+                retInfo.endPos = stream.start + endTag.length;
+                return retInfo;
+            }
+            return null;
+        }
+    }
+
+    interface BasicInnerModeOptions {
+        skipFirstToken?: boolean
+        style?: string
+    }
+
+    interface InnerModeOptions1 extends BasicInnerModeOptions {
+        fallbackMode: () => CodeMirror.Mode<any>
+        exitChecker: InnerModeExitChecker
+    }
+
+    interface InnerModeOptions2 extends BasicInnerModeOptions {
+        endTag: string
+    }
+
+    type InnerModeOptions = InnerModeOptions1 | InnerModeOptions2
+
+    /**
+     * switch to another mode
+     *
+     * After entering a mode, you can then set `hmdInnerExitStyle` and `hmdInnerState` of `state`
+     *
+     * @returns if `skipFirstToken` not set, returns `innerMode.token(stream, innerState)`, meanwhile, stream advances
+     */
+    function enterMode(stream: StringStream, state: HyperMDState, mode: string | CodeMirror.Mode<any> | null, opt: InnerModeOptions): string {
+        if (typeof mode === "string") mode = getMode(cm, mode);
+
+        if (!mode || mode["name"] === "null") {
+            if ('endTag' in opt) mode = createDummyMode(opt.endTag);
+            else if(typeof opt.fallbackMode === 'function') mode = opt.fallbackMode();
+
+            if (!mode) throw new Error("no mode");
+        }
+
+        state.hmdInnerExitChecker = ('endTag' in opt) ? createSimpleInnerModeExitChecker(opt.endTag) : opt.exitChecker;
+        state.hmdInnerStyle = opt.style ?? '';
+        state.hmdInnerMode = mode;
+        state.hmdOverride = modeOverride;
+        state.hmdInnerState = startState(mode);
+
+        let ans = opt.style || "";
+        if (!opt.skipFirstToken)
+            ans += " " + mode.token(stream, state.hmdInnerState);
+
+        return ans.trim();
+    }
+
+    const i: Record<string, any> = {
+        htmlBlock: null,
+        block: null
+    };
+
+    return {
+        name: 'd-any',
+        ...mode,
+        token(stream, _state) {
+            const state = _state as HyperMDState;
+            stream.tabSize = 4;
+            if (state.hmdOverride)
+                return state.hmdOverride(stream, state);
+
+            if (state.hmdTable && " " === stream.peek())
+            {
+                if ("|" === stream.string[stream.pos - 1] && "\\" !== stream.string[stream.pos - 2])
+                    return stream.match(/^ +/), "";
+                if (stream.match(/^ +\|/))
+                    return stream.backUp(1), "";
+            }
+            if (state.hmdNextMaybe === NextMaybe.FRONT_MATTER)
+            {
+                if ("---" === stream.string)
+                    return state.hmdNextMaybe = NextMaybe.FRONT_MATTER_END, enterMode(stream, state, "yaml", {
+                        style: "hmd-frontmatter",
+                        fallbackMode: function() {
+                            return createDummyMode("---");
+                        },
+                        exitChecker: function(e, stream) {
+                            return e.string.startsWith("---") && "" === e.string.substring(3).trim() ? (stream.hmdNextMaybe = NextMaybe.NONE,
+                            {
+                                endPos: e.string.length
+                            }) : null;
+                        }
+                    });
+                state.hmdNextMaybe = NextMaybe.NONE;
+            }
+            let a = state.f === i.htmlBlock, c = -1 === state.code, u = state.quote, h = 0 === stream.start;
+            h && (state.inFootnote && state.hmdLinkType === LinkType.MAYBE_FOOTNOTE_URL || (state.hmdLinkType = LinkType.NONE),
+            state.inlineFootnote = !1,
+            state.wasHeading = state.isHeading,
+            state.isHeading = !1,
+            !state.code || 1 !== state.code && 2 !== state.code || (state.code = 0));
+            let d, p, f = state.linkText, m = state.linkHref, v = !(c || a), g = v && !(state.code || state.indentedCode || state.linkHref), y = "", b = !1, w = -1, k = !1;
+            if (v)
+            {
+                if (g && "\\" === stream.peek() && (k = !0), state.list && !state.header && "#" === stream.peek() && /^\s*[*\-+]\s$/.test(stream.string.substring(0, stream.pos)))
+                {
+                    const C = stream.match(/^(#+)(?: |$)/, !0);
+                    if (C)
+                    {
+                        const M = C[1].length;
+                        return state.header = M, "formatting formatting-header formatting-header-" + M + " header header-" + M;
+                    }
+                }
+                if (config.math && g && "$" === stream.peek() && (state.hmdLinkType === LinkType.NONE || state.hmdLinkType === LinkType.MAYBE_FOOTNOTE_URL) && !state.internalLink && !state.internalEmbed)
+                {
+                    let E: string[] | null = stream.match(/^(\$)[^\s$]/, !1), S = stream.match(/^(\${2})/, !1), x = E ? "$" : "$$";
+                    if (E)
+                    {
+                        let I = stream.string.slice(stream.pos + 1).match(/[^\\]\$(.|$)/)
+                        if(!I || !I[0].match(/^[^\s\\]\$([^0-9]|$)/))
+                            E = null;
+                    }
+                    let T = !1;
+                    if (E || S)
+                    {
+                        if (0 !== stream.pos || state.mathed)
+                        {
+                            let D = "math";
+                            state.quote && (D += " line-HyperMD-quote line-HyperMD-quote-" + state.quote + " line-HyperMD-quote-lazy");
+                            const A = getMode(cm, {
+                                name: "stex"
+                            }), L = "stex" !== A.name;
+                            return y += enterMode(stream, state, A, {
+                                style: D,
+                                skipFirstToken: L,
+                                fallbackMode: function() {
+                                    return createDummyMode(x);
+                                },
+                                exitChecker: function(e, stream) {
+                                    let n = e.start, i = e.string, r = "formatting formatting-math formatting-math-end math-";
+                                    return stream.hmdTable && "|" === i[n] ? {
+                                        endPos: n,
+                                        style: r
+                                    } : i.substring(n, n + x.length) === x ? {
+                                        endPos: n + x.length,
+                                        style: r
+                                    } : null;
+                                }
+                            }),
+                            E ? (L && (stream.pos += E[1].length),
+                            y += " formatting formatting-math formatting-math-begin") : (L && (stream.pos += S[1].length),
+                            y += " formatting formatting-math formatting-math-begin math-block")
+                        }
+                        T = !0, w = 0;
+                    }
+                    state.mathed = T;
+                }
+                if (g) {
+                    state.internalLink ? (state.hmdLinkType = LinkType.INTERNAL_LINK,
+                    state.internalLink = !1) : state.internalEmbed && (state.hmdLinkType = LinkType.EMBED,
+                    state.internalEmbed = !1);
+                    let P = state.hmdLinkType === LinkType.INTERNAL_LINK || state.hmdLinkType === LinkType.EMBED;
+                    if (P)
+                        if ("|" === stream.peek())
+                            state.isAlias = !0,
+                            w = stream.pos + 1,
+                            y += " link-alias-pipe";
+                        else if ("]" === stream.peek() && stream.match("]]", !1))
+                            state.hmdLinkType = LinkType.NONE,
+                            state.linkText = !1,
+                            state.isAlias = !1,
+                            state.hasAlias = !1,
+                            w = stream.pos + 2,
+                            y += " formatting-link formatting-link-end";
+                        else {
+                            b = !0,
+                            state.isAlias && (y += " link-alias"),
+                            state.hasAlias && !state.isAlias && (y += " link-has-alias");
+                            let I = stream.match(/^([^|\]]*?)/, !1);
+                            w = stream.pos + Math.max(1, I[0].length)
+                        }
+                    else if("!" === stream.peek() || "[" === stream.peek())
+                    {
+                        const I = stream.match(/^(!?\[\[)(.*?)]]/, !1)
+                        if(I)
+                            "!" === I[1].charAt(0) ? (y += " formatting-link formatting-link-start formatting-embed", state.internalEmbed = !0) : (y += " formatting-link formatting-link-start", state.internalLink = !0), w = stream.pos + I[1].length, state.hasAlias = I[2].includes("|");
+                    }
+                    if (state.hmdLinkType === LinkType.FOOTREF)
+                        if (b = !0,
+                        "]" === stream.peek())
+                            state.hmdLinkType = LinkType.NONE,
+                            w = stream.pos + 1,
+                            y += " formatting formatting-link formatting-link-end " + CLASSES[LinkType.FOOTREF];
+                        else {
+                            let I = stream.match(/^([^\]]*?)/, !1);
+                            w = stream.pos + Math.max(1, I[0].length)
+                        }
+                    else
+                    {
+                        const I = stream.peek() === "[" && stream.match(/^\[\^([^\]\s]*?)\](:?)/, false);
+                        if(I && (h || I[2]))
+                        {
+                            stream.match("[^"),
+                            y += " formatting formatting-link formatting-link-start",
+                            state.hmdLinkType = LinkType.FOOTREF,
+                            w = stream.pos;
+                        }
+                    }
+                    if (config.blockId && "^" === stream.peek() && stream.match(/^\^([a-zA-Z0-9\-]+)$/))
+                        return y += " blockid";
+                    !state.inlineFootnote && "^" === stream.peek() && stream.match("^[", !1) ? (state.inlineFootnote = !0,
+                    y += " inline-footnote-start formatting-inline-footnote",
+                    w = stream.pos + 2) : state.inlineFootnote && !P && state.hmdLinkType === LinkType.NONE && !state.image && stream.match("]") && (state.inlineFootnote = !1,
+                    y += " footref inline-footnote inline-footnote-end formatting-inline-footnote",
+                    w = stream.pos),
+                    "%" === stream.peek() && stream.match("%%", !1) ? (state.comment ? (y += " comment formatting comment-end",
+                    state.comment = !1) : (y += " comment formatting comment-start",
+                    state.comment = !0),
+                    w = stream.pos + 2) : state.comment && (y += " comment")
+                }
+                if (g && (state.hmdLinkType || state.image || state.linkText || (isLetter(stream.peek()!) && stream.match(SN) || (p = stream.peek(),
+                !/[\s<>()[\]\\.,;:\s@\"`]/.test(p!) && stream.match(xN))) && (y += " url",
+                w = stream.pos)),
+                h && state.inFootnote) {
+                    let F = stream.match(/^\s*/, !1)[0].replace(/\stream/g, "    ").length;
+                    F && F % stream.tabSize == 0 ? y += " line-HyperMD-footnote" : state.inFootnote = !1
+                }
+                let O = h && "[" === stream.peek() && stream.match(/^\[((?:[^\]\\]|\\.)*)\]:/, !1);
+                if (O) {
+                    let B = O[1];
+                    if ("^" !== B[0] || !/\s/.test(B))
+                        return stream.match(/\[\^?/),
+                        state.hmdLinkType = LinkType.FOOTNOTE,
+                        state.formatting = "link",
+                        state.linkText = !0,
+                        y += "formatting formatting-link link " + CLASSES[LinkType.FOOTNOTE]
+                } else if (state.hmdLinkType === LinkType.FOOTNOTE) {
+                    if ("]" === stream.peek() && stream.match("]:"))
+                        return y += " formatting formatting-link link " + CLASSES[LinkType.FOOTNOTE],
+                        state.linkText = !1,
+                        state.inFootnote = !0,
+                        state.hmdLinkType = LinkType.MAYBE_FOOTNOTE_URL,
+                        //@ts-ignore
+                        state.f = state.inline = markdownMode.startState().inline,
+                        y;
+                    y += " link " + CLASSES[LinkType.FOOTNOTE]
+                } else if (state.hmdLinkType === LinkType.MAYBE_FOOTNOTE_URL) {
+                    if (stream.eatSpace())
+                        return y;
+                    if (isLetter(stream.peek()!) && stream.match(SN))
+                        return y += " url hmd-footnote-url",
+                        state.hmdLinkType = LinkType.MAYBE_FOOTNOTE_URL_TITLE,
+                        y;
+                    state.hmdLinkType = LinkType.NONE
+                } else if (state.hmdLinkType === LinkType.MAYBE_FOOTNOTE_URL_TITLE) {
+                    if (stream.eatSpace())
+                        return y;
+                    if (state.hmdLinkType = LinkType.NONE,
+                    stream.match(/^(["']).*?\1/) || stream.match(/^\([^)]*?\)/))
+                        return y += " hmd-footnote-url-title"
+                }
+            }
+            if (state.hmdTable && "|" === stream.peek() && "\\" !== stream.string[stream.pos - 1] && function(e)
+            {
+                e.code = !1,
+                e.comment = !1,
+                e.em = !1,
+                e.formatting = !1,
+                e.highlight = !1,
+                e.hmdHashtag = !1,
+                e.hmdLinkType = LinkType.NONE,
+                e.isAlias = !1,
+                e.internalEmbed = !1,
+                e.internalLink = !1,
+                e.linkHref = !1,
+                e.linkText = !1,
+                e.linkTitle = !1,
+                e.strikethrough = !1,
+                e.strong = !1
+            }(state),
+            state.hmdNextState)
+                stream.pos = state.hmdNextPos!,
+                y += " " + (state.hmdNextStyle || ""),
+                Object.assign(state, state.hmdNextState),
+                state.hmdNextState = null,
+                state.hmdNextStyle = null,
+                state.hmdNextPos = null;
+            else {
+                let N = h && 0 !== stream.pos;
+                if (b) {
+                    //@ts-ignore
+                    let R = markdownMode.copyState(state), H = stream.pos;
+                    y += " " + (markdownMode.token(stream, R) || ""),
+                    stream.pos = H
+                } else
+                    y += " " + (markdownMode.token(stream, state) || "");
+                //@ts-ignore
+                N && state.f === state.block && (state.f = state.inline = markdownMode.startState().inline),
+                state.inFootnote && (state.indentationDiff = 0)
+            }
+            y = function(e, text) {
+                return text ? (!config.hr && e.hr && (text = clearSubstringWords(text, "hr"),
+                e.hr = !1),
+                !config.headers && e.header && (text = clearSubstringWords(text, "header"),
+                e.header = 0),
+                !config.indentedCode && e.indentedCode && (text = clearSubstringWords(text, "inline-code"),
+                e.indentedCode = !1),
+                !config.blockquotes && e.quote && (text = clearSubstringWords(text, "quote"),
+                e.quote = 0),
+                !config.lists && e.list && (text = clearSubstringWords(text, "list"),
+                e.list = !1),
+                text) : text
+            }(state, y),
+            y.includes("formatting-task") && (y += " line-HyperMD-task-line"),
+            state.hmdHashtag && (y += " " + config.tokenTypeOverrides.hashtag),
+            -1 !== w && (stream.pos = w),
+            state.header && (state.isHeading = !0),
+            !i.htmlBlock && state.htmlState && (i.htmlBlock = state.f);
+            let V = state.f === i.htmlBlock
+                , z = -1 === state.code;
+            if (v = v && !(V || z),
+            g = g && v && !(state.code || state.indentedCode || state.linkHref),
+            state.hmdTable && V) {
+                let q = stream.current();
+                /(?:^|[^\\])\|/.test(q) && ("" === y.trim() || /string|attribute/.test(y)) && (V = !1,
+                a = !1,
+                state.htmlState = null,
+                state.block = i.block,
+                //@ts-ignore
+                state.f = state.inline = markdownMode.startState().inline,
+                stream.pos = "|" === q ? stream.start : stream.start + 1)
+            }
+            let U = stream.current();
+            if (V !== a && (V ? (y += " hmd-html-begin",
+            i.htmlBlock = state.f) : y += " hmd-html-end"),
+            (c || z) && (state.localMode && c || (y = y.replace("inline-code", "")),
+            y += " line-HyperMD-codeblock line-background-HyperMD-codeblock-bg hmd-codeblock",
+            z !== c && (z ? c || (y += " line-HyperMD-codeblock-begin line-background-HyperMD-codeblock-begin-bg") : y += " line-HyperMD-codeblock-end line-background-HyperMD-codeblock-end-bg")),
+            v) {
+                let _ = state.hmdTable;
+                if (h && _)
+                    (_ == TableType.SIMPLE ? IN : ON).test(stream.string) ? (state.hmdTableCol = 0,
+                    state.hmdTableRow++) : resetTable(state);
+                if (h && state.header && (/^(?:---+|===+)\s*$/.test(stream.string) && state.prevLine && state.prevLine.header ? y += " line-HyperMD-header-line line-HyperMD-header-line-" + state.header : y += " line-HyperMD-header line-HyperMD-header-" + state.header),
+                state.indentedCode && (y += " hmd-indented-code"),
+                state.quote) {
+                    if (stream.match(/^\s*>/, !1) && !stream.eol() || (y += " line-HyperMD-quote line-HyperMD-quote-" + state.quote,
+                    /^ {0,3}\>/.test(stream.string) || (y += " line-HyperMD-quote-lazy")),
+                    h && (d = U.match(/^\s+/)))
+                        return stream.pos = d![0].length,
+                        (y += " hmd-indent-in-quote").trim();
+                    if (state.quote > u)
+                    {
+                        const I = "[" === stream.peek() && stream.match(/^\[!([^\]]+)\]([+\-]?)(?:\s|$)/);
+                        if(I)
+                            y += " line-HyperMD-callout hmd-callout line-HyperMD-quote line-HyperMD-quote-" + state.quote
+                    }
+                }
+                let W = (state.listStack[state.listStack.length - 1] || 0) + 3
+                    , j = h && /^\s+$/.test(U) && (!1 !== state.list || stream.indentation() <= W)
+                    , G = state.list && y.includes("formatting-list");
+                if (G || j && (!1 !== state.list || stream.match(EN, !1))) {
+                    let K = state.listStack && state.listStack.length || 0;
+                    if (j) {
+                        if (stream.match(EN, !1))
+                            !1 === state.list && K++;
+                        else {
+                            for (; K > 0 && stream.pos < state.listStack[K - 1]; )
+                                K--;
+                            if (!K)
+                                return y.trim() || null;
+                            y += " line-HyperMD-list-line-nobullet line-HyperMD-list-line line-HyperMD-list-line-".concat(K.toString())
+                        }
+                        y += " hmd-list-indent hmd-list-indent-".concat(K.toString())
+                    } else
+                        G && (y += " line-HyperMD-list-line line-HyperMD-list-line-".concat(K.toString()))
+                }
+                if (f !== state.linkText && (f || state.internalLink || state.internalEmbed ? state.hmdLinkType !== LinkType.FOOTNOTE && (state.hmdLinkType in CLASSES && (y += " " + CLASSES[state.hmdLinkType]),
+                state.hmdLinkType = LinkType.NONE) : (d = stream.match(/^([^\]]+)\](\(| ?\[|\:)?/, !1)) ? d[2] ? "[" !== d[2] && " [" !== d[2] || "]" !== stream.string.charAt(stream.pos + d[0].length) ? state.hmdLinkType = LinkType.NORMAL : state.hmdLinkType = LinkType.BARELINK2 : "^" !== d[1][0] || /\s/.test(d[1]) ? state.hmdLinkType = LinkType.BARELINK : state.hmdLinkType = LinkType.FOOTREF : state.hmdLinkType = LinkType.BARELINK),
+                m !== state.linkHref && (m ? state.hmdLinkType && (y += " " + CLASSES[state.hmdLinkType],
+                state.hmdLinkType = LinkType.NONE) : "[" === U && "]" !== stream.peek() && (state.hmdLinkType = LinkType.FOOTREF2)),
+                state.hmdLinkType !== LinkType.NONE && state.hmdLinkType in CLASSES && (y += " " + CLASSES[state.hmdLinkType]),
+                state.inlineFootnote && (y += " footref inline-footnote"),
+                k && U.length > 1) {
+                    let Y = U.length - 1
+                        , Z = y.replace("formatting-escape", "escape") + " hmd-escape-char";
+                    return state.hmdOverride = function(e, stream) {
+                        return e.pos += Y,
+                        stream.hmdOverride = null,
+                        Z.trim()
+                    }
+                    ,
+                    y += " hmd-escape-backslash",
+                    stream.pos -= Y,
+                    y
+                }
+                if (!y.trim() && config.table) {
+                    let X = !1;
+                    if ("|" === U.charAt(0) && (stream.pos = stream.start + 1,
+                    U = "|",
+                    X = !0),
+                    !_ && state.prevLine && state.prevLine.stream && state.prevLine.stream.string.trim() && !state.wasHeading && (X = !1),
+                    X) {
+                        if (!_) {
+                            PN.test(stream.string) ? _ = TableType.SIMPLE : FN.test(stream.string) && (_ = TableType.NORMAL);
+                            let $: string[] | undefined = void 0;
+                            if (_) {
+                                let Q = stream.lookAhead(1);
+                                if (_ === TableType.NORMAL ? FN.test(Q) ? Q = Q.replace(/^\s*\|/, "").replace(/\|\s*$/, "") : _ = TableType.NONE : _ === TableType.SIMPLE && (PN.test(Q) || (_ = TableType.NONE)),
+                                _) {
+                                    $ = Q.split("|");
+                                    for (let J = 0; J < $.length; J++) {
+                                        let ee = $[J];
+                                        if (BN.test(ee))
+                                            ee = "right";
+                                        else if (NN.test(ee))
+                                            ee = "left";
+                                        else if (RN.test(ee))
+                                            ee = "center";
+                                        else {
+                                            if (!HN.test(ee)) {
+                                                _ = TableType.NONE;
+                                                break
+                                            }
+                                            ee = "default"
+                                        }
+                                        $[J] = ee
+                                    }
+                                }
+                            }
+                            _ && (state.hmdTable = _,
+                            state.hmdTableColumns = $!,
+                            "rtl" === readSide(stream.string) && (state.hmdTableRTL = !0),
+                            state.hmdTableRow = state.hmdTableCol = 0)
+                        }
+                        if (_) {
+                            let te = state.hmdTableColumns.length - 1
+                                , ne = state.hmdTableCol
+                                , ee = state.hmdTableRow;
+                            0 == ne && (y += " line-HyperMD-table-".concat(_.toString(), " line-HyperMD-table-row line-HyperMD-table-row-").concat(ee.toString()),
+                            state.hmdTableRTL && (y += " line-HyperMD-table-rtl")),
+                            _ === TableType.NORMAL && (0 === state.hmdTableCol && /^\s*\|$/.test(stream.string.slice(0, stream.pos)) || stream.match(/^\s*$/, !1)) ? y += " hmd-table-sep hmd-table-sep-dummy" : state.hmdTableCol < te && (y += " hmd-table-sep hmd-table-sep-".concat(ne.toString()),
+                            state.hmdTableCol += 1)
+                        }
+                    }
+                }
+                if (_ && 1 === state.hmdTableRow && y.includes("emoji") && (y = ""),
+                g && "<" === U) {
+                    let ie = null;
+                    if ("!" === stream.peek() && stream.match(/^\![A-Z]+/) ? ie = ">" : "!" === stream.peek() && stream.match("![CDATA[") ? ie = "]]>" : "?" === stream.peek() && (ie = "?>"),
+                    null != ie)
+                        return enterMode(stream, state, null, {
+                            endTag: ie,
+                            style: (y + " comment hmd-cdata-html").trim()
+                        })
+                }
+                if (config.hashtag && g)
+                    if (state.hmdHashtag) {
+                        let re = !1;
+                        if (!(y = y.replace(/((formatting )?formatting-em|em) /g, "")).includes("formatting") && !/^\s*$/.test(U)) {
+                            d = U.match(TN);
+                            let oe = U.length - (d ? d[0].length : 0);
+                            oe > 0 && (stream.backUp(oe),
+                            re = !0)
+                        }
+                        if (re || (re = stream.eol()),
+                        re || (re = !TN.test(stream.peek()!)),
+                        re)
+                        {
+                            let le = stream.current();
+                            y += " hashtag-end " + (le = "tag-" + le.replace(/[^_a-zA-Z0-9\-]/g, "")),
+                            state.hmdHashtag = !1
+                        }
+                    } else if ("#" === U && !state.linkText && !state.image && (h || /^\s*$/.test(stream.string.charAt(stream.start - 1)))) {
+                        let ae = stream.string.slice(stream.pos).replace(/\\./g, "")
+                            , se = TN.exec(ae);
+                        if (se && /[^0-9]/.test(se[0])) {
+                            let le = "tag-" + se[0].replace(/[^_a-zA-Z0-9\-]/g, "");
+                            state.hmdHashtag = !0,
+                            y += " formatting formatting-hashtag hashtag-begin " + config.tokenTypeOverrides.hashtag + " " + le
+                        }
+                    }
+            }
+            return y.trim() || null;
+        },
+    }
+}, 'd-any');

shared/physics.util.ts

@@ -0,0 +1,355 @@
+import type { CanvasContent, CanvasNode } from "~/types/canvas";
+import type { CanvasPreferences } from "~/types/general";
+import type { Position, Box, Direction } from "./canvas.util";
+
+interface SnapPoint {
+    pos: Position;
+    type: TYPE;
+    side?: Direction;
+}
+
+export interface SnapHint {
+    start: Position,
+    end?: Position,
+}
+
+interface SnapConfig {
+    preferences: CanvasPreferences;
+    threshold: number;
+    cellSize: number;
+    gridSize: number;
+}
+
+const enum TYPE {
+    CENTER,
+    CORNER,
+    EDGE,
+}
+
+class SpatialGrid {
+    private cells: Map<number, Map<number, Set<string>>> = new Map();
+    private cellSize: number;
+
+    private minx: number = Infinity;
+    private miny: number = Infinity;
+    private maxx: number = -Infinity;
+    private maxy: number = -Infinity;
+
+    private cacheSet: Set<string> = new Set<string>();
+
+    constructor(cellSize: number) {
+        this.cellSize = cellSize;
+    }
+
+    private updateBorders(startX: number, startY: number, endX: number, endY: number) {
+        this.minx = Math.min(this.minx, startX);
+        this.miny = Math.min(this.miny, startY);
+        this.maxx = Math.max(this.maxx, endX);
+        this.maxy = Math.max(this.maxy, endY);
+    }
+
+    insert(node: CanvasNode): void {
+        const startX = Math.floor(node.x / this.cellSize);
+        const startY = Math.floor(node.y / this.cellSize);
+        const endX = Math.ceil((node.x + node.width) / this.cellSize);
+        const endY = Math.ceil((node.y + node.height) / this.cellSize);
+
+        this.updateBorders(startX, startY, endX, endY);
+
+        for (let i = startX; i <= endX; i++) {
+            let gridX = this.cells.get(i);
+            if (!gridX) {
+                gridX = new Map<number, Set<string>>();
+                this.cells.set(i, gridX);
+            }
+
+            for (let j = startY; j <= endY; j++) {
+                let gridY = gridX.get(j);
+                if (!gridY) {
+                    gridY = new Set<string>();
+                    gridX.set(j, gridY);
+                }
+                gridY.add(node.id);
+            }
+        }
+    }
+
+    remove(node: CanvasNode): void {
+        const startX = Math.floor(node.x / this.cellSize);
+        const startY = Math.floor(node.y / this.cellSize);
+        const endX = Math.ceil((node.x + node.width) / this.cellSize);
+        const endY = Math.ceil((node.y + node.height) / this.cellSize);
+
+        for (let i = startX; i <= endX; i++) {
+            const gridX = this.cells.get(i);
+            if (gridX) {
+                for (let j = startY; j <= endY; j++) {
+                    gridX.get(j)?.delete(node.id);
+                }
+            }
+        }
+    }
+
+    fetch(x: number, y: number): Set<string> | undefined {
+        return this.query(x, y, x, y);
+    }
+
+    query(x1: number, y1: number, x2: number, y2: number): Set<string> {
+        this.cacheSet.clear();
+
+        const startX = Math.floor(x1 / this.cellSize);
+        const startY = Math.floor(y1 / this.cellSize);
+        const endX = Math.ceil(x2 / this.cellSize);
+        const endY = Math.ceil(y2 / this.cellSize);
+
+        for (let dx = startX; dx <= endX; dx++) {
+            const gridX = this.cells.get(dx);
+            if (gridX) {
+                for (let dy = startY; dy <= endY; dy++) {
+                    const cellNodes = gridX.get(dy);
+                    if (cellNodes) {
+                        cellNodes.forEach(neighbor => this.cacheSet.add(neighbor));
+                    }
+                }
+            }
+        }
+
+        return this.cacheSet;
+    }
+
+    getViewportNeighbors(node: CanvasNode, viewport?: Box): Set<string> {
+        this.cacheSet.clear();
+
+        const startX = Math.floor(node.x / this.cellSize);
+        const startY = Math.floor(node.y / this.cellSize);
+        const endX = Math.ceil((node.x + node.width) / this.cellSize);
+        const endY = Math.ceil((node.y + node.height) / this.cellSize);
+
+        const minX = Math.max(viewport ? Math.max(this.minx, Math.floor(viewport.x / this.cellSize)) : this.minx, startX - 8);
+        const minY = Math.max(viewport ? Math.max(this.miny, Math.floor(viewport.y / this.cellSize)) : this.miny, startY - 8);
+        const maxX = Math.min(viewport ? Math.min(this.maxx, Math.ceil((viewport.x + viewport.w) / this.cellSize)) : this.maxx, endX + 8);
+        const maxY = Math.min(viewport ? Math.min(this.maxy, Math.ceil((viewport.y + viewport.h) / this.cellSize)) : this.maxy, endY + 8);
+
+        for (let dx = minX; dx <= maxX; dx++) {
+            const gridX = this.cells.get(dx);
+            if (gridX) {
+                for (let dy = startY; dy <= endY; dy++) {
+                    const cellNodes = gridX.get(dy);
+                    if (cellNodes) {
+                        cellNodes.forEach(neighbor => {
+                            if (neighbor !== node.id) this.cacheSet.add(neighbor);
+                        });
+                    }
+                }
+            }
+        }
+        for (let dx = startX; dx <= endX; dx++) {
+            const gridX = this.cells.get(dx);
+            if (gridX) {
+                for (let dy = minY; dy <= maxY; dy++) {
+                    const cellNodes = gridX.get(dy);
+                    if (cellNodes) {
+                        cellNodes.forEach(neighbor => {
+                            if (neighbor !== node.id) this.cacheSet.add(neighbor);
+                        });
+                    }
+                }
+            }
+        }
+
+        return this.cacheSet;
+    }
+}
+
+class SnapPointCache {
+    private cache: Map<string, SnapPoint[]>;
+
+    constructor() {
+        this.cache = new Map();
+    }
+
+    getSnapPoints(node: string): SnapPoint[] | undefined {
+        return this.cache.get(node);
+    }
+
+    private calculateSnapPoints(node: CanvasNode): SnapPoint[] {
+        const centerX = node.x + node.width / 2;
+        const centerY = node.y + node.height / 2;
+        return [
+            { pos: { x: centerX, y: centerY }, type: TYPE.CENTER },
+            { pos: { x: node.x, y: node.y }, type: TYPE.CORNER },
+            { pos: { x: node.x + node.width, y: node.y }, type: TYPE.CORNER },
+            { pos: { x: node.x, y: node.y + node.height }, type: TYPE.CORNER },
+            { pos: { x: node.x + node.width, y: node.y + node.height }, type: TYPE.CORNER },
+            { pos: { x: centerX, y: node.y }, type: TYPE.EDGE, side: 'top' },
+            { pos: { x: node.x, y: centerY }, type: TYPE.EDGE, side: 'left' },
+            { pos: { x: centerX, y: node.y + node.height }, type: TYPE.EDGE, side: 'bottom' },
+            { pos: { x: node.x + node.width, y: centerY }, type: TYPE.EDGE, side: 'right' },
+        ];
+    }
+
+    insert(node: CanvasNode): void {
+        if (!this.cache.has(node.id)) {
+            this.cache.set(node.id, this.calculateSnapPoints(node));
+        }
+    }
+
+    invalidate(node: CanvasNode): void {
+        this.cache.delete(node.id);
+    }
+}
+
+export class SnapFinder {
+    private spatialGrid: SpatialGrid;
+    private snapPointCache: SnapPointCache;
+    config: SnapConfig;
+
+    hints: Ref<SnapHint[]>;
+    viewport: Ref<Box>;
+
+    constructor(hints: Ref<SnapHint[]>, viewport: Ref<Box>, config: SnapConfig) {
+        this.spatialGrid = new SpatialGrid(config.cellSize);
+        this.snapPointCache = new SnapPointCache();
+        this.config = config;
+
+        this.hints = hints;
+        this.viewport = viewport;
+    }
+
+    add(node: CanvasNode): void
+    {
+        this.spatialGrid.insert(node);
+        this.snapPointCache.insert(node);
+        this.hints.value.length = 0;
+    }
+
+    remove(node: CanvasNode): void
+    {
+        this.spatialGrid.remove(node);
+        this.snapPointCache.invalidate(node);
+        this.hints.value.length = 0;
+    }
+
+    update(node: CanvasNode): void
+    {
+        this.remove(node);
+        this.add(node);
+    }
+
+    findEdgeSnapPosition(node: string, x: number, y: number): { x: number, y: number, node: string, direction: Direction } | undefined
+    {
+        const near = [...this.spatialGrid.fetch(x, y)?.values().filter(e => e !== node).flatMap(e => this.snapPointCache.getSnapPoints(e)?.map(_e => ({ ..._e, node: e })) ?? []) ?? []].filter(e => e.type === TYPE.EDGE);
+        let nearestDistance = this.config.threshold, nearest = undefined;
+
+        for (const point of near) {
+            const distance = Math.hypot(point.pos.x - x, point.pos.y - y);
+            if (distance < nearestDistance) {
+                nearestDistance = distance;
+                nearest = { ...point.pos, node: point.node, direction: point.side! };
+            }
+        }
+
+        return nearest;
+    }
+
+    findNodeSnapPosition(node: CanvasNode, resizeHandle?: Box): Partial<Box>
+    {
+        const result: Partial<Box> = {
+            x: undefined,
+            y: undefined,
+            w: undefined,
+            h: undefined,
+        };
+
+        if(!this.config.preferences.neighborSnap)
+        {
+            result.x = this.snapToGrid(node.x);
+            result.w = this.snapToGrid(node.width);
+            result.y = this.snapToGrid(node.y);
+            result.h = this.snapToGrid(node.height);
+
+            return result;
+        }
+        
+        this.hints.value.length = 0;
+
+        this.snapPointCache.invalidate(node);
+        this.snapPointCache.insert(node);
+
+        const neighbors = [...this.spatialGrid.getViewportNeighbors(node, this.viewport.value)].flatMap(e => this.snapPointCache.getSnapPoints(e)).filter(e => !!e);
+        const bestSnap = this.findBestSnap(this.snapPointCache.getSnapPoints(node.id)!, neighbors, this.config.threshold, resizeHandle);
+
+        return this.applySnap(node, bestSnap.x, bestSnap.y, resizeHandle);
+    }
+
+    private findBestSnap(activePoints: SnapPoint[], otherPoints: SnapPoint[], threshold: number, resizeHandle?: Box): Partial<Position>
+    {
+        let bestSnap: Partial<Position> = {};
+        let bestDiffX = threshold, bestDiffY = threshold;
+		let xHints: SnapHint[] = [], yHints: SnapHint[] = [];
+
+        for (const activePoint of activePoints) {
+            if (activePoint.type === TYPE.EDGE) continue;
+            if (!!resizeHandle && activePoint.type !== TYPE.CORNER) continue;
+
+            for (const otherPoint of otherPoints) {
+                if (otherPoint.type === TYPE.EDGE) continue;
+                if (!!resizeHandle && otherPoint.type !== TYPE.CORNER) continue;
+
+                const diffX = Math.abs(otherPoint.pos.x - activePoint.pos.x);
+                const diffY = Math.abs(otherPoint.pos.y - activePoint.pos.y);
+
+                if (diffX < bestDiffX) {
+                    bestDiffX = diffX;
+                    bestSnap.x = otherPoint.pos.x - activePoint.pos.x;
+					xHints = [{ start: { x: otherPoint.pos.x, y: activePoint.pos.y }, end: { x: otherPoint.pos.x, y: otherPoint.pos.y } }];
+                } else if(diffX === bestDiffX) {
+                    xHints.push({ start: { x: otherPoint.pos.x, y: activePoint.pos.y }, end: { x: otherPoint.pos.x, y: otherPoint.pos.y } });
+                }
+
+                if (diffY < bestDiffY) {
+                    bestDiffY = diffY;
+                    bestSnap.y = otherPoint.pos.y - activePoint.pos.y;
+                    yHints = [{ start: { x: activePoint.pos.x, y: otherPoint.pos.y }, end: { x: otherPoint.pos.x, y: otherPoint.pos.y } }];
+                } else if(diffY === bestDiffY) {
+                    yHints.push({ start: { x: activePoint.pos.x, y: otherPoint.pos.y }, end: { x: otherPoint.pos.x, y: otherPoint.pos.y } });
+                }
+            }
+        }
+
+		if(bestSnap.x && bestSnap.y)
+		{
+			xHints.forEach(e => e.start.y += bestSnap.y!);
+			yHints.forEach(e => e.start.x += bestSnap.x!);
+		}
+
+		this.hints.value = [...xHints, ...yHints];
+
+        return bestSnap;
+    }
+
+    private snapToGrid(pos?: number): number | undefined
+    {
+        return pos && this.config.preferences.gridSnap && this.config.preferences.spacing ? Math.round(pos / this.config.preferences.spacing) * this.config.preferences.spacing : undefined;
+    }
+
+    private applySnap(node: CanvasNode, offsetx?: number, offsety?: number, resizeHandle?: Box): Partial<Box>
+    {
+        const result: Partial<Box> = { x: undefined, y: undefined, w: undefined, h: undefined };
+
+        if (resizeHandle)
+        {
+            result.x = offsetx ? node.x + offsetx * resizeHandle.x : this.snapToGrid(node.x);
+            result.w = offsetx ? node.width + offsetx * resizeHandle.w : this.snapToGrid(node.width);
+            result.y = offsety ? node.y + offsety * resizeHandle.y : this.snapToGrid(node.y);
+            result.h = offsety ? node.height - offsety * resizeHandle.h : this.snapToGrid(node.height);
+        }
+        else
+        {
+            result.x = offsetx ? node.x + offsetx : this.snapToGrid(node.x);
+            result.y = offsety ? node.y + offsety : this.snapToGrid(node.y);
+        }
+
+        return result;
+    }
+}