From 3cee2f06ef4d1daf390cfbfb7f419efaaa1ca476 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Mon, 10 Apr 2023 18:31:01 +0530 Subject: [PATCH 01/45] NC App icon as default icon --- appinfo/info.xml | 2 +- lib/Util.php | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index 4bea43e..ec0611d 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -5,7 +5,7 @@ Murena Dashboard Murena Dashboard - 1.5.0 + 1.5.1 agpl Murena MurenaDashboard diff --git a/lib/Util.php b/lib/Util.php index 2cf484e..6048405 100755 --- a/lib/Util.php +++ b/lib/Util.php @@ -99,7 +99,7 @@ class Util { $isBeta = $this->isBetaUser(); foreach ($entries as &$entry) { if (strpos($entry["id"], "external_index") !== 0) { - $entry["style"] = ""; + $entry["style"] = "background-image: url('/svg/". $entry["id"] ."/".$entry["id"] ."?color=808080')"; $entry["target"] = ""; } else { $entry["style"] = "background-image: url('". $entry["icon"] ."')"; diff --git a/package-lock.json b/package-lock.json index 410f9c0..fd17224 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "murena-dashboard", - "version": "1.5.0", + "version": "1.5.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "murena-dashboard", - "version": "1.5.0", + "version": "1.5.1", "license": "AGPL-3.0-or-later", "dependencies": { "@nextcloud/axios": "2.1.0", diff --git a/package.json b/package.json index 2122d8f..82dabd4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "murena-dashboard", - "version": "1.5.0", + "version": "1.5.1", "private": true, "description": "Place this app in **nextcloud/custom_apps/**", "main": "js/main.js", -- GitLab From 76e998e466fe5fdac182258558fdb54fbd44371b Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 11 Apr 2023 21:36:19 +0530 Subject: [PATCH 02/45] icon change --- lib/Util.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/Util.php b/lib/Util.php index 6048405..ffa5be0 100755 --- a/lib/Util.php +++ b/lib/Util.php @@ -10,7 +10,7 @@ use OCP\IUser; use OCP\IUserManager; use OCP\IGroupManager; use OCP\IUserSession; - +use OCP\IURLGenerator; class Util { private $appName; private $userId; @@ -27,6 +27,8 @@ class Util { /** @var IUserSession */ private $userSession; + /** @var IURLGenerator */ + protected $url; private const DEFAULT_ORDER = array("/apps/files/", "/apps/snappymail/", "/apps/contacts/", "/apps/calendar/", "/apps/notes/", "/apps/tasks/", "/apps/photos/"); public function __construct( @@ -37,6 +39,7 @@ class Util { IUserSession $userSession, IAppManager $appManager, IFactory $l10nFac, + IURLGenerator $url, $userId ) { $this->userId = $userId; @@ -47,6 +50,7 @@ class Util { $this->appManager = $appManager; $this->l10nFac = $l10nFac; $this->userSession = $userSession; + $this->url = $url; } private function getOnlyOfficeEntries() { @@ -98,11 +102,10 @@ class Util { $betaGroupName = $this->config->getSystemValue("beta_group_name"); $isBeta = $this->isBetaUser(); foreach ($entries as &$entry) { - if (strpos($entry["id"], "external_index") !== 0) { - $entry["style"] = "background-image: url('/svg/". $entry["id"] ."/".$entry["id"] ."?color=808080')"; + $entry["style"] = "background-image: url('". $entry["icon"] ."')"; + if (strpos($entry["id"], "external_index") !== 0) { $entry["target"] = ""; } else { - $entry["style"] = "background-image: url('". $entry["icon"] ."')"; $entry["target"] = "_blank"; } -- GitLab From 514498fa3d32701a7785e9933ca4d6458f4b7e47 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 11 Apr 2023 21:37:23 +0530 Subject: [PATCH 03/45] icon change #2 --- lib/Util.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/Util.php b/lib/Util.php index ffa5be0..12f2b5f 100755 --- a/lib/Util.php +++ b/lib/Util.php @@ -11,6 +11,7 @@ use OCP\IUserManager; use OCP\IGroupManager; use OCP\IUserSession; use OCP\IURLGenerator; + class Util { private $appName; private $userId; @@ -103,7 +104,7 @@ class Util { $isBeta = $this->isBetaUser(); foreach ($entries as &$entry) { $entry["style"] = "background-image: url('". $entry["icon"] ."')"; - if (strpos($entry["id"], "external_index") !== 0) { + if (strpos($entry["id"], "external_index") !== 0) { $entry["target"] = ""; } else { $entry["target"] = "_blank"; -- GitLab From 63d202189897bdb773714169fe597cbbb615640e Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 11 Apr 2023 21:45:30 +0530 Subject: [PATCH 04/45] added dark icon --- lib/Util.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/Util.php b/lib/Util.php index 12f2b5f..4ab6e9a 100755 --- a/lib/Util.php +++ b/lib/Util.php @@ -103,7 +103,8 @@ class Util { $betaGroupName = $this->config->getSystemValue("beta_group_name"); $isBeta = $this->isBetaUser(); foreach ($entries as &$entry) { - $entry["style"] = "background-image: url('". $entry["icon"] ."')"; + $icon = str_replace('.svg', '-dark.svg', $entry["icon"]); + $entry["style"] = "background-image: url('". $icon ."')"; if (strpos($entry["id"], "external_index") !== 0) { $entry["target"] = ""; } else { -- GitLab From 24486b37c01a376c1429eca6d1ebbec87ec0a199 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 11 Apr 2023 22:14:00 +0530 Subject: [PATCH 05/45] added condition --- lib/Util.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/Util.php b/lib/Util.php index 4ab6e9a..fccee11 100755 --- a/lib/Util.php +++ b/lib/Util.php @@ -103,7 +103,10 @@ class Util { $betaGroupName = $this->config->getSystemValue("beta_group_name"); $isBeta = $this->isBetaUser(); foreach ($entries as &$entry) { - $icon = str_replace('.svg', '-dark.svg', $entry["icon"]); + $icon = $entry["icon"]; + if (!str_contains($entry["icon"], '/themes/eCloud')) { + $icon = str_replace('.svg', '-dark.svg', $entry["icon"]); + } $entry["style"] = "background-image: url('". $icon ."')"; if (strpos($entry["id"], "external_index") !== 0) { $entry["target"] = ""; -- GitLab From aec950fc9ea529040640de16b1a738e2a65a2cb9 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 13 Apr 2023 17:20:45 +0530 Subject: [PATCH 06/45] major change --- lib/Util.php | 10 +++++----- src/components/AllApps.vue | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/lib/Util.php b/lib/Util.php index fccee11..307b5d0 100755 --- a/lib/Util.php +++ b/lib/Util.php @@ -103,17 +103,17 @@ class Util { $betaGroupName = $this->config->getSystemValue("beta_group_name"); $isBeta = $this->isBetaUser(); foreach ($entries as &$entry) { - $icon = $entry["icon"]; - if (!str_contains($entry["icon"], '/themes/eCloud')) { - $icon = str_replace('.svg', '-dark.svg', $entry["icon"]); + $theme = \OC::$server->getConfig()->getSystemValue("theme"); + $imgPath = '/themes/'. $theme . '/apps/' . strtolower($entry["id"]).'/img/app-color.svg'; + if (\file_exists(\OC::$SERVERROOT . $imgPath)) { + $entry["icon"] = $imgPath; } - $entry["style"] = "background-image: url('". $icon ."')"; + $entry["icon"] .= '?color=808080'; if (strpos($entry["id"], "external_index") !== 0) { $entry["target"] = ""; } else { $entry["target"] = "_blank"; } - $entry["iconOffsetY"] = 0; $entry["is_beta"] = 0; $appEnabledGroups = $this->config->getAppValue($entry['id'], 'enabled', 'no'); diff --git a/src/components/AllApps.vue b/src/components/AllApps.vue index 22a1a03..3efbaa1 100755 --- a/src/components/AllApps.vue +++ b/src/components/AllApps.vue @@ -39,7 +39,21 @@ :href="entry.href" :target="entry.target" @click="handleOfficeClick(entry, $event)"> -
+
+ '; + + + +
{{ entry.name }}
@@ -50,7 +64,21 @@ :href="entry.href" :target="entry.target" @click="handleOfficeClick(entry, $event)"> -
+
+ '; + + + +
{{ entry.name }}
-- GitLab From bcc293137d49d9b59c5824388ee56bb39d1bb594 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 13 Apr 2023 18:11:23 +0530 Subject: [PATCH 07/45] added invert --- lib/Util.php | 2 ++ src/components/AllApps.vue | 22 ++++++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/lib/Util.php b/lib/Util.php index 307b5d0..20826c5 100755 --- a/lib/Util.php +++ b/lib/Util.php @@ -103,10 +103,12 @@ class Util { $betaGroupName = $this->config->getSystemValue("beta_group_name"); $isBeta = $this->isBetaUser(); foreach ($entries as &$entry) { + $entry["filterInvert"] = 'filter: invert(1)'; $theme = \OC::$server->getConfig()->getSystemValue("theme"); $imgPath = '/themes/'. $theme . '/apps/' . strtolower($entry["id"]).'/img/app-color.svg'; if (\file_exists(\OC::$SERVERROOT . $imgPath)) { $entry["icon"] = $imgPath; + $entry["filterInvert"] = ''; } $entry["icon"] .= '?color=808080'; if (strpos($entry["id"], "external_index") !== 0) { diff --git a/src/components/AllApps.vue b/src/components/AllApps.vue index 3efbaa1..76029ad 100755 --- a/src/components/AllApps.vue +++ b/src/components/AllApps.vue @@ -40,17 +40,18 @@ :target="entry.target" @click="handleOfficeClick(entry, $event)">
- ';
@@ -65,17 +66,18 @@ :target="entry.target" @click="handleOfficeClick(entry, $event)">
- ';
-- GitLab From 6fcb94cb6adab2d4f4a735252f6a480b061c0095 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 13 Apr 2023 22:41:44 +0530 Subject: [PATCH 08/45] changes --- lib/Util.php | 1 - src/components/AllApps.vue | 12 ++++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/Util.php b/lib/Util.php index 20826c5..01a97e9 100755 --- a/lib/Util.php +++ b/lib/Util.php @@ -110,7 +110,6 @@ class Util { $entry["icon"] = $imgPath; $entry["filterInvert"] = ''; } - $entry["icon"] .= '?color=808080'; if (strpos($entry["id"], "external_index") !== 0) { $entry["target"] = ""; } else { diff --git a/src/components/AllApps.vue b/src/components/AllApps.vue index 76029ad..8f05924 100755 --- a/src/components/AllApps.vue +++ b/src/components/AllApps.vue @@ -44,7 +44,11 @@ height="60" viewBox="0 0 60 60" alt="">'; - + + + + + '; - + + + + + Date: Mon, 1 May 2023 17:06:53 +0530 Subject: [PATCH 09/45] apps --- src/components/AllApps.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/AllApps.vue b/src/components/AllApps.vue index 8f05924..034d399 100755 --- a/src/components/AllApps.vue +++ b/src/components/AllApps.vue @@ -54,7 +54,7 @@ width="60" height="60" preserveAspectRatio="xMinYMin meet" - :xlink:href="entry.icon" + :href="entry.icon" :style="entry.filterInvert" class="app-icon" /> @@ -84,7 +84,7 @@ width="60" height="60" preserveAspectRatio="xMinYMin meet" - :xlink:href="entry.icon" + :href="entry.icon" :style="entry.filterInvert" class="app-icon" /> -- GitLab From 5a6786b7a8041c19c8b9b5de8afba154fb1d867d Mon Sep 17 00:00:00 2001 From: Akhil Date: Mon, 24 Apr 2023 17:18:14 +0000 Subject: [PATCH 10/45] update max version to 25 --- appinfo/info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index ec0611d..4f8884e 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -12,7 +12,7 @@ dashboard https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/murena-dashboard/-/issues - + -- GitLab From 744f041bfc023d322167ed27a913687fa232a58b Mon Sep 17 00:00:00 2001 From: Akhil Date: Mon, 24 Apr 2023 23:08:27 +0530 Subject: [PATCH 11/45] Remove useless style.scss --- css/style.scss | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 css/style.scss diff --git a/css/style.scss b/css/style.scss deleted file mode 100644 index ce350c6..0000000 --- a/css/style.scss +++ /dev/null @@ -1,3 +0,0 @@ -#hello { - color: red; -} -- GitLab From 528cd4954040b4b8ce91b27e27255d35a9ec152c Mon Sep 17 00:00:00 2001 From: Akhil Date: Mon, 24 Apr 2023 23:14:42 +0530 Subject: [PATCH 12/45] Don't package css --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 51be490..18b05c0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,7 @@ variables: APP_NAME: 'murena-dashboard' + TO_PACKAGE: 'appinfo l10n lib templates js' + include: - project: "e/infra/ecloud/nextcloud-apps/ci-templates" ref: main -- GitLab From 4404d8301d9e331b833d433ea836c578f615f00a Mon Sep 17 00:00:00 2001 From: Akhil Date: Tue, 25 Apr 2023 18:55:34 +0530 Subject: [PATCH 13/45] v2.0.0 --- appinfo/info.xml | 4 ++-- package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index 4f8884e..9d8723d 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -5,9 +5,9 @@ Murena Dashboard Murena Dashboard - 1.5.1 + 2.0.0 agpl - Murena + Murena MurenaDashboard dashboard https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/murena-dashboard/-/issues diff --git a/package-lock.json b/package-lock.json index fd17224..927f211 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "murena-dashboard", - "version": "1.5.1", + "version": "2.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "murena-dashboard", - "version": "1.5.1", + "version": "2.0.0", "license": "AGPL-3.0-or-later", "dependencies": { "@nextcloud/axios": "2.1.0", diff --git a/package.json b/package.json index 82dabd4..89eb2b0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "murena-dashboard", - "version": "1.5.1", + "version": "2.0.0", "private": true, "description": "Place this app in **nextcloud/custom_apps/**", "main": "js/main.js", -- GitLab From ef3d631543d22406eb27c2fdb2c195668801bc67 Mon Sep 17 00:00:00 2001 From: Akhil Date: Wed, 26 Apr 2023 17:18:00 +0530 Subject: [PATCH 14/45] Use OO event from ecloud-theme-helper --- src/components/AllApps.vue | 41 +++----------------------------------- 1 file changed, 3 insertions(+), 38 deletions(-) diff --git a/src/components/AllApps.vue b/src/components/AllApps.vue index 034d399..e61c275 100755 --- a/src/components/AllApps.vue +++ b/src/components/AllApps.vue @@ -96,8 +96,6 @@