From cf7b22e27b9ad38c0b52e77c922125627d01ee25 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 28 Apr 2023 15:15:49 +0530 Subject: [PATCH 01/16] scroll --- lib/Listeners/BeforeTemplateRenderedListener.php | 0 package.json | 5 +++-- scss/murena-dashboard.scss | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 lib/Listeners/BeforeTemplateRenderedListener.php create mode 100644 scss/murena-dashboard.scss diff --git a/lib/Listeners/BeforeTemplateRenderedListener.php b/lib/Listeners/BeforeTemplateRenderedListener.php new file mode 100644 index 0000000..e69de29 diff --git a/package.json b/package.json index 89eb2b0..01fcacf 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,9 @@ "description": "Place this app in **nextcloud/custom_apps/**", "main": "js/main.js", "scripts": { - "build": "NODE_ENV=production webpack --progress", - "dev": "NODE_ENV=development webpack --progress", + "build-scss": "sass scss:css --style compressed --no-source-map", + "build": "npm run build-scss && NODE_ENV=production webpack --progress", + "dev": "npm run build-scss && NODE_ENV=development webpack --progress", "watch": "NODE_ENV=development webpack --progress --watch", "lint": "eslint --ext .js,.vue src", "lint:fix": "eslint --ext .js,.vue src --fix", diff --git a/scss/murena-dashboard.scss b/scss/murena-dashboard.scss new file mode 100644 index 0000000..8b70c8d --- /dev/null +++ b/scss/murena-dashboard.scss @@ -0,0 +1,3 @@ +#content.app-murena-dashboard { + overflow: scroll; +} \ No newline at end of file -- GitLab From 384ce74dd868bfb9eccb056c3774b9706ed5654c Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 28 Apr 2023 15:36:24 +0530 Subject: [PATCH 02/16] css added --- scss/murena-dashboard.scss => css/murena-dashboard.css | 0 package.json | 5 ++--- 2 files changed, 2 insertions(+), 3 deletions(-) rename scss/murena-dashboard.scss => css/murena-dashboard.css (100%) diff --git a/scss/murena-dashboard.scss b/css/murena-dashboard.css similarity index 100% rename from scss/murena-dashboard.scss rename to css/murena-dashboard.css diff --git a/package.json b/package.json index 01fcacf..89eb2b0 100644 --- a/package.json +++ b/package.json @@ -5,9 +5,8 @@ "description": "Place this app in **nextcloud/custom_apps/**", "main": "js/main.js", "scripts": { - "build-scss": "sass scss:css --style compressed --no-source-map", - "build": "npm run build-scss && NODE_ENV=production webpack --progress", - "dev": "npm run build-scss && NODE_ENV=development webpack --progress", + "build": "NODE_ENV=production webpack --progress", + "dev": "NODE_ENV=development webpack --progress", "watch": "NODE_ENV=development webpack --progress --watch", "lint": "eslint --ext .js,.vue src", "lint:fix": "eslint --ext .js,.vue src --fix", -- GitLab From 8f706b4881f6d5717b1b02e36d3be2cb14b57bca Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 28 Apr 2023 15:40:41 +0530 Subject: [PATCH 03/16] css added --- css/murena-dashboard.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/murena-dashboard.css b/css/murena-dashboard.css index 8b70c8d..551651f 100644 --- a/css/murena-dashboard.css +++ b/css/murena-dashboard.css @@ -1,3 +1,3 @@ #content.app-murena-dashboard { overflow: scroll; -} \ No newline at end of file +} -- GitLab From ac036801275367c0c147e5e742970b33a3bb36fe Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 28 Apr 2023 15:47:28 +0530 Subject: [PATCH 04/16] css added --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 18b05c0..cbc5b2c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ variables: APP_NAME: 'murena-dashboard' - TO_PACKAGE: 'appinfo l10n lib templates js' + TO_PACKAGE: 'appinfo l10n lib templates js css' include: - project: "e/infra/ecloud/nextcloud-apps/ci-templates" -- GitLab From d585fe2196c369a5ceddd61942c7f0dd9eafb8ef Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 28 Apr 2023 15:52:27 +0530 Subject: [PATCH 05/16] css added --- package.json | 5 +++-- css/murena-dashboard.css => scss/murena-dashboard.scss | 0 2 files changed, 3 insertions(+), 2 deletions(-) rename css/murena-dashboard.css => scss/murena-dashboard.scss (100%) diff --git a/package.json b/package.json index 89eb2b0..09b691d 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,9 @@ "description": "Place this app in **nextcloud/custom_apps/**", "main": "js/main.js", "scripts": { - "build": "NODE_ENV=production webpack --progress", - "dev": "NODE_ENV=development webpack --progress", + "build-scss": "sass scss:css --style compressed --no-source-map", + "build": "npm run build-scss && NODE_ENV=production webpack --progress", + "dev": "npm run build-scss && NODE_ENV=development webpack --progress", "watch": "NODE_ENV=development webpack --progress --watch", "lint": "eslint --ext .js,.vue src", "lint:fix": "eslint --ext .js,.vue src --fix", diff --git a/css/murena-dashboard.css b/scss/murena-dashboard.scss similarity index 100% rename from css/murena-dashboard.css rename to scss/murena-dashboard.scss -- GitLab From 6e657bfd596d09422b2058e3282c148d709bba9c Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 28 Apr 2023 16:03:54 +0530 Subject: [PATCH 06/16] css added --- lib/AppInfo/Application.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php index 9881c68..cd6170b 100755 --- a/lib/AppInfo/Application.php +++ b/lib/AppInfo/Application.php @@ -3,10 +3,22 @@ namespace OCA\MurenaDashboard\AppInfo; use OCP\AppFramework\App; +use OCP\AppFramework\Bootstrap\IBootstrap; +use OCP\AppFramework\Bootstrap\IRegistrationContext; +use OCP\AppFramework\Bootstrap\IBootContext; +use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent; +use OCA\MurenaLauncher\Listeners\BeforeTemplateRenderedListener; class Application extends App { public function __construct(array $urlParams = array()) { $appName = "murena-dashboard"; parent::__construct($appName, $urlParams); } + public function register(IRegistrationContext $context): void { + $context->registerEventListener(BeforeTemplateRenderedEvent::class, BeforeTemplateRenderedListener::class); + } + + public function boot(IBootContext $context): void { + } + } -- GitLab From 486e1d0f476a4172c88399d6a22852e3c30de17e Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 28 Apr 2023 16:07:31 +0530 Subject: [PATCH 07/16] listner added --- lib/AppInfo/Application.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php index cd6170b..0ef9818 100755 --- a/lib/AppInfo/Application.php +++ b/lib/AppInfo/Application.php @@ -7,18 +7,19 @@ use OCP\AppFramework\Bootstrap\IBootstrap; use OCP\AppFramework\Bootstrap\IRegistrationContext; use OCP\AppFramework\Bootstrap\IBootContext; use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent; -use OCA\MurenaLauncher\Listeners\BeforeTemplateRenderedListener; +use OCA\MurenaDashboard\Listeners\BeforeTemplateRenderedListener; -class Application extends App { - public function __construct(array $urlParams = array()) { - $appName = "murena-dashboard"; - parent::__construct($appName, $urlParams); +class Application extends App implements IBootstrap { + public const APP_ID = 'murena-dashboardr'; + + public function __construct(array $urlParams = []) { + parent::__construct(self::APP_ID, $urlParams); } + public function register(IRegistrationContext $context): void { $context->registerEventListener(BeforeTemplateRenderedEvent::class, BeforeTemplateRenderedListener::class); } public function boot(IBootContext $context): void { } - } -- GitLab From d34ad10849774608bdc30ad2218510bb3c9d4e67 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 28 Apr 2023 16:09:55 +0530 Subject: [PATCH 08/16] listner added --- lib/AppInfo/Application.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php index 0ef9818..c4254a6 100755 --- a/lib/AppInfo/Application.php +++ b/lib/AppInfo/Application.php @@ -10,7 +10,7 @@ use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent; use OCA\MurenaDashboard\Listeners\BeforeTemplateRenderedListener; class Application extends App implements IBootstrap { - public const APP_ID = 'murena-dashboardr'; + public const APP_ID = 'murena-dashboard'; public function __construct(array $urlParams = []) { parent::__construct(self::APP_ID, $urlParams); -- GitLab From ace6c243136b79082a1817925ecf1e66d7a93b27 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 28 Apr 2023 16:16:09 +0530 Subject: [PATCH 09/16] listner added --- .../BeforeTemplateRenderedListener.php | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/lib/Listeners/BeforeTemplateRenderedListener.php b/lib/Listeners/BeforeTemplateRenderedListener.php index e69de29..f7ef1f3 100644 --- a/lib/Listeners/BeforeTemplateRenderedListener.php +++ b/lib/Listeners/BeforeTemplateRenderedListener.php @@ -0,0 +1,34 @@ +appName = $appName; + $this->util = $util; + $this->userSession = $userSession; + $this->request = $request; + + } + public function handle(Event $event): void { + if (!($event instanceof BeforeTemplateRenderedEvent)) { + return; + } + $pathInfo = $this->request->getPathInfo(); + + if (strpos($pathInfo, '/apps/murena-dashboard/') !== false) { + $this->util->addStyle($this->appName, 'murena-dashboard'); + } + + } +} \ No newline at end of file -- GitLab From 13801d1f50267babf99614f867aa7167edb7a6be Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 28 Apr 2023 16:21:07 +0530 Subject: [PATCH 10/16] listner added --- .../BeforeTemplateRenderedListener.php | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/lib/Listeners/BeforeTemplateRenderedListener.php b/lib/Listeners/BeforeTemplateRenderedListener.php index f7ef1f3..9b4bc0a 100644 --- a/lib/Listeners/BeforeTemplateRenderedListener.php +++ b/lib/Listeners/BeforeTemplateRenderedListener.php @@ -1,34 +1,32 @@ appName = $appName; $this->util = $util; $this->userSession = $userSession; - $this->request = $request; - } + public function handle(Event $event): void { if (!($event instanceof BeforeTemplateRenderedEvent)) { return; } - $pathInfo = $this->request->getPathInfo(); - - if (strpos($pathInfo, '/apps/murena-dashboard/') !== false) { + if ($this->userSession->isLoggedIn()) { $this->util->addStyle($this->appName, 'murena-dashboard'); } - } -} \ No newline at end of file + +} -- GitLab From 9ef6612bd47ad306cf4851d2b7801a564268e7b1 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 28 Apr 2023 16:25:18 +0530 Subject: [PATCH 11/16] listner added --- lib/Listeners/BeforeTemplateRenderedListener.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/Listeners/BeforeTemplateRenderedListener.php b/lib/Listeners/BeforeTemplateRenderedListener.php index 9b4bc0a..b72234e 100644 --- a/lib/Listeners/BeforeTemplateRenderedListener.php +++ b/lib/Listeners/BeforeTemplateRenderedListener.php @@ -8,13 +8,19 @@ use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent; use \OCP\EventDispatcher\IEventListener; use OCP\Util; use OCP\IUserSession; +use OCP\INavigationManager; +use OCP\App\IAppManager; class BeforeTemplateRenderedListener implements IEventListener { private Util $util; private IUserSession $userSession; + private INavigationManager $navigationManager; + private IAppManager $appManager; private string $appName; - public function __construct($appName, Util $util, IUserSession $userSession) { + private const ONLYOFFICE_APP_ID = 'onlyoffice'; + + public function __construct($appName, Util $util, IUserSession $userSession, INavigationManager $navigationManager) { $this->appName = $appName; $this->util = $util; $this->userSession = $userSession; -- GitLab From 1a5f4995eed6487aba718d7a45ab77fac9f27a3e Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 28 Apr 2023 16:29:00 +0530 Subject: [PATCH 12/16] listner added --- .../BeforeTemplateRenderedListener.php | 52 +++++++++---------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/lib/Listeners/BeforeTemplateRenderedListener.php b/lib/Listeners/BeforeTemplateRenderedListener.php index b72234e..0bb5cf8 100644 --- a/lib/Listeners/BeforeTemplateRenderedListener.php +++ b/lib/Listeners/BeforeTemplateRenderedListener.php @@ -1,38 +1,34 @@ appName = $appName; - $this->util = $util; - $this->userSession = $userSession; - } - - public function handle(Event $event): void { - if (!($event instanceof BeforeTemplateRenderedEvent)) { - return; - } - if ($this->userSession->isLoggedIn()) { - $this->util->addStyle($this->appName, 'murena-dashboard'); - } - } +class BeforeTemplateRenderedListener implements IEventListener +{ + private Util $util; + private IUserSession $userSession; + private string $appName; + + public function __construct($appName, Util $util, IUserSession $userSession) + { + $this->appName = $appName; + $this->util = $util; + $this->userSession = $userSession; + } + + public function handle(Event $event): void + { + if (!($event instanceof BeforeTemplateRenderedEvent)) { + return; + } + + if ($this->userSession->isLoggedIn()) { + $this->util->addStyle($this->appName, 'murena-dashboard'); + } + } } -- GitLab From b968da6ebc31e27eae64eec8435e346398d6d47b Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 28 Apr 2023 16:31:34 +0530 Subject: [PATCH 13/16] listner added --- .../BeforeTemplateRenderedListener.php | 57 +++++++++++-------- 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/lib/Listeners/BeforeTemplateRenderedListener.php b/lib/Listeners/BeforeTemplateRenderedListener.php index 0bb5cf8..903641b 100644 --- a/lib/Listeners/BeforeTemplateRenderedListener.php +++ b/lib/Listeners/BeforeTemplateRenderedListener.php @@ -1,34 +1,43 @@ appName = $appName; + $this->util = $util; + $this->userSession = $userSession; + $this->navigationManager = $navigationManager; + $this->appsService = $appsService; + $this->appManager = $appManager; + } + + public function handle(Event $event): void { + if (!($event instanceof BeforeTemplateRenderedEvent)) { + return; + } + if ($this->userSession->isLoggedIn()) { + $this->util->addStyle($this->appName, 'murena-dashboard'); + } + } -class BeforeTemplateRenderedListener implements IEventListener -{ - private Util $util; - private IUserSession $userSession; - private string $appName; - - public function __construct($appName, Util $util, IUserSession $userSession) - { - $this->appName = $appName; - $this->util = $util; - $this->userSession = $userSession; - } - - public function handle(Event $event): void - { - if (!($event instanceof BeforeTemplateRenderedEvent)) { - return; - } - - if ($this->userSession->isLoggedIn()) { - $this->util->addStyle($this->appName, 'murena-dashboard'); - } - } } -- GitLab From 058b16e01d523b64ada511d334fb8d8fc85851d1 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 28 Apr 2023 16:33:13 +0530 Subject: [PATCH 14/16] listner added --- lib/Listeners/BeforeTemplateRenderedListener.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lib/Listeners/BeforeTemplateRenderedListener.php b/lib/Listeners/BeforeTemplateRenderedListener.php index 903641b..cdac94b 100644 --- a/lib/Listeners/BeforeTemplateRenderedListener.php +++ b/lib/Listeners/BeforeTemplateRenderedListener.php @@ -36,8 +36,19 @@ class BeforeTemplateRenderedListener implements IEventListener { return; } if ($this->userSession->isLoggedIn()) { + if ($this->appManager->isEnabledForUser(self::ONLYOFFICE_APP_ID)) { + $this->addOnlyOfficeEntriesToNavigation(); + } $this->util->addStyle($this->appName, 'murena-dashboard'); } } + private function addOnlyOfficeEntriesToNavigation() { + $entries = $this->appsService->getOnlyOfficeEntries(); + foreach ($entries as $entry) { + $this->navigationManager->add(function () use ($entry) { + return $entry; + }); + } + } } -- GitLab From 327f3a03da3f93e3c3e0c19692116a03f7fecd1f Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 28 Apr 2023 16:34:56 +0530 Subject: [PATCH 15/16] listner added --- lib/Listeners/BeforeTemplateRenderedListener.php | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/lib/Listeners/BeforeTemplateRenderedListener.php b/lib/Listeners/BeforeTemplateRenderedListener.php index cdac94b..b2bdcb1 100644 --- a/lib/Listeners/BeforeTemplateRenderedListener.php +++ b/lib/Listeners/BeforeTemplateRenderedListener.php @@ -36,19 +36,7 @@ class BeforeTemplateRenderedListener implements IEventListener { return; } if ($this->userSession->isLoggedIn()) { - if ($this->appManager->isEnabledForUser(self::ONLYOFFICE_APP_ID)) { - $this->addOnlyOfficeEntriesToNavigation(); - } $this->util->addStyle($this->appName, 'murena-dashboard'); } } - - private function addOnlyOfficeEntriesToNavigation() { - $entries = $this->appsService->getOnlyOfficeEntries(); - foreach ($entries as $entry) { - $this->navigationManager->add(function () use ($entry) { - return $entry; - }); - } - } } -- GitLab From 65fb3ee10e2ba4d893fa538b1e0a9a2eb0bfd284 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 28 Apr 2023 16:37:30 +0530 Subject: [PATCH 16/16] listner added --- lib/Listeners/BeforeTemplateRenderedListener.php | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/lib/Listeners/BeforeTemplateRenderedListener.php b/lib/Listeners/BeforeTemplateRenderedListener.php index b2bdcb1..150df8e 100644 --- a/lib/Listeners/BeforeTemplateRenderedListener.php +++ b/lib/Listeners/BeforeTemplateRenderedListener.php @@ -8,27 +8,16 @@ use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent; use \OCP\EventDispatcher\IEventListener; use OCP\Util; use OCP\IUserSession; -use OCA\MurenaLauncher\Service\AppsService; -use OCP\INavigationManager; -use OCP\App\IAppManager; class BeforeTemplateRenderedListener implements IEventListener { private Util $util; private IUserSession $userSession; - private INavigationManager $navigationManager; - private AppsService $appsService; - private IAppManager $appManager; private string $appName; - private const ONLYOFFICE_APP_ID = 'onlyoffice'; - - public function __construct($appName, Util $util, IUserSession $userSession, INavigationManager $navigationManager, AppsService $appsService) { + public function __construct($appName, Util $util, IUserSession $userSession) { $this->appName = $appName; $this->util = $util; $this->userSession = $userSession; - $this->navigationManager = $navigationManager; - $this->appsService = $appsService; - $this->appManager = $appManager; } public function handle(Event $event): void { -- GitLab