Changed to new Layout System

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

@@ -1,17 +1,13 @@
 <script setup>
-import HistoryDisplay from "~/components/HistoryDisplay.vue";
-
 definePageMeta({
   middleware: "auth"
 })
 
-const supabase = useSupabaseClient()
+const dataStore = useDataStore()
 const route = useRoute()
 const router = useRouter()
 const toast = useToast()
 const id = ref(route.params.id ? route.params.id : null )
-const numberRange = useNumberRange("customers")
-const dataStore = useDataStore()
 
 let currentItem = ref(null)
 
@@ -34,13 +30,10 @@ const setupPage = async () => {
   }
 
   if(mode.value === "edit") itemInfo.value = currentItem.value
-
-
 }
 
-const editCustomer = async () => {
-  router.push(`/customers/edit/${currentItem.value.id}`)
-  setupPage()
+const editItem = async () => {
+  await router.push(`/customers/edit/${currentItem.value.id}`)
 }
 
 const cancelEditorCreate = () => {
@@ -56,37 +49,59 @@ setupPage()
 </script>
 
 <template>
-  <h1
-      class="mb-3 font-bold text-3xl truncate"
-      v-if="currentItem "
-  >Kunde: {{currentItem.name}}</h1>
+  <UDashboardNavbar :title="currentItem ? currentItem.name : (mode === 'create' ? 'Kunde erstellen' : 'Kunde bearbeiten')">
+    <template #right>
+      <UButton
+          v-if="mode === 'edit'"
+          @click="dataStore.updateItem('customers',itemInfo)"
+      >
+        Speichern
+      </UButton>
+      <UButton
+          v-else-if="mode === 'create'"
+          @click="dataStore.createNewItem('customers',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="editItem"
+      >
+        Bearbeiten
+      </UButton>
+    </template>
+    <template #badge v-if="currentItem">
+      <UBadge
+          v-if="currentItem.active"
+      >
+        Kunde aktiv
+      </UBadge>
+      <UBadge
+          v-else
+          color="red"
+      >
+        Kunde gesperrt
+      </UBadge>
+    </template>
+  </UDashboardNavbar>
+
   <UTabs
       v-if="currentItem && mode == 'show'"
       :items="[{label: 'Informationen'}, {label: 'Logbuch'}, {label: 'Projekte'},{label: 'Objekte'},{label: 'Verträge'}, {label: 'Ansprechpartner'}]"
+      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="editCustomer"
-            >
-              Bearbeiten
-            </UButton>
-          </Toolbar>
 
-          <UBadge
-              v-if="currentItem.active"
-          >
-            Kunde aktiv
-          </UBadge>
-          <UBadge
-              v-else
-              color="red"
-          >
-            Kunde gesperrt
-          </UBadge>
 
           <div class="text-wrap">
             <p>Kundennummer: {{currentItem.customerNumber}}</p>
@@ -164,16 +179,16 @@ setupPage()
         <div v-else-if="item.label === 'Ansprechpartner'">
           <Toolbar>
             <UButton
-            @click="router.push(`/contacts/create?customer=${currentItem.id}`)"
+                @click="router.push(`/contacts/create?customer=${currentItem.id}`)"
             >
-            + Ansprechpartner
+              + Ansprechpartner
             </UButton>
           </Toolbar>
           <UTable
-            :rows="dataStore.getContactsByCustomerId(currentItem.id)"
-            @select="(row) => router.push(`/contacts/show/${row.id}`)"
-            :columns="[{label: 'Anrede', key: 'salutation'},{label: 'Name', key: 'fullName'},{label: 'Rolle', key: 'role'}]"
-            :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine zugehörigen Ansprechpartner' }"
+              :rows="dataStore.getContactsByCustomerId(currentItem.id)"
+              @select="(row) => router.push(`/contacts/show/${row.id}`)"
+              :columns="[{label: 'Anrede', key: 'salutation'},{label: 'Name', key: 'fullName'},{label: 'Rolle', key: 'role'}]"
+              :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine zugehörigen Ansprechpartner' }"
 
           >
 
@@ -183,12 +198,7 @@ setupPage()
       </UCard>
     </template>
   </UTabs>
-
-
-  <UCard v-else-if="mode === 'edit' || mode === 'create'" >
-    <template #header v-if="mode === 'edit'">
-      <UBadge>{{itemInfo.customerNumber}}</UBadge>{{itemInfo.name}}
-    </template>
+  <UForm v-else-if="mode === 'edit' || mode === 'create'" class="p-5">
     <UFormGroup
         label="Name:"
     >
@@ -288,36 +298,11 @@ setupPage()
           v-model="itemInfo.infoData.ustid"
       />
     </UFormGroup>
-
-    <template #footer>
-      <UButton
-          v-if="mode == 'edit'"
-          @click="dataStore.updateItem('customers', itemInfo)"
-      >
-        Speichern
-      </UButton>
-      <UButton
-          v-else-if="mode == 'create'"
-          @click="dataStore.createNewItem('customers',itemInfo)"
-      >
-        Erstellen
-      </UButton>
-      <UButton
-          @click="cancelEditorCreate"
-          color="red"
-          class="ml-2"
-      >
-        Abbrechen
-      </UButton>
-    </template>
-
-  </UCard>
+  </UForm>
 
 
 </template>
 
 <style scoped>
-td {
-  padding: 0.2em;
-}
+
 </style>

spaces/pages/customers/index.vue

@@ -1,64 +1,80 @@
 <template>
+  <UDashboardNavbar title="Kunden" :badge="filteredRows.length">
+    <template #right>
+      <UInput
+          ref="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>
 
-  <Toolbar>
-    <UButton @click="router.push(`/customers/create/`)">+ Kunde</UButton>
+      <UButton @click="router.push(`/customers/create/`)">+ Kunde</UButton>
 
-    <UInput
-        v-model="searchString"
-        placeholder="Suche..."
-    />
+    </template>
+  </UDashboardNavbar>
 
-    <USelectMenu
-        v-model="selectedColumns"
-        multiple
-        :options="columnTemplate"
-        :uiMenu="{width:'w-40'}"
-        :popper="{placement: 'bottom-start'}"
-        by="key"
-    >
-      <UButton
-          color="gray"
-          variant="ghost"
-          class="flex-1 justify-between"
-          icon="i-heroicons-view-columns"
-      />
+  <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>
 
-      <template #option="{ option }">
-        {{option.label}}
-      </template>
-    </USelectMenu>
-  </Toolbar>
-
-  <div class="table">
-    <UTable
-        :rows="filteredRows"
-        :columns="selectedColumns"
-        @select="selectItem"
-
-        :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Noch keine Einträge' }"
-    >
-      <template #active-data="{row}">
-        <span v-if="row.active" class="text-primary-500">Aktiv</span>
-        <span v-else class="text-rose">Gesperrt</span>
-      </template>
-      <template #address-data="{row}">
-        {{row.infoData.street}}, {{row.infoData.special ? `${row.infoData.special},` : ''}} {{row.infoData.zip}} {{row.infoData.city}}, {{row.infoData.country}}
-      </template>
-    </UTable>
-  </div>
+  <UTable
+      :rows="filteredRows"
+      :columns="columns"
+      class="w-full"
+      :ui="{ divide: 'divide-gray-200 dark:divide-gray-800' }"
+      @select="(i) => router.push(`/customers/show/${i.id}`) "
+      :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Kunden anzuzeigen' }"
+  >
+    <template #active-data="{row}">
+      <span v-if="row.active" class="text-primary-500">Aktiv</span>
+      <span v-else class="text-rose-500">Gesperrt</span>
+    </template>
+    <template #address-data="{row}">
+      {{row.infoData.street ? `${row.infoData.street}, ` : ''}}{{row.infoData.special ? `${row.infoData.special},` : ''}} {{(row.infoData.zip || row.infoData.city) ? `${row.infoData.zip} ${row.infoData.city}, ` : ''}} {{row.infoData.country}}
+    </template>
+  </UTable>
 </template>
 
 <script setup>
-
 definePageMeta({
   middleware: "auth"
 })
 
+defineShortcuts({
+  '/': () => {
+    //console.log(searchinput)
+    //searchinput.value.focus()
+    document.getElementById("searchinput").focus()
+  },
+  '+': () => {
+    router.push("/customers/create")
+  }
+})
+
 const dataStore = useDataStore()
 const router = useRouter()
-const mode = ref("show")
 
-const columnTemplate = ref([
+const templateColumns = [
   {
     key: 'customerNumber',
     label: "Kundennr.",
@@ -84,26 +100,9 @@ const columnTemplate = ref([
     label: "Adresse",
     sortable: true
   }
-])
-const selectedColumns = ref([
-  {
-    key: 'customerNumber',
-    label: "Kundennr.",
-    sortable: true
-  },
-  {
-    key: "name",
-    label: "Name",
-    sortable: true
-  },
-])
-
-
-
-const selectItem = (customer) => {
-  console.log(customer)
-  router.push(`/customers/show/${customer.id} `)
-}
+]
+const selectedColumns = ref(templateColumns)
+const columns = computed(() => templateColumns.filter((column) => selectedColumns.value.includes(column)))
 
 
 const searchString = ref('')