Merge pull request #596 from MerginMaps/head-project-request

Upgrade app banner to have rounded boundaries in footer

Author: MarcelGeo

server/mergin/sync/public_api_v2_controller.py

@@ -204,6 +204,7 @@ def get_project(id, files_at_version=None):
     """Get project info. Include list of files at specific version if requested."""
     project = require_project_by_uuid(id, ProjectPermissions.Read, expose=False)
     data = ProjectSchemaV2().dump(project)
+
     if files_at_version:
         pv = ProjectVersion.query.filter_by(
             project_id=project.id, name=ProjectVersion.from_v_name(files_at_version)

web-app/packages/lib/src/common/components/AppPanelToggleable.vue

@@ -35,25 +35,40 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
 
 <script lang="ts" setup>
 import { PanelProps } from 'primevue/panel'
-import { ref, computed } from 'vue'
+import { ref, computed, useSlots } from 'vue'
 
 const props = defineProps<PanelProps>()
 const collapsed = ref(props.collapsed)
+const slots = useSlots()
 
-const pt = computed(() => ({
-  header: {
-    class: [
-      'surface-section border-none cursor-pointer',
-      // Toggle border radius by open / closed panel
-      collapsed.value ? 'border-round-2xl' : 'border-round-top-2xl',
-      props.pt?.header?.class ?? 'p-4'
-    ],
-    onclick: headerClick
-  },
-  content: {
-    class: 'border-none border-round-bottom-2xl p-4 pt-0'
+const pt = computed(() => {
+  const hasFooterSlot = Boolean(slots.footer)
+
+  return {
+    header: {
+      class: [
+        'surface-section border-none cursor-pointer',
+        // Toggle border radius by open / closed panel
+        collapsed.value ? 'border-round-2xl' : 'border-round-top-2xl',
+        props.pt?.header?.class ?? 'p-4'
+      ],
+      onclick: headerClick
+    },
+    content: {
+      class: [
+        'border-none p-4 pt-0',
+        hasFooterSlot ? '' : 'border-round-bottom-2xl'
+      ]
+    },
+    ...(hasFooterSlot
+      ? {
+          footer: {
+            class: 'border-none border-round-bottom-2xl p-4 pt-0'
+          }
+        }
+      : {})
   }
-}))
+})
 
 function headerClick() {
   collapsed.value = !collapsed.value