feat(sidebarPanel): Make content use all available vertical space

owncloud · Dec 7, 2023 · 7869863 · 7869863
1 parent 4200b4d
commit 7869863
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 3 deletions.
diff --git a/dev/docker/ocis.web.config.json b/dev/docker/ocis.web.config.json
@@ -24,7 +24,8 @@
       "text/plain",
       "image/tiff",
       "image/bmp",
-      "image/x-ms-bmp"
+      "image/x-ms-bmp",
+      "audio/mpeg"
     ],
     "contextHelpersReadMore": true
   },
@@ -60,6 +61,17 @@
       "config": {
         "companionUrl": "https://host.docker.internal:9200/companion"
       }
+    },
+    {
+      "id": "media-player",
+      "path": "https://localhost:9721/media-player.js"
+    },
+    {
+      "id": "cast",
+      "path": "https://localhost:9722/cast.js",
+      "config": {
+        "overrideServerOrigin": "http://192.168.188.78:9100"
+      }
     }
   ]
 }
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -85,7 +85,7 @@ services:
     labels:
       traefik.enable: true
       traefik.http.routers.ocis.tls: true
-      traefik.http.routers.ocis.rule: Host(`host.docker.internal`) && PathPrefix(`/`)
+      traefik.http.routers.ocis.rule: Host(`host.docker.internal`) || Host(`192.168.188.78`)
       traefik.http.routers.ocis.entrypoints: ocis
       traefik.http.services.ocis.loadbalancer.server.port: 9200
       # workaround: https://github.com/owncloud/ocis/issues/5108
@@ -99,6 +99,8 @@ services:
       - ./dev/docker/ocis/app-registry.yaml:/etc/ocis/app-registry.yaml
       - ocis-config:/etc/ocis
       - ${OCIS_WEB_CONFIG:-./dev/docker/ocis.web.config.json}:/web/config.json:ro
+    ports:
+      - 9100:9200
 
   ocis-federated:
     <<: *ocis-service

diff --git a/packages/web-client/src/webdav/listFiles.ts b/packages/web-client/src/webdav/listFiles.ts
@@ -110,6 +110,7 @@ export const ListFilesFactory = (
             : buildWebDavFilesTrashPath(space.id.toString())
         }
 
+        console.log('DAV PROPERTIES', davProperties)
         webDavResources = await dav.propfind(webDavPath, {
           depth,
           headers,

diff --git a/packages/web-pkg/src/components/SideBar/SideBar.vue b/packages/web-pkg/src/components/SideBar/SideBar.vue
@@ -371,6 +371,12 @@ export default defineComponent({
     overflow-y: auto;
     overflow-x: hidden;
     padding: var(--oc-space-small);
+    display: flex;
+    flex-direction: column;
+
+    &-content {
+      flex: 1;
+    }
   }
 
   &__navigation {

diff --git a/packages/web-runtime/src/layouts/Application.vue b/packages/web-runtime/src/layouts/Application.vue
@@ -11,7 +11,13 @@
       <div class="app-container oc-flex">
         <app-loading-spinner v-if="isLoading" />
         <template v-else>
-          <sidebar-nav v-if="isSidebarVisible" class="app-navigation" :nav-items="navItems" />
+          <sidebar-nav v-if="isSidebarVisible" class="app-navigation" :nav-items="navItems">
+            <template #bottom>
+              <div class="web-content-nav-bottom">
+                <portal-target name="app.runtime.nav.bottom" />
+              </div>
+            </template>
+          </sidebar-nav>
           <portal to="app.runtime.mobile.nav">
             <mobile-nav v-if="isMobileWidth" :nav-items="navItems" />
           </portal>
@@ -266,6 +272,13 @@ export default defineComponent({
     }
   }
 
+  .web-content-nav-bottom {
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-end;
+    height: 100%;
+  }
+
   .snackbars {
     position: absolute;
     right: 20px;