diff --git a/dev/docker/ocis.web.config.json b/dev/docker/ocis.web.config.json index 6696b48d521..8435f66d934 100644 --- 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 index 8d9971f1158..3f3d39f3f4d 100644 --- 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 index d2eee1617b6..4567043e0a3 100644 --- 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 index abdeb537a63..4c15dd87316 100644 --- 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 index a6a4ffcaf9f..34f9f4a68a2 100644 --- a/packages/web-runtime/src/layouts/Application.vue +++ b/packages/web-runtime/src/layouts/Application.vue @@ -11,7 +11,13 @@