diff --git a/app.vue b/app.vue
index 2ed14e6..766b302 100644
--- a/app.vue
+++ b/app.vue
@@ -13,7 +13,7 @@ const { id: project, home, get } = useProject();
 
 if(project.value !== 0 && home.value === null)
 {
-  const { data: useless } = await useAsyncData(`project:get:${project}`, get);
+  await useAsyncData(`project:get:${project}`, get);
 }
 
 const toggled = ref(false);
@@ -50,8 +50,8 @@ onMounted(() => {
               <NuxtLink class="arrow-group-item" aria-label="Projets" :to="{ path: '/explorer', force: true }">Liste des projets</NuxtLink>
             </div>
           </div>
-          <NuxtLink class="site-nav-bar-text mobile-hidden" aria-label="Outils" :to="{ path: '/tools', force: true }"
-            :class="{'mod-active': $route.path.startsWith('/tools')}">Outils</NuxtLink>
+          <NuxtLink class="site-nav-bar-text mobile-hidden" aria-label="Editeur" :to="{ path: '/editing', force: true }"
+            :class="{'mod-active': $route.path.startsWith('/editing')}">Editeur</NuxtLink>
         </div>
       </div>
       <div class="mobile-bigger">
diff --git a/assets/common.css b/assets/common.css
index 00fb60e..f2a60bf 100644
--- a/assets/common.css
+++ b/assets/common.css
@@ -227,7 +227,7 @@ html.light-mode .light-block {
     padding: 4px 1em;
 }
 
-.input-group .input-error {
+.input-error {
     padding: .5em 1em 4px;
     color: var(--text-error);
     user-select: text;
diff --git a/assets/global.css b/assets/global.css
index 4c26d86..404a23a 100644
--- a/assets/global.css
+++ b/assets/global.css
@@ -342,7 +342,7 @@
     --inline-title-margin-bottom: 0.5em;
     /* Inputs */
     --input-height: 30px;
-    --input-radius: 5px;
+    --input-radius: 0px;
     --input-font-weight: var(--font-normal);
     --input-border-width: 1px;
     /* Italic */
diff --git a/bun.lockb b/bun.lockb
index d1d9a4e..3db123e 100644
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/components/EditableMarkdown.vue b/components/EditableMarkdown.vue
new file mode 100644
index 0000000..f558e65
--- /dev/null
+++ b/components/EditableMarkdown.vue
@@ -0,0 +1,105 @@
+<style>
+.editor
+{
+    white-space: pre-line;
+    overflow: auto;
+    outline: none;
+    box-shadow: none !important;
+}
+</style>
+
+<template>
+  <div class="editor" contenteditable>
+    <template
+      v-if="model && model.length > 0">
+      <MarkdownRenderer
+        v-if="node"
+        :key="key"
+        :node="node"
+        :proses="{
+          'a': LiveA,
+          'h1': LiveH1,
+          'h2': LiveH2,
+          'h3': LiveH3,
+          'h4': LiveH4,
+          'h5': LiveH5,
+          'h6': LiveH6,
+          'blockquote': LiveBlockquote,
+        }"
+      ></MarkdownRenderer>
+    </template>
+  </div>
+</template>
+
+<script setup lang="ts">
+import LiveA from "~/components/prose/live/LiveA.vue";
+import LiveH1 from "~/components/prose/live/LiveH1.vue";
+import LiveH2 from "~/components/prose/live/LiveH2.vue";
+import LiveH3 from "~/components/prose/live/LiveH3.vue";
+import LiveH4 from "~/components/prose/live/LiveH4.vue";
+import LiveH5 from "~/components/prose/live/LiveH5.vue";
+import LiveH6 from "~/components/prose/live/LiveH6.vue";
+import LiveBlockquote from "~/components/prose/ProseBlockquote.vue";
+
+import { hash } from 'ohash'
+import { watch, computed } from 'vue'
+import type { Root } from 'hast';
+import { diffLines as diff } from 'diff';
+
+const model = defineModel<string>();
+
+const parser = useMarkdown();
+const key = computed(() => hash(model.value));
+
+const node = ref<Root>();
+
+watch(model, async (value, old) => {
+  if(value && old)
+  {
+    if(node.value)
+    {
+      let content = "", line = 0, pos = -1, len = 0, child;
+      const d = diff(old, value);
+      const children = node.value?.children.filter(e => e.hasOwnProperty('position'));
+
+      for(let i = 0; i < d.length; i++)
+      {
+        if(d[i].added) //Nouvelle ligne
+        {
+          const next = d.length > i ? d[i + 1] : undefined;
+          if(pos === -1 && (!next || !next.removed)) //Nouvelle ligne
+          {
+            child = children.filter(e => e.position?.start.line <= line && e.position?.end.line >= line); //Je cherche tout les blocs qui était inclus dans les lignes éditées.
+            if(child.length > 0)
+            {
+              pos = child[0].position?.start.offset ?? 0; //Je pars du premier caractère du bloc
+              len += (child[child.length - 1].position?.end.offset ?? 0) + 1; //Je m'arrete au dernier caractère du bloc + le \n
+            }
+          }
+          len += d[i].value.length; // J'ajoute le nouveau nombre de caractère
+        }
+        else if(d[i].removed) //Ancienne ligne
+        {
+          child = children.filter(e => e.position?.start.line <= line + 1 && e.position?.end.line >= line + (d[i].count ?? 1)); //Je cherche tout les blocs qui était inclus dans les lignes éditées.
+          if(child.length > 0)
+          {
+            pos = child[0].position?.start.offset ?? 0; //Je pars du premier caractère du bloc
+            len += child[child.length - 1].position?.end.offset ?? 0 + 1; //Je m'arrete au dernier caractère du bloc
+            len -= d[i].value.length; //Je supprime l'ancien nombre de caractère
+          }
+        }
+        else
+        {
+          line += d[i].count ?? 0;
+        }
+      }
+
+      node.value = parser(value);
+    }
+    else
+    {
+      node.value = parser(value);
+    }
+  }
+}, { immediate: true });
+</script>
\ No newline at end of file
diff --git a/components/Input.vue b/components/Input.vue
index 321d562..9c629e1 100644
--- a/components/Input.vue
+++ b/components/Input.vue
@@ -8,6 +8,8 @@ const props = defineProps<Prop>();
 const model = defineModel<string>();
 
 const err = ref<string | boolean | undefined>(props.error);
+
+watchEffect(() => err.value = props.error);
 </script>
 
 <template>
diff --git a/components/LeftComponent.vue b/components/LeftComponent.vue
index 79a58e0..711268f 100644
--- a/components/LeftComponent.vue
+++ b/components/LeftComponent.vue
@@ -13,15 +13,17 @@ const { data: navigation, execute, status, error } = await useFetch(() => `/api/
     immediate: false,
 });
 
-if(route.params.projectId &&  project.value !== 0)
-{
-    showing.value = true;
-    execute();
-}
-else
-{
-    showing.value = false;
-}
+watch(route, () => {
+    if(route.params.projectId &&  project.value !== 0)
+    {
+        showing.value = true;
+        execute();
+    }
+    else
+    {
+        showing.value = false;
+    }
+})
 </script>
 
 <template>
diff --git a/components/Markdown.vue b/components/Markdown.vue
index 2042656..a36dec7 100644
--- a/components/Markdown.vue
+++ b/components/Markdown.vue
@@ -1,89 +1,26 @@
 <template>
-  <slot
-    :data="data?.data"
-    :body="data?.body"
-    :toc="data?.toc"
-    :excerpt="data?.excerpt"
-    :error="error"
-  >
-    <MDCRenderer
-      v-if="body"
-      :tag="tag"
-      :class="props.class"
-      :body="body"
-      :data="data?.data"
-      :unwrap="props.unwrap"
-      :components="{
-        a: ProseA,
-        h1: ProseH1,
-        h2: ProseH2,
-        h3: ProseH3,
-        h4: ProseH4,
-        h5: ProseH5,
-        h6: ProseH6,
-        blockquote: ProseBlockquote,
-      }"
-    />
-  </slot>
+  <template
+    v-if="model && model.length > 0">
+    <MarkdownRenderer :key="key" v-if="node" :node="node"></MarkdownRenderer>
+  </template>
 </template>
 
 <script setup lang="ts">
-import ProseA from "~/components/content/prose/ProseA.vue";
-import ProseH1 from "~/components/content/prose/ProseH1.vue";
-import ProseH2 from "~/components/content/prose/ProseH2.vue";
-import ProseH3 from "~/components/content/prose/ProseH3.vue";
-import ProseH4 from "~/components/content/prose/ProseH4.vue";
-import ProseH5 from "~/components/content/prose/ProseH5.vue";
-import ProseH6 from "~/components/content/prose/ProseH6.vue";
-import ProseBlockquote from "~/components/content/prose/ProseBlockquote.vue";
-
 import { hash } from 'ohash'
-import { useAsyncData } from 'nuxt/app'
 import { watch, computed } from 'vue'
+import type { Root } from 'hast';
 
-const props = defineProps({
-  tag: {
-    type: [String, Boolean],
-    default: 'div'
-  },
-  content: {
-    type: [String, Object],
-    required: true
-  },
-  excerpt: {
-    type: Boolean,
-    default: false
-  },
-  class: {
-    type: [String, Array, Object],
-    default: ''
-  },
-  unwrap: {
-    type: [Boolean, String],
-    default: false
-  }
-})
-const model = defineModel<number>({
-  default: 0,
-});
+const model = defineModel<string>();
 
 const parser = useMarkdown();
-const key = computed(() => hash(props.content))
+const key = computed(() => hash(model.value));
 
-const { data, refresh, error } = await useAsyncData(key.value, async () => {
-  const timer = performance.now();
-  if (typeof props.content !== 'string') {
-    model.value = performance.now() - timer;
-    return props.content
+const node = ref<Root>();
+
+watch(model, async () => {
+  if(model.value && model.value)
+  {
+    node.value = parser(model.value);
   }
-  const result = await parser(props.content);
-  model.value = performance.now() - timer;
-  return result;
-})
-
-const body = computed(() => props.excerpt ? data.value?.excerpt : data.value?.body)
-
-watch(() => props.content, () => {
-  refresh()
-})
+}, { immediate: true });
 </script>
\ No newline at end of file
diff --git a/components/MarkdownRenderer.vue b/components/MarkdownRenderer.vue
new file mode 100644
index 0000000..64112d4
--- /dev/null
+++ b/components/MarkdownRenderer.vue
@@ -0,0 +1,121 @@
+<script lang="ts">
+import type { Node, Text, Element, Comment, Root } from 'hast';
+import { Text as HText, Comment as HComment } from 'vue';
+
+import ProseP from '~/components/prose/ProseP.vue';
+import ProseA from '~/components/prose/ProseA.vue';
+import ProseBlockquote from '~/components/prose/ProseBlockquote.vue';
+import ProseCode from '~/components/prose/ProseCode.vue';
+import ProsePre from '~/components/prose/ProsePre.vue';
+import ProseEm from '~/components/prose/ProseEm.vue';
+import ProseH1 from '~/components/prose/ProseH1.vue';
+import ProseH2 from '~/components/prose/ProseH2.vue';
+import ProseH3 from '~/components/prose/ProseH3.vue';
+import ProseH4 from '~/components/prose/ProseH4.vue';
+import ProseH5 from '~/components/prose/ProseH5.vue';
+import ProseH6 from '~/components/prose/ProseH6.vue';
+import ProseHr from '~/components/prose/ProseHr.vue';
+import ProseImg from '~/components/prose/ProseImg.vue';
+import ProseUl from '~/components/prose/ProseUl.vue';
+import ProseOl from '~/components/prose/ProseOl.vue';
+import ProseLi from '~/components/prose/ProseLi.vue';
+import ProseStrong from '~/components/prose/ProseStrong.vue';
+import ProseTable from '~/components/prose/ProseTable.vue';
+import ProseThead from '~/components/prose/ProseThead.vue';
+import ProseTbody from '~/components/prose/ProseTbody.vue';
+import ProseTd from '~/components/prose/ProseTd.vue';
+import ProseTh from '~/components/prose/ProseTh.vue';
+import ProseTr from '~/components/prose/ProseTr.vue';
+import ProseScript from '~/components/prose/ProseScript.vue';
+
+const proseList = {
+    "p": ProseP, 
+    "a": ProseA, 
+    "blockquote": ProseBlockquote, 
+    "code": ProseCode, 
+    "pre": ProsePre, 
+    "em": ProseEm, 
+    "h1": ProseH1, 
+    "h2": ProseH2, 
+    "h3": ProseH3, 
+    "h4": ProseH4, 
+    "h5": ProseH5, 
+    "h6": ProseH6, 
+    "hr": ProseHr, 
+    "img": ProseImg, 
+    "ul": ProseUl, 
+    "ol": ProseOl, 
+    "li": ProseLi, 
+    "strong": ProseStrong, 
+    "table": ProseTable, 
+    "thead": ProseThead, 
+    "tbody": ProseTbody, 
+    "td": ProseTd, 
+    "th": ProseTh, 
+    "tr": ProseTr, 
+    "script": ProseScript  
+};
+
+export default defineComponent({
+    name: 'MarkdownRenderer',
+    props: {
+        node: {
+            type: Object,
+            required: true
+        },
+        proses: {
+            type: Object,
+            default: () => ({})
+        }
+    },
+    watch: {
+        node: {
+            handler: function(val, old) {
+
+            },
+            deep: true,
+        }
+    },
+    async setup(props) {
+        if(props.proses)
+        {
+            for(const prose of Object.keys(props.proses))
+            {
+                if(typeof props.proses[prose] === 'string')
+                    props.proses[prose] = await resolveComponent(props.proses[prose]);
+            }
+        }
+        return { tags: Object.assign({}, proseList, props.proses) };
+    },
+    render(ctx: any) {
+        const { node, tags } = ctx;
+
+        const div = h('div', null, (node as Root).children.map(e => renderNode(e, tags)).filter(e => !!e));
+        return div;
+    }
+});
+
+function renderNode(node: Node, tags: Record<string, any>): VNode | undefined
+{
+    if(node.type === 'text')
+    {
+        const text = node as Text;
+        if(text.value.length > 0 && text.value !== '\n')
+            return h(HText, (node as Text).value);
+    }
+    else if(node.type === 'comment')
+    {
+        const comment = node as Comment;
+        if(comment.value.length > 0 && comment.value !== '\n')
+            return h(HComment, (node as Comment).value);
+    }
+    else if(node.type === 'element')
+    {
+        const element = node as Element;
+
+        return h(tags[element.tagName], { ...element.properties, class: element.properties.className }, element.children.map(e => renderNode(e, tags)).filter(e => !!e));
+    }
+
+    return undefined;
+}
+</script>
\ No newline at end of file
diff --git a/components/canvas/CanvasNode.vue b/components/canvas/CanvasNode.vue
index cca85d3..e33da02 100644
--- a/components/canvas/CanvasNode.vue
+++ b/components/canvas/CanvasNode.vue
@@ -43,7 +43,7 @@ if(props.node.color !== undefined)
                     <div  v-if="node.text?.length > 0" class="markdown-embed-content node-insert-event" style="">
                         <div class="markdown-preview-view markdown-rendered node-insert-event show-indentation-guide allow-fold-headings allow-fold-lists">
                             <div class="markdown-preview-sizer markdown-preview-section">
-                                <Markdown :content="node.text"/>
+                                <Markdown v-model="node.text"/>
                             </div>
                         </div>
                     </div>
diff --git a/components/explorer/NavigationLink.vue b/components/explorer/NavigationLink.vue
index 1f2abde..0fb7331 100644
--- a/components/explorer/NavigationLink.vue
+++ b/components/explorer/NavigationLink.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { Navigation } from '~/server/api/project/[projectId]/navigation.get';
+import type { Navigation } from '~/types/api';
 
 interface Props {
     link: Navigation;
diff --git a/components/content/prose/ProseA.vue b/components/prose/ProseA.vue
similarity index 97%
rename from components/content/prose/ProseA.vue
rename to components/prose/ProseA.vue
index aa67d4d..a65b054 100644
--- a/components/content/prose/ProseA.vue
+++ b/components/prose/ProseA.vue
@@ -8,7 +8,7 @@
                         <div class="markdown-preview-view markdown-rendered node-insert-event hide-title">
                             <div class="markdown-preview-sizer markdown-preview-section" style="padding-bottom: 0px;">
                                 <h1 v-if="page[0]?.title">{{ page[0]?.title }}</h1>
-                                <Markdown :content="page[0].content" />
+                                <Markdown v-model="page[0].content" />
                             </div>
                         </div>
                     </div>
diff --git a/components/prose/ProseBlockquote.vue b/components/prose/ProseBlockquote.vue
new file mode 100644
index 0000000..656ea52
--- /dev/null
+++ b/components/prose/ProseBlockquote.vue
@@ -0,0 +1,5 @@
+<template>
+  <blockquote>
+    <slot />
+  </blockquote>
+</template>
diff --git a/components/prose/ProseCode.vue b/components/prose/ProseCode.vue
new file mode 100644
index 0000000..b15c934
--- /dev/null
+++ b/components/prose/ProseCode.vue
@@ -0,0 +1,3 @@
+<template>
+  <code><slot /></code>
+</template>
diff --git a/components/prose/ProseEm.vue b/components/prose/ProseEm.vue
new file mode 100644
index 0000000..7f4ae1f
--- /dev/null
+++ b/components/prose/ProseEm.vue
@@ -0,0 +1,5 @@
+<template>
+  <em>
+    <slot />
+  </em>
+</template>
diff --git a/components/content/prose/ProseH1.vue b/components/prose/ProseH1.vue
similarity index 51%
rename from components/content/prose/ProseH1.vue
rename to components/prose/ProseH1.vue
index f40aa1c..7a55f69 100644
--- a/components/content/prose/ProseH1.vue
+++ b/components/prose/ProseH1.vue
@@ -1,7 +1,11 @@
 <template>
-    <h1 :id="id"><slot></slot></h1>
+  <h1 :id="id">
+    <slot />
+  </h1>
 </template>
 
 <script setup lang="ts">
 const props = defineProps<{ id?: string }>()
-</script>
\ No newline at end of file
+
+const generate = computed(() => props.id)
+</script>
diff --git a/components/content/prose/ProseH2.vue b/components/prose/ProseH2.vue
similarity index 51%
rename from components/content/prose/ProseH2.vue
rename to components/prose/ProseH2.vue
index 5d7f478..05335eb 100644
--- a/components/content/prose/ProseH2.vue
+++ b/components/prose/ProseH2.vue
@@ -1,7 +1,11 @@
 <template>
-    <h2 :id="id"><slot></slot></h2>
+  <h2 :id="id">
+    <slot />
+  </h2>
 </template>
 
 <script setup lang="ts">
 const props = defineProps<{ id?: string }>()
-</script>
\ No newline at end of file
+
+const generate = computed(() => props.id)
+</script>
diff --git a/components/content/prose/ProseH3.vue b/components/prose/ProseH3.vue
similarity index 51%
rename from components/content/prose/ProseH3.vue
rename to components/prose/ProseH3.vue
index 377cc87..67d81c1 100644
--- a/components/content/prose/ProseH3.vue
+++ b/components/prose/ProseH3.vue
@@ -1,7 +1,11 @@
 <template>
-    <h3 :id="id"><slot></slot></h3>
+  <h3 :id="id">
+    <slot />
+  </h3>
 </template>
 
 <script setup lang="ts">
 const props = defineProps<{ id?: string }>()
-</script>
\ No newline at end of file
+
+const generate = computed(() => props.id)
+</script>
diff --git a/components/content/prose/ProseH4.vue b/components/prose/ProseH4.vue
similarity index 51%
rename from components/content/prose/ProseH4.vue
rename to components/prose/ProseH4.vue
index 7a3b7d5..aef52bc 100644
--- a/components/content/prose/ProseH4.vue
+++ b/components/prose/ProseH4.vue
@@ -1,7 +1,11 @@
 <template>
-    <h4 :id="id"><slot></slot></h4>
+  <h4 :id="id">
+    <slot />
+  </h4>
 </template>
 
 <script setup lang="ts">
 const props = defineProps<{ id?: string }>()
-</script>
\ No newline at end of file
+
+const generate = computed(() => props.id)
+</script>
diff --git a/components/content/prose/ProseH5.vue b/components/prose/ProseH5.vue
similarity index 51%
rename from components/content/prose/ProseH5.vue
rename to components/prose/ProseH5.vue
index 7cf3030..bbcfeb7 100644
--- a/components/content/prose/ProseH5.vue
+++ b/components/prose/ProseH5.vue
@@ -1,7 +1,11 @@
 <template>
-    <h5 :id="id"><slot></slot></h5>
+  <h5 :id="id">
+    <slot />
+  </h5>
 </template>
 
 <script setup lang="ts">
 const props = defineProps<{ id?: string }>()
-</script>
\ No newline at end of file
+
+const generate = computed(() => props.id)
+</script>
diff --git a/components/content/prose/ProseH6.vue b/components/prose/ProseH6.vue
similarity index 51%
rename from components/content/prose/ProseH6.vue
rename to components/prose/ProseH6.vue
index 600e60e..0a2b273 100644
--- a/components/content/prose/ProseH6.vue
+++ b/components/prose/ProseH6.vue
@@ -1,7 +1,11 @@
 <template>
-    <h6 :id="id"><slot></slot></h6>
+  <h6 :id="id">
+    <slot />
+  </h6>
 </template>
 
 <script setup lang="ts">
 const props = defineProps<{ id?: string }>()
-</script>
\ No newline at end of file
+
+const generate = computed(() => props.id)
+</script>
diff --git a/components/prose/ProseHr.vue b/components/prose/ProseHr.vue
new file mode 100644
index 0000000..d26dde6
--- /dev/null
+++ b/components/prose/ProseHr.vue
@@ -0,0 +1,3 @@
+<template>
+  <hr>
+</template>
diff --git a/components/prose/ProseImg.vue b/components/prose/ProseImg.vue
new file mode 100644
index 0000000..8244bb1
--- /dev/null
+++ b/components/prose/ProseImg.vue
@@ -0,0 +1,42 @@
+<template>
+  <img
+    :src="refinedSrc"
+    :alt="alt"
+    :width="width"
+    :height="height"
+  />
+</template>
+
+<script setup lang="ts">
+import { withTrailingSlash, withLeadingSlash, joinURL } from 'ufo'
+import { useRuntimeConfig, computed, resolveComponent } from '#imports'
+
+const props = defineProps({
+  src: {
+    type: String,
+    default: ''
+  },
+  alt: {
+    type: String,
+    default: ''
+  },
+  width: {
+    type: [String, Number],
+    default: undefined
+  },
+  height: {
+    type: [String, Number],
+    default: undefined
+  }
+})
+
+const refinedSrc = computed(() => {
+  if (props.src?.startsWith('/') && !props.src.startsWith('//')) {
+    const _base = withLeadingSlash(withTrailingSlash(useRuntimeConfig().app.baseURL))
+    if (_base !== '/' && !props.src.startsWith(_base)) {
+      return joinURL(_base, props.src)
+    }
+  }
+  return props.src
+})
+</script>
diff --git a/components/prose/ProseLi.vue b/components/prose/ProseLi.vue
new file mode 100644
index 0000000..3bad7d1
--- /dev/null
+++ b/components/prose/ProseLi.vue
@@ -0,0 +1,3 @@
+<template>
+  <li><slot /></li>
+</template>
diff --git a/components/prose/ProseOl.vue b/components/prose/ProseOl.vue
new file mode 100644
index 0000000..7d3a886
--- /dev/null
+++ b/components/prose/ProseOl.vue
@@ -0,0 +1,5 @@
+<template>
+  <ol>
+    <slot />
+  </ol>
+</template>
diff --git a/components/prose/ProseP.vue b/components/prose/ProseP.vue
new file mode 100644
index 0000000..14c310f
--- /dev/null
+++ b/components/prose/ProseP.vue
@@ -0,0 +1,3 @@
+<template>
+  <p><slot /></p>
+</template>
diff --git a/components/prose/ProsePre.vue b/components/prose/ProsePre.vue
new file mode 100644
index 0000000..ab89465
--- /dev/null
+++ b/components/prose/ProsePre.vue
@@ -0,0 +1,36 @@
+<template>
+  <pre :class="$props.class"><slot /></pre>
+</template>
+
+<script setup lang="ts">
+defineProps({
+  code: {
+    type: String,
+    default: ''
+  },
+  language: {
+    type: String,
+    default: null
+  },
+  filename: {
+    type: String,
+    default: null
+  },
+  highlights: {
+    type: Array as () => number[],
+    default: () => []
+  },
+  meta: {
+    type: String,
+    default: null
+  },
+  class: {
+    type: String,
+    default: null
+  }
+})
+</script>
+
+<style>
+pre code .line{display:block}
+</style>
diff --git a/components/prose/ProseScript.vue b/components/prose/ProseScript.vue
new file mode 100644
index 0000000..e95f58a
--- /dev/null
+++ b/components/prose/ProseScript.vue
@@ -0,0 +1,15 @@
+<template>
+  <div v-if="isDev">
+    Rendering the <code>script</code> element is dangerous and is disabled by default. Consider implementing your own <code>ProseScript</code> element to have control over script rendering.
+  </div>
+</template>
+
+<script setup lang="ts">
+defineProps({
+  src: {
+    type: String,
+    default: ''
+  }
+})
+const isDev = import.meta.dev
+</script>
diff --git a/components/prose/ProseStrong.vue b/components/prose/ProseStrong.vue
new file mode 100644
index 0000000..994fae3
--- /dev/null
+++ b/components/prose/ProseStrong.vue
@@ -0,0 +1,5 @@
+<template>
+  <strong>
+    <slot />
+  </strong>
+</template>
diff --git a/components/prose/ProseTable.vue b/components/prose/ProseTable.vue
new file mode 100644
index 0000000..74b36d3
--- /dev/null
+++ b/components/prose/ProseTable.vue
@@ -0,0 +1,5 @@
+<template>
+  <table>
+    <slot />
+  </table>
+</template>
diff --git a/components/prose/ProseTbody.vue b/components/prose/ProseTbody.vue
new file mode 100644
index 0000000..09d6191
--- /dev/null
+++ b/components/prose/ProseTbody.vue
@@ -0,0 +1,5 @@
+<template>
+  <tbody>
+    <slot />
+  </tbody>
+</template>
diff --git a/components/prose/ProseTd.vue b/components/prose/ProseTd.vue
new file mode 100644
index 0000000..8bb1a9b
--- /dev/null
+++ b/components/prose/ProseTd.vue
@@ -0,0 +1,5 @@
+<template>
+  <td>
+    <slot />
+  </td>
+</template>
diff --git a/components/prose/ProseTh.vue b/components/prose/ProseTh.vue
new file mode 100644
index 0000000..940a961
--- /dev/null
+++ b/components/prose/ProseTh.vue
@@ -0,0 +1,5 @@
+<template>
+  <th>
+    <slot />
+  </th>
+</template>
diff --git a/components/prose/ProseThead.vue b/components/prose/ProseThead.vue
new file mode 100644
index 0000000..95dbdb7
--- /dev/null
+++ b/components/prose/ProseThead.vue
@@ -0,0 +1,5 @@
+<template>
+  <thead>
+    <slot />
+  </thead>
+</template>
diff --git a/components/prose/ProseTr.vue b/components/prose/ProseTr.vue
new file mode 100644
index 0000000..926f7c1
--- /dev/null
+++ b/components/prose/ProseTr.vue
@@ -0,0 +1,5 @@
+<template>
+  <tr>
+    <slot />
+  </tr>
+</template>
diff --git a/components/prose/ProseUl.vue b/components/prose/ProseUl.vue
new file mode 100644
index 0000000..5c12ce9
--- /dev/null
+++ b/components/prose/ProseUl.vue
@@ -0,0 +1,5 @@
+<template>
+  <ul>
+    <slot />
+  </ul>
+</template>
diff --git a/components/prose/live/LiveA.vue b/components/prose/live/LiveA.vue
new file mode 100644
index 0000000..fd60232
--- /dev/null
+++ b/components/prose/live/LiveA.vue
@@ -0,0 +1,5 @@
+<template>
+    <a>
+        <slot></slot>
+    </a>
+</template>
\ No newline at end of file
diff --git a/components/prose/live/LiveBlockquote.vue b/components/prose/live/LiveBlockquote.vue
new file mode 100644
index 0000000..8cba945
--- /dev/null
+++ b/components/prose/live/LiveBlockquote.vue
@@ -0,0 +1,12 @@
+<template>
+    <span v-if="focused">> </span>
+    <blockquote ref="el" @focusin="focused = true" @focusout="focused = false">
+        <slot />
+    </blockquote>
+</template>
+
+<script setup lang="ts">
+    const focused = ref(false);
+
+    watch(focused, console.log);
+</script>
\ No newline at end of file
diff --git a/components/prose/live/LiveH1.vue b/components/prose/live/LiveH1.vue
new file mode 100644
index 0000000..abfa20a
--- /dev/null
+++ b/components/prose/live/LiveH1.vue
@@ -0,0 +1,3 @@
+<template>
+    <span v-show="false"># </span><h1><slot></slot></h1>
+</template>
\ No newline at end of file
diff --git a/components/prose/live/LiveH2.vue b/components/prose/live/LiveH2.vue
new file mode 100644
index 0000000..6a29875
--- /dev/null
+++ b/components/prose/live/LiveH2.vue
@@ -0,0 +1,12 @@
+<template>
+    <span v-show="focused">## </span><h2><slot></slot></h2>
+</template>
+
+<script setup>
+const props = defineProps({
+    focused: {
+        type: Boolean,
+        default: false
+    }
+})
+</script>
\ No newline at end of file
diff --git a/components/prose/live/LiveH3.vue b/components/prose/live/LiveH3.vue
new file mode 100644
index 0000000..d3c7409
--- /dev/null
+++ b/components/prose/live/LiveH3.vue
@@ -0,0 +1,3 @@
+<template>
+    <span v-show="false">### </span><h3><slot></slot></h3>
+</template>
\ No newline at end of file
diff --git a/components/prose/live/LiveH4.vue b/components/prose/live/LiveH4.vue
new file mode 100644
index 0000000..e149331
--- /dev/null
+++ b/components/prose/live/LiveH4.vue
@@ -0,0 +1,3 @@
+<template>
+    <span v-show="false">#### </span><h4><slot></slot></h4>
+</template>
\ No newline at end of file
diff --git a/components/prose/live/LiveH5.vue b/components/prose/live/LiveH5.vue
new file mode 100644
index 0000000..9aa8d60
--- /dev/null
+++ b/components/prose/live/LiveH5.vue
@@ -0,0 +1,3 @@
+<template>
+    <span v-show="false">##### </span><h5><slot></slot></h5>
+</template>
\ No newline at end of file
diff --git a/components/prose/live/LiveH6.vue b/components/prose/live/LiveH6.vue
new file mode 100644
index 0000000..60aeac8
--- /dev/null
+++ b/components/prose/live/LiveH6.vue
@@ -0,0 +1,3 @@
+<template>
+    <span v-show="false">###### </span><h6><slot></slot></h6>
+</template>
\ No newline at end of file
diff --git a/composables/useMarkdown.ts b/composables/useMarkdown.ts
index 889ac78..802804b 100644
--- a/composables/useMarkdown.ts
+++ b/composables/useMarkdown.ts
@@ -1,24 +1,23 @@
-import { createMarkdownParser } from "@nuxtjs/mdc/runtime/parser/index";
-import RemarkBreaks from "remark-breaks";
-import RemarkOfm from "remark-ofm";
+import { unified, type Processor } from "unified";
+import type { Root } from 'hast';
+import RemarkParse from "remark-parse";
 
-export default function useMarkdown(): Awaited<ReturnType<typeof createMarkdownParser>>
+import RemarkRehype from 'remark-rehype';
+import RemarkOfm from 'remark-ofm';
+import RemarkGfm from 'remark-gfm';
+
+export default function useMarkdown(): (md: string) => Root
 {
-    let parser: Awaited<ReturnType<typeof createMarkdownParser>>
+    let processor: Processor;
 
-    const parse = async (markdown: string) => {
-        if (!parser) 
+    const parse = (markdown: string) => {
+        if (!processor) 
         {
-            parser = await createMarkdownParser({
-                remark: {
-                    plugins: {
-                        'remark-breaks': { instance: RemarkBreaks },
-                        'remark-ofm': { instance: RemarkOfm }
-                    }
-                },
-            });
+            processor = unified().use([RemarkParse, RemarkGfm, RemarkOfm, RemarkRehype]);
         }
-        return parser(markdown);
+
+        const processed = processor.runSync(processor.parse(markdown)) as Root;
+        return processed;
     }
 
     return parse;
diff --git a/composables/useUserSession.ts b/composables/useUserSession.ts
new file mode 100644
index 0000000..d225abb
--- /dev/null
+++ b/composables/useUserSession.ts
@@ -0,0 +1,40 @@
+import type { UserSession, UserSessionComposable } from '~/types/auth'
+
+const useSessionState = () => useState<UserSession>('nuxt-session', () => ({}))
+const useAuthReadyState = () => useState('nuxt-auth-ready', () => false)
+
+/**
+ * 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()
+  const authReadyState = useAuthReadyState()
+  return {
+    ready: computed(() => authReadyState.value),
+    loggedIn: computed(() => Boolean(sessionState.value.user)),
+    user: computed(() => sessionState.value.user || null),
+    session: sessionState,
+    fetch,
+    clear,
+  }
+}
+
+async function fetch() {
+  const authReadyState = useAuthReadyState()
+  useSessionState().value = await useRequestFetch()('/api/auth/session', {
+    headers: {
+      Accept: 'text/json',
+    },
+    retry: false,
+  }).catch(() => ({}))
+  if (!authReadyState.value) {
+    authReadyState.value = true
+  }
+}
+
+async function clear() {
+  await $fetch('/api/auth/session', { method: 'DELETE' })
+  useSessionState().value = {}
+  useRouter().go(0);
+}
\ No newline at end of file
diff --git a/db.sqlite b/db.sqlite
index a48ac11..c278f95 100644
Binary files a/db.sqlite and b/db.sqlite differ
diff --git a/middleware/auth.global.ts b/middleware/auth.global.ts
new file mode 100644
index 0000000..b302d00
--- /dev/null
+++ b/middleware/auth.global.ts
@@ -0,0 +1,22 @@
+export default defineNuxtRouteMiddleware(async (to, from) => {
+    const { loggedIn, ready, fetch } = useUserSession();
+    const meta = to.meta;
+
+    if(!ready)
+        await fetch();
+    
+    if(!!meta.guestsGoesTo && !loggedIn.value)
+    {
+        return navigateTo(meta.guestsGoesTo);
+    }
+    else if(meta.requireAuth && !loggedIn.value)
+    {
+        return abortNavigation();
+    }
+    else if(!!meta.usersGoesTo && loggedIn.value)
+    {
+        return navigateTo(meta.usersGoesTo);
+    }
+
+    return;
+});
\ No newline at end of file
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 3aa9f0f..bde2466 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -1,11 +1,13 @@
 // https://nuxt.com/docs/api/configuration/nuxt-config
 
 export default defineNuxtConfig({
-  modules: ["@nuxtjs/color-mode", "@nuxtjs/mdc"],
+  modules: ["@nuxtjs/color-mode", "nuxt-security"],
   css: ['~/assets/common.css', '~/assets/global.css'],
   runtimeConfig: {
     dbFile: '',
-    sessionPassword: '699c46bd-9aaa-4364-ad01-510ee4fe7013'
+    session: {
+      password: '699c46bd-9aaa-4364-ad01-510ee4fe7013'
+    }
   },
   components: [
     {
diff --git a/package.json b/package.json
index b2a0498..f8a6de8 100644
--- a/package.json
+++ b/package.json
@@ -1,17 +1,19 @@
 {
   "devDependencies": {
     "@nuxtjs/color-mode": "^3.4.2",
-    "@nuxtjs/mdc": "^0.8.3",
     "@types/bun": "^1.1.6",
-    "nuxt": "^3.12.4",
-    "vue": "^3.4.35",
-    "vue-router": "^4.4.2",
+    "@types/diff": "^5.2.1",
     "hast-util-to-html": "^9.0.1",
+    "nuxt": "^3.12.4",
+    "nuxt-security": "^2.0.0-rc.9",
     "remark-breaks": "^4.0.0",
     "remark-ofm": "link:remark-ofm",
+    "vue": "^3.4.37",
+    "vue-router": "^4.4.3",
     "zod": "^3.23.8"
   },
   "dependencies": {
+    "diff": "^5.2.0",
     "lodash.capitalize": "^4.2.1"
   }
 }
\ No newline at end of file
diff --git a/pages/editing.vue b/pages/editing.vue
index 620f419..ed4cfac 100644
--- a/pages/editing.vue
+++ b/pages/editing.vue
@@ -1,18 +1,220 @@
+<style>
+.editor-container
+{
+    width: 100%;
+    height: 100%;
+    overflow: auto;
+    display: flex;
+    justify-content: space-around;
+}
+.editor
+{
+    width: 45%;
+}
+</style>
+
 <template>
-    <div class="column">
-        <textarea v-model="input"></textarea>
-        <pre>{{ timing }}ms</pre>
-    </div>
-    <div class="column">
+    <Head>
+        <Title>Live Editing</Title>
+    </Head>
+    <div class="editor-container">
         <Suspense>
             <template #fallback>
                 <div class="loading"></div>
             </template>
-            <Markdown v-if="input.length > 0" :content="input" v-model="timing"/>
+            <EditableMarkdown class="editor-preview" v-if="input.length > 0" v-model="input"></EditableMarkdown>
         </Suspense>
+        <textarea class="editor" v-model="input"></textarea>
     </div>
 </template>
 
 <script setup lang="ts">
-const input = ref(""), timing = ref(0);
+const input = ref(`## Liste de sorts provisoire
+%% Equilibrage: Les sorts de dégâts plus cher ne doivent pas forcément proposer plus de dés de dégâts mais offrir plus d'options et avoir des dé de dégâts plus haut, pour synergiser avec les buffs de l'arbre de magie. %%
+
+**Notation:**
+- Nom #element (coût, durée d'incantation, portée, prérequis d'incantation)
+> Effet
+### Rang 1
+- Trait de feu #element/feu (4 mana, tour, 12 cases, V/Ge/Gl)
+>Tire un faisceau de flamme, infligeant 2d8 dégâts de [[Les types de dégâts#Feu|feu]].
+
+- Echauffement #element/feu (2 mana, tour, V/Gl)
+>Chauffe à blanc une arme ou un projectile. Jusqu'au début de votre prochain tour, les coups portés avec l'objet infligent 1d6 dégâts supplémentaire. Les dégâts de l'arme deviennent des dégâts de [[Les types de dégâts#Feu|feu]].
+
+-  #element/feu (mana, tour)
+>
+
+- Corps ardent #element/feu(6 mana, tour, V/Ge/Gl/C)
+>Pendant 5 tours, toute personne terminant son tour à une case de vous subit 1d10 dégâts de [[Les types de dégâts#Feu|feu]].
+
+-  #element/feu(mana, tour)
+>
+
+- Protection supérieure #element/glace (2 mana, réaction, V/Gl)
+>L'armure subit l'intégralité des dégâts sur le prochain coup.
+
+- Lames de glace #element/glace (4 mana, tour, 12 cases)
+>Tire 2 projectiles infligeant 1d8 dégâts de [[Les types de dégâts#Glace|glace]]. Augmenter les dés de dégâts offre un projectile supplémentaire à la place. Chaque projectile demande un jet d'attaque séparé et peut viser une cible différente.
+
+-  #element/glace(mana, tour)
+>
+
+-  #element/glace(mana, tour)
+>
+
+-  #element/glace(mana, tour)
+>
+
+- Chaine de foudre #element/foudre (4 mana, tour, 12 cases)
+>Frappe une cible visible puis rebondit sur jusqu'à 2 autres cibles à 1 case de la première. Inflige 1d8 dégâts de [[Les types de dégâts#Foudre|foudre]].
+
+- Vitesse lumière #element/foudre (3 mana, tour)
+>Se téléporte à 6 cases tant que vous pouvez voir et courir vers la destination.
+
+- Décharge de foudre #element/foudre(3 mana, tour)
+>Tire une décharge foudroyante d'énergie, infligeant 4d4[[Glossaire#Jet explosif|!]] dégâts de [[Les types de dégâts#Foudre|foudre]].
+
+- Faisceau fulgurant  #element/foudre(4 mana, tour)
+>Lance un faisceau électrique qui peut contourner les obstacles pour toucher une cible à couvert. Inflige 3d4[[Glossaire#Jet explosif|!]] dégâts de [[Les types de dégâts#Foudre|foudre]]. 
+>*Vous pouvez viser une case que vous ne voyez pas, mais le MJ ne doit pas vous informer si l'attaque pourrait toucher une cible.*
+
+-  #element/foudre(mana, tour)
+>
+
+-  #element/terre(2 mana, tour)
+>Un pilier de matière est extirpé du sol pour aller frapper la cible, qui est alors déplacée d'une case. Si la cible est propulsée contre un mur, elle subit alors 3d12 dégâts [[Les types de dégâts#Contondant|contondant]].
+
+-  #element/terre(3 mana, tour)
+>Propulse un projectile de matière sur la cible, infligeant 1d12 dégâts [[Les types de dégâts#Contondant|contondant]] et appliquant un [[Les effets#L'étourdissement|étourdissement]] (2/12).
+
+- Bouclier tortue #element/terre(3 mana, tour)
+>Vous gagnez un bonus de 2 en blocage, mais subissez également un malus de 2 en esquive et perdez 2 cases de vitesse de course durant 1 min.
+
+-  #element/terre(2 mana, réaction)
+> Vous gagnez une résistance aux dégâts [[Les types de dégâts#Les dégâts physiques|physiques]] jusqu'à la fin de votre prochain tour.
+
+-  #element/terre(mana, tour)
+>
+
+- Enchantement mineur #element/arcane(2 mana, tour, V/Gl)
+> Condense de l'énergie magique dans une arme ou un projectile. Vous faites une attaque immédiatement après avoir lancé ce sort sans dépenser d'action, infligeant 1d8 dégâts supplémentaire. Les dégâts de l'arme deviennent [[Les types de dégâts#Neutre|magique]].
+
+- Rupture de force #element/arcane(3 mana, tour, V/Ge/Gl)
+> Vous condensez une puissante énergie magique qui est propulsée directement sur votre cible. Vous lancez 2d20 et prenez le plus haut résultat pour infliger des dégâts [[Les types de dégâts#Neutre|magique]]. *Avoir un #avantage aux dégâts permet de lancer un autre d20.* *Augmenter les dégâts de ce sort permet d'infliger 5 dégâts [[Les types de dégâts#Neutre|magique]] supplémentaire.*
+
+-  #element/arcane(mana, tour)
+>
+
+-  #element/arcane(mana, tour)
+>
+
+-  #element/arcane(mana, tour)
+>
+
+- Foulée aérienne #element/air(3 mana, tour, 12 cases)
+>La vitesse de course de votre cible augmente de 2 cases pendant 1 minute. Vous gagnez également un bonus de +1 à l'esquive.
+
+- Pression forcée  #element/air(5 mana, tour, 18 cases)
+>Crée une imposante colonne d'air descendent de 3 cases de rayon sur 12 cases de haut. Les créatures à l'intérieur ont un malus de 1 à l'esquive. Les créatures volantes chutent de 3 cases par tour.
+
+-  #element/air(mana, tour)
+>
+
+-  #element/air(mana, tour)
+>
+
+-  #element/air(mana, tour)
+>
+
+- Conservation #element/nature (2 mana, 1 minute)
+>Permet à jusqu'à 5 herbes ou préparations médicinales de se conserver 1 jour de plus. *Ne peux être utilisé qu'une seule fois par herbe/préparation.*
+
+-  #element/nature(mana, tour)
+>
+
+-  #element/nature(mana, tour)
+>
+
+-  #element/nature(mana, tour)
+>
+
+-  #element/nature(mana, tour)
+>
+
+- Absorption radieuse #element/lumiere (3 mana, tour)
+> Absorbe la lumière d'une zone de 4 cases de rayon, la faisant apparaitre comme plus sombre. #todo 
+
+-  #element/lumiere (mana, tour)
+>
+
+-  #element/lumiere (mana, tour)
+>
+
+-  #element/lumiere (mana, tour)
+>
+
+-  #element/lumiere (mana, tour)
+>
+
+-  #element/psy(6 mana, tour)
+>Envenime l'esprit de la cible, brouillant sa perception de la réalité et lui faisant voir des images subliminales de chaos. Applique un effet de [[Les effets#La peur|peur]] (4/12).
+### Rang 2
+- Trait de feu 2 #element/feu (5 mana, tour, 15 cases, V/Ge/Gl)
+>Tire un faisceau de flamme, infligeant 3d8 de dégâts de feu.
+
+- Lames de glace 2 #element/glace (5 mana, tour, 15 cases)
+>Tire 3 projectiles à 1d8 de glace. Augmenter les dés de dégâts offre un projectile supplémentaire à la place. Chaque projectile demande un jet d'attaque séparé et peut viser une cible différente.
+
+- Chaine de foudre 2 #element/foudre (5 mana, tour, 15 cases)
+>Frappe une cible visible puis rebondit sur jusqu'à 3 autres cibles à 2 cases de la première. 1d8+3 de foudre.
+
+- Décharge de foudre 2 #element/foudre(3 mana, tour)
+>Tire une décharge foudroyante d'énergie, infligeant 6d4[[Glossaire#Jet explosif|!]] de dégâts de foudre.
+
+- Conservation 2 #element/nature (4 mana, 1 minute)
+>Permet à jusqu'à 8 herbes ou préparations médicinales de se conserver 3 jours de plus. *Ne peux être utilisé qu'une seule fois par herbe/préparation.*
+
+- Boule de feu #element/feu (8 mana, tour, 12 cases)
+>Projette une imposante boule de flamme explosant au contact d'une surface, infligeant ainsi 4d10 de feu sur 3 cases de rayon.
+
+- Détonation #element/feu (4 mana, tour, 8 cases)
+>Pointe un lieu visible. Une explosion de flamme jaillit subitement, infligeant 2d10 de feu sur 2 cases de rayon.
+
+- Lance de givre #element/glace(4 mana, tour)
+>Une lame de glace vient grandir le long de votre arme. Augmente votre portée d'une case. L'arme inflige des dégâts tranchants. Dure 1 min, casse après 8 coups réussis.
+
+- Téléportation #element/foudre (4 mana, tour)
+>Se téléporte à un point visible à 9 cases max.
+
+- Apaisement #element/psy (3 mana, tour)
+>En touchant la cible, vous pouvez faire un jet d'intelligence. Guérit l'influence, le charme et la peur, mais augmente les chances de ces effet de 1 niveau pendant 3 tours.
+
+- Painshock #element/psy (6 mana, tour)
+>*Ne fonctionne que si la cible touchée à subit des dégâts depuis votre dernier tour.* Vous touchez une plaie et intensifiez la douleur à l'extrême. Applique un effet d'[[Les effets#L'étourdissement|étourdissement]]. La difficulté est égale à 2/12 + 1 niveau pour chaque 10% de vie max retiré.
+
+- Perturbateur #element/psy (4 mana, réaction, 9 cases, V/Ge)
+>Lorsqu'un lanceur de sort termine son incantation, vous pouvez perturber les flux magiques pour lui imposer un malus de 3 au jet.
+### Rang 3
+- Rejet pur #divin (spécial, tour, 3 cases, Ge)
+>Vous propulsez une énergie magique pure condensée sur votre adversaire avec une puissance absolue. Vous infligez 1d6!+4 dégâts [[Les types de dégâts#Neutre|magique]] tous les 3 mana dépensé. Vous pouvez dépenser jusqu'à 30 mana. Après avoir lancé ce sort, vous subissez un malus de 4 au lancer de sort pendant 1 tour.
+### Sorts unique
+Les sorts uniques sont des sorts obtenus uniquement avec des objets magiques ou en progressant dans l'arbre d'entrainement. Il n'existe **aucun** autre moyen d'obtenir des sorts.
+
+- Dévastation #element/feu + #element/glace + #element/foudre (10 mana, tour, 12 cases)
+>Inflige 10+3d10 dégâts. Vous pouvez choisir le type de dégâts entre feu, glace et foudre. Ignore les résistances et réduit les immunités en résistance. ^484fc3
+
+- Soin #element/nature (8 mana, tour, toucher)
+>Soigne 10+1d10 PV et guérit l'[[Les effets#L'étourdissement|étourdissement]], le [[Les effets#Le saignement|saignement]] et les [[Les effets#L'empoisonnement|poisons]]. ^068b55
+
+- Contresort #element/arcane (4 mana, réaction, 12 cases)
+>Perturbe les flux magique pour interrompre une canalisation en cours. Vous pouvez augmenter le coût du sort pour augmenter les chances de réussite. La difficulté est égale à 6 - le cout du sort à interrompre + le cout du contresort. ^a8f46f
+
+- Focalisation destructrice #element/arcane (12 mana, tour)
+>Vous focalisez les énergies magiques sur vous, rendant l'utilisation de sort plus complexe pour les autres. La densité d'énergie anormale vous fait subir 5 points de dégâts par tour. Pendant une minute, toute personne à 18 cases de vous essayant de lancer un sort ou de [[1.Règles/6.Les Aspects/index#Transformations|se transformer]] subit un malus de 4. ^73b8bd
+
+- Domination mentale #element/psy (10 mana, tour, toucher)
+>Applique un effet de [[Les effets#La possession|possession]] (6/12). ^5b38b6
+### Sorts spéciaux
+Les sorts spéciaux sont une liste de sorts que les joueurs peuvent obtenir durant certaines aventures. Selon les cas, un joueur peut demander au maitre du jeu de commencer avec un sort spécial si ça correspond à son passé. Les sorts spéciaux peuvent aussi être des sorts que les PNJ ont et qu'ils peuvent apprendre aux joueurs.`);
 </script>
\ No newline at end of file
diff --git a/pages/explorer/[projectId]/[...slug].vue b/pages/explorer/[projectId]/[...slug].vue
index 9079c42..70b84e6 100644
--- a/pages/explorer/[projectId]/[...slug].vue
+++ b/pages/explorer/[projectId]/[...slug].vue
@@ -24,7 +24,7 @@ await set(parseInt(route.params.projectId as string));
                         <div class="markdown-preview-view markdown-rendered node-insert-event hide-title">
                             <div class="markdown-preview-sizer markdown-preview-section" style="padding-bottom: 0px;">
                                 <h1>{{ content[0].title }}</h1>
-                                <Markdown :content="content[0].content" />
+                                <Markdown v-model="content[0].content" />
                             </div>
                         </div>
                     </div>
diff --git a/pages/explorer/[projectId]/tags/[...slug].vue b/pages/explorer/[projectId]/tags/[...slug].vue
index 15ddb32..b29af6d 100644
--- a/pages/explorer/[projectId]/tags/[...slug].vue
+++ b/pages/explorer/[projectId]/tags/[...slug].vue
@@ -1,4 +1,4 @@
-<script lang="ts">
+<!--<script lang="ts">
 let icon: HTMLDivElement | null;
 function toggleLeftPanel(_: Event) {
     icon!.parentElement!.parentElement!.parentElement!.parentElement!.classList.toggle('is-left-column-open');
@@ -84,4 +84,6 @@ onMounted(() => {
             </div>
         </template>
     </ContentList>
-</template>
\ No newline at end of file
+</template>-->
+
+<template></template>
\ No newline at end of file
diff --git a/pages/third-party.vue b/pages/third-party.vue
index 97a06d3..ec0e3bc 100644
--- a/pages/third-party.vue
+++ b/pages/third-party.vue
@@ -18,7 +18,7 @@ Le logo a été créé grâce aux icones de [Game Icons](https://game-icons.net)
                 <div class="publish-renderer">
                     <div class="markdown-preview-view markdown-rendered node-insert-event hide-title">
                         <div class="markdown-preview-sizer markdown-preview-section" style="padding-bottom: 0px;">
-                            <Markdown :content="data" />
+                            <Markdown v-model="data" />
                         </div>
                     </div>
                 </div>
diff --git a/pages/user/login.vue b/pages/user/login.vue
index 1451257..ae396db 100644
--- a/pages/user/login.vue
+++ b/pages/user/login.vue
@@ -1,46 +1,74 @@
 <script setup lang="ts">
+import { hydrate } from 'vue';
+import { ZodError } from 'zod';
 import { schema, type Login } from '~/schemas/login';
 
 definePageMeta({
-    auth: {
-        disconnectedOnly: true,
-        connectedRedirect: '/user/profile'
-    }
+    usersGoesTo: '/user/profile'
 });
 
 const state = reactive<Login>({
-    username: '',
+    usernameOrEmail: '',
     password: ''
 });
 
-const { status, login } = useAuth();
+const { data: result, status, error, refresh } = await useFetch('/api/auth/login', {
+    body: state,
+    immediate: false,
+    method: 'POST',
+    watch: false,
+    ignoreResponseError: true,
+})
 
 const usernameError = ref("");
 const passwordError = ref("");
+const generalError = ref("");
 
 async function submit()
 {
+    if(state.password === "")
+        return;
+
     const data = schema.safeParse(state);
 
-    if(data.success && state.password !== "")
+    if(data.success)
     {
-        let errors = await login(data.data.username, data.data.password);
+        await refresh()
 
-        if(status.value === AuthStatus.connected)
+        const login = result.value;
+        if(!login || !login.success)
         {
-            await navigateTo('/user/profile', { replace: true });
+            handleErrors(login?.error ?? error.value!);
         }
-        else
+        else if(status.value === 'success' && login.success)
         {
-            errors = errors?.issues ?? errors;
-            usernameError.value = errors?.find((e: any) => e.path.includes("username"))?.message ?? "";
-            passwordError.value = errors?.find((e: any) => e.path.includes("password"))?.message ?? "";
+            console.log(await navigateTo('/user/profile'));
         }
     }
     else
     {
-        usernameError.value = data.error?.issues.find(e => e.path.includes("username"))?.message ?? "";
-        passwordError.value = data.error?.issues.find(e => e.path.includes("password"))?.message ?? "";
+        handleErrors(data.error);
+    }
+}
+function handleErrors(error: Error | ZodError)
+{
+    if(error.hasOwnProperty('issues'))
+    {
+        for(const err of (error as ZodError).issues)
+        {
+            if(err.path.includes('username'))
+            {
+                usernameError.value = err.message;
+            }
+            if(err.path.includes('password'))
+            {
+                passwordError.value = err.message;
+            }
+        }
+    }
+    else
+    {
+        generalError.value = error?.message ?? 'Erreur inconnue.';
     }
 }
 </script>
@@ -51,20 +79,20 @@ async function submit()
     </Head>
     <div class="site-body-center-column">
         <div class="render-container flex align-center justify-center">
-            <form v-if="status === AuthStatus.disconnected" @submit.prevent="submit" class="input-form input-form-wide">
+            <form @submit.prevent="submit" class="input-form input-form-wide">
                 <h1>Connexion</h1>
-                <Input type="text" autocomplete="username" v-model="state.username"
+                <Input type="text" autocomplete="username" v-model="state.usernameOrEmail"
                     placeholder="" title="Nom d'utilisateur ou adresse mail" :error="usernameError" />
                 <Input type="password" autocomplete="current-password" v-model="state.password"
                     placeholder="" title="Mot de passe"
                     :error="passwordError" />
-                <button>Se connecter</button>
+                <span v-if="generalError" class="input-error">{{ generalError }}</span>
+                <button>
+                    <div class="loading" v-if="status === 'pending'"></div>
+                    <template v-else>Se connecter</template>
+                </button>
                 <NuxtLink :to="{ path: `/user/register`, force: true }">Pas de compte ?</NuxtLink>
             </form>
-            <div v-else-if="status === AuthStatus.loading" class="input-form"><div class="loading"></div></div>
-            <div v-else class="not-found-container">
-                <div class="not-found-title">👀 Vous n'avez rien à faire ici. 👀</div>
-            </div>
         </div>
     </div>
 </template>
\ No newline at end of file
diff --git a/pages/user/profile.vue b/pages/user/profile.vue
index 44e041a..2b4f855 100644
--- a/pages/user/profile.vue
+++ b/pages/user/profile.vue
@@ -1,13 +1,9 @@
 <script setup lang="ts">
 definePageMeta({
-    auth: {    
-        disconnectedOnly: false,
-        disconnectedRedirect: '/user/login'
-    }
+    guestsGoesTo: '/user/login'
 });
 
-const { data } = useAuth();
-
+const { user, clear } = useUserSession();
 </script>
 
 <template>
@@ -18,7 +14,8 @@ const { data } = useAuth();
         <div class="render-container">
             <div class="not-found-container">
                 <ThemeIcon icon="logo" :width=128 :height=128 />
-                <div class="not-found-title">Work in prorgess</div>
+                <div class="not-found-title">Bonjour {{ user?.username }} :)</div>
+                <button @click="clear">Se deconnecter</button>
             </div>
         </div>
     </div>
diff --git a/pages/user/register.vue b/pages/user/register.vue
index 9943264..a543c8d 100644
--- a/pages/user/register.vue
+++ b/pages/user/register.vue
@@ -1,11 +1,9 @@
 <script setup lang="ts">
+import { ZodError } from 'zod';
 import { schema, type Registration } from '~/schemas/registration';
 
 definePageMeta({
-    auth: {
-        disconnectedOnly: true,
-        connectedRedirect: '/user/profile'
-    }
+    usersGoesTo: '/user/profile'
 });
 
 const state = reactive<Registration>({
@@ -16,8 +14,6 @@ const state = reactive<Registration>({
 
 const confirmPassword = ref("");
 
-const { status, register } = useAuth();
-
 const checkedLength = computed(() => state.password.length >= 8 && state.password.length <= 128);
 const checkedLowerUpper = computed(() => state.password.toLowerCase() !== state.password && state.password.toUpperCase() !== state.password);
 const checkedDigit = computed(() => /[0-9]/.test(state.password));
@@ -25,30 +21,61 @@ const checkedSymbol = computed(() => " !\"#$%&'()*+,-./:;<=>?@[]^_`{|}~".split("
 
 const usernameError = ref("");
 const emailError = ref("");
+const generalError = ref("");
+
+const { data: result, status, error, execute } = await useFetch('/api/auth/register', {
+    body: state,
+    immediate: false,
+    method: 'POST',
+    watch: false,
+    ignoreResponseError: true,
+})
 
 async function submit()
 {
+    if(state.password === "" || state.password !== confirmPassword.value)
+        return;
+
     const data = schema.safeParse(state);
 
-    if(data.success && state.password !== "" && confirmPassword.value === state.password)
+    if(data.success)
     {
-        let errors = await register(data.data.username, data.data.email, data.data.password, {});
+        await execute()
 
-        if(status.value === AuthStatus.connected)
+        const login = result.value;
+        if(!login || !login.success)
         {
-            await navigateTo('/');
+            handleErrors(login?.error ?? error.value!);
         }
-        else
+        else if(status.value === 'success' && login.success)
         {
-            errors = errors?.issues ?? errors;
-            usernameError.value = errors?.find((e: any) => e.path.includes("username"))?.message ?? "";
-            emailError.value = errors?.find((e: any) => e.path.includes("email"))?.message ?? "";
+            console.log(await navigateTo('/user/profile'));
         }
     }
     else
     {
-        usernameError.value = data.error?.issues.find(e => e.path.includes("username"))?.message ?? "";
-        emailError.value = data.error?.issues.find(e => e.path.includes("email"))?.message ?? "";
+        handleErrors(data.error);
+    }
+}
+function handleErrors(error: Error | ZodError)
+{
+    if(error.hasOwnProperty('issues'))
+    {
+        for(const err of (error as ZodError).issues)
+        {
+            if(err.path.includes('username'))
+            {
+                usernameError.value = err.message;
+            }
+            if(err.path.includes('email'))
+            {
+                emailError.value = err.message;
+            }
+        }
+    }
+    else
+    {
+        generalError.value = error?.message ?? 'Erreur inconnue.';
     }
 }
 </script>
@@ -60,7 +87,7 @@ async function submit()
     </Head>
     <div class="site-body-center-column">
         <div class="render-container flex align-center justify-center">
-            <form v-if="status === AuthStatus.disconnected" @submit.prevent="submit" class="input-form input-form-wide">
+            <form @submit.prevent="submit" class="input-form input-form-wide">
                 <h1>Inscription</h1>
                 <Input type="text" autocomplete="username" v-model="state.username"
                     placeholder="Entrez un nom d'utiliateur" title="Nom d'utilisateur" :error="usernameError" />
@@ -85,14 +112,12 @@ async function submit()
                 </div>
                 <Input type="password" v-model="confirmPassword" placeholder="Confirmer le mot de passe"
                     title="Confirmer le mot de passe"
+                    autocomplete="new-password"
                     :error="confirmPassword === '' || confirmPassword === state.password ? '' : 'Les mots de passe saisies ne sont pas identique'" />
-                <button>S'inscrire</button>
+                <span v-if="generalError" class="input-error">{{ generalError }}</span>
+                <button><div v-if="status === 'pending'" class="loading"></div><template v-else>S'inscrire</template></button>
                 <NuxtLink :to="{ path: `/user/login`, force: true }">Se connecter</NuxtLink>
             </form>
-            <div v-else-if="status === AuthStatus.loading" class="input-form"><div class="loading"></div></div>
-            <div v-else class="not-found-container">
-                <div class="not-found-title">👀 Vous n'avez rien à faire ici. 👀</div>
-            </div>
         </div>
     </div>
 </template>
\ No newline at end of file
diff --git a/plugins/session.client.ts b/plugins/session.client.ts
new file mode 100644
index 0000000..ce704e1
--- /dev/null
+++ b/plugins/session.client.ts
@@ -0,0 +1,7 @@
+export default defineNuxtPlugin(async (nuxtApp) => {
+  if (!nuxtApp.payload.serverRendered || Boolean(nuxtApp.payload.prerenderedAt) || Boolean(nuxtApp.payload.isCached)) {
+    nuxtApp.hook('app:mounted', async () => {
+      await useUserSession().fetch()
+    })
+  }
+})
\ No newline at end of file
diff --git a/plugins/session.server.ts b/plugins/session.server.ts
new file mode 100644
index 0000000..0571894
--- /dev/null
+++ b/plugins/session.server.ts
@@ -0,0 +1,11 @@
+export default defineNuxtPlugin({
+  name: 'session-fetch-plugin',
+  enforce: 'pre',
+  async setup(nuxtApp) {
+    // Flag if request is cached
+    nuxtApp.payload.isCached = Boolean(useRequestEvent()?.context.cache)
+    if (nuxtApp.payload.serverRendered && !nuxtApp.payload.prerenderedAt && !nuxtApp.payload.isCached) {
+      await useUserSession().fetch()
+    }
+  },
+})
\ No newline at end of file
diff --git a/schemas/login.ts b/schemas/login.ts
index c482505..c1db54c 100644
--- a/schemas/login.ts
+++ b/schemas/login.ts
@@ -1,7 +1,7 @@
 import { z } from "zod";
 
 export const schema = z.object({
-    username: z.string({ required_error: "Nom d'utilisateur obligatoire" }),
+    usernameOrEmail: z.string({ required_error: "Nom d'utilisateur ou email obligatoire" }),
     password: z.string({ required_error: "Mot de passe obligatoire" }),
 });
 
diff --git a/schemas/registration.ts b/schemas/registration.ts
index 8b775a6..b9bba67 100644
--- a/schemas/registration.ts
+++ b/schemas/registration.ts
@@ -35,7 +35,17 @@ function securePassword(password: string, ctx: z.RefinementCtx): void {
 }
 
 export const schema = z.object({
-    username: z.string({ required_error: "Nom d'utilisateur obligatoire" }).min(3, "Votre nom d'utilisateur doit contenir au moins 3 caractères").max(32, "Votre nom d'utilisateur doit contenir au plus 32 caractères"),
+    username: z.string({ required_error: "Nom d'utilisateur obligatoire" }).min(3, "Votre nom d'utilisateur doit contenir au moins 3 caractères").max(32, "Votre nom d'utilisateur doit contenir au plus 32 caractères").superRefine((user, ctx) => {
+        const test = z.string().email().safeParse(user);
+        if(test.success)
+        {
+            ctx.addIssue({
+                code: z.ZodIssueCode.invalid_string,
+                validation: 'email',
+                message: "Votre nom d'utilisateur ne peut pas être une addresse mail",
+            });
+        }
+    }),
     email: z.string({ required_error: "Email obligatoire" }).email("Adresse mail invalide"),
     password: z.string({ required_error: "Mot de passe obligatoire" }).min(8, "Votre mot de passe doit contenir au moins 8 caractères").max(128, "Votre mot de passe doit contenir au moins 8 caractères").superRefine(securePassword),
     data: z.object({
diff --git a/server/api/auth/login.post.ts b/server/api/auth/login.post.ts
index 835c11a..d14c162 100644
--- a/server/api/auth/login.post.ts
+++ b/server/api/auth/login.post.ts
@@ -1,96 +1,89 @@
 import useDatabase from '~/composables/useDatabase';
 import { schema } from '~/schemas/login';
+import { User, UserExtendedData, UserRawData, UserSession, UserSessionRequired } from '~/types/auth';
+import type { Database } from "bun:sqlite";
+import { ZodError } from 'zod';
+import { checkSession, logSession } from '~/server/utils/user';
 
-export default defineEventHandler(async (e) => {
-    const { sessionPassword } = useRuntimeConfig();
-    const session = await useSession(e, {
-        password: sessionPassword,
-    });
+interface SuccessHandler
+{
+    success: true;
+    session: UserSession;
+}
+interface ErrorHandler
+{
+    success: false;
+    error: Error | ZodError<{
+        usernameOrEmail: string;
+        password: string;
+    }>;
+}
+type Return = SuccessHandler | ErrorHandler;
 
+export default defineEventHandler(async (e): Promise<Return> => {
     try
     {
+        const session = await getUserSession(e);
         const db = useDatabase();
 
-        console.log(session.id);
+        const checkedSession = await checkSession(e, session);
 
-        if(session.id && session.data.id)
-        {
-            const checkSession = db.query("SELECT user_id FROM user_sessions WHERE id = ?1");
-            const sessionId = checkSession.get(session.id) as any;
-
-            console.log(sessionId);
-
-            if(sessionId && sessionId.user_id === session.data.id)
-            {
-                return { success: true, id: session.data.id, sessionId: session.id, data: session.data };
-            }
-            else
-            {
-                session.clear();
-                
-                setResponseStatus(e, 406);
-                return { success: false, error: { path: ['global'], message: 'Vous êtes déjà connecté' } };
-            }
-    
-        }
+        if(checkedSession !== undefined)
+            return checkedSession;
+        
         const body = await readValidatedBody(e, schema.safeParse);
 
         if (!body.success)
         {
-            session.clear();
+            await clearUserSession(e);
 
             setResponseStatus(e, 406);
             return { success: false, error: body.error };
         }
 
-
         const hash = await Bun.password.hash(body.data.password);
-        const checkID = db.query(`SELECT id FROM users WHERE (username = ?1 or email = ?1)`);
-        const id = checkID.get(body.data.username) as any;
+        const checkID = db.query(`SELECT id, hash FROM users WHERE (username = ?1 or email = ?1)`);
+        const id = checkID.get(body.data.usernameOrEmail) as { id: number, hash: string };
 
-        if(!id || !id.id)
+        if(!id || !id.id || !id.hash)
         {
-            session.clear();
+            await clearUserSession(e);
 
             setResponseStatus(e, 401);
-            return { success: false, error: { path: ['username'], message: 'Identifiant inconnu' } };
+            return { success: false, error: new ZodError([{ code: 'custom', path: ['username'], message: 'Identifiant inconnu' }]) };
         }
+        
+        const valid = await Bun.password.verify(body.data.password, id.hash);
 
-        const checkHash = db.query(`SELECT COUNT(*) as count FROM users WHERE id = ?1 and hash = ?2`);
-        const validation = checkHash.get(id.id, hash) as any;
-
-        if(validation && validation.count && validation.count !== 1)
+        if(!valid)
         {
-            session.clear();
+            await clearUserSession(e);
 
             setResponseStatus(e, 401);
-            return { success: false, error: { path: ['password'], message: 'Mot de passe incorrect' } };
+            return { success: false, error: new ZodError([{ code: 'custom', path: ['password'], message: 'Mot de passe incorrect' }]) };
         }
 
-        const loggingIn = db.query(`INSERT INTO user_sessions(id, user_id, ip, agent, lastRefresh) VALUES(?1, ?2, ?3, ?4, ?5)`);
-        loggingIn.get(session.id, id.id, getRequestIP(e), getRequestHeader(e, 'User-Agent'), Date.now());
-
-        await session.update(getData(db, id.id));
+        logSession(e, await setUserSession(e, { user: getData(db, id.id) }) as UserSessionRequired);
 
         setResponseStatus(e, 201);
-        return { success: true, id: id.id, sessionId: session.id, data: session.data };
+        return { success: true, session };
     }
-    catch(e)
+    catch(err: any)
     {
-        session.clear();
+        await clearUserSession(e);
 
-        console.error(e);
-        return { success: false, error: e };
+        console.error(err);
+        return { success: false, error: err as Error };
     }
 });
 
-function getData(db: Database, id: string): any
+function getData(db: Database, id: number): User
 {
-    const userQuery = db.query(`SELECT * FROM users WHERE id = ?1`);
-    const user = userQuery.get(id);
+    const userQuery = db.query(`SELECT id, username, email, state FROM users WHERE id = ?1`);
+    const user = userQuery.get(id) as UserRawData;
 
     const userDataQuery = db.query(`SELECT * FROM users_data WHERE user_id = ?1`);
-    const userData = userDataQuery.get(id);
+    const userData = userDataQuery.get(id) as UserExtendedData;
 
     return { ...user, ...userData };
 }
\ No newline at end of file
diff --git a/server/api/auth/logout.post.ts b/server/api/auth/logout.post.ts
deleted file mode 100644
index 0e2f809..0000000
--- a/server/api/auth/logout.post.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export default defineEventHandler(async (e) => {
-});
\ No newline at end of file
diff --git a/server/api/auth/register.post.ts b/server/api/auth/register.post.ts
index 4f8ae46..bf3a59f 100644
--- a/server/api/auth/register.post.ts
+++ b/server/api/auth/register.post.ts
@@ -1,41 +1,67 @@
+import { ZodError, ZodIssue } from 'zod';
 import useDatabase from '~/composables/useDatabase';
 import { schema } from '~/schemas/registration';
+import { checkSession, logSession } from '~/server/utils/user';
+import { UserSession, UserSessionRequired } from '~/types/auth';
 
-export default defineEventHandler(async (e) => {
+interface SuccessHandler
+{
+    success: true;
+    session: UserSession;
+}
+interface ErrorHandler
+{
+    success: false;
+    error: Error | ZodError<{
+        username: string;
+        email: string;
+        password: string;
+    }>;
+}
+type Return = SuccessHandler | ErrorHandler;
+
+export default defineEventHandler(async (e): Promise<Return> => {
     try
     {
-        const { sessionPassword } = useRuntimeConfig();
+        const session = await getUserSession(e);
+        const db = useDatabase();
+
+        const checkedSession = await checkSession(e, session);
+
+        if(checkedSession !== undefined)
+            return checkedSession;
+
         const body = await readValidatedBody(e, schema.safeParse);
 
         if (!body.success)
         {
+            await clearUserSession(e);
+
             setResponseStatus(e, 406);
             return { success: false, error: body.error };
         }
 
-        const db = useDatabase();
-
         const usernameQuery = db.query(`SELECT COUNT(*) as count FROM users WHERE username = ?1`);
         const checkUsername = usernameQuery.get(body.data.username) as any;
 
         const emailQuery = db.query(`SELECT COUNT(*) as count FROM users WHERE email = ?1`);
         const checkEmail = emailQuery.get(body.data.email) as any;
 
-        const errors = [];
+        const errors: ZodIssue[] = [];
         if(checkUsername.count !== 0)
-            errors.push({ path: ['username'], message: "Ce nom d'utilisateur est déjà utilisé" });
+            errors.push({ code: 'custom', path: ['username'], message: "Ce nom d'utilisateur est déjà utilisé" });
         if(checkEmail.count !== 0)
-            errors.push({ path: ['email'], message: "Cette adresse mail est déjà utilisée" });
+            errors.push({ code: 'custom', path: ['email'], message: "Cette adresse mail est déjà utilisée" });
 
         if(errors.length > 0)
         {
             setResponseStatus(e, 406);
-            return { success: false, error: errors };
+            return { success: false, error: new ZodError(errors) };
         }
         else
         {
             const hash = await Bun.password.hash(body.data.password);
-            const registration = db.query(`INSERT INTO users(username, email, hash, email_valid) VALUES(?1, ?2, ?3, 0)`);
+            const registration = db.query(`INSERT INTO users(username, email, hash, state) VALUES(?1, ?2, ?3, 0)`);
             registration.get(body.data.username, body.data.email, hash) as any;
 
             const userIdQuery = db.query(`SELECT id FROM users WHERE username = ?1`);
@@ -43,20 +69,18 @@ export default defineEventHandler(async (e) => {
 
             const registeringData = db.query(`INSERT INTO users_data(user_id) VALUES(?1)`);
             registeringData.get(id);
-            
-            const session = await useSession(e, {
-                password: sessionPassword,
-            });
 
-            const loggingIn = db.query(`INSERT INTO user_sessions(id, user_id, ip, agent, lastRefresh) VALUES(?1, ?2, ?3, ?4, ?5)`);
-            loggingIn.get(session.id, id, getRequestIP(e), getRequestHeader(e, 'User-Agent'), Date.now());
+            logSession(e, await setUserSession(e, { user: { id: id, username: body.data.username, email: body.data.email, state: 0 } }) as UserSessionRequired);
 
             setResponseStatus(e, 201);
-            return { success: true, id: id, sessionId: session.id };
+            return { success: true, session };
         }
     }
-    catch(e)
+    catch(err: any)
     {
-        return { success: false, error: e };
+        await clearUserSession(e);
+
+        console.error(err);
+        return { success: false, error: err as Error };
     }
 });
\ No newline at end of file
diff --git a/server/api/auth/session.delete.ts b/server/api/auth/session.delete.ts
new file mode 100644
index 0000000..a21b435
--- /dev/null
+++ b/server/api/auth/session.delete.ts
@@ -0,0 +1,8 @@
+import { eventHandler } from 'h3';
+import { clearUserSession } from '~/server/utils/session';
+
+export default eventHandler(async (event) => {
+  await clearUserSession(event);
+
+  return { loggedOut: true };
+})
\ No newline at end of file
diff --git a/server/api/auth/session.get.ts b/server/api/auth/session.get.ts
new file mode 100644
index 0000000..a7245a9
--- /dev/null
+++ b/server/api/auth/session.get.ts
@@ -0,0 +1,13 @@
+import { eventHandler } from 'h3'
+import { getUserSession, sessionHooks } from '~/server/utils/session'
+import type { UserSessionRequired } from '~/types/auth'
+
+export default eventHandler(async (event) => {
+  const session = await getUserSession(event)
+
+  if (session.user) {
+    await sessionHooks.callHookParallel('fetch', session as UserSessionRequired, event)
+  }
+
+  return session
+})
\ No newline at end of file
diff --git a/server/plugins/obsidianParse.ts b/server/plugins/obsidianParse.ts
deleted file mode 100644
index 3962b05..0000000
--- a/server/plugins/obsidianParse.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-const regex = /[\0-\x1F!-,\.\/:-@\[-\^`\{-\xA9\xAB-\xB4\xB6-\xB9\xBB-\xBF\xD7\xF7\u02C2-\u02C5\u02D2-\u02DF\u02E5-\u02EB\u02ED\u02EF-\u02FF\u0375\u0378\u0379\u037E\u0380-\u0385\u0387\u038B\u038D\u03A2\u03F6\u0482\u0530\u0557\u0558\u055A-\u055F\u0589-\u0590\u05BE\u05C0\u05C3\u05C6\u05C8-\u05CF\u05EB-\u05EE\u05F3-\u060F\u061B-\u061F\u066A-\u066D\u06D4\u06DD\u06DE\u06E9\u06FD\u06FE\u0700-\u070F\u074B\u074C\u07B2-\u07BF\u07F6-\u07F9\u07FB\u07FC\u07FE\u07FF\u082E-\u083F\u085C-\u085F\u086B-\u089F\u08B5\u08C8-\u08D2\u08E2\u0964\u0965\u0970\u0984\u098D\u098E\u0991\u0992\u09A9\u09B1\u09B3-\u09B5\u09BA\u09BB\u09C5\u09C6\u09C9\u09CA\u09CF-\u09D6\u09D8-\u09DB\u09DE\u09E4\u09E5\u09F2-\u09FB\u09FD\u09FF\u0A00\u0A04\u0A0B-\u0A0E\u0A11\u0A12\u0A29\u0A31\u0A34\u0A37\u0A3A\u0A3B\u0A3D\u0A43-\u0A46\u0A49\u0A4A\u0A4E-\u0A50\u0A52-\u0A58\u0A5D\u0A5F-\u0A65\u0A76-\u0A80\u0A84\u0A8E\u0A92\u0AA9\u0AB1\u0AB4\u0ABA\u0ABB\u0AC6\u0ACA\u0ACE\u0ACF\u0AD1-\u0ADF\u0AE4\u0AE5\u0AF0-\u0AF8\u0B00\u0B04\u0B0D\u0B0E\u0B11\u0B12\u0B29\u0B31\u0B34\u0B3A\u0B3B\u0B45\u0B46\u0B49\u0B4A\u0B4E-\u0B54\u0B58-\u0B5B\u0B5E\u0B64\u0B65\u0B70\u0B72-\u0B81\u0B84\u0B8B-\u0B8D\u0B91\u0B96-\u0B98\u0B9B\u0B9D\u0BA0-\u0BA2\u0BA5-\u0BA7\u0BAB-\u0BAD\u0BBA-\u0BBD\u0BC3-\u0BC5\u0BC9\u0BCE\u0BCF\u0BD1-\u0BD6\u0BD8-\u0BE5\u0BF0-\u0BFF\u0C0D\u0C11\u0C29\u0C3A-\u0C3C\u0C45\u0C49\u0C4E-\u0C54\u0C57\u0C5B-\u0C5F\u0C64\u0C65\u0C70-\u0C7F\u0C84\u0C8D\u0C91\u0CA9\u0CB4\u0CBA\u0CBB\u0CC5\u0CC9\u0CCE-\u0CD4\u0CD7-\u0CDD\u0CDF\u0CE4\u0CE5\u0CF0\u0CF3-\u0CFF\u0D0D\u0D11\u0D45\u0D49\u0D4F-\u0D53\u0D58-\u0D5E\u0D64\u0D65\u0D70-\u0D79\u0D80\u0D84\u0D97-\u0D99\u0DB2\u0DBC\u0DBE\u0DBF\u0DC7-\u0DC9\u0DCB-\u0DCE\u0DD5\u0DD7\u0DE0-\u0DE5\u0DF0\u0DF1\u0DF4-\u0E00\u0E3B-\u0E3F\u0E4F\u0E5A-\u0E80\u0E83\u0E85\u0E8B\u0EA4\u0EA6\u0EBE\u0EBF\u0EC5\u0EC7\u0ECE\u0ECF\u0EDA\u0EDB\u0EE0-\u0EFF\u0F01-\u0F17\u0F1A-\u0F1F\u0F2A-\u0F34\u0F36\u0F38\u0F3A-\u0F3D\u0F48\u0F6D-\u0F70\u0F85\u0F98\u0FBD-\u0FC5\u0FC7-\u0FFF\u104A-\u104F\u109E\u109F\u10C6\u10C8-\u10CC\u10CE\u10CF\u10FB\u1249\u124E\u124F\u1257\u1259\u125E\u125F\u1289\u128E\u128F\u12B1\u12B6\u12B7\u12BF\u12C1\u12C6\u12C7\u12D7\u1311\u1316\u1317\u135B\u135C\u1360-\u137F\u1390-\u139F\u13F6\u13F7\u13FE-\u1400\u166D\u166E\u1680\u169B-\u169F\u16EB-\u16ED\u16F9-\u16FF\u170D\u1715-\u171F\u1735-\u173F\u1754-\u175F\u176D\u1771\u1774-\u177F\u17D4-\u17D6\u17D8-\u17DB\u17DE\u17DF\u17EA-\u180A\u180E\u180F\u181A-\u181F\u1879-\u187F\u18AB-\u18AF\u18F6-\u18FF\u191F\u192C-\u192F\u193C-\u1945\u196E\u196F\u1975-\u197F\u19AC-\u19AF\u19CA-\u19CF\u19DA-\u19FF\u1A1C-\u1A1F\u1A5F\u1A7D\u1A7E\u1A8A-\u1A8F\u1A9A-\u1AA6\u1AA8-\u1AAF\u1AC1-\u1AFF\u1B4C-\u1B4F\u1B5A-\u1B6A\u1B74-\u1B7F\u1BF4-\u1BFF\u1C38-\u1C3F\u1C4A-\u1C4C\u1C7E\u1C7F\u1C89-\u1C8F\u1CBB\u1CBC\u1CC0-\u1CCF\u1CD3\u1CFB-\u1CFF\u1DFA\u1F16\u1F17\u1F1E\u1F1F\u1F46\u1F47\u1F4E\u1F4F\u1F58\u1F5A\u1F5C\u1F5E\u1F7E\u1F7F\u1FB5\u1FBD\u1FBF-\u1FC1\u1FC5\u1FCD-\u1FCF\u1FD4\u1FD5\u1FDC-\u1FDF\u1FED-\u1FF1\u1FF5\u1FFD-\u203E\u2041-\u2053\u2055-\u2070\u2072-\u207E\u2080-\u208F\u209D-\u20CF\u20F1-\u2101\u2103-\u2106\u2108\u2109\u2114\u2116-\u2118\u211E-\u2123\u2125\u2127\u2129\u212E\u213A\u213B\u2140-\u2144\u214A-\u214D\u214F-\u215F\u2189-\u24B5\u24EA-\u2BFF\u2C2F\u2C5F\u2CE5-\u2CEA\u2CF4-\u2CFF\u2D26\u2D28-\u2D2C\u2D2E\u2D2F\u2D68-\u2D6E\u2D70-\u2D7E\u2D97-\u2D9F\u2DA7\u2DAF\u2DB7\u2DBF\u2DC7\u2DCF\u2DD7\u2DDF\u2E00-\u2E2E\u2E30-\u3004\u3008-\u3020\u3030\u3036\u3037\u303D-\u3040\u3097\u3098\u309B\u309C\u30A0\u30FB\u3100-\u3104\u3130\u318F-\u319F\u31C0-\u31EF\u3200-\u33FF\u4DC0-\u4DFF\u9FFD-\u9FFF\uA48D-\uA4CF\uA4FE\uA4FF\uA60D-\uA60F\uA62C-\uA63F\uA673\uA67E\uA6F2-\uA716\uA720\uA721\uA789\uA78A\uA7C0\uA7C1\uA7CB-\uA7F4\uA828-\uA82B\uA82D-\uA83F\uA874-\uA87F\uA8C6-\uA8CF\uA8DA-\uA8DF\uA8F8-\uA8FA\uA8FC\uA92E\uA92F\uA954-\uA95F\uA97D-\uA97F\uA9C1-\uA9CE\uA9DA-\uA9DF\uA9FF\uAA37-\uAA3F\uAA4E\uAA4F\uAA5A-\uAA5F\uAA77-\uAA79\uAAC3-\uAADA\uAADE\uAADF\uAAF0\uAAF1\uAAF7-\uAB00\uAB07\uAB08\uAB0F\uAB10\uAB17-\uAB1F\uAB27\uAB2F\uAB5B\uAB6A-\uAB6F\uABEB\uABEE\uABEF\uABFA-\uABFF\uD7A4-\uD7AF\uD7C7-\uD7CA\uD7FC-\uD7FF\uE000-\uF8FF\uFA6E\uFA6F\uFADA-\uFAFF\uFB07-\uFB12\uFB18-\uFB1C\uFB29\uFB37\uFB3D\uFB3F\uFB42\uFB45\uFBB2-\uFBD2\uFD3E-\uFD4F\uFD90\uFD91\uFDC8-\uFDEF\uFDFC-\uFDFF\uFE10-\uFE1F\uFE30-\uFE32\uFE35-\uFE4C\uFE50-\uFE6F\uFE75\uFEFD-\uFF0F\uFF1A-\uFF20\uFF3B-\uFF3E\uFF40\uFF5B-\uFF65\uFFBF-\uFFC1\uFFC8\uFFC9\uFFD0\uFFD1\uFFD8\uFFD9\uFFDD-\uFFFF]|\uD800[\uDC0C\uDC27\uDC3B\uDC3E\uDC4E\uDC4F\uDC5E-\uDC7F\uDCFB-\uDD3F\uDD75-\uDDFC\uDDFE-\uDE7F\uDE9D-\uDE9F\uDED1-\uDEDF\uDEE1-\uDEFF\uDF20-\uDF2C\uDF4B-\uDF4F\uDF7B-\uDF7F\uDF9E\uDF9F\uDFC4-\uDFC7\uDFD0\uDFD6-\uDFFF]|\uD801[\uDC9E\uDC9F\uDCAA-\uDCAF\uDCD4-\uDCD7\uDCFC-\uDCFF\uDD28-\uDD2F\uDD64-\uDDFF\uDF37-\uDF3F\uDF56-\uDF5F\uDF68-\uDFFF]|\uD802[\uDC06\uDC07\uDC09\uDC36\uDC39-\uDC3B\uDC3D\uDC3E\uDC56-\uDC5F\uDC77-\uDC7F\uDC9F-\uDCDF\uDCF3\uDCF6-\uDCFF\uDD16-\uDD1F\uDD3A-\uDD7F\uDDB8-\uDDBD\uDDC0-\uDDFF\uDE04\uDE07-\uDE0B\uDE14\uDE18\uDE36\uDE37\uDE3B-\uDE3E\uDE40-\uDE5F\uDE7D-\uDE7F\uDE9D-\uDEBF\uDEC8\uDEE7-\uDEFF\uDF36-\uDF3F\uDF56-\uDF5F\uDF73-\uDF7F\uDF92-\uDFFF]|\uD803[\uDC49-\uDC7F\uDCB3-\uDCBF\uDCF3-\uDCFF\uDD28-\uDD2F\uDD3A-\uDE7F\uDEAA\uDEAD-\uDEAF\uDEB2-\uDEFF\uDF1D-\uDF26\uDF28-\uDF2F\uDF51-\uDFAF\uDFC5-\uDFDF\uDFF7-\uDFFF]|\uD804[\uDC47-\uDC65\uDC70-\uDC7E\uDCBB-\uDCCF\uDCE9-\uDCEF\uDCFA-\uDCFF\uDD35\uDD40-\uDD43\uDD48-\uDD4F\uDD74\uDD75\uDD77-\uDD7F\uDDC5-\uDDC8\uDDCD\uDDDB\uDDDD-\uDDFF\uDE12\uDE38-\uDE3D\uDE3F-\uDE7F\uDE87\uDE89\uDE8E\uDE9E\uDEA9-\uDEAF\uDEEB-\uDEEF\uDEFA-\uDEFF\uDF04\uDF0D\uDF0E\uDF11\uDF12\uDF29\uDF31\uDF34\uDF3A\uDF45\uDF46\uDF49\uDF4A\uDF4E\uDF4F\uDF51-\uDF56\uDF58-\uDF5C\uDF64\uDF65\uDF6D-\uDF6F\uDF75-\uDFFF]|\uD805[\uDC4B-\uDC4F\uDC5A-\uDC5D\uDC62-\uDC7F\uDCC6\uDCC8-\uDCCF\uDCDA-\uDD7F\uDDB6\uDDB7\uDDC1-\uDDD7\uDDDE-\uDDFF\uDE41-\uDE43\uDE45-\uDE4F\uDE5A-\uDE7F\uDEB9-\uDEBF\uDECA-\uDEFF\uDF1B\uDF1C\uDF2C-\uDF2F\uDF3A-\uDFFF]|\uD806[\uDC3B-\uDC9F\uDCEA-\uDCFE\uDD07\uDD08\uDD0A\uDD0B\uDD14\uDD17\uDD36\uDD39\uDD3A\uDD44-\uDD4F\uDD5A-\uDD9F\uDDA8\uDDA9\uDDD8\uDDD9\uDDE2\uDDE5-\uDDFF\uDE3F-\uDE46\uDE48-\uDE4F\uDE9A-\uDE9C\uDE9E-\uDEBF\uDEF9-\uDFFF]|\uD807[\uDC09\uDC37\uDC41-\uDC4F\uDC5A-\uDC71\uDC90\uDC91\uDCA8\uDCB7-\uDCFF\uDD07\uDD0A\uDD37-\uDD39\uDD3B\uDD3E\uDD48-\uDD4F\uDD5A-\uDD5F\uDD66\uDD69\uDD8F\uDD92\uDD99-\uDD9F\uDDAA-\uDEDF\uDEF7-\uDFAF\uDFB1-\uDFFF]|\uD808[\uDF9A-\uDFFF]|\uD809[\uDC6F-\uDC7F\uDD44-\uDFFF]|[\uD80A\uD80B\uD80E-\uD810\uD812-\uD819\uD824-\uD82B\uD82D\uD82E\uD830-\uD833\uD837\uD839\uD83D\uD83F\uD87B-\uD87D\uD87F\uD885-\uDB3F\uDB41-\uDBFF][\uDC00-\uDFFF]|\uD80D[\uDC2F-\uDFFF]|\uD811[\uDE47-\uDFFF]|\uD81A[\uDE39-\uDE3F\uDE5F\uDE6A-\uDECF\uDEEE\uDEEF\uDEF5-\uDEFF\uDF37-\uDF3F\uDF44-\uDF4F\uDF5A-\uDF62\uDF78-\uDF7C\uDF90-\uDFFF]|\uD81B[\uDC00-\uDE3F\uDE80-\uDEFF\uDF4B-\uDF4E\uDF88-\uDF8E\uDFA0-\uDFDF\uDFE2\uDFE5-\uDFEF\uDFF2-\uDFFF]|\uD821[\uDFF8-\uDFFF]|\uD823[\uDCD6-\uDCFF\uDD09-\uDFFF]|\uD82C[\uDD1F-\uDD4F\uDD53-\uDD63\uDD68-\uDD6F\uDEFC-\uDFFF]|\uD82F[\uDC6B-\uDC6F\uDC7D-\uDC7F\uDC89-\uDC8F\uDC9A-\uDC9C\uDC9F-\uDFFF]|\uD834[\uDC00-\uDD64\uDD6A-\uDD6C\uDD73-\uDD7A\uDD83\uDD84\uDD8C-\uDDA9\uDDAE-\uDE41\uDE45-\uDFFF]|\uD835[\uDC55\uDC9D\uDCA0\uDCA1\uDCA3\uDCA4\uDCA7\uDCA8\uDCAD\uDCBA\uDCBC\uDCC4\uDD06\uDD0B\uDD0C\uDD15\uDD1D\uDD3A\uDD3F\uDD45\uDD47-\uDD49\uDD51\uDEA6\uDEA7\uDEC1\uDEDB\uDEFB\uDF15\uDF35\uDF4F\uDF6F\uDF89\uDFA9\uDFC3\uDFCC\uDFCD]|\uD836[\uDC00-\uDDFF\uDE37-\uDE3A\uDE6D-\uDE74\uDE76-\uDE83\uDE85-\uDE9A\uDEA0\uDEB0-\uDFFF]|\uD838[\uDC07\uDC19\uDC1A\uDC22\uDC25\uDC2B-\uDCFF\uDD2D-\uDD2F\uDD3E\uDD3F\uDD4A-\uDD4D\uDD4F-\uDEBF\uDEFA-\uDFFF]|\uD83A[\uDCC5-\uDCCF\uDCD7-\uDCFF\uDD4C-\uDD4F\uDD5A-\uDFFF]|\uD83B[\uDC00-\uDDFF\uDE04\uDE20\uDE23\uDE25\uDE26\uDE28\uDE33\uDE38\uDE3A\uDE3C-\uDE41\uDE43-\uDE46\uDE48\uDE4A\uDE4C\uDE50\uDE53\uDE55\uDE56\uDE58\uDE5A\uDE5C\uDE5E\uDE60\uDE63\uDE65\uDE66\uDE6B\uDE73\uDE78\uDE7D\uDE7F\uDE8A\uDE9C-\uDEA0\uDEA4\uDEAA\uDEBC-\uDFFF]|\uD83C[\uDC00-\uDD2F\uDD4A-\uDD4F\uDD6A-\uDD6F\uDD8A-\uDFFF]|\uD83E[\uDC00-\uDFEF\uDFFA-\uDFFF]|\uD869[\uDEDE-\uDEFF]|\uD86D[\uDF35-\uDF3F]|\uD86E[\uDC1E\uDC1F]|\uD873[\uDEA2-\uDEAF]|\uD87A[\uDFE1-\uDFFF]|\uD87E[\uDE1E-\uDFFF]|\uD884[\uDF4B-\uDFFF]|\uDB40[\uDC00-\uDCFF\uDDF0-\uDFFF]/g
-
-// !?               -> optional embedding
-// \[\[             -> open brace
-// ([^\[\]\|\#]+)   -> one or more non-special characters ([,],|, or #) (name)
-// (#[^\[\]\|\#]+)? -> # then one or more non-special characters (heading link)
-// (|[^\[\]\|\#]+)? -> | then one or more non-special characters (alias)
-const wikilinkRegex = /!?\[\[([^\[\]\|\#]+)?(#+[^\[\]\|\#]+)?(\|[^\[\]\|\#]+)?\]\]/g;
-// from https://github.com/escwxyz/remark-obsidian-callout/blob/main/src/index.ts
-const calloutRegex = /\[\!(\w+)\]([+-]?)/g;
-const calloutLineRegex = /^> *\[\!\w+\][+-]?.*$/gm;
-
-export default defineNitroPlugin((nitroApp) => {
-    nitroApp.hooks.hook('content:file:beforeParse', (file: { _id: string, body: string }) => {
-        if (file._id.endsWith('.md'))
-            file.body = preParse(file.body);
-    });
-});
-
-function slug(value: string, maintainCase?: boolean) {
-    if (!maintainCase) value = value.toLowerCase()
-    return value.replace(regex, '').replace(/ /g, '-')
-}
-
-function preParse(src: string)
-{
-    src = src.replaceAll(calloutLineRegex, (value) => {
-        // force newline after title of callout
-        return value + "\n> "
-    });
-    src = src.replaceAll(calloutRegex, (value) => {
-        // force newline after title of callout
-        return "\\" + value;
-    });
-
-    src = src.replaceAll(wikilinkRegex, (value, ...capture) => {
-        const [rawFp, rawHeader, rawAlias] = capture;
-        const fp = rawFp ?? "";
-        const anchor = rawHeader?.trim().replace(/^#+/, "");
-        const blockRef = Boolean(anchor?.startsWith("^")) ? "^" : "";
-        const displayAnchor = anchor ? `#${blockRef}${slug(anchor)}` : "";
-        const displayAlias = rawAlias ?? rawHeader?.replace("#", "|") ?? "";
-        const embedDisplay = value.startsWith("!") ? "!" : "";
-        return `${embedDisplay}[[${fp}${displayAnchor}${displayAlias}]]`;
-    });
-
-    return src;
-} 
\ No newline at end of file
diff --git a/server/plugins/session.ts b/server/plugins/session.ts
new file mode 100644
index 0000000..8701e58
--- /dev/null
+++ b/server/plugins/session.ts
@@ -0,0 +1,32 @@
+import useDatabase from "~/composables/useDatabase";
+
+const monthAsMs = 1000 * 60 * 60 * 24 * 30;
+
+export default defineNitroPlugin(() => {
+    const db = useDatabase();
+    
+    sessionHooks.hook('fetch', async (session, event) => {
+        const query = db.prepare('SELECT lastRefresh FROM user_sessions WHERE id = ?1 AND user_id = ?2');
+        const result = query.get(session.id, session.user.id) as Record<string, any>;
+
+        if(!result)
+        {
+            throw createError({ statusCode: 401, message: 'Unauthorized' });
+        }
+        else if(result && result.lastRefresh && result.lastRefresh < Date.now() - monthAsMs)
+        {
+            throw createError({ statusCode: 401, message: 'Session has expired' });
+        }
+        else
+        {
+            db.prepare('UPDATE user_sessions SET lastRefresh = ?1 WHERE id = ?2 AND user_id = ?3').run(Date.now(), session.id, session.user.id);
+        }
+    });
+    sessionHooks.hook('clear', async (session, event) => {
+        if(session.id && session.user)
+        {
+            const query = db.prepare('DELETE FROM user_sessions WHERE id = ?1 AND user_id = ?2');
+            query.run(session.id, session.user.id);
+        }
+    });
+});
\ No newline at end of file
diff --git a/server/utils/session.ts b/server/utils/session.ts
new file mode 100644
index 0000000..6136a72
--- /dev/null
+++ b/server/utils/session.ts
@@ -0,0 +1,110 @@
+import type { H3Event, SessionConfig } from 'h3'
+import { useSession, createError } from 'h3'
+import { defu } from 'defu'
+import { createHooks } from 'hookable'
+import { useRuntimeConfig } from '#imports'
+import type { UserSession, UserSessionRequired } from '~/types/auth'
+
+export interface SessionHooks {
+  /**
+   * Called when fetching the session from the API
+   * - Add extra properties to the session
+   * - Throw an error if the session could not be verified (with a database for example)
+   */
+  fetch: (session: UserSessionRequired, event: H3Event) => void | Promise<void>
+  /**
+   * Called before clearing the session
+   */
+  clear: (session: UserSession, event: H3Event) => void | Promise<void>
+}
+
+export const sessionHooks = createHooks<SessionHooks>()
+
+/**
+ * Get the user session from the current request
+ * @param event The Request (h3) event
+ * @returns The user session
+ */
+export async function getUserSession(event: H3Event) {
+  const session = await _useSession(event);
+
+  if(!session.data || !session.data.id)
+  {
+    await session.update(defu({ id: session.id }, session.data));
+  }
+
+  return session.data;
+}
+/**
+ * Set a user session
+ * @param event The Request (h3) event
+ * @param data User session data, please only store public information since it can be decoded with API calls
+ * @see https://github.com/atinux/nuxt-auth-utils
+ */
+export async function setUserSession(event: H3Event, data: UserSession) {
+  const session = await _useSession(event)
+
+  await session.update(defu(data, session.data))
+
+  return session.data
+}
+
+/**
+ * Replace a user session
+ * @param event The Request (h3) event
+ * @param data User session data, please only store public information since it can be decoded with API calls
+ */
+export async function replaceUserSession(event: H3Event, data: UserSession) {
+  const session = await _useSession(event)
+
+  await session.clear()
+  await session.update(data)
+
+  return session.data
+}
+
+/**
+ * Clear the user session and removing the session cookie
+ * @param event The Request (h3) event
+ * @returns true if the session was cleared
+ */
+export async function clearUserSession(event: H3Event) {
+  const session = await _useSession(event)
+
+  await sessionHooks.callHookParallel('clear', session.data, event)
+  await session.clear()
+
+  return true
+}
+
+/**
+ * Require a user session, throw a 401 error if the user is not logged in
+ * @param event
+ * @param opts Options to customize the error message and status code
+ * @param opts.statusCode The status code to use for the error (defaults to 401)
+ * @param opts.message The message to use for the error (defaults to Unauthorized)
+ * @see https://github.com/atinux/nuxt-auth-utils
+ */
+export async function requireUserSession(event: H3Event, opts: { statusCode?: number, message?: string } = {}): Promise<UserSessionRequired> {
+  const userSession = await getUserSession(event)
+
+  if (!userSession.user) {
+    throw createError({
+      statusCode: opts.statusCode || 401,
+      message: opts.message || 'Unauthorized',
+    })
+  }
+
+  return userSession as UserSessionRequired
+}
+
+let sessionConfig: SessionConfig
+
+function _useSession(event: H3Event) {
+  if (!sessionConfig) {
+    const runtimeConfig = useRuntimeConfig(event)
+
+    sessionConfig = runtimeConfig.session;
+  }
+  return useSession<UserSession>(event, sessionConfig)
+}
\ No newline at end of file
diff --git a/server/utils/user.ts b/server/utils/user.ts
new file mode 100644
index 0000000..22d4397
--- /dev/null
+++ b/server/utils/user.ts
@@ -0,0 +1,33 @@
+import useDatabase from "~/composables/useDatabase";
+import { Return } from "~/types/api";
+import type { UserSession, UserSessionRequired } from "~/types/auth";
+
+export async function checkSession(e: H3Event<EventRequestHandler>, session: UserSession): Promise<Return | undefined>
+{
+    const db = useDatabase();
+    
+    if(session.id && session.user?.id)
+    {
+        const checkSession = db.query("SELECT user_id FROM user_sessions WHERE id = ?1");
+        const sessionId = checkSession.get(session.id) as any;
+
+        if(sessionId && sessionId.user_id === session.user?.id)
+        {
+            return { success: true, session };
+        }
+        else
+        {
+            await clearUserSession(e);
+            
+            setResponseStatus(e, 406);
+            return { success: false, error: new Error('Vous êtes déjà connecté') };
+        }
+    }
+}
+export async function logSession(e: H3Event<EventRequestHandler>, session: UserSessionRequired)
+{
+    const db = useDatabase();
+
+    const loggingIn = db.query(`INSERT INTO user_sessions(id, user_id, ip, agent, lastRefresh) VALUES(?1, ?2, ?3, ?4, ?5)`);
+    loggingIn.get(session.id, session.user.id, getRequestIP(e) ?? null, getRequestHeader(e, 'User-Agent') ?? null, Date.now());
+}
\ No newline at end of file
diff --git a/types/api.ts b/types/api.d.ts
similarity index 78%
rename from types/api.ts
rename to types/api.d.ts
index a0207a1..c344541 100644
--- a/types/api.ts
+++ b/types/api.d.ts
@@ -1,3 +1,19 @@
+export interface SuccessHandler
+{
+    success: true;
+    session: UserSession;
+}
+export interface ErrorHandler
+{
+    success: false;
+    error: Error | ZodError<{
+        username: string;
+        email: string;
+        password: string;
+    }>;
+}
+export type Return = SuccessHandler | ErrorHandler;
+
 export interface Project {
     id: number;
     name: string;
diff --git a/types/auth.d.ts b/types/auth.d.ts
new file mode 100644
index 0000000..f2a8be5
--- /dev/null
+++ b/types/auth.d.ts
@@ -0,0 +1,71 @@
+import type { ComputedRef, Ref } from 'vue'
+
+import 'vue-router';
+declare module 'vue-router'
+{
+    interface RouteMeta
+    {
+        requiresAuth?: boolean;
+        guestsGoesTo?: string;
+        usersGoesTo?: string;
+    }
+}
+
+import 'nuxt';
+declare module 'nuxt'
+{
+    interface RuntimeConfig
+    {
+        session: SessionConfig;
+    }
+}
+
+export interface UserRawData {
+  id: number;
+  username: string;
+  email: string;
+  state: number;
+}
+
+export interface UserExtendedData {
+  
+}
+
+export type User = UserRawData & UserExtendedData;
+
+export interface UserSession {
+  user?: User;
+  id?: string;
+}
+
+export interface UserSessionRequired extends UserSession {
+  user: User;
+  id: string;
+}
+
+export interface UserSessionComposable {
+  /**
+   * Computed indicating if the auth session is ready
+   */
+  ready: ComputedRef<boolean>
+  /**
+   * Computed indicating if the user is logged in.
+   */
+  loggedIn: ComputedRef<boolean>
+  /**
+   * The user object if logged in, null otherwise.
+   */
+  user: ComputedRef<User | null>
+  /**
+   * The session object.
+   */
+  session: Ref<UserSession>
+  /**
+   * Fetch the user session from the server.
+   */
+  fetch: () => Promise<void>
+  /**
+   * Clear the user session and remove the session cookie.
+   */
+  clear: () => Promise<void>
+}
\ No newline at end of file
diff --git a/types/canvas.ts b/types/canvas.d.ts
similarity index 100%
rename from types/canvas.ts
rename to types/canvas.d.ts
diff --git a/types/cookies.ts b/types/cookies.ts
deleted file mode 100644
index e69de29..0000000