From 1cba7bbb5a32fc9fd531db4e8841c428e3814efb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Sat, 21 Mar 2020 19:07:46 +0100 Subject: [PATCH] Sidebar & cleanup 2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- package-lock.json | 37 ++- package.json | 3 + src/Forms.vue | 12 +- src/components/AppNavigationForm.vue | 18 + src/components/_base-SideBar.vue | 39 --- src/components/shareDiv.vue | 1 + src/main.js | 26 +- src/mixins/ViewsMixin.js | 5 + src/router.js | 16 +- src/views/Create.vue | 478 ++++++--------------------- src/views/Sidebar.vue | 244 ++++++++++++++ 11 files changed, 435 insertions(+), 444 deletions(-) delete mode 100644 src/components/_base-SideBar.vue create mode 100644 src/views/Sidebar.vue diff --git a/package-lock.json b/package-lock.json index 00a8486..b8173a9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1722,17 +1722,18 @@ } }, "@nextcloud/l10n": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@nextcloud/l10n/-/l10n-1.0.0.tgz", - "integrity": "sha512-A6zUwFWgwvQ5q86GdcfgD2t3uZ+H/k45S0OUlS6iMf0p5br9IrovF7hdv5+jaJcdQpkpOX2AKuordC1KheNGGA==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@nextcloud/l10n/-/l10n-1.1.1.tgz", + "integrity": "sha512-aVGvOhXgBzGtgMTOIVov1T7jt35FjX2vCqWCT0C/t6T6VgRn6l2Wb3/jzQycyUgGe71VPqS/4TpSH21yyH99YA==", "requires": { - "core-js": "3.5.0" + "core-js": "3.6.4", + "node-gettext": "^2.0.0" }, "dependencies": { "core-js": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.5.0.tgz", - "integrity": "sha512-Ifh3kj78gzQ7NAoJXeTu+XwzDld0QRIwjBLRqAMhuLhP3d2Av5wmgE9ycfnvK6NAEjTkQ1sDPeoEZAWO3Hx1Uw==" + "version": "3.6.4", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz", + "integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==" } } }, @@ -1745,6 +1746,23 @@ "core-js": "3.6.1", "i18next": "19.0.2", "moment": "2.24.0" + }, + "dependencies": { + "@nextcloud/l10n": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@nextcloud/l10n/-/l10n-1.0.0.tgz", + "integrity": "sha512-A6zUwFWgwvQ5q86GdcfgD2t3uZ+H/k45S0OUlS6iMf0p5br9IrovF7hdv5+jaJcdQpkpOX2AKuordC1KheNGGA==", + "requires": { + "core-js": "3.5.0" + }, + "dependencies": { + "core-js": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.5.0.tgz", + "integrity": "sha512-Ifh3kj78gzQ7NAoJXeTu+XwzDld0QRIwjBLRqAMhuLhP3d2Av5wmgE9ycfnvK6NAEjTkQ1sDPeoEZAWO3Hx1Uw==" + } + } + } } }, "@nextcloud/router": { @@ -3775,6 +3793,11 @@ "integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=", "dev": true }, + "debounce": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/debounce/-/debounce-1.2.0.tgz", + "integrity": "sha512-mYtLl1xfZLi1m4RtQYlZgJUNQjl4ZxVnHzIR8nLLgi4q1YT8o/WM+MK/f8yfcc9s5Ir5zRaPZyZU6xs1Syoocg==" + }, "debug": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", diff --git a/package.json b/package.json index e1e553e..ee18188 100644 --- a/package.json +++ b/package.json @@ -69,11 +69,14 @@ "test:coverage": "jest --coverage" }, "dependencies": { + "@nextcloud/auth": "^1.2.2", "@nextcloud/axios": "^1.3.2", "@nextcloud/dialogs": "^1.2.2", + "@nextcloud/l10n": "^1.1.1", "@nextcloud/moment": "^1.1.0", "@nextcloud/router": "^1.0.2", "@nextcloud/vue": "^1.4.1", + "debounce": "^1.2.0", "json2csv": "5.0.0", "vue": "^2.6.11", "vue-clipboard2": "^0.3.1", diff --git a/src/Forms.vue b/src/Forms.vue index 98007c5..5531fce 100644 --- a/src/Forms.vue +++ b/src/Forms.vue @@ -29,7 +29,7 @@ - + {{ t('forms', 'Loading forms …') }} @@ -48,7 +48,10 @@ - + @@ -97,6 +100,11 @@ export default { hash() { return this.$route.params.hash }, + + selectedForm() { + // TODO: replace with form.hash + return this.forms.find(form => form.event.hash === this.hash) + }, }, beforeMount() { diff --git a/src/components/AppNavigationForm.vue b/src/components/AppNavigationForm.vue index 8305cad..59330a3 100644 --- a/src/components/AppNavigationForm.vue +++ b/src/components/AppNavigationForm.vue @@ -25,6 +25,7 @@ :exact="true" :title="form.title" :to="{ name: 'edit', params: { hash: form.hash } }"> +