diff --git a/app.vue b/app.vue
index b987c6b..f2f0d80 100644
--- a/app.vue
+++ b/app.vue
@@ -1,12 +1,7 @@
 <script setup>
 import * as Sentry from "@sentry/browser"
 
-const supabase = useSupabaseClient()
-const user = useSupabaseUser()
-const route = useRoute()
-const tenants = (await supabase.from("tenants").select()).data
-const dataStore = useDataStore()
-const viewport = useViewport()
+
 
 /*watch(viewport.breakpoint, (newBreakpoint, oldBreakpoint) => {
   console.log('Breakpoint updated:', oldBreakpoint, '->', newBreakpoint)
@@ -70,7 +65,6 @@ useSeoMeta({
     <UNotifications :class="platform === 'mobile' ? ['mb-14'] : []"/>
     <USlideovers />
     <UModals/>
-    <VitePwaManifest/>
   </div>
 
 
diff --git a/components/DocumentDisplay.vue b/components/DocumentDisplay.vue
index 7e4715b..0c695a9 100644
--- a/components/DocumentDisplay.vue
+++ b/components/DocumentDisplay.vue
@@ -66,18 +66,18 @@ const showFile = (file) => {
 
 <style scoped>
 .documentListItem {
-  display:block;
+  display: block;
   width: 15vw;
   aspect-ratio: 1 / 1.414;
-  padding:1em;
+  padding: 1em;
   margin: 0.7em;
-  border: 1px solid lightgrey;
   border-radius: 15px;
+  transition: box-shadow 0.2s ease; /* für smooth hover */
 }
 
 .documentListItem:hover {
-  border: 1px solid #69c350;
   cursor: pointer;
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.2); /* sanfter Shadow beim Hover */
 }
 
 .previewEmbed {
diff --git a/components/DocumentDisplayModal.vue b/components/DocumentDisplayModal.vue
index 36e66c9..296929e 100644
--- a/components/DocumentDisplayModal.vue
+++ b/components/DocumentDisplayModal.vue
@@ -1,7 +1,6 @@
 <script setup>
 
 const toast = useToast()
-const supabase = useSupabaseClient()
 const dataStore = useDataStore()
 const modal = useModal()
 const props = defineProps({
@@ -27,7 +26,7 @@ const filetypes = ref([])
 const documentboxes = ref([])
 
 const setup = async () => {
-  const {data} = await supabase.from("folders").select().eq("tenant",useProfileStore().currentTenant)
+  const data = await useEntities("folders").select()
 
   data.forEach(folder => {
     let name = folder.name
@@ -55,20 +54,12 @@ const setup = async () => {
     }
   })
 
-  filetypes.value = await useSupabaseSelect("filetags")
-  documentboxes.value = await useSupabaseSelect("documentboxes")
+  filetypes.value = await useEntities("filetags").select()
+  documentboxes.value = await useEntities("documentboxes").select()
 }
 
 setup()
 
-
-//Functions
-const openDocument = async () => {
-  //selectedDocument.value = doc
-  openShowModal.value = true
-  console.log("open")
-}
-
 const updateDocument = async () => {
   const {url, ...objData} = props.documentData
   delete objData.url
@@ -91,12 +82,7 @@ const updateDocument = async () => {
 
   console.log(objData)
 
-
-  const {data,error} = await supabase
-      .from("files")
-      .update(objData)
-      .eq('id',objData.id)
-      .select()
+  const {data,error} = await useEntities("files").update(objData.id, objData)
 
   if(error) {
     console.log(error)
@@ -114,13 +100,6 @@ const archiveDocument = async () => {
   props.documentData.archived = true
   await updateDocument()
 
-  const {data,error} = await supabase.from("historyitems").insert({
-    createdBy: useProfileStore().activeProfile.id,
-    tenant: useProfileStore().currentTenant,
-    text: "Datei archiviert",
-    file: props.documentData.id
-  })
-
   modal.close()
   emit("update")
 }
@@ -139,19 +118,19 @@ const itemOptions = ref([])
 const idToAssign = ref(null)
 const getItemsBySelectedResource = async () => {
   if(resourceToAssign.value === "project") {
-    itemOptions.value = await useSupabaseSelect("projects")
+    itemOptions.value = await useEntities("projects").select()
   } else if(resourceToAssign.value === "customer") {
-    itemOptions.value = await useSupabaseSelect("customers")
+    itemOptions.value = await useEntities("customers").select()
   } else if(resourceToAssign.value === "vendor") {
-    itemOptions.value = await useSupabaseSelect("vendors")
+    itemOptions.value = await useEntities("vendors").select()
   } else if(resourceToAssign.value === "vehicle") {
-    itemOptions.value = await useSupabaseSelect("vehicles")
+    itemOptions.value = await useEntities("vehicles").select()
   } else if(resourceToAssign.value === "product") {
-    itemOptions.value = await useSupabaseSelect("products")
+    itemOptions.value = await useEntities("products").select()
   } else if(resourceToAssign.value === "plant") {
-    itemOptions.value = await useSupabaseSelect("plants")
+    itemOptions.value = await useEntities("plants").select()
   } else if(resourceToAssign.value === "contract") {
-    itemOptions.value = await useSupabaseSelect("contracts")
+    itemOptions.value = await useEntities("contracts").select()
   } else {
     itemOptions.value =  []
   }
@@ -165,20 +144,9 @@ const updateDocumentAssignment = async () => {
 
 const folderToMoveTo = ref(null)
 const moveFile = async () => {
-  console.log(folderToMoveTo.value)
-  const {data,error} = await supabase
-    .from("files")
-    .update({folder: folderToMoveTo.value})
-    .eq("id",props.documentData.id)
-    .select()
 
-  if(error) {
-    console.log(error)
-    toast.add({title: "Fehler beim verschieben", color:"rose"})
-  } else {
-    toast.add({title: "Datei verschoben"})
-    console.log(data)
-  }
+  const res = await useEntities("files").update(props.documentData.id, {folder: folderToMoveTo.value})
+
   modal.close()
 }
 
diff --git a/components/DocumentUploadModal.vue b/components/DocumentUploadModal.vue
index 700c112..b3d24b2 100644
--- a/components/DocumentUploadModal.vue
+++ b/components/DocumentUploadModal.vue
@@ -18,7 +18,7 @@ const uploadInProgress = ref(false)
 const availableFiletypes = ref([])
 
 const setup = async () => {
-  availableFiletypes.value = await useSupabaseSelect("filetags")
+  availableFiletypes.value = await useEntities("filetags").select()
 }
 
 setup()
diff --git a/components/EntityEdit.vue b/components/EntityEdit.vue
index 3367d57..c356355 100644
--- a/components/EntityEdit.vue
+++ b/components/EntityEdit.vue
@@ -48,17 +48,15 @@ defineShortcuts({
   },
 })
 
-
+const supabase = useSupabaseClient()
 const router = useRouter()
 const route = useRoute()
 const dataStore = useDataStore()
-const profileStore = useProfileStore()
-const supabase = useSupabaseClient()
 const modal = useModal()
 
+
 const dataType = dataStore.dataTypes[type]
 const openTab = ref(0)
-
 const item = ref(JSON.parse(props.item))
 console.log(item.value)
 
@@ -156,7 +154,7 @@ const loadOptions = async () => {
     } else if(option.option === "units") {
       loadedOptions.value[option.option] = (await supabase.from("units").select()).data
     } else {
-      loadedOptions.value[option.option] = (await useSupabaseSelect(option.option))
+      loadedOptions.value[option.option] = (await useEntities(option.option).select())
 
       if(dataType.templateColumns.find(x => x.key === option.key).selectDataTypeFilter){
         loadedOptions.value[option.option] = loadedOptions.value[option.option].filter(i => dataType.templateColumns.find(x => x.key === option.key).selectDataTypeFilter(i, item))
@@ -210,7 +208,7 @@ const createItem = async () => {
   if(props.inModal) {
     ret = await dataStore.createNewItem(type,item.value,true)
   } else {
-    ret = dataStore.createNewItem(type,item.value)
+    ret = await useEntities(type).create(item.value)//dataStore.createNewItem(type,item.value)
   }
 
   emit('returnData', ret)
@@ -222,7 +220,8 @@ const updateItem = async () => {
   if(props.inModal) {
     ret = await dataStore.updateItem(type,item.value, oldItem.value,true)
   } else {
-    ret = await dataStore.updateItem(type,item.value, oldItem.value)
+    console.log(item.value)
+    ret = await useEntities(type).update(item.value.id, item.value)//await dataStore.updateItem(type,item.value, oldItem.value)
   }
 
   emit('returnData', ret)
diff --git a/components/EntityList.vue b/components/EntityList.vue
index a76b031..602f4d7 100644
--- a/components/EntityList.vue
+++ b/components/EntityList.vue
@@ -4,6 +4,9 @@ import FloatingActionButton from "~/components/mobile/FloatingActionButton.vue";
 import EntityTable from "~/components/EntityTable.vue";
 import EntityListMobile from "~/components/EntityListMobile.vue";
 
+const { has } = usePermission()
+
+
 const props = defineProps({
   type: {
     required: true,
@@ -15,9 +18,17 @@ const props = defineProps({
   },
   platform: {
     required: true,
+  },
+  loading: {
+    required: true,
+    type: Boolean,
+    default: false
   }
 })
 
+const emit = defineEmits(["sort"]);
+
+
 const {type} = props
 
 defineShortcuts({
@@ -83,23 +94,6 @@ const filteredRows = computed(() => {
     })
   }
 
-  if(!useRole().generalAvailableRights.value[type].showToAllUsers) {
-    if(useRole().checkRight(`${type}-viewAll`)){
-      console.log("Right to Show All")
-    } else if(useRole().checkRight(type)){
-      console.log("Only Righty to show Own")
-      console.log(tempItems)
-      tempItems = tempItems.filter(item => item.profiles.includes(profileStore.activeProfile.id))
-    } else {
-      console.log("No Right to Show")
-      tempItems = []
-    }
-  }
-
-
-
-
-
   return useSearch(searchString.value, tempItems)
 })
 </script>
@@ -139,7 +133,7 @@ const filteredRows = computed(() => {
       />
 
       <UButton
-          v-if="platform !== 'mobile' && useRole().checkRight(`${type}-create`)"
+          v-if="platform !== 'mobile' && has(`${type}-create`)/*&& useRole().checkRight(`${type}-create`)*/"
           @click="router.push(`/standardEntity/${type}/create`)"
           class="ml-3"
       >+ {{dataType.labelSingle}}</UButton>
@@ -190,9 +184,11 @@ const filteredRows = computed(() => {
   />
   <EntityTable
     v-else
+    @sort="(i) => emit('sort',i)"
     :type="props.type"
     :columns="columns"
     :rows="filteredRows"
+    :loading="props.loading"
   />
 </template>
 
diff --git a/components/EntityShow.vue b/components/EntityShow.vue
index 6f5291f..dc3dec8 100644
--- a/components/EntityShow.vue
+++ b/components/EntityShow.vue
@@ -158,22 +158,6 @@ const onTabChange = (index) => {
       v-else-if="!props.inModal && platform === 'mobile'"
       :ui="{center: 'flex items-stretch gap-1.5 min-w-0'}"
   >
-<!--    <template #left>
-      <UButton
-          icon="i-heroicons-chevron-left"
-          variant="outline"
-          @click="router.back()/*router.push(`/standardEntity/${type}`)*/"
-      >
-          Zurück
-      </UButton>
-      <UButton
-          icon="i-heroicons-chevron-left"
-          variant="outline"
-          @click="router.push(`/standardEntity/${type}`)"
-      >
-          Übersicht
-      </UButton>
-    </template>-->
     <template #toggle>
       <div></div>
     </template>
@@ -226,6 +210,7 @@ const onTabChange = (index) => {
           @updateNeeded="emit('updateNeeded')"
           :platform="platform"
       />
+      <!-- TODO Change Active Phase      -->
       <EntityShowSubPhases
           :item="props.item"
           :top-level-type="type"
@@ -234,14 +219,14 @@ const onTabChange = (index) => {
           @updateNeeded="emit('updateNeeded')"
           :platform="platform"
       />
-      <EntityShowSubCreatedDocuments
+     <EntityShowSubCreatedDocuments
           :item="props.item"
           :top-level-type="type"
           v-else-if="tab.label === 'Ausgangsbelege'"
           :query-string-data="getAvailableQueryStringData()"
           :platform="platform"
       />
-      <EntityShowSubCostCentreReport
+       <EntityShowSubCostCentreReport
           :top-level-type="type"
           :item="props.item"
           v-else-if="tab.label === 'Auswertung Kostenstelle'"
@@ -259,13 +244,12 @@ const onTabChange = (index) => {
           v-else-if="tab.label === 'Zeiten'"
           :platform="platform"
       />
-
-
       <EntityShowSub
           :item="props.item"
           :query-string-data="getAvailableQueryStringData()"
           :tab-label="tab.label"
           :top-level-type="type"
+          :type="tab.key"
           v-else
           :platform="platform"
       />
diff --git a/components/EntityShowSub.vue b/components/EntityShowSub.vue
index 75ecb8f..174fbe8 100644
--- a/components/EntityShowSub.vue
+++ b/components/EntityShowSub.vue
@@ -27,8 +27,6 @@ const props = defineProps({
 
 let type = ref("")
 
-
-
 const dataStore = useDataStore()
 const tempStore = useTempStore()
 
@@ -42,6 +40,7 @@ const columns = computed(() => dataType.templateColumns.filter((column) => !colu
 const loaded = ref(false)
 
 const setup = () => {
+
   if(!props.type && props.tabLabel ) {
     if(props.tabLabel === "Aufgaben") {
       type.value = "tasks"
diff --git a/components/EntityShowSubCreatedDocuments.vue b/components/EntityShowSubCreatedDocuments.vue
index 3956695..751b406 100644
--- a/components/EntityShowSubCreatedDocuments.vue
+++ b/components/EntityShowSubCreatedDocuments.vue
@@ -61,7 +61,8 @@ const router = useRouter()
 const createddocuments = ref([])
 
 const setup = async () => {
-  createddocuments.value = (await useSupabaseSelect("createddocuments")).filter(i => !i.archived)
+  //createddocuments.value = (await useSupabaseSelect("createddocuments")).filter(i => !i.archived)
+  createddocuments.value = (await useEntities("createddocuments").select()).filter(i => !i.archived)
 }
 setup()
 
@@ -150,6 +151,7 @@ const selectItem = (item) => {
       <span>Ausgangsbelege</span>
     </template>
     <Toolbar>
+      <!-- TODO Rendering when Screen is too small      -->
       <UButton
           @click="invoiceDeliveryNotes"
           v-if="props.topLevelType === 'projects'"
diff --git a/components/EntityShowSubFiles.vue b/components/EntityShowSubFiles.vue
index e5596ac..2d9978b 100644
--- a/components/EntityShowSubFiles.vue
+++ b/components/EntityShowSubFiles.vue
@@ -31,7 +31,7 @@ const availableFiles = ref([])
 
 const setup = async () => {
   if(props.item.files) {
-    availableFiles.value = await files.selectSomeDocuments(props.item.files.map(i => i.id)) || []
+    availableFiles.value = (await files.selectSomeDocuments(props.item.files.map(i => i.id))) || []
   }
 }
 
@@ -51,12 +51,12 @@ setup()
           @uploadFinished="emit('updateNeeded')"
       />
     </Toolbar>
-
     <DocumentList
         :key="props.item.files.length"
         :documents="availableFiles"
         v-if="availableFiles.length > 0"
     />
+
     <UAlert
         v-else
         icon="i-heroicons-x-mark"
diff --git a/components/EntityShowSubHistoryDisplay.vue b/components/EntityShowSubHistoryDisplay.vue
index 5f026c4..5b5ec89 100644
--- a/components/EntityShowSubHistoryDisplay.vue
+++ b/components/EntityShowSubHistoryDisplay.vue
@@ -27,9 +27,8 @@ const dataType = dataStore.dataTypes[props.topLevelType]
 <template>
   <UCard class="mt-5 scroll" :style="props.platform !== 'mobile' ? 'height: 80vh' : ''">
     <HistoryDisplay
-        :type="dataType.historyItemHolder"
-        v-if="props
-        .item.id"
+        :type="props.topLevelType"
+        v-if="props.item.id"
         :element-id="props.item.id"
         render-headline
     />
diff --git a/components/EntityTable.vue b/components/EntityTable.vue
index 808de55..c243fc8 100644
--- a/components/EntityTable.vue
+++ b/components/EntityTable.vue
@@ -26,7 +26,6 @@
       }
     }
   })
-
   const props = defineProps({
     rows: {
       type: Array,
@@ -40,9 +39,16 @@
     type: {
       type: String,
       required: true,
+    },
+    loading: {
+      type: Boolean,
+      required: true,
+      default: false
     }
   })
 
+  const emit = defineEmits(["sort"]);
+
   const dataStore = useDataStore()
 
   const router = useRouter()
@@ -50,12 +56,20 @@
   const dataType = dataStore.dataTypes[props.type]
 
   const selectedItem = ref(0)
-
+  const sort = ref({
+    column: dataType.supabaseSortColumn || "date",
+    direction: 'desc'
+  })
 
 </script>
 
 <template>
   <UTable
+      :loading="props.loading"
+      :loading-state="{ icon: 'i-heroicons-arrow-path-20-solid', label: 'Loading...' }"
+      sort-mode="manual"
+      v-model:sort="sort"
+      @update:sort="emit('sort',{sort_column: sort.column, sort_direction: sort.direction})"
       v-if="dataType && columns"
       :rows="props.rows"
       :columns="props.columns"
@@ -64,18 +78,26 @@
       @select="(i) => router.push(`/standardEntity/${type}/show/${i.id}`) "
       :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: `Keine ${dataType.label} anzuzeigen` }"
   >
-    <template
+<!--    <template
         v-for="column in dataType.templateColumns.filter(i => !i.disabledInTable)"
         v-slot:[`${column.key}-header`]="{row}">
       <span class="text-nowrap">{{column.label}}</span>
-    </template>
+    </template>-->
     <template #name-data="{row}">
       <span
           v-if="row.id === props.rows[selectedItem].id"
-          class="text-primary-500 font-bold">{{row.name}}
-      </span>
+          class="text-primary-500 font-bold">
+        <UTooltip
+            :text="row.name"
+        >
+          {{dataType.templateColumns.find(i => i.key === "name").maxLength ? (row.name.length > dataType.templateColumns.find(i => i.key === "name").maxLength ? `${row.name.substring(0,dataType.templateColumns.find(i => i.key === "name").maxLength)}...` : row.name ) : row.name}}
+        </UTooltip>      </span>
       <span v-else>
-        {{row.name}}
+        <UTooltip
+          :text="row.name"
+        >
+          {{dataType.templateColumns.find(i => i.key === "name").maxLength ? (row.name.length > dataType.templateColumns.find(i => i.key === "name").maxLength ? `${row.name.substring(0,dataType.templateColumns.find(i => i.key === "name").maxLength)}...` : row.name ) : row.name}}
+        </UTooltip>
       </span>
     </template>
     <template #fullName-data="{row}">
@@ -100,7 +122,12 @@
         v-for="column in dataType.templateColumns.filter(i => i.key !== 'name' && i.key !== 'fullName' && i.key !== 'licensePlate' && !i.disabledInTable)"
         v-slot:[`${column.key}-data`]="{row}">
       <component v-if="column.component" :is="column.component" :row="row"></component>
-      <span v-else>{{row[column.key] ? `${row[column.key]} ${column.unit ? column.unit : ''}`: ''}}</span>
+      <span v-else-if="row[column.key]">
+        <UTooltip :text="row[column.key]">
+        {{row[column.key] ? `${column.maxLength ? (row[column.key].length > column.maxLength ? `${row[column.key].substring(0,column.maxLength)}...` : row[column.key]) : row[column.key]} ${column.unit ? column.unit : ''}`: ''}}
+      </UTooltip>
+      </span>
+
     </template>
   </UTable>
 </template>
diff --git a/components/HistoryDisplay.vue b/components/HistoryDisplay.vue
index cf60788..a9461fc 100644
--- a/components/HistoryDisplay.vue
+++ b/components/HistoryDisplay.vue
@@ -14,8 +14,9 @@ const props = defineProps({
     default: false
   }
 })
-const profileStore = useProfileStore()
-const supabase = useSupabaseClient()
+
+const auth = useAuthStore()
+
 const toast = useToast()
 const showAddHistoryItemModal = ref(false)
 const colorMode = useColorMode()
@@ -28,11 +29,12 @@ const setup = async () => {
   if(await useCapacitor().getIsPhone()) platform.value = "mobile"
 
   if(props.type && props.elementId){
-    items.value = (await supabase.from("historyitems").select().eq(props.type,props.elementId).order("created_at",{ascending: true})).data || []
-  } else {
+    //items.value = (await supabase.from("historyitems").select().eq(props.type,props.elementId).order("created_at",{ascending: true})).data || []
+    items.value = await useNuxtApp().$api(`/api/resource/${props.type}/${props.elementId}/history`)
+  } /*else {
     items.value = (await supabase.from("historyitems").select().order("created_at",{ascending: true})).data || []
 
-  }
+  }*/
 }
 
 setup()
@@ -40,55 +42,24 @@ setup()
 
 
 const addHistoryItemData = ref({
-  text: "",
-  config: {
-    type: props.type,
-    id: props.elementId
-  }
+  text: ""
 })
 
 const addHistoryItem = async () => {
-  console.log(addHistoryItemData.value)
-  addHistoryItemData.value.createdBy = profileStore.activeProfile.id
 
-  addHistoryItemData.value[props.type] = props.elementId
+  const res = await useNuxtApp().$api(`/api/resource/${props.type}/${props.elementId}/history`, {
+    method: "POST",
+    body: addHistoryItemData.value
+  })
 
-  const {data,error} = await supabase
-      .from("historyitems")
-      .insert([{...addHistoryItemData.value, tenant: profileStore.currentTenant}])
-      .select()
 
-  if(error) {
-    console.log(error)
-  } else {
-    if(addHistoryItemData.value.text.includes("@")){
-      let usernames = [...addHistoryItemData.value.text.matchAll(/@(\S*)/gm)]
 
-      const {data:profiles} = await supabase.from("profiles").select("id,username")
 
-      let notifications = usernames.map(i => {
-        let rawUsername = i[1]
+  addHistoryItemData.value = {}
+  toast.add({title: "Eintrag erfolgreich erstellt"})
+  showAddHistoryItemModal.value = false
+  await setup()
 
-        return {
-          tenant: profileStore.currentTenant,
-          profile: profiles.find(x => x.username === rawUsername).id,
-          initiatingProfile: profileStore.activeProfile.id,
-          title: "Sie wurden im Logbuch erwähnt",
-          link: `/${props.type}s/show/${props.elementId}`,
-          message: addHistoryItemData.value.text
-        }
-      })
-
-      console.log(notifications)
-
-      const {error} = await supabase.from("notifications").insert(notifications)
-    }
-
-    addHistoryItemData.value = {}
-    toast.add({title: "Eintrag erfolgreich erstellt"})
-    showAddHistoryItemModal.value = false
-    await setup()
-  }
 
 }
 
@@ -170,15 +141,15 @@ const renderText = (text) => {
       />
       <div class="flex items-center gap-3">
         <UAvatar
-            v-if="!item.createdBy"
+            v-if="!item.created_by"
             :src="colorMode.value === 'light' ? '/Logo.png' : '/Logo_Dark.png' "
         />
         <UAvatar
-            :alt="profileStore.getProfileById(item.createdBy).fullName"
+            :alt="item.created_by_profile?.full_name"
             v-else
         />
         <div>
-          <h3 v-if="item.createdBy">{{profileStore.getProfileById(item.createdBy) ? profileStore.getProfileById(item.createdBy).fullName : ""}}</h3>
+          <h3 v-if="item.created_by">{{item.created_by_profile?.full_name}}</h3>
           <h3 v-else>FEDEO Bot</h3>
           <span v-html="renderText(item.text)"/><br>
           <span class="text-gray-500">{{dayjs(item.created_at).format("DD.MM.YY HH:mm")}}</span>
diff --git a/components/MainNav.vue b/components/MainNav.vue
index a2307b8..4d16dd6 100644
--- a/components/MainNav.vue
+++ b/components/MainNav.vue
@@ -1,19 +1,25 @@
 <script setup>
-import {useRole} from "~/composables/useRole.js";
 
-const profileStore = useProfileStore()
 const route = useRoute()
+const auth = useAuthStore()
+
+const {has} = usePermission()
 
-const role = useRole()
 const links = computed(() => {
   return [
-    ... profileStore.currentTenant === 21 ? [{
-      label: "Lieferschein Formular",
-      to: "https://loar.ma-agrarservice.de/erfassung",
-      icon: "i-heroicons-rectangle-stack",
-      target: "_blank",
-    }] : [],
-    ... profileStore.currentTenant === 5 ? [{
+      ...(auth.profile?.pinned_on_navigation || []).map(pin => {
+        if(pin.type === "external") {
+          return {
+            label: pin.label,
+            to: pin.link,
+            icon: pin.icon,
+            target: "_blank",
+            pinned: true
+          }
+        }
+      }),
+
+    ... false ? [{
       label: "Support Tickets",
       to: "/support",
       icon: "i-heroicons-rectangle-stack",
@@ -34,22 +40,22 @@ const links = computed(() => {
       icon: "i-heroicons-rectangle-stack",
       defaultOpen: false,
       children: [
-        ... role.checkRight("tasks") ? [{
+        ... has("tasks") ? [{
           label: "Aufgaben",
           to: "/standardEntity/tasks",
           icon: "i-heroicons-rectangle-stack"
         }] : [],
-        ... profileStore.ownTenant.features.planningBoard ? [{
+        ... true ? [{
           label: "Plantafel",
           to: "/calendar/timeline",
           icon: "i-heroicons-calendar-days"
         }] : [],
-        ... profileStore.ownTenant.features.calendar ? [{
+        ... true ? [{
           label: "Kalender",
           to: "/calendar/grid",
           icon: "i-heroicons-calendar-days"
         }] : [],
-        ... profileStore.ownTenant.features.calendar ? [{
+        ... true ? [{
           label: "Termine",
           to: "/standardEntity/events",
           icon: "i-heroicons-calendar-days"
@@ -86,7 +92,7 @@ const links = computed(() => {
           label: "E-Mail",
           to: "/email/new",
           icon: "i-heroicons-envelope"
-        }, {
+        }/*, {
           label: "Logbücher",
           to: "/communication/historyItems",
           icon: "i-heroicons-book-open"
@@ -94,25 +100,25 @@ const links = computed(() => {
           label: "Chats",
           to: "/chats",
           icon: "i-heroicons-chat-bubble-left"
-        }
+        }*/
       ]
     },
-    ... (role.checkRight("customers") || role.checkRight("vendors") || role.checkRight("contacts")) ? [{
+    ... (has("customers") || has("vendors") || has("contacts")) ? [{
       label: "Kontakte",
       defaultOpen: false,
       icon: "i-heroicons-user-group",
       children: [
-        ... role.checkRight("customers") ? [{
+        ... has("customers") ? [{
           label: "Kunden",
           to: "/standardEntity/customers",
           icon: "i-heroicons-user-group"
         }] : [],
-        ... role.checkRight("vendors") ? [{
+        ... has("vendors") ? [{
           label: "Lieferanten",
           to: "/standardEntity/vendors",
           icon: "i-heroicons-truck"
         }] : [],
-        ... role.checkRight("contacts") ? [{
+        ... has("contacts") ? [{
           label: "Ansprechpartner",
           to: "/standardEntity/contacts",
           icon: "i-heroicons-user-group"
@@ -124,17 +130,17 @@ const links = computed(() => {
       defaultOpen:false,
       icon: "i-heroicons-user-group",
       children: [
-          ... profileStore.ownTenant.features.timeTracking ? [{
+          ... true ? [{
           label: "Projektzeiten",
           to: "/times",
           icon: "i-heroicons-clock"
         }] : [],
-        ... profileStore.ownTenant.features.workingTimeTracking ? [{
+        ... true ? [{
           label: "Anwesenheiten",
           to: "/workingtimes",
           icon: "i-heroicons-clock"
         }] : [],
-        ... role.checkRight("absencerequests") ? [{
+        ... has("absencerequests") ? [{
           label: "Abwesenheiten",
           to: "/standardEntity/absencerequests",
           icon: "i-heroicons-document-text"
@@ -146,7 +152,7 @@ const links = computed(() => {
         },
       ]
     },
-    ... profileStore.ownTenant.features.accounting ? [{
+    ... [{
       label: "Buchhaltung",
       defaultOpen: false,
       icon: "i-heroicons-chart-bar-square",
@@ -182,8 +188,8 @@ const links = computed(() => {
           icon: "i-heroicons-document-text"
         },
       ]
-    },] : [],
-    ... role.checkRight("inventory") ? [{
+    }],
+    ... has("inventory") ? [{
       label: "Lager",
       icon: "i-heroicons-puzzle-piece",
       defaultOpen: false,
@@ -197,7 +203,7 @@ const links = computed(() => {
           to: "/inventory/stocks",
           icon: "i-heroicons-square-3-stack-3d"
         },*/
-        ... role.checkRight("spaces") ? [{
+        ... has("spaces") ? [{
           label: "Lagerplätze",
           to: "/standardEntity/spaces",
           icon: "i-heroicons-square-3-stack-3d"
@@ -209,22 +215,22 @@ const links = computed(() => {
       defaultOpen: false,
       icon: "i-heroicons-clipboard-document",
       children: [
-        ... role.checkRight("products") ? [{
+        ... has("products") ? [{
           label: "Artikel",
           to: "/standardEntity/products",
           icon: "i-heroicons-puzzle-piece"
         }] : [],
-        ... role.checkRight("productcategories") ? [{
+        ... has("productcategories") ? [{
           label: "Artikelkategorien",
           to: "/standardEntity/productcategories",
           icon: "i-heroicons-puzzle-piece"
         }] : [],
-        ... role.checkRight("services") ? [{
+        ... has("services") ? [{
           label: "Leistungen",
           to: "/standardEntity/services",
           icon: "i-heroicons-wrench-screwdriver"
         }] : [],
-        ... role.checkRight("servicecategories") ? [{
+        ... has("servicecategories") ? [{
           label: "Leistungskategorien",
           to: "/standardEntity/servicecategories",
           icon: "i-heroicons-wrench-screwdriver"
@@ -239,70 +245,67 @@ const links = computed(() => {
           to: "/standardEntity/hourrates",
           icon: "i-heroicons-user-group"
         },
-        ... role.checkRight("vehicles") ? [{
+        ... has("vehicles") ? [{
           label: "Fahrzeuge",
           to: "/standardEntity/vehicles",
           icon: "i-heroicons-truck"
         }] : [],
-        ... role.checkRight("inventoryitems") ? [{
+        ... has("inventoryitems") ? [{
           label: "Inventar",
           to: "/standardEntity/inventoryitems",
           icon: "i-heroicons-puzzle-piece"
         }] : [],
-        ... role.checkRight("inventoryitems") ? [{
+        ... has("inventoryitems") ? [{
           label: "Inventargruppen",
           to: "/standardEntity/inventoryitemgroups",
           icon: "i-heroicons-puzzle-piece"
         }] : [],
       ]
     },
-    ... role.checkRight("checks") ? [{
-      label: "Überprüfungen",
-      to: "/standardEntity/checks",
-      icon: "i-heroicons-magnifying-glass"
-    },] : [],
-    ... role.checkRight("projects") ? [{
+
+    ... has("projects") ? [{
       label: "Projekte",
       to: "/standardEntity/projects",
       icon: "i-heroicons-clipboard-document-check"
     },] : [],
-    ... role.checkRight("contracts") ? [{
+    ... has("contracts") ? [{
       label: "Verträge",
       to: "/standardEntity/contracts",
       icon: "i-heroicons-clipboard-document"
     }] : [],
-    ... role.checkRight("plants") ? [{
+    ... has("plants") ? [{
       label: "Objekte",
       to: "/standardEntity/plants",
       icon: "i-heroicons-clipboard-document"
     },] : [],
-
+    ... has("checks") ? [{
+      label: "Überprüfungen",
+      to: "/standardEntity/checks",
+      icon: "i-heroicons-magnifying-glass"
+    },] : [],
     {
       label: "Einstellungen",
       defaultOpen: false,
       icon: "i-heroicons-cog-8-tooth",
       children: [
         {
-          label: "Abrechnung",
-          to: "https://billing.stripe.com/p/login/cN29Eb32Vdx0gOk288",
-          icon: "i-heroicons-document-currency-euro",
-          target: "_blank"
-        },{
           label: "Nummernkreise",
           to: "/settings/numberRanges",
           icon: "i-heroicons-clipboard-document-list"
-        },{
+        },/*{
           label: "Rollen",
           to: "/roles",
           icon: "i-heroicons-key"
-        },{
+        },*/{
           label: "E-Mail Konten",
           to: "/settings/emailAccounts",
-          icon: "i-heroicons-envelope"
+          icon: "i-heroicons-envelope",
+          disabled: true
         },{
           label: "Bankkonten",
           to: "/settings/banking",
-          icon: "i-heroicons-currency-euro"
+          icon: "i-heroicons-currency-euro",
+          disabled: true
         },{
           label: "Textvorlagen",
           to: "/settings/texttemplates",
@@ -328,59 +331,126 @@ const links = computed(() => {
     }
   ]
 })
+
+// nur Items mit Children → für Accordion
+const accordionItems = computed(() =>
+    links.value.filter(item => Array.isArray(item.children) && item.children.length > 0)
+)
+
+// nur Items ohne Children → als Buttons
+const buttonItems = computed(() =>
+    links.value.filter(item => !item.children || item.children.length === 0)
+)
 </script>
 
 <template>
-
-  <div
-    v-for="item in links"
-  >
-    <UAccordion
-      v-if="item.children"
-      :items="[item]"
-    >
-      <template #default="{item,index,open}">
-        <UButton
-          variant="ghost"
-          :color="item.children.find(i => route.path.includes(i.to)) ? 'primary' :   'gray'"
-          :icon="item.icon"
-        >
-          {{item.label}}
-
-          <template #trailing>
-            <UIcon
-                name="i-heroicons-chevron-right-20-solid"
-                class="w-5 h-5 ms-auto transform transition-transform duration-200"
-                :class="[open && 'rotate-90']"
-            />
-          </template>
-        </UButton>
-      </template>
-      <template #item="{item, open}">
-        <div class="flex flex-col">
-          <UButton
-              variant="ghost"
-              :color="child.to === route.path ? 'primary' : 'gray'"
-              :icon="child.icon"
-              v-for="child in item.children"
-              class="ml-4"
-              :to="child.to"
-              :target="child.target"
-          >
-            {{child.label}}
-          </UButton>
-        </div>
-      </template>
-    </UAccordion>
+  <!-- Standalone Buttons -->
+  <div class="flex flex-col gap-1">
     <UButton
-      v-else
-      variant="ghost"
-      :color="item.to === route.path ? 'primary' : 'gray'"
-      class="w-full"
-      :icon="item.icon"
-      :to="item.to"
+        v-for="item in buttonItems"
+        :key="item.label"
+        :variant="item.pinned ? 'ghost' : 'ghost'"
+        :color="(item.to && route.path === item.to) ? 'primary' : (item.pinned ? 'amber' : 'gray')"
+        :icon="item.pinned ? 'i-heroicons-star' : item.icon"
+        class="w-full"
+        :to="item.to"
+        :target="item.target"
     >
-      {{item.label}}
+      <UIcon
+          v-if="item.pinned"
+          :name="item.icon"
+          class="w-5 h-5 me-2"
+      />
+      {{ item.label }}
     </UButton>
   </div>
+  <UDivider/>
+  <!-- Accordion für die Items mit Children -->
+  <UAccordion
+      :items="accordionItems"
+      :multiple="false"
+      class="mt-2"
+  >
+    <template #default="{ item, open }">
+      <UButton
+          :variant="'ghost'"
+          :color="(item.children?.some(c => route.path.includes(c.to))) ? 'primary' : 'gray'"
+          :icon="item.icon"
+          class="w-full"
+      >
+        {{ item.label }}
+        <template #trailing>
+          <UIcon
+              name="i-heroicons-chevron-right-20-solid"
+              class="w-5 h-5 ms-auto transform transition-transform duration-200"
+              :class="[open && 'rotate-90']"
+          />
+        </template>
+      </UButton>
+    </template>
+
+    <template #item="{ item }">
+      <div class="flex flex-col">
+        <UButton
+            v-for="child in item.children"
+            :key="child.label"
+            variant="ghost"
+            :color="child.to === route.path ? 'primary' : 'gray'"
+            :icon="child.icon"
+            class="ml-4"
+            :to="child.to"
+            :target="child.target"
+            :disabled="child.disabled"
+        >
+          {{ child.label }}
+        </UButton>
+      </div>
+    </template>
+  </UAccordion>
+<!--  <UAccordion
+      :items="links"
+      :multiple="false"
+  >
+    <template #default="{ item, index, open }">
+      <UButton
+          :variant="item.pinned ? 'ghost' : 'ghost'"
+          :color="(item.to && route.path === item.to) || (item.children?.some(c => route.path.includes(c.to))) ? 'primary' : (item.pinned ? 'amber' : 'gray')"
+          :icon="item.pinned ? 'i-heroicons-star' : item.icon"
+          class="w-full"
+          :to="item.to"
+          :target="item.target"
+      >
+        <UIcon
+            v-if="item.pinned"
+            :name="item.icon" class="w-5 h-5 me-2" />
+        {{ item.label }}
+
+        <template v-if="item.children" #trailing>
+          <UIcon
+              name="i-heroicons-chevron-right-20-solid"
+              class="w-5 h-5 ms-auto transform transition-transform duration-200"
+              :class="[open && 'rotate-90']"
+          />
+        </template>
+      </UButton>
+    </template>
+
+    <template #item="{ item }">
+      <div class="flex flex-col" v-if="item.children?.length > 0">
+        <UButton
+            v-for="child in item.children"
+            :key="child.label"
+            variant="ghost"
+            :color="child.to === route.path ? 'primary' : 'gray'"
+            :icon="child.icon"
+            class="ml-4"
+            :to="child.to"
+            :target="child.target"
+        >
+          {{ child.label }}
+        </UButton>
+      </div>
+    </template>
+  </UAccordion>-->
+
 </template>
\ No newline at end of file
diff --git a/components/ProfileDropdown.vue b/components/ProfileDropdown.vue
deleted file mode 100644
index a5c7281..0000000
--- a/components/ProfileDropdown.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<script setup>
-const dataStore = useDataStore()
-const profileStore = useProfileStore()
-const supabase = useSupabaseClient()
-
-const selectedProfile = ref(profileStore.activeProfile.id)
-
-
-</script>
-
-<template>
-  <USelectMenu
-    :options="profileStore.ownProfiles"
-    value-attribute="id"
-    class="w-40"
-    @change="profileStore.changeProfile(selectedProfile)"
-    v-model="selectedProfile"
-  >
-    <UButton color="gray" variant="ghost" :class="[open && 'bg-gray-50 dark:bg-gray-800']" class="w-full">
-      <UAvatar :alt="profileStore.tenants.find(i => profileStore.profiles.find(i => i.id === selectedProfile).tenant === i.id).name" size="md" />
-
-      <span class="truncate text-gray-900 dark:text-white font-semibold">{{profileStore.tenants.find(i => profileStore.profiles.find(i => i.id === selectedProfile).tenant === i.id).name}}</span>
-    </UButton>
-
-    <template #option="{option}">
-      {{profileStore.tenants.find(i => i.id === option.tenant).name}}
-    </template>
-  </USelectMenu>
-</template>
\ No newline at end of file
diff --git a/components/TenantDropdown.vue b/components/TenantDropdown.vue
new file mode 100644
index 0000000..039860a
--- /dev/null
+++ b/components/TenantDropdown.vue
@@ -0,0 +1,27 @@
+<script setup>
+const auth = useAuthStore()
+
+const selectedTenant = ref(auth.user.tenant_id)
+
+
+</script>
+
+<template>
+  <USelectMenu
+    :options="auth.tenants"
+    value-attribute="id"
+    class="w-40"
+    @change="auth.switchTenant(selectedTenant)"
+    v-model="selectedTenant"
+  >
+    <UButton color="gray" variant="ghost" :class="[open && 'bg-gray-50 dark:bg-gray-800']" class="w-full">
+      <UAvatar :alt="auth.tenants.find(i => auth.activeTenant === i.id).name" size="md" />
+
+      <span class="truncate text-gray-900 dark:text-white font-semibold">{{auth.tenants.find(i => auth.activeTenant === i.id).name}}</span>
+    </UButton>
+
+    <template #option="{option}">
+      {{option.name}}
+    </template>
+  </USelectMenu>
+</template>
\ No newline at end of file
diff --git a/components/UserDropdown.vue b/components/UserDropdown.vue
index b0b57f0..7d15569 100644
--- a/components/UserDropdown.vue
+++ b/components/UserDropdown.vue
@@ -1,4 +1,5 @@
 <script setup>
+
 const { isHelpSlideoverOpen } = useDashboard()
 const { isDashboardSearchModalOpen } = useUIState()
 const { metaSymbol } = useShortcuts()
@@ -7,23 +8,26 @@ const dataStore = useDataStore()
 const profileStore = useProfileStore()
 const supabase = useSupabaseClient()
 const router = useRouter()
+const auth = useAuthStore()
 
 const items = computed(() => [
   [{
     slot: 'account',
     label: '',
     disabled: true
-  }],  [{
+  }],  [/*{
     label: 'Mein Profil',
     icon: 'i-heroicons-user',
     to: `/profiles/show/${profileStore.activeProfile.id}`
+  },*/{
+    label: 'Passwort ändern',
+    icon: 'i-heroicons-shield-check',
+    to: `/password-change`
   },{
     label: 'Abmelden',
     icon: 'i-heroicons-arrow-left-on-rectangle',
     click: async () => {
-      await supabase.auth.signOut()
-      //await dataStore.clearStore()
-      await router.push('/login')
+      await auth.logout()
 
     }
   }]
@@ -33,10 +37,10 @@ const items = computed(() => [
 <template>
   <UDropdown mode="hover" :items="items" :ui="{ width: 'w-full', item: { disabled: 'cursor-text select-text' } }" :popper="{ strategy: 'absolute', placement: 'top' }" class="w-full">
     <template #default="{ open }">
-      <UButton color="gray" variant="ghost" class="w-full" :label="profileStore.activeProfile.fullName" :class="[open && 'bg-gray-50 dark:bg-gray-800']">
-        <template #leading>
-          <UAvatar :alt="profileStore.activeProfile ? profileStore.activeProfile.fullName : ''"  size="xs" />
-        </template>
+      <UButton color="gray" variant="ghost" class="w-full" :label="auth.user.email" :class="[open && 'bg-gray-50 dark:bg-gray-800']">
+<!--        <template #leading>
+          <UAvatar :alt="auth.user.email"  size="xs" />
+        </template>-->
 
         <template #trailing>
           <UIcon name="i-heroicons-ellipsis-vertical" class="w-5 h-5 ml-auto" />
@@ -50,7 +54,7 @@ const items = computed(() => [
           Angemeldet als
         </p>
         <p class="truncate font-medium text-gray-900 dark:text-white">
-          {{profileStore.activeProfile.email}}
+          {{auth.user.email}}
         </p>
       </div>
     </template>
diff --git a/components/costcentreDisplay.vue b/components/costcentreDisplay.vue
index 5d5215b..8b3a97b 100644
--- a/components/costcentreDisplay.vue
+++ b/components/costcentreDisplay.vue
@@ -13,7 +13,7 @@ const props = defineProps({
 const incomingInvoices = ref({})
 
 const setupPage = async () => {
-  incomingInvoices.value = (await supabase.from("incominginvoices").select().eq("tenant", profileStore.currentTenant)).data.filter(i => i.accounts.find(x => x.costCentre === props.item.id))
+  incomingInvoices.value = (await useEntities("incominginvoices").select()).filter(i => i.accounts.find(x => x.costCentre === props.item.id))
 }
 
 setupPage()
diff --git a/components/displayBankaccounts.vue b/components/displayBankaccounts.vue
index 147bd71..1e85ca3 100644
--- a/components/displayBankaccounts.vue
+++ b/components/displayBankaccounts.vue
@@ -7,9 +7,9 @@ let unallocatedStatements = ref(0)
 let bankaccounts = ref([])
 
 const setupPage = async () => {
-  let bankstatements = (await useSupabaseSelect("bankstatements","*, statementallocations(*)","date",true)).filter(i => !i.archived)
+  let bankstatements = (await useEntities("bankstatements").select("*, statementallocations(*)","date",true)).filter(i => !i.archived)
   unallocatedStatements.value = bankstatements.filter(i => Number(calculateOpenSum(i)) !== 0).length
-  bankaccounts.value = await useSupabaseSelect("bankaccounts")
+  bankaccounts.value = await useEntities("bankaccounts").select()
 }
 
 setupPage()
diff --git a/components/displayIncomeAndExpenditure.vue b/components/displayIncomeAndExpenditure.vue
index d71d9c5..cfd55c2 100644
--- a/components/displayIncomeAndExpenditure.vue
+++ b/components/displayIncomeAndExpenditure.vue
@@ -4,21 +4,20 @@ import dayjs from "dayjs";
 dayjs.extend(customParseFormat)
 
 
-const supabase = useSupabaseClient()
-const dataStore = useDataStore()
-const profileStore = useProfileStore()
-
 let incomeData = ref({})
 let expenseData = ref({})
 
 const setup = async () => {
-  let incomeRawData = (await supabase.from("createddocuments").select().eq("tenant",profileStore.currentTenant).eq("state","Gebucht").in('type',['invoices','advanceInvoices','cancellationInvoices'])).data
-  console.log(incomeRawData)
+  //let incomeRawData = (await supabase.from("createddocuments").select().eq("tenant",profileStore.currentTenant).eq("state","Gebucht").in('type',['invoices','advanceInvoices','cancellationInvoices'])).data
+  let incomeRawData = (await useEntities("createddocuments").select()).filter(i => i.state === "Gebucht" && ['invoices','advanceInvoices','cancellationInvoices'].includes(i.type))
+
   let incomeRawFilteredData = incomeRawData.filter(x => x.state === 'Gebucht' && incomeRawData.find(i => i.linkedDocument && i.linkedDocument.id === x.id && i.type === 'cancellationInvoices') && ['invoices','advanceInvoices'].includes(row.type))
 
 
-  let expenseRawData =(await supabase.from("incominginvoices").select().eq("tenant",profileStore.currentTenant)).data
-  let withoutInvoiceRawData = (await supabase.from("statementallocations").select().eq("tenant",profileStore.currentTenant).not("account","is",null)).data
+  //let expenseRawData =(await supabase.from("incominginvoices").select().eq("tenant",profileStore.currentTenant)).data
+  let expenseRawData =(await useEntities("incominginvoices").select())
+  //let withoutInvoiceRawData = (await supabase.from("statementallocations").select().eq("tenant",profileStore.currentTenant).not("account","is",null)).data
+  let withoutInvoiceRawData = (await useEntities("statementallocations").select()).filter(i => i.account)
 
   let withoutInvoiceRawDataExpenses = []
   let withoutInvoiceRawDataIncomes = []
@@ -87,7 +86,7 @@ const setup = async () => {
   }
   Object.keys(expenseMonths).forEach(month => {
     let dates = Object.keys(expenseData.value).filter(i => i.split("-")[1] === month && i.split("-")[2] === dayjs().format("YY"))
-    console.log(dates)
+
 
 
     dates.forEach(date => {
diff --git a/components/displayOpenBalances.vue b/components/displayOpenBalances.vue
index 70245e3..e0e6a11 100644
--- a/components/displayOpenBalances.vue
+++ b/components/displayOpenBalances.vue
@@ -3,7 +3,6 @@
 import dayjs from "dayjs";
 
 const profileStore = useProfileStore();
-const supabase = useSupabaseClient()
 
 let unpaidInvoicesSum = ref(0)
 let unpaidInvoicesCount = ref(0)
@@ -15,7 +14,7 @@ let draftInvoicesCount = ref(0)
 let countPreparedOpenIncomingInvoices = ref(0)
 
 const setupPage = async () => {
-  let items = (await useSupabaseSelect("createddocuments","*, statementallocations(*), customer(id,name), linkedDocument(*)")).filter(i => !i.archived)
+  let items = (await useEntities("createddocuments").select("*, statementallocations(*), customer(id,name), linkedDocument(*)")).filter(i => !i.archived)
   let documents = items.filter(i => i.type === "invoices" ||i.type === "advanceInvoices")
 
   let draftDocuments = documents.filter(i => i.state === "Entwurf")
@@ -25,11 +24,9 @@ const setupPage = async () => {
 
   finalizedDocuments = finalizedDocuments.filter(x => (x.type === 'invoices' || x.type === 'advanceInvoices') && x.state === 'Gebucht' && !items.find(i => i.linkedDocument && i.linkedDocument.id === x.id))
 
-  console.log(finalizedDocuments)
+
 
   finalizedDocuments.forEach(i => {
-    //if(process.dev) console.log(i)
-    //if(process.dev) console.log(useSum().getCreatedDocumentSum(i, documents) - i.statementallocations.reduce((n,{amount}) => n + amount, 0))
     if(dayjs().subtract(i.paymentDays,"days").isAfter(i.documentDate)) {
       unpaidOverdueInvoicesSum.value += useSum().getCreatedDocumentSum(i, documents) - i.statementallocations.reduce((n,{amount}) => n + amount, 0)
       unpaidOverdueInvoicesCount.value += 1
@@ -45,7 +42,7 @@ const setupPage = async () => {
   })
   draftInvoicesCount.value = draftDocuments.length
 
-  countPreparedOpenIncomingInvoices.value = (await supabase.from("incominginvoices").select("id").eq("tenant",profileStore.currentTenant).eq("state", "Vorbereitet")).data.length
+  countPreparedOpenIncomingInvoices.value = (await useEntities("incominginvoices").select("id, state")).filter(i => i.state === "Vorbereitet").length
 
 
 }
diff --git a/components/displayOpenTasks.vue b/components/displayOpenTasks.vue
index 3c579e5..e60512e 100644
--- a/components/displayOpenTasks.vue
+++ b/components/displayOpenTasks.vue
@@ -1,12 +1,12 @@
 <script setup>
 
 const openTasks = ref([])
-const supabase = useSupabaseClient()
 const router = useRouter()
-
+const auth = useAuthStore()
 
 const setupPage = async () => {
-  openTasks.value = (await supabase.from("tasks").select().eq("tenant",useProfileStore().currentTenant).not("archived","is",true).neq("categorie","Abgeschlossen").eq("profile", useProfileStore().activeProfile.id)).data
+  //TODO: BACKEND CHANGE Migrate to auth_users for profile
+  openTasks.value = (await useEntities("tasks").select()).filter(i => !i.archived && i.user_id === auth.user.id)
 }
 
 setupPage()
diff --git a/components/displayProjectsInPhases.vue b/components/displayProjectsInPhases.vue
index 566d3b0..fb6ddfa 100644
--- a/components/displayProjectsInPhases.vue
+++ b/components/displayProjectsInPhases.vue
@@ -3,7 +3,7 @@
 const phasesCounter = ref({})
 
 const setupPage = async () => {
-  const projects = (await useSupabaseSelect("projects")).filter(i => !i.archived)
+  const projects = (await useEntities("projects").select()).filter(i => !i.archived)
 
   projects.forEach(project => {
     if(project.phases && project.phases.length > 0){
diff --git a/composables/useEntities.ts b/composables/useEntities.ts
new file mode 100644
index 0000000..9975b02
--- /dev/null
+++ b/composables/useEntities.ts
@@ -0,0 +1,143 @@
+
+import { useDataStore } from "~/stores/data"
+
+export const useEntities = (
+    relation: string,
+) => {
+
+    const dataStore = useDataStore()
+    const toast = useToast()
+    const router = useRouter()
+
+    const dataType = dataStore.dataTypes[relation]
+
+    const select = async (
+        select: string = "*",
+        sortColumn: string | null = null,
+        ascending: boolean = false,
+        noArchivedFiltering: boolean = false
+    ) => {
+
+        const res = await useNuxtApp().$api(`/api/resource/${relation}`, {
+            method: "GET",
+            params: {
+                select,
+                sort: sortColumn || undefined,
+                asc: ascending
+            }
+        })
+
+        let data = res || []
+
+        if (dataType && dataType.isArchivable && !noArchivedFiltering) {
+            data = data.filter((i: any) => !i.archived)
+        }
+
+        return data
+    }
+
+    const selectSpecial = async (
+        select: string = "*",
+        sortColumn: string | null = null,
+        ascending: boolean = false,
+    ) => {
+
+        const res = await useNuxtApp().$api(`/api/resource-special/${relation}`, {
+            method: "GET",
+            params: {
+                select,
+                sort: sortColumn || undefined,
+                asc: ascending
+            }
+        })
+
+        return res || []
+    }
+
+    const selectSingle = async (
+        idToEq: string | number,
+        select: string = "*",
+        withInformation: boolean = false
+    ) => {
+        if (!idToEq) return null
+
+        const res = await useNuxtApp().$api(withInformation ? `/api/resource/${relation}/${idToEq}/${withInformation}` : `/api/resource/${relation}/${idToEq}`, {
+            method: "GET",
+            params: { select }
+        })
+
+        return res
+    }
+
+    const create = async (
+        payload: Record<string, any>,
+        noRedirect: boolean = false
+    ) => {
+
+
+        const res = await useNuxtApp().$api(`/api/resource/${relation}`, {
+            method: "POST",
+            body: payload
+        })
+
+        toast.add({title: `${dataType.labelSingle} hinzugefügt`})
+        if(dataType.redirect && !noRedirect) {
+            if(dataType.isStandardEntity) {
+                await router.push(dataType.redirectToList ? `/standardEntity/${relation}` : `/standardEntity/${relation}/show/${res.id}`)
+            } else {
+                await router.push(dataType.redirectToList ? `/${relation}` : `/${relation}/show/${res.id}`)
+            }
+        }
+        //modal.close() TODO: Modal Close wenn in Modal
+
+
+        return res
+    }
+
+    const update = async (
+        id: string | number,
+        payload: Record<string, any>,
+        noRedirect: boolean = false
+    ) => {
+        const res = await useNuxtApp().$api(`/api/resource/${relation}/${id}`, {
+            method: "PUT",
+            body: payload
+        })
+
+        toast.add({title: `${dataType.labelSingle} geändert`})
+        if(dataType.redirect && !noRedirect) {
+            if(dataType.isStandardEntity) {
+                await router.push(dataType.redirectToList ? `/standardEntity/${relation}` : `/standardEntity/${relation}/show/${res.id}`)
+            } else {
+                await router.push(dataType.redirectToList ? `/${relation}` : `/${relation}/show/${res.id}`)
+            }
+        }
+        //modal.close() TODO: Modal Close wenn in Modal
+
+
+        return res
+    }
+
+    /**
+     * Soft Delete = archived = true
+     */
+    const archive = async (
+        id: string | number
+    ) => {
+        const res = await useNuxtApp().$api(`/api/resource/${relation}/${id}`, {
+            method: "PUT",
+            body: { archived: true }
+        })
+        navigateTo(dataType.isStandardEntity ? `/standardEntity/${relation}` : `/${relation}`)
+
+        return res
+
+    }
+
+    return {select, create, update, archive, selectSingle, selectSpecial}
+}
+
+
+
+
+
diff --git a/composables/useFiles.js b/composables/useFiles.js
deleted file mode 100644
index 52c4875..0000000
--- a/composables/useFiles.js
+++ /dev/null
@@ -1,211 +0,0 @@
-
-export const useFiles = () => {
-    const supabase = useSupabaseClient()
-    const toast = useToast()
-
-    let bucket = "filesdev"
-
-    const profileStore = useProfileStore()
-
-    const uploadFiles = async (formData, files,tags, upsert) => {
-        const uploadSingleFile = async (file) => {
-            //Create File Entry to Get ID for Folder
-            const {data:createdFileData,error:createdFileError} = await supabase
-                .from("files")
-                .insert({
-                    tenant: profileStore.currentTenant,
-                })
-                .select()
-                .single()
-
-            if(createdFileError){
-                console.log(createdFileError)
-                toast.add({title: "Hochladen fehlgeschlagen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
-            } else if(createdFileData) {
-                //Upload File to ID Folder
-                const {data:uploadData, error: uploadError} = await supabase
-                    .storage
-                    .from(bucket)
-                    .upload(`${profileStore.currentTenant}/filesbyid/${createdFileData.id}/${file.name}`, file, {upsert: upsert})
-
-                if(uploadError) {
-                    console.log(uploadError)
-                    console.log(uploadError.statusCode)
-
-                    if(uploadError.statusCode === '400') {
-                        console.log("is 400")
-                        toast.add({title: "Hochladen fehlgeschlagen", description: "Die Datei enthält ungültige Zeichen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
-                    } else if(uploadError.statusCode === '409') {
-                        console.log("is 409")
-                        toast.add({title: "Hochladen fehlgeschlagen", description: "Es existiert bereits eine Datei mit diesem Namen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
-                    } else {
-                        toast.add({title: "Hochladen fehlgeschlagen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
-
-                    }
-                } else if(uploadData) {
-                    //Update File with Corresponding Path
-                    const {data:updateFileData, error:updateFileError} = await supabase
-                        .from("files")
-                        .update({
-                            ...formData,
-                            path: uploadData.path,
-                        })
-                        .eq("id", createdFileData.id)
-
-                    if(updateFileError) {
-                        console.log(updateFileError)
-                        toast.add({title: "Hochladen fehlgeschlagen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
-                    } else {
-                        const {data:tagData, error:tagError} = await supabase
-                            .from("filetagmembers")
-                            .insert(tags.map(tag => {
-                                return {
-                                    file_id: createdFileData.id,
-                                    tag_id: tag
-                                }
-                            }))
-
-
-
-                        toast.add({title: "Hochladen erfolgreich"})
-
-                    }
-                }
-            }
-        }
-
-        if(files.length === 1) {
-            await uploadSingleFile(files[0])
-        } else if( files.length > 1) {
-
-            for(let i = 0; i < files.length; i++){
-                await uploadSingleFile(files[i])
-            }
-
-        }
-    }
-
-    const selectDocuments = async (sortColumn = null, folder = null) => {
-        let data = []
-
-        if(sortColumn !== null ) {
-            data = (await supabase
-                .from("files")
-                .select('*, incominginvoice(*), project(*), vendor(*), customer(*), contract(*), plant(*), createddocument(*), vehicle(*), product(*), profile(*), check(*), inventoryitem(*)')
-                .eq("tenant", profileStore.currentTenant)
-                .not("path","is",null)
-                .not("archived","is",true)
-                .order(sortColumn, {ascending: true})).data
-        } else {
-            data = (await supabase
-                .from("files")
-                .select('*, incominginvoice(*), project(*), vendor(*), customer(*), contract(*), plant(*), createddocument(*), vehicle(*), product(*), profile(*), check(*), inventoryitem(*)')
-                .eq("tenant", profileStore.currentTenant)
-                .not("path","is",null)
-                .not("archived","is",true)).data
-
-        }
-
-        if(data.length > 0){
-            let paths = []
-            data.forEach(doc => {
-                paths.push(doc.path)
-            })
-
-            const {data: supabaseData,error} = await supabase.storage.from(bucket).createSignedUrls(paths,3600)
-
-            data = data.map((doc,index) => {
-
-                return {
-                    ...doc,
-                    url: supabaseData[index].signedUrl
-                }
-            })
-        }
-
-        return data
-    }
-
-    const selectSomeDocuments = async (documentIds, sortColumn = null, folder = null) => {
-        let data = null
-
-        if(sortColumn !== null ) {
-            data = (await supabase
-                .from("files")
-                .select('*, incominginvoice(*), project(*), vendor(*), customer(*), contract(*), plant(*), createddocument(*), vehicle(*), product(*), profile(*), check(*), inventoryitem(*)')
-                .in("id",documentIds)
-                .eq("tenant", profileStore.currentTenant)
-                .not("path","is",null)
-                .not("archived","is",true)
-                .order(sortColumn, {ascending: true})).data
-        } else {
-            data = (await supabase
-                .from("files")
-                .select('*, incominginvoice(*), project(*), vendor(*), customer(*), contract(*), plant(*), createddocument(*, customer(*), contact(*)), vehicle(*), product(*), profile(*), check(*), inventoryitem(*)')
-                .in("id",documentIds)
-                .not("path","is",null)
-                .not("archived","is",true)
-                .eq("tenant", profileStore.currentTenant)).data
-
-        }
-
-        if(data.length > 0){
-            let paths = []
-            data.forEach(doc => {
-                paths.push(doc.path)
-            })
-
-            const {data: supabaseData,error} = await supabase.storage.from(bucket).createSignedUrls(paths,3600)
-
-            data = data.map((doc,index) => {
-
-                return {
-                    ...doc,
-                    url: supabaseData[index].signedUrl
-                }
-            })
-        }
-
-        //console.log(data)
-
-        return data
-    }
-
-    const selectDocument = async (id) => {
-        const {data,error} = await supabase
-            .from("files")
-            .select('*')
-            .eq("id",id)
-            .single()
-
-        const {data: supabaseData,error:supabaseError} = await supabase.storage.from(bucket).createSignedUrl(data.path,3600)
-
-        return {
-            ...data,
-            url: supabaseData.signedUrl
-        }
-/*
-        if(data.length > 0){
-            let paths = []
-            data.forEach(doc => {
-                paths.push(doc.path)
-            })
-
-            const {data: supabaseData,error} = await supabase.storage.from(bucket).createSignedUrls(paths,3600)
-
-            data = data.map((doc,index) => {
-
-                return {
-                    ...doc,
-                    url: supabaseData[index].signedUrl
-                }
-            })
-        }
-
-        //console.log(data)
-
-        return data[0]*/
-    }
-
-    return {uploadFiles, selectDocuments, selectSomeDocuments, selectDocument}
-}
\ No newline at end of file
diff --git a/composables/useFiles.ts b/composables/useFiles.ts
new file mode 100644
index 0000000..657824d
--- /dev/null
+++ b/composables/useFiles.ts
@@ -0,0 +1,129 @@
+
+export const useFiles = () => {
+    const supabase = useSupabaseClient()
+    const toast = useToast()
+
+    const auth = useAuthStore()
+
+    let bucket = "filesdev"
+
+    const uploadFiles = async (fileData, files,tags, upsert) => {
+        const uploadSingleFile = async (file) => {
+            //Create File Entry to Get ID for Folder
+
+            const formData = new FormData()
+
+            formData.append("file", file)
+            formData.append("meta", JSON.stringify(fileData))
+
+            const {fileReturn} = await useNuxtApp().$api("/api/files/upload",{
+                method: "POST",
+                body: formData
+            })
+        }
+
+        if(files.length === 1) {
+            await uploadSingleFile(files[0])
+        } else if( files.length > 1) {
+
+            for(let i = 0; i < files.length; i++){
+                await uploadSingleFile(files[i])
+            }
+
+        }
+    }
+
+    const selectDocuments = async (sortColumn = null, folder = null) => {
+        let data = []
+        data = await useEntities("files").select("*, incominginvoice(*), project(*), vendor(*), customer(*), contract(*), plant(*), createddocument(*), vehicle(*), product(*), profile(*), check(*), inventoryitem(*)")
+
+
+
+        const res =  await useNuxtApp().$api("/api/files/presigned",{
+            method: "POST",
+            body: {
+                ids: data.map(i => i.id)
+            }
+        })
+
+        console.log(res)
+
+        return res.files
+    }
+
+    const selectSomeDocuments = async (documentIds, sortColumn = null, folder = null) => {
+
+        if(documentIds.length === 0) return []
+        const res =  await useNuxtApp().$api("/api/files/presigned",{
+            method: "POST",
+            body: {
+                ids: documentIds
+            }
+        })
+
+        console.log(res)
+
+        return res.files
+
+
+    }
+
+    const selectDocument = async (id) => {
+        let documentIds = [id]
+        if(documentIds.length === 0) return []
+        const res =  await useNuxtApp().$api("/api/files/presigned",{
+            method: "POST",
+            body: {
+                ids: documentIds
+            }
+        })
+
+        console.log(res)
+
+        return res.files[0]
+    }
+
+    const downloadFile = async (id?: string, ids?: string[], returnAsBlob: Boolean = false) => {
+        const url = id ? `/api/files/download/${id}` : `/api/files/download`
+        const body = ids ? { ids } : undefined
+
+        const res:any = await useNuxtApp().$api.raw(url, {
+            method: "POST",
+            body,
+            responseType: "blob", // wichtig!
+        })
+
+        // Dateiname bestimmen
+        let filename = "download"
+
+        if (id) {
+            // Einzeldatei → nimm den letzten Teil des Pfads aus Content-Disposition
+            const contentDisposition = res.headers?.get("content-disposition")
+            if (contentDisposition) {
+                const match = contentDisposition.match(/filename="?([^"]+)"?/)
+                if (match) filename = match[1]
+            }
+        } else {
+            filename = "dateien.zip"
+        }
+
+        // Direkt speichern
+        const blob = res._data as Blob
+
+        if(returnAsBlob) {
+            return blob
+        } else {
+            const link = document.createElement("a")
+            link.href = URL.createObjectURL(blob)
+            link.download = filename
+            link.click()
+            URL.revokeObjectURL(link.href)
+        }
+
+
+
+    }
+
+
+    return {uploadFiles, selectDocuments, selectSomeDocuments, selectDocument, downloadFile}
+}
\ No newline at end of file
diff --git a/composables/useFunctions.js b/composables/useFunctions.js
index 44d27ee..42e7506 100644
--- a/composables/useFunctions.js
+++ b/composables/useFunctions.js
@@ -24,7 +24,7 @@ export const useFunctions = () => {
     }
 
     const useNextNumber = async (numberRange) => {
-        const {data:{session:{access_token}}} = await supabase.auth.getSession()
+        /*const {data:{session:{access_token}}} = await supabase.auth.getSession()
 
         return (await axios({
             method: "POST",
@@ -35,7 +35,11 @@ export const useFunctions = () => {
             headers: {
                 Authorization: `Bearer ${access_token}`
             }
-        })).data.usedNumber
+        })).data.usedNumber*/
+
+        return (await useNuxtApp().$api(`/api/functions/usenextnumber/${numberRange}`,)).usedNumber
+
+
     }
 
     const useCreateTicket = async (subject,message,url,source) => {
@@ -80,9 +84,17 @@ export const useFunctions = () => {
     }
 
     const useCreatePDF = async (invoiceData,path) => {
-        const {data:{session:{access_token}}} = await supabase.auth.getSession()
+        //const {data:{session:{access_token}}} = await supabase.auth.getSession()
 
-        const {data} = await axios({
+        const data = await useNuxtApp().$api(`/api/functions/createinvoicepdf`, {
+            method: "POST",
+            body: {
+                invoiceData: invoiceData,
+                backgroundPath: path,
+            }
+        })
+
+        /*const {data} = await axios({
             method: "POST",
             url: `${baseURL}/functions/createpdf`,
             data: {
@@ -93,7 +105,7 @@ export const useFunctions = () => {
             headers: {
                 Authorization: `Bearer ${access_token}`
             }
-        })
+        })*/
 
         console.log(data)
 
diff --git a/composables/usePermission.ts b/composables/usePermission.ts
new file mode 100644
index 0000000..54376e7
--- /dev/null
+++ b/composables/usePermission.ts
@@ -0,0 +1,9 @@
+export function usePermission() {
+    const auth = useAuthStore()
+
+    const has = (key: string) => {
+        return auth.hasPermission(key)
+    }
+
+    return { has }
+}
diff --git a/composables/useUsers.ts b/composables/useUsers.ts
new file mode 100644
index 0000000..ba68874
--- /dev/null
+++ b/composables/useUsers.ts
@@ -0,0 +1,28 @@
+
+import { useDataStore } from "~/stores/data"
+
+export const useUsers = (
+    id: string | number,
+) => {
+
+    const dataStore = useDataStore()
+    const toast = useToast()
+    const router = useRouter()
+
+    const getProfile = async () => {
+
+
+        const res = await useNuxtApp().$api(`/api/profiles/${id}`, {
+            method: "GET"
+        })
+
+        return res
+    }
+
+    return {getProfile}
+}
+
+
+
+
+
diff --git a/layouts/default.vue b/layouts/default.vue
index ecbbae7..225873b 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -3,19 +3,19 @@
 
 import MainNav from "~/components/MainNav.vue";
 import dayjs from "dayjs";
-import {useProfileStore} from "~/stores/profile.js";
 import {useCapacitor} from "../composables/useCapacitor.js";
 import GlobalMessages from "~/components/GlobalMessages.vue";
+import TenantDropdown from "~/components/TenantDropdown.vue";
 
 const dataStore = useDataStore()
-const profileStore = useProfileStore()
 const colorMode = useColorMode()
 const { isHelpSlideoverOpen } = useDashboard()
-const supabase = useSupabaseClient()
 const router = useRouter()
 const route = useRoute()
 
-profileStore.initializeData((await supabase.auth.getUser()).data.user.id)
+const auth = useAuthStore()
+
+//profileStore.initializeData((await supabase.auth.getUser()).data.user.id)
 
 const month = dayjs().format("MM")
 
@@ -65,8 +65,8 @@ const actions = [
 ]
 
 
-const groups = computed(() =>
-    [{
+const groups = computed(() => [
+    {
       key: 'actions',
       commands: actions
     },{
@@ -99,7 +99,8 @@ const groups = computed(() =>
       commands: dataStore.projects.map(item => { return {id: item.id, label: item.name, to: `/projects/show/${item.id}`}})
     }
     ].filter(Boolean))
-const footerLinks = [/*{
+const footerLinks = [
+    /*{
   label: 'Invite people',
   icon: 'i-heroicons-plus',
   to: '/settings/members'
@@ -112,56 +113,163 @@ const footerLinks = [/*{
 </script>
 
 <template>
-  <UDashboardLayout class="safearea"  v-if="profileStore.loaded">
-
-    <UDashboardPanel :width="250" :resizable="{ min: 200, max: 300 }" collapsible>
-      <UDashboardNavbar style="margin-top: env(safe-area-inset-top, 10px) !important;" :class="['!border-transparent']" :ui="{ left: 'flex-1' }">
-        <template #left>
-          <ProfileDropdown class="w-full" />
-        </template>
-      </UDashboardNavbar>
-
-      <UDashboardSidebar id="sidebar">
-        <template #header>
-          <UDashboardSearchButton label="Suche..."/>
-        </template>
-
-        <GlobalMessages/>
-
-        <MainNav/>
-
-        <div class="flex-1" />
-
-
-        <template #footer>
-          <div class="flex flex-col w-full">
-
-            <UDashboardSidebarLinks :links="footerLinks" />
-            <UDivider class="sticky bottom-0" />
-            <UserDropdown style="margin-bottom: env(safe-area-inset-bottom, 10px) !important;"/>
+  <div v-if="!auth.loading">
+    <div v-if="auth.tenants.find(t => t.id === auth.activeTenant).locked === 'maintenance_tenant'">
+      <UContainer class="min-h-screen flex items-center justify-center bg-gray-50 dark:bg-gray-900">
+        <UCard class="max-w-lg text-center p-10">
+          <UColorModeImage
+              light="/Logo_Hell_Weihnachten.png"
+              dark="/Logo_Dunkel_Weihnachten.png"
+              class=" mx-auto my-10"
+              v-if="month === '12'"
+          />
+          <UColorModeImage
+              light="/Logo.png"
+              dark="/Logo_Dark.png"
+              class="mx-auto my-10"
+              v-else
+          />
+          <div class="flex justify-center mb-6">
+            <UIcon name="i-heroicons-exclamation-triangle-solid" class="w-16 h-16 text-yellow-500" />
           </div>
 
-        </template>
-      </UDashboardSidebar>
-    </UDashboardPanel>
+          <h1 class="text-2xl font-bold text-gray-900 dark:text-white mb-4">
+            Wartungsarbeiten
+          </h1>
+          <p class="text-gray-600 dark:text-gray-300 mb-8">
+            Dieser FEDEO Mandant wird derzeit gewartet. Bitte versuche es in einigen Minuten erneut oder verwende einen anderen Mandanten.
+          </p>
+          <div class="mx-auto text-left flex flex-row justify-between my-3" v-for="tenant in auth.tenants">
+            {{tenant.name}}
+            <UButton
+                :disabled="tenant.locked"
+                @click="auth.switchTenant(tenant.id)"
+            >Wählen</UButton>
+          </div>
 
-    <UDashboardPage>
-      <UDashboardPanel grow>
-        <slot />
+
+        </UCard>
+      </UContainer>
+    </div>
+    <div v-else-if="auth.tenants.find(t => t.id === auth.activeTenant).locked === 'maintenance'">
+      <UContainer class="min-h-screen flex items-center justify-center bg-gray-50 dark:bg-gray-900">
+        <UCard class="max-w-lg text-center p-10">
+          <UColorModeImage
+              light="/Logo_Hell_Weihnachten.png"
+              dark="/Logo_Dunkel_Weihnachten.png"
+              class=" mx-auto my-10"
+              v-if="month === '12'"
+          />
+          <UColorModeImage
+              light="/Logo.png"
+              dark="/Logo_Dark.png"
+              class="mx-auto my-10"
+              v-else
+          />
+          <div class="flex justify-center mb-6">
+            <UIcon name="i-heroicons-exclamation-triangle-solid" class="w-16 h-16 text-yellow-500" />
+          </div>
+
+          <h1 class="text-2xl font-bold text-gray-900 dark:text-white mb-4">
+            Wartungsarbeiten
+          </h1>
+          <p class="text-gray-600 dark:text-gray-300 mb-8">
+            FEDEO wird derzeit gewartet. Bitte versuche es in einigen Minuten erneut.
+          </p>
+
+
+        </UCard>
+      </UContainer>
+    </div>
+    <div v-else-if="auth.tenants.find(t => t.id === auth.activeTenant).locked === 'no_subscription'">
+      <UContainer class="min-h-screen flex items-center justify-center bg-gray-50 dark:bg-gray-900">
+        <UCard class="max-w-lg text-center p-10">
+          <UColorModeImage
+              light="/Logo_Hell_Weihnachten.png"
+              dark="/Logo_Dunkel_Weihnachten.png"
+              class=" mx-auto my-10"
+              v-if="month === '12'"
+          />
+          <UColorModeImage
+              light="/Logo.png"
+              dark="/Logo_Dark.png"
+              class="mx-auto my-10"
+              v-else
+          />
+          <div class="flex justify-center mb-6">
+            <UIcon name="i-heroicons-credit-card" class="w-16 h-16 text-red-600" />
+          </div>
+
+          <h1 class="text-2xl font-bold text-gray-900 dark:text-white mb-4">
+            Kein Aktives Abonnement für diesen Mandant.
+          </h1>
+          <p class="text-gray-600 dark:text-gray-300 mb-8">
+            Bitte wenden Sie sich an den FEDEO Support um ein Abonnement zu erhalten oder verwenden Sie einen anderen Mandanten.
+          </p>
+          <div class="mx-auto text-left flex flex-row justify-between my-3" v-for="tenant in auth.tenants">
+            {{tenant.name}}
+            <UButton
+                :disabled="tenant.locked"
+                @click="auth.switchTenant(tenant.id)"
+            >Wählen</UButton>
+          </div>
+
+
+        </UCard>
+      </UContainer>
+    </div>
+    <UDashboardLayout class="safearea" v-else  >
+      <UDashboardPanel :width="250" :resizable="{ min: 200, max: 300 }" collapsible>
+        <UDashboardNavbar style="margin-top: env(safe-area-inset-top, 10px) !important;" :class="['!border-transparent']" :ui="{ left: 'flex-1' }">
+          <template #left>
+            <TenantDropdown class="w-full" />
+          </template>
+        </UDashboardNavbar>
+
+        <UDashboardSidebar id="sidebar">
+<!--          <template #header>
+            <UDashboardSearchButton label="Suche..."/>
+          </template>-->
+
+<!--
+                  <GlobalMessages/>
+-->
+
+          <MainNav/>
+
+          <div class="flex-1" />
+
+
+          <template #footer>
+            <div class="flex flex-col w-full">
+
+              <UDashboardSidebarLinks :links="footerLinks" />
+              <UDivider class="sticky bottom-0" />
+              <UserDropdown style="margin-bottom: env(safe-area-inset-bottom, 10px) !important;"/>
+            </div>
+
+          </template>
+        </UDashboardSidebar>
       </UDashboardPanel>
-    </UDashboardPage>
+
+      <UDashboardPage>
+        <UDashboardPanel grow>
+          <slot />
+        </UDashboardPanel>
+      </UDashboardPage>
 
 
 
-    <!-- ~/components/HelpSlideover.vue -->
-    <HelpSlideover/>
-    <!-- ~/components/NotificationsSlideover.vue -->
-    <NotificationsSlideover />
+      <HelpSlideover/>
+
+      <!--<NotificationsSlideover />
+
+      <ClientOnly>
+        <LazyUDashboardSearch :groups="groups" hide-color-mode/>
+      </ClientOnly>-->
+    </UDashboardLayout>
+  </div>
 
-    <ClientOnly>
-      <LazyUDashboardSearch :groups="groups" hide-color-mode/>
-    </ClientOnly>
-  </UDashboardLayout>
   <div
       v-else
       class="flex flex-col"
@@ -178,12 +286,25 @@ const footerLinks = [/*{
       class="w-1/3 mx-auto my-10"
       v-else
     />
-    <div v-if="profileStore.showProfileSelection">
-      <ProfileSelection/>
+
+    <div v-if="!auth.activeTenant" class="w-1/2 mx-auto text-center">
+        <!-- Tenant Selection      -->
+        <h3 class="text-center font-bold text-2xl mb-5">Kein Aktiver Mandant. Bitte wählen Sie ein Mandant.</h3>
+        <div class="mx-auto w-1/2 flex flex-row justify-between my-3" v-for="tenant in auth.tenants">
+          <span class="text-left">{{tenant.name}}</span>
+          <UButton
+            @click="auth.switchTenant(tenant.id)"
+          >Wählen</UButton>
+        </div>
+        <UButton
+            variant="outline"
+            color="rose"
+          @click="auth.logout()"
+        >Abmelden</UButton>
+
+
     </div>
     <div v-else>
-
-
       <UProgress animation="carousel" class="w-3/4 mx-auto mt-10" />
     </div>
 
@@ -192,7 +313,5 @@ const footerLinks = [/*{
 </template>
 
 <style scoped>
-.testclass {
-  color: red;
-}
+
 </style>
\ No newline at end of file
diff --git a/middleware/auth.global.ts b/middleware/auth.global.ts
new file mode 100644
index 0000000..8d0d033
--- /dev/null
+++ b/middleware/auth.global.ts
@@ -0,0 +1,17 @@
+export default defineNuxtRouteMiddleware(async (to, from) => {
+    const auth = useAuthStore()
+
+
+
+    // Wenn nicht eingeloggt → auf /login (außer er will schon dahin)
+    if (!auth.user && !["/login", "/password-reset"].includes(to.path)) {
+        return navigateTo("/login")
+    }
+
+    // Wenn eingeloggt → von /login auf /dashboard umleiten
+    if (auth.user && !auth.user?.must_change_password &&  to.path === "/login") {
+        return navigateTo("/")
+    } else if(auth.user && auth.user.must_change_password && to.path !== "/password-change") {
+        return navigateTo("/password-change")
+    }
+})
\ No newline at end of file
diff --git a/middleware/auth.ts b/middleware/auth.ts
deleted file mode 100644
index 0bdf3b3..0000000
--- a/middleware/auth.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export default defineNuxtRouteMiddleware((to, _from) => {
-    const user = useSupabaseUser()
-    const router = useRouter()
-    if (!user.value) {
-        //useCookie('redirect', { path: '/' }).value = to.fullPath
-        return router.push("/login")
-    }
-})
\ No newline at end of file
diff --git a/middleware/redirectToMobileIndex.ts b/middleware/redirectToMobileIndex.ts
deleted file mode 100644
index 6c4b111..0000000
--- a/middleware/redirectToMobileIndex.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export default defineNuxtRouteMiddleware(async (to, _from) => {
-    const router = useRouter()
-
-    console.log(await useCapacitor().getIsPhone())
-
-    if(await useCapacitor().getIsPhone()) {
-        return router.push('/mobile')
-    }
-})
\ No newline at end of file
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 9f690eb..873a7cf 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -34,7 +34,8 @@ export default defineNuxtConfig({
 
   supabase: {
       key: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InV3cHB2Y3hmbHJjc2lidXpzYmlsIiwicm9sZSI6ImFub24iLCJpYXQiOjE3MDA5MzgxOTQsImV4cCI6MjAxNjUxNDE5NH0.CkxYSQH0uLfwx9GVUlO6AYMU2FMLAxGMrwEKvyPv7Oo",
-      url: "https://uwppvcxflrcsibuzsbil.supabase.co"
+      url: "https://uwppvcxflrcsibuzsbil.supabase.co",
+      redirect:false
   },
 
   vite: {
diff --git a/pages/accounts/index.vue b/pages/accounts/index.vue
index 30038a6..e955732 100644
--- a/pages/accounts/index.vue
+++ b/pages/accounts/index.vue
@@ -1,11 +1,6 @@
 <script setup>
 
 import dayjs from "dayjs";
-import {useSupabaseSelect} from "~/composables/useSupabase.js";
-
-definePageMeta({
-  middleware: "auth"
-})
 
 defineShortcuts({
   '/': () => {
@@ -15,16 +10,14 @@ defineShortcuts({
   }
 })
 
-const profileStore = useProfileStore()
 const tempStore = useTempStore()
 const router = useRouter()
-const supabase = useSupabaseClient()
 
 const items = ref([])
 const dataLoaded = ref(false)
 
 const setupPage = async () => {
-  items.value = (await supabase.from("accounts").select("*").order("number", {ascending:true})).data
+  items.value = await useEntities("accounts").selectSpecial()
 
   items.value = await Promise.all(items.value.map(async (i) => {
     let renderedAllocationsTemp = await renderedAllocations(i.id)
@@ -44,8 +37,8 @@ const setupPage = async () => {
 
 const renderedAllocations = async (account) => {
 
-  let statementallocations = (await supabase.from("statementallocations").select("*, bs_id(*)").eq("account", account).eq("tenant",profileStore.currentTenant).order("created_at",{ascending: true})).data
-  let incominginvoices = (await useSupabaseSelect("incominginvoices", "*, vendor(*)")).filter(i => i.accounts.find(x => x.account === account))
+  let statementallocations = (await useEntities("statementallocations").select("*, bs_id(*)")).filter(i => i.account === account)
+  let incominginvoices = (await useEntities("incominginvoices").select("*, vendor(*)")).filter(i => i.accounts.find(x => x.account === account))
 
   let tempstatementallocations = statementallocations.map(i => {
     return {
diff --git a/pages/accounts/show/[id].vue b/pages/accounts/show/[id].vue
index ff2310e..5a9e02d 100644
--- a/pages/accounts/show/[id].vue
+++ b/pages/accounts/show/[id].vue
@@ -3,19 +3,17 @@
 import dayjs from "dayjs";
 import {useSupabaseSelect} from "~/composables/useSupabase.js";
 
-const supabase = useSupabaseClient()
 const route = useRoute()
 const router = useRouter()
-const profileStore = useProfileStore()
 
 const itemInfo = ref(null)
 const statementallocations = ref([])
 const incominginvoices = ref([])
 
 const setup = async () => {
-  itemInfo.value = (await supabase.from("accounts").select("*").eq("id",route.params.id).single()).data
-  statementallocations.value = (await supabase.from("statementallocations").select("*, bs_id(*)").eq("account", route.params.id).eq("tenant",profileStore.currentTenant).order("created_at",{ascending: true})).data
-  incominginvoices.value = (await useSupabaseSelect("incominginvoices", "*, vendor(*)")).filter(i => i.accounts.find(x => x.account == route.params.id))
+  itemInfo.value = (await useEntities("accounts").selectSpecial("*")).find(i => i.id === Number(route.params.id))
+  statementallocations.value = (await useEntities("statementallocations").select("*, bs_id(*)")).filter(i => i.account === Number(route.params.id))
+  incominginvoices.value = (await useEntities("incominginvoices").select("*, vendor(*)")).filter(i => i.accounts.find(x => x.account === Number(route.params.id)))
 }
 
 setup()
diff --git a/pages/banking/dep/[[accountId]].vue b/pages/banking/dep/[[accountId]].vue
index abc3b7b..f4bd5e4 100644
--- a/pages/banking/dep/[[accountId]].vue
+++ b/pages/banking/dep/[[accountId]].vue
@@ -1,9 +1,7 @@
 <script setup>
 import dayjs from "dayjs";
 
-definePageMeta({
-  middleware: "auth"
-})
+
 const dataStore = useDataStore()
 const route = useRoute()
 const supabase = useSupabaseClient()
diff --git a/pages/banking/index.vue b/pages/banking/index.vue
index ae54624..a2ebb1f 100644
--- a/pages/banking/index.vue
+++ b/pages/banking/index.vue
@@ -2,10 +2,6 @@
 
 import dayjs from "dayjs";
 
-definePageMeta({
-  middleware: "auth"
-})
-
 defineShortcuts({
   '/': () => {
     //console.log(searchinput)
@@ -14,17 +10,15 @@ defineShortcuts({
   }
 })
 
-const profileStore = useProfileStore()
 const tempStore = useTempStore()
 const router = useRouter()
-const supabase = useSupabaseClient()
 
 const bankstatements = ref([])
 const bankaccounts = ref([])
 
 const setupPage = async () => {
-  bankstatements.value = (await supabase.from("bankstatements").select("*, statementallocations(*)").is("archived",false).eq('tenant', profileStore.currentTenant).order("date", {ascending:false})).data
-  bankaccounts.value = await useSupabaseSelect("bankaccounts")
+  bankstatements.value = (await useEntities("bankstatements").select("*, statementallocations(*)", "date", false))
+  bankaccounts.value = await useEntities("bankaccounts").select()
 }
 
 const templateColumns = [
diff --git a/pages/banking/statements/[mode]/[[id]].vue b/pages/banking/statements/[mode]/[[id]].vue
index de40f5a..71a1d2d 100644
--- a/pages/banking/statements/[mode]/[[id]].vue
+++ b/pages/banking/statements/[mode]/[[id]].vue
@@ -3,9 +3,7 @@
 import dayjs from "dayjs";
 import {filter} from "vuedraggable/dist/vuedraggable.common.js";
 
-definePageMeta({
-  middleware: "auth"
-})
+
 
 defineShortcuts({
   'backspace': () => {
@@ -38,21 +36,22 @@ const ownaccounts = ref([])
 
 const loading = ref(true)
 const setup = async () => {
+  loading.value = true
   if(route.params.id) {
-    itemInfo.value =  (await supabase.from("bankstatements").select("*, statementallocations(*, cd_id(*), ii_id(*))").eq("id",route.params.id).single()).data  //dataStore.bankstatements.find(i => i.id === Number(route.params.id))
+    itemInfo.value =  await useEntities("bankstatements").selectSingle(route.params.id,"*, statementallocations(*, cd_id(*), ii_id(*))", undefined, undefined, true)
   }
   if(itemInfo.value) oldItemInfo.value = JSON.parse(JSON.stringify(itemInfo.value))
 
   manualAllocationSum.value = calculateOpenSum.value
 
-  createddocuments.value = (await useSupabaseSelect("createddocuments","*, statementallocations(*), customer(id,name)"))
+  createddocuments.value = (await useEntities("createddocuments").select("*, statementallocations(*), customer(id,name)"))
   const documents = createddocuments.value.filter(i => i.type === "invoices" ||i.type === "advanceInvoices")
-  const incominginvoices = (await useSupabaseSelect("incominginvoices","*, statementallocations(*), vendor(id,name)")).filter(i => i.state === "Gebucht")
+  const incominginvoices = (await useEntities("incominginvoices").select("*, statementallocations(*), vendor(id,name)")).filter(i => i.state === "Gebucht")
 
-  accounts.value = (await supabase.from("accounts").select().order("number",{ascending: true})).data
-  ownaccounts.value = (await supabase.from("ownaccounts").select()).data
-  customers.value = (await supabase.from("customers").select()).data
-  vendors.value = (await supabase.from("vendors").select()).data
+  accounts.value = (await useEntities("accounts").selectSpecial("*","number",true))
+  ownaccounts.value = (await useEntities("ownaccounts").select())
+  customers.value = (await useEntities("customers").select())
+  vendors.value = (await useEntities("vendors").select())
 
   openDocuments.value = documents.filter(i => i.statementallocations.reduce((n,{amount}) => n + amount, 0).toFixed(2) !== useSum().getCreatedDocumentSum(i,createddocuments.value).toFixed(2))
   openDocuments.value = openDocuments.value.map(i => {
@@ -71,15 +70,12 @@ const setup = async () => {
   allocatedIncomingInvoices.value = incominginvoices.filter(i => i.statementallocations.find(x => x.bs_id === itemInfo.value.id))
   console.log(allocatedDocuments.value)
   console.log(allocatedIncomingInvoices.value)
-  //openIncomingInvoices.value = (await useSupabaseSelect("incominginvoices","*, statementallocations(*), vendor(*)")).filter(i => i.statementallocations.length === 0 )
-  openIncomingInvoices.value = (await useSupabaseSelect("incominginvoices","*, statementallocations(*), vendor(*)")).filter(i => i.statementallocations.reduce((n,{amount}) => n + amount, 0).toFixed(2) !== getInvoiceSum(i,false))
+  openIncomingInvoices.value = (await useEntities("incominginvoices").select("*, statementallocations(*), vendor(*)")).filter(i => i.statementallocations.reduce((n,{amount}) => n + amount, 0).toFixed(2) !== getInvoiceSum(i,false))
   //console.log(openIncomingInvoices.value)
 
   //        return incominginvoices.value.filter(i => bankstatements.value.filter(x => x.assignments.find(y => y.type === 'incomingInvoice' && y.id === i.id)).length === 0)
 
 
-  let allocations = (await supabase.from("createddocuments").select(`*, statementallocations(*)`).eq("id",50)).data
-
   loading.value = false
 
 }
@@ -151,15 +147,17 @@ const showMoreWithoutRecipe = ref(false)
 const showMoreText = ref(false)
 
 const saveAllocation = async (allocation) => {
-
+  //TODO: BACKEND CHANGE SAVE/REMOVE
   console.log(allocation)
 
-  const {data,error} = await supabase.from("statementallocations").insert({
-    ...allocation,
-    tenant: profileStore.currentTenant
-  }).select()
+  const res = await useNuxtApp().$api("/api/banking/statements",{
+    method: "POST",
+    body: {
+      data: allocation
+    }
+  })
 
-  if(data) {
+  if(res) {
     await setup()
     accountToSave.value = null
     vendorAccountToSave.value = null
@@ -173,7 +171,9 @@ const saveAllocation = async (allocation) => {
 }
 
 const removeAllocation = async (allocationId) => {
-  const {data,error} = await supabase.from("statementallocations").delete().eq("id",allocationId)
+  const res = await useNuxtApp().$api(`/api/banking/statements/${allocationId}`,{
+    method: "DELETE"
+  })
 
   await setup()
 }
@@ -356,7 +356,9 @@ const archiveStatement = async () => {
                 <span class="font-semibold">Konto:</span>
               </td>
               <td>
+<!--
                 {{dataStore.getBankAccountById(itemInfo.account) ? dataStore.getBankAccountById(itemInfo.account).name || separateIBAN(dataStore.getBankAccountById(itemInfo.account).iban) : ""}}
+-->
               </td>
             </tr>
 <!--            <tr class="flex-row flex justify-between">
diff --git a/pages/calendar/[mode].vue b/pages/calendar/[mode].vue
index c8dad04..ed17d4b 100644
--- a/pages/calendar/[mode].vue
+++ b/pages/calendar/[mode].vue
@@ -7,15 +7,12 @@ import resourceTimelinePlugin from "@fullcalendar/resource-timeline";
 import interactionPlugin from "@fullcalendar/interaction";
 import dayjs from "dayjs";
 
-definePageMeta({
-  middleware: "auth"
-})
+//TODO BACKEND CHANGE COLOR IN TENANT FOR RENDERING
 
 //Config
 const route = useRoute()
 const router = useRouter()
 const mode = ref(route.params.mode || "grid")
-const supabase = useSupabaseClient()
 const dataStore = useDataStore()
 
 const profileStore = useProfileStore()
@@ -130,13 +127,13 @@ const calendarOptionsTimeline = ref({
 
 const loaded = ref(false)
 const setupPage = async () => {
-  let tempData = (await useSupabaseSelect("events", "*")).filter(i => !i.archived)
-  let absencerequests = (await useSupabaseSelect("absencerequests", "*, profile(*)")).filter(i => !i.archived)
-  let projects = (await useSupabaseSelect("projects", "*")).filter(i => !i.archived)
-  let inventoryitems = (await useSupabaseSelect("inventoryitems", "*")).filter(i => !i.archived)
-  let inventoryitemgroups = (await useSupabaseSelect("inventoryitemgroups", "*")).filter(i => !i.archived)
-  let profiles = (await useSupabaseSelect("profiles", "*")).filter(i => !i.archived)
-  let vehicles = (await useSupabaseSelect("vehicles", "*")).filter(i => !i.archived)
+  let tempData = (await useEntities("events").select()).filter(i => !i.archived)
+  let absencerequests = (await useEntities("absencerequests").select("*, profile(*)")).filter(i => !i.archived)
+  let projects = (await useEntities("projects").select( "*")).filter(i => !i.archived)
+  let inventoryitems = (await useEntities("inventoryitems").select()).filter(i => !i.archived)
+  let inventoryitemgroups = (await useEntities("inventoryitemgroups").select()).filter(i => !i.archived)
+  let profiles = (await useEntities("profiles").select()).filter(i => !i.archived)
+  let vehicles = (await useEntities("vehicles").select()).filter(i => !i.archived)
 
   calendarOptionsGrid.value.initialEvents = [
     ...tempData.map(event => {
diff --git a/pages/chat.vue b/pages/chat.vue
deleted file mode 100644
index 421b901..0000000
--- a/pages/chat.vue
+++ /dev/null
@@ -1,108 +0,0 @@
-<script setup>
-definePageMeta({
-  layout: "default"
-})
-
-
-import dayjs from "dayjs";
-
-
-const supabase = useSupabaseClient()
-const user = useSupabaseUser()
-
-const dataStore = useDataStore()
-const profileStore = useProfileStore()
-const selectedChat = ref({})
-const messageText = ref("")
-
-</script>
-
-<template>
-  <div class="flex h-full">
-    <div class="w-1/5 mr-2 scrollList">
-      <a
-          v-for="chat in dataStore.chats"
-          @click="selectedChat = chat"
-      >
-        <UAlert
-            :title="chat.title ? chat.title : chat.members.map(i => { if(i !== user.id) return profileStore.getProfileById(i).fullName}).join(' ')"
-            :avatar="{alt: chat.members.map(i => { if(i !== user.id) return profileStore.getProfileById(i).fullName}).join(' ')}"
-            :color="selectedChat.id === chat.id ? 'primary' : 'white'"
-            variant="outline"
-        >
-          <template #title="{title}">
-            {{title}} <!-- TODO: Add Unread Counter  <UBadge class="ml-1">{{dataStore.getMessagesByChatId(chat.id).filter(i => !i.read ).length}}</UBadge>-->
-          </template>
-        </UAlert>
-
-      </a>
-    </div>
-    <div class="w-full  h-full px-5 flex flex-col justify-between" v-if="selectedChat.id">
-      <div class="flex flex-col mt-5 scrollList">
-
-        <div
-            v-for="message in dataStore.getMessagesByChatId(selectedChat.id)"
-        >
-          <div class="flex justify-end mb-4" v-if="message.origin === user.id">
-            <div
-                class="mr-2 py-3 px-4 bg-primary-400 rounded-bl-3xl rounded-tl-3xl rounded-tr-xl text-white"
-            >
-              {{message.text}}
-            </div>
-            <UAvatar
-                :alt="profileStore.getProfileById(message.origin) ? profileStore.getProfileById(message.origin).fullName : ''"
-                size="md"
-            />
-          </div>
-          <div class="flex justify-start mb-4" v-else>
-            <UAvatar
-                :alt="profileStore.getProfileById(message.origin) ? profileStore.getProfileById(message.origin).fullName : ''"
-                size="md"
-            />
-            <div
-                class="ml-2 py-3 px-4 bg-gray-400 rounded-br-3xl rounded-tr-3xl rounded-tl-xl text-white"
-            >
-              {{message.text}}
-            </div>
-          </div>
-        </div>
-      </div>
-
-
-
-      <div class="py-5">
-        <UButtonGroup class="w-full">
-          <UInput
-              variant="outline"
-              color="primary"
-              placeholder="Neue Nachricht"
-              v-model="messageText"
-              @keyup.enter="dataStore.createNewItem('messages',{
-                  text: messageText,
-                  origin: user.id,
-                  destination: selectedChat.id
-                })"
-              class="flex-auto"
-          />
-          <UButton
-              @click="dataStore.createNewItem('messages',{
-                  text: messageText,
-                  origin: user.id,
-                  destination: selectedChat.id
-                })"
-          >
-            Senden
-          </UButton>
-        </UButtonGroup>
-
-
-      </div>
-    </div>
-  </div>
-
-
-</template>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/pages/chats/index.vue b/pages/chats/index.vue
index 9b38686..47ea0ac 100644
--- a/pages/chats/index.vue
+++ b/pages/chats/index.vue
@@ -1,7 +1,5 @@
 <script setup>
-definePageMeta({
-  middleware: "auth"
-})
+
 
 defineShortcuts({
   '/': () => {
diff --git a/pages/chats/show/[id].vue b/pages/chats/show/[id].vue
index 2b480d6..302ca65 100644
--- a/pages/chats/show/[id].vue
+++ b/pages/chats/show/[id].vue
@@ -2,9 +2,7 @@
 import { format, isToday } from 'date-fns'
 import dayjs from "dayjs"
 
-definePageMeta({
-  middleware: "auth"
-})
+
 
 defineShortcuts({
   ' ': () => {
diff --git a/pages/communication/historyItems/index.vue b/pages/communication/historyItems/index.vue
deleted file mode 100644
index 8c81f86..0000000
--- a/pages/communication/historyItems/index.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<script setup>
-import dayjs from "dayjs"
-
-const supabase = useSupabaseClient()
-const dataStore = useDataStore()
-const profileStore = useProfileStore()
-const router = useRouter()
-
-
-const items = ref([])
-
-const setup = async () => {
-
-  items.value = (await supabase.from("historyitems").select().like('text',`%@${profileStore.activeProfile.username}%`)/*.textSearch("text", `'@${profileStore.activeProfile.username}'`)*/.order("created_at")).data
-}
-
-const navigateToHistoryItem = (item) => {
-  /*if(item.customer) {
-    router.push(`/customers/show/${item.customer}`)
-  } else if(item.vendor) {
-    router.push(`/vendors/show/${item.vendor}`)
-  } else if(item.project) {
-    router.push(`/projects/show/${item.project}`)
-  } else if(item.plant) {
-    router.push(`/plants/show/${item.plant}`)
-  } else if(item.incomingInvoice) {
-    router.push(`/incomingInvoices/show/${item.incomingInvoice}`)
-  }/!* else if(item.document) {
-    router.push(`/documents/show/${item.document}`)
-  }*!/ else if(item.contact) {
-    router.push(`/contacts/show/${item.contact}`)
-  } else if(item.inventoryitem) {
-    router.push(`/inventoryitems/show/${item.inventoryitem}`)
-  } else if(item.product) {
-    router.push(`/products/show/${item.product}`)
-  } else if(item.profile) {
-    router.push(`/profiles/show/${item.profile}`)
-  } else if(item.absenceRequest) {
-    router.push(`/absenceRequests/show/${item.absenceRequest}`)
-  } else if(item.event) {
-    router.push(`/events/show/${item.event}`)
-  } else if(item.task) {
-    router.push(`/tasks/show/${item.task}`)
-  } else if(item.vehicle) {
-    router.push(`/vehicle/show/${item.vehicle}`)
-  } else if(item.bankStatement) {
-    router.push(`/bankStatements/show/${item.bankStatement}`)
-  } else if(item.space) {
-    router.push(`/spaces/show/${item.space}`)
-  } else if(item.trackingtrip) {
-    router.push(`/trackingtrips/show/${item.trackingtrip}`)
-  }*/
-  if(item.config && item.config.type !== "document") {
-    router.push(`/${item.config.type}s/show/${item.config.id}`)
-  }
-}
-
-setup()
-</script>
-
-<template>
-  <UDashboardNavbar title="Erwähnungen in Logbüchern" :badge="items.length">
-
-  </UDashboardNavbar>
-  <UTable
-    :rows="items"
-    @select="navigateToHistoryItem"
-    :columns="[{key:'created_at',label:'Datum'},{key:'config',label:'Typ'},{key:'text',label:'Text'}]"
-    :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Erwähnungen anzuzeigen' }"
-    class="w-full"
-    :ui="{ divide: 'divide-gray-200 dark:divide-gray-800' }"
-  >
-    <template #config-data="{row}">
-      <span v-if="row.config">{{dataStore.dataTypes[row.config.type + "s"].labelSingle}}</span>
-    </template>
-    <template #created_at-data="{row}">
-      {{dayjs(row.created_at).format("HH:mm DD.MM.YYYY")}}
-    </template>
-  </UTable>
-</template>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/pages/contacts/[mode]/[[id]].vue b/pages/contacts/[mode]/[[id]].vue
deleted file mode 100644
index 65f491f..0000000
--- a/pages/contacts/[mode]/[[id]].vue
+++ /dev/null
@@ -1,340 +0,0 @@
-<script setup>
-import dayjs from "dayjs";
-import {useSupabaseSelectSingle} from "~/composables/useSupabase.js";
-
-definePageMeta({
-  middleware: "auth"
-})
-
-defineShortcuts({
-  'backspace': () => {
-    router.push("/contacts")
-  },
-  'arrowleft': () => {
-    if(openTab.value > 0){
-      openTab.value -= 1
-    }
-  },
-  'arrowright': () => {
-    if(openTab.value < 3) {
-      openTab.value += 1
-    }
-  },
-})
-
-const dataStore = useDataStore()
-const profileStore = useProfileStore()
-const route = useRoute()
-const router = useRouter()
-const toast = useToast()
-const id = ref(route.params.id ? route.params.id : null )
-const openTab = ref(0)
-
-
-//Working
-const mode = ref(route.params.mode || "show")
-const itemInfo = ref({
-  active: true,
-  profiles: [profileStore.activeProfile.id]
-})
-const oldItemInfo = ref({})
-
-//Functions
-const setupPage = async () => {
-  if(mode.value === "show"){
-    itemInfo.value = await useSupabaseSelectSingle("contacts",route.params.id,"*, customer(id, name), vendor(id,name) ")
-  } else if(mode.value === "edit") {
-    itemInfo.value = await useSupabaseSelectSingle("contacts",route.params.id,"*")
-  }
-
-  if(mode.value === "create") {
-    let query = route.query
-
-    if(query.customer) itemInfo.value.customer = Number(query.customer)
-    if(query.vendor) itemInfo.value.vendor = Number(query.vendor)
-  }
-  if(itemInfo.value) oldItemInfo.value = JSON.parse(JSON.stringify(itemInfo.value))
-}
-
-setupPage()
-</script>
-
-<template>
-  <UDashboardNavbar
-      :ui="{center: 'flex items-stretch gap-1.5 min-w-0'}"
-  >
-    <template #left>
-      <UButton
-          icon="i-heroicons-chevron-left"
-          variant="outline"
-          @click="router.push(`/contacts`)"
-      >
-        Ansprechpartner
-      </UButton>
-    </template>
-    <template #center>
-      <h1
-          v-if="itemInfo"
-          :class="['text-xl','font-medium', ... itemInfo.active ? ['text-primary'] : ['text-rose-500']]"
-      >{{itemInfo.id ? `Ansprechpartner: ${itemInfo.fullName}` : (mode === 'create' ? 'Ansprechpartner erstellen' : 'Ansprechpartner bearbeiten')}}</h1>
-    </template>
-    <template #right>
-      <UButton
-          v-if="mode === 'edit'"
-          @click="dataStore.updateItem('contacts',{...itemInfo, fullName: itemInfo.firstName + ' ' + itemInfo.lastName},oldItemInfo)"
-      >
-        Speichern
-      </UButton>
-      <UButton
-          v-else-if="mode === 'create'"
-          @click="dataStore.createNewItem('contacts',{...itemInfo, fullName: itemInfo.firstName + ' ' + itemInfo.lastName})"
-      >
-        Erstellen
-      </UButton>
-      <UButton
-          @click="router.push(itemInfo.id ? `/contacts/show/${itemInfo.value.id}` : `/contacts/`)"
-          color="red"
-          class="ml-2"
-          v-if="mode === 'edit' || mode === 'create'"
-      >
-        Abbrechen
-      </UButton>
-      <UButton
-          v-if="mode === 'show'"
-          @click="router.push(`/contacts/edit/${itemInfo.id}`)"
-      >
-        Bearbeiten
-      </UButton>
-    </template>
-<!--    <template #badge v-if="itemInfo">
-      <UBadge
-          v-if="itemInfo.active"
-      >
-        Kontakt aktiv
-      </UBadge>
-      <UBadge
-          v-else
-          color="red"
-      >
-        Kontakt inaktiv
-      </UBadge>
-    </template>-->
-  </UDashboardNavbar>
-
-  <UTabs
-    :items="[{label: 'Informationen'}, {label: 'Logbuch'}]"
-    v-if="itemInfo && mode == 'show'"
-    class="p-5"
-    v-model="openTab"
-  >
-    <template #item="{item}">
-      <div v-if="item.label === 'Informationen'" class="flex flex-row mt-5">
-        <div class="w-1/2 mr-5">
-          <UCard>
-            <Toolbar>
-              <UButton
-                  @click="router.push(`/email/new?to=${itemInfo.email}`)"
-                  icon="i-heroicons-envelope"
-                  :disabled="!itemInfo.email"
-              >
-                E-Mail
-              </UButton>
-            </Toolbar>
-            <table class="w-full">
-              <tr>
-                <td>Kunde: </td>
-                <td><nuxt-link v-if="itemInfo.customer" :to="`/customers/show/${itemInfo.customer?.id}`">{{itemInfo?.customer?.name}}</nuxt-link></td>
-              </tr>
-              <tr>
-                <td>Lieferant: </td>
-                <td><nuxt-link v-if="itemInfo.vendor" :to="`/customers/show/${itemInfo.vendor?.id}`">{{itemInfo?.vendor?.name}}</nuxt-link></td>
-              </tr>
-              <tr>
-                <td>E-Mail:</td>
-                <td>{{itemInfo.email}}</td>
-              </tr>
-              <tr>
-                <td>Mobil:</td>
-                <td>{{itemInfo.phoneMobile}}</td>
-              </tr>
-              <tr>
-                <td>Festnetz:</td>
-                <td>{{itemInfo.phoneHome}}</td>
-              </tr>
-              <tr>
-                <td>Rolle:</td>
-                <td>{{itemInfo.role}}</td>
-              </tr>
-              <tr>
-                <td>Geburtstag:</td>
-                <td>{{itemInfo.birthday ? dayjs(itemInfo.birthday).format("DD.MM.YYYY") : ""}}</td>
-              </tr>
-              <tr>
-                <td>Notizen:</td>
-                <td>{{itemInfo.notes}}</td>
-              </tr>
-
-            </table>
-          </UCard>
-        </div>
-        <div class="w-1/2">
-          <UCard>
-            <HistoryDisplay
-                type="contact"
-                v-if="itemInfo"
-                :element-id="itemInfo.id"
-            />
-          </UCard>
-        </div>
-      </div>
-    </template>
-  </UTabs>
-  <UForm
-      v-else-if="mode == 'edit' || mode == 'create'"
-      class="p-5"
-  >
-    <UFormGroup
-        label="Anrede:"
-    >
-      <UInput
-          v-model="itemInfo.salutation"
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="Vorname:"
-    >
-      <UInput
-          v-model="itemInfo.firstName"
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="Nachname:"
-    >
-      <UInput
-          v-model="itemInfo.lastName"
-      />
-    </UFormGroup>
-
-    <UFormGroup
-        label="Kunde:"
-    >
-      <USelectMenu
-          v-model="itemInfo.customer"
-          option-attribute="name"
-          value-attribute="id"
-          :options="dataStore.customers"
-          searchable
-          :search-attributes="['name']"
-      >
-        <template #label>
-          {{dataStore.customers.find(customer => customer.id === itemInfo.customer) ? dataStore.customers.find(customer => customer.id === itemInfo.customer).name : "Kunde auswählen"}}
-        </template>
-      </USelectMenu>
-    </UFormGroup>
-    <UFormGroup
-        label="Lieferant:"
-    >
-      <USelectMenu
-          v-model="itemInfo.vendor"
-          option-attribute="name"
-          value-attribute="id"
-          :options="dataStore.vendors"
-          searchable
-          :search-attributes="['name']"
-      >
-        <template #label>
-          {{dataStore.vendors.find(vendor => vendor.id === itemInfo.vendor) ? dataStore.vendors.find(vendor => vendor.id === itemInfo.vendor).name : "Lieferant auswählen"}}
-        </template>
-      </USelectMenu>
-    </UFormGroup>
-
-    <UFormGroup
-        label="Kontakt aktiv:"
-    >
-      <UCheckbox
-          v-model="itemInfo.active"
-      />
-    </UFormGroup>
-
-    <UFormGroup
-        label="E-Mail:"
-    >
-      <UInput
-          v-model="itemInfo.email"
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="Mobil:"
-    >
-      <UInput
-          v-model="itemInfo.phoneMobile"
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="Festnetz:"
-    >
-      <UInput
-          v-model="itemInfo.phoneHome"
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="Rolle:"
-    >
-      <UInput
-          v-model="itemInfo.role"
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="Geburtstag:"
-    >
-      <UPopover :popper="{ placement: 'bottom-start' }">
-        <UButton
-            variant="outline"
-            icon="i-heroicons-calendar-days-20-solid"
-            :label="itemInfo.birthday ? dayjs(itemInfo.birthday).format('DD.MM.YYYY') : 'Datum auswählen'"
-        />
-
-        <template #panel="{ close }">
-          <LazyDatePicker
-              v-model="itemInfo.birthday"
-              mode="date"
-          />
-        </template>
-      </UPopover>
-    </UFormGroup>
-    <UFormGroup
-        label="Berechtige Benutzer:"
-    >
-      <USelectMenu
-          v-model="itemInfo.profiles"
-          :options="profileStore.profiles"
-          option-attribute="fullName"
-          value-attribute="id"
-          searchable
-          multiple
-          :search-attributes="['fullName']"
-      >
-        <template #label>
-          {{itemInfo.profiles.length > 0 ? itemInfo.profiles.map(i => profileStore.getProfileById(i).fullName).join(", ") : "Kein Benutzer ausgewählt"}}
-        </template>
-      </USelectMenu>
-    </UFormGroup>
-    <UFormGroup
-        label="Notizen:"
-    >
-      <UTextarea
-          v-model="itemInfo.notes"
-      />
-    </UFormGroup>
-
-  </UForm>
-</template>
-
-<style scoped>
-td {
-  border-bottom: 1px solid lightgrey;
-  vertical-align: top;
-  padding-bottom: 0.15em;
-  padding-top: 0.15em;
-}
-</style>
\ No newline at end of file
diff --git a/pages/contacts/index.vue b/pages/contacts/index.vue
deleted file mode 100644
index a1cf1aa..0000000
--- a/pages/contacts/index.vue
+++ /dev/null
@@ -1,26 +0,0 @@
-<template>
-  <EntityList
-      type="contacts"
-      :items="items"
-  ></EntityList>
-</template>
-
-<script setup>
-import EntityList from "~/components/EntityList.vue";
-
-definePageMeta({
-  middleware: "auth"
-})
-
-const items = ref([])
-
-const setupPage = async () => {
-  items.value = await useSupabaseSelect("contacts","*, customer(name), vendor(name)")
-}
-
-setupPage()
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/pages/createDocument/edit/[[id]].vue b/pages/createDocument/edit/[[id]].vue
index 2f8b5b4..1e0cf78 100644
--- a/pages/createDocument/edit/[[id]].vue
+++ b/pages/createDocument/edit/[[id]].vue
@@ -11,11 +11,10 @@ const route = useRoute()
 const router = useRouter()
 const supabase = useSupabaseClient()
 const modal = useModal()
+const auth = useAuthStore()
+
 
 
-definePageMeta({
-  middleware: "auth"
-})
 
 
 const itemInfo = ref({
@@ -37,16 +36,14 @@ const itemInfo = ref({
   deliveryDateEnd: null,
   deliveryDateType: "Lieferdatum",
   dateOfPerformance: null,
-  paymentDays: profileStore.ownTenant.standardPaymentDays,
+  paymentDays: auth.activeTenantData.standardPaymentDays,
   customSurchargePercentage: 0,
   createdBy: profileStore.activeProfile.id,
   title: null,
   description: null,
   startText: null,
   endText: null,
-  rows: [
-
-  ],
+  rows: [],
   contactPerson: profileStore.activeProfile.id,
   contactPersonName: null,
   contactTel: null,
@@ -63,7 +60,7 @@ const itemInfo = ref({
   usedAdvanceInvoices: []
 })
 
-console.log(profileStore.ownTenant)
+console.log(auth.activeTenantData)
 
 const letterheads = ref([])
 const createddocuments = ref([])
@@ -78,61 +75,66 @@ const selectedServicecategorie = ref(null)
 const customers = ref([])
 const contacts = ref([])
 const texttemplates = ref([])
+const units = ref([])
+const tenantUsers = ref([])
 
 
 const loaded = ref(false)
 const setupPage = async () => {
 
 
-  letterheads.value = (await useSupabaseSelect("letterheads","*")).filter(i => i.documentTypes.length === 0 || i.documentTypes.includes(itemInfo.value.type))
-  createddocuments.value = (await useSupabaseSelect("createddocuments","*"))
-  projects.value = (await useSupabaseSelect("projects","*"))
-  plants.value = (await useSupabaseSelect("plants","*"))
-  services.value = (await useSupabaseSelect("services","*"))
-  servicecategories.value = (await useSupabaseSelect("servicecategories","*"))
-  products.value = (await useSupabaseSelect("products","*"))
-  productcategories.value = (await useSupabaseSelect("productcategories","*"))
-  customers.value = (await useSupabaseSelect("customers","*","customerNumber"))
-  contacts.value = (await useSupabaseSelect("contacts","*"))
-  texttemplates.value = (await useSupabaseSelect("texttemplates","*"))
-  if(productcategories.value.length > 0) selectedProductcategorie.value = productcategories.value[0].id
-  if(servicecategories.value.length > 0) selectedServicecategorie.value = servicecategories.value[0].id
+  letterheads.value = (await useEntities("letterheads").select("*")).filter(i => i.documentTypes.length === 0 || i.documentTypes.includes(itemInfo.value.type))
+  createddocuments.value = await useEntities("createddocuments").select("*")
+  projects.value = await useEntities("projects").select("*")
+  plants.value = await useEntities("plants").select("*")
+  services.value = await useEntities("services").select("*")
+  servicecategories.value = await useEntities("servicecategories").select("*")
+  products.value = await useEntities("products").select("*")
+  productcategories.value = await useEntities("productcategories").select("*")
+  customers.value = await useEntities("customers").select("*", "customerNumber")
+  contacts.value = await useEntities("contacts").select("*")
+  texttemplates.value = await useEntities("texttemplates").select("*")
+  units.value = await useEntities("units").selectSpecial("*")
+  tenantUsers.value = (await useNuxtApp().$api(`/api/tenant/users`, {
+    method: "GET"
+  })).users
+  if (productcategories.value.length > 0) selectedProductcategorie.value = productcategories.value[0].id
+  if (servicecategories.value.length > 0) selectedServicecategorie.value = servicecategories.value[0].id
 
-  if(route.params) {
-    if(route.params.id) {
-      itemInfo.value = await useSupabaseSelectSingle("createddocuments", route.params.id)
+  if (route.params) {
+    if (route.params.id) {
+      console.log(route.params)
+      itemInfo.value = await useEntities("createddocuments").selectSingle(route.params.id)
       checkCompatibilityWithInputPrice()
     }
 
-    if(itemInfo.value.project) await checkForOpenAdvanceInvoices()
 
-    if(!itemInfo.value.deliveryDateType) itemInfo.value.deliveryDateType = "Lieferdatum"
+    if (!itemInfo.value.deliveryDateType) itemInfo.value.deliveryDateType = "Lieferdatum"
 
-    if(itemInfo.value.rows.find(i => i.agriculture)) {
+    if (itemInfo.value.rows.find(i => i.agriculture)) {
       processDieselPosition()
     }
 
   }
 
-  if(route.query) {
-    if(route.query.type) itemInfo.value.type = route.query.type
+  if (route.query) {
+    if (route.query.type) itemInfo.value.type = route.query.type
 
-    if(!itemInfo.value.startText && !itemInfo.value.endText) {
+    if (!itemInfo.value.startText && !itemInfo.value.endText) {
       setDocumentTypeConfig(true)
     } else {
       setDocumentTypeConfig(false)
     }
 
 
-
     setContactPersonData()
 
-    if(route.query.linkedDocuments) {
+    if (route.query.linkedDocuments) {
 
       console.log(route.query.loadMode)
 
-      if(route.query.loadMode === "deliveryNotes") {
-        let linkedDocuments = (await supabase.from("createddocuments").select().in("id",JSON.parse(route.query.linkedDocuments))).data
+      if (route.query.loadMode === "deliveryNotes") {
+        let linkedDocuments = (await supabase.from("createddocuments").select().in("id", JSON.parse(route.query.linkedDocuments))).data
 
         //TODO: Implement Checking for Same Customer, Contact and Project
 
@@ -148,15 +150,15 @@ const setupPage = async () => {
         linkedDocuments.forEach(doc => {
           let lastId = 0
           itemInfo.value.rows.forEach(row => {
-            if(row.id > lastId) lastId = row.id
+            if (row.id > lastId) lastId = row.id
           })
 
-          if(dayjs(doc.documentDate).isBefore(firstDate) || !firstDate) firstDate = doc.documentDate
-          if(dayjs(doc.documentDate).isAfter(lastDate) || !lastDate) lastDate = doc.documentDate
+          if (dayjs(doc.documentDate).isBefore(firstDate) || !firstDate) firstDate = doc.documentDate
+          if (dayjs(doc.documentDate).isAfter(lastDate) || !lastDate) lastDate = doc.documentDate
 
           itemInfo.value.rows.push(...[
             {
-              id:uuidv4(),
+              id: uuidv4(),
               mode: "title",
               text: `${doc.title} vom ${dayjs(doc.documentDate).format("DD.MM.YYYY")}`
             },
@@ -181,7 +183,7 @@ const setupPage = async () => {
 
         console.log(linkedDocuments)
 
-        if(linkedDocuments.find(i => i.rows.find( x => x.agriculture.dieselUsage))){
+        if (linkedDocuments.find(i => i.rows.find(x => x.agriculture.dieselUsage))) {
           console.log("has diesel")
 
           //Remove Existing Total Diesel Pos
@@ -191,7 +193,7 @@ const setupPage = async () => {
 
           //Add Total Title
           itemInfo.value.rows.push({
-            id:uuidv4(),
+            id: uuidv4(),
             mode: "title",
             text: "Allgemein"
           })
@@ -199,8 +201,8 @@ const setupPage = async () => {
           processDieselPosition()
         }
 
-      } else if(route.query.loadMode === "finalInvoice") {
-        let linkedDocuments = (await supabase.from("createddocuments").select().in("id",JSON.parse(route.query.linkedDocuments))).data
+      } else if (route.query.loadMode === "finalInvoice") {
+        let linkedDocuments = (await supabase.from("createddocuments").select().in("id", JSON.parse(route.query.linkedDocuments))).data
 
         //TODO: Implement Checking for Same Customer, Contact and Project
 
@@ -213,7 +215,7 @@ const setupPage = async () => {
         setCustomerData()
 
         for await (const doc of linkedDocuments.filter(i => i.type === "confirmationOrders")) {
-          let linkedDocument = await useSupabaseSelectSingle("createddocuments",doc.id)
+          let linkedDocument = await useEntities("createddocuments").selectSingle(doc.id)
 
           itemInfo.value.rows.push({
             mode: "title",
@@ -224,7 +226,7 @@ const setupPage = async () => {
         }
 
         for await (const doc of linkedDocuments.filter(i => i.type === "quotes")) {
-          let linkedDocument = await useSupabaseSelectSingle("createddocuments",doc.id)
+          let linkedDocument = await useEntities("createddocuments").selectSingle(doc.id)
 
           itemInfo.value.rows.push({
             mode: "title",
@@ -247,7 +249,7 @@ const setupPage = async () => {
             taxPercent: 19, // TODO TAX PERCENTAGE
             discountPercent: 0,
             unit: 10,
-            inputPrice: useSum().getCreatedDocumentSumDetailed(doc).totalNet *-1,
+            inputPrice: useSum().getCreatedDocumentSumDetailed(doc).totalNet * -1,
             linkedEntitys: [
               {
                 type: "createddocuments",
@@ -266,54 +268,49 @@ const setupPage = async () => {
         setPosNumbers()
 
 
-
-
       }
 
 
-
-
     }
 
-    if(route.query.linkedDocument) {
+    if (route.query.linkedDocument) {
       itemInfo.value.linkedDocument = route.query.linkedDocument
-      let linkedDocument = await useSupabaseSelectSingle("createddocuments",itemInfo.value.linkedDocument)
+      let linkedDocument = await useEntities("createddocuments").selectSingle(itemInfo.value.linkedDocument)
 
-
-      if(route.query.optionsToImport) {
+      if (route.query.optionsToImport) {
         //Import only true
         let optionsToImport = JSON.parse(route.query.optionsToImport)
 
         console.log(optionsToImport)
         console.log(linkedDocument)
 
-        if(optionsToImport.taxType) itemInfo.value.taxType = linkedDocument.taxType
-        if(optionsToImport.customer) itemInfo.value.customer = linkedDocument.customer
-        if(optionsToImport.letterhead) itemInfo.value.letterhead = linkedDocument.letterhead
-        if(optionsToImport.contact) itemInfo.value.contact = linkedDocument.contact
-        if(optionsToImport.deliveryDateType) itemInfo.value.deliveryDateType = linkedDocument.deliveryDateType
-        if(optionsToImport.deliveryDate) itemInfo.value.deliveryDate = linkedDocument.deliveryDate
-        if(optionsToImport.deliveryDateEnd) itemInfo.value.deliveryDateEnd = linkedDocument.deliveryDateEnd
-        if(optionsToImport.documentDate) itemInfo.value.documentDate = linkedDocument.documentDate
-        if(optionsToImport.paymentDays) itemInfo.value.paymentDays = linkedDocument.paymentDays
-        if(optionsToImport.customSurchargePercentage) itemInfo.value.customSurchargePercentage = linkedDocument.customSurchargePercentage
-        if(optionsToImport.contactPerson) itemInfo.value.contactPerson = linkedDocument.contactPerson
-        if(optionsToImport.plant) itemInfo.value.plant = linkedDocument.plant
-        if(optionsToImport.project) itemInfo.value.project = linkedDocument.project
-        if(optionsToImport.title) itemInfo.value.title = linkedDocument.title
-        if(optionsToImport.description) itemInfo.value.description = linkedDocument.description
-        if(optionsToImport.startText) itemInfo.value.startText = linkedDocument.startText
-        if(optionsToImport.rows) itemInfo.value.rows = linkedDocument.rows
-        if(optionsToImport.endText) itemInfo.value.endText = linkedDocument.endText
+        if (optionsToImport.taxType) itemInfo.value.taxType = linkedDocument.taxType
+        if (optionsToImport.customer) itemInfo.value.customer = linkedDocument.customer
+        if (optionsToImport.letterhead) itemInfo.value.letterhead = linkedDocument.letterhead
+        if (optionsToImport.contact) itemInfo.value.contact = linkedDocument.contact
+        if (optionsToImport.deliveryDateType) itemInfo.value.deliveryDateType = linkedDocument.deliveryDateType
+        if (optionsToImport.deliveryDate) itemInfo.value.deliveryDate = linkedDocument.deliveryDate
+        if (optionsToImport.deliveryDateEnd) itemInfo.value.deliveryDateEnd = linkedDocument.deliveryDateEnd
+        if (optionsToImport.documentDate) itemInfo.value.documentDate = linkedDocument.documentDate
+        if (optionsToImport.paymentDays) itemInfo.value.paymentDays = linkedDocument.paymentDays
+        if (optionsToImport.customSurchargePercentage) itemInfo.value.customSurchargePercentage = linkedDocument.customSurchargePercentage
+        if (optionsToImport.contactPerson) itemInfo.value.contactPerson = linkedDocument.contactPerson
+        if (optionsToImport.plant) itemInfo.value.plant = linkedDocument.plant
+        if (optionsToImport.project) itemInfo.value.project = linkedDocument.project
+        if (optionsToImport.title) itemInfo.value.title = linkedDocument.title
+        if (optionsToImport.description) itemInfo.value.description = linkedDocument.description
+        if (optionsToImport.startText) itemInfo.value.startText = linkedDocument.startText
+        if (optionsToImport.rows) itemInfo.value.rows = linkedDocument.rows
+        if (optionsToImport.endText) itemInfo.value.endText = linkedDocument.endText
 
       } else {
         // Import all
 
-        if(process.dev) console.log(linkedDocument)
+        if (process.dev) console.log(linkedDocument)
 
         itemInfo.value.taxType = linkedDocument.taxType
         itemInfo.value.customer = linkedDocument.customer
-        await setCustomerData(null,true)
+        await setCustomerData(null, true)
         itemInfo.value.letterhead = linkedDocument.letterhead
         itemInfo.value.contact = linkedDocument.contact
         itemInfo.value.deliveryDateType = linkedDocument.deliveryDateType
@@ -333,10 +330,9 @@ const setupPage = async () => {
       }
 
 
-
       checkCompatibilityWithInputPrice()
 
-      if(route.query.loadMode === "storno") {
+      if (route.query.loadMode === "storno") {
         itemInfo.value.rows.forEach(row => {
           row.price = row.price * -1
         })
@@ -345,7 +341,6 @@ const setupPage = async () => {
 
         itemInfo.value.usedAdvanceInvoices = linkedDocument.usedAdvanceInvoices
 
-        checkForOpenAdvanceInvoices()
 
         itemInfo.value.description = `Stornorechnung zu Rechnung ${linkedDocument.documentNumber} vom ${dayjs(linkedDocument.documentDate).format('DD.MM.YYYY')}`
 
@@ -358,69 +353,52 @@ const setupPage = async () => {
 
     }
 
-    if(route.query.project) {
+    if (route.query.project) {
       itemInfo.value.project = Number(route.query.project)
 
-      let project = await useSupabaseSelectSingle("projects",itemInfo.value.project)
+      let project = await useEntities("projects").selectSingle(itemInfo.value.project)
 
-      if(!itemInfo.value.description){
+      if (!itemInfo.value.description) {
         itemInfo.value.description = project.customerRef
       }
 
-      checkForOpenAdvanceInvoices()
 
     }
 
-    if(route.query.plant) {
+    if (route.query.plant) {
       itemInfo.value.plant = Number(route.query.plant)
     }
 
-    if(route.query.contact) itemInfo.value.contact = Number(route.query.contact)
-    if(route.query.customer) {
+    if (route.query.contact) itemInfo.value.contact = Number(route.query.contact)
+    if (route.query.customer) {
       itemInfo.value.customer = Number(route.query.customer)
       setCustomerData()
     }
   }
 
-  //if(itemInfo.value.project) checkForOpenAdvanceInvoices()
 
   loaded.value = true
 
 }
 
 setupPage()
-const openAdvanceInvoices = ref([])
-const checkForOpenAdvanceInvoices = async () => {
-  console.log("Check for Open Advance Invoices")
-  const {data} = await supabase.from("createddocuments").select().eq("project", itemInfo.value.project).eq("advanceInvoiceResolved", false).eq("type","advanceInvoices")
-  const {data: usedAdvanceInvoices} = await supabase.from("createddocuments").select().in("id", itemInfo.value.usedAdvanceInvoices)
-
-  console.log(data)
-
-  openAdvanceInvoices.value =  [...data, ...usedAdvanceInvoices.filter(i => !data.find(x => x.id === i.id))]
-
-}
-
-const addAdvanceInvoiceToInvoice = (advanceInvoice) => {
-  itemInfo.value.usedAdvanceInvoices.push(advanceInvoice)
-}
 
 const setDocumentTypeConfig = (withTexts = false) => {
-  if(itemInfo.value.type === "invoices" ||itemInfo.value.type === "advanceInvoices" || itemInfo.value.type === "serialInvoices"|| itemInfo.value.type === "cancellationInvoices") {
+  if (itemInfo.value.type === "invoices" || itemInfo.value.type === "advanceInvoices" || itemInfo.value.type === "serialInvoices" || itemInfo.value.type === "cancellationInvoices") {
     itemInfo.value.documentNumberTitle = "Rechnungsnummer"
     itemInfo.value.title = `Rechnung-Nr. ${itemInfo.value.documentNumber ? itemInfo.value.documentNumber : "XXXX"}`
-  } else if(itemInfo.value.type === "quotes") {
+  } else if (itemInfo.value.type === "quotes") {
     itemInfo.value.documentNumberTitle = "Angebotsnummer"
     itemInfo.value.title = `Angebot-Nr. ${itemInfo.value.documentNumber ? itemInfo.value.documentNumber : "XXXX"}`
-  } else if(itemInfo.value.type === "deliveryNotes") {
+  } else if (itemInfo.value.type === "deliveryNotes") {
     itemInfo.value.documentNumberTitle = "Lieferscheinnummer"
     itemInfo.value.title = `Lieferschein-Nr. ${itemInfo.value.documentNumber ? itemInfo.value.documentNumber : "XXXX"}`
-  } else if(itemInfo.value.type === "confirmationOrders") {
+  } else if (itemInfo.value.type === "confirmationOrders") {
     itemInfo.value.documentNumberTitle = "Auftragsbestätigungsnr."
     itemInfo.value.title = `Auftragsbestätigung-Nr. ${itemInfo.value.documentNumber ? itemInfo.value.documentNumber : "XXXX"}`
   }
 
-  if(withTexts) {
+  if (withTexts) {
     itemInfo.value.startText = getTextTemplateByType(itemInfo.value.type).find(i => i.default && i.pos === "startText").text
     itemInfo.value.endText = getTextTemplateByType(itemInfo.value.type).find(i => i.default && i.pos === "endText").text
     //itemInfo.value.startText = texttemplates.value.find(i => i.documentType === itemInfo.value.type && i.default && i.pos === "startText").text
@@ -429,7 +407,7 @@ const setDocumentTypeConfig = (withTexts = false) => {
 
   itemInfo.value.letterhead = letterheads.value[0].id
 
-  if(itemInfo.value.type === "advanceInvoices" && !itemInfo.value.rows.find(i => i.text === "Abschlagszahlung")) {
+  if (itemInfo.value.type === "advanceInvoices" && !itemInfo.value.rows.find(i => i.text === "Abschlagszahlung")) {
 
 
     itemInfo.value.rows.push({
@@ -450,11 +428,11 @@ const setDocumentTypeConfig = (withTexts = false) => {
 }
 
 const setTaxType = () => {
-  if(itemInfo.value.taxType === "19 UStG") {
+  if (itemInfo.value.taxType === "19 UStG") {
     itemInfo.value.rows.forEach(row => {
       row.taxPercent = 0
     })
-  } else if(itemInfo.value.taxType === "12.3 UStG") {
+  } else if (itemInfo.value.taxType === "12.3 UStG") {
     itemInfo.value.rows.forEach(row => {
       row.taxPercent = 0
     })
@@ -463,30 +441,30 @@ const setTaxType = () => {
 
 const setCustomerData = async (customerId, loadOnlyAdress = false) => {
 
-  if(customerId){
+  if (customerId) {
     itemInfo.value.customer = customerId
   }
 
-  customers.value = await useSupabaseSelect("customers")
+  customers.value = await useEntities("customers").select()
 
 
   let customer = customers.value.find(i => i.id === itemInfo.value.customer)
   console.log(customer)
   itemInfo.value.contact = null
-  if(customer) {
+  if (customer) {
     itemInfo.value.address.street = customer.infoData.street
     itemInfo.value.address.zip = customer.infoData.zip
     itemInfo.value.address.city = customer.infoData.city
     itemInfo.value.address.special = customer.infoData.special
 
-    if(!loadOnlyAdress && customer.customPaymentDays) itemInfo.value.paymentDays = customer.customPaymentDays
+    if (!loadOnlyAdress && customer.customPaymentDays) itemInfo.value.paymentDays = customer.customPaymentDays
 
-    if(!loadOnlyAdress && customer.customSurchargePercentage) {
+    if (!loadOnlyAdress && customer.customSurchargePercentage) {
       itemInfo.value.customSurchargePercentage = customer.customSurchargePercentage
       updateCustomSurcharge()
     }
 
-    if(!loadOnlyAdress && contacts.value.filter(i => i.customer === itemInfo.value.customer).length === 1) {
+    if (!loadOnlyAdress && contacts.value.filter(i => i.customer === itemInfo.value.customer).length === 1) {
       itemInfo.value.contact = contacts.value.filter(i => i.customer === itemInfo.value.customer)[0].id
     }
 
@@ -496,10 +474,12 @@ const setCustomerData = async (customerId, loadOnlyAdress = false) => {
 }
 
 const setContactPersonData = async () => {
-  //console.log(itemInfo.value.contactPerson)
-  let profile = await useSupabaseSelectSingle("profiles",itemInfo.value.contactPerson, '*')
+  //console.log(itemInfo.value.contactPerson) //TODO: BACKEND CHANGE Set Profile
+  let profile = (await useNuxtApp().$api(`/api/user/${itemInfo.value.created_by}`, {
+    method: "GET"
+  })).profile
 
-  itemInfo.value.contactPersonName = profile.fullName
+  itemInfo.value.contactPersonName = auth.profile.full_name
   itemInfo.value.contactTel = profile.mobileTel || profile.fixedTel || ""
   itemInfo.value.contactEMail = profile.email
 
@@ -512,17 +492,17 @@ const advanceInvoiceData = ref({
   part: 0
 })
 const importPositions = () => {
-  if(itemInfo.value.type === 'advanceInvoices') {
-    if(advanceInvoiceData.value.totalSumNet !== 0 && advanceInvoiceData.value.partPerPecentage !== 0 && advanceInvoiceData.value.part !== 0) {
+  if (itemInfo.value.type === 'advanceInvoices') {
+    if (advanceInvoiceData.value.totalSumNet !== 0 && advanceInvoiceData.value.partPerPecentage !== 0 && advanceInvoiceData.value.part !== 0) {
       showAdvanceInvoiceCalcModal.value = false
 
       let lastId = 0
       itemInfo.value.rows.forEach(row => {
-        if(row.id > lastId) lastId = row.id
+        if (row.id > lastId) lastId = row.id
       })
 
       itemInfo.value.rows.push({
-        id: lastId +1,
+        id: lastId + 1,
         mode: "free",
         text: "Abschlagszahlung",
         quantity: 1,
@@ -540,27 +520,27 @@ const importPositions = () => {
 }
 
 const getRowAmount = (row) => {
-  return String(Number(Number(row.quantity) * Number(row.price) * (1 - Number(row.discountPercent) /100) ).toFixed(2)).replace('.',',')
+  return String(Number(Number(row.quantity) * Number(row.price) * (1 - Number(row.discountPercent) / 100)).toFixed(2)).replace('.', ',')
 }
 
 const getRowAmountUndiscounted = (row) => {
-  return String(Number(Number(row.quantity) * Number(row.price)).toFixed(2)).replace('.',',')
+  return String(Number(Number(row.quantity) * Number(row.price)).toFixed(2)).replace('.', ',')
 }
 
 const addPosition = (mode) => {
 
   let lastId = 0
   itemInfo.value.rows.forEach(row => {
-    if(row.id > lastId) lastId = row.id
+    if (row.id > lastId) lastId = row.id
   })
 
   let taxPercentage = 19
 
-  if(['13b UStG','19 UStG','12.3 UStG'].includes(itemInfo.value.taxType)) {
+  if (['13b UStG', '19 UStG', '12.3 UStG'].includes(itemInfo.value.taxType)) {
     taxPercentage = 0
   }
 
-  if(mode === 'free'){
+  if (mode === 'free') {
     let rowData = {
       id: uuidv4(),
       mode: "free",
@@ -574,9 +554,9 @@ const addPosition = (mode) => {
       linkedEntitys: []
     }
 
-    itemInfo.value.rows.push({...rowData, ...profileStore.ownTenant.extraModules.includes("agriculture") ? {agriculture: {}}: {}})
+    itemInfo.value.rows.push({...rowData, ...auth.activeTenantData.extraModules.includes("agriculture") ? {agriculture: {}} : {}})
 
-  } else if(mode === 'normal'){
+  } else if (mode === 'normal') {
     itemInfo.value.rows.push({
       id: uuidv4(),
       mode: "normal",
@@ -588,7 +568,7 @@ const addPosition = (mode) => {
       unit: 1,
       linkedEntitys: []
     })
-  } else if(mode === 'service'){
+  } else if (mode === 'service') {
     let rowData = {
       id: uuidv4(),
       mode: "service",
@@ -602,20 +582,20 @@ const addPosition = (mode) => {
     }
 
     //Push Agriculture Holder only if Module is activated
-    itemInfo.value.rows.push({...rowData, ...profileStore.ownTenant.extraModules.includes("agriculture") ? {agriculture: {}}: {}})
-  } else if(mode === "pagebreak") {
+    itemInfo.value.rows.push({...rowData, ...auth.activeTenantData.extraModules.includes("agriculture") ? {agriculture: {}} : {}})
+  } else if (mode === "pagebreak") {
     itemInfo.value.rows.push({
       id: uuidv4(),
       mode: "pagebreak",
       linkedEntitys: []
     })
-  } else if(mode === "title") {
+  } else if (mode === "title") {
     itemInfo.value.rows.push({
       id: uuidv4(),
       mode: "title",
       linkedEntitys: []
     })
-  } else if(mode === "text") {
+  } else if (mode === "text") {
     itemInfo.value.rows.push({
       id: uuidv4(),
       mode: "text",
@@ -636,69 +616,115 @@ const removePosition = (id) => {
 }
 
 const findDocumentErrors = computed(() => {
-    let errors = []
+  let errors = []
 
-    if(itemInfo.value.customer === null) errors.push({message: "Es ist kein Kunde ausgewählt", type: "breaking"})
-    if(itemInfo.value.contact === null) errors.push({message: "Es ist kein Kontakt ausgewählt", type: "info"})
-    if(itemInfo.value.letterhead === null) errors.push({message: "Es ist kein Briefpapier ausgewählt", type: "breaking"})
-    if(itemInfo.value.address.street === null) errors.push({message: "Es ist keine Straße im Adressat angegeben", type: "breaking"})
-    if(itemInfo.value.address.zip === null) errors.push({message: "Es ist keine Postleitzahl im Adressat angegeben", type: "breaking"})
-    if(itemInfo.value.address.city === null) errors.push({message: "Es ist keine Stadt im Adressat angegeben", type: "breaking"})
+  if (itemInfo.value.customer === null) errors.push({message: "Es ist kein Kunde ausgewählt", type: "breaking"})
+  if (itemInfo.value.contact === null) errors.push({message: "Es ist kein Kontakt ausgewählt", type: "info"})
+  if (itemInfo.value.letterhead === null) errors.push({message: "Es ist kein Briefpapier ausgewählt", type: "breaking"})
+  if (itemInfo.value.address.street === null) errors.push({
+    message: "Es ist keine Straße im Adressat angegeben",
+    type: "breaking"
+  })
+  if (itemInfo.value.address.zip === null) errors.push({
+    message: "Es ist keine Postleitzahl im Adressat angegeben",
+    type: "breaking"
+  })
+  if (itemInfo.value.address.city === null) errors.push({
+    message: "Es ist keine Stadt im Adressat angegeben",
+    type: "breaking"
+  })
 
-    if(itemInfo.value.project === null) errors.push({message: "Es ist kein Projekt ausgewählt", type: "info"})
+  if (itemInfo.value.project === null) errors.push({message: "Es ist kein Projekt ausgewählt", type: "info"})
 
-    if(['Lieferzeitraum','Leistungszeitraum'].includes(itemInfo.value.deliveryDateType) && itemInfo.value.type !== "serialInvoices") {
-      if(itemInfo.value.deliveryDateEnd === null) errors.push({message: `Es ist kein Enddatum für den ${itemInfo.value.deliveryDateType} angegeben`, type: "breaking"})
-    }
+  if (['Lieferzeitraum', 'Leistungszeitraum'].includes(itemInfo.value.deliveryDateType) && itemInfo.value.type !== "serialInvoices") {
+    if (itemInfo.value.deliveryDateEnd === null) errors.push({
+      message: `Es ist kein Enddatum für den ${itemInfo.value.deliveryDateType} angegeben`,
+      type: "breaking"
+    })
+  }
 
 
-    if(itemInfo.value.rows.length === 0) {
-      errors.push({message: "Es sind keine Positionen angegeben", type: "breaking"})
-    } else {
-      itemInfo.value.rows.forEach(row => {
+  if (itemInfo.value.rows.length === 0) {
+    errors.push({message: "Es sind keine Positionen angegeben", type: "breaking"})
+  } else {
+    itemInfo.value.rows.forEach(row => {
 
-        if(itemInfo.value.type !== "quotes" && row.optional) {
-          errors.push({message: `Position ${row.pos} ist als Optional markiert. Dies wird nur in Angeboten unterstützt.`, type: "breaking"})
-        }
+      if (itemInfo.value.type !== "quotes" && row.optional) {
+        errors.push({
+          message: `Position ${row.pos} ist als Optional markiert. Dies wird nur in Angeboten unterstützt.`,
+          type: "breaking"
+        })
+      }
 
-        if(itemInfo.value.type !== "quotes" && row.alternative) {
-          errors.push({message: `Position ${row.pos} ist als Alternativ markiert. Dies wird nur in Angeboten unterstützt.`, type: "breaking"})
-        }
-
-        if(row.mode === "normal" && !row.product) errors.push({message: `In Position ${row.pos} ist kein Artikel ausgewählt`, type: "breaking"})
-        if(row.mode === "service" && !row.service) errors.push({message: `In Position ${row.pos} ist keine Leistung ausgewählt`, type: "breaking"})
-        if(row.mode === "title" && !row.text) errors.push({message: `In Position ${row.pos} ist kein Titel hinterlegt`, type: "breaking"})
-        //if(row.mode === "text" && !row.text) errors.push({message: `In einer Freitext Position ist kein Titel hinterlegt`, type: "breaking"})
-        if(row.mode === "free" && !row.text) errors.push({message: `In einer freien Position ist kein Titel hinterlegt`, type: "breaking"})
-
-        if(["normal","service","free"].includes(row.mode)){
-
-          if(!row.taxPercent && typeof row.taxPercent !== "number") errors.push({message: `In Position ${row.pos} ist kein Steuersatz hinterlegt`, type: "breaking"})
-          if(!row.price && typeof row.price !== "number") errors.push({message: `In Position ${row.pos} ist kein Preis hinterlegt`, type: "breaking"})
-          if(!row.unit) errors.push({message: `In Position ${row.pos} ist keine Einheit hinterlegt`, type: "breaking"})
-
-        }
-
-        if(row.agriculture){
-          if(row.agriculture.dieselUsage && (!row.agriculture.dieselPrice && typeof row.agriculture.dieselPrice !== "number")) {
-            errors.push({message: `In Position ${row.pos} ist kein Dieselpreis hinterlegt`, type: "breaking"})
-          } else if(row.agriculture.dieselUsage && row.agriculture.dieselPrice === 0) {
-            errors.push({message: `In Position ${row.pos} ist 0,00 € als Dieselpreis hinterlegt`, type: "info"})
-          }
-        }
+      if (itemInfo.value.type !== "quotes" && row.alternative) {
+        errors.push({
+          message: `Position ${row.pos} ist als Alternativ markiert. Dies wird nur in Angeboten unterstützt.`,
+          type: "breaking"
+        })
+      }
 
+      if (row.mode === "normal" && !row.product) errors.push({
+        message: `In Position ${row.pos} ist kein Artikel ausgewählt`,
+        type: "breaking"
       })
-    }
+      if (row.mode === "service" && !row.service) errors.push({
+        message: `In Position ${row.pos} ist keine Leistung ausgewählt`,
+        type: "breaking"
+      })
+      if (row.mode === "title" && !row.text) errors.push({
+        message: `In Position ${row.pos} ist kein Titel hinterlegt`,
+        type: "breaking"
+      })
+      //if(row.mode === "text" && !row.text) errors.push({message: `In einer Freitext Position ist kein Titel hinterlegt`, type: "breaking"})
+      if (row.mode === "free" && !row.text) errors.push({
+        message: `In einer freien Position ist kein Titel hinterlegt`,
+        type: "breaking"
+      })
+
+      if (["normal", "service", "free"].includes(row.mode)) {
+
+        if (!row.taxPercent && typeof row.taxPercent !== "number") errors.push({
+          message: `In Position ${row.pos} ist kein Steuersatz hinterlegt`,
+          type: "breaking"
+        })
+        if (!row.price && typeof row.price !== "number") errors.push({
+          message: `In Position ${row.pos} ist kein Preis hinterlegt`,
+          type: "breaking"
+        })
+        if (!row.unit) errors.push({message: `In Position ${row.pos} ist keine Einheit hinterlegt`, type: "breaking"})
+
+      }
+
+      if (row.agriculture) {
+        if (row.agriculture.dieselUsage && (!row.agriculture.dieselPrice && typeof row.agriculture.dieselPrice !== "number")) {
+          errors.push({message: `In Position ${row.pos} ist kein Dieselpreis hinterlegt`, type: "breaking"})
+        } else if (row.agriculture.dieselUsage && row.agriculture.dieselPrice === 0) {
+          errors.push({message: `In Position ${row.pos} ist 0,00 € als Dieselpreis hinterlegt`, type: "info"})
+        }
+      }
+
+    })
+  }
 
 
-
-
-    if(itemInfo.value.type === "serialInvoices") {
-      if(!itemInfo.value.serialConfig.intervall) errors.push({message: `Kein Intervall für die Ausführung festgelegt`, type: "breaking"})
-      if(!itemInfo.value.serialConfig.dateDirection) errors.push({message: `Kein Richtung für die Datierung festgelegt`, type: "breaking"})
-      if(!itemInfo.value.serialConfig.firstExecution) errors.push({message: `Kein Datum für die erste Ausführung festgelegt`, type: "breaking"})
-      if(!itemInfo.value.serialConfig.executionUntil) errors.push({message: `Kein Datum für die letzte Ausführung festgelegt`, type: "info"})
-    }
+  if (itemInfo.value.type === "serialInvoices") {
+    if (!itemInfo.value.serialConfig.intervall) errors.push({
+      message: `Kein Intervall für die Ausführung festgelegt`,
+      type: "breaking"
+    })
+    if (!itemInfo.value.serialConfig.dateDirection) errors.push({
+      message: `Kein Richtung für die Datierung festgelegt`,
+      type: "breaking"
+    })
+    if (!itemInfo.value.serialConfig.firstExecution) errors.push({
+      message: `Kein Datum für die erste Ausführung festgelegt`,
+      type: "breaking"
+    })
+    if (!itemInfo.value.serialConfig.executionUntil) errors.push({
+      message: `Kein Datum für die letzte Ausführung festgelegt`,
+      type: "info"
+    })
+  }
 
 
   return errors.sort((a) => (a.type === "breaking") ? -1 : 1)
@@ -731,17 +757,17 @@ const documentTotal = computed(() => {
   let totalNet0 = 0
 
   itemInfo.value.rows.filter(i => !i.optional && !i.alternative).forEach(row => {
-    if(!['pagebreak','title','text'].includes(row.mode)){
-      let rowPrice = Number(Number(row.quantity) * Number(row.price) * (1 - Number(row.discountPercent) /100) ).toFixed(3)
+    if (!['pagebreak', 'title', 'text'].includes(row.mode)) {
+      let rowPrice = Number(Number(row.quantity) * Number(row.price) * (1 - Number(row.discountPercent) / 100)).toFixed(3)
       totalNet = totalNet + Number(rowPrice)
 
-      if(row.taxPercent === 19) {
+      if (row.taxPercent === 19) {
         total19 = total19 + Number(rowPrice * 0.19)
         totalNet19 += Number(rowPrice)
-      } else if(row.taxPercent === 7) {
+      } else if (row.taxPercent === 7) {
         total7 = total7 + Number(rowPrice * 0.07)
         totalNet7 += Number(rowPrice)
-      } else if(row.taxPercent === 0) {
+      } else if (row.taxPercent === 0) {
         totalNet0 += Number(rowPrice)
       }
     }
@@ -755,18 +781,18 @@ const documentTotal = computed(() => {
   let transferCounter = 0
 
   itemInfo.value.rows.forEach(row => {
-    if(row.mode === 'title'){
+    if (row.mode === 'title') {
       let title = `${row.pos} - ${row.text}`
       titleSums[title] = 0
       lastTitle = title
 
       //Übertrag berechnen
-      titleSumsTransfer[Object.keys(titleSums)[row.pos-2]] = transferCounter
+      titleSumsTransfer[Object.keys(titleSums)[row.pos - 2]] = transferCounter
 
 
-    } else if(!['pagebreak','text'].includes(row.mode) && lastTitle !== "" && !row.optional && !row.alternative){
-      titleSums[lastTitle] = Number(titleSums[lastTitle]) + Number(Number(row.quantity) * Number(row.price) * (1 - Number(row.discountPercent) /100) )
-      transferCounter += Number(Number(row.quantity) * Number(row.price) * (1 - Number(row.discountPercent) /100) )
+    } else if (!['pagebreak', 'text'].includes(row.mode) && lastTitle !== "" && !row.optional && !row.alternative) {
+      titleSums[lastTitle] = Number(titleSums[lastTitle]) + Number(Number(row.quantity) * Number(row.price) * (1 - Number(row.discountPercent) / 100))
+      transferCounter += Number(Number(row.quantity) * Number(row.price) * (1 - Number(row.discountPercent) / 100))
       console.log(transferCounter)
     }
   })
@@ -774,8 +800,6 @@ const documentTotal = computed(() => {
   console.log(titleSumsTransfer)
 
 
-
-
   let totalGross = Number(totalNet.toFixed(2)) + Number(total19.toFixed(2)) + Number(total7.toFixed(2))
 
   let totalGrossAlreadyPaid = 0
@@ -794,21 +818,14 @@ const documentTotal = computed(() => {
 
   let sumToPay = 0
 
-  if(itemInfo.value.type === "invoices") {
+  if (itemInfo.value.type === "invoices") {
     sumToPay = totalGross - totalGrossAlreadyPaid
-  } else if(itemInfo.value.type === "cancellationInvoices") {
+  } else if (itemInfo.value.type === "cancellationInvoices") {
     sumToPay = totalGross + totalGrossAlreadyPaid
 
   }
 
 
-
-
-
-
-
-
-
   return {
     titleSums: titleSums,
     titleSumsTransfer: titleSumsTransfer,
@@ -838,15 +855,15 @@ const documentReport = computed(() => {
 
 
   itemInfo.value.rows.filter(i => !i.optional && !i.alternative).forEach(row => {
-    if(row.product) {
+    if (row.product) {
       let product = products.value.find(i => i.id === row.product)
 
       totalProductsPurchasePrice += product.purchasePrice * row.quantity
 
-    } else if(row.service) {
+    } else if (row.service) {
       let service = services.value.find(i => i.id === row.service)
 
-      if(service.materialComposition) {
+      if (service.materialComposition) {
         service.materialComposition.forEach(entry => {
           let productData = products.value.find(i => i.id === entry.product)
 
@@ -854,21 +871,20 @@ const documentReport = computed(() => {
         })
       }
 
-      if(service.personalComposition) {
+      if (service.personalComposition) {
         service.personalComposition.forEach(entry => {
           totalHoursFromServices.total += entry.quantity * row.quantity
 
           totalHoursFromServices.totalPurchasePrice += entry.quantity * entry.purchasePrice * row.quantity
           totalHoursSellingPrice += entry.quantity * entry.price * row.quantity
 
-          if(totalHoursFromServices.byName[entry.name]) {
+          if (totalHoursFromServices.byName[entry.name]) {
             totalHoursFromServices.byName[entry.name] += entry.quantity * row.quantity
           } else {
             totalHoursFromServices.byName[entry.name] = entry.quantity * row.quantity
           }
 
 
-
         })
       } else {
         //totalHoursSellingPrice += service.sellingPriceComposed.totalWorker * row.quantity
@@ -901,7 +917,7 @@ const processDieselPosition = () => {
   }
 
   itemInfo.value.rows.forEach(row => {
-    if(row.agriculture && row.agriculture.dieselUsage) {
+    if (row.agriculture && row.agriculture.dieselUsage) {
       console.log(row.agriculture)
       agricultureData.dieselUsageTotal += Number(row.agriculture.dieselUsage)
       agricultureData.dieselPriceTotal += Number(row.agriculture.dieselPrice || 0) * Number(row.agriculture.dieselUsage)
@@ -912,9 +928,9 @@ const processDieselPosition = () => {
   })
   console.log(agricultureData)
 
-  if(agricultureData.dieselUsageTotal !== 0) {
+  if (agricultureData.dieselUsageTotal !== 0) {
 
-    if(itemInfo.value.rows.find(i => i.key === "dieselPos")){
+    if (itemInfo.value.rows.find(i => i.key === "dieselPos")) {
       let existingIndex = itemInfo.value.rows.findIndex(i => i.key === "dieselPos")
 
       itemInfo.value.rows[existingIndex] = {
@@ -934,7 +950,7 @@ const processDieselPosition = () => {
     } else {
       itemInfo.value.rows.push({
         mode: "free",
-        text: `${(agricultureData.dieselUsageTotal).toFixed(2).replace(".",",")} L Diesel`,
+        text: `${(agricultureData.dieselUsageTotal).toFixed(2).replace(".", ",")} L Diesel`,
         quantity: 1,
         unit: 10,
         price: agricultureData.dieselPriceTotal,
@@ -945,7 +961,7 @@ const processDieselPosition = () => {
 
       itemInfo.value.rows.push({
         mode: "free",
-        text: `${(agricultureData.adblueUsageTotal).toFixed(2).replace(".",",")} L AdBlue`,
+        text: `${(agricultureData.adblueUsageTotal).toFixed(2).replace(".", ",")} L AdBlue`,
         quantity: 1,
         unit: 10,
         price: agricultureData.adbluePriceTotal,
@@ -961,15 +977,15 @@ const processDieselPosition = () => {
   itemInfo.value.agriculture = {...itemInfo.value.agriculture, ...agricultureData}
 }
 
-const getDocumentData = () => {
+const getDocumentData = async () => {
 
   let customerData = customers.value.find(i => i.id === itemInfo.value.customer)
-  let contactData = dataStore.getContactById(itemInfo.value.contact)
-  let businessInfo = profileStore.ownTenant.businessInfo
+  let contactData = contacts.value.find(i => i.id === itemInfo.value.contact)
+  let businessInfo = auth.activeTenantData.businessInfo
 
-  if(profileStore.ownTenant.extraModules.includes("agriculture")) {
+  if (auth.activeTenantData.extraModules.includes("agriculture")) {
     itemInfo.value.rows.forEach(row => {
-      if(row.agriculture && row.agriculture.dieselUsage) {
+      if (row.agriculture && row.agriculture.dieselUsage) {
         row.agriculture.description = `${row.agriculture.dieselUsage} L Diesel zu ${renderCurrency(row.agriculture.dieselPrice)}/L verbraucht ${row.description ? "\n" + row.description : ""}`
       }
     })
@@ -977,25 +993,25 @@ const getDocumentData = () => {
 
   let rows = itemInfo.value.rows
 
-  if(itemInfo.value.taxType === "13b UStG" || itemInfo.value.taxType === "19 UStG") {
-      rows = rows.map(row => {
-        return {
-          ...row,
-          taxPercent: 0
-        }
-      })
+  if (itemInfo.value.taxType === "13b UStG" || itemInfo.value.taxType === "19 UStG") {
+    rows = rows.map(row => {
+      return {
+        ...row,
+        taxPercent: 0
+      }
+    })
   }
 
 
   rows = itemInfo.value.rows.map(row => {
 
-    let unit = dataStore.units.find(i => i.id === row.unit)
+    let unit = units.value.find(i => i.id === row.unit)
 
-    if(!['pagebreak','title'].includes(row.mode)){
-      if(row.agriculture && row.agriculture.description) {
+    if (!['pagebreak', 'title'].includes(row.mode)) {
+      if (row.agriculture && row.agriculture.description) {
         console.log("Row has Agri")
         row.descriptionText = row.agriculture.description
-      } else if(row.description) {
+      } else if (row.description) {
         console.log("Row has no Agri")
         row.descriptionText = row.description
       } else {
@@ -1003,18 +1019,18 @@ const getDocumentData = () => {
       }
     }
 
-    if(!['pagebreak','title','text'].includes(row.mode)) {
-      if(row.mode === 'normal') row.text = products.value.find(i => i.id === row.product).name
-      if(row.mode === 'service') row.text = services.value.find(i => i.id === row.service).name
+    if (!['pagebreak', 'title', 'text'].includes(row.mode)) {
+      if (row.mode === 'normal') row.text = products.value.find(i => i.id === row.product).name
+      if (row.mode === 'service') row.text = services.value.find(i => i.id === row.service).name
 
 
       return {
         ...row,
         rowAmount: `${getRowAmount(row)} €`,
-        quantity: String(row.quantity).replace(".",","),
+        quantity: String(row.quantity).replace(".", ","),
         unit: unit.short,
         pos: String(row.pos),
-        price: `${String(row.price.toFixed(2)).replace(".",",")} €`,
+        price: `${String(row.price.toFixed(2)).replace(".", ",")} €`,
         discountText: `(Rabatt: ${row.discountPercent} %)`
       }
     } else {
@@ -1029,27 +1045,29 @@ const getDocumentData = () => {
   const generateContext = (itemInfo, contactData) => {
     return {
       lohnkosten: documentReport.value.totalHoursSellingPrice ? useCurrency(documentReport.value.totalHoursSellingPrice) : null,
-      anrede:(contactData && contactData.salutation) || (customerData && customerData.salutation),
-      titel:(contactData && contactData.title) || (customerData && customerData.title),
-      vorname:(contactData && contactData.firstName) || (customerData && customerData.firstname),
+      anrede: (contactData && contactData.salutation) || (customerData && customerData.salutation),
+      titel: (contactData && contactData.title) || (customerData && customerData.title),
+      vorname: (contactData && contactData.firstName) || (customerData && customerData.firstname),
       nachname: (contactData && contactData.lastName) || (customerData && customerData.lastname),
       kundenname: customerData && customerData.name,
-      zahlungsziel_in_tagen:itemInfo.paymentDays,
+      zahlungsziel_in_tagen: itemInfo.paymentDays,
       diesel_gesamtverbrauch: (itemInfo.agriculture && itemInfo.agriculture.dieselUsageTotal) && itemInfo.agriculture.dieselUsageTotal
     }
   }
 
-  let contactPerson = profileStore.getProfileById(itemInfo.value.contactPerson)
+  let contactPerson = (await useNuxtApp().$api(`/api/user/${itemInfo.value.created_by}`, {
+    method: "GET"
+  })).profile
 
   let returnTitleSums = {}
-  if(Object.keys(documentTotal.value.titleSums).length > 0) {
+  if (Object.keys(documentTotal.value.titleSums).length > 0) {
     Object.keys(documentTotal.value.titleSums).forEach(key => {
       returnTitleSums[key] = renderCurrency(documentTotal.value.titleSums[key])
     })
   }
 
   let returnTitleSumsTransfer = {}
-  if(Object.keys(documentTotal.value.titleSumsTransfer).length > 0) {
+  if (Object.keys(documentTotal.value.titleSumsTransfer).length > 0) {
     Object.keys(documentTotal.value.titleSumsTransfer).forEach(key => {
       returnTitleSumsTransfer[key] = renderCurrency(documentTotal.value.titleSumsTransfer[key])
     })
@@ -1072,12 +1090,12 @@ const getDocumentData = () => {
       zip: itemInfo.value.address.zip || customerData.infoData.zip
     },*/
     recipient: [
-        customerData.name,
-        ... customerData.nameAddition ? [customerData.nameAddition] : [],
-        ... contactData ? [`${contactData.firstName} ${contactData.lastName}`] : [],
-        itemInfo.value.address.street,
-        ... itemInfo.value.address.special ? [itemInfo.value.address.special] : [],
-        `${itemInfo.value.address.zip} ${itemInfo.value.address.city}`,
+      customerData.name,
+      ...customerData.nameAddition ? [customerData.nameAddition] : [],
+      ...contactData ? [`${contactData.firstName} ${contactData.lastName}`] : [],
+      itemInfo.value.address.street,
+      ...itemInfo.value.address.special ? [itemInfo.value.address.special] : [],
+      `${itemInfo.value.address.zip} ${itemInfo.value.address.city}`,
 
     ],
     /*info: {
@@ -1098,16 +1116,16 @@ const getDocumentData = () => {
       {
         label: itemInfo.value.documentNumberTitle,
         content: itemInfo.value.documentNumber || "XXXX",
-      },{
+      }, {
         label: "Kundennummer",
         content: customerData.customerNumber,
-      },{
+      }, {
         label: "Belegdatum",
         content: itemInfo.value.documentDate ? dayjs(itemInfo.value.documentDate).format("DD.MM.YYYY") : "XXXX",
       },
-      ... itemInfo.value.deliveryDateType !== "Kein Lieferdatum anzeigen" ? [{
-        label:  itemInfo.value.deliveryDateType,
-        content: !['Lieferzeitraum','Leistungszeitraum'].includes(itemInfo.value.deliveryDateType) ? (itemInfo.value.deliveryDate ? dayjs(itemInfo.value.deliveryDate).format("DD.MM.YYYY") : "XXXX") : `${itemInfo.value.deliveryDate ? dayjs(itemInfo.value.deliveryDate).format("DD.MM.YYYY") : "XXXX"} - ${itemInfo.value.deliveryDateEnd ? dayjs(itemInfo.value.deliveryDateEnd).format("DD.MM.YYYY") : "XXXX"}`,
+      ...itemInfo.value.deliveryDateType !== "Kein Lieferdatum anzeigen" ? [{
+        label: itemInfo.value.deliveryDateType,
+        content: !['Lieferzeitraum', 'Leistungszeitraum'].includes(itemInfo.value.deliveryDateType) ? (itemInfo.value.deliveryDate ? dayjs(itemInfo.value.deliveryDate).format("DD.MM.YYYY") : "XXXX") : `${itemInfo.value.deliveryDate ? dayjs(itemInfo.value.deliveryDate).format("DD.MM.YYYY") : "XXXX"} - ${itemInfo.value.deliveryDateEnd ? dayjs(itemInfo.value.deliveryDateEnd).format("DD.MM.YYYY") : "XXXX"}`,
       }] : [],
       /*{
         label: itemInfo.value.deliveryDateType,
@@ -1115,24 +1133,24 @@ const getDocumentData = () => {
       },*/
       {
         label: "Ansprechpartner",
-        content: contactPerson.fullName,
+        content: contactPerson.full_name,
       },
-      ... contactPerson.fixedTel || contactPerson.mobileTel ? [{
+      ...contactPerson.fixedTel || contactPerson.mobileTel ? [{
         label: "Telefon",
         content: contactPerson.fixedTel || contactPerson.mobileTel,
       }] : [],
-      ... contactPerson.email ? [{
+      ...contactPerson.email ? [{
         label: "E-Mail",
         content: contactPerson.email,
-      }]: [],
-      ... itemInfo.value.plant ? [{
+      }] : [],
+      ...itemInfo.value.plant ? [{
         label: "Objekt",
         content: plants.value.find(i => i.id === itemInfo.value.plant).name,
-      }]  : [],
-      ... itemInfo.value.project ? [{
+      }] : [],
+      ...itemInfo.value.project ? [{
         label: "Projekt",
         content: projects.value.find(i => i.id === itemInfo.value.project).name
-      }]: []
+      }] : []
     ],
     title: itemInfo.value.title,
     description: itemInfo.value.description,
@@ -1144,18 +1162,18 @@ const getDocumentData = () => {
         label: "Nettobetrag",
         content: renderCurrency(documentTotal.value.totalNet),
       },
-      ... rows.find(i => i.taxPercent === 19) ? [{
+      ...rows.find(i => i.taxPercent === 19) && !["13b UStG"].includes(itemInfo.value.taxType) ? [{
         label: `zzgl. 19% USt auf ${renderCurrency(documentTotal.value.totalNet19)}`,
         content: renderCurrency(documentTotal.value.total19),
       }] : [],
-      ... rows.find(i => i.taxPercent === 7) ? [{
+      ...rows.find(i => i.taxPercent === 7) && !["13b UStG"].includes(itemInfo.value.taxType) ? [{
         label: `zzgl. 7% USt auf ${renderCurrency(documentTotal.value.totalNet7)}`,
         content: renderCurrency(documentTotal.value.total7),
-      }]: [],
-      ...rows.find(i => i.taxPercent === 0) ? [{
+      }] : [],
+      ...rows.find(i => i.taxPercent === 0) && !["13b UStG"].includes(itemInfo.value.taxType) ? [{
         label: `zzgl. 0% USt auf ${renderCurrency(documentTotal.value.totalNet0)}`,
         content: renderCurrency(documentTotal.value.total0),
-      }]  : [],
+      }] : [],
       {
         label: "Gesamtbetrag",
         content: renderCurrency(documentTotal.value.totalGross),
@@ -1187,36 +1205,20 @@ const uri = ref("")
 const generateDocument = async () => {
   const path = letterheads.value.find(i => i.id === itemInfo.value.letterhead).path
 
-  /*const {data,error} = await supabase.functions.invoke('create_pdf',{
+  uri.value = await useFunctions().useCreatePDF(await getDocumentData(), path)
+  /*uri.value = await useNuxtApp().$api("/api/functions/createinvoicepdf",{
+    method: "POST",
     body: {
-      invoiceData: getDocumentData(),
-      backgroundPath: path,
-      returnMode: "base64"
+      invoiceData: await getDocumentData(),
+      backgroundPath: path
     }
   })*/
 
-  uri.value = await useFunctions().useCreatePDF(getDocumentData(), path)
-
-
-
-
-  //const {data,error} = await supabase.storage.from("files").download(path)
-
-  //console.log(data)
-  //console.log(error)
-
-  //console.log(JSON.stringify(getDocumentData()))
-
-  //uri.value = `data:${data.mimeType};base64,${data.base64}`
-
-  //uri.value = await useCreatePdf(getDocumentData(), await data.arrayBuffer())
-  //alert(uri.value)
   showDocument.value = true
-  //console.log(uri.value)
 }
 
 const onChangeTab = (index) => {
-  if(index === 1) {
+  if (index === 1) {
     generateDocument()
   }
 }
@@ -1225,16 +1227,16 @@ const setPosNumbers = () => {
   let mainIndex = 1
   let subIndex = 1
   let rows = itemInfo.value.rows.map(row => {
-    if(row.mode === 'title') {
+    if (row.mode === 'title') {
       row.pos = mainIndex
       mainIndex += 1
       subIndex = 1
-    } else if(!['pagebreak','title','text'].includes(row.mode)) {
-      row.pos = itemInfo.value.rows.filter(i => i.mode === "title").length === 0 ? `${subIndex}` :`${ mainIndex - 1}.${subIndex}`
+    } else if (!['pagebreak', 'title', 'text'].includes(row.mode)) {
+      row.pos = itemInfo.value.rows.filter(i => i.mode === "title").length === 0 ? `${subIndex}` : `${mainIndex - 1}.${subIndex}`
       subIndex += 1
     }
 
-    if(!row.id) {
+    if (!row.id) {
       row.id = uuidv4()
     }
 
@@ -1265,7 +1267,7 @@ const saveSerialInvoice = async () => {
 
   let data = null
 
-  if(route.params.id) {
+  if (route.params.id) {
     data = await dataStore.updateItem("createddocuments", {...createData, id: itemInfo.value.id})
   } else {
     data = await dataStore.createNewItem("createddocuments", createData)
@@ -1274,15 +1276,15 @@ const saveSerialInvoice = async () => {
   await router.push(`/createDocument/edit/${data.id}`)
 }
 
-const saveDocument = async (state,resetup = false) => {
+const saveDocument = async (state, resetup = false) => {
 
   itemInfo.value.state = state
 
-  if(state !== "Entwurf") {
+  if (state !== "Entwurf") {
     console.log("???")
 
     let type = ""
-    if(itemInfo.value.type === "advanceInvoices" || itemInfo.value.type === "cancellationInvoices"){
+    if (itemInfo.value.type === "advanceInvoices" || itemInfo.value.type === "cancellationInvoices") {
       type = "invoices"
     } else {
       type = itemInfo.value.type
@@ -1297,13 +1299,11 @@ const saveDocument = async (state,resetup = false) => {
     }
 
 
-
-
   }
 
-  if(profileStore.ownTenant.extraModules.includes("agriculture")) {
+  if (auth.activeTenantData.extraModules.includes("agriculture")) {
     itemInfo.value.rows.forEach(row => {
-      if(row.agriculture && row.agriculture.dieselUsage) {
+      if (row.agriculture && row.agriculture.dieselUsage) {
         row.agriculture.description = `${row.agriculture.dieselUsage} L Diesel zu ${renderCurrency(row.agriculture.dieselPrice)}/L verbraucht ${row.description ? "\n" + row.description : ""}`
       }
     })
@@ -1314,7 +1314,7 @@ const saveDocument = async (state,resetup = false) => {
 
     let descriptionText = ""
 
-    if(row.agriculture && row.agriculture.description) {
+    if (row.agriculture && row.agriculture.description) {
       descriptionText = row.agriculture.description
     } else {
       descriptionText = row.description ? row.description : null
@@ -1328,7 +1328,7 @@ const saveDocument = async (state,resetup = false) => {
 
   let createData = {
     type: itemInfo.value.type,
-    taxType: ['invoices','cancellationInvoices','advanceInvoices','qoutes','confirmationOrders'].includes(itemInfo.value.type) ? itemInfo.value.taxType : null,
+    taxType: ['invoices', 'cancellationInvoices', 'advanceInvoices', 'qoutes', 'confirmationOrders'].includes(itemInfo.value.type) ? itemInfo.value.taxType : null,
     state: itemInfo.value.state || "Entwurf",
     customer: itemInfo.value.customer,
     contact: itemInfo.value.contact,
@@ -1343,6 +1343,7 @@ const saveDocument = async (state,resetup = false) => {
     deliveryDateType: itemInfo.value.deliveryDateType,
     info: {},
     createdBy: itemInfo.value.createdBy,
+    created_by: itemInfo.value.created_by,
     title: itemInfo.value.title,
     description: itemInfo.value.description,
     startText: itemInfo.value.startText,
@@ -1357,15 +1358,16 @@ const saveDocument = async (state,resetup = false) => {
     report: documentReport.value
   }
 
-  if(route.params.id) {
-    await dataStore.updateItem("createddocuments", {...createData, id: itemInfo.value.id})
+  if (route.params.id) {
+    //await dataStore.updateItem("createddocuments", {...createData, id: itemInfo.value.id})
+    await useEntities("createddocuments").update(itemInfo.value.id, {...createData, id: itemInfo.value.id})
   } else {
-    const data = await dataStore.createNewItem("createddocuments", createData)
+    const data = await useEntities("createddocuments").create(createData)
     console.log(data)
     await router.push(`/createDocument/edit/${data.id}`)
   }
 
-  if(resetup) await setupPage()
+  if (resetup) await setupPage()
 }
 
 const closeDocument = async () => {
@@ -1383,13 +1385,16 @@ const closeDocument = async () => {
 
   let mappedType = itemInfo.value.type
 
-  if(mappedType === "advanceInvoices" || mappedType === "cancellationInvoices"){
+  if (mappedType === "advanceInvoices" || mappedType === "cancellationInvoices") {
     mappedType = "invoices"
   }
 
-  fileData.folder = (await supabase.from("folders").select("id").eq("tenant", profileStore.currentTenant).eq("function", mappedType).eq("year",dayjs().format("YYYY")).single()).data.id
+  const folders = await useEntities("folders").select()
+  console.log(folders)
+  fileData.folder = folders.find(i => i.function === mappedType && i.year === Number(dayjs().format("YYYY"))).id
 
-  let tag  = (await supabase.from("filetags").select("id").eq("tenant", profileStore.currentTenant).eq("createddocumenttype", mappedType).single()).data
+  const tags = await useEntities("filetags").select()
+  fileData.type = tags.find(i => i.createddocumenttype === mappedType).id
 
   function dataURLtoFile(dataurl, filename) {
     var arr = dataurl.split(","),
@@ -1400,12 +1405,12 @@ const closeDocument = async () => {
     while (n--) {
       u8arr[n] = bstr.charCodeAt(n);
     }
-    return new File([u8arr], filename, { type: mime });
+    return new File([u8arr], filename, {type: mime});
   }
 
   let file = dataURLtoFile(uri.value, `${itemInfo.value.documentNumber}.pdf`)
 
-  await dataStore.uploadFiles(fileData,  [file],[tag.id], true)
+  await useFiles().uploadFiles(fileData, [file])
 
   await router.push(`/createDocument/show/${itemInfo.value.id}`)
 
@@ -1415,11 +1420,11 @@ const getTextTemplateByType = (type, pos) => {
 
   let finalType = type
 
-  if(type === "serialInvoices") {
+  if (type === "serialInvoices") {
     finalType = "invoices"
   }
 
-  if(pos) {
+  if (pos) {
     return texttemplates.value.filter(i => i.documentType === finalType && i.pos === pos)
   } else {
     return texttemplates.value.filter(i => i.documentType === finalType)
@@ -1430,7 +1435,7 @@ const getTextTemplateByType = (type, pos) => {
 
 const checkCompatibilityWithInputPrice = () => {
   itemInfo.value.rows.forEach(row => {
-    if(!row.inputPrice) {
+    if (!row.inputPrice) {
       row.inputPrice = row.price
     }
   })
@@ -1438,10 +1443,10 @@ const checkCompatibilityWithInputPrice = () => {
 
 const updateCustomSurcharge = () => {
   itemInfo.value.rows.forEach(row => {
-    if(!["pagebreak","title","text"].includes(row.mode) /*&& !row.linkedEntitys.find(i => i.type === "createddocuments" && i.subtype === "advanceInvoices")*/) {
+    if (!["pagebreak", "title", "text"].includes(row.mode) /*&& !row.linkedEntitys.find(i => i.type === "createddocuments" && i.subtype === "advanceInvoices")*/) {
       //setRowData(row)
 
-      row.price = Number((row.inputPrice * (1 + itemInfo.value.customSurchargePercentage /100)).toFixed(2))
+      row.price = Number((row.inputPrice * (1 + itemInfo.value.customSurchargePercentage / 100)).toFixed(2))
 
 
     }/* else if(!["pagebreak","title","text"].includes(row.mode) /!*&& row.linkedEntitys.find(i => i.type === "createddocuments" && i.subtype === "advanceInvoices")*!/) {
@@ -1452,36 +1457,36 @@ const updateCustomSurcharge = () => {
 
 const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {}) => {
   console.log("Set Row Data")
-  if(service && service.id) {
+  if (service && service.id) {
     row.service = service.id
-    services.value = await useSupabaseSelect("services","*")
+    services.value = await useEntities("services").select("*")
   }
 
-  if(product && product.id) {
+  if (product && product.id) {
     row.product = product.id
-    product.value = await useSupabaseSelect("products","*")
+    product.value = await useEntities("products").select("*")
   }
 
-  if(row.service) {
+  if (row.service) {
     row.unit = service.unit ? service.unit : services.value.find(i => i.id === row.service).unit
     row.inputPrice = ((service.sellingPriceComposed.total || service.sellingPrice) ? (service.sellingPriceComposed.total || service.sellingPrice) : (services.value.find(i => i.id === row.service).sellingPriceComposed.total || services.value.find(i => i.id === row.service).sellingPrice))
     row.description = service.description ? service.description : (services.value.find(i => i.id === row.service) ? services.value.find(i => i.id === row.service).description : "")
 
-    if(['13b UStG','19 UStG'].includes(itemInfo.value.taxType)) {
+    if (['13b UStG', '19 UStG'].includes(itemInfo.value.taxType)) {
       row.taxPercent = 0
     } else {
       row.taxPercent = service.taxPercentage ? service.taxPercentage : services.value.find(i => i.id === row.service).taxPercentage
     }
   }
 
-  if(row.product) {
+  if (row.product) {
     console.log("Product Detected")
     row.unit = product.unit ? product.unit : products.value.find(i => i.id === row.product).unit
     row.inputPrice = (product.sellingPrice ? product.sellingPrice : products.value.find(i => i.id === row.product).sellingPrice)
     //row.price = Number((row.originalPrice * (1 + itemInfo.value.customSurchargePercentage /100)).toFixed(2))
     row.description = product.description ? product.description : (products.value.find(i => i.id === row.product) ? products.value.find(i => i.id === row.product).description : "")
 
-    if(['13b UStG','19 UStG'].includes(itemInfo.value.taxType)) {
+    if (['13b UStG', '19 UStG'].includes(itemInfo.value.taxType)) {
       row.taxPercent = 0
     } else {
       row.taxPercent = product.taxPercentage ? product.taxPercentage : products.value.find(i => i.id === row.product).taxPercentage
@@ -1536,9 +1541,9 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
         Fertigstellen
       </UButton>
       <UButton
-        icon="i-mdi-content-save"
-        @click="saveSerialInvoice"
-        v-if="itemInfo.type === 'serialInvoices'"
+          icon="i-mdi-content-save"
+          @click="saveSerialInvoice"
+          v-if="itemInfo.type === 'serialInvoices'"
       >
         Serienrechnung
       </UButton>
@@ -1551,15 +1556,16 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
 
           <UAlert
               class="my-5"
-            title="Vorhandene Probleme und Informationen:"
-            :color="findDocumentErrors.filter(i => i.type === 'breaking').length > 0 ? 'rose' : 'white'"
-            variant="outline"
+              title="Vorhandene Probleme und Informationen:"
+              :color="findDocumentErrors.filter(i => i.type === 'breaking').length > 0 ? 'rose' : 'white'"
+              variant="outline"
               v-if="findDocumentErrors.length > 0"
           >
             <template #description>
               <ul class="list-disc ml-5">
-                <li v-for="error in findDocumentErrors" :class="[...error.type === 'breaking' ? ['text-rose-600'] : ['dark:text-white','text-black']]">
-                  {{error.message}}
+                <li v-for="error in findDocumentErrors"
+                    :class="[...error.type === 'breaking' ? ['text-rose-600'] : ['dark:text-white','text-black']]">
+                  {{ error.message }}
                 </li>
               </ul>
             </template>
@@ -1582,19 +1588,19 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                       class="flex-auto"
                   >
                     <template #label>
-                      {{dataStore.documentTypesForCreation[itemInfo.type].labelSingle}}
+                      {{ dataStore.documentTypesForCreation[itemInfo.type].labelSingle }}
                     </template>
                   </USelectMenu>
-<!--                  <UButton
-                      variant="outline"
-                      v-if="itemInfo.type === 'advanceInvoices'"
-                      icon="i-heroicons-arrow-down-tray"
-                      @click="showAdvanceInvoiceCalcModal = true"
-                  >Auto Positionen</UButton>-->
+                  <!--                  <UButton
+                                        variant="outline"
+                                        v-if="itemInfo.type === 'advanceInvoices'"
+                                        icon="i-heroicons-arrow-down-tray"
+                                        @click="showAdvanceInvoiceCalcModal = true"
+                                    >Auto Positionen</UButton>-->
                 </InputGroup>
 
                 <USlideover
-                  v-model="showAdvanceInvoiceCalcModal"
+                    v-model="showAdvanceInvoiceCalcModal"
                 >
                   <UCard class="h-full">
                     <template #header>
@@ -1602,13 +1608,13 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                     </template>
 
                     <UFormGroup
-                      label="Gesamtsumme:"
+                        label="Gesamtsumme:"
                     >
                       <UInput
-                        type="number"
-                        :step="0.01"
-                        v-model="advanceInvoiceData.totalSumNet"
-                        @focusout="advanceInvoiceData.part = advanceInvoiceData.totalSumNet / 100 * advanceInvoiceData.partPerPecentage"
+                          type="number"
+                          :step="0.01"
+                          v-model="advanceInvoiceData.totalSumNet"
+                          @focusout="advanceInvoiceData.part = advanceInvoiceData.totalSumNet / 100 * advanceInvoiceData.partPerPecentage"
                       />
                     </UFormGroup>
                     <UFormGroup
@@ -1634,7 +1640,6 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                     </UFormGroup>
 
 
-
                   </UCard>
 
                 </USlideover>
@@ -1670,7 +1675,7 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                     :color="itemInfo.letterhead ? 'primary' : 'rose'"
                 >
                   <template #label>
-                    {{itemInfo.letterhead ? letterheads.find(i => i.id === itemInfo.letterhead).name : "Kein Briefpapier gewählt"}}
+                    {{ itemInfo.letterhead ? letterheads.find(i => i.id === itemInfo.letterhead).name : "Kein Briefpapier gewählt" }}
                   </template>
                 </USelectMenu>
               </UFormGroup>
@@ -1691,16 +1696,18 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                       class="flex-auto"
                   >
                     <template #option="{option}">
-                      {{option.name}}{{option.nameAddition}}
+                      {{ option.name }}{{ option.nameAddition }}
                     </template>
                     <UButton
                         :color="itemInfo.customer ? 'primary' : 'rose'"
                         variant="outline"
                         class="w-full"
                     >
-                      {{customers.find(i => i.id === itemInfo.customer) ? customers.find(i => i.id === itemInfo.customer).name : "Kein Kunde ausgewählt"}}
+                      {{ customers.find(i => i.id === itemInfo.customer) ? customers.find(i => i.id === itemInfo.customer).name : "Kein Kunde ausgewählt" }}
 
-                      <UIcon name="i-heroicons-chevron-right-20-solid" class="w-5 h-5 transition-transform text-gray-400 dark:text-gray-500" :class="['transform rotate-90']" />
+                      <UIcon name="i-heroicons-chevron-right-20-solid"
+                             class="w-5 h-5 transition-transform text-gray-400 dark:text-gray-500"
+                             :class="['transform rotate-90']"/>
                     </UButton>
                   </USelectMenu>
                   <EntityModalButtons
@@ -1708,59 +1715,58 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                       :id="itemInfo.customer"
                       @return-data="(data) => setCustomerData(data.id)"
                   />
-<!--                  <UButton
-                      variant="outline"
-                      class="w-25 ml-2"
-                      v-if="itemInfo.customer"
-                      icon="i-heroicons-eye"
-                      @click="modal.open(StandardEntityModal, {
-                        id: itemInfo.customer,
-                        type: 'customers',
-                        mode: 'show',
-                      })"
-                  />
-                  <UButton
-                      variant="outline"
-                      class="w-25 ml-2"
-                      v-if="itemInfo.customer"
-                      icon="i-heroicons-pencil-solid"
-                      @click="modal.open(StandardEntityModal, {
-                        id: itemInfo.customer,
-                        type: 'customers',
-                        mode: 'edit',
-                        onReturnData(data) {
-                          setCustomerData()
-                        }
-                      })"
-                  />
-                  <UButton
-                      variant="outline"
-                      class="w-25 ml-2"
-                      v-if="!itemInfo.customer"
-                      icon="i-heroicons-plus"
-                      @click="modal.open(StandardEntityModal, {
-                        type: 'customers',
-                        mode: 'create',
-                        onReturnData(data) {
-                          setCustomerData(data.id)
-                        }
-                      })"
-                  />-->
+                  <!--                  <UButton
+                                        variant="outline"
+                                        class="w-25 ml-2"
+                                        v-if="itemInfo.customer"
+                                        icon="i-heroicons-eye"
+                                        @click="modal.open(StandardEntityModal, {
+                                          id: itemInfo.customer,
+                                          type: 'customers',
+                                          mode: 'show',
+                                        })"
+                                    />
+                                    <UButton
+                                        variant="outline"
+                                        class="w-25 ml-2"
+                                        v-if="itemInfo.customer"
+                                        icon="i-heroicons-pencil-solid"
+                                        @click="modal.open(StandardEntityModal, {
+                                          id: itemInfo.customer,
+                                          type: 'customers',
+                                          mode: 'edit',
+                                          onReturnData(data) {
+                                            setCustomerData()
+                                          }
+                                        })"
+                                    />
+                                    <UButton
+                                        variant="outline"
+                                        class="w-25 ml-2"
+                                        v-if="!itemInfo.customer"
+                                        icon="i-heroicons-plus"
+                                        @click="modal.open(StandardEntityModal, {
+                                          type: 'customers',
+                                          mode: 'create',
+                                          onReturnData(data) {
+                                            setCustomerData(data.id)
+                                          }
+                                        })"
+                                    />-->
                 </div>
 
 
-
                 <UAlert
-                  v-if="customers.find(i => i.id === itemInfo.customer)"
-                  class="mt-2"
-                  variant="solid"
-                  color="white"
-                  title="Info"
+                    v-if="customers.find(i => i.id === itemInfo.customer)"
+                    class="mt-2"
+                    variant="solid"
+                    color="white"
+                    title="Info"
                 >
                   <template #description>
-                    Kundennr: {{customers.find(i => i.id === itemInfo.customer).customerNumber}}<br>
-                    Typ: {{customers.find(i => i.id === itemInfo.customer).isCompany ? 'Firma' : 'Privat'}}<br>
-                    Notizen: <span class="truncate">{{customers.find(i => i.id === itemInfo.customer).notes}}</span>
+                    Kundennr: {{ customers.find(i => i.id === itemInfo.customer).customerNumber }}<br>
+                    Typ: {{ customers.find(i => i.id === itemInfo.customer).isCompany ? 'Firma' : 'Privat' }}<br>
+                    Notizen: <span class="truncate">{{ customers.find(i => i.id === itemInfo.customer).notes }}</span>
                   </template>
 
                 </UAlert>
@@ -1785,23 +1791,26 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                         :color="itemInfo.contact ? 'primary' : 'none'"
                         variant="outline"
                         class="w-full"
-                      :disabled="!itemInfo.customer"
+                        :disabled="!itemInfo.customer"
                     >
-                      <span class="truncate">{{itemInfo.contact ? contacts.find(i => i.id === itemInfo.contact).fullName : "Kein Kontakt ausgewählt"}}</span>
+                      <span
+                          class="truncate">{{ itemInfo.contact ? contacts.find(i => i.id === itemInfo.contact).fullName : "Kein Kontakt ausgewählt" }}</span>
 
 
-                      <UIcon name="i-heroicons-chevron-right-20-solid" class="w-5 h-5 transition-transform text-gray-400 dark:text-gray-500" :class="['transform rotate-90']" />
+                      <UIcon name="i-heroicons-chevron-right-20-solid"
+                             class="w-5 h-5 transition-transform text-gray-400 dark:text-gray-500"
+                             :class="['transform rotate-90']"/>
                     </UButton>
                     <template #label>
-                      {{ itemInfo.contact ? contacts.find(i => i.id === itemInfo.contact).fullName : "Kein Kontakt ausgewählt"}}
+                      {{ itemInfo.contact ? contacts.find(i => i.id === itemInfo.contact).fullName : "Kein Kontakt ausgewählt" }}
                     </template>
                   </USelectMenu>
-<!--                  <UButton
-                      variant="outline"
-                      v-if="itemInfo.contact"
-                      icon="i-heroicons-arrow-right-end-on-rectangle"
-                      @click="router.push(`/standardEntity/contacts/show/${itemInfo.contact}`)"
-                  >Kontakt</UButton>-->
+                  <!--                  <UButton
+                                        variant="outline"
+                                        v-if="itemInfo.contact"
+                                        icon="i-heroicons-arrow-right-end-on-rectangle"
+                                        @click="router.push(`/standardEntity/contacts/show/${itemInfo.contact}`)"
+                                    >Kontakt</UButton>-->
                   <EntityModalButtons
                       type="contacts"
                       :id="itemInfo.contact"
@@ -1880,7 +1889,7 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                     />
 
                     <template #panel="{ close }">
-                      <LazyDatePicker v-model="itemInfo.deliveryDate" @close="close" />
+                      <LazyDatePicker v-model="itemInfo.deliveryDate" @close="close"/>
                     </template>
                   </UPopover>
 
@@ -1899,7 +1908,7 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                     />
 
                     <template #panel="{ close }">
-                      <LazyDatePicker v-model="itemInfo.deliveryDateEnd" @close="close" />
+                      <LazyDatePicker v-model="itemInfo.deliveryDateEnd" @close="close"/>
                     </template>
                   </UPopover>
                 </UFormGroup>
@@ -1919,29 +1928,29 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                     />
 
                     <template #panel="{ close }">
-                      <LazyDatePicker v-model="itemInfo.documentDate" @close="close" />
+                      <LazyDatePicker v-model="itemInfo.documentDate" @close="close"/>
                     </template>
                   </UPopover>
                 </UFormGroup>
 
 
                 <UFormGroup
-                  class="w-full"
-                  label="Zahlungsziel in Tagen:"
+                    class="w-full"
+                    label="Zahlungsziel in Tagen:"
                 >
                   <UInput
-                    type="number"
-                    v-model="itemInfo.paymentDays"
+                      type="number"
+                      v-model="itemInfo.paymentDays"
                   />
                 </UFormGroup>
                 <UFormGroup
-                  class="w-full"
-                  label="Individueller Aufschlag:"
+                    class="w-full"
+                    label="Individueller Aufschlag:"
                 >
                   <UInput
-                    type="number"
-                    v-model="itemInfo.customSurchargePercentage"
-                    @change="updateCustomSurcharge"
+                      type="number"
+                      v-model="itemInfo.customSurchargePercentage"
+                      @change="updateCustomSurcharge"
                   >
                     <template #trailing>
                       <span class="text-gray-500 dark:text-gray-400 text-xs">%</span>
@@ -1953,9 +1962,9 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                   label="Ansprechpartner:"
               >
                 <USelectMenu
-                    :options="profileStore.profiles"
-                    v-model="itemInfo.contactPerson"
-                    option-attribute="fullName"
+                    :options="tenantUsers"
+                    v-model="itemInfo.created_by"
+                    option-attribute="full_name"
                     value-attribute="id"
                     @change="setContactPersonData"
                 />
@@ -1988,13 +1997,12 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                       :search-attributes="['name']"
                       class="w-full"
                       :disabled="!itemInfo.customer"
-                      @change="checkForOpenAdvanceInvoices"
                   >
                     <template #label>
-                      {{plants.find(i => i.id === itemInfo.plant) ? plants.find(i => i.id === itemInfo.plant).name : "Kein Objekt ausgewählt"}}
+                      {{ plants.find(i => i.id === itemInfo.plant) ? plants.find(i => i.id === itemInfo.plant).name : "Kein Objekt ausgewählt" }}
                     </template>
                     <template #option="{option: plant}">
-                      {{plant.name}}
+                      {{ plant.name }}
                     </template>
                   </USelectMenu>
                   <UButton
@@ -2027,20 +2035,20 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                       :search-attributes="['name']"
                       class="w-full"
                       :disabled="!itemInfo.customer"
-                      @change="checkForOpenAdvanceInvoices"
                   >
                     <template #label>
-                      {{itemInfo.project ? projects.find(i => i.id === itemInfo.project).name : "Kein Projekt ausgewählt"}}
+                      {{ itemInfo.project ? projects.find(i => i.id === itemInfo.project).name : "Kein Projekt ausgewählt" }}
                     </template>
                     <template #option="{option: project}">
-                      {{dataStore.getCustomerById(project.customer).name}} - {{project.name}}
+                      {{ customers.find(i => i.id === project.customer) ? customers.find(i => i.id === project.customer).name : "" }}
+                      - {{ project.name }}
                     </template>
                   </USelectMenu>
                   <UButton
                       variant="outline"
                       color="rose"
                       v-if="itemInfo.project"
-                    icon="i-heroicons-x-mark"
+                      icon="i-heroicons-x-mark"
                       @click="itemInfo.project = null"
                   />
                   <EntityModalButtons
@@ -2074,7 +2082,7 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                     />
 
                     <template #panel="{ close }">
-                      <LazyDatePicker v-model="itemInfo.serialConfig.firstExecution" @close="close" />
+                      <LazyDatePicker v-model="itemInfo.serialConfig.firstExecution" @close="close"/>
                     </template>
                   </UPopover>
                 </UFormGroup>
@@ -2089,7 +2097,7 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                     />
 
                     <template #panel="{ close }">
-                      <LazyDatePicker v-model="itemInfo.serialConfig.executionUntil" @close="close" />
+                      <LazyDatePicker v-model="itemInfo.serialConfig.executionUntil" @close="close"/>
                     </template>
                   </UPopover>
                 </UFormGroup>
@@ -2118,9 +2126,9 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                   />
                 </UFormGroup>
                 <UAlert
-                  title="Anfangs- und Enddatum"
-                  description="Für das Anfangs- und Enddatum werden jeweils der ersten und letzte Tag des ausgewählten Intervalls und der Richtung automatisch ausgewählt"
-                  class="mt-5"
+                    title="Anfangs- und Enddatum"
+                    description="Für das Anfangs- und Enddatum werden jeweils der ersten und letzte Tag des ausgewählten Intervalls und der Richtung automatisch ausgewählt"
+                    class="mt-5"
                 />
 
 
@@ -2159,10 +2167,10 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                 value-attribute="text"
             >
               <template #option="{option}">
-                {{option.name}} - {{option.text}}
+                {{ option.name }} - {{ option.text }}
               </template>
               <template #label>
-                {{dataStore.texttemplates.find(i => i.text === itemInfo.startText && (itemInfo.type === "serialInvoices" ? i.documentType === "invoices" : i.documentType === itemInfo.type)) ? dataStore.texttemplates.find(i => i.text === itemInfo.startText && (itemInfo.type === "serialInvoices" ? i.documentType === "invoices" : i.documentType === itemInfo.type)).name : "Keine Vorlage ausgewählt oder Vorlage verändert"}}
+                {{ texttemplates.find(i => i.text === itemInfo.startText && (itemInfo.type === "serialInvoices" ? i.documentType === "invoices" : i.documentType === itemInfo.type)) ? texttemplates.find(i => i.text === itemInfo.startText && (itemInfo.type === "serialInvoices" ? i.documentType === "invoices" : i.documentType === itemInfo.type)).name : "Keine Vorlage ausgewählt oder Vorlage verändert" }}
               </template>
             </USelectMenu>
           </UFormGroup>
@@ -2184,18 +2192,18 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
 
           <table class="w-full" v-if="itemInfo.rows.length > 0">
             <thead>
-              <tr>
-                <th></th>
-                <th>Pos.</th>
-                <th class="pl-2">Name</th>
-                <th class="pl-2">Menge</th>
-                <th class="pl-2">Einheit</th>
-                <th class="pl-2" v-if="itemInfo.type !== 'deliveryNotes'">Preis</th>
-<!--                <th class="pl-2" v-if="itemInfo.type !== 'deliveryNotes'">Steuer</th>
-                <th class="pl-2" v-if="itemInfo.type !== 'deliveryNotes'">Rabatt</th>-->
-                <th class="pl-2"> </th>
-                <th class="pl-2" v-if="itemInfo.type !== 'deliveryNotes'">Gesamt</th>
-              </tr>
+            <tr>
+              <th></th>
+              <th>Pos.</th>
+              <th class="pl-2">Name</th>
+              <th class="pl-2">Menge</th>
+              <th class="pl-2">Einheit</th>
+              <th class="pl-2" v-if="itemInfo.type !== 'deliveryNotes'">Preis</th>
+              <!--                <th class="pl-2" v-if="itemInfo.type !== 'deliveryNotes'">Steuer</th>
+                              <th class="pl-2" v-if="itemInfo.type !== 'deliveryNotes'">Rabatt</th>-->
+              <th class="pl-2"></th>
+              <th class="pl-2" v-if="itemInfo.type !== 'deliveryNotes'">Gesamt</th>
+            </tr>
             </thead>
             <draggable
                 v-model="itemInfo.rows"
@@ -2223,11 +2231,11 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                       v-if="row.mode === 'text'"
                       colspan="9"
                   >
-<!--                    <UInput
-                        v-model="row.text"
-                        placeholder="Titel"
-                        maxlength="60"
-                    />-->
+                    <!--                    <UInput
+                                            v-model="row.text"
+                                            placeholder="Titel"
+                                            maxlength="60"
+                                        />-->
                     <UTextarea
                         v-model="row.description"
                         placeholder="Text"
@@ -2235,7 +2243,8 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                   </td>
                   <td
                       v-if="!['pagebreak','text'].includes(row.mode)"
-                  >{{row.pos}}</td>
+                  >{{ row.pos }}
+                  </td>
                   <td
                       class="w-120"
                       v-if="row.mode === 'free'"
@@ -2266,7 +2275,9 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                           @change="setRowData(row)"
                       >
                         <template #label>
-                          <span class="truncate">{{products.find(i => i.id === row.product) ? products.find(i => i.id === row.product).name : "Kein Produkt ausgewählt" }}</span>
+                          <span class="truncate">{{
+                              products.find(i => i.id === row.product) ? products.find(i => i.id === row.product).name : "Kein Produkt ausgewählt"
+                            }}</span>
                         </template>
                       </USelectMenu>
                       <EntityModalButtons
@@ -2274,46 +2285,46 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                           :id="row.product"
                           @return-data="(data) => setRowData(row,null,data)"
                       />
-<!--                      <UButton
-                          icon="i-heroicons-magnifying-glass"
-                          @click="showProductSelectionModal = true"
-                      />
-                      <UModal v-model="showProductSelectionModal">
-                        <UCard>
-                          <template #header>
-                            Artikel Auswählen
-                          </template>
+                      <!--                      <UButton
+                                                icon="i-heroicons-magnifying-glass"
+                                                @click="showProductSelectionModal = true"
+                                            />
+                                            <UModal v-model="showProductSelectionModal">
+                                              <UCard>
+                                                <template #header>
+                                                  Artikel Auswählen
+                                                </template>
 
-                          <InputGroup class="w-full">
-                            <UFormGroup label="Artikelkategorie:">
-                              <USelectMenu
-                                  v-if="productcategories.length > 0"
-                                  :options="[{name: 'Nicht zugeordnet',id:'not set'},...productcategories]"
-                                  value-attribute="id"
-                                  option-attribute="name"
-                                  v-model="selectedProductcategorie"
-                              />
-                            </UFormGroup>
-                          </InputGroup>
-                          <UTable
-                              :rows="selectedProductcategorie !== 'not set' ? products.filter(i => i.productcategories.includes(selectedProductcategorie)) : products.filter(i => i.productcategories.length === 0)"
-                              :columns="[
-                                  {key: 'name',label:'Name'},
-                                  {key: 'manufacturer',label:'Hersteller'},
-                                  {key: 'articleNumber',label:'Artikelnummer'},
-                              ]"
-                              :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Artikel anzuzeigen' }"
-                              @select=" (i) => {
-                               row.product = i.id
-                               row.unit = products.find(i => i.id === row.product).unit,
-                               row.price = (products.find(i => i.id === row.product).sellingPrice || 0),
-                               row.description = products.find(i => i.id === row.product).description
-                                showProductSelectionModal = false}"
-                          >
+                                                <InputGroup class="w-full">
+                                                  <UFormGroup label="Artikelkategorie:">
+                                                    <USelectMenu
+                                                        v-if="productcategories.length > 0"
+                                                        :options="[{name: 'Nicht zugeordnet',id:'not set'},...productcategories]"
+                                                        value-attribute="id"
+                                                        option-attribute="name"
+                                                        v-model="selectedProductcategorie"
+                                                    />
+                                                  </UFormGroup>
+                                                </InputGroup>
+                                                <UTable
+                                                    :rows="selectedProductcategorie !== 'not set' ? products.filter(i => i.productcategories.includes(selectedProductcategorie)) : products.filter(i => i.productcategories.length === 0)"
+                                                    :columns="[
+                                                        {key: 'name',label:'Name'},
+                                                        {key: 'manufacturer',label:'Hersteller'},
+                                                        {key: 'articleNumber',label:'Artikelnummer'},
+                                                    ]"
+                                                    :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Artikel anzuzeigen' }"
+                                                    @select=" (i) => {
+                                                     row.product = i.id
+                                                     row.unit = products.find(i => i.id === row.product).unit,
+                                                     row.price = (products.find(i => i.id === row.product).sellingPrice || 0),
+                                                     row.description = products.find(i => i.id === row.product).description
+                                                      showProductSelectionModal = false}"
+                                                >
 
-                          </UTable>
-                        </UCard>
-                      </UModal>-->
+                                                </UTable>
+                                              </UCard>
+                                            </UModal>-->
                     </InputGroup>
 
                   </td>
@@ -2336,7 +2347,9 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                           @change="setRowData(row)"
                       >
                         <template #label>
-                          <span class="truncate">{{services.find(i => i.id === row.service) ? services.find(i => i.id === row.service).name : "Keine Leistung ausgewählt" }}</span>
+                          <span class="truncate">{{
+                              services.find(i => i.id === row.service) ? services.find(i => i.id === row.service).name : "Keine Leistung ausgewählt"
+                            }}</span>
                         </template>
                       </USelectMenu>
                       <EntityModalButtons
@@ -2344,44 +2357,44 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                           :id="row.service"
                           @return-data="(data) => setRowData(row,data,null)"
                       />
-<!--                      <UButton
-                          icon="i-heroicons-magnifying-glass"
-                          @click="showServiceSelectionModal = true"
-                      />
-                      <UModal v-model="showServiceSelectionModal">
-                        <UCard>
-                          <template #header>
-                            Leistung Auswählen
-                          </template>
+                      <!--                      <UButton
+                                                icon="i-heroicons-magnifying-glass"
+                                                @click="showServiceSelectionModal = true"
+                                            />
+                                            <UModal v-model="showServiceSelectionModal">
+                                              <UCard>
+                                                <template #header>
+                                                  Leistung Auswählen
+                                                </template>
 
-                          <InputGroup class="w-full">
-                            <UFormGroup label="Leistungskategorie:">
-                              <USelectMenu
-                                  v-if="servicecategories.length > 0"
-                                  :options="[{name: 'Nicht zugeordnet',id:'not set'},...servicecategories]"
-                                  value-attribute="id"
-                                  option-attribute="name"
-                                  v-model="selectedServicecategorie"
-                              />
-                            </UFormGroup>
-                          </InputGroup>
-                          <UTable
-                              :rows="selectedServicecategorie !== 'not set' ? services.filter(i => i.servicecategories.includes(selectedServicecategorie)) : services.filter(i => i.servicecategories.length === 0)"
-                              :columns="[
-                                    {key: 'name',label:'Name'},
-                                    {key: 'serviceNumber',label:'Leistungsnummer'},
-                                    {key: 'sellingPrice',label:'Verkaufspreis'},
-                                ]"
-                              :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Leistungen anzuzeigen' }"
-                              @select=" (i) => {
-                                 row.service = i.id
-                                 setRowData(row)
-                                  showServiceSelectionModal = false}"
-                          >
+                                                <InputGroup class="w-full">
+                                                  <UFormGroup label="Leistungskategorie:">
+                                                    <USelectMenu
+                                                        v-if="servicecategories.length > 0"
+                                                        :options="[{name: 'Nicht zugeordnet',id:'not set'},...servicecategories]"
+                                                        value-attribute="id"
+                                                        option-attribute="name"
+                                                        v-model="selectedServicecategorie"
+                                                    />
+                                                  </UFormGroup>
+                                                </InputGroup>
+                                                <UTable
+                                                    :rows="selectedServicecategorie !== 'not set' ? services.filter(i => i.servicecategories.includes(selectedServicecategorie)) : services.filter(i => i.servicecategories.length === 0)"
+                                                    :columns="[
+                                                          {key: 'name',label:'Name'},
+                                                          {key: 'serviceNumber',label:'Leistungsnummer'},
+                                                          {key: 'sellingPrice',label:'Verkaufspreis'},
+                                                      ]"
+                                                    :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Leistungen anzuzeigen' }"
+                                                    @select=" (i) => {
+                                                       row.service = i.id
+                                                       setRowData(row)
+                                                        showServiceSelectionModal = false}"
+                                                >
 
-                          </UTable>
-                        </UCard>
-                      </UModal>-->
+                                                </UTable>
+                                              </UCard>
+                                            </UModal>-->
                     </InputGroup>
                   </td>
                   <td
@@ -2392,7 +2405,7 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                         v-model="row.quantity"
                         :disabled="itemInfo.type === 'cancellationInvoices'"
                         type="number"
-                        :step="dataStore.units.find(i => i.id === row.unit) ? dataStore.units.find(i => i.id === row.unit).step : '1' "
+                        :step="units.find(i => i.id === row.unit) ? units.find(i => i.id === row.unit).step : '1' "
 
                     />
                   </td>
@@ -2403,12 +2416,12 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                     <USelectMenu
                         v-model="row.unit"
                         :disabled="itemInfo.type === 'cancellationInvoices'"
-                        :options="dataStore.units"
+                        :options="units"
                         option-attribute="name"
                         value-attribute="id"
                     >
                       <template #label>
-                        {{dataStore.units.find(i => i.id === row.unit) ? dataStore.units.find(i => i.id === row.unit).name : "Keine Einheit gewählt"}}
+                        {{ units.find(i => i.id === row.unit) ? units.find(i => i.id === row.unit).name : "Keine Einheit gewählt" }}
                       </template>
                     </USelectMenu>
                   </td>
@@ -2423,19 +2436,19 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                         step="0.001"
                         @change="updateCustomSurcharge"
                     >
-                      <template  #leading>
+                      <template #leading>
                         <span class="text-gray-500 dark:text-gray-400 text-xs">EUR</span>
                       </template>
                       <template #trailing>
                         <span
                             v-if="row.price > row.inputPrice"
                             class="text-primary text-xs">
-                        {{useCurrency(row.price)}}
+                        {{ useCurrency(row.price) }}
                         </span>
                         <span
                             v-else-if="row.price < row.inputPrice"
                             class="text-rose-600 text-xs">
-                        {{useCurrency(row.price)}}
+                        {{ useCurrency(row.price) }}
                         </span>
                         <span
                             v-else
@@ -2443,40 +2456,40 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                       </template>
                     </UInput>
                   </td>
-<!--                  <td
-                      class="w-40"
-                      v-if="!['pagebreak','title','text'].includes(row.mode)&& itemInfo.type !== 'deliveryNotes'"
+                  <!--                  <td
+                                        class="w-40"
+                                        v-if="!['pagebreak','title','text'].includes(row.mode)&& itemInfo.type !== 'deliveryNotes'"
 
-                  >
-                    <USelectMenu
-                        :options="[19,7,0]"
-                        v-model="row.taxPercent"
-                        :disabled="itemInfo.taxType === '13b UStG' || itemInfo.taxType === '19 UStG'"
-                    >
-                      <template #option="{option}">
-                        {{option}} %
-                      </template>
-                      <template #label>
-                        {{row.taxPercent}} %
-                      </template>
-                    </USelectMenu>
+                                    >
+                                      <USelectMenu
+                                          :options="[19,7,0]"
+                                          v-model="row.taxPercent"
+                                          :disabled="itemInfo.taxType === '13b UStG' || itemInfo.taxType === '19 UStG'"
+                                      >
+                                        <template #option="{option}">
+                                          {{option}} %
+                                        </template>
+                                        <template #label>
+                                          {{row.taxPercent}} %
+                                        </template>
+                                      </USelectMenu>
 
-                  </td>-->
-<!--                  <td
-                      class="w-40"
-                      v-if="!['pagebreak','title','text'].includes(row.mode)&& itemInfo.type !== 'deliveryNotes'"
-                  >
-                    <UInput
-                        v-model="row.discountPercent"
-                        type="number"
-                        step="0.01"
-                        placeholder="0"
-                    >
-                      <template #trailing>
-                        <span class="text-gray-500 dark:text-gray-400 text-xs">%</span>
-                      </template>
-                    </UInput>
-                  </td>-->
+                                    </td>-->
+                  <!--                  <td
+                                        class="w-40"
+                                        v-if="!['pagebreak','title','text'].includes(row.mode)&& itemInfo.type !== 'deliveryNotes'"
+                                    >
+                                      <UInput
+                                          v-model="row.discountPercent"
+                                          type="number"
+                                          step="0.01"
+                                          placeholder="0"
+                                      >
+                                        <template #trailing>
+                                          <span class="text-gray-500 dark:text-gray-400 text-xs">%</span>
+                                        </template>
+                                      </UInput>
+                                    </td>-->
                   <td
                       class="w-40"
                       v-if="!['pagebreak','title','text'].includes(row.mode)"
@@ -2495,15 +2508,16 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                     />
                     <UModal v-model="row.showEdit">
                       <UCard>
-<!--                        <template #header>
-                          Zeile bearbeiten
-                        </template>-->
+                        <!--                        <template #header>
+                                                  Zeile bearbeiten
+                                                </template>-->
                         <template #header>
                           <div class="flex items-center justify-between">
                             <h3 class="text-base font-semibold leading-6 text-gray-900 dark:text-white">
                               Zeile bearbeiten
                             </h3>
-                            <UButton color="gray" variant="ghost" icon="i-heroicons-x-mark-20-solid" class="-my-1" @click="row.showEdit = false" />
+                            <UButton color="gray" variant="ghost" icon="i-heroicons-x-mark-20-solid" class="-my-1"
+                                     @click="row.showEdit = false"/>
                           </div>
                         </template>
                         <InputGroup>
@@ -2514,7 +2528,7 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                             <UInput
                                 v-model="row.quantity"
                                 type="number"
-                                :step="dataStore.units.find(i => i.id === row.unit) ? dataStore.units.find(i => i.id === row.unit).step : '1' "
+                                :step="units.find(i => i.id === row.unit) ? units.find(i => i.id === row.unit).step : '1' "
 
                             />
                           </UFormGroup>
@@ -2524,13 +2538,13 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                           >
                             <USelectMenu
                                 v-model="row.unit"
-                                :options="dataStore.units"
+                                :options="units"
                                 option-attribute="name"
 
                                 value-attribute="id"
                             >
                               <template #label>
-                                {{dataStore.units.find(i => i.id === row.unit) ? dataStore.units.find(i => i.id === row.unit).name : "Keine Einheit gewählt"}}
+                                {{ units.find(i => i.id === row.unit) ? units.find(i => i.id === row.unit).name : "Keine Einheit gewählt" }}
                               </template>
                             </USelectMenu>
                           </UFormGroup>
@@ -2546,19 +2560,19 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                               step="0.001"
                               @change="updateCustomSurcharge"
                           >
-                            <template  #leading>
+                            <template #leading>
                               <span class="text-gray-500 dark:text-gray-400 text-xs">EUR</span>
                             </template>
                             <template #trailing>
                         <span
                             v-if="row.price > row.inputPrice"
                             class="text-primary text-xs">
-                        {{useCurrency(row.price)}}
+                        {{ useCurrency(row.price) }}
                         </span>
                               <span
                                   v-else-if="row.price < row.inputPrice"
                                   class="text-rose-600 text-xs">
-                        {{useCurrency(row.price)}}
+                        {{ useCurrency(row.price) }}
                         </span>
                               <span
                                   v-else
@@ -2567,9 +2581,9 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                           </UInput>
                         </UFormGroup>
                         <UFormGroup
-                          label="Umsatzsteuer:"
-                          class="mt-3"
-                          v-if="itemInfo.type !== 'deliveryNotes'"
+                            label="Umsatzsteuer:"
+                            class="mt-3"
+                            v-if="itemInfo.type !== 'deliveryNotes'"
                         >
                           <USelectMenu
                               :options="[19,7,0]"
@@ -2577,18 +2591,18 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                               :disabled="itemInfo.taxType === '13b UStG' || itemInfo.taxType === '19 UStG'"
                           >
                             <template #option="{option}">
-                              {{option}} %
+                              {{ option }} %
                             </template>
                             <template #label>
-                              {{row.taxPercent}} %
+                              {{ row.taxPercent }} %
                             </template>
                           </USelectMenu>
                         </UFormGroup>
 
                         <UFormGroup
-                          label="Rabatt:"
-                          class="mt-3"
-                          v-if="itemInfo.type !== 'deliveryNotes'"
+                            label="Rabatt:"
+                            class="mt-3"
+                            v-if="itemInfo.type !== 'deliveryNotes'"
                         >
                           <UInput
                               v-model="row.discountPercent"
@@ -2622,28 +2636,28 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                         </InputGroup>
 
                         <UAlert
-                          v-if="row.linkedEntitys && row.linkedEntitys.find(i => i.type === 'createddocuments' && i.subtype === 'advanceInvoices')"
-                          title="Berechnung des Individuellen Aufschlags für die Zeile gesperrt"
-                          color="orange"
-                          variant="subtle"
-                          class="my-3"
+                            v-if="row.linkedEntitys && row.linkedEntitys.find(i => i.type === 'createddocuments' && i.subtype === 'advanceInvoices')"
+                            title="Berechnung des Individuellen Aufschlags für die Zeile gesperrt"
+                            color="orange"
+                            variant="subtle"
+                            class="my-3"
                         />
 
                         Verknüpfungen:
                         <ul>
                           <li
-                            v-for="linkedEntity in row.linkedEntitys"
+                              v-for="linkedEntity in row.linkedEntitys"
                           >
                             - <a
-                                v-if="linkedEntity.subtype === 'advanceInvoices'"
-                                :to="`/createddocuments/show/${linkedEntity.id}`"
-                            >Abschlagsrechnung</a>
+                              v-if="linkedEntity.subtype === 'advanceInvoices'"
+                              :to="`/createddocuments/show/${linkedEntity.id}`"
+                          >Abschlagsrechnung</a>
                           </li>
                         </ul>
 
                         <UFormGroup
-                          label="Beschreibung:"
-                          class="mt-3"
+                            label="Beschreibung:"
+                            class="mt-3"
                         >
                           <UTextarea
                               v-model="row.description"
@@ -2653,13 +2667,13 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                           </UTextarea>
                         </UFormGroup>
 
-<!--                        <template #footer>
-                          <UButton
-                              @click="row.showEdit = false"
-                          >
-                            Speichern
-                          </UButton>
-                        </template>-->
+                        <!--                        <template #footer>
+                                                  <UButton
+                                                      @click="row.showEdit = false"
+                                                  >
+                                                    Speichern
+                                                  </UButton>
+                                                </template>-->
                       </UCard>
 
 
@@ -2742,12 +2756,12 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                   >
 
                     <p class="text-right font-bold whitespace-nowrap">
-                      {{row.optional || row.alternative ? "(" : ""}}
+                      {{ row.optional || row.alternative ? "(" : "" }}
                       <span v-if="row.discountPercent !== 0" class="line-through mr-2 text-rose-500">
-                        {{getRowAmountUndiscounted(row)}} €
+                        {{ getRowAmountUndiscounted(row) }} €
                       </span>
-                      {{getRowAmount(row)}} €
-                      {{row.optional || row.alternative ? ")" : ""}}
+                      {{ getRowAmount(row) }} €
+                      {{ row.optional || row.alternative ? ")" : "" }}
                     </p>
                   </td>
                   <td
@@ -2774,11 +2788,11 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
             </draggable>
           </table>
           <UAlert
-            v-else
-            title="Keine Positionen hinzugefügt"
-            color="rose"
-            variant="outline"
-            icon="i-heroicons-light-bulb"
+              v-else
+              title="Keine Positionen hinzugefügt"
+              color="rose"
+              variant="outline"
+              icon="i-heroicons-light-bulb"
           ></UAlert>
 
           <InputGroup>
@@ -2826,150 +2840,150 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
             </UButton>
           </InputGroup>
 
-<!--          <UDivider
-              class="mt-5 mb-3"
-              v-if="openAdvanceInvoices.length > 0 || itemInfo.usedAdvanceInvoices.length > 0"
-          >
-            Noch nicht abgerechnete Abschlagsrechnungen
-          </UDivider>
+          <!--          <UDivider
+                        class="mt-5 mb-3"
+                        v-if="openAdvanceInvoices.length > 0 || itemInfo.usedAdvanceInvoices.length > 0"
+                    >
+                      Noch nicht abgerechnete Abschlagsrechnungen
+                    </UDivider>
 
-          <div
-              v-for="advanceInvoice in openAdvanceInvoices"
-              :key="advanceInvoice.id"
-              class="flex flex-row justify-between my-2"
-          >
-            <span>{{advanceInvoice.documentNumber}}</span>
-            <span>Summe: {{renderCurrency(advanceInvoice.rows[0].price * (1 + advanceInvoice.rows[0].taxPercent/100))}}</span>
-            <InputGroup>
-              <UButton
-                @click="addAdvanceInvoiceToInvoice(advanceInvoice.id)"
-                :disabled="itemInfo.usedAdvanceInvoices.includes(advanceInvoice.id)"
-                class="mr-2"
-              >
-                Verwenden
-              </UButton>
-              <UButton
-                @click="itemInfo.usedAdvanceInvoices = itemInfo.usedAdvanceInvoices.filter(i => i !== advanceInvoice.id)"
-                :disabled="!itemInfo.usedAdvanceInvoices.includes(advanceInvoice.id)"
-                color="rose"
-                variant="outline"
-              >
-                X
-              </UButton>
-            </InputGroup>
-          </div>-->
+                    <div
+                        v-for="advanceInvoice in openAdvanceInvoices"
+                        :key="advanceInvoice.id"
+                        class="flex flex-row justify-between my-2"
+                    >
+                      <span>{{advanceInvoice.documentNumber}}</span>
+                      <span>Summe: {{renderCurrency(advanceInvoice.rows[0].price * (1 + advanceInvoice.rows[0].taxPercent/100))}}</span>
+                      <InputGroup>
+                        <UButton
+                          @click="addAdvanceInvoiceToInvoice(advanceInvoice.id)"
+                          :disabled="itemInfo.usedAdvanceInvoices.includes(advanceInvoice.id)"
+                          class="mr-2"
+                        >
+                          Verwenden
+                        </UButton>
+                        <UButton
+                          @click="itemInfo.usedAdvanceInvoices = itemInfo.usedAdvanceInvoices.filter(i => i !== advanceInvoice.id)"
+                          :disabled="!itemInfo.usedAdvanceInvoices.includes(advanceInvoice.id)"
+                          color="rose"
+                          variant="outline"
+                        >
+                          X
+                        </UButton>
+                      </InputGroup>
+                    </div>-->
 
           <UDivider class="my-3" v-if="Object.keys(documentTotal.titleSums).length > 0">Überschriften</UDivider>
 
           <table>
             <tr v-for="sumKey in Object.keys(documentTotal.titleSums) ">
-              <td>{{sumKey}}</td>
-              <td>{{useCurrency(documentTotal.titleSums[sumKey])}}</td>
+              <td>{{ sumKey }}</td>
+              <td>{{ useCurrency(documentTotal.titleSums[sumKey]) }}</td>
             </tr>
           </table>
 
           <UDivider class="my-3" v-if="itemInfo.rows.length > 0">Auswertung & Gesamt</UDivider>
 
 
-          <div class="w-full flex justify-between"  v-if="itemInfo.type !== 'deliveryNotes'">
+          <div class="w-full flex justify-between" v-if="itemInfo.type !== 'deliveryNotes'">
             <table class="w-1/2" v-if="itemInfo.rows.length > 0">
               <tr v-if="documentReport.totalProductsPurchasePrice !== 0">
                 <td>Einkaufspreis Artikel Gesamt:</td>
-                <td class="text-right">{{useCurrency(documentReport.totalProductsPurchasePrice)}}</td>
+                <td class="text-right">{{ useCurrency(documentReport.totalProductsPurchasePrice) }}</td>
               </tr>
               <tr v-if="documentReport.totalProductsFromServicesPurchasePrice !== 0">
                 <td>Einkaufspreis Artikel aus Leistungen Gesamt:</td>
-                <td class="text-right">{{useCurrency(documentReport.totalProductsFromServicesPurchasePrice)}}</td>
+                <td class="text-right">{{ useCurrency(documentReport.totalProductsFromServicesPurchasePrice) }}</td>
               </tr>
               <tr v-if="documentReport.totalHoursFromServices.totalPurchasePrice !== 0">
                 <td>Einkaufspreis Personal aus Leistungen Gesamt:</td>
-                <td class="text-right">{{useCurrency(documentReport.totalHoursFromServices.totalPurchasePrice)}}</td>
+                <td class="text-right">{{ useCurrency(documentReport.totalHoursFromServices.totalPurchasePrice) }}</td>
               </tr>
               <tr>
                 <td>Gewinn Gesamt:</td>
-                <td class="text-right">{{useCurrency(documentReport.totalMargin)}}</td>
+                <td class="text-right">{{ useCurrency(documentReport.totalMargin) }}</td>
               </tr>
               <tr v-if="documentReport.totalHoursSellingPrice !== 0">
                 <td>Lohnkosten Verkauf:</td>
-                <td class="text-right">{{useCurrency(documentReport.totalHoursSellingPrice)}}</td>
+                <td class="text-right">{{ useCurrency(documentReport.totalHoursSellingPrice) }}</td>
               </tr>
               <tr v-for="key in Object.keys(documentReport.totalHoursFromServices.byName)">
-                <td>{{key}}</td>
-                <td class="text-right">{{documentReport.totalHoursFromServices.byName[key]}} h</td>
+                <td>{{ key }}</td>
+                <td class="text-right">{{ documentReport.totalHoursFromServices.byName[key] }} h</td>
               </tr>
               <tr v-if="documentReport.totalHoursFromServices.total !== 0">
                 <td>Stunden Gesamt:</td>
-                <td class="text-right">{{documentReport.totalHoursFromServices.total}} h</td>
+                <td class="text-right">{{ documentReport.totalHoursFromServices.total }} h</td>
               </tr>
             </table>
             <table class="w-1/3 h-full" v-if="itemInfo.rows.length > 0">
               <tr>
                 <td class="font-bold">Netto:</td>
-                <td class="text-right">{{renderCurrency(documentTotal.totalNet)}}</td>
+                <td class="text-right">{{ renderCurrency(documentTotal.totalNet) }}</td>
               </tr>
               <tr v-if="itemInfo.taxType === 'Standard' && itemInfo.rows.find(i => i.taxPercent === 19)">
-                <td class="font-bold">zzgl. 19 % USt auf {{renderCurrency(documentTotal.totalNet19)}}:</td>
-                <td class="text-right">{{renderCurrency(documentTotal.total19)}}</td>
+                <td class="font-bold">zzgl. 19 % USt auf {{ renderCurrency(documentTotal.totalNet19) }}:</td>
+                <td class="text-right">{{ renderCurrency(documentTotal.total19) }}</td>
               </tr>
               <tr v-if="itemInfo.taxType === 'Standard' && itemInfo.rows.find(i => i.taxPercent === 7)">
-                <td class="font-bold">zzgl. 7 % USt auf {{renderCurrency(documentTotal.totalNet7)}}:</td>
-                <td class="text-right">{{renderCurrency(documentTotal.total7)}}</td>
+                <td class="font-bold">zzgl. 7 % USt auf {{ renderCurrency(documentTotal.totalNet7) }}:</td>
+                <td class="text-right">{{ renderCurrency(documentTotal.total7) }}</td>
               </tr>
               <tr v-if="itemInfo.taxType === 'Standard' && itemInfo.rows.find(i => i.taxPercent === 0)">
-                <td class="font-bold">zzgl. 0 % USt auf {{renderCurrency(documentTotal.totalNet0)}}:</td>
-                <td class="text-right">{{renderCurrency(documentTotal.total0)}}</td>
+                <td class="font-bold">zzgl. 0 % USt auf {{ renderCurrency(documentTotal.totalNet0) }}:</td>
+                <td class="text-right">{{ renderCurrency(documentTotal.total0) }}</td>
               </tr>
               <tr>
                 <td class="font-bold">Brutto:</td>
-                <td class="text-right">{{renderCurrency(documentTotal.totalGross)}}</td>
+                <td class="text-right">{{ renderCurrency(documentTotal.totalGross) }}</td>
               </tr>
               <tr v-if="documentTotal.totalGrossAlreadyPaid !== 0">
                 <td class="font-bold">Bereits bezahlt:</td>
-                <td class="text-right">{{renderCurrency(documentTotal.totalGrossAlreadyPaid)}}</td>
+                <td class="text-right">{{ renderCurrency(documentTotal.totalGrossAlreadyPaid) }}</td>
               </tr>
               <tr v-if="documentTotal.totalGrossAlreadyPaid !== 0">
                 <td class="font-bold">Offene Summe:</td>
-                <td class="text-right">{{renderCurrency(documentTotal.totalSumToPay)}}</td>
+                <td class="text-right">{{ renderCurrency(documentTotal.totalSumToPay) }}</td>
               </tr>
             </table>
           </div>
 
-<!--          <UDivider
-              class="my-3"
-          >Auswertung</UDivider>
+          <!--          <UDivider
+                        class="my-3"
+                    >Auswertung</UDivider>
 
-          <div class="w-full flex justify-end">
-            <table class="w-1/3">
-              <tr v-if="documentReport.totalProductsPurchasePrice !== 0">
-                <td>Einkaufspreis Artikel Gesamt:</td>
-                <td class="text-right">{{useCurrency(documentReport.totalProductsPurchasePrice)}}</td>
-              </tr>
-              <tr v-if="documentReport.totalProductsFromServicesPurchasePrice !== 0">
-                <td>Einkaufspreis Artikel aus Leistungen Gesamt:</td>
-                <td class="text-right">{{useCurrency(documentReport.totalProductsFromServicesPurchasePrice)}}</td>
-              </tr>
-              <tr v-if="documentReport.totalHoursFromServices.totalPurchasePrice !== 0">
-                <td>Einkaufspreis Personal aus Leistungen Gesamt:</td>
-                <td class="text-right">{{useCurrency(documentReport.totalHoursFromServices.totalPurchasePrice)}}</td>
-              </tr>
-              <tr>
-                <td>Gewinn Gesamt:</td>
-                <td class="text-right">{{useCurrency(documentReport.totalMargin)}}</td>
-              </tr>
-              <tr v-if="documentReport.totalHoursSellingPrice !== 0">
-                <td>Lohnkosten Verkauf:</td>
-                <td class="text-right">{{useCurrency(documentReport.totalHoursSellingPrice)}}</td>
-              </tr>
-              <tr v-for="key in Object.keys(documentReport.totalHoursFromServices.byName)">
-                <td>{{key}}</td>
-                <td class="text-right">{{documentReport.totalHoursFromServices.byName[key]}} h</td>
-              </tr>
-              <tr v-if="documentReport.totalHoursFromServices.total !== 0">
-                <td>Stunden Gesamt:</td>
-                <td class="text-right">{{documentReport.totalHoursFromServices.total}} h</td>
-              </tr>
-            </table>
-          </div>-->
+                    <div class="w-full flex justify-end">
+                      <table class="w-1/3">
+                        <tr v-if="documentReport.totalProductsPurchasePrice !== 0">
+                          <td>Einkaufspreis Artikel Gesamt:</td>
+                          <td class="text-right">{{useCurrency(documentReport.totalProductsPurchasePrice)}}</td>
+                        </tr>
+                        <tr v-if="documentReport.totalProductsFromServicesPurchasePrice !== 0">
+                          <td>Einkaufspreis Artikel aus Leistungen Gesamt:</td>
+                          <td class="text-right">{{useCurrency(documentReport.totalProductsFromServicesPurchasePrice)}}</td>
+                        </tr>
+                        <tr v-if="documentReport.totalHoursFromServices.totalPurchasePrice !== 0">
+                          <td>Einkaufspreis Personal aus Leistungen Gesamt:</td>
+                          <td class="text-right">{{useCurrency(documentReport.totalHoursFromServices.totalPurchasePrice)}}</td>
+                        </tr>
+                        <tr>
+                          <td>Gewinn Gesamt:</td>
+                          <td class="text-right">{{useCurrency(documentReport.totalMargin)}}</td>
+                        </tr>
+                        <tr v-if="documentReport.totalHoursSellingPrice !== 0">
+                          <td>Lohnkosten Verkauf:</td>
+                          <td class="text-right">{{useCurrency(documentReport.totalHoursSellingPrice)}}</td>
+                        </tr>
+                        <tr v-for="key in Object.keys(documentReport.totalHoursFromServices.byName)">
+                          <td>{{key}}</td>
+                          <td class="text-right">{{documentReport.totalHoursFromServices.byName[key]}} h</td>
+                        </tr>
+                        <tr v-if="documentReport.totalHoursFromServices.total !== 0">
+                          <td>Stunden Gesamt:</td>
+                          <td class="text-right">{{documentReport.totalHoursFromServices.total}} h</td>
+                        </tr>
+                      </table>
+                    </div>-->
 
 
 
@@ -2990,7 +3004,7 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                 {{option.name}} - {{option.text}}
               </template>
               <template #label>
-                {{dataStore.texttemplates.find(i => i.text === itemInfo.endText && (itemInfo.type === "serialInvoices" ? i.documentType === "invoices" : i.documentType === itemInfo.type)) ? dataStore.texttemplates.find(i => i.text === itemInfo.endText && (itemInfo.type === "serialInvoices" ? i.documentType === "invoices" : i.documentType === itemInfo.type)).name : "Keine Vorlage ausgewählt oder Vorlage verändert"}}
+                {{texttemplates.find(i => i.text === itemInfo.endText && (itemInfo.type === "serialInvoices" ? i.documentType === "invoices" : i.documentType === itemInfo.type)) ? texttemplates.find(i => i.text === itemInfo.endText && (itemInfo.type === "serialInvoices" ? i.documentType === "invoices" : i.documentType === itemInfo.type)).name : "Keine Vorlage ausgewählt oder Vorlage verändert"}}
               </template>
             </USelectMenu>
           </UFormGroup>
diff --git a/pages/createDocument/index.vue b/pages/createDocument/index.vue
index c22290d..820256b 100644
--- a/pages/createDocument/index.vue
+++ b/pages/createDocument/index.vue
@@ -31,11 +31,11 @@
   </UDashboardNavbar>
   <UDashboardToolbar>
     <template #left>
-<!--      <UCheckbox
-          v-model="showDrafts"
-          label="Entwürfe Anzeigen"
-          class="my-auto mr-3"
-      />-->
+      <!--      <UCheckbox
+                v-model="showDrafts"
+                label="Entwürfe Anzeigen"
+                class="my-auto mr-3"
+            />-->
       <USelectMenu
           v-model="selectedTypes"
           icon="i-heroicons-adjustments-horizontal-solid"
@@ -79,7 +79,7 @@
       </USelectMenu>
     </template>
   </UDashboardToolbar>
-
+  {{sort}}
   <UTabs :items="selectedTypes" class="m-3">
     <template #item="{item}">
       <div style="height: 80vh; overflow-y: scroll">
@@ -128,8 +128,10 @@
       </span>
           </template>
           <template #partner-data="{row}">
-            <span v-if="row.customer">{{row.customer ? row.customer.name : ""}}</span>
-
+            <span v-if="row.customer && row.customer.name.length <21">{{row.customer ? row.customer.name : ""}}</span>
+            <UTooltip v-else-if="row.customer && row.customer.name.length > 20" :text="row.customer.name">
+              {{row.customer.name.substring(0,20)}}...
+            </UTooltip>
           </template>
           <template #reference-data="{row}">
             <span v-if="row === filteredRows[selectedItem]" class="text-primary-500 font-bold">{{row.documentNumber}}</span>
@@ -165,10 +167,6 @@
 <script setup>
 import dayjs from "dayjs";
 
-definePageMeta({
-  middleware: "auth"
-})
-
 defineShortcuts({
   '/': () => {
     //console.log(searchinput)
@@ -207,8 +205,9 @@ const router = useRouter()
 const items = ref([])
 const selectedItem = ref(0)
 
+
 const setupPage = async () => {
-  items.value = (await useSupabaseSelect("createddocuments","*, customer(id,name), statementallocations(id,amount),linkedDocument(*)","documentNumber")).filter(i => !i.archived)
+  items.value = (await useEntities("createddocuments").select("*, customer(id,name), statementallocations(id,amount),linkedDocument(*)","documentNumber",true)).filter(i => !i.archived)
 }
 
 setupPage()
@@ -216,47 +215,38 @@ setupPage()
 const templateColumns = [
   {
     key: "reference",
-    label: "Referenz",
-    sortable: true
+    label: "Referenz"
   },
   {
     key: 'type',
-    label: "Typ",
-    sortable: true
-  },{
+    label: "Typ"
+  }, {
     key: 'state',
-    label: "Status",
-    sortable: true
+    label: "Status"
   },
   {
     key: "amount",
-    label: "Betrag",
-    sortable: true
+    label: "Betrag"
   },
   {
     key: 'partner',
-    label: "Kunde",
-    sortable: true
+    label: "Kunde"
   },
   {
     key: "date",
-    label: "Datum",
-    sortable: true
+    label: "Datum"
   },
   {
     key: "amountOpen",
-    label: "Offener Betrag",
-    sortable: true
+    label: "Offener Betrag"
   },
   {
     key: "paid",
-    label: "Bezahlt",
-    sortable: true
+    label: "Bezahlt"
   },
   {
     key: "dueDate",
-    label: "Fällig",
-    sortable: true
+    label: "Fällig"
   }
 ]
 const selectedColumns = ref(tempStore.columns["createddocuments"] ? tempStore.columns["createddocuments"] : templateColumns)
@@ -291,19 +281,19 @@ const types = computed(() => {
 const selectItem = (item) => {
   console.log(item)
 
-  if(item.state === "Entwurf"){
+  if (item.state === "Entwurf") {
     router.push(`/createDocument/edit/${item.id}`)
-  } else if(item.state !== "Entwurf") {
+  } else if (item.state !== "Entwurf") {
     router.push(`/createDocument/show/${item.id}`)
   }
 }
 
 const displayCurrency = (value, currency = "€") => {
-  return `${Number(value).toFixed(2).replace(".",",")} ${currency}`
+  return `${Number(value).toFixed(2).replace(".", ",")} ${currency}`
 }
 
 
-const searchString = ref(tempStore.searchStrings['createddocuments'] ||'')
+const searchString = ref(tempStore.searchStrings['createddocuments'] || '')
 
 const clearSearchString = () => {
   tempStore.clearSearchString('createddocuments')
@@ -312,7 +302,7 @@ const clearSearchString = () => {
 const selectedFilters = ref([])
 const filteredRows = computed(() => {
 
-  let temp = items.value.filter(i => types.value.find(x => x.key === 'invoices' ? ['invoices','advanceInvoices','cancellationInvoices'].includes(i.type) : x.key === i.type))
+  let temp = items.value.filter(i => types.value.find(x => x.key === 'invoices' ? ['invoices', 'advanceInvoices', 'cancellationInvoices'].includes(i.type) : x.key === i.type))
   temp = temp.filter(i => i.type !== "serialInvoices")
 
   /*if(showDrafts.value === true) {
@@ -321,7 +311,7 @@ const filteredRows = computed(() => {
     temp = temp.filter(i => i.state !== "Entwurf")
   }*/
 
-  if(selectedFilters.value.includes("Nur offene anzeigen")){
+  if (selectedFilters.value.includes("Nur offene anzeigen")) {
     temp = temp.filter(i => !isPaid(i))
   }
 
diff --git a/pages/createDocument/serialInvoice.vue b/pages/createDocument/serialInvoice.vue
index 5789509..9d794ad 100644
--- a/pages/createDocument/serialInvoice.vue
+++ b/pages/createDocument/serialInvoice.vue
@@ -126,7 +126,7 @@ const items = ref([])
 const selectedItem = ref(0)
 
 const setupPage = async () => {
-  items.value = await useSupabaseSelect("createddocuments","*, customer(id,name)","documentDate")
+  items.value = await useEntities("createddocuments").select("*, customer(id,name)","documentDate")
 }
 
 const searchString = ref("")
diff --git a/pages/createDocument/show/[id].vue b/pages/createDocument/show/[id].vue
index 0c2db3e..2d16156 100644
--- a/pages/createDocument/show/[id].vue
+++ b/pages/createDocument/show/[id].vue
@@ -1,9 +1,7 @@
 <script setup>
 import CopyCreatedDocumentModal from "~/components/copyCreatedDocumentModal.vue";
 
-definePageMeta({
-  middleware: "auth"
-})
+
 
 defineShortcuts({
   'backspace': () => {
@@ -11,41 +9,28 @@ defineShortcuts({
   },
 })
 
-const supabase = useSupabaseClient()
 const modal = useModal()
-const dataStore = useDataStore()
-const profileStore = useProfileStore()
 const route = useRoute()
 const router = useRouter()
+const auth = useAuthStore()
 
 const itemInfo = ref({})
 const linkedDocument =ref({})
-const currentTenant = ref({})
 const setupPage = async () => {
   if(route.params) {
-    if(route.params.id) itemInfo.value = await useSupabaseSelectSingle("createddocuments",route.params.id,"*, files(*)")
+    if(route.params.id) itemInfo.value = await useEntities("createddocuments").selectSingle(route.params.id,"*, files(*)")
 
     console.log(itemInfo.value)
 
     linkedDocument.value = await useFiles().selectDocument(itemInfo.value.files[0].id)
-
-
-
-    //const {data,error} = await supabase.from("files").select("id").eq("createddocument", route.params.id).order("id",{ascending:true})
-    //linkedDocument.value = data[data.length -1]
-
   }
-
-  currentTenant.value = (await supabase.from("tenants").select().eq("id",profileStore.currentTenant).single()).data
-  console.log(currentTenant.value)
-
 }
 
 setupPage()
 
 const openEmail = () => {
   if(["invoices","advanceInvoices"].includes(itemInfo.value.type)){
-    router.push(`/email/new?loadDocuments=["${linkedDocument.value.id}"]&bcc=${encodeURIComponent(currentTenant.value.standardEmailForInvoices || "")}`)
+    router.push(`/email/new?loadDocuments=["${linkedDocument.value.id}"]&bcc=${encodeURIComponent(auth.activeTenantData.standardEmailForInvoices || "")}`)
   } else {
     router.push(`/email/new?loadDocuments=["${linkedDocument.value.id}"]`)
   }
@@ -54,7 +39,7 @@ const openEmail = () => {
 
 <template>
   <UDashboardNavbar
-    title="Erstelltes Dokument anzeigen"
+      title="Erstelltes Dokument anzeigen"
   >
 
   </UDashboardNavbar>
@@ -66,10 +51,10 @@ const openEmail = () => {
       >
         Bearbeiten
       </UButton>
-<!--      <UButton
-          :to="dataStore.documents.find(i => i.createdDocument === itemInfo.id) ? dataStore.documents.find(i => i.createdDocument === itemInfo.id).url : ''"
-          target="_blank"
-      >In neuen Tab anzeigen</UButton>-->
+      <!--      <UButton
+                :to="dataStore.documents.find(i => i.createdDocument === itemInfo.id) ? dataStore.documents.find(i => i.createdDocument === itemInfo.id).url : ''"
+                target="_blank"
+            >In neuen Tab anzeigen</UButton>-->
       <UButton
           icon="i-heroicons-arrow-right-end-on-rectangle"
           @click="modal.open(CopyCreatedDocumentModal, {
@@ -81,8 +66,8 @@ const openEmail = () => {
         Kopieren
       </UButton>
       <UButton
-        @click="openEmail"
-        icon="i-heroicons-envelope"
+          @click="openEmail"
+          icon="i-heroicons-envelope"
       >
         E-Mail
       </UButton>
@@ -96,16 +81,16 @@ const openEmail = () => {
       </UButton>
       <UButton
           v-if="itemInfo.project"
-        @click="router.push(`/standardEntity/projects/show/${itemInfo.project}`)"
-        icon="i-heroicons-link"
+          @click="router.push(`/standardEntity/projects/show/${itemInfo.project}`)"
+          icon="i-heroicons-link"
           variant="outline"
       >
         Projekt
       </UButton>
       <UButton
           v-if="itemInfo.customer"
-        @click="router.push(`/standardEntity/customers/show/${itemInfo.customer}`)"
-        icon="i-heroicons-link"
+          @click="router.push(`/standardEntity/customers/show/${itemInfo.customer}`)"
+          icon="i-heroicons-link"
           variant="outline"
       >
         Kunde
diff --git a/pages/createdletters/[mode]/[[id]].vue b/pages/createdletters/[mode]/[[id]].vue
new file mode 100644
index 0000000..147b7c1
--- /dev/null
+++ b/pages/createdletters/[mode]/[[id]].vue
@@ -0,0 +1,108 @@
+<script setup>
+import {useFunctions} from "~/composables/useFunctions.js";
+import dayjs from "dayjs";
+
+const profileStore = useProfileStore();
+
+const preloadedContent = ref("")
+const letterheads = ref([])
+const itemInfo = ref({
+  contentHTML: "",
+  contentJSON: {},
+  contentText: ""
+})
+const showDocument = ref(false)
+const uri = ref("")
+
+const setupPage = async () => {
+  letterheads.value = await useSupabaseSelect("letterheads","*")
+
+  preloadedContent.value = `<p></p><p></p><p></p>`
+}
+
+setupPage()
+
+const onChangeTab = (index) => {
+  if(index === 1) {
+    generateDocument()
+  }
+}
+
+const getDocumentData = () => {
+  /*const returnData = {
+    adressLine: `${businessInfo.name}, ${businessInfo.street}, ${businessInfo.zip} ${businessInfo.city}`,
+    recipient: [
+      customerData.name,
+      ... customerData.nameAddition ? [customerData.nameAddition] : [],
+      ... contactData ? [`${contactData.firstName} ${contactData.lastName}`] : [],
+      itemInfo.value.address.street,
+      ... itemInfo.value.address.special ? [itemInfo.value.address.special] : [],
+      `${itemInfo.value.address.zip} ${itemInfo.value.address.city}`,
+
+    ],
+  }*/
+
+  const returnData = {
+    adressLine: `Federspiel Technology UG, Am Schwarzen Brack 14, 26452 Sande`,
+    recipient: [
+      "Federspiel Technology",
+      "UG haftungsbeschränkt",
+      "Florian Federspiel",
+      "Am Schwarzen Brack 14",
+      "Zusatz",
+      "26452 Sande",
+    ],
+    contentJSON: itemInfo.value.contentJSON,
+  }
+
+  return returnData
+}
+
+const generateDocument = async () => {
+  const ownTenant = profileStore.ownTenant
+  const path = letterheads.value[0].path
+
+  uri.value = await useFunctions().useCreateLetterPDF(getDocumentData(), path)
+
+  showDocument.value = true
+}
+
+const contentChanged = (content) => {
+  itemInfo.value.contentHTML = content.html
+  itemInfo.value.contentJSON = content.json
+  itemInfo.value.contentText = content.text
+}
+</script>
+
+<template>
+  <UDashboardNavbar title="Anschreiben bearbeiten"/>
+  {{itemInfo}}
+  <UDashboardPanelContent>
+    <UTabs @change="onChangeTab" :items="[{label: 'Editor'},{label: 'Vorschau'}]">
+      <template #item="{item}">
+        <div v-if="item.label === 'Editor'">
+          <Tiptap
+              class="mt-3"
+              @updateContent="contentChanged"
+              :preloadedContent="preloadedContent"
+          />
+        </div>
+        <div v-else-if="item.label === 'Vorschau'">
+          <object
+              :data="uri"
+              v-if="showDocument"
+              type="application/pdf"
+              class="w-full previewDocumentMobile"
+          />
+        </div>
+      </template>
+    </UTabs>
+  </UDashboardPanelContent>
+
+</template>
+
+<style scoped>
+.previewDocumentMobile {
+  aspect-ratio: 1 / 1.414;
+}
+</style>
\ No newline at end of file
diff --git a/pages/email/index.vue b/pages/email/index.vue
deleted file mode 100644
index f0f4e30..0000000
--- a/pages/email/index.vue
+++ /dev/null
@@ -1,280 +0,0 @@
-<script setup>
-
-const supabase = useSupabaseClient()
-const dataStore = useDataStore()
-const profileStore = useProfileStore()
-
-
-const selectedTab = ref(0)
-const selectedMail = ref(null)
-const selectedMailboxPath = ref("INBOX")
-const emails = ref([])
-const accountData = ref(null)
-const availableAccounts = ref(null)
-const selectedAccount = ref(null)
-const setupPage = async () => {
-  availableAccounts.value = (await supabase.from("emailAccounts").select("*").contains("profiles",[profileStore.activeProfile.id])).data
-  console.log(availableAccounts.value)
-
-  if(availableAccounts.value.length > 0) {
-    selectedAccount.value = availableAccounts.value[0].id
-    accountData.value = await useSupabaseSelectSingle("emailAccounts", selectedAccount.value)
-    emails.value = await useSupabaseSelect("emailMessages", "*", "date", false)
-  }
-}
-
-const filteredMails = computed(() => {
-
-  let temp = emails.value.filter(i => i.mailboxPath.toLowerCase() === selectedMailboxPath.value.toLowerCase())
-
-
-  if(selectedTab.value === 0){
-    return temp
-  } else {
-    return temp.filter(i => !i.seen)
-  }
-
-
-  return emails.value
-})
-
-const isMailPanelOpen = computed({
-  get() {
-    return !!selectedMail.value
-  },
-  set(value) {
-    if (!value) {
-      selectedMail.value = null
-    }
-  }
-})
-
-const changeSeen = async (seen) => {
-  const {data,error} = await supabase.functions.invoke('emailcontrol',{
-    body: {
-      method: seen ? "makeSeen" : "makeUnseen",
-      emailId: selectedMail.value.id
-    }
-  })
-
-  if(data) {
-    setupPage()
-  }
-}
-
-
-
-setupPage()
-</script>
-
-<template>
-<!--  <UDashboardNavbar title="E-Mails">
-
-  </UDashboardNavbar>
-  <UDashboardToolbar>
-
-  </UDashboardToolbar>-->
-  <UDashboardPage
-    v-if="selectedAccount"
-  >
-    <UDashboardPanel
-        id="inbox"
-        :width="400"
-        :resizable="{ min: 300, max: 500 }"
-
-    >
-      <UDashboardNavbar>
-        <template #left>
-          <USelectMenu
-              v-if="accountData"
-              class="w-40"
-            :options="accountData.mailboxes"
-            option-attribute="name"
-            value-attribute="path"
-            v-model="selectedMailboxPath"
-          />
-        </template>
-        <template #right>
-          <UButton
-            icon="i-heroicons-arrow-path"
-            variant="ghost"
-            color="gray"
-            @click="setupPage"
-          />
-
-          <UTabs
-              v-model="selectedTab"
-              :items="[{label: 'All'}, {label: 'Ungelesen'}]"
-              :ui="{ wrapper: '', list: { height: 'h-9', tab: { height: 'h-7', size: 'text-[13px]' } } }"
-          />
-        </template>
-      </UDashboardNavbar>
-
-      <!-- ~/components/inbox/InboxList.vue -->
-      <InboxList
-          v-model="selectedMail"
-          :mails="filteredMails"
-          @emailSelected=" !selectedMail.seen ? changeSeen(true): ''"
-      />
-    </UDashboardPanel>
-    <UDashboardPanel
-        v-model="isMailPanelOpen"
-        collapsible
-        grow
-        side="right"
-    >
-      <template v-if="selectedMail">
-        <UDashboardNavbar>
-          <template #toggle>
-            <UDashboardNavbarToggle icon="i-heroicons-x-mark" />
-
-            <UDivider
-                orientation="vertical"
-                class="mx-1.5 lg:hidden"
-            />
-          </template>
-
-          <template #left>
-            <UTooltip text="Ungelesen">
-              <UButton
-                  icon="i-heroicons-eye-slash"
-                  color="gray"
-                  variant="ghost"
-                  @click="changeSeen(false)"
-              />
-            </UTooltip>
-<!--            <UTooltip text="Archive">
-              <UButton
-                  icon="i-heroicons-archive-box"
-                  color="gray"
-                  variant="ghost"
-              />
-            </UTooltip>
-
-            <UTooltip text="Move to junk">
-              <UButton
-                  icon="i-heroicons-archive-box-x-mark"
-                  color="gray"
-                  variant="ghost"
-              />
-            </UTooltip>
-
-            <UDivider
-                orientation="vertical"
-                class="mx-1.5"
-            />
-
-            <UPopover :popper="{ placement: 'bottom-start' }">
-              <template #default="{ open }">
-                <UTooltip
-                    text="Snooze"
-                    :prevent="open"
-                >
-                  <UButton
-                      icon="i-heroicons-clock"
-                      color="gray"
-                      variant="ghost"
-                      :class="[open && 'bg-gray-50 dark:bg-gray-800']"
-                  />
-                </UTooltip>
-              </template>
-
-              <template #panel="{ close }">
-                <DatePicker @close="close" />
-              </template>
-            </UPopover>-->
-          </template>
-
-          <template #right>
-            <UTooltip text="Reply">
-              <UButton
-                  icon="i-heroicons-arrow-uturn-left"
-                  color="gray"
-                  variant="ghost"
-              />
-            </UTooltip>
-
-            <UTooltip text="Forward">
-              <UButton
-                  icon="i-heroicons-arrow-uturn-right"
-                  color="gray"
-                  variant="ghost"
-              />
-            </UTooltip>
-
-<!--            <UDivider
-                orientation="vertical"
-                class="mx-1.5"
-            />
-
-            <UDropdown :items="dropdownItems">
-              <UButton
-                  icon="i-heroicons-ellipsis-vertical"
-                  color="gray"
-                  variant="ghost"
-              />
-            </UDropdown>-->
-          </template>
-        </UDashboardNavbar>
-
-        <!-- ~/components/inbox/InboxMail.vue -->
-        <InboxMail :mail="selectedMail" />
-      </template>
-      <div
-          v-else
-          class="flex-1 hidden lg:flex items-center justify-center"
-      >
-        <UIcon
-            name="i-heroicons-inbox"
-            class="w-32 h-32 text-gray-400 dark:text-gray-500"
-        />
-      </div>
-    </UDashboardPanel>
-  </UDashboardPage>
-  <div
-      v-else
-      class="flex-1  flex-col hidden lg:flex items-center justify-center"
-  >
-    <UIcon
-        name="i-heroicons-inbox"
-        class="w-32 h-32 text-gray-400 dark:text-gray-500"
-    />
-    <span class="font-bold text-2xl">Kein E-Mail Account verfügbar</span>
-
-  </div>
-
-<!--  <UInput
-    placeholder="Empfänger"
-    variant="ghost"
-    class="m-2"
-  />
-  <UInput
-    placeholder="Betreff"
-    variant="ghost"
-    class="m-2"
-  />
-  <UInput
-    placeholder="CC"
-    variant="ghost"
-    class="m-2"
-  />
-  <UInput
-    placeholder="BCC"
-    variant="ghost"
-    class="m-2"
-  />
-
-  <UDivider
-    class="my-5"
-  />
-
-
-
-
-
-  <Tiptap/>-->
-</template>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/pages/email/new.vue b/pages/email/new.vue
index 1c88a27..ed8d53a 100644
--- a/pages/email/new.vue
+++ b/pages/email/new.vue
@@ -1,11 +1,12 @@
 <script setup>
-
+//TODO: BACKENDCHANGE EMAIL SENDING
 const supabase = useSupabaseClient()
 const dataStore = useDataStore()
 const profileStore = useProfileStore()
 const route = useRoute()
 const router = useRouter()
 const toast = useToast()
+const auth = useAuthStore()
 
 const emailData = ref({
   to:"",
@@ -23,14 +24,14 @@ const loadedDocuments = ref([])
 const loaded = ref(false)
 const noAccountsPresent = ref(false)
 const setupPage = async () => {
-  emailAccounts.value = await useSupabaseSelect("emailAccounts")
+  emailAccounts.value = await useEntities("emailAccounts").select()
 
   if(emailAccounts.value.length === 0) {
     noAccountsPresent.value = true
   } else {
     emailData.value.account = emailAccounts.value[0].id
 
-    preloadedContent.value = `<p></p><p></p><p></p>${profileStore.activeProfile.emailSignature || ""}`
+    preloadedContent.value = `<p></p><p></p><p></p>${auth.profile.email_signature || ""}`
 
     //Check Query
     if(route.query.to) emailData.value.to = route.query.to
@@ -44,15 +45,13 @@ const setupPage = async () => {
       const data = await useFiles().selectSomeDocuments(JSON.parse(route.query.loadDocuments))
       console.log(data)
 
-
-
       if(data) loadedDocuments.value = data
 
       //console.log(loadedDocuments.value)
 
       if(loadedDocuments.value.length > 0) {
         console.log(loadedDocuments.value[0])
-        emailData.value.subject = loadedDocuments.value[0].createddocument.title
+        emailData.value.subject = `${loadedDocuments.value[0].createddocument.title} von ${auth.activeTenantData.businessInfo.name}`
 
         if(loadedDocuments.value[0].createddocument.contact && loadedDocuments.value[0].createddocument.contact.email) {
           console.log("Contact")
@@ -63,7 +62,6 @@ const setupPage = async () => {
           emailData.value.to = loadedDocuments.value[0].createddocument.customer.infoData.email
         }
       }
-
     }
 
     loaded.value = true
@@ -132,25 +130,35 @@ const sendEmail = async () => {
 
   for await (const doc of loadedDocuments.value) {
 
-    const {data,error} = await supabase.storage.from("filesdev").download(doc.path)
+    //const {data,error} = await supabase.storage.from("filesdev").download(doc.path)
+
+    const res = await useFiles().downloadFile(doc.id, null, true)
 
     body.attachments.push({
       filename: doc.path.split("/")[doc.path.split("/").length -1],
-      content: await blobToBase64(data),
-      contentType: data.type,
+      content: await blobToBase64(res),
+      contentType: res.type,
       encoding: "base64",
       contentDisposition: "attachment"
     })
   }
 
-  const { data, error } = await supabase.functions.invoke('send_email', {
-    body
+  const res = await useNuxtApp().$api("/api/emailasuser/send",{
+    method: "POST",
+    body: body,
   })
-  if(error) {
+
+  console.log(res)
+
+
+  /*const { data, error } = await supabase.functions.invoke('send_email', {
+    body
+  })*/
+  if(!res.success) {
     toast.add({title: "Fehler beim Absenden der E-Mail", color: "rose"})
 
-  } else if(data) {
-    router.push("/")
+  } else {
+    navigateTo("/")
     toast.add({title: "E-Mail zum Senden eingereiht"})
   }
 
diff --git a/pages/export.vue b/pages/export.vue
new file mode 100644
index 0000000..cb1e725
--- /dev/null
+++ b/pages/export.vue
@@ -0,0 +1,162 @@
+<script setup lang="ts">
+import dayjs from "dayjs"
+const exports = ref([])
+
+const auth = useAuthStore()
+const toast = useToast()
+
+const setupPage = async () => {
+  exports.value = await useNuxtApp().$api("/api/exports",{
+    method: "GET"
+  })
+}
+
+setupPage()
+
+function downloadFile(row) {
+  const a = document.createElement("a")
+  a.href = row.url
+  a.download = row.file_path.split("/").pop()
+  document.body.appendChild(a)
+  a.click()
+  document.body.removeChild(a)
+}
+
+const showCreateExportModal = ref(false)
+const createExportData = ref({
+  start_date: null,
+  end_date: null,
+  beraternr:null,
+  mandantennr: null
+})
+
+const createExport = async () => {
+  const res = await useNuxtApp().$api("/api/exports/datev",{
+    method: "POST",
+    body: createExportData.value
+  })
+
+  showCreateExportModal.value = false
+
+  if(res.success) {
+    toast.add({title: "Export wird erstellt. Sie erhalten eine Benachrichtigung sobald es soweit ist."})
+  } else {
+    toast.add({title: "Es gab einen Fehler beim erstellen", color: "rose"})
+  }
+
+}
+
+
+</script>
+
+<template>
+  <UDashboardNavbar
+      title="Exporte"
+  >
+    <template #right>
+      <UButton
+          @click="showCreateExportModal = true"
+      >+ Export</UButton>
+    </template>
+  </UDashboardNavbar>
+  <UTable
+      :rows="exports"
+      :columns="[
+        {
+          key: 'created_at',
+          label: 'Erstellt am',
+        },{
+          key: 'start_date',
+          label: 'Start',
+        },{
+          key: 'end_date',
+          label: 'Ende',
+        },{
+          key: 'valid_until',
+          label: 'Gültig bis',
+        },{
+          key: 'type',
+          label: 'Typ',
+        },{
+          key: 'download',
+          label: 'Download',
+        },
+    ]"
+  >
+    <template #created_at-data="{row}">
+      {{dayjs(row.created_at).format("DD.MM.YYYY HH:mm")}}
+    </template>
+    <template #start_date-data="{row}">
+      {{dayjs(row.start_date).format("DD.MM.YYYY HH:mm")}}
+    </template>
+    <template #end_date-data="{row}">
+      {{dayjs(row.end_date).format("DD.MM.YYYY HH:mm")}}
+    </template>
+    <template #valid_until-data="{row}">
+      {{dayjs(row.valid_until).format("DD.MM.YYYY HH:mm")}}
+    </template>
+    <template #download-data="{row}">
+      <UButton
+          @click="downloadFile(row)"
+      >
+        Download
+      </UButton>
+    </template>
+  </UTable>
+
+  <UModal v-model="showCreateExportModal">
+    <UCard>
+      <template #header>
+        Export erstellen
+      </template>
+
+      <UFormGroup
+          label="Start:"
+      >
+        <UPopover :popper="{ placement: 'bottom-start' }">
+          <UButton
+              icon="i-heroicons-calendar-days-20-solid"
+              :label="createExportData.start_date ? dayjs(createExportData.start_date).format('DD.MM.YYYY') : 'Datum auswählen'"
+              variant="outline"
+              class="mx-auto"
+          />
+
+          <template #panel="{ close }">
+            <LazyDatePicker v-model="createExportData.start_date" @close="close" />
+          </template>
+        </UPopover>
+      </UFormGroup>
+
+      <UFormGroup
+          label="Ende:"
+      >
+        <UPopover :popper="{ placement: 'bottom-start' }">
+          <UButton
+              icon="i-heroicons-calendar-days-20-solid"
+              :label="createExportData.end_date ? dayjs(createExportData.end_date).format('DD.MM.YYYY') : 'Datum auswählen'"
+              variant="outline"
+              class="mx-auto"
+          />
+
+          <template #panel="{ close }">
+            <LazyDatePicker v-model="createExportData.end_date" @close="close" />
+          </template>
+        </UPopover>
+      </UFormGroup>
+
+      <template #footer>
+        <UButton
+            @click="createExport"
+        >
+          Erstellen
+        </UButton>
+      </template>
+
+    </UCard>
+  </UModal>
+
+</template>
+
+<style scoped>
+
+</style>
diff --git a/pages/files/index.vue b/pages/files/index.vue
index 4a743ef..89ffec4 100644
--- a/pages/files/index.vue
+++ b/pages/files/index.vue
@@ -2,23 +2,14 @@
 
 
 import {BlobReader, BlobWriter, ZipWriter} from "@zip.js/zip.js";
-import {useSupabaseSelectSingle} from "~/composables/useSupabase.js";
 import DocumentDisplayModal from "~/components/DocumentDisplayModal.vue";
 import DocumentUploadModal from "~/components/DocumentUploadModal.vue";
 import dayjs from "dayjs";
 import arraySort from "array-sort";
-import {useTempStore} from "~/stores/temp.js";
 
-definePageMeta({
-  middleware: "auth"
-})
+
 
 defineShortcuts({
-  /*'/': () => {
-    //console.log(searchinput)
-    //searchinput.value.focus()
-    document.getElementById("searchinput").focus()
-  },*/
   '+': () => {
     //Hochladen
     uploadModalOpen.value = true
@@ -30,9 +21,10 @@ defineShortcuts({
 
       if(entry.type === "file") {
         showFile(entry.id)
-        console.log(entry)
-      } else {
+      } else if(createFolderModalOpen.value === false && entry.type === "folder") {
         changeFolder(currentFolders.value.find(i => i.id === entry.id))
+      } else if(createFolderModalOpen.value === true) {
+        createFolder()
       }
 
     }
@@ -55,13 +47,11 @@ defineShortcuts({
 
 const dataStore = useDataStore()
 const tempStore = useTempStore()
-const profileStore = useProfileStore()
-const supabase = useSupabaseClient()
 const router = useRouter()
 const route = useRoute()
 const modal = useModal()
 
-dataStore.fetchDocuments()
+const auth = useAuthStore()
 
 const uploadModalOpen = ref(false)
 const createFolderModalOpen = ref(false)
@@ -69,7 +59,7 @@ const uploadInProgress = ref(false)
 const fileUploadFormData = ref({
   tags: ["Eingang"],
   path: "",
-  tenant: profileStore.currentTenant,
+  tenant: auth.activeTenant,
   folder: null
 })
 
@@ -92,15 +82,16 @@ const isDragTarget = ref(false)
 const loaded = ref(false)
 
 const setupPage = async () => {
-  folders.value = await useSupabaseSelect("folders")
+  folders.value = await useEntities("folders").select()
 
   documents.value = await files.selectDocuments()
 
-  filetags.value = await useSupabaseSelect("filetags")
+  filetags.value = await useEntities("filetags").select()
 
   if(route.query) {
     if(route.query.folder) {
-      currentFolder.value = await useSupabaseSelectSingle("folders", route.query.folder)
+      currentFolder.value = await useEntities("folders").selectSingle(route.query.folder)
+
     }
   }
 
@@ -118,7 +109,6 @@ const setupPage = async () => {
   }
 
   dropZone.ondrop = async function (event) {
-    console.log("files dropped")
     event.preventDefault()
 
   }
@@ -213,14 +203,10 @@ const changeFolder = async (newFolder) => {
 
 const createFolderData = ref({})
 const createFolder = async () => {
-  const {data,error} = await supabase
-      .from("folders")
-      .insert({
-        tenant: profileStore.currentTenant,
-        parent: currentFolder.value ? currentFolder.value.id : undefined,
-        name: createFolderData.value.name,
-
-      })
+  const res = await useEntities("folders").create({
+    parent: currentFolder.value ? currentFolder.value.id : undefined,
+    name: createFolderData.value.name,
+  })
 
   createFolderModalOpen.value = false
 
@@ -229,61 +215,14 @@ const createFolder = async () => {
 }
 
 const downloadSelected = async () => {
-  const bucket = "filesdev";
 
   let files = []
 
   files = filteredDocuments.value.filter(i => selectedFiles.value[i.id] === true).map(i => i.path)
 
-  // If there are no files in the folder, throw an error
-  if (!files || !files.length) {
-    throw new Error("No files to download");
-  }
 
-  const promises = [];
+  await useFiles().downloadFile(undefined,Object.keys(selectedFiles.value))
 
-// Download each file in the folder
-  files.forEach((file) => {
-    promises.push(
-        supabase.storage.from(bucket).download(`${file}`)
-    );
-  });
-
-// Wait for all the files to download
-  const response = await Promise.allSettled(promises);
-
-// Map the response to an array of objects containing the file name and blob
-  const downloadedFiles = response.map((result, index) => {
-    if (result.status === "fulfilled") {
-
-      return {
-        name: files[index].split("/")[files[index].split("/").length -1],
-        blob: result.value.data,
-      };
-    }
-  });
-
-// Create a new zip file
-  const zipFileWriter = new BlobWriter("application/zip");
-  const zipWriter = new ZipWriter(zipFileWriter, { bufferedWrite: true });
-
-// Add each file to the zip file
-  downloadedFiles.forEach((downloadedFile) => {
-    if (downloadedFile) {
-      zipWriter.add(downloadedFile.name, new BlobReader(downloadedFile.blob));
-    }
-  });
-
-// Download the zip file
-  const url = URL.createObjectURL(await zipWriter.close());
-  const link = document.createElement("a");
-
-  link.href = url;
-  link.setAttribute("download", "dateien.zip");
-
-  document.body.appendChild(link);
-
-  link.click();
 }
 
 const searchString = ref(tempStore.searchStrings["files"] ||'')
@@ -295,7 +234,6 @@ const renderedFileList = computed(() => {
         type: "file"
       }
     })
-    console.log(currentFolders.value)
 
     arraySort(files, (a,b) => {
       let aVal = a.path ? a.path.split("/")[a.path.split("/").length -1] : null
@@ -338,7 +276,6 @@ const renderedFileList = computed(() => {
 const selectedFileIndex = ref(0)
 
 const showFile = (fileId) => {
-  console.log(fileId)
   modal.open(DocumentDisplayModal,{
     documentData: documents.value.find(i => i.id === fileId),
     onUpdatedNeeded: setupPage()
@@ -413,7 +350,10 @@ const clearSearchString = () => {
       </USelectMenu>
 
 
-      <UButton @click="modal.open(DocumentUploadModal,{fileData: {folder: currentFolder.id, type: currentFolder.standardFiletype, typeEnabled: currentFolder.standardFiletypeIsOptional}, onUploadFinished: () => {setupPage()}})">+ Datei</UButton>
+      <UButton
+          :disabled="!currentFolder"
+          @click="modal.open(DocumentUploadModal,{fileData: {folder: currentFolder.id, type: currentFolder.standardFiletype, typeEnabled: currentFolder.standardFiletypeIsOptional}, onUploadFinished: () => {setupPage()}})"
+      >+ Datei</UButton>
       <UButton
           @click="createFolderModalOpen = true"
           variant="outline"
diff --git a/pages/incomingInvoices/create.vue b/pages/incomingInvoices/create.vue
index 3f5c566..5dff367 100644
--- a/pages/incomingInvoices/create.vue
+++ b/pages/incomingInvoices/create.vue
@@ -4,9 +4,7 @@ import dayjs from "dayjs";
 import HistoryDisplay from "~/components/HistoryDisplay.vue";
 import {useSupabaseSelect} from "~/composables/useSupabase.js";
 
-definePageMeta({
-  middleware: "auth"
-})
+
 
 const dataStore = useDataStore()
 const profileStore = useProfileStore()
diff --git a/pages/incomingInvoices/edit/[id].vue b/pages/incomingInvoices/edit/[id].vue
index 914395c..c730939 100644
--- a/pages/incomingInvoices/edit/[id].vue
+++ b/pages/incomingInvoices/edit/[id].vue
@@ -4,16 +4,10 @@ import dayjs from "dayjs";
 import HistoryDisplay from "~/components/HistoryDisplay.vue";
 import {useSupabaseSelect} from "~/composables/useSupabase.js";
 
-definePageMeta({
-  middleware: "auth"
-})
+
 
 const dataStore = useDataStore()
-const profileStore = useProfileStore()
-const supabase = useSupabaseClient()
 const route = useRoute()
-const router = useRouter()
-const toast = useToast()
 
 const itemInfo = ref({
   vendor: 0,
@@ -36,14 +30,18 @@ const itemInfo = ref({
 })
 
 const costcentres = ref([])
+const vendors = ref([])
+const accounts = ref([])
 
 const setup = async () => {
-  let filetype = (await supabase.from("filetags").select().eq("tenant",profileStore.currentTenant).eq("incomingDocumentType","invoices").single()).data.id
+  let filetype = (await useEntities("filetags").select()).find(i=> i.incomingDocumentType === "invoices").id
   console.log(filetype)
 
-  costcentres.value = await useSupabaseSelect("costcentres")
+  costcentres.value = await useEntities("costcentres").select()
+  vendors.value = await useEntities("vendors").select()
+  accounts.value = await useEntities("accounts").selectSpecial()
 
-  itemInfo.value = await useSupabaseSelectSingle("incominginvoices", route.params.id, "*, files(*)")
+  itemInfo.value = await useEntities("incominginvoices").selectSingle(route.params.id, "*, files(*)")
   await loadFile(itemInfo.value.files[itemInfo.value.files.length-1].id)
 
 }
@@ -65,7 +63,7 @@ const loadFile = async (id) => {
 const changeNetMode = (mode) => {
   useNetMode.value = mode
 
-  itemInfo.value.accounts = [{account: null,amountNet: null,amountTax: null,taxType: '19'}]
+  //itemInfo.value.accounts = [{account: null,amountNet: null,amountTax: null,taxType: '19'}]
 }
 
 
@@ -139,7 +137,7 @@ const updateIncomingInvoice = async (setBooked = false) => {
   } else {
     item.state = "Entwurf"
   }
-  const data = await dataStore.updateItem('incominginvoices',item)
+  const data = await useEntities('incominginvoices').update(itemInfo.value.id,item)
 }
 
 const findIncomingInvoiceErrors = computed(() => {
@@ -172,6 +170,19 @@ const findIncomingInvoiceErrors = computed(() => {
 <template>
   <UDashboardNavbar :title="'Eingangsbeleg erstellen'">
     <template #right>
+      <ButtonWithConfirm
+          color="rose"
+          variant="outline"
+          @confirmed="useEntities('incominginvoices').archive(route.params.id)"
+      >
+        <template #button>
+          Archivieren
+        </template>
+        <template #header>
+          <span class="text-md text-black font-bold">Archivieren bestätigen</span>
+        </template>
+        Möchten Sie den Eingangsbeleg wirklich archivieren?
+      </ButtonWithConfirm>
       <UButton
           @click="updateIncomingInvoice(false)"
       >
@@ -234,7 +245,7 @@ const findIncomingInvoiceErrors = computed(() => {
             <InputGroup>
               <USelectMenu
                   v-model="itemInfo.vendor"
-                  :options="dataStore.vendors"
+                  :options="vendors"
                   option-attribute="name"
                   value-attribute="id"
                   searchable
@@ -247,7 +258,7 @@ const findIncomingInvoiceErrors = computed(() => {
                   {{option.vendorNumber}} - {{option.name}}
                 </template>
                 <template #label>
-                  {{dataStore.vendors.find(vendor => vendor.id === itemInfo.vendor) ? dataStore.vendors.find(vendor => vendor.id === itemInfo.vendor).name : 'Lieferant auswählen'}}
+                  {{vendors.find(vendor => vendor.id === itemInfo.vendor) ? vendors.find(vendor => vendor.id === itemInfo.vendor).name : 'Lieferant auswählen'}}
                 </template>
               </USelectMenu>
               <EntityModalButtons
@@ -256,10 +267,10 @@ const findIncomingInvoiceErrors = computed(() => {
                   @return-data="(data) => itemInfo.vendor = data.id"
               />
               <UButton
-                icon="i-heroicons-x-mark"
-                variant="outline"
-                color="rose"
-                @click="itemInfo.vendor = null"
+                  icon="i-heroicons-x-mark"
+                  variant="outline"
+                  color="rose"
+                  @click="itemInfo.vendor = null"
               />
             </InputGroup>
 
@@ -323,26 +334,26 @@ const findIncomingInvoiceErrors = computed(() => {
 
           <InputGroup class="my-3">
             <UButton
-              :variant="!useNetMode ? 'solid' : 'outline'"
-              @click="changeNetMode(false)"
+                :variant="!useNetMode ? 'solid' : 'outline'"
+                @click="changeNetMode(false)"
             >
               Brutto
             </UButton>
             <UButton
-              :variant="useNetMode ? 'solid' : 'outline'"
-              @click="changeNetMode(true)"
+                :variant="useNetMode ? 'solid' : 'outline'"
+                @click="changeNetMode(true)"
             >
               Netto
             </UButton>
 
 
 
-<!--            Brutto
-            <UToggle
-                v-model="useNetMode"
-                @update:model-value="itemInfo.accounts = [{account: null,amountNet: null,amountTax: null,taxType: '19'}]"
-            />
-            Netto-->
+            <!--            Brutto
+                        <UToggle
+                            v-model="useNetMode"
+                            @update:model-value="itemInfo.accounts = [{account: null,amountNet: null,amountTax: null,taxType: '19'}]"
+                        />
+                        Netto-->
           </InputGroup>
 
           <table v-if="itemInfo.accounts.length > 1" class="w-full">
@@ -369,7 +380,7 @@ const findIncomingInvoiceErrors = computed(() => {
                 class="mb-3"
             >
               <USelectMenu
-                  :options="dataStore.accounts"
+                  :options="accounts"
                   option-attribute="label"
                   value-attribute="id"
                   searchable
@@ -379,7 +390,7 @@ const findIncomingInvoiceErrors = computed(() => {
                   :color="!item.account ? 'rose' : 'primary'"
               >
                 <template #label>
-                  {{dataStore.accounts.find(account => account.id === item.account) ? dataStore.accounts.find(account => account.id === item.account).label : "Keine Kategorie ausgewählt" }}
+                  {{accounts.find(account => account.id === item.account) ? accounts.find(account => account.id === item.account).label : "Keine Kategorie ausgewählt" }}
                 </template>
 
               </USelectMenu>
diff --git a/pages/incomingInvoices/index.vue b/pages/incomingInvoices/index.vue
index 4911831..7050cfe 100644
--- a/pages/incomingInvoices/index.vue
+++ b/pages/incomingInvoices/index.vue
@@ -1,9 +1,7 @@
 <script setup>
 import dayjs from "dayjs"
 import {useSum} from "~/composables/useSum.js";
-definePageMeta({
-  middleware: "auth"
-})
+
 
 defineShortcuts({
   '/': () => {
@@ -44,9 +42,14 @@ const sum = useSum()
 
 const items = ref([])
 const selectedItem = ref(0)
+const sort = ref({
+  column: 'date',
+  direction: 'desc'
+})
 
 const setupPage = async () => {
-  items.value = await useSupabaseSelect("incominginvoices","*, vendor(id,name), statementallocations(id,amount)","created_at",false)
+  //items.value = await useSupabaseSelect("incominginvoices","*, vendor(id,name), statementallocations(id,amount)","created_at",false)
+  items.value = await useEntities("incominginvoices").select("*, vendor(id,name), statementallocations(id,amount)",sort.value.column,sort.value.direction === "asc")
 }
 
 setupPage()
@@ -54,26 +57,29 @@ setupPage()
 const templateColumns = [
   {
     key: 'reference',
-    label: "Referenz:"
+    label: "Referenz:",
+    sortable: true,
   }, {
     key: 'state',
     label: "Status:"
   },
   {
     key: "date",
-    label: "Datum"
+    label: "Datum",
+    sortable: true,
   },
   {
     key: "vendor",
-    label: "Lieferant"
+    label: "Lieferant",
   },
   {
     key: "amount",
-    label: "Betrag"
+    label: "Betrag",
   },
   {
     key: "dueDate",
-    label: "Fälligkeitsdatum"
+    label: "Fälligkeitsdatum",
+    sortable: true,
   },
   {
     key: "paid",
@@ -81,7 +87,8 @@ const templateColumns = [
   },
   {
     key: "paymentType",
-    label: "Zahlart"
+    label: "Zahlart",
+    sortable: true,
   },
   {
     key: "description",
@@ -92,6 +99,7 @@ const selectedColumns = ref(templateColumns)
 const columns = computed(() => templateColumns.filter((column) => selectedColumns.value.includes(column)))
 
 
+
 const searchString = ref(tempStore.searchStrings['incominginvoices'] ||'')
 
 const clearSearchString = () => {
@@ -185,6 +193,9 @@ const selectIncomingInvoice = (invoice) => {
 
   <UDashboardPanelContent>
     <UTable
+        v-model:sort="sort"
+        sort-mode="manual"
+        @update:sort="setupPage"
         :rows="filteredRows"
         :columns="columns"
         class="w-full"
diff --git a/pages/incomingInvoices/show/[id].vue b/pages/incomingInvoices/show/[id].vue
index 4aea25c..0c9e9e8 100644
--- a/pages/incomingInvoices/show/[id].vue
+++ b/pages/incomingInvoices/show/[id].vue
@@ -1,9 +1,7 @@
 <script setup>
 import dayjs from "dayjs";
 
-definePageMeta({
-  middleware: "auth"
-})
+
 
 const dataStore = useDataStore()
 const profileStore = useProfileStore()
diff --git a/pages/index.vue b/pages/index.vue
index d46258a..3e4a2e5 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1,13 +1,13 @@
 <template>
   <UDashboardNavbar title="Home">
     <template #right>
-      <UTooltip text="Notifications" :shortcuts="['N']">
+<!--      <UTooltip text="Notifications" :shortcuts="['N']">
         <UButton color="gray" variant="ghost" square @click="isNotificationsSlideoverOpen = true">
           <UChip :show="unreadMessages" color="primary" inset>
             <UIcon name="i-heroicons-bell" class="w-5 h-5" />
           </UChip>
         </UButton>
-      </UTooltip>
+      </UTooltip>-->
     </template>
   </UDashboardNavbar>
 
@@ -23,13 +23,11 @@
     <UPageGrid>
       <UDashboardCard
           title="Buchhaltung"
-          v-if="profileStore.ownTenant.features.accounting"
       >
         <display-open-balances/>
       </UDashboardCard>
       <UDashboardCard
           title="Bank"
-          v-if="profileStore.ownTenant.features.accounting"
       >
         <display-bankaccounts/>
       </UDashboardCard>
@@ -38,7 +36,7 @@
       >
         <display-projects-in-phases/>
       </UDashboardCard>
-      <UDashboardCard
+      <!--<UDashboardCard
           title="Anwesende"
       >
         <display-present-profiles/>
@@ -52,7 +50,7 @@
           title="Anwesenheiten"
       >
         <display-running-working-time/>
-      </UDashboardCard>
+      </UDashboardCard>-->
       <UDashboardCard
           title="Aufgaben"
       >
@@ -66,9 +64,7 @@
 
 import DisplayPresentProfiles from "~/components/noAutoLoad/displayPresentProfiles.vue";
 
-definePageMeta({
-  middleware: ["auth","redirect-to-mobile-index"]
-})
+
 
 const dataStore = useDataStore()
 const profileStore = useProfileStore()
@@ -76,24 +72,14 @@ const toast = useToast()
 const router = useRouter()
 
 const { isNotificationsSlideoverOpen } = useDashboard()
-const items = [[{
-  label: 'Aufgabe',
-  icon: 'i-heroicons-paper-airplane',
-  to: '/tasks/create'
-}, {
-  label: 'Kunde',
-  icon: 'i-heroicons-user-plus',
-  to: '/customers/create'
-}]]
 
 
-const supabase = useSupabaseClient()
+
 
 const user = useSupabaseUser()
 
-const unreadMessages = ref(false)
 const setup = async () => {
-  unreadMessages.value = (await supabase.from("notifications").select("id,read").eq("read",false)).data.length > 0
+
 }
 
 setup()
diff --git a/pages/inventory/index.vue b/pages/inventory/index.vue
index 8407047..9d344ff 100644
--- a/pages/inventory/index.vue
+++ b/pages/inventory/index.vue
@@ -1,7 +1,5 @@
 <script setup>
-definePageMeta({
-  middleware: "auth"
-})
+
 
 const dataStore = useDataStore()
 const profileStore = useProfileStore()
diff --git a/pages/inventory/stocks.vue b/pages/inventory/stocks.vue
index 3777c10..eabfbcd 100644
--- a/pages/inventory/stocks.vue
+++ b/pages/inventory/stocks.vue
@@ -63,9 +63,7 @@
 
 <script setup>
 
-definePageMeta({
-  middleware: "auth"
-})
+
 
 defineShortcuts({
   '/': () => {
diff --git a/pages/login.vue b/pages/login.vue
index f7744d7..511cf59 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -1,118 +1,32 @@
-<script setup >
-
-import {useProfileStore} from "~/stores/profile.js";
-import {useCapacitor} from "~/composables/useCapacitor.js";
-
+<script setup lang="ts">
 definePageMeta({
   layout: "notLoggedIn"
 })
 
-const supabase = useSupabaseClient()
-const user = useSupabaseUser()
-const router = useRouter()
-const colorMode = useColorMode()
+const auth = useAuthStore()
 const toast = useToast()
-const profileStore = useProfileStore()
-
-const isLight = computed({
-  get () {
-    return colorMode.value !== 'dark'
-  },
-  set () {
-    colorMode.preference = colorMode.value === 'dark' ? 'light' : 'dark'
-  }
-})
-
-
-const email = ref("")
-const password = ref("")
-
-const fields = [{
-  name: 'email',
-  type: 'text',
-  label: 'Email',
-  placeholder: 'E-Mail Adresse'
-}, {
-  name: 'password',
-  label: 'Password',
-  type: 'password',
-  placeholder: 'Passwort'
-}]
-
-const authenticateWithAzure = async () => {
-  const { data, error } = await supabase.auth.signInWithOAuth({
-    provider: 'azure',
-    options: {
-      scopes: 'email',
-    },
-  })
-
-  console.log(data)
-  console.log(error)
-}
-
-const onSubmit = async (data) => {
-
-  const {error, data:{ user}} = await supabase.auth.signInWithPassword({
-    email: data.email,
-    password: data.password
-  })
-  if(error) {
-    if(error.toString().toLowerCase().includes("invalid")){
-      toast.add({title:"Zugangsdaten falsch",color:"rose"})
-    }
-
-  } else {
-    //console.log("Login Successful")
-    profileStore.initializeData(user.id)
-
-    if(await useCapacitor().getIsPhone()) {
-      router.push("/mobile")
-    } else {
-      router.push("/")
-    }
 
 
 
 
+const doLogin = async (data:any) => {
+  try {
+    await auth.login(data.email, data.password)
+    // Weiterleiten nach erfolgreichem Login
+    toast.add({title:"Einloggen erfolgreich"})
+    return navigateTo("/")
+  } catch (err: any) {
+    toast.add({title:"Zugangsdaten falsch. Bitte überprüfen Sie Ihre Eingaben",color:"rose"})
   }
 }
-
 </script>
 
 <template>
-<!--  <div id="loginSite">
-    <div id="loginForm">
-      <UFormGroup
-          label="E-Mail:"
-      >
-        <UInput
-            v-model="email"
-        />
-      </UFormGroup>
-      <UFormGroup
-          label="Passwort:"
-      >
-        <UInput
-            v-model="password"
-            type="password"
-            @keyup.enter="onSubmit"
-        />
-      </UFormGroup>
-      <UButton
-          @click="onSubmit"
-          class="mt-3"
-      >
-        Einloggen
-      </UButton>
-    </div>
-
-  </div>-->
   <UCard class="max-w-sm w-full mx-auto mt-5">
 
     <UColorModeImage
-      light="/Logo.png"
-      dark="/Logo_Dark.png"
+        light="/Logo.png"
+        dark="/Logo_Dark.png"
     />
 
     <UAuthForm
@@ -131,29 +45,13 @@ const onSubmit = async (data) => {
             placeholder: 'Dein Passwort'
           }]"
         :loading="false"
-        @submit="onSubmit"
-        :providers="[{label: 'MS365',icon: 'i-simple-icons-microsoft',color: 'gray',click: authenticateWithAzure}]"
+        @submit="doLogin"
         :submit-button="{label: 'Weiter'}"
         divider="oder"
     >
-
+      <template #password-hint>
+        <NuxtLink to="/password-reset" class="text-primary font-medium">Passwort vergessen?</NuxtLink>
+      </template>
     </UAuthForm>
   </UCard>
-
-
-
-</template>
-
-<style scoped>
-#loginSite {
-  display: flex;
-  align-content: center;
-  justify-content: center;
-
-}
-
-#loginForm {
-  width: 30vw;
-  height: 30vh;
-}
-</style>
\ No newline at end of file
+</template>
\ No newline at end of file
diff --git a/pages/password-change.vue b/pages/password-change.vue
new file mode 100644
index 0000000..527a64f
--- /dev/null
+++ b/pages/password-change.vue
@@ -0,0 +1,62 @@
+<script setup lang="ts">
+definePageMeta({
+  layout: "notLoggedIn"
+})
+
+const auth = useAuthStore()
+const toast = useToast()
+
+
+
+
+const doChange = async (data:any) => {
+  try {
+    const res = await useNuxtApp().$api("/api/auth/password/change", {
+      method: "POST",
+      body: {
+        old_password: data.oldPassword,
+        new_password: data.newPassword,
+      }
+    })
+
+    // Weiterleiten nach erfolgreichem Login
+    toast.add({title:"Ändern erfolgreich"})
+    await auth.logout()
+    return navigateTo("/login")
+  } catch (err: any) {
+    toast.add({title:"Es gab ein Problem beim ändern",color:"rose"})
+  }
+}
+</script>
+
+<template>
+  <UCard class="max-w-sm w-full mx-auto mt-5">
+
+    <UColorModeImage
+        light="/Logo.png"
+        dark="/Logo_Dark.png"
+    />
+
+    <UAuthForm
+        title="Passwort zurücksetzen"
+        description="Geben Sie Ihre E-Mail ein um ein neues Passwort per E-Mail zu erhalten."
+        align="bottom"
+        :fields="[{
+            name: 'oldPassword',
+            label: 'Altes Passwort',
+            type: 'password',
+            placeholder: 'Dein altes Passwort'
+          },{
+            name: 'newPassword',
+            label: 'Neues Passwort',
+            type: 'password',
+            placeholder: 'Dein neues Passwort'
+          }]"
+        :loading="false"
+        @submit="doChange"
+        :submit-button="{label: 'Ändern'}"
+        divider="oder"
+    >
+    </UAuthForm>
+  </UCard>
+</template>
\ No newline at end of file
diff --git a/pages/password-reset.vue b/pages/password-reset.vue
new file mode 100644
index 0000000..e0abd34
--- /dev/null
+++ b/pages/password-reset.vue
@@ -0,0 +1,55 @@
+<script setup lang="ts">
+definePageMeta({
+  layout: "notLoggedIn"
+})
+
+const auth = useAuthStore()
+const toast = useToast()
+
+
+
+
+const doReset = async (data:any) => {
+  try {
+    const res = await useNuxtApp().$api("/auth/password/reset", {
+      method: "POST",
+      body: {
+        email: data.email
+      }
+    })
+
+    // Weiterleiten nach erfolgreichem Login
+    toast.add({title:"Zurücksetzen erfolgreich"})
+    return navigateTo("/login")
+  } catch (err: any) {
+    toast.add({title:"Problem beim zurücksetzen",color:"rose"})
+  }
+}
+</script>
+
+<template>
+  <UCard class="max-w-sm w-full mx-auto mt-5">
+
+    <UColorModeImage
+        light="/Logo.png"
+        dark="/Logo_Dark.png"
+    />
+
+    <UAuthForm
+        title="Passwort zurücksetzen"
+        description="Geben Sie Ihre E-Mail ein um ein neues Passwort per E-Mail zu erhalten."
+        align="bottom"
+        :fields="[{
+            name: 'email',
+            type: 'text',
+            label: 'Email',
+            placeholder: 'Deine E-Mail Adresse'
+          }]"
+        :loading="false"
+        @submit="doReset"
+        :submit-button="{label: 'Zurücksetzen'}"
+        divider="oder"
+    >
+    </UAuthForm>
+  </UCard>
+</template>
\ No newline at end of file
diff --git a/pages/profiles/index.vue b/pages/profiles/index.vue
index 129399e..6513a1a 100644
--- a/pages/profiles/index.vue
+++ b/pages/profiles/index.vue
@@ -3,13 +3,21 @@
   const profileStore = useProfileStore()
   const router = useRouter()
 
+  const items = ref([])
+
+  const setupPage = async () => {
+    items.value = (await useNuxtApp().$api("/api/tenant/users")).users
+    items.value = items.value.map(i => i.profile)
+  }
+
+  setupPage()
 
   const templateColumns = [
     {
-      key: 'employeeNumber',
+      key: 'employee_number',
       label: "MA-Nummer",
     },{
-      key: 'fullName',
+      key: 'full_name',
       label: "Name",
     },{
       key: "email",
@@ -26,6 +34,7 @@
       <template #right>
         <UButton
           @click="router.push(`/profiles/create`)"
+          disabled
         >
           + Mitarbeiter
         </UButton>
@@ -33,8 +42,7 @@
   </UDashboardNavbar>
 
   <UTable
-    :rows="profileStore.profiles"
-    @select="(item) => router.push(`/profiles/show/${item.id}`)"
+    :rows="items"
     :columns="columns"
   >
 
diff --git a/pages/projecttypes/[mode]/[[id]].vue b/pages/projecttypes/[mode]/[[id]].vue
index 928ea7d..49304b5 100644
--- a/pages/projecttypes/[mode]/[[id]].vue
+++ b/pages/projecttypes/[mode]/[[id]].vue
@@ -2,9 +2,7 @@
 
 import { v4 as uuidv4 } from 'uuid';
 
-definePageMeta({
-  middleware: "auth"
-})
+
 
 defineShortcuts({
   'backspace': () => {
@@ -23,8 +21,6 @@ defineShortcuts({
 })
 
 const openTab = ref(0)
-const dataStore = useDataStore()
-const supabase = useSupabaseClient()
 const route = useRoute()
 const router = useRouter()
 const toast = useToast()
@@ -55,9 +51,9 @@ const setKeys = () => {
 const setupPage = async() => {
 
   if(mode.value === "show" ){
-    itemInfo.value = await useSupabaseSelectSingle("projecttypes",route.params.id,"*")
+    itemInfo.value = await useEntities("projecttypes").selectSingle(route.params.id,"*")
   } else if (mode.value === "edit") {
-    itemInfo.value = await useSupabaseSelectSingle("projecttypes",route.params.id,"*")
+    itemInfo.value = await useEntities("projecttypes").selectSingle(route.params.id,"*")
   }
 
   if(mode.value === "create") {
@@ -76,7 +72,7 @@ setupPage()
 
 const addPhase = () => {
   itemInfo.value.initialPhases.push({label: '', icon: ''}),
-  setKeys
+      setKeys
 }
 
 </script>
@@ -101,13 +97,13 @@ const addPhase = () => {
     <template #right>
       <UButton
           v-if="mode === 'edit'"
-          @click="dataStore.updateItem('projecttypes',itemInfo,oldItemInfo)"
+          @click="useEntities('projecttypes').update(itemInfo.id, itemInfo)"
       >
         Speichern
       </UButton>
       <UButton
           v-else-if="mode === 'create'"
-          @click="dataStore.createNewItem('projecttypes', itemInfo)"
+          @click="useEntities('projecttypes').create( itemInfo)"
       >
         Erstellen
       </UButton>
@@ -160,7 +156,7 @@ const addPhase = () => {
           variant="outline"
           class="mb-5"
           v-if="mode === 'edit'"
-        description="Achtung Änderungen an diesem Projekttypen betreffen nur Projekte die damit neu erstellt werden. Bestehende Projekte bleiben unverändert."
+          description="Achtung Änderungen an diesem Projekttypen betreffen nur Projekte die damit neu erstellt werden. Bestehende Projekte bleiben unverändert."
       />
 
       <UFormGroup
@@ -244,9 +240,9 @@ const addPhase = () => {
                             selectedKeyForQuickAction = phase.key"
                 >+ Schnellaktion</UButton>
                 <UButton
-                  @click="phase.quickactions = phase.quickactions.filter(i => i.label !== button.label)"
-                  v-for="button in phase.quickactions"
-                  class="ml-1"
+                    @click="phase.quickactions = phase.quickactions.filter(i => i.label !== button.label)"
+                    v-for="button in phase.quickactions"
+                    class="ml-1"
                 >
                   {{ button.label }}
                 </UButton>
diff --git a/pages/projecttypes/index.vue b/pages/projecttypes/index.vue
index 8e38668..ce4b141 100644
--- a/pages/projecttypes/index.vue
+++ b/pages/projecttypes/index.vue
@@ -1,7 +1,5 @@
 <script setup>
-definePageMeta({
-  middleware: "auth"
-})
+
 
 defineShortcuts({
   '/': () => {
@@ -19,14 +17,14 @@ defineShortcuts({
     }
   },
   'arrowdown': () => {
-    if(selectedItem.value < filteredRows.value.length - 1) {
+    if (selectedItem.value < filteredRows.value.length - 1) {
       selectedItem.value += 1
     } else {
       selectedItem.value = 0
     }
   },
   'arrowup': () => {
-    if(selectedItem.value === 0) {
+    if (selectedItem.value === 0) {
       selectedItem.value = filteredRows.value.length - 1
     } else {
       selectedItem.value -= 1
@@ -36,14 +34,14 @@ defineShortcuts({
 
 
 const router = useRouter()
-
+const tempStore = useTempStore()
 
 const items = ref([])
 const selectedItem = ref(0)
 
 
 const setup = async () => {
-    items.value = await useSupabaseSelect("projecttypes","*")
+  items.value = await useEntities("projecttypes").select()
 }
 
 setup()
@@ -58,7 +56,7 @@ const templateColumns = [
 const selectedColumns = ref(templateColumns)
 const columns = computed(() => templateColumns.filter((column) => selectedColumns.value.includes(column)))
 
-const searchString = ref("")
+const searchString = ref(tempStore.searchStrings["projecttypes"] || '')
 
 const filteredRows = computed(() => {
   return useListFilter(searchString.value, items.value)
@@ -77,9 +75,10 @@ const filteredRows = computed(() => {
           placeholder="Suche..."
           class="hidden lg:block"
           @keydown.esc="$event.target.blur()"
+          @change="tempStore.modifySearchString('projecttypes',searchString)"
       >
         <template #trailing>
-          <UKbd value="/" />
+          <UKbd value="/"/>
         </template>
       </UInput>
 
@@ -96,8 +95,8 @@ const filteredRows = computed(() => {
       :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Projekttypen anzuzeigen' }"
   >
     <template #name-data="{row}">
-      <span class="text-primary-500 font-bold" v-if="row === filteredRows[selectedItem]">{{row.name}}</span>
-      <span v-else>{{row.name}}</span>
+      <span class="text-primary-500 font-bold" v-if="row === filteredRows[selectedItem]">{{ row.name }}</span>
+      <span v-else>{{ row.name }}</span>
     </template>
 
   </UTable>
diff --git a/pages/roles/[mode]/[[id]].vue b/pages/roles/[mode]/[[id]].vue
index 73f836d..9487de3 100644
--- a/pages/roles/[mode]/[[id]].vue
+++ b/pages/roles/[mode]/[[id]].vue
@@ -4,9 +4,7 @@ import DocumentList from "~/components/DocumentList.vue";
 import DocumentUpload from "~/components/DocumentUpload.vue";
 import {useSupabaseSelect} from "~/composables/useSupabase.js";
 
-definePageMeta({
-  middleware: "auth"
-})
+
 
 defineShortcuts({
   'backspace': () => {
diff --git a/pages/roles/index.vue b/pages/roles/index.vue
index 36a1d43..d9debf6 100644
--- a/pages/roles/index.vue
+++ b/pages/roles/index.vue
@@ -1,7 +1,5 @@
 <script setup>
-definePageMeta({
-  middleware: "auth"
-})
+
 
 const items = ref([])
 const setup = async () => {
diff --git a/pages/settings/index.vue b/pages/settings/index.vue
index 78654d9..ac8f9b1 100644
--- a/pages/settings/index.vue
+++ b/pages/settings/index.vue
@@ -1,7 +1,5 @@
 <script setup>
-definePageMeta({
-  middleware: "auth"
-})
+
 const dataStore = useDataStore()
 const profileStore = useProfileStore()
 const supabase = useSupabaseClient()
diff --git a/pages/settings/labels/index.vue b/pages/settings/labels/index.vue
index c25247e..d81fe8a 100644
--- a/pages/settings/labels/index.vue
+++ b/pages/settings/labels/index.vue
@@ -48,9 +48,7 @@
 
 <script setup>
 
-definePageMeta({
-  middleware: "auth"
-})
+
 
 defineShortcuts({
   '/': () => {
diff --git a/pages/settings/numberRanges.vue b/pages/settings/numberRanges.vue
index 72c2e37..c1819a1 100644
--- a/pages/settings/numberRanges.vue
+++ b/pages/settings/numberRanges.vue
@@ -1,13 +1,5 @@
 <script setup>
-definePageMeta({
-  middleware: "auth"
-})
-
-const supabase = useSupabaseClient()
-const dataStore = useDataStore()
-const profileStore = useProfileStore()
-
-
+const auth = useAuthStore()
 
 const resources = {
   customers: {
@@ -45,16 +37,19 @@ const resources = {
   }
 }
 
-const numberRanges = ref(profileStore.ownTenant.numberRanges)
+const numberRanges = ref(auth.activeTenantData.numberRanges)
 
 const updateNumberRanges = async (range) => {
 
-  const {data,error} = await supabase
-      .from("tenants")
-      .update({numberRanges: numberRanges.value})
-      .eq('id',profileStore.currentTenant)
+  const res = await useNuxtApp().$api(`/api/tenant/numberrange/${range}`,{
+    method: "PUT",
+    body: {
+      numberRange: numberRanges.value[range]
+    }
+  })
+
+  console.log(res)
 
-  await profileStore.fetchOwnTenant()
 }
 
 
@@ -62,7 +57,7 @@ const updateNumberRanges = async (range) => {
 
 <template>
   <UDashboardNavbar
-    title="Nummernkreise bearbeiten"
+      title="Nummernkreise bearbeiten"
   >
 
   </UDashboardNavbar>
@@ -76,7 +71,7 @@ const updateNumberRanges = async (range) => {
   </UDashboardToolbar>
 
   <table
-    class="m-3"
+      class="m-3"
   >
     <tr class="text-left">
       <th>Typ</th>
@@ -85,19 +80,19 @@ const updateNumberRanges = async (range) => {
       <th>Suffix</th>
     </tr>
     <tr
-      v-for="key in Object.keys(resources)"
+        v-for="key in Object.keys(resources)"
     >
       <td>{{resources[key].label}}</td>
       <td>
         <UInput
-          v-model="numberRanges[key].prefix"
-          @change="updateNumberRanges"
+            v-model="numberRanges[key].prefix"
+            @change="updateNumberRanges(key)"
         />
       </td>
       <td>
         <UInput
             v-model="numberRanges[key].nextNumber"
-            @change="updateNumberRanges"
+            @change="updateNumberRanges(key)"
             type="number"
             step="1"
         />
@@ -105,7 +100,7 @@ const updateNumberRanges = async (range) => {
       <td>
         <UInput
             v-model="numberRanges[key].suffix"
-            @change="updateNumberRanges"
+            @change="updateNumberRanges(key)"
         />
       </td>
     </tr>
@@ -114,4 +109,4 @@ const updateNumberRanges = async (range) => {
 
 <style scoped>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/settings/tenant.vue b/pages/settings/tenant.vue
index 0f93424..2295e35 100644
--- a/pages/settings/tenant.vue
+++ b/pages/settings/tenant.vue
@@ -1,8 +1,6 @@
 <script setup>
 
-const dataStore = useDataStore()
-const profileStore = useProfileStore()
-const supabase = useSupabaseClient()
+const auth = useAuthStore()
 
 const itemInfo = ref({
   features: {},
@@ -11,20 +9,21 @@ const itemInfo = ref({
 })
 
 const setupPage = async () => {
-  itemInfo.value = (await supabase.from("tenants").select().eq("id",profileStore.currentTenant).single()).data
+  itemInfo.value = auth.activeTenantData
   console.log(itemInfo.value)
 }
 
-const features = ref(profileStore.ownTenant.features)
-const businessInfo = ref(profileStore.ownTenant.businessInfo)
+const features = ref(auth.activeTenantData.features)
+const businessInfo = ref(auth.activeTenantData.businessInfo)
 
 const updateTenant = async (newData) => {
-    const {data,error} = await supabase.from("tenants")
-        .update(newData)
-        .eq("id",profileStore.currentTenant)
-        .select()
 
-    if (error) console.log(error)
+  const res = await useNuxtApp().$api(`/api/tenant/other/${auth.activeTenant}`, {
+    method: "PUT",
+    body: {
+      data: newData,
+    }
+  })
 }
 
 setupPage()
@@ -36,7 +35,7 @@ setupPage()
   </UDashboardNavbar>
   <UTabs
       class="p-5"
-    :items="[
+      :items="[
         {
           label: 'Dokubox'
         },{
@@ -167,4 +166,4 @@ setupPage()
 
 <style scoped>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/settings/texttemplates.vue b/pages/settings/texttemplates.vue
index 39c5b76..7850478 100644
--- a/pages/settings/texttemplates.vue
+++ b/pages/settings/texttemplates.vue
@@ -1,41 +1,43 @@
 <script setup>
-  const dataStore = useDataStore()
+const dataStore = useDataStore()
 
-  defineShortcuts({
-    '+': () => {
-      editTemplateModalOpen.value = true
-    }
-  })
-
-  const editTemplateModalOpen = ref(false)
-  const itemInfo = ref({})
-  const texttemplates = ref([])
-
-  const setup = async () => {
-    texttemplates.value = (await useSupabaseSelect("texttemplates")).filter(i => !i.archived)
+defineShortcuts({
+  '+': () => {
+    editTemplateModalOpen.value = true
   }
+})
 
-  setup()
+const editTemplateModalOpen = ref(false)
+const itemInfo = ref({})
+const texttemplates = ref([])
+const loading = ref(true)
 
-  const expand = ref({
-    openedRows: [],
-    row: {}
-  })
+const setup = async () => {
+  texttemplates.value = (await useEntities("texttemplates").select()).filter(i => !i.archived)
+  loading.value = false
+}
+
+setup()
+
+const expand = ref({
+  openedRows: [],
+  row: {}
+})
 
 
 </script>
 
 <template>
   <UDashboardNavbar
-    title="Text Vorlagen"
+      title="Text Vorlagen"
   >
-      <template #right>
-        <UButton
+    <template #right>
+      <UButton
           @click="editTemplateModalOpen = true, itemInfo = {}"
-        >
-          + Erstellen
-        </UButton>
-      </template>
+      >
+        + Erstellen
+      </UButton>
+    </template>
   </UDashboardNavbar>
   <UDashboardPanelContent>
     <UCard class="mx-5">
@@ -77,9 +79,11 @@
 
     <UTable
         class="mt-3"
-      :rows="texttemplates"
-      v-model:expand="expand"
-      :columns="[{key:'name',label:'Name'},{key:'documentType',label:'Dokumententyp'},{key:'default',label:'Standard'},{key:'pos',label:'Position'}]"
+        :rows="texttemplates"
+        :loading-state="{ icon: 'i-heroicons-arrow-path-20-solid', label: 'Loading...' }"
+        :loading="loading"
+        v-model:expand="expand" :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Textvorlagen anzuzeigen' }"
+        :columns="[{key:'name',label:'Name'},{key:'documentType',label:'Dokumententyp'},{key:'default',label:'Standard'},{key:'pos',label:'Position'}]"
     >
       <template #documentType-data="{row}">
         {{dataStore.documentTypesForCreation[row.documentType].label}}
@@ -121,26 +125,26 @@
     </UTable>
 
 
-<!--    <div class="w-3/4 mx-auto mt-5">
-      <UCard
-          v-for="template in dataStore.texttemplates"
-          class="mb-3"
-      >
-        <p class="text-2xl">{{dataStore.documentTypesForCreation[template.documentType].label}}</p>
-        <p class="text-xl">{{template.pos === 'startText' ? 'Einleitung' : 'Ende'}}</p>
-        <p class="text-justify">{{template.text}}</p>
-        <UButton
-            @click="itemInfo = template;
-             editTemplateModalOpen = true"
-          icon="i-heroicons-pencil-solid"
-          variant="outline"
-        />
-      </UCard>
-    </div>-->
+    <!--    <div class="w-3/4 mx-auto mt-5">
+          <UCard
+              v-for="template in dataStore.texttemplates"
+              class="mb-3"
+          >
+            <p class="text-2xl">{{dataStore.documentTypesForCreation[template.documentType].label}}</p>
+            <p class="text-xl">{{template.pos === 'startText' ? 'Einleitung' : 'Ende'}}</p>
+            <p class="text-justify">{{template.text}}</p>
+            <UButton
+                @click="itemInfo = template;
+                 editTemplateModalOpen = true"
+              icon="i-heroicons-pencil-solid"
+              variant="outline"
+            />
+          </UCard>
+        </div>-->
   </UDashboardPanelContent>
 
   <UModal
-    v-model="editTemplateModalOpen"
+      v-model="editTemplateModalOpen"
   >
     <UCard class="h-full">
       <template #header>
@@ -157,51 +161,51 @@
           />
         </UFormGroup>
         <UFormGroup
-          label="Dokumententyp:"
+            label="Dokumententyp:"
         >
 
           <USelectMenu
-            :options="Object.keys(dataStore.documentTypesForCreation).filter(i => i !== 'serialInvoices').map(i => {
+              :options="Object.keys(dataStore.documentTypesForCreation).filter(i => i !== 'serialInvoices').map(i => {
               return {
                 label: dataStore.documentTypesForCreation[i].label,
                 key: i
               }
             })"
-            option-attribute="label"
-            value-attribute="key"
-            v-model="itemInfo.documentType"
+              option-attribute="label"
+              value-attribute="key"
+              v-model="itemInfo.documentType"
           />
         </UFormGroup>
         <UFormGroup
-          label="Position:"
+            label="Position:"
         >
           <USelectMenu
-            :options="[{label:'Einleitung',key: 'startText'},{label:'Ende',key: 'endText'}]"
-            option-attribute="label"
-            value-attribute="key"
-            v-model="itemInfo.pos"
+              :options="[{label:'Einleitung',key: 'startText'},{label:'Ende',key: 'endText'}]"
+              option-attribute="label"
+              value-attribute="key"
+              v-model="itemInfo.pos"
           />
         </UFormGroup>
         <UFormGroup
-          label="Text:"
+            label="Text:"
         >
           <UTextarea
-            v-model="itemInfo.text"
+              v-model="itemInfo.text"
           />
         </UFormGroup>
       </UForm>
 
-
+<!-- TODO: Update und Create      -->
       <template #footer>
         <UButton
-          @click="dataStore.createNewItem('texttemplates',itemInfo);
+            @click="dataStore.createNewItem('texttemplates',itemInfo);
                   editTemplateModalOpen = false"
-          v-if="!itemInfo.id"
+            v-if="!itemInfo.id"
         >Erstellen</UButton>
         <UButton
-          @click="dataStore.updateItem('texttemplates',itemInfo);
+            @click="dataStore.updateItem('texttemplates',itemInfo);
                   editTemplateModalOpen = false"
-          v-if="itemInfo.id"
+            v-if="itemInfo.id"
         >Speichern</UButton>
       </template>
     </UCard>
diff --git a/pages/standardEntity/[type]/[[mode]]/[[id]].vue b/pages/standardEntity/[type]/[[mode]]/[[id]].vue
index 34673e3..e5f4e4c 100644
--- a/pages/standardEntity/[type]/[[mode]]/[[id]].vue
+++ b/pages/standardEntity/[type]/[[mode]]/[[id]].vue
@@ -3,12 +3,12 @@ import {setPageLayout} from "#app";
 import {useCapacitor} from "~/composables/useCapacitor.js";
 
 definePageMeta({
-  middleware: "auth",
   layout: "default",
 })
 const route = useRoute()
 const dataStore = useDataStore()
-const supabase = useSupabaseClient()
+const api = useNuxtApp().$api
+
 
 const type = route.params.type
 const platform = await useCapacitor().getIsPhone() ? "mobile" : "default"
@@ -22,31 +22,30 @@ const mode = ref("list")
 const items = ref([])
 const item = ref({})
 
-const setupPage = async () => {
 
-  if(await useCapacitor().getIsPhone()) {
+const setupPage = async (sort_column = null, sort_direction = null) => {
+  loaded.value = false
+
+  if (await useCapacitor().getIsPhone()) {
     setPageLayout("mobile")
   }
 
-  if(route.params.mode) mode.value = route.params.mode
+  if (route.params.mode) mode.value = route.params.mode
 
-  if(mode.value === "show") {
+  if (mode.value === "show") {
     //Load Data for Show
-    item.value = await useSupabaseSelectSingle(type, route.params.id, dataType.supabaseSelectWithInformation || "*")
-  } else if(mode.value === "edit") {
+    item.value = await useEntities(type).selectSingle(route.params.id, "*", true)
+  } else if (mode.value === "edit") {
     //Load Data for Edit
-    const data = JSON.stringify((await supabase.from(type).select().eq("id", route.params.id).single()).data)
-        //await useSupabaseSelectSingle(type, route.params.id)
-    item.value = data
+    item.value = JSON.stringify(await useEntities(type).selectSingle(route.params.id))
 
-  }  else if(mode.value === "create") {
+  } else if (mode.value === "create") {
     //Load Data for Create
     item.value = JSON.stringify({})
-
     console.log(item.value)
-  } else if(mode.value === "list") {
+  } else if (mode.value === "list") {
     //Load Data for List
-    items.value = await useSupabaseSelect(type, dataType.supabaseSelectWithInformation || "*", dataType.supabaseSortColumn,dataType.supabaseSortAscending || false, true)
+    items.value = await useEntities(type).select(dataType.supabaseSelectWithInformation, sort_column || dataType.supabaseSortColumn, sort_direction === "asc")
   }
 
   loaded.value = true
@@ -66,17 +65,19 @@ setupPage()
       :platform="platform"
   />
   <EntityEdit
-      v-else-if="loaded && (mode === 'edit' || mode === 'create')"
+      v-else-if="(mode === 'edit' || mode === 'create')"
       :type="route.params.type"
       :item="item"
       :mode="mode"
       :platform="platform"
   />
   <EntityList
-      v-else-if="loaded && mode === 'list'"
+      :loading="!loaded"
+      v-else-if="mode === 'list'"
       :type="type"
       :items="items"
       :platform="platform"
+      @sort="(i) => setupPage(i.sort_column, i.sort_direction)"
   />
   <UProgress
       v-else
diff --git a/pages/test.vue b/pages/test.vue
new file mode 100644
index 0000000..a39d54e
--- /dev/null
+++ b/pages/test.vue
@@ -0,0 +1,15 @@
+<script setup lang="ts">
+
+async function handleSingle() {
+  await useFiles().downloadFile("f60e8466-7136-4492-ad94-a60603bc3c38") // Einzel-Download
+}
+
+async function handleMulti() {
+  await useFiles().downloadFile(undefined, ["f60e8466-7136-4492-ad94-a60603bc3c38", "f60e8466-7136-4492-ad94-a60603bc3c38"]) // Multi-Download ZIP
+}
+</script>
+
+<template>
+  <button @click="handleSingle">Einzeldatei</button>
+  <button @click="handleMulti">Mehrere als ZIP</button>
+</template>
\ No newline at end of file
diff --git a/pages/times/index.vue b/pages/times/index.vue
index 92b9eb4..be4249a 100644
--- a/pages/times/index.vue
+++ b/pages/times/index.vue
@@ -5,9 +5,7 @@ import '@vuepic/vue-datepicker/dist/main.css'
 import {setPageLayout} from "#app";
 
 
-definePageMeta({
-  middleware: "auth"
-})
+
 
 const dataStore = useDataStore()
 const profileStore = useProfileStore()
diff --git a/pages/trackingTrips/[mode]/[[id]].client.vue b/pages/trackingTrips/[mode]/[[id]].client.vue
index 576f7b8..159e655 100644
--- a/pages/trackingTrips/[mode]/[[id]].client.vue
+++ b/pages/trackingTrips/[mode]/[[id]].client.vue
@@ -4,9 +4,7 @@ import {useSupabaseSelectSingle} from "~/composables/useSupabase.js";
 
 
 
-definePageMeta({
-  middleware: "auth"
-})
+
 
 defineShortcuts({
   'backspace': () => {
diff --git a/pages/trackingTrips/index.vue b/pages/trackingTrips/index.vue
index 802c273..0d3e232 100644
--- a/pages/trackingTrips/index.vue
+++ b/pages/trackingTrips/index.vue
@@ -67,9 +67,7 @@
 
 import dayjs from "dayjs";
 
-definePageMeta({
-  middleware: "auth"
-})
+
 
 defineShortcuts({
   '/': () => {
diff --git a/pages/workingtimes/index.vue b/pages/workingtimes/index.vue
index e8a5f9e..7bb9c23 100644
--- a/pages/workingtimes/index.vue
+++ b/pages/workingtimes/index.vue
@@ -7,9 +7,7 @@ import FloatingActionButton from "~/components/mobile/FloatingActionButton.vue";
 
 dayjs.extend(customParseFormat)
 
-definePageMeta({
-  middleware: "auth"
-})
+
 
 const dataStore = useDataStore()
 const profileStore = useProfileStore()
diff --git a/plugins/api.ts b/plugins/api.ts
new file mode 100644
index 0000000..cb99a85
--- /dev/null
+++ b/plugins/api.ts
@@ -0,0 +1,24 @@
+export default defineNuxtPlugin(() => {
+    const api = $fetch.create({
+        baseURL: "https://backend.fedeo.io",
+        credentials: "include",
+        onRequest({ options }) {
+            // Token aus Cookie holen
+            let token = useCookie("token").value
+
+            // Falls im Request explizit ein anderer JWT übergeben wird → diesen verwenden
+            if (options.context && (options.context as any).jwt) {
+                token = (options.context as any).jwt
+            }
+
+            if (token) {
+                options.headers = {
+                    ...options.headers,
+                    Authorization: `Bearer ${token}`,
+                }
+            }
+        }
+    })
+
+    return { provide: { api } }
+})
\ No newline at end of file
diff --git a/plugins/auth-init.client.ts b/plugins/auth-init.client.ts
new file mode 100644
index 0000000..68affde
--- /dev/null
+++ b/plugins/auth-init.client.ts
@@ -0,0 +1,4 @@
+export default defineNuxtPlugin(async () => {
+    const auth = useAuthStore()
+    await auth.init()
+})
\ No newline at end of file
diff --git a/stores/auth.ts b/stores/auth.ts
new file mode 100644
index 0000000..146169b
--- /dev/null
+++ b/stores/auth.ts
@@ -0,0 +1,94 @@
+import { defineStore } from "pinia"
+import router from "#app/plugins/router";
+
+export const useAuthStore = defineStore("auth", {
+    state: () => ({
+        user: null as null | { user_id: string; email: string; tenant_id?: string; role?: string },
+        profile: null as null | any,
+        tenants: [] as { tenant_id: string; role: string; tenants: { id: string; name: string } }[],
+        permissions: [] as string[],
+        activeTenant: null as any,
+        activeTenantData: null as any,
+        loading: true as boolean,
+    }),
+
+    actions: {
+        async init(token) {
+            await this.fetchMe(token)
+        },
+
+        async login(email: string, password: string) {
+            const { token } = await useNuxtApp().$api("/auth/login", {
+                method: "POST",
+                body: { email, password }
+            })
+            useCookie("token").value = token // persistieren
+            await this.fetchMe(token)
+        },
+
+        async logout() {
+            try {
+                await useNuxtApp().$api("/auth/logout", { method: "POST" })
+            } catch (e) {
+                console.error("Logout fehlgeschlagen:", e)
+            }
+            this.user = null
+            this.permissions = []
+            this.profile = null
+            this.activeTenant = null
+            this.tenants = []
+            useCookie("token").value = null
+            navigateTo("/login")
+        },
+
+        async fetchMe(jwt= null) {
+            try {
+                const me = await useNuxtApp().$api("/api/me", {
+                    headers: { Authorization: `Bearer ${jwt}`,
+                        context: {
+                            jwt
+                        }}
+                })
+                console.log(me)
+                this.user = me.user
+                this.permissions = me.permissions
+                this.tenants = me.tenants
+
+                this.tenants.sort(function (a, b) {
+                    if (a.id < b.id)  return -1
+                    if (a.id > b.id)  return 1
+                })
+
+                this.profile = me.profile
+
+                if(me.activeTenant) {
+                    this.activeTenant = me.activeTenant
+                    this.activeTenantData = me.tenants.find(i => i.id === me.activeTenant)
+                    this.loading = false
+
+                } else {
+
+                }
+
+
+            } catch (err: any) {
+                if (err?.response?.status === 401) this.logout()
+            }
+        },
+
+        async switchTenant(tenant_id: string) {
+            this.loading = true
+            const { token } = await useNuxtApp().$api("/api/tenant/switch", {
+                method: "POST",
+                body: { tenant_id }
+            })
+            useCookie("token").value = token
+            await this.init(token)
+            navigateTo("/")
+        },
+
+        hasPermission(key: string) {
+            return this.permissions.includes(key)
+        }
+    }
+})
\ No newline at end of file
diff --git a/stores/data.js b/stores/data.js
index 3eed2dd..dd9f12d 100644
--- a/stores/data.js
+++ b/stores/data.js
@@ -92,14 +92,16 @@ export const useDataStore = defineStore('data', () => {
                     key: "created_at",
                     label: "Erstellt am",
                     component: created_at,
-                    inputColumn: "Allgemeines"
+                    inputColumn: "Allgemeines",
+                    sortable: true
                 },{
                     key: "name",
                     label: "Name",
                     title: true,
                     required: true,
                     inputType: "text",
-                    inputColumn: "Allgemeines"
+                    inputColumn: "Allgemeines",
+                    sortable: true
                 },{
                     key: "categorie",
                     label: "Kategorie",
@@ -111,7 +113,8 @@ export const useDataStore = defineStore('data', () => {
                         {label:"In Bearbeitung"},
                         {label:"Abgeschlossen"}
                     ],
-                    inputColumn: "Allgemeines"
+                    inputColumn: "Allgemeines",
+                    sortable: true
                 },{
                     key: "profile",
                     label: "Mitarbeiter",
@@ -191,7 +194,8 @@ export const useDataStore = defineStore('data', () => {
                     label: "Kundennummer",
                     inputIsNumberRange: true,
                     inputType: "text",
-                    inputColumn: "Allgemeines"
+                    inputColumn: "Allgemeines",
+                    sortable: true
                 }, {
                     key: "isCompany",
                     label: "Firmenkunde",
@@ -210,7 +214,9 @@ export const useDataStore = defineStore('data', () => {
                     showFunction: function (item) {
                         return item.isCompany
                     },
-                    inputColumn: "Allgemeines"
+                    inputColumn: "Allgemeines",
+                    sortable: true,
+                    maxLength: 20
                 }, {
                     key: "nameAddition",
                     label: "Firmenname Zusatz",
@@ -221,7 +227,8 @@ export const useDataStore = defineStore('data', () => {
                     showFunction: function (item) {
                         return item.isCompany
                     },
-                    inputColumn: "Allgemeines"
+                    inputColumn: "Allgemeines",
+                    maxLength: 20
                 },{
                     key: "salutation",
                     label: "Anrede",
@@ -247,7 +254,8 @@ export const useDataStore = defineStore('data', () => {
                     showFunction: function (item) {
                         return !item.isCompany
                     },
-                    inputColumn: "Allgemeines"
+                    inputColumn: "Allgemeines",
+                    sortable: true
                 },{
                     key: "title",
                     label: "Titel",
@@ -333,17 +341,20 @@ export const useDataStore = defineStore('data', () => {
                     label: "Aktiv",
                     component: active,
                     inputType: "bool",
-                    inputColumn: "Allgemeines"
+                    inputColumn: "Allgemeines",
+                    sortable: true
                 }, {
                     key: "customPaymentDays",
                     label: "Zahlungsziel in Tagen",
                     inputType: "number",
-                    inputColumn: "Allgemeines"
+                    inputColumn: "Allgemeines",
+                    sortable: true
                 }, {
                     key: "customSurchargePercentage",
                     label: "Individueller Aufschlag",
                     inputType: "number",
-                    inputColumn: "Allgemeines"
+                    inputColumn: "Allgemeines",
+                    sortable: true
                 }, {
                     key: "infoData.street",
                     label: "Straße + Hausnummer",
@@ -368,14 +379,16 @@ export const useDataStore = defineStore('data', () => {
                         }
                     },
                     disabledInTable: true,
-                    inputColumn: "Kontaktdaten"
+                    inputColumn: "Kontaktdaten",
+                    sortable: true
                 },
                 {
                     key: "infoData.city",
                     label: "Stadt",
                     inputType: "text",
                     disabledInTable: true,
-                    inputColumn: "Kontaktdaten"
+                    inputColumn: "Kontaktdaten",
+                    sortable: true
                 },
                 {
                     key: "infoData.country",
@@ -385,7 +398,8 @@ export const useDataStore = defineStore('data', () => {
                     selectOptionAttribute: "name",
                     selectValueAttribute: "name",
                     disabledInTable: true,
-                    inputColumn: "Kontaktdaten"
+                    inputColumn: "Kontaktdaten",
+                    sortable: true
                 },
                 {
                     key: "address",
@@ -429,17 +443,17 @@ export const useDataStore = defineStore('data', () => {
                     inputType: "textarea",
                     inputColumn: "Allgemeines"
                 },
-                {
+                /*{
                     key: "profiles",
                     label: "Berechtigte Benutzer",
                     inputType: "select",
                     selectDataType: "profiles",
                     selectOptionAttribute: "fullName",
                     selectSearchAttributes: ['fullName'],
-                    selectMultiple: true,
-                    component: profiles,
+                    selectMultiple: true,/!*
+                    component: profiles,*!/
                     inputColumn: "Allgemeines"
-                },
+                },*/
             ],
             showTabs: [{label: 'Informationen'},{label: 'Ansprechpartner'},{label: 'Dateien'},{label: 'Ausgangsbelege'},{label: 'Projekte'},{label: 'Objekte'},{label: 'Termine'},{label: 'Verträge'}]
         },
@@ -467,13 +481,15 @@ export const useDataStore = defineStore('data', () => {
                     key: "fullName",
                     label: "Name",
                     title: true,
+                    sortable: true
                 },{
                     key: "salutation",
                     label: "Anrede",
                     inputType: "text",
                     inputChangeFunction: function (row) {
                         row.fullName = `${row.firstName} ${row.lastName}`
-                    }
+                    },
+                    sortable: true
                 },{
                     key: "title",
                     label: "Titel",
@@ -501,7 +517,8 @@ export const useDataStore = defineStore('data', () => {
                     key: "active",
                     label: "Aktiv",
                     component: active,
-                    inputType: "bool"
+                    inputType: "bool",
+                    sortable: true
                 },
                 {
                     key: "customer",
@@ -549,6 +566,7 @@ export const useDataStore = defineStore('data', () => {
                     key: "birthday",
                     label: "Geburtstag",
                     inputType: "date",
+                    sortable: true
                 },
                 {
                     key: "notes",
@@ -591,7 +609,8 @@ export const useDataStore = defineStore('data', () => {
                     label: "Vertragsnummer",
                     inputIsNumberRange: true,
                     inputType: "text",
-                    inputColumn: "Allgemeines"
+                    inputColumn: "Allgemeines",
+                    sortable: true
                 },
                 {
                     key: "name",
@@ -599,19 +618,22 @@ export const useDataStore = defineStore('data', () => {
                     label: "Name",
                     title: true,
                     inputType: "text",
-                    inputColumn: "Allgemeines"
+                    inputColumn: "Allgemeines",
+                    sortable: true
                 },{
                     key: "active",
                     label: "Aktiv",
                     component: active,
                     inputType: "bool",
-                    inputColumn: "Allgemeines"
+                    inputColumn: "Allgemeines",
+                    sortable: true
                 },{
                     key: "recurring",
                     label: "Wiederkehrend",
                     component: recurring,
                     inputType: "bool",
-                    inputColumn: "Allgemeines"
+                    inputColumn: "Allgemeines",
+                    sortable: true
                 },{
                     key: 'customer',
                     label: "Kunde",
@@ -645,7 +667,8 @@ export const useDataStore = defineStore('data', () => {
                         {label:'36 Monate'},
                         {label:'48 Monate'},
                         ],
-                    inputColumn: "Allgemeines"
+                    inputColumn: "Allgemeines",
+                    sortable: true
                 },{
                     key: 'invoiceDispatch',
                     label: "Rechnungsversand",
@@ -655,7 +678,8 @@ export const useDataStore = defineStore('data', () => {
                         {label:'E-Mail'},
                         {label:'Post'}
                     ],
-                    inputColumn: "Abrechnung"
+                    inputColumn: "Abrechnung",
+                    sortable: true
                 },{
                     key: 'paymentType',
                     label: "Zahlungsart",
@@ -671,19 +695,22 @@ export const useDataStore = defineStore('data', () => {
                     label: "Vertragsstart",
                     inputType: "date",
                     inputColumn: "Allgemeines",
-                    component: startDate
+                    component: startDate,
+                    sortable: true
                 },{
                     key: 'endDate',
                     label: "Vertragsende",
                     inputType: "date",
                     inputColumn: "Allgemeines",
-                    component: endDate
+                    component: endDate,
+                    sortable: true
                 },{
                     key: 'signDate',
                     label: "Unterschrieben am",
                     inputType: "date",
                     inputColumn: "Allgemeines",
-                    component: signDate
+                    component: signDate,
+                    sortable: true
                 },{
                     key: 'sepaDate',
                     label: "SEPA Datum",
@@ -798,13 +825,15 @@ export const useDataStore = defineStore('data', () => {
                     required: true,
                     label: "Start",
                     inputType: "date",
-                    component: startDate
+                    component: startDate,
+                    sortable: true
                 },{
                     key: "endDate",
                     required: true,
                     label: "Ende",
                     inputType: "date",
-                    component: endDate
+                    component: endDate,
+                    sortable: true
                 },{
                     key: "note",
                     label: "Notizen",
@@ -820,6 +849,7 @@ export const useDataStore = defineStore('data', () => {
             isStandardEntity: true,
             redirect:true,
             historyItemHolder: "plant",
+            supabaseSortColumn:"name",
             supabaseSelectWithInformation: "*, customer(id,name)",
             filters: [{
                 name: "Archivierte ausblenden",
@@ -838,7 +868,8 @@ export const useDataStore = defineStore('data', () => {
                     label: "Name",
                     required: true,
                     inputType: "text",
-                    title: true
+                    title: true,
+                    sortable: true
                 },
                 {
                     key: "customer",
@@ -1027,7 +1058,8 @@ export const useDataStore = defineStore('data', () => {
             templateColumns: [
                 {
                 key: "projectNumber",
-                label: "Projektnummer"
+                label: "Projektnummer",
+                    sortable: true
                 },
                 {
                     key: "projecttype",
@@ -1040,7 +1072,8 @@ export const useDataStore = defineStore('data', () => {
                     selectSearchAttributes: ['name'],
                     inputChangeFunction: function (item,loadedOptions = {}) {
                         item.phases = loadedOptions.projecttypes.find(i => i.id === item.projecttype).initialPhases
-                    }
+                    },
+                    sortable: true
                 },{
                     key: "phase",
                     label: "Phase",
@@ -1050,7 +1083,8 @@ export const useDataStore = defineStore('data', () => {
                     label: "Name",
                     required: true,
                     title: true,
-                    inputType: "text"
+                    inputType: "text",
+                    sortable: true
                 },
                 {
                     key: "customer",
@@ -1080,16 +1114,17 @@ export const useDataStore = defineStore('data', () => {
                     label: "Notizen",
                     inputType: "textarea"
                 },
-                {
+                /*{
                     key: "profiles",
                     label: "Berechtigte Benutzer",
                     inputType: "select",
                     selectDataType: "profiles",
                     selectOptionAttribute: "fullName",
                     selectSearchAttributes: ['fullName'],
-                    selectMultiple: true,
-                    component: profiles
-                },],
+                    selectMultiple: true,/!*
+                    component: profiles,*!/
+                    inputColumn: "Allgemeines"
+                },*/],
             showTabs: [
                 {
                 key: "information",
@@ -1128,6 +1163,7 @@ export const useDataStore = defineStore('data', () => {
             isStandardEntity: true,
             redirect:true,
             historyItemHolder: "vehicle",
+            supabaseSortColumn:"licensePlate",
             supabaseSelectWithInformation: "*, checks(*), files(*)",
             filters:[{
                 name: "Archivierte ausblenden",
@@ -1145,13 +1181,15 @@ export const useDataStore = defineStore('data', () => {
                     key: 'active',
                     label: "Aktiv",
                     component: active,
-                    inputType: "bool"
+                    inputType: "bool",
+                    sortable: true
                 },{
                     key: 'licensePlate',
                     label: "Kennzeichen",
                     required: true,
                     inputType: "text",
-                    title: true
+                    title: true,
+                    sortable: true
                 },{
                     key: 'vin',
                     label: "Identifikationnummer",
@@ -1185,7 +1223,8 @@ export const useDataStore = defineStore('data', () => {
                     key: "towingCapacity",
                     label: "Anhängelast",
                     unit: "Kg",
-                    inputType: "number"
+                    inputType: "number",
+                    sortable: true
                 },
                 {
                     key: "color",
@@ -1196,18 +1235,20 @@ export const useDataStore = defineStore('data', () => {
                     key: "powerInKW",
                     label: "Leistung",
                     unit: "kW",
-                    inputType: "number"
+                    inputType: "number",
+                    sortable: true
                 },
-                {
+                /*{
                     key: "profiles",
                     label: "Berechtigte Benutzer",
                     inputType: "select",
                     selectDataType: "profiles",
                     selectOptionAttribute: "fullName",
                     selectSearchAttributes: ['fullName'],
-                    selectMultiple: true,
-                    component: profiles
-                },
+                    selectMultiple: true,/!*
+                    component: profiles,*!/
+                    inputColumn: "Allgemeines"
+                },*/
             ],
             showTabs: [
                 {
@@ -1250,14 +1291,16 @@ export const useDataStore = defineStore('data', () => {
                     key: 'vendorNumber',
                     label: "Lieferantennummer",
                     inputType: "text",
-                    inputIsNumberRange: true
+                    inputIsNumberRange: true,
+                    sortable: true
                 },
                 {
                     key: "name",
                     required: true,
                     label: "Name",
                     title: true,
-                    inputType: "text"
+                    inputType: "text",
+                    sortable: true
                 },
                 {
                     key: "infoData.streetNumber",
@@ -1344,16 +1387,17 @@ export const useDataStore = defineStore('data', () => {
                     label: "Notizen",
                     inputType: "textarea"
                 },
-                {
+                /*{
                     key: "profiles",
                     label: "Berechtigte Benutzer",
                     inputType: "select",
                     selectDataType: "profiles",
                     selectOptionAttribute: "fullName",
                     selectSearchAttributes: ['fullName'],
-                    selectMultiple: true,
-                    component: profiles
-                },
+                    selectMultiple: true,/!*
+                    component: profiles,*!/
+                    inputColumn: "Allgemeines"
+                },*/
             ],
             showTabs: [
                 {
@@ -1401,14 +1445,16 @@ export const useDataStore = defineStore('data', () => {
                     inputType: "text",
                     required: true,
                     title: true,
-                    inputColumn: "Allgemeines"
+                    inputColumn: "Allgemeines",
+                    sortable: true
                 },
                 {
                     key: 'spaceNumber',
                     label: "Lagerplatznr.",
                     inputType: "text",
                     inputIsNumberRange: true,
-                    inputColumn: "Allgemeines"
+                    inputColumn: "Allgemeines",
+                    sortable: true
                 },
                 {
                     key: "type",
@@ -1423,7 +1469,8 @@ export const useDataStore = defineStore('data', () => {
                         {label:"Palettenplatz"},
                         {label:"Sonstiges"}
                     ],
-                    inputColumn: "Allgemeines"
+                    inputColumn: "Allgemeines",
+                    sortable: true
                 },
                 {
                     key: "parentSpace",
@@ -1506,6 +1553,18 @@ export const useDataStore = defineStore('data', () => {
             labelSingle: "Dokument",
             supabaseSelectWithInformation: "*, files(*), statementallocations(*)",
         },
+        files: {
+            isArchivable: true,
+            label: "Dateien",
+            labelSingle: "Datei",
+            supabaseSelectWithInformation: "*",
+        },
+        folders: {
+            isArchivable: true,
+            label: "Ordner",
+            labelSingle: "Ordner",
+            supabaseSelectWithInformation: "*",
+        },
         incominginvoices: {
             label: "Eingangsrechnungen",
             labelSingle: "Eingangsrechnung",
@@ -1542,19 +1601,22 @@ export const useDataStore = defineStore('data', () => {
                     title: true,
                     required: true,
                     inputType: "text",
-                    inputColumn: "Allgemeines"
+                    inputColumn: "Allgemeines",
+                    sortable: true
                 },
                 {
                     key: "usePlanning",
                     label: "In Plantafel anzeigen",
                     inputType: "bool",
                     inputColumn: "Allgemeines",
-                    component: usePlanning
+                    component: usePlanning,
+                    sortable: true
                 },
                 {
                     key: "description",
                     label: "Beschreibung",
                     inputType: "textarea",
+                    sortable: true
                 },
                 {
                     key: "currentSpace",
@@ -1571,7 +1633,8 @@ export const useDataStore = defineStore('data', () => {
                     label: "Artikelnummer",
                     inputType: "text",
                     inputIsNumberRange: true,
-                    inputColumn: "Allgemeines"
+                    inputColumn: "Allgemeines",
+                    sortable: true
                 },
                 {
                     key: "serialNumber",
@@ -1583,7 +1646,8 @@ export const useDataStore = defineStore('data', () => {
                     key: "purchaseDate",
                     label: "Kaufdatum",
                     inputType: "date",
-                    inputColumn: "Anschaffung"
+                    inputColumn: "Anschaffung",
+                    sortable: true
                 },
                 {
                     key: "vendor",
@@ -1603,14 +1667,16 @@ export const useDataStore = defineStore('data', () => {
                     disabledFunction: function (item) {
                         return item.serialNumber
                     },
-                    helpComponent: quantity
+                    helpComponent: quantity,
+                    sortable: true
                 },
                 {
                     key: "purchasePrice",
                     label: "Kaufpreis",
                     inputType: "number",
                     inputStepSize: "0.01",
-                    inputColumn: "Anschaffung"
+                    inputColumn: "Anschaffung",
+                    sortable: true
                 },
                 {
                     key: "manufacturer",
@@ -1624,22 +1690,24 @@ export const useDataStore = defineStore('data', () => {
                     inputType: "text",
                     inputColumn: "Anschaffung"
                 },
-                {
+                /*{
                     key: "profiles",
                     label: "Berechtigte Benutzer",
                     inputType: "select",
                     selectDataType: "profiles",
                     selectOptionAttribute: "fullName",
                     selectSearchAttributes: ['fullName'],
-                    selectMultiple: true,
-                    component: profiles
-                },
+                    selectMultiple: true,/!*
+                    component: profiles,*!/
+                    inputColumn: "Allgemeines"
+                },*/
                 {
                     key: "currentValue",
                     label: "Aktueller Wert",
                     inputType: "number",
                     inputStepSize: "0.01",
-                    inputColumn: "Anschaffung"
+                    inputColumn: "Anschaffung",
+                    sortable: true
                 },
 
             ],
@@ -1677,6 +1745,7 @@ export const useDataStore = defineStore('data', () => {
                     title: true,
                     required: true,
                     inputType: "text",
+                    sortable: true
                 },
                 {
                     key: "description",
@@ -1698,16 +1767,17 @@ export const useDataStore = defineStore('data', () => {
                     selectMultiple: true,
                     required: true,
                     component: inventoryitemsWithLoad
-                },{
+                },/*{
                     key: "profiles",
                     label: "Berechtigte Benutzer",
                     inputType: "select",
                     selectDataType: "profiles",
                     selectOptionAttribute: "fullName",
                     selectSearchAttributes: ['fullName'],
-                    selectMultiple: true,
-                    component: profiles
-                },
+                    selectMultiple: true,/!*
+                    component: profiles,*!/
+                    inputColumn: "Allgemeines"
+                },*/
 
             ],
             showTabs: [
@@ -1759,16 +1829,17 @@ export const useDataStore = defineStore('data', () => {
                     title: true,
                     required: true,
                 },
-                {
+                /*{
                     key: "profiles",
                     label: "Berechtigte Benutzer",
                     inputType: "select",
                     selectDataType: "profiles",
                     selectOptionAttribute: "fullName",
                     selectSearchAttributes: ['fullName'],
-                    selectMultiple: true,
-                    component: profiles
-                },
+                    selectMultiple: true,/!*
+                    component: profiles,*!/
+                    inputColumn: "Allgemeines"
+                },*/
 
             ],
             showTabs: [
@@ -1804,7 +1875,8 @@ export const useDataStore = defineStore('data', () => {
                     label: "Name",
                     required: true,
                     title: true,
-                    inputType: "text"
+                    inputType: "text",
+                    sortable: true
                 },
                 {
                     key: "unit",
@@ -1937,19 +2009,22 @@ export const useDataStore = defineStore('data', () => {
                     label: "Name",
                     required: true,
                     title: true,
-                    inputType: "text"
+                    inputType: "text",
+                    sortable: true
                 },
                 {
                     key: "purchasePrice",
                     label: "Einkauspreis",
                     inputType: "number",
                     component: purchasePrice,
+                    sortable: true
                 },
                 {
                     key: "sellingPrice",
                     label: "Verkaufspreis",
                     inputType: "number",
                     component: sellingPrice,
+                    sortable: true
                 },
             ],
             showTabs: [
@@ -1983,21 +2058,24 @@ export const useDataStore = defineStore('data', () => {
                     label: "Name",
                     required: true,
                     title: true,
-                    inputType: "text"
+                    inputType: "text",
+                    sortable: true
                 },
                 {
                     key: "startDate",
                     label: "Start",
                     required: true,
                     inputType: "datetime",
-                    component: startDateTime
+                    component: startDateTime,
+                    sortable: true
                 },
                 {
                     key: "endDate",
                     label: "Ende",
                     required: true,
                     inputType: "datetime",
-                    component: endDateTime
+                    component: endDateTime,
+                    sortable: true
                 },/*{
                     key: "eventtype",
                     label: "Typ",
@@ -2112,6 +2190,7 @@ export const useDataStore = defineStore('data', () => {
             labelSingle: "Artikelkategorie",
             isStandardEntity: true,
             redirect: true,
+            supabaseSortColumn: "name",
             supabaseSelectWithInformation: "*",
             filters: [{
                 name: "Archivierte ausblenden",
@@ -2130,7 +2209,8 @@ export const useDataStore = defineStore('data', () => {
                     label: "Name",
                     required: true,
                     title: true,
-                    inputType: "text"
+                    inputType: "text",
+                    sortable: true
                 },
                 {
                     key: "description",
@@ -2150,6 +2230,7 @@ export const useDataStore = defineStore('data', () => {
             labelSingle: "Leistungskategorie",
             isStandardEntity: true,
             redirect: true,
+            supabaseSortColumn: "name",
             supabaseSelectWithInformation: "*",
             filters: [{
                 name: "Archivierte ausblenden",
@@ -2168,7 +2249,8 @@ export const useDataStore = defineStore('data', () => {
                     label: "Name",
                     required: true,
                     title: true,
-                    inputType: "text"
+                    inputType: "text",
+                    sortable: true
                 },
                 {
                     key: "description",
@@ -2301,13 +2383,15 @@ export const useDataStore = defineStore('data', () => {
                     key: 'number',
                     label: "Nummer",
                     inputIsNumberRange: true,
-                    inputType: "text"
+                    inputType: "text",
+                    sortable: true
                 }, {
                     key: "name",
                     label: "Name",
                     required: true,
                     title: true,
                     inputType: "text",
+                    sortable: true
                 },
                 {
                     key: "description",
@@ -2340,16 +2424,17 @@ export const useDataStore = defineStore('data', () => {
                     selectOptionAttribute: "name",
                     selectSearchAttributes: ['name'],
                 },
-                {
+                /*{
                     key: "profiles",
                     label: "Berechtigte Benutzer",
                     inputType: "select",
                     selectDataType: "profiles",
                     selectOptionAttribute: "fullName",
                     selectSearchAttributes: ['fullName'],
-                    selectMultiple: true,
-                    component: profiles
-                },
+                    selectMultiple: true,/!*
+                    component: profiles,*!/
+                    inputColumn: "Allgemeines"
+                },*/
             ],
             showTabs: [{label: 'Informationen'},{label: 'Auswertung Kostenstelle'}]
         },
@@ -2377,29 +2462,32 @@ export const useDataStore = defineStore('data', () => {
                 {
                     key: 'number',
                     label: "Nummer",
-                    inputType: "text"
+                    inputType: "text",
+                    sortable: true
                 }, {
                     key: "name",
                     label: "Name",
                     required: true,
                     title: true,
                     inputType: "text",
+                    sortable: true
                 },
                 {
                     key: "description",
                     label: "Beschreibung",
                     inputType: "textarea"
                 },
-                {
+                /*{
                     key: "profiles",
                     label: "Berechtigte Benutzer",
                     inputType: "select",
                     selectDataType: "profiles",
                     selectOptionAttribute: "fullName",
                     selectSearchAttributes: ['fullName'],
-                    selectMultiple: true,
-                    component: profiles
-                },
+                    selectMultiple: true,/!*
+                    component: profiles,*!/
+                    inputColumn: "Allgemeines"
+                },*/
             ],
             showTabs: [{label: 'Informationen'},{label: 'Buchungen'}]
         },
@@ -2438,455 +2526,6 @@ export const useDataStore = defineStore('data', () => {
     })
 
 
-    const events = ref([])
-    const customers = ref([])
-    const tasks = ref([])
-    const projects = ref([])
-    const documents = ref([])
-    const spaces = ref([])
-    const units = ref([])
-    const times = ref([])
-    const products = ref([])
-    const movements = ref([])
-    const forms = ref([])
-    const contracts = ref([])
-    const formSubmits = ref([])
-    const contacts = ref([])
-    const vendors = ref([])
-    const incominginvoices = ref([])
-    const bankAccounts = ref([])
-    const bankstatements = ref([])
-    const bankrequisitions = ref([])
-    const historyItems = ref([])
-    const notifications = ref([])
-    const accounts = ref([])
-    const taxTypes = ref([])
-    const plants = ref([])
-    const chats = ref([])
-    const messages = ref([])
-    const createddocuments = ref([])
-    const workingtimes = ref([])
-    const emailAccounts = ref([])
-    const texttemplates =ref([])
-    const resources =ref([])
-
-    async function fetchData () {
-        await fetchDocuments()
-        await fetchEvents()
-        await fetchTasks()
-        await fetchProjects()
-        await fetchTimes()
-        await fetchCustomers()
-        await fetchContracts()
-        await fetchContacts()
-        await fetchForms()
-        await fetchFormSubmits()
-        await fetchProducts()
-        await fetchUnits()
-        await fetchMovements()
-        await fetchSpaces()
-        await fetchVendors()
-        await fetchIncomingInvoices()
-        await fetchBankAccounts()
-        await fetchBankStatements()
-        await fetchBankRequisitions()
-        await fetchHistoryItems()
-        await fetchNotifications()
-        await fetchAccounts()
-        await fetchTaxTypes()
-        await fetchPlants()
-        await fetchChats()
-        await fetchMessages()
-        await fetchCreatedDocuments()
-        await fetchWorkingTimes()
-        await fetchEmailAccounts()
-        await fetchTextTemplates()
-        await fetchResources()
-    }
-
-    function clearStore () {
-        events.value= []
-        customers.value= []
-        tasks.value= []
-        projects.value= []
-        documents.value= []
-        spaces.value= []
-        units.value= []
-        times.value= []
-        products.value= []
-        movements.value= []
-        forms.value= []
-        contracts.value= []
-        formSubmits.value= []
-        contacts.value= []
-        vendors.value= []
-        incominginvoices.value= []
-        bankAccounts.value= []
-        bankstatements.value= []
-        bankrequisitions.value= []
-        historyItems.value = []
-        notifications.value = []
-        accounts.value = []
-        taxTypes.value = []
-        plants.value = []
-        chats.value = []
-        messages.value = []
-        createddocuments.value = []
-        workingtimes.value = []
-        emailAccounts.value = []
-        texttemplates.value = []
-        resources.value = []
-    }
-
-    var deepDiffMapper = function () {
-        return {
-            VALUE_CREATED: 'created',
-            VALUE_UPDATED: 'updated',
-            VALUE_DELETED: 'deleted',
-            VALUE_UNCHANGED: 'unchanged',
-            map: function(obj1, obj2, k = null) {
-                if (this.isFunction(obj1) || this.isFunction(obj2)) {
-                    throw 'Invalid argument. Function given, object expected.';
-                }
-                if (this.isValue(obj1) || this.isValue(obj2)) {
-                    return {
-                        type: this.compareValues(obj1, obj2),
-                        data: {o: obj1, n: obj2, k: k}//obj1 === undefined ? obj2 : obj1
-                    };
-                }
-
-                var diff = {};
-                for (var key in obj1) {
-                    if (this.isFunction(obj1[key])) {
-                        continue;
-                    }
-
-                    var value2 = undefined;
-                    if (obj2[key] !== undefined) {
-                        value2 = obj2[key];
-                    }
-
-                    diff[key] = this.map(obj1[key], value2,key);
-                }
-                for (var key in obj2) {
-                    if (this.isFunction(obj2[key]) || diff[key] !== undefined) {
-                        continue;
-                    }
-
-                    diff[key] = this.map(undefined, obj2[key],key);
-                }
-
-                return diff;
-
-            },
-            compareValues: function (value1, value2) {
-                if (value1 === value2) {
-                    return this.VALUE_UNCHANGED;
-                }
-                if (this.isDate(value1) && this.isDate(value2) && value1.getTime() === value2.getTime()) {
-                    return this.VALUE_UNCHANGED;
-                }
-                if (value1 === undefined) {
-                    return this.VALUE_CREATED;
-                }
-                if (value2 === undefined) {
-                    return this.VALUE_DELETED;
-                }
-                return this.VALUE_UPDATED;
-            },
-            isFunction: function (x) {
-                return Object.prototype.toString.call(x) === '[object Function]';
-            },
-            isArray: function (x) {
-                return Object.prototype.toString.call(x) === '[object Array]';
-            },
-            isDate: function (x) {
-                return Object.prototype.toString.call(x) === '[object Date]';
-            },
-            isObject: function (x) {
-                return Object.prototype.toString.call(x) === '[object Object]';
-            },
-            isValue: function (x) {
-                return !this.isObject(x) && !this.isArray(x);
-            }
-        }
-    }();
-
-    const generateHistoryItems = async (dataType,newData, oldData=null) => {
-        //console.log(oldData)
-        //console.log(newData)
-
-        if(dataTypes[dataType].historyItemHolder){
-            let itemsToCreate = []
-
-            const checkPropState = (key,propContent) =>  {
-                //console.log(propContent)
-                if(propContent.type && propContent.data){
-                    if(propContent.type === "updated" ||propContent.type === "created"){
-                        createHistoryItem(key,propContent)
-                    }
-                } else {
-                    for (let prop in propContent) {
-                        checkPropState(prop,propContent[prop])
-                    }
-                }
-            }
-
-            const createHistoryItem = (key,prop) => {
-
-                //console.log("OLD: " + prop.data.o)
-                //console.log("NEW: " + prop.data.n)
-
-                let name = "" || key
-                let oldVal = prop.data.o || "-"
-                let newVal = prop.data.n || "-"
-
-                /*console.log(key)
-                console.log(oldVal)
-                console.log(newVal)*/
-
-                if(key === "project") {
-                    name = "Projekt"
-                    oldVal = oldVal !== "-" ? projects.value.find(i => i.id === prop.data.o).name : "-"
-                    newVal = projects.value.find(i => i.id === prop.data.n).name
-                } else if (key === "title") {
-                    name = "Titel"
-                } else if(key === "type") {
-                    name = "Typ"
-                } else if(key === "notes") {
-                    name = "Notizen"
-                } else if(key === "link") {
-                    name = "Link"
-                } else if(key === "start") {
-                    name = "Start"
-                    oldVal = dayjs(prop.data.o).format("DD.MM.YYYY HH:mm")
-                    newVal = dayjs(prop.data.n).format("DD.MM.YYYY HH:mm")
-                } else if(key === "end") {
-                    name = "Ende"
-                    oldVal = dayjs(prop.data.o).format("DD.MM.YYYY HH:mm")
-                    newVal = dayjs(prop.data.n).format("DD.MM.YYYY HH:mm")
-                } else if(key === "birthday") {
-                    name = "Geburtstag"
-                    oldVal = dayjs(prop.data.o).format("DD.MM.YYY")
-                    newVal = dayjs(prop.data.n).format("DD.MM.YYY")
-                } else if(key === "resources") {
-                    name = "Resourcen"
-                    oldVal = prop.data.o.map(i => i.title).join(", ")
-                    newVal = prop.data.n.map(i => i.title).join(", ")
-                } else if(key === "customerNumber") {
-                    name = "Kundennummer"
-                } else if(key === "active") {
-                    name = "Aktiv"
-                    if(oldVal === true){
-                        oldVal = "Aktiv"
-                        newVal = "Gesperrt"
-                    } else if(oldVal === "-") {
-                        oldVal = "Gesperrt"
-                        newVal = "Aktiv"
-                    }
-                } else if(key === "isCompany") {
-                    name = "Firmenkunde"
-                    if(oldVal === true){
-                        oldVal = "Firma"
-                        newVal = "Privatkunde"
-                    } else if(oldVal === "-") {
-                        oldVal = "Privatkunde"
-                        newVal = "Firma"
-                    }
-                } else if(key === "special") {
-                    name = "Adresszusatz"
-                } else if(key === "street") {
-                    name = "Straße & Hausnummer"
-                } else if(key === "city") {
-                    name = "Ort"
-                } else if(key === "zip") {
-                    name = "Postleitzahl"
-                } else if(key === "country") {
-                    name = "Land"
-                } else if(key === "web") {
-                    name = "Webseite"
-                } else if(key === "email") {
-                    name = "E-Mail"
-                } else if(key === "tel") {
-                    name = "Telefon"
-                } else if(key === "ustid") {
-                    name = "USt-ID"
-                } else if(key === "role") {
-                    name = "Rolle"
-                } else if(key === "phoneHome") {
-                    name = "Festnetz"
-                } else if(key === "phoneMobile") {
-                    name = "Mobiltelefon"
-                } else if(key === "salutation") {
-                    name = "Anrede"
-                } else if(key === "firstName") {
-                    name = "Vorname"
-                } else if(key === "lastName") {
-                    name = "Nachname"
-                } else if(key === "name") {
-                    name = "Name"
-                } else if(key === "nameAddition") {
-                    name = "Name Zusatz"
-                } else if(key === "approved") {
-                    name = "Genehmigt"
-                } else if(key === "manufacturer") {
-                    name = "Hersteller"
-                } else if(key === "purchasePrice") {
-                    name = "Kaufpreis"
-                } else if(key === "purchaseDate") {
-                    name = "Kaufdatum"
-                } else if(key === "serialNumber") {
-                    name = "Seriennummer"
-                } else if(key === "usePlanning") {
-                    name = "In Plantafel verwenden"
-                } else if(key === "currentSpace") {
-                    name = "In Plantafel verwenden"
-                } else if(key === "customer") {
-                    name = "Kunde"
-                    if(prop.data.o) oldVal = customers.value.find(i => i.id === prop.data.o).name
-                    if(prop.data.n) newVal = customers.value.find(i => i.id === prop.data.n).name
-                } else if(key === "vendor") {
-                    name = "Lieferant"
-                    if(prop.data.o) oldVal = vendors.value.find(i => i.id === prop.data.o).name
-                    if(prop.data.n) newVal = vendors.value.find(i => i.id === prop.data.n).name
-
-                } else if(key === "description") {
-                    name = "Beschreibung"
-                } else if(key === "categorie") {
-                    name = "Kategorie"
-                } else if(key === "profile") {
-                    name = "Mitarbeiter"
-                    if(prop.data.o) oldVal = profileStore.profiles.find(i => i.id === prop.data.o).fullName
-                    if(prop.data.n) newVal = profileStore.profiles.find(i => i.id === prop.data.n).fullName
-                } else if(key === "plant") {
-                    name = "Objekt"
-                    if(prop.data.o) oldVal = plants.value.find(i => i.id === prop.data.o).name
-                    if(prop.data.n) newVal = plants.value.find(i => i.id === prop.data.n).name
-                } else if(key === "annualPaidLeaveDays") {
-                    name = "Urlaubstage"
-                } else if(key === "employeeNumber") {
-                    name = "Mitarbeiternummer"
-                } else if(key === "weeklyWorkingDays") {
-                    name = "Wöchentliche Arbeitstage"
-                } else if(key === "weeklyWorkingHours") {
-                    name = "Wöchentliche Arbeitszeit"
-                } else if(key === "customerRef") {
-                    name = "Referenz des Kunden"
-                } else if(key === "licensePlate") {
-                    name = "Kennzeichen"
-                }else if(key === "tankSize") {
-                    name = "Tankvolumen"
-                }else if(key === "towingCapacity") {
-                    name = "Anhängelast"
-                }else if(key === "color") {
-                    name = "Farbe"
-                }else if(key === "customPaymentDays") {
-                    name = "Zahlungsziel in Tagen"
-                }else if(key === "customSurchargePercentage") {
-                    name = "Individueller Aufschlag"
-                }else if(key === "powerInKW") {
-                    name = "Leistung"
-                } else if(key === "driver") {
-                    name = "Fahrer"
-                    if(prop.data.o) oldVal = profileStore.profiles.find(i => i.id === prop.data.o).fullName
-                    if(prop.data.n) newVal = profileStore.profiles.find(i => i.id === prop.data.n).fullName
-                } else if(key === "projecttype") {
-                    name = "Projekttyp"
-
-                    //TODO: Resolving for Projecttypes
-                    //if(prop.data.o) oldVal = profiles.value.find(i => i.id === prop.data.o).fullName
-                    //if(prop.data.n) newVal = profiles.value.find(i => i.id === prop.data.n).fullName
-                } else if(key === "fixed") {
-                    name = "Festgeschrieben"
-                    if(newVal === true){
-                        oldVal = "Nein"
-                        newVal = "Ja"
-                    } else if(newVal === false) {
-                        oldVal = "Ja"
-                        newVal = "Nein"
-                    }
-                } else if(key === "archived") {
-                    name = "Archiviert"
-                    if(newVal === true){
-                        oldVal = "Nein"
-                        newVal = "Ja"
-                    } else if(newVal === false) {
-                        oldVal = "Ja"
-                        newVal = "Nein"
-                    }
-                }
-
-
-
-                let text = ""
-                if(prop.type === "updated" && newVal !== "-" && oldVal !== "-") {
-                    text = `Geändert: ${name} von "${oldVal}" zu "${newVal}"`
-                } else if(prop.type === "updated" && newVal !== "-" && oldVal === "-") {
-                    text = `Hinzugefügt: ${name} "${newVal}"`
-                } else if(prop.type === "created") {
-                    text = `Hinzugefügt: ${name} "${newVal}"`
-                } else if(prop.type === "updated" && newVal === "-" && oldVal !== "-") {
-                    text = `Entfernt: ${name} "${oldVal}"`
-                }
-
-                let historyItem = {
-                    text: text,
-                    createdBy: profileStore.activeProfile.id,
-                    oldVal: prop.data.o,
-                    newVal: prop.data.n,
-                    tenant: profileStore.currentTenant
-                }
-
-                historyItem[dataTypes[dataType].historyItemHolder] = newData.id
-
-
-                const checkIfNaN = (x) => {
-                    return typeof x === "number" && x !== x;
-                }
-                //console.log(key)
-                //console.log(checkIfNaN(key))
-
-                if(key !== "fullName" && key !== "phases") {
-                    //console.log(historyItem)
-                    itemsToCreate.push(historyItem)
-                }
-
-            }
-
-            if(oldData) {
-                let result = deepDiffMapper.map(oldData,newData)
-
-                //console.log(result)
-
-                for (let prop in result) {
-                    //console.log(prop)
-                    checkPropState(prop,result[prop])
-
-                }
-
-            } else {
-                let historyItem = {
-                    text: `${dataTypes[dataType].labelSingle} erstellt`,
-                    createdBy: profileStore.activeProfile.id,
-                    tenant: profileStore.currentTenant
-                }
-
-                historyItem[dataTypes[dataType].historyItemHolder] = newData.id
-
-                //console.log(historyItem)
-                itemsToCreate.push(historyItem)
-            }
-
-            const {data,error} = await supabase.from("historyitems").insert(itemsToCreate)
-
-            if(error) {
-                console.log(error)
-            } else {
-                fetchHistoryItems()
-            }
-        }
-    }
-
     async function createNewItem (dataType,data,noRedirect=false){
         if(typeof(data) === 'object') {
             data = {...data, tenant: profileStore.currentTenant}
@@ -3018,540 +2657,15 @@ export const useDataStore = defineStore('data', () => {
         }
     }
 
-    const uploadFiles = async (formData, files, upsert) => {
-        const uploadSingleFile = async (file) => {
 
-            const {data:createdFileData,error:createdFileError} = await supabase
-                .from("files")
-                .insert({
-                    tenant: profileStore.currentTenant,
-                })
-                .select()
-                .single()
 
-            if(createdFileError){
-                console.log(createdFileError)
-                toast.add({title: "Hochladen fehlgeschlagen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
-            } else if(createdFileData) {
-                console.log(createdFileData)
-                const {data:uploadData, error: uploadError} = await supabase
-                    .storage
-                    .from("filesdev")
-                    .upload(`${profileStore.currentTenant}/filesbyid/${createdFileData.id}/${file.name}`, file, {upsert: upsert})
 
-                if(uploadError) {
-                    console.log(uploadError)
-                    console.log(uploadError.statusCode)
 
-                    if(uploadError.statusCode === '400') {
-                        console.log("is 400")
-                        toast.add({title: "Hochladen fehlgeschlagen", description: "Die Datei enthält ungültige Zeichen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
-                    } else if(uploadError.statusCode === '409') {
-                        console.log("is 409")
-                        toast.add({title: "Hochladen fehlgeschlagen", description: "Es existiert bereits eine Datei mit diesem Namen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
-                    } else {
-                        toast.add({title: "Hochladen fehlgeschlagen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
-
-                    }
-                } else if(uploadData) {
-                    const {data:updateFileData, error:updateFileError} = await supabase
-                        .from("files")
-                        .update({
-                            ...formData,
-                            path: uploadData.path,
-                        })
-                        .eq("id", createdFileData.id)
-
-                    if(updateFileError) {
-                        console.log(updateFileError)
-                        toast.add({title: "Hochladen fehlgeschlagen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
-                    } else {
-                        toast.add({title: "Hochladen erfolgreich"})
-
-                    }
-                }
-            }
-        }
-
-        if(files.length === 1) {
-            await uploadSingleFile(files[0])
-        } else if( files.length > 1) {
-
-            for(let i = 0; i < files.length; i++){
-                await uploadSingleFile(files[i])
-            }
-
-        }
-    }
-
-    async function fetchBankAccounts () {
-        bankAccounts.value = (await supabase.from("bankaccounts").select().eq('tenant', profileStore.currentTenant)).data
-    }
-    async function fetchBankStatements () {
-        bankstatements.value = (await supabase.from("bankstatements").select().eq('tenant', profileStore.currentTenant).order("date", {ascending:false})).data
-    }
-    async function fetchBankRequisitions () {
-        bankrequisitions.value = (await supabase.from("bankrequisitions").select().eq('status', "LN")).data
-    }
-    async function fetchEvents () {
-        events.value = (await supabase.from("events").select().eq('tenant', profileStore.currentTenant)).data
-    }
-    async function fetchContracts () {
-        contracts.value = (await supabase.from("contracts").select().eq('tenant', profileStore.currentTenant)).data
-    }
-    async function fetchContacts () {
-        contacts.value = (await supabase.from("contacts").select().eq('tenant', profileStore.currentTenant)).data
-    }
-    async function fetchCustomers () {
-        customers.value = (await supabase.from("customers").select().eq('tenant', profileStore.currentTenant).order("customerNumber", {ascending:true})).data
-    }
-    async function fetchTasks () {
-        tasks.value = (await supabase.from("tasks").select().eq('tenant', profileStore.currentTenant)).data
-    }
-    async function fetchForms () {
-        forms.value = (await supabase.from("forms").select().eq('tenant', profileStore.currentTenant)).data
-    }
-    async function fetchFormSubmits () {
-        formSubmits.value = (await supabase.from("formSubmits").select().eq('tenant', profileStore.currentTenant)).data
-    }
-    async function fetchProducts () {
-        products.value = (await supabase.from("products").select().eq('tenant', profileStore.currentTenant)).data
-    }
-    async function fetchUnits () {
-        units.value = (await supabase.from("units").select()).data
-    }
-    async function fetchProjects () {
-        projects.value = (await supabase.from("projects").select().eq("tenant",profileStore.currentTenant)).data
-    }
-    async function fetchSpaces () {
-        spaces.value = (await supabase.from("spaces").select().eq('tenant', profileStore.currentTenant).order("spaceNumber", {ascending:true})).data
-    }
-    async function fetchMovements () {
-        movements.value = (await supabase.from("movements").select().eq('tenant', profileStore.currentTenant)).data
-    }
-    async function fetchTimes () {
-        times.value = (await supabase.from("times").select().eq('tenant', profileStore.currentTenant).order("startDate", {ascending:false})).data
-    }
-    async function fetchHistoryItems () {
-
-        historyItems.value = (await supabase.from("historyitems").select().eq('tenant', profileStore.currentTenant)).data
-    }
-    async function fetchVendors () {
-        vendors.value = (await supabase.from("vendors").select().eq('tenant', profileStore.currentTenant).order("vendorNumber", {ascending:true})).data
-    }
-    async function fetchIncomingInvoices () {
-        incominginvoices.value = (await supabase.from("incominginvoices").select().eq('tenant', profileStore.currentTenant)).data
-    }
-    async function fetchNotifications () {
-        notifications.value = (await supabase.from("notifications").select().eq('tenant', profileStore.currentTenant).order("created_at", {ascending: false})).data
-    }
-    async function fetchAccounts () {
-        accounts.value = (await supabase.from("accounts").select()).data
-    }
-    async function fetchTaxTypes () {
-        taxTypes.value = (await supabase.from("taxtypes").select()).data
-    }
-    async function fetchPlants () {
-        plants.value = (await supabase.from("plants").select().eq('tenant', profileStore.currentTenant)).data
-    }
-    async function fetchChats() {
-        chats.value = (await supabase.from("chats").select()).data
-    }
-    async function fetchMessages() {
-        messages.value = (await supabase.from("messages").select().eq('tenant', profileStore.currentTenant).order('created_at', {ascending:true})).data
-    }
-    async function fetchCreatedDocuments() {
-        createddocuments.value = (await supabase.from("createddocuments").select().eq('tenant', profileStore.currentTenant).order('created_at', {ascending:true})).data
-    }
-
-    async function fetchWorkingTimes() {
-        workingtimes.value = (await supabase.from("workingtimes").select().eq('tenant', profileStore.currentTenant).order('created_at', {ascending:true})).data
-    }
-
-    async function fetchEmailAccounts() {
-        emailAccounts.value = (await supabase.from("emailAccounts").select().eq('tenant', profileStore.currentTenant)).data
-    }
-
-    async function fetchTextTemplates() {
-        texttemplates.value = (await supabase.from("texttemplates").select().eq('tenant', profileStore.currentTenant)).data
-    }
-
-    async function fetchResources() {
-        resources.value = (await supabase.from("resources").select().eq('tenant', profileStore.currentTenant)).data
-    }
-
-    async function fetchDocuments () {
-        let tempDocuments = (await supabase.from("documents").select().eq('tenant', profileStore.currentTenant)).data
-
-        if(tempDocuments.length > 0){
-            let paths = []
-            tempDocuments.forEach(doc => {
-                paths.push(doc.path)
-            })
-
-            const {data,error} = await supabase.storage.from('files').createSignedUrls(paths,3600)
-
-            tempDocuments = tempDocuments.map((doc,index) => {
-
-                return {
-                    ...doc,
-                    url: data[index].signedUrl
-                }
-            })
-
-            documents.value = tempDocuments
-        } else {
-            documents.value = []
-        }
-
-
-    }
-
-    async function addHistoryItem(text, user, elementId, resourceType) {
-        let data = {
-            user: user,
-            text: text
-        }
-
-        if(resourceType === "customers") {
-            data.customer = elementId
-        }
-
-        const {data:insertData,error:insertError} = await supabase
-            .from("historyItems")
-            .insert([addHistoryItemData.value])
-            .select()
-
-        if(insertError) {
-            console.log(insertError)
-        } else {
-            toast.add({title: "Eintrag erfolgreich erstellt"})
-            await fetchHistoryItems()
-        }
-
-    }
-
-    //Getters
-
-    const getDocumentsByProfileId = computed(() => (profileId) => {
-        return documents.value.filter(item => item.profile === profileId && !item.tags.includes("Archiviert"))
-    })
-
-    const getMessagesByChatId = computed(() => (chatId) => {
-        return messages.value.filter(i => i.destination === chatId)
-    })
-
-    const getTextTemplatesByDocumentType = computed(() => (documentType) => {
-        //console.log(documentType)
-
-        let type = ""
-        if(documentType === "serialInvoices") {
-            type = "invoices"
-        } else {
-            type = documentType
-        }
-
-        //console.log(type)
-
-        return texttemplates.value.filter(i => i.documentType === type)
-    })
-
-    const getStartedWorkingTimes = computed(() => () => {
-        return workingtimes.value.filter(i => !i.endDate)
-    })
-
-    const getStockByProductId = computed(() => (productId) => {
-        let productMovements = movements.value.filter(movement => movement.productId === productId && movement.projectId === null)
-
-        let count = 0
-
-        productMovements.forEach(movement => {
-            count += movement.quantity
-        })
-
-        return count
-    })
-
-    const getEventTypes = computed(() => {
-        return profileStore.ownTenant.calendarConfig.eventTypes
-    })
-
-    const getTimeTypes = computed(() => {
-        return profileStore.ownTenant.timeConfig.timeTypes
-    })
-
-    const getDocumentTags = computed(() => {
-        return profileStore.ownTenant.tags.documents
-    })
-
-    const getResources = computed(() => {
-        return [
-            ...profiles.value.filter(i => i.tenant === profileStore.currentTenant).map(profile => {
-                return {
-                    type: 'Mitarbeiter',
-                    title: profile.fullName,
-                    id: profile.id
-                }
-            }),
-            /*...vehicles.value.map(vehicle => {
-                return {
-                    type: 'Fahrzeug',
-                    title: vehicle.licensePlate,
-                    id: `F-${vehicle.id}`
-                }
-            }),*/
-            ...inventoryitems.value.filter(i=> i.usePlanning).map(item => {
-                return {
-                    type: 'Inventar',
-                    title: item.name,
-                    id: `I-${item.id}`
-                }
-            })
-        ]
-    })
-
-    const getEvents = computed(() => {
-        return [
-            ...events.value.map(event => {
-                let eventColor = profileStore.ownTenant.calendarConfig.eventTypes.find(type => type.label === event.type).color
-
-                let title = ""
-                if(event.title) {
-                    title = event.title
-                } else if(event.project) {
-                    projects.value.find(i => i.id === event.project) ? projects.value.find(i => i.id === event.project).name : ""
-                }
-
-                return {
-                    ...event,
-                    title: title,
-                    borderColor: eventColor,
-                    textColor: eventColor,
-                    backgroundColor: "black"
-                }
-            }),
-            ...absencerequests.value.map(absence => {
-                return  {
-                    id: absence.id,
-                    resourceId: absence.user,
-                    resourceType: "person",
-                    title: `Abw.: ${absence.reason}`,
-                    start: dayjs(absence.start).toDate(),
-                    end: dayjs(absence.end).add(1,'day').toDate(),
-                    allDay: true,
-                }
-            })
-        ]
-    })
-
-    const getEventsByResource = computed(() => {
-        let tempEvents = []
-        events.value.forEach(event => {
-            console.log(event)
-            event.resources.forEach(resource => {
-                console.log(resource)
-                let eventColor = profileStore.ownTenant.calendarConfig.eventTypes.find(type => type.label === event.type).color
-
-                let title = ""
-                if(event.title) {
-                    title = event.title
-                } /*else if(event.project) {
-                    projects.value.find(i => i.id === event.project) ? projects.value.find(i => i.id === event.project).name : ""
-                }*/
-
-
-
-                tempEvents.push({
-                    ...event,
-                    resourceId: /*resource.type !== 'Mitarbeiter' ? `${resource.type[0]}-${resource.id}`:*/ resource.id,
-                    resourceType: "Mitarbeiter",
-                    title: title,
-                    borderColor: eventColor,
-                    textColor: eventColor,
-                    backgroundColor: "black"
-                })
-
-
-            })
-        })
-
-
-
-        return [
-            ...tempEvents,
-            /*...events.value.map(event => {
-
-
-                let eventColor = profileStore.ownTenant.calendarConfig.eventTypes.find(type => type.label === event.type).color
-
-                return {
-                    ...event,
-                    title: !event.title ? projects.value.find(i => i.id === event.project).name : event.title,
-                    borderColor: eventColor,
-                    textColor: eventColor,
-                    backgroundColor: "black"
-                }
-            }),*/
-            ...absencerequests.value.map(absence => {
-                return  {
-                    id: absence.id,
-                    resourceId: absence.user,
-                    resourceType: "person",
-                    title: `Abw.: ${absence.reason}`,
-                    start: dayjs(absence.start).toDate(),
-                    end: dayjs(absence.end).add(1,'day').toDate(),
-                    allDay: true
-                }
-            })
-        ]
-    })
-
-    const getCostCentresComposed = computed(() => {
-        return [
-            /*...vehicles.value.map(vehicle => {
-                return {
-                    label: "Fahrzeug - " + vehicle.licensePlate,
-                    id: vehicle.id
-                }
-            }),*/
-            ...projects.value.map(project => {
-                return {
-                    label: "Projekt - " + project.name,
-                    id: project.id
-                }
-            })
-        ]
-    })
-
-    const getServiceById = computed(() => (itemId) => {
-        return services.value.find(item => item.id === itemId)
-    })
-
-    const getVendorById = computed(() => (itemId) => {
-        return vendors.value.find(item => item.id === itemId)
-    })
-
-    const getIncomingInvoiceById = computed(() => (itemId) => {
-        return incominginvoices.value.find(item => item.id === itemId)
-    })
-
-    const getContactById = computed(() => (itemId) => {
-        return contacts.value.find(item => item.id === itemId)
-    })
-
-    const getDocumentById = computed(() => (itemId) => {
-        return documents.value.find(item => item.id === itemId)
-    })
-
-    const getCustomerById = computed(() => (itemId) => {
-        return customers.value.find(item => item.id === itemId)
-    })
-
-    const getAccountById = computed(() => (accountId) => {
-        return accounts.value.find(item => item.id === accountId)
-    })
-
-    const getCreatedDocumentById = computed(() => (documentId) => {
-        return createddocuments.value.find(item => item.id === documentId)
-    })
-
-    const getBankAccountById = computed(() => (itemId) => {
-        return bankAccounts.value.find(item => item.id === itemId)
-    })
-
-    const getWorkingTimeById = computed(() => (itemId) => {
-        return workingtimes.value.find(item => item.id === itemId)
-    })
-
-    const getProjectById = computed(() => (itemId) => {
-        if(projects.value.find(i => i.id === itemId)) {
-            let project = projects.value.find(project => project.id === itemId)
-
-            /*let projectHours = 0
-
-            let projectTimes = times.value.filter(time => time.projectId === itemId)
-            projectTimes.forEach(time => projectHours += time.duration)
-
-            project.projectHours = projectHours*/
-
-            return project
-        } else {
-            return null
-        }
-
-
-
-    })
 
     return {
-        uploadFiles,
-        generateHistoryItems,
         dataTypes,
-
-        //Data
-        customers,
-        tasks,
-        projects,
-        documents,
-        spaces,
-        units,
-        times,
-        products,
-        movements,
-        forms,
-        contracts,
-        formSubmits,
-        contacts,
-        vendors,
-        incominginvoices,
-        bankAccounts,
-        bankstatements,
-        bankrequisitions,
-        historyItems,
-        notifications,
-        accounts,
-        taxTypes,
-        plants,
-        chats,
-        messages,
-        createddocuments,
-        workingtimes,
-        emailAccounts,
-        texttemplates,
         documentTypesForCreation,
-
-        //Functions
         createNewItem,
         updateItem,
-        fetchData,
-        clearStore,
-        fetchTimes,
-        fetchIncomingInvoices,
-        fetchDocuments,
-        fetchWorkingTimes,
-        //Getters
-        getDocumentsByProfileId,
-        getMessagesByChatId,
-        getTextTemplatesByDocumentType,
-        getStartedWorkingTimes,
-        getStockByProductId,
-        getEventTypes,
-        getTimeTypes,
-        getDocumentTags,
-        getResources,
-        getEvents,
-        getEventsByResource,
-        getCostCentresComposed,
-        getServiceById,
-        getVendorById,
-        getIncomingInvoiceById,
-        getContactById,
-        getDocumentById,
-        getCustomerById,
-        getProjectById,
-        getAccountById,
-        getCreatedDocumentById,
-        getBankAccountById,
-        getWorkingTimeById,
     }
 })
\ No newline at end of file