Changed to new Layout System

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

@@ -1,12 +1,9 @@
 <script setup>
-import dayjs from "dayjs";
-
 definePageMeta({
   middleware: "auth"
 })
 
 const dataStore = useDataStore()
-const supabase = useSupabaseClient()
 const route = useRoute()
 const router = useRouter()
 const toast = useToast()
@@ -14,12 +11,6 @@ const id = ref(route.params.id ? route.params.id : null )
 
 let currentItem = ref(null)
 
-/*watch(dataStore.tasks, (oldVal,newVal) => {
-  console.log("OK")
-  console.log(dataStore.tasks)
-  currentItem.value = dataStore.getTaskById(Number(useRoute().params.id))
-})*/
-
 //Working
 const mode = ref(route.params.mode || "show")
 const itemInfo = ref({})
@@ -44,7 +35,6 @@ const setupPage = () => {
 
 const editItem = async () => {
   router.push(`/tasks/edit/${currentItem.value.id}`)
-  setupPage()
 }
 
 const cancelEditorCreate = () => {
@@ -55,223 +45,50 @@ const cancelEditorCreate = () => {
   }
 }
 
-const updateItem = async () => {
-  const {error} = await supabase
-      .from("tasks")
-      .update(itemInfo.value)
-      .eq('id',itemInfo.value.id)
-
-  if(error) {
-    console.log(error)
-  }
-
-
-  router.push(`/tasks/show/${currentItem.value.id}`)
-  toast.add({title: "Aufgabe erfolgreich gespeichert"})
-  dataStore.fetchTasks()
-}
-
-
 
 setupPage()
 </script>
 
 <template>
-  <UDashboardPage>
-    <UDashboardPanel grow>
-      <UDashboardNavbar :title="currentItem ? currentItem.name : ''">
-        <template #right>
-          <UButton
-              v-if="mode === 'edit'"
-              @click="dataStore.updateItem('tasks',itemInfo)"
-          >
-            Speichern
-          </UButton>
-          <UButton
-              v-else-if="mode === 'create'"
-              @click="dataStore.createNewItem('tasks',itemInfo)"
-          >
-            Erstellen
-          </UButton>
-          <UButton
-              @click="cancelEditorCreate"
-              color="red"
-              class="ml-2"
-              v-if="mode === 'edit' || mode === 'create'"
-          >
-            Abbrechen
-          </UButton>
-          <UButton
-              v-if="mode === 'show' && currentItem.id"
-              @click="editItem"
-          >
-            Bearbeiten
-          </UButton>
-        </template>
-      </UDashboardNavbar>
-
-<!--      <UDashboardToolbar>
-        <template #left>
-          &lt;!&ndash;          <UButton @click="router.push(`/tasks/create`)">+ Aufgabe</UButton>
-
-                    <UInput
-                        v-model="searchString"
-                        placeholder="Suche..."
-                    />&ndash;&gt;
-
-          <UCheckbox
-              label="Erledigte Anzeigen"
-              v-model="showDone"
-          />
-        </template>
-
-        <template #right>
-          <USelectMenu
-              v-model="selectedColumns"
-              icon="i-heroicons-adjustments-horizontal-solid"
-              :options="templateColumns"
-              multiple
-              class="hidden lg:block"
-          >
-            <template #label>
-              Spalten
-            </template>
-          </USelectMenu>
-        </template>
-      </UDashboardToolbar>-->
-
-
-      <UTabs
-          :items="[{label: 'Informationen'},{label: 'Logbuch'}]"
-          v-if="currentItem && mode === 'show'"
-          class="p-5"
+  <UDashboardNavbar :title="currentItem ? currentItem.name : (mode === 'create' ? 'Aufgabe erstellen' : 'Aufgabe bearbeiten')">
+    <template #right>
+      <UButton
+          v-if="mode === 'edit'"
+          @click="dataStore.updateItem('tasks',itemInfo)"
       >
-        <template #item="{item}">
-          <UCard class="mt-5">
-            <div v-if="item.label === 'Informationen'">
-
-
-              <div class="truncate">
-                <p>Kategorie: {{currentItem.categorie}}</p>
-                <p v-if="currentItem.project">Projekt: <nuxt-link :to="`/projects/show/${currentItem.project}`">{{dataStore.getProjectById(currentItem.project).name}}</nuxt-link></p>
-                <p>Beschreibung: {{currentItem.description}}</p>
-              </div>
-
-            </div>
-            <!-- TODO: Logbuch Tasks -->
-          </UCard>
-        </template>
-      </UTabs>
-
-      <UForm v-else-if="mode === 'edit' || mode === 'create' " class="p-5">
-        <UFormGroup
-            label="Name:"
-        >
-          <UInput
-              v-model="itemInfo.name"
-          />
-        </UFormGroup>
-
-        <UFormGroup
-            label="Kategorie:"
-        >
-          <USelectMenu
-              v-model="itemInfo.categorie"
-              :options="categories"
-          />
-        </UFormGroup>
-
-        <UFormGroup
-            label="Benutzer:"
-        >
-          <USelectMenu
-              v-model="itemInfo.user"
-              :options="dataStore.profiles"
-              option-attribute="fullName"
-              value-attribute="id"
-              searchable-placeholder="Suche..."
-              searchable
-              :search-attributes="['fullName']"
-          >
-            <template #label>
-              {{dataStore.getProfileById(itemInfo.user) ? dataStore.getProfileById(itemInfo.user).fullName : "Kein Benutzer ausgewählt"}}
-            </template>
-          </USelectMenu>
-        </UFormGroup>
-        <UFormGroup
-            label="Projekt:"
-        >
-          <USelectMenu
-              v-model="itemInfo.project"
-              :options="dataStore.projects"
-              option-attribute="name"
-              value-attribute="id"
-              searchable-placeholder="Suche..."
-              searchable
-              :search-attributes="['name']"
-          >
-            <template #label>
-              {{dataStore.getProjectById(itemInfo.project) ? dataStore.getProjectById(itemInfo.project).name : "Kein Projekt ausgewählt"}}
-            </template>
-          </USelectMenu>
-        </UFormGroup>
-        <UFormGroup
-            label="Objekt:"
-        >
-          <USelectMenu
-              v-model="itemInfo.plant"
-              :options="dataStore.plants"
-              option-attribute="name"
-              value-attribute="id"
-              searchable-placeholder="Suche..."
-              searchable
-              :search-attributes="['name']"
-          >
-            <template #label>
-              {{dataStore.getPlantById(itemInfo.plant) ? dataStore.getPlantById(itemInfo.plant).name : "Kein Objekt ausgewählt"}}
-            </template>
-          </USelectMenu>
-        </UFormGroup>
-
-        <UFormGroup
-            label="Beschreibung:"
-        >
-          <UTextarea
-              v-model="itemInfo.description"
-          />
-        </UFormGroup>
-      </UForm>
-
-
-
-    </UDashboardPanel>
-  </UDashboardPage>
-
-<!--  <h1
-      class="mb-3 truncate font-bold text-2xl"
-      v-if="currentItem"
-  >Aufgabe: {{currentItem.name}}</h1>
+        Speichern
+      </UButton>
+      <UButton
+          v-else-if="mode === 'create'"
+          @click="dataStore.createNewItem('tasks',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>
+  </UDashboardNavbar>
   <UTabs
-    :items="[{label: 'Informationen'},{label: 'Logbuch'}]"
-    v-if="currentItem && mode === 'show'"
+      :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>
-            <UButton
-                v-if="currentItem.project"
-                @click="router.push(`/projects/show/${currentItem.project}`)"
-            >
-              Zum Projekt
-            </UButton>
-          </Toolbar>
+
 
           <div class="truncate">
             <p>Kategorie: {{currentItem.categorie}}</p>
@@ -280,15 +97,12 @@ setupPage()
           </div>
 
         </div>
-        &lt;!&ndash; TODO: Logbuch Tasks &ndash;&gt;
+        <!-- TODO: Logbuch Tasks -->
       </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:"
     >
@@ -358,9 +172,6 @@ setupPage()
       </USelectMenu>
     </UFormGroup>
 
-
-
-
     <UFormGroup
         label="Beschreibung:"
     >
@@ -368,31 +179,7 @@ setupPage()
           v-model="itemInfo.description"
       />
     </UFormGroup>
-
-
-    <template #footer>
-      <UButton
-          v-if="mode === 'edit'"
-          @click="dataStore.updateItem('tasks',itemInfo)"
-      >
-        Speichern
-      </UButton>
-      <UButton
-          v-else-if="mode === 'create'"
-          @click="dataStore.createNewItem('tasks',itemInfo)"
-      >
-        Erstellen
-      </UButton>
-      <UButton
-          @click="cancelEditorCreate"
-          color="red"
-          class="ml-2"
-      >
-        Abbrechen
-      </UButton>
-    </template>
-
-  </UCard>-->
+  </UForm>
 </template>
 
 <style scoped>

spaces/pages/tasks/index.vue

@@ -1,108 +1,98 @@
 <template>
-  <UDashboardPage>
-    <UDashboardPanel grow>
-      <UDashboardNavbar title="Aufgaben" :badge="filteredRows.length">
-        <template #right>
-          <UInput
-              ref="input"
-              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>
-
-          <UButton @click="router.push(`/tasks/create`)">+ Aufgabe</UButton>
-        </template>
-      </UDashboardNavbar>
-
-      <UDashboardToolbar>
-        <template #left>
-<!--          <UButton @click="router.push(`/tasks/create`)">+ Aufgabe</UButton>
-
-          <UInput
-              v-model="searchString"
-              placeholder="Suche..."
-          />-->
-
-          <UCheckbox
-              label="Erledigte Anzeigen"
-              v-model="showDone"
-          />
-        </template>
-
-        <template #right>
-          <USelectMenu
-              v-model="selectedColumns"
-              icon="i-heroicons-adjustments-horizontal-solid"
-              :options="templateColumns"
-              multiple
-              class="hidden lg:block"
-          >
-            <template #label>
-              Spalten
-            </template>
-          </USelectMenu>
-        </template>
-      </UDashboardToolbar>
-
-      <UTable
-          v-model:sort="sort"
-          :rows="filteredRows"
-          :columns="columns"
-          sort-mode="manual"
-          class="w-full"
-          :ui="{ divide: 'divide-gray-200 dark:divide-gray-800' }"
-          @select="(i) => router.push(`/tasks/show/${i.id}`) "
+  <UDashboardNavbar title="Aufgaben" :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 #finish-data="{row}">
-          <UButton
-              icon="i-heroicons-check"
-              variant="ghost"
-              @click="markAsFinished(row)"
-          />
+        <template #trailing>
+          <UKbd value="/" />
         </template>
-        <template #created_at-data="{row}">
-          {{row.created_at ? dayjs(row.created_at).format("DD.MM.YY HH:mm") : ''}}
+      </UInput>
+
+      <UButton @click="router.push(`/tasks/create`)">+ Aufgabe</UButton>
+    </template>
+  </UDashboardNavbar>
+
+  <UDashboardToolbar>
+    <template #left>
+
+
+      <UCheckbox
+          label="Erledigte Anzeigen"
+          v-model="showDone"
+      />
+    </template>
+
+    <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>
-        <template #user-data="{row}">
-          {{dataStore.profiles.find(i => i.id === row.user) ? dataStore.profiles.find(i => i.id === row.user).fullName : ""}}
-        </template>
-        <template #project-data="{row}">
-          {{dataStore.projects.find(i => i.id === row.project) ? dataStore.projects.find(i => i.id === row.project).name : ""}}
-        </template>
-        <template #customer-data="{row}">
-          {{dataStore.customers.find(customer => customer.id === row.customer) ? dataStore.customers.find(customer => customer.id === row.customer).name : "" }}
-        </template>
-        <template #plant-data="{row}">
-          {{dataStore.getPlantById(row.plant) ? dataStore.getPlantById(row.plant).name : "" }}
-        </template>
-      </UTable>
-    </UDashboardPanel>
-  </UDashboardPage>
+      </USelectMenu>
+    </template>
+  </UDashboardToolbar>
+
+  <UTable
+      :rows="filteredRows"
+      :columns="columns"
+      class="w-full"
+      :ui="{ divide: 'divide-gray-200 dark:divide-gray-800' }"
+      @select="(i) => router.push(`/tasks/show/${i.id}`) "
+      :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Aufgaben anzuzeigen' }"
+  >
+    <template #finish-data="{row}">
+      <UButton
+          icon="i-heroicons-check"
+          variant="ghost"
+          @click="markAsFinished(row)"
+      />
+    </template>
+    <template #created_at-data="{row}">
+      {{row.created_at ? dayjs(row.created_at).format("DD.MM.YY HH:mm") : ''}}
+    </template>
+    <template #user-data="{row}">
+      {{dataStore.profiles.find(i => i.id === row.user) ? dataStore.profiles.find(i => i.id === row.user).fullName : ""}}
+    </template>
+    <template #project-data="{row}">
+      {{dataStore.projects.find(i => i.id === row.project) ? dataStore.projects.find(i => i.id === row.project).name : ""}}
+    </template>
+    <template #customer-data="{row}">
+      {{dataStore.customers.find(customer => customer.id === row.customer) ? dataStore.customers.find(customer => customer.id === row.customer).name : "" }}
+    </template>
+    <template #plant-data="{row}">
+      {{dataStore.getPlantById(row.plant) ? dataStore.getPlantById(row.plant).name : "" }}
+    </template>
+  </UTable>
 </template>
 
-<script lang="ts" setup>
+<script setup>
 import  dayjs from "dayjs";
 
 definePageMeta({
   middleware: "auth"
 })
-const input = ref<{ input: HTMLInputElement }>()
 
 const dataStore = useDataStore()
 const router = useRouter()
-const mode = ref("show")
-
 
 defineShortcuts({
   '/': () => {
-    input.value?.input?.focus()
+    //console.log(searchinput)
+    //searchinput.value.focus()
+    document.getElementById("searchinput").focus()
   },
   '+': () => {
     router.push("/tasks/create")
@@ -143,40 +133,30 @@ const templateColumns = [
     sortable: true
   }
 ]
-
 const selectedColumns = ref(templateColumns)
 const columns = computed(() => templateColumns.filter((column) => selectedColumns.value.includes(column)))
 
+const markAsFinished = (item) => {
+  dataStore.updateItem("tasks", {...item, categorie: "Erledigt"})
+}
 
 const searchString = ref('')
 const showDone = ref(false)
-
-
 const filteredRows = computed(() => {
-  let tasks = dataStore.tasks
+  let items = dataStore.tasks
 
-  if(!showDone.value) {
-    tasks = tasks.filter(i => i.categorie !== "Erledigt")
-  }
+  items = items.filter(i => showDone.value === true ? i.categorie === "Erledigt" : i.categorie !== "Erledigt")
 
   if(!searchString.value) {
-    return tasks
+    return items
   }
 
-  return tasks.filter(item => {
+  return items.filter(item => {
     return Object.values(item).some((value) => {
       return String(value).toLowerCase().includes(searchString.value.toLowerCase())
     })
   })
 })
-
-const selectItem = (item) => {
-  router.push(`/tasks/show/${item.id} `)
-}
-
-const markAsFinished = (item) => {
-  dataStore.updateItem("tasks", {...item, categorie: "Erledigt"})
-}
 </script>
 
 <style scoped>