Changed to new Layout System

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

@@ -82,12 +82,6 @@ const itemInfo = ref({
   customer: 0,
   users: [user.value.id]
 })
-
-const uploadModalOpen = ref(false)
-const fileUploadFormData = ref({
-  tags: ["Dokument"],
-  project: null
-})
 const tags = dataStore.getDocumentTags
 
 
@@ -109,13 +103,6 @@ const setupPage = () => {
       itemInfo.value.customer = dataStore.getPlantById(itemInfo.value.plant).customer
     }
   }
-
-
-}
-
-const editItem = async () => {
-  router.push(`/projects/edit/${currentItem.value.id}`)
-  setupPage()
 }
 
 const cancelEditorCreate = () => {
@@ -126,32 +113,6 @@ const cancelEditorCreate = () => {
   }
 }
 
-const updateItem = async () => {
-  const {error} = await supabase
-      .from("projects")
-      .update(itemInfo.value)
-      .eq('id',itemInfo.value.id)
-
-  if(error) {
-    console.log(error)
-  }
-
-
-  router.push(`/projects/show/${currentItem.value.id}`)
-  toast.add({title: "Projekt erfolgreich gespeichert"})
-  dataStore.fetchProjects()
-}
-
-const uploadFiles = async () => {
-  //uploadInProgress.value = true;
-
-  await dataStore.uploadFiles({...fileUploadFormData.value, project: currentItem.value.id}, document.getElementById("fileUploadInput").files)
-
-  uploadModalOpen.value = false;
-  //uploadInProgress.value = false;
-}
-
-
 const projectHours = () => {
   let hours = 0
   dataStore.getTimesByProjectId(currentItem.value.id).forEach(item => {
@@ -212,21 +173,45 @@ setupPage()
 </script>
 
 <template>
-  <h1
-      class="mb-3 truncate font-bold text-2xl"
-      v-if="currentItem "
-  >Projekt: {{currentItem.name}}</h1>
-  <UTabs :items="tabItems" class="w-full"  v-if="currentItem && mode == 'show'">
+  <UDashboardNavbar :title="currentItem ? currentItem.name : (mode === 'create' ? 'Projekt erstellen' : 'Projekt bearbeiten')">
+    <template #right>
+      <UButton
+          v-if="mode === 'edit'"
+          @click="dataStore.updateItem('projects',itemInfo)"
+      >
+        Speichern
+      </UButton>
+      <UButton
+          v-else-if="mode === 'create'"
+          @click="dataStore.createNewItem('projects',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(`/projects/edit/${currentItem.id}`)"
+      >
+        Bearbeiten
+      </UButton>
+    </template>
+  </UDashboardNavbar>
+  <UTabs
+      :items="tabItems"
+      v-if="currentItem && mode == 'show'"
+      class="p-5"
+  >
     <template #item="{ item }">
       <UCard class="mt-5">
         <div v-if="item.key === 'information'">
-          <Toolbar>
-            <UButton
-                @click="editItem"
-            >
-              Bearbeiten
-            </UButton>
-          </Toolbar>
+
 
 
           <div class="text-wrap">
@@ -391,11 +376,7 @@ setupPage()
 
   </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:"
     >
@@ -477,32 +458,7 @@ setupPage()
         v-model="itemInfo.notes"
       />
     </UFormGroup>
-
-    <template #footer>
-      <UButton
-          v-if="mode == 'edit'"
-          @click="dataStore.updateItem('projects',itemInfo)"
-      >
-        Speichern
-      </UButton>
-      <UButton
-          v-else-if="mode == 'create'"
-          @click="dataStore.createNewItem('projects',itemInfo)"
-      >
-        Erstellen
-      </UButton>
-      <UButton
-          @click="cancelEditorCreate"
-          color="red"
-          class="ml-2"
-      >
-        Abbrechen
-      </UButton>
-    </template>
-
-  </UCard>
-
-
+  </UForm>
 </template>
 
 <style scoped>

spaces/pages/projects/index.vue

@@ -1,53 +1,97 @@
 <template>
-  <InputGroup >
-    <UButton @click="router.push(`/projects/create/`)">+ Projekt</UButton>
+  <UDashboardNavbar title="Projekte" :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..."
-    />
+      <UButton @click="router.push(`/projects/create`)">+ Projekt</UButton>
+    </template>
+  </UDashboardNavbar>
 
-    <UCheckbox
-      label="Abgeschlossene anzeigen"
-      v-model="showFinished"
-    />
-  </InputGroup>
+  <UDashboardToolbar>
+    <template #left>
 
 
-  <div class="table">
-    <UTable
-        :rows="filteredRows"
-        @select="selectItem"
-        :columns="itemColumns"
-        :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Noch keine Einträge' }"
-    >
-      <template #phase-data="{row}">
-        {{getActivePhaseLabel(row)}}
-      </template>
-      <template #customer-data="{row}">
-        {{dataStore.getCustomerById(row.customer) ? dataStore.getCustomerById(row.customer).name : ""}}
-      </template>
-      <template #plant-data="{row}">
-        {{dataStore.getPlantById(row.plant) ? dataStore.getPlantById(row.plant).name : ""}}
-      </template>
-      <template #users-data="{row}">
-        {{row.users.map(i => dataStore.getProfileById(i).fullName).join(", ")}}
-      </template>
-    </UTable>
-  </div>
+      <UCheckbox
+          label="Abgeschlossene anzeigen"
+          v-model="showFinished"
+      />
+    </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>
+      </USelectMenu>
+    </template>
+  </UDashboardToolbar>
+
+
+
+
+  <UTable
+      :rows="filteredRows"
+      :columns="columns"
+      class="w-full"
+      :ui="{ divide: 'divide-gray-200 dark:divide-gray-800' }"
+      @select="(i) => router.push(`/projects/show/${i.id}`) "
+      :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Projekte anzuzeigen' }"
+  >
+    <template #phase-data="{row}">
+      {{getActivePhaseLabel(row)}}
+    </template>
+    <template #customer-data="{row}">
+      {{dataStore.getCustomerById(row.customer) ? dataStore.getCustomerById(row.customer).name : ""}}
+    </template>
+    <template #plant-data="{row}">
+      {{dataStore.getPlantById(row.plant) ? dataStore.getPlantById(row.plant).name : ""}}
+    </template>
+    <template #users-data="{row}">
+      {{row.users.map(i => dataStore.getProfileById(i).fullName).join(", ")}}
+    </template>
+  </UTable>
 
 </template>
 
 <script setup>
-
 definePageMeta({
   middleware: "auth"
 })
+
+defineShortcuts({
+  '/': () => {
+    //console.log(searchinput)
+    //searchinput.value.focus()
+    document.getElementById("searchinput").focus()
+  },
+  '+': () => {
+    router.push("/projects/create")
+  }
+})
+
 const dataStore = useDataStore()
-const supabase = useSupabaseClient()
 const router = useRouter()
 
-const itemColumns = [
+const templateColumns = [
   {
     key: "phase",
     label: "Phase"
@@ -80,11 +124,9 @@ 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(`/projects/show/${item.id} `)
-}
 
 const getActivePhaseLabel = (item) => {
   if(item.phases) {
@@ -125,18 +167,10 @@ const filteredRows = computed(() => {
     return items
   }
 
-
-
   return items.filter(project => {
     return Object.values(project).some((value) => {
       return String(value).toLowerCase().includes(searchString.value.toLowerCase())
     })
   })
 })
-
-
-</script>
-
-<style scoped>
-
-</style>
+</script>