Changed to new Layout System

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

@@ -8,7 +8,6 @@ definePageMeta({
 })
 
 const dataStore = useDataStore()
-const supabase = useSupabaseClient()
 const route = useRoute()
 const router = useRouter()
 const toast = useToast()
@@ -16,8 +15,6 @@ const id = ref(route.params.id ? route.params.id : null )
 
 let currentItem = ref(null)
 
-
-
 //Working
 const mode = ref(route.params.mode || "show")
 const itemInfo = ref({
@@ -33,51 +30,60 @@ const setupPage = () => {
 
   if(mode.value === "edit") itemInfo.value = currentItem.value
 
-
-
-}
-
-
-const editItem = async () => {
-  router.push(`/products/edit/${currentItem.value.id}`)
-  setupPage()
 }
 
 const cancelEditorCreate = () => {
-  mode.value = "show"
-  itemInfo.value = {
-    id: 0,
-
+  if(currentItem.value) {
+    router.push(`/products/show/${currentItem.value.id}`)
+  } else {
+    router.push(`/products/`)
   }
 }
 
-
-
 setupPage()
 </script>
 
 <template>
-  <h1
-      class="mb-3 truncate font-bold text-2xl"
-      v-if="currentItem "
-  >Artikel: {{currentItem.name}}</h1>
+  <UDashboardNavbar :title="currentItem ? currentItem.name : (mode === 'create' ? 'Artikel erstellen' : 'Artikel bearbeiten')">
+    <template #right>
+      <UButton
+          v-if="mode === 'edit'"
+          @click="dataStore.updateItem('products',itemInfo)"
+      >
+        Speichern
+      </UButton>
+      <UButton
+          v-else-if="mode === 'create'"
+          @click="dataStore.createNewItem('products',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(`/products/edit/${currentItem.id}`)"
+      >
+        Bearbeiten
+      </UButton>
+    </template>
+  </UDashboardNavbar>
   <UTabs
     :items="[{label: 'Informationen'},{label: 'Logbuch'},{label: 'Bestand'},{label: 'Dokumente'}]"
     v-if="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>
           <UBadge
               v-for="tag in currentItem.tags"
               class="mr-2"
@@ -121,11 +127,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:"
     >
@@ -161,7 +166,11 @@ setupPage()
           v-model="itemInfo.tags"
           :options="dataStore.ownTenant.tags.products"
           multiple
-      />
+      >
+        <template #label>
+          {{itemInfo.tags.join(", ")}}
+        </template>
+      </USelectMenu>
     </UFormGroup>
     <UFormGroup
         label="EAN:"
@@ -190,31 +199,7 @@ setupPage()
         </template>
       </UInput>
     </UFormGroup>
-
-
-    <template #footer>
-      <UButton
-          v-if="mode == 'edit'"
-          @click="dataStore.updateItem('products',itemInfo)"
-      >
-        Speichern
-      </UButton>
-      <UButton
-          v-else-if="mode == 'create'"
-          @click="dataStore.createNewItem('products',itemInfo)"
-      >
-        Erstellen
-      </UButton>
-      <UButton
-          @click="cancelEditorCreate"
-          color="red"
-          class="ml-2"
-      >
-        Abbrechen
-      </UButton>
-    </template>
-
-  </UCard>
+  </UForm>
 </template>
 
 <style scoped>

spaces/pages/products/index.vue

@@ -1,20 +1,50 @@
 <template>
-  <Toolbar>
-    <UButton @click="router.push(`/products/create/`)">+ Artikel</UButton>
+  <UDashboardNavbar title="Artikel" :badge="filteredRows.length">
+    <template #right>
+      <UInput
+          id="searchinput"
+          v-model="searchString"
+          icon="i-heroicons-funnel"
+          autocomplete="off"
+          placeholder="Suche..."
+          class="hidden lg:block"
+          @keydown.esc="$event.target.blur()"
+      >
+        <template #trailing>
+          <UKbd value="/" />
+        </template>
+      </UInput>
 
-    <UInput
-        v-model="searchString"
-        placeholder="Suche..."
-    />
-  </Toolbar>
+      <UButton @click="router.push(`/products/create`)">+ Artikel</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>
 
 
   <div class="table">
     <UTable
         :rows="filteredRows"
-        :columns="itemColumns"
-        @select="selectItem"
-        :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(`/products/show/${i.id}`) "
+        :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Artikel anzuzeigen' }"
     >
       <template #stock-data="{row}">
         {{`${dataStore.getStockByProductId(row.id)} ${(dataStore.units.find(unit => unit.id === row.unit) ? dataStore.units.find(unit => unit.id === row.unit).name : "")}`}}
@@ -45,11 +75,22 @@
 definePageMeta({
   middleware: "auth"
 })
+
+defineShortcuts({
+  '/': () => {
+    //console.log(searchinput)
+    //searchinput.value.focus()
+    document.getElementById("searchinput").focus()
+  },
+  '+': () => {
+    router.push("/products/create")
+  }
+})
+
 const dataStore = useDataStore()
-const supabase = useSupabaseClient()
 const router = useRouter()
 
-const itemColumns = [
+const templateColumns = [
   {
     key: "stock",
     label: "Bestand"
@@ -80,11 +121,8 @@ const itemColumns = [
     sortable: true
   }
 ]
-
-const selectItem = (item) => {
-  console.log(item)
-  router.push(`/products/show/${item.id} `)
-}
+const selectedColumns = ref(templateColumns)
+const columns = computed(() => templateColumns.filter((column) => selectedColumns.value.includes(column)))
 
 const searchString = ref('')