Changed to new Layout System

spaces/pages/inventoryitems/[mode]/[[id]].vue

@@ -6,7 +6,6 @@ definePageMeta({
 })
 
 const dataStore = useDataStore()
-const supabase = useSupabaseClient()
 const route = useRoute()
 const router = useRouter()
 const toast = useToast()
@@ -28,13 +27,6 @@ const setupPage = () => {
   }
 
   if(mode.value === "edit") itemInfo.value = currentItem.value
-
-}
-
-
-const editItem = async () => {
-  router.push(`/inventoryitems/edit/${currentItem.value.id}`)
-  setupPage()
 }
 
 const cancelEditorCreate = () => {
@@ -43,34 +35,50 @@ const cancelEditorCreate = () => {
   } else {
     router.push(`/inventoryitems`)
   }
-
 }
 
-
-
 setupPage()
 </script>
 
 <template>
-  <h1
-      class="text-center my-3 font-bold text-2xl"
-      v-if="currentItem "
-  >{{currentItem.name}}</h1>
+  <UDashboardNavbar :title="currentItem ? currentItem.name : (mode === 'create' ? 'Inventartikel erstellen' : 'Inventartikel bearbeiten')">
+    <template #right>
+      <UButton
+          v-if="mode === 'edit'"
+          @click="dataStore.updateItem('inventoryitems',itemInfo)"
+      >
+        Speichern
+      </UButton>
+      <UButton
+          v-else-if="mode === 'create'"
+          @click="dataStore.createNewItem('inventoryitems',itemInfo)"
+      >
+        Erstellen
+      </UButton>
+      <UButton
+          @click="cancelEditorCreate"
+          color="red"
+          class="ml-2"
+          v-if="mode === 'edit' || mode === 'create'"
+      >
+        Abbrechen
+      </UButton>
+      <UButton
+          v-if="mode === 'show'"
+          @click="  router.push(`/inventoryitems/edit/${currentItem.id}`)"
+      >
+        Bearbeiten
+      </UButton>
+    </template>
+  </UDashboardNavbar>
   <UTabs
     :items="[{label: 'Informationen'}, {label: 'Logbuch'}]"
     v-if="currentItem && mode == 'show'"
+    class="p-5"
   >
     <template #item="{item}">
       <UCard class="mt-5">
         <div v-if="item.label === 'Informationen'">
-          <Toolbar>
-            <UButton
-                v-if="mode === 'show' && currentItem.id"
-                @click="editItem"
-            >
-              Bearbeiten
-            </UButton>
-          </Toolbar>
 
           <div class="text-wrap">
             <p v-if="currentItem.currentSpace">Lagerplatz: {{dataStore.getSpaceById(currentItem.currentSpace).spaceNumber}} - {{dataStore.getSpaceById(currentItem.currentSpace).description}}</p>
@@ -87,11 +95,10 @@ setupPage()
       </UCard>
     </template>
   </UTabs>
-  <UCard v-else-if="mode == 'edit' || mode == 'create'" >
-    <template #header v-if="mode === 'edit'">
-      {{itemInfo.name}}
-    </template>
-
+  <UForm
+      v-else-if="mode == 'edit' || mode == 'create'"
+      class="p-5"
+  >
     <UFormGroup
         label="Name:"
     >
@@ -123,31 +130,7 @@ setupPage()
           v-model="itemInfo.description"
       />
     </UFormGroup>
-
-
-    <template #footer>
-      <UButton
-          v-if="mode === 'edit'"
-          @click="dataStore.updateItem('inventoryitems',itemInfo)"
-      >
-        Speichern
-      </UButton>
-      <UButton
-          v-else-if="mode === 'create'"
-          @click="dataStore.createNewItem('inventoryitems',itemInfo)"
-      >
-        Erstellen
-      </UButton>
-      <UButton
-          @click="cancelEditorCreate"
-          color="red"
-          class="ml-2"
-      >
-        Abbrechen
-      </UButton>
-    </template>
-
-  </UCard>
+  </UForm>
 </template>
 
 <style scoped>

spaces/pages/inventoryitems/index.vue

@@ -1,29 +1,52 @@
 <template>
-  <div>
-
-    <div class="flex items-center gap-1">
-      <UButton @click="router.push(`/inventoryitems/create/`)">+ Inventarartikel</UButton>
-
+  <UDashboardNavbar title="Inventar" :badge="filteredRows.length">
+    <template #right>
       <UInput
+          id="searchinput"
           v-model="searchString"
+          icon="i-heroicons-funnel"
+          autocomplete="off"
           placeholder="Suche..."
-      />
-    </div>
+          class="hidden lg:block"
+          @keydown.esc="$event.target.blur()"
+      >
+        <template #trailing>
+          <UKbd value="/" />
+        </template>
+      </UInput>
 
+      <UButton @click="router.push(`/inventoryitems/create`)">+ Inventarartikel</UButton>
+    </template>
+  </UDashboardNavbar>
 
+  <UDashboardToolbar>
+    <template #right>
+      <USelectMenu
+          v-model="selectedColumns"
+          icon="i-heroicons-adjustments-horizontal-solid"
+          :options="templateColumns"
+          multiple
+          class="hidden lg:block"
+          by="key"
+      >
+        <template #label>
+          Spalten
+        </template>
+      </USelectMenu>
+    </template>
+  </UDashboardToolbar>
 
-    <UTable
+  <UTable
       :rows="filteredRows"
-      @select="selectItem"
-      :columns="itemColumns"
-      :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Noch keine Einträge' }"
-    >
+      :columns="columns"
+      class="w-full"
+      :ui="{ divide: 'divide-gray-200 dark:divide-gray-800' }"
+      @select="(i) => router.push(`/inventoryitems/show/${i.id}`) "
+      :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Inventarartikel anzuzeigen' }"
+  >
 
 
-    </UTable>
-
-
-  </div>
+  </UTable>
 </template>
 
 <script setup>
@@ -31,11 +54,22 @@
 definePageMeta({
   middleware: "auth"
 })
+
+defineShortcuts({
+  '/': () => {
+    //console.log(searchinput)
+    //searchinput.value.focus()
+    document.getElementById("searchinput").focus()
+  },
+  '+': () => {
+    router.push("/tasks/create")
+  }
+})
+
 const dataStore = useDataStore()
-const supabase = useSupabaseClient()
 const router = useRouter()
 
-const itemColumns = [
+const templateColumns = [
   {
     key: "name",
     label: "Name",
@@ -47,14 +81,11 @@ const itemColumns = [
     sortable: true
   }
 ]
+const selectedColumns = ref(templateColumns)
+const columns = computed(() => templateColumns.filter((column) => selectedColumns.value.includes(column)))
 
-const selectItem = (item) => {
-  console.log(item)
-  router.push(`/inventoryitems/show/${item.id} `)
-}
 
 const searchString = ref('')
-
 const filteredRows = computed(() => {
   if(!searchString.value) {
     return dataStore.inventoryitems