From cd4bf4857a6f841beb2cc7bc984542e7d2e690f9 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Sat, 28 May 2022 17:59:48 +0530 Subject: [PATCH 1/5] upgrade storage button --- src/components/StorageLayout.vue | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/components/StorageLayout.vue b/src/components/StorageLayout.vue index f51311a..f7adb9c 100755 --- a/src/components/StorageLayout.vue +++ b/src/components/StorageLayout.vue @@ -16,7 +16,7 @@
{{ usageinfo }}
-
+
{{ upgradeStorage }} @@ -53,9 +53,9 @@ export default { data() { return { storageInfo: [], - isHidden: false, redirectURL: '', storageLink: '', + link: '', storage: OC.L10N.translate('ecloud-dashboard', 'Storage'), upgradeStorage: OC.L10N.translate('ecloud-dashboard', 'Upgrade Storage'), getCredits: OC.L10N.translate('ecloud-dashboard', 'getCredits'), @@ -115,9 +115,7 @@ export default { .then((response) => { this.storageLink = response.data.storageLink this.redirectURL = response.data.redirectURL - if (response.data.link === '') { - this.isHidden = true - } + this.link = response.data.link }) }, }, -- GitLab From 899aea076fbb92618af9c1f5d674a6b542e04f08 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Sat, 28 May 2022 18:15:56 +0530 Subject: [PATCH 2/5] condition if storage is not unlimited --- src/components/StorageLayout.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/StorageLayout.vue b/src/components/StorageLayout.vue index f7adb9c..62642d7 100755 --- a/src/components/StorageLayout.vue +++ b/src/components/StorageLayout.vue @@ -16,7 +16,7 @@
{{ usageinfo }}
-
+
{{ upgradeStorage }} -- GitLab From 91b9375b7ea51b67a35bbd29c22f6747d978e9c0 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Sat, 28 May 2022 18:34:16 +0530 Subject: [PATCH 3/5] removed unncessary variable --- src/components/StorageLayout.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/components/StorageLayout.vue b/src/components/StorageLayout.vue index 62642d7..e0c276b 100755 --- a/src/components/StorageLayout.vue +++ b/src/components/StorageLayout.vue @@ -55,7 +55,6 @@ export default { storageInfo: [], redirectURL: '', storageLink: '', - link: '', storage: OC.L10N.translate('ecloud-dashboard', 'Storage'), upgradeStorage: OC.L10N.translate('ecloud-dashboard', 'Upgrade Storage'), getCredits: OC.L10N.translate('ecloud-dashboard', 'getCredits'), @@ -115,7 +114,6 @@ export default { .then((response) => { this.storageLink = response.data.storageLink this.redirectURL = response.data.redirectURL - this.link = response.data.link }) }, }, -- GitLab From 29da5b5a9fc70d242629fa876bd2154aecfda5e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnau=20V=C3=A0zquez?= Date: Sat, 28 May 2022 13:32:24 +0000 Subject: [PATCH 4/5] Check also empty links --- src/components/StorageLayout.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/StorageLayout.vue b/src/components/StorageLayout.vue index e0c276b..1e52236 100755 --- a/src/components/StorageLayout.vue +++ b/src/components/StorageLayout.vue @@ -16,7 +16,7 @@
{{ usageinfo }}
-
+
{{ upgradeStorage }} @@ -112,7 +112,7 @@ export default { axios .get(generateUrl('/apps/ecloud-dashboard/apps/get-redirections')) .then((response) => { - this.storageLink = response.data.storageLink + this.storageLink = response.data.storageLink || '' this.redirectURL = response.data.redirectURL }) }, -- GitLab From 03a01ab65cf838dccb17f0d6ad3952047cbf6f77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnau=20V=C3=A0zquez=20Palma?= Date: Sat, 28 May 2022 15:41:49 +0200 Subject: [PATCH 5/5] Fix weird space entered in web IDE --- package-lock.json | 3 --- package.json | 8 ++++---- src/components/StorageLayout.vue | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 232ef11..36e9598 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,7 +5,6 @@ "requires": true, "packages": { "": { - "name": "ecloud-dashboard", "version": "0.1.0", "license": "AGPL-3.0-or-later", "dependencies": { @@ -6120,7 +6119,6 @@ "version": "2.3.2", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "dev": true, "hasInstallScript": true, "optional": true, "os": [ @@ -18466,7 +18464,6 @@ "version": "2.3.2", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "dev": true, "optional": true }, "function-bind": { diff --git a/package.json b/package.json index 4d91f88..7ab7121 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ecloud-dashboard", - "version": "0.1.0", + "version": "1.0.1", "private": true, "description": "Place this app in **nextcloud/custom_apps/**", "main": "js/main.js", @@ -15,8 +15,8 @@ "test": "jest", "test:coverage": "jest --coverage" }, - "homepage": "https://github.com/nextcloud/aliases", - "author": "Georg Ehrke", + "homepage": "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/ecloud-dashboard", + "author": "Murena", "license": "AGPL-3.0-or-later", "dependencies": { "@babel/polyfill": "^7.11.5", @@ -72,4 +72,4 @@ "webpack-cli": "^3.3.12", "webpack-merge": "^5.1.4" } -} \ No newline at end of file +} diff --git a/src/components/StorageLayout.vue b/src/components/StorageLayout.vue index 1e52236..bfd3954 100755 --- a/src/components/StorageLayout.vue +++ b/src/components/StorageLayout.vue @@ -112,7 +112,7 @@ export default { axios .get(generateUrl('/apps/ecloud-dashboard/apps/get-redirections')) .then((response) => { - this.storageLink = response.data.storageLink || '' + this.storageLink = response.data.storageLink || '' this.redirectURL = response.data.redirectURL }) }, -- GitLab