From 3f5f77c50d4298637995330e9f9374eb87821b91 Mon Sep 17 00:00:00 2001 From: Jannik Stehle Date: Mon, 27 Dec 2021 15:31:37 +0100 Subject: [PATCH 01/18] Implement spaces overview --- libre-graph-api-typescript-axios | 1 + packages/web-app-files/package.json | 1 + packages/web-app-files/src/index.js | 8 ++ .../web-app-files/src/spaces/views/Spaces.vue | 129 ++++++++++++++++++ .../web-runtime/themes/owncloud/theme.json | 3 + yarn.lock | 8 ++ 6 files changed, 150 insertions(+) create mode 160000 libre-graph-api-typescript-axios create mode 100644 packages/web-app-files/src/spaces/views/Spaces.vue diff --git a/libre-graph-api-typescript-axios b/libre-graph-api-typescript-axios new file mode 160000 index 00000000000..7dd01804d1f --- /dev/null +++ b/libre-graph-api-typescript-axios @@ -0,0 +1 @@ +Subproject commit 7dd01804d1f1ed20e6796fbefdb29761742258e7 diff --git a/packages/web-app-files/package.json b/packages/web-app-files/package.json index 20ce3e9b5b6..760bd4d9bcd 100644 --- a/packages/web-app-files/package.json +++ b/packages/web-app-files/package.json @@ -8,6 +8,7 @@ "copy-to-clipboard": "^3.3.1", "filter-obj": "^2.0.1", "semver": "^6.1.0", + "typescript-axios": "file:../../libre-graph-api-typescript-axios", "vue2-dropzone": "^3.6.0" } } diff --git a/packages/web-app-files/src/index.js b/packages/web-app-files/src/index.js index 6b61492a2de..185ca82b82c 100644 --- a/packages/web-app-files/src/index.js +++ b/packages/web-app-files/src/index.js @@ -77,6 +77,14 @@ const navItems = [ path: `/${appInfo.id}/shares/via-link` } }, + { + name: $gettext('Spaces'), + iconMaterial: 'space', + route: { + name: 'files-spaces', + path: `/${appInfo.id}/list/spaces` + } + }, { name: $gettext('Deleted files'), iconMaterial: 'delete-bin-5', diff --git a/packages/web-app-files/src/spaces/views/Spaces.vue b/packages/web-app-files/src/spaces/views/Spaces.vue new file mode 100644 index 00000000000..ed8d8fb5713 --- /dev/null +++ b/packages/web-app-files/src/spaces/views/Spaces.vue @@ -0,0 +1,129 @@ + + + + + diff --git a/packages/web-runtime/themes/owncloud/theme.json b/packages/web-runtime/themes/owncloud/theme.json index 5cfb9023e89..4e7982fe5f4 100644 --- a/packages/web-runtime/themes/owncloud/theme.json +++ b/packages/web-runtime/themes/owncloud/theme.json @@ -13,6 +13,9 @@ "loginPage": { "autoRedirect": true, "backgroundImg": "themes/owncloud/assets/loginBackground.jpg" + }, + "spaces": { + "defaultImg": "themes/owncloud/assets/spacesDefault.svg" } } } diff --git a/yarn.lock b/yarn.lock index 91e4ca7e528..906890ce540 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6788,6 +6788,7 @@ __metadata: copy-to-clipboard: ^3.3.1 filter-obj: ^2.0.1 semver: ^6.1.0 + typescript-axios: "file:../../libre-graph-api-typescript-axios" vue2-dropzone: ^3.6.0 languageName: unknown linkType: soft @@ -14854,6 +14855,13 @@ __metadata: languageName: node linkType: hard +"typescript-axios@file:../../libre-graph-api-typescript-axios::locator=files%40workspace%3Apackages%2Fweb-app-files": + version: 0.0.0 + resolution: "typescript-axios@file:../../libre-graph-api-typescript-axios#../../libre-graph-api-typescript-axios::hash=4ad935&locator=files%40workspace%3Apackages%2Fweb-app-files" + checksum: 9a75838296517619c068120983de8c2c596d15bcd8b6869a24ebcb3cbaede6d060c0f398e06facc08ab6926ef0cfaa934b0b6f2890853465739090101c65cb7e + languageName: node + linkType: hard + typescript@^4.3.2: version: 4.3.3 resolution: "typescript@npm:4.3.3" From fb761e4c45b0f90da46cb0865c58c0fd9a1b26ed Mon Sep 17 00:00:00 2001 From: Jannik Stehle Date: Mon, 27 Dec 2021 15:37:36 +0100 Subject: [PATCH 02/18] Remove box shadow --- .../web-app-files/src/spaces/views/Spaces.vue | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/packages/web-app-files/src/spaces/views/Spaces.vue b/packages/web-app-files/src/spaces/views/Spaces.vue index ed8d8fb5713..ab7d9a41953 100644 --- a/packages/web-app-files/src/spaces/views/Spaces.vue +++ b/packages/web-app-files/src/spaces/views/Spaces.vue @@ -29,6 +29,34 @@ + + + + + + +

Another Space

+ + + + + + + + + +

Lorem

+ + +
@@ -110,7 +138,7 @@ export default { From 984ee55ccfcc258bbe9898bd6a11a71befb9506d Mon Sep 17 00:00:00 2001 From: Jannik Stehle Date: Wed, 5 Jan 2022 13:07:22 +0100 Subject: [PATCH 11/18] Hide app bar for spaces, remove default icon --- packages/web-app-files/src/App.vue | 5 +++- .../src/components/AppBar/AppBar.vue | 5 +--- packages/web-app-files/src/router/spaces.ts | 2 +- .../web-app-files/src/spaces/views/Spaces.vue | 24 ++++++------------- .../tests/unit/spaces/Spaces.spec.js | 17 +++---------- .../web-runtime/themes/owncloud/theme.json | 3 --- 6 files changed, 16 insertions(+), 40 deletions(-) diff --git a/packages/web-app-files/src/App.vue b/packages/web-app-files/src/App.vue index 47a8127afb3..ce198a51f8e 100644 --- a/packages/web-app-files/src/App.vue +++ b/packages/web-app-files/src/App.vue @@ -6,7 +6,7 @@ class="files-list-wrapper oc-width-expand" @dragover="$_ocApp_dragOver" > - +
@@ -55,6 +55,9 @@ export default { }, showSidebar() { return !this.sidebarClosed + }, + hideAppBar() { + return this.$route.meta.hideAppBar === true } }, watch: { diff --git a/packages/web-app-files/src/components/AppBar/AppBar.vue b/packages/web-app-files/src/components/AppBar/AppBar.vue index b3eab067eb0..4abcbaa66c5 100644 --- a/packages/web-app-files/src/components/AppBar/AppBar.vue +++ b/packages/web-app-files/src/components/AppBar/AppBar.vue @@ -109,7 +109,7 @@ - + @@ -213,9 +213,6 @@ export default { hasBulkActions() { return this.$route.meta.hasBulkActions === true }, - hideViewOptions() { - return this.$route.meta.hideViewOptions === true - }, pageTitle() { const title = this.$route.meta.title return this.$gettext(title) diff --git a/packages/web-app-files/src/router/spaces.ts b/packages/web-app-files/src/router/spaces.ts index 4eda7b0251c..70151b4989d 100644 --- a/packages/web-app-files/src/router/spaces.ts +++ b/packages/web-app-files/src/router/spaces.ts @@ -45,7 +45,7 @@ export const buildRoutes = (components: RouteComponents): RouteConfig[] => [ meta: { hideFilelistActions: true, hasBulkActions: true, - hideViewOptions: true, + hideAppBar: true, title: $gettext('Spaces') } } diff --git a/packages/web-app-files/src/spaces/views/Spaces.vue b/packages/web-app-files/src/spaces/views/Spaces.vue index e7905c1979f..653310d4184 100644 --- a/packages/web-app-files/src/spaces/views/Spaces.vue +++ b/packages/web-app-files/src/spaces/views/Spaces.vue @@ -1,12 +1,10 @@