From 2d30a1f1ea68ce5e756a26e54d4caac9f7a7cc35 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Fri, 2 Dec 2022 12:16:49 +0100
Subject: [PATCH 01/19] hide custom categories list when empty

---
 css/admin.css                     | 4 ++++
 src/AdminCategoriesCustom.vue     | 8 +++++++-
 templates/settings/admin-form.php | 2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/css/admin.css b/css/admin.css
index 5332c4e..5eaa7fc 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -137,6 +137,10 @@
   padding-right: 20px;
 }
 
+.side-menu-setting-label--top {
+  vertical-align: top;
+}
+
 .side-menu-setting-form {
   display: table-cell;
   min-width: 300px;
diff --git a/src/AdminCategoriesCustom.vue b/src/AdminCategoriesCustom.vue
index c210fc3..2a84749 100644
--- a/src/AdminCategoriesCustom.vue
+++ b/src/AdminCategoriesCustom.vue
@@ -16,7 +16,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 -->
 <template>
   <div>
-    <ul class="side-menu-setting-list">
+    <ul class="side-menu-setting-list" :class="{hide: values.length === 0}">
       <li v-for="item in values" class="side-menu-setting-list-item" v-on:click="showEditForm(item)">
         <span v-text="item.en"></span>
       </li>
@@ -77,6 +77,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 }
 </style>
 
+<style scoped>
+.hide {
+  display: none;
+}
+</style>
+
 <script>
 import NcModal from '@nextcloud/vue/dist/Components/NcModal'
 import NcActions from '@nextcloud/vue/dist/Components/NcActions'
diff --git a/templates/settings/admin-form.php b/templates/settings/admin-form.php
index 5d1d088..81e076e 100644
--- a/templates/settings/admin-form.php
+++ b/templates/settings/admin-form.php
@@ -951,7 +951,7 @@ $labelReset = 'Reset to default';
             </div>
 
             <div class="side-menu-setting-row">
-                <div class="side-menu-setting-label">
+                <div class="side-menu-setting-label side-menu-setting-label--top">
                     <?php p($l->t('Custom categories')); ?>
                 </div>
                 <div class="side-menu-setting-form">

From 45a68cbfc80f728417a5bd43a93783a79f9eac58 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Fri, 2 Dec 2022 12:25:31 +0100
Subject: [PATCH 02/19] release v3.4.1

---
 CHANGELOG.md     | 5 ++++-
 README.md        | 2 +-
 appinfo/info.xml | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0a7deac..3c14d21 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,10 @@
 ## [Unreleased]
 
+## 3.4.1
 ## Added
-* add translations (thanks to zonorti, jorisvandijk)
+* add translations (thanks to zonorti, jorisvandijk, jak2k)
+## Fixed
+* fix #183: hide custom categories list when empty (admin page)
 
 ## 3.4.0
 ### Added
diff --git a/README.md b/README.md
index e5e90b4..273173d 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ You like this app and you want to support me? ☕ [Buy me a coffee](https://www.
 Requirements
 ------------
 
-* PHP >= 7.4
+* PHP >= 8.0
 * App `theming` enabled
 
 Installation and upgrade
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 1105b43..12570a5 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -17,7 +17,7 @@ You can report a bug or request a feature by opening an issue.
 
 Requirements:
 
-* PHP >= 7.4
+* PHP >= 8.0
 * App `theming` enabled
 
 If you like this application and if you want to support the development:
@@ -32,7 +32,7 @@ Notice
 Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**.
 In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/).
 ]]></description>
-    <version>3.4.0</version>
+    <version>3.4.1</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
     <namespace>SideMenu</namespace>

From 89cf28f9a8b4e669a42e034a13f100c31bd19b5a Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sat, 3 Dec 2022 23:47:55 +0100
Subject: [PATCH 03/19] add code_quality in ci

---
 .woodpecker.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index d51f01d..9de7535 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -15,6 +15,15 @@ pipeline:
       branch: [master, develop, feature/*]
       event: [push, pull_request]
 
+  code_quality:
+    image: sonarsource/sonar-scanner-cli
+    secrets: [sonar_token, sonar_host, sonar_project]
+    commands:
+      - sonar-scanner -Dsonar.projectKey=$SONAR_PROJECT -Dsonar.sources=. -Dsonar.host.url=$SONAR_HOST
+    failure: ignore
+    when:
+      event: [push, pull_request]
+
   package:
     image: gitnet.fr/deblan/devenv
     volumes:

From 053615c2c42347f1dc941293aeeae02f4c059bff Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sun, 4 Dec 2022 00:08:16 +0100
Subject: [PATCH 04/19] remove this unused "$topMenuAppsOrder" local variable

---
 lib/Controller/JsController.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/Controller/JsController.php b/lib/Controller/JsController.php
index c0831a9..2ba62ed 100644
--- a/lib/Controller/JsController.php
+++ b/lib/Controller/JsController.php
@@ -95,7 +95,6 @@ class JsController extends Controller
     {
         $topMenuApps = $this->config->getAppValueArray('top-menu-apps', '[]');
         $topSideMenuApps = $this->config->getAppValueArray('top-side-menu-apps', '[]');
-        $topMenuAppsOrder = $this->config->getAppValueArray('top-menu-apps-order', '[]');
         $targetBlankApps = $this->config->getAppValueArray('target-blank-apps', '[]');
         $useAvatar = $this->config->getAppValueBool('use-avatar', '0');
         $isForced = $this->config->getAppValueBool('force', '0');

From 81bcad348ebf167c59dd24a5e040f8802e9f79e6 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sun, 4 Dec 2022 00:09:11 +0100
Subject: [PATCH 05/19] remove this unused import of 'trim'

---
 src/SideMenu.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/SideMenu.vue b/src/SideMenu.vue
index ee9d477..c52ac1f 100644
--- a/src/SideMenu.vue
+++ b/src/SideMenu.vue
@@ -53,7 +53,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 </template>
 
 <script>
-import trim from 'trim'
 import axios from 'axios'
 import OpenerButton from './OpenerButton'
 import SettingsButton from './SettingsButton'

From 1c2f04f63fab33f6ebbb14e4f2820c0d7690fad6 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sun, 4 Dec 2022 00:13:28 +0100
Subject: [PATCH 06/19] replace border-size with border-width

---
 css/admin.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/css/admin.css b/css/admin.css
index 5eaa7fc..b3d0b7c 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -186,7 +186,7 @@
 }
 
 .badge {
-  border-size: 1px;
+  border-width: 1px;
   padding: 2px 8px;
   margin-right: 2px;
   margin-bottom: 5px;

From 0f34275d044640c916af31867cf64d40bc9e36f2 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sun, 4 Dec 2022 00:14:38 +0100
Subject: [PATCH 07/19] remove duplicated selector ".side-menu-always-displayed
 body"

---
 css/sideMenu.css | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/css/sideMenu.css b/css/sideMenu.css
index 189d4da..7224803 100644
--- a/css/sideMenu.css
+++ b/css/sideMenu.css
@@ -235,9 +235,6 @@
 
 .side-menu-always-displayed body {
   width: calc(100% - 50px) !important;
-}
-
-.side-menu-always-displayed body {
   position: absolute;
   left: 50px;
 }

From 0382e1c61df6576f9db08119c76b4711afcd02fa Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sun, 4 Dec 2022 00:19:54 +0100
Subject: [PATCH 08/19] replace dupplicated string with variables

---
 templates/settings/admin-form.php | 59 ++++++++++++++++---------------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/templates/settings/admin-form.php b/templates/settings/admin-form.php
index 81e076e..5a4e149 100644
--- a/templates/settings/admin-form.php
+++ b/templates/settings/admin-form.php
@@ -41,6 +41,9 @@ $choicesSizes = [
 
 $labelShowHideApps = 'Show and hide the list of applications';
 $labelReset = 'Reset to default';
+$labelWithCategories = 'With categories';
+$labelBigMenu = 'Big menu';
+$labelAlwaysDisplayed = 'Always displayed';
 
 ?>
 <div id="side-menu-section">
@@ -75,7 +78,7 @@ $labelReset = 'Reset to default';
 
         <div>
             <label>
-                <?php p($l->t('With categories')); ?>
+                <?php p($l->t($labelWithCategories)); ?>
             </label>
         </div>
         <p>
@@ -84,12 +87,12 @@ $labelReset = 'Reset to default';
                 data-alwaysdiplayed="0"
                 data-bigmenu="0"
                 data-sidewithcategories="1"
-                src="<?php print_unescaped(image_path('side_menu', 'admin/layout-side-with-categories.svg')); ?>" alt="<?php p($l->t('With categories')); ?>">
+                src="<?php print_unescaped(image_path('side_menu', 'admin/layout-side-with-categories.svg')); ?>" alt="<?php p($l->t($labelWithCategories)); ?>">
         </p>
 
         <div>
             <label for="side-menu-opener">
-                <?php p($l->t('Big menu')); ?>
+                <?php p($l->t($labelBigMenu)); ?>
             </label>
         </div>
         <p>
@@ -98,12 +101,12 @@ $labelReset = 'Reset to default';
                 data-alwaysdiplayed="0"
                 data-bigmenu="1"
                 data-sidewithcategories="0"
-                src="<?php print_unescaped(image_path('side_menu', 'admin/layout-big-menu.svg')); ?>" alt="<?php p($l->t('Big menu')); ?>">
+                src="<?php print_unescaped(image_path('side_menu', 'admin/layout-big-menu.svg')); ?>" alt="<?php p($l->t($labelBigMenu)); ?>">
         </p>
 
         <div>
             <label for="side-menu-opener">
-                <?php p($l->t('Always displayed')); ?>
+                <?php p($l->t($labelAlwaysDisplayed)); ?>
             </label>
         </div>
         <p><em><?php p($l->t('Not compatible with touch screens.')); ?></em></p>
@@ -113,7 +116,7 @@ $labelReset = 'Reset to default';
                 data-alwaysdiplayed="1"
                 data-bigmenu="0"
                 data-sidewithcategories="0"
-                src="<?php print_unescaped(image_path('side_menu', 'admin/layout-always-displayed.svg')); ?>" alt="<?php p($l->t('Always displayed')); ?>">
+                src="<?php print_unescaped(image_path('side_menu', 'admin/layout-always-displayed.svg')); ?>" alt="<?php p($l->t($labelAlwaysDisplayed)); ?>">
         </p>
 
         <input
@@ -148,9 +151,9 @@ $labelReset = 'Reset to default';
 
         <div class="badges">
             <span class="badge badge-1"><?php p($l->t('Default')); ?></span>
-            <span class="badge badge-2"><?php p($l->t('With categories')); ?></span>
-            <span class="badge badge-3"><?php p($l->t('Big menu')); ?></span>
-            <span class="badge badge-4"><?php p($l->t('Always displayed')); ?></span>
+            <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
+            <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
+            <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
         </div>
 
         <div class="side-menu-setting-table">
@@ -339,9 +342,9 @@ $labelReset = 'Reset to default';
 
         <div class="badges">
             <span class="badge badge-1"><?php p($l->t('Default')); ?></span>
-            <span class="badge badge-2"><?php p($l->t('With categories')); ?></span>
-            <span class="badge badge-3"><?php p($l->t('Big menu')); ?></span>
-            <span class="badge badge-4"><?php p($l->t('Always displayed')); ?></span>
+            <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
+            <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
+            <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
         </div>
 
         <p>
@@ -534,9 +537,9 @@ $labelReset = 'Reset to default';
 
         <div class="badges">
             <span class="badge badge-1"><?php p($l->t('Default')); ?></span>
-            <span class="badge badge-2"><?php p($l->t('With categories')); ?></span>
-            <span class="badge badge-3"><?php p($l->t('Big menu')); ?></span>
-            <span class="badge badge-4"><?php p($l->t('Always displayed')); ?></span>
+            <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
+            <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
+            <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
         </div>
 
         <div class="side-menu-setting-table">
@@ -675,8 +678,8 @@ $labelReset = 'Reset to default';
                     <?php p($l->t('Apps that should not be displayed in the menu')); ?>
 
                     <div class="badges">
-                        <span class="badge badge-2"><?php p($l->t('With categories')); ?></span>
-                        <span class="badge badge-3"><?php p($l->t('Big menu')); ?></span>
+                        <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
+                        <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
                     </div>
                 </div>
                 <div class="side-menu-setting-form">
@@ -799,9 +802,9 @@ $labelReset = 'Reset to default';
 
         <div class="badges">
             <span class="badge badge-1"><?php p($l->t('Default')); ?></span>
-            <span class="badge badge-2"><?php p($l->t('With categories')); ?></span>
-            <span class="badge badge-3"><?php p($l->t('Big menu')); ?></span>
-            <span class="badge badge-4"><?php p($l->t('Always displayed')); ?></span>
+            <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
+            <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
+            <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
         </div>
 
         <div class="side-menu-setting-table">
@@ -878,9 +881,9 @@ $labelReset = 'Reset to default';
 
         <div class="badges">
             <span class="badge badge-1"><?php p($l->t('Default')); ?></span>
-            <span class="badge badge-2"><?php p($l->t('With categories')); ?></span>
-            <span class="badge badge-3"><?php p($l->t('Big menu')); ?></span>
-            <span class="badge badge-4"><?php p($l->t('Always displayed')); ?></span>
+            <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
+            <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
+            <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
         </div>
 
         <div class="side-menu-setting-table">
@@ -924,8 +927,8 @@ $labelReset = 'Reset to default';
         </h2>
 
         <div class="badges">
-            <span class="badge badge-2"><?php p($l->t('With categories')); ?></span>
-            <span class="badge badge-3"><?php p($l->t('Big menu')); ?></span>
+            <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
+            <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
         </div>
 
         <div class="side-menu-setting-table">
@@ -1040,9 +1043,9 @@ $labelReset = 'Reset to default';
 
         <div class="badges">
             <span class="badge badge-1"><?php p($l->t('Default')); ?></span>
-            <span class="badge badge-2"><?php p($l->t('With categories')); ?></span>
-            <span class="badge badge-3"><?php p($l->t('Big menu')); ?></span>
-            <span class="badge badge-4"><?php p($l->t('Always displayed')); ?></span>
+            <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
+            <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
+            <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
         </div>
 
         <p>

From 4d05079c70b407ec5b07ebeda9d1b45c239eefed Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sun, 4 Dec 2022 00:45:29 +0100
Subject: [PATCH 09/19] split long lines

---
 lib/Controller/AppController.php             |  6 +++++-
 lib/Controller/CssController.php             | 15 ++++++++-------
 lib/Controller/PersonalSettingController.php |  9 +++++++--
 lib/Settings/Personal.php                    |  9 +++++++--
 4 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/lib/Controller/AppController.php b/lib/Controller/AppController.php
index 1d3de92..83a0e8c 100644
--- a/lib/Controller/AppController.php
+++ b/lib/Controller/AppController.php
@@ -86,7 +86,11 @@ class AppController extends Controller
 
     protected function redirectToApp($appId): RedirectResponse
     {
-        $isIgnoreFrontController = true === OC::$server->getConfig()->getSystemValue('htaccess.IgnoreFrontController', false);
+        $isIgnoreFrontController = true === OC::$server->getConfig()->getSystemValue(
+            'htaccess.IgnoreFrontController',
+            false
+        );
+
         $isFrontControllerActive = 'true' === getenv('front_controller_active');
 
         if ($isIgnoreFrontController || $isFrontControllerActive) {
diff --git a/lib/Controller/CssController.php b/lib/Controller/CssController.php
index 028ac11..338acb7 100644
--- a/lib/Controller/CssController.php
+++ b/lib/Controller/CssController.php
@@ -21,14 +21,14 @@ namespace OCA\SideMenu\Controller;
 use OC;
 use OC\User\User;
 use OCA\SideMenu\AppInfo\Application;
+use OCA\SideMenu\Service\Color;
 use OCA\SideMenu\Service\ConfigProxy;
+use OCA\Theming\ThemingDefaults;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IRequest;
 use OCP\IUserSession;
-use OCA\Theming\ThemingDefaults;
-use OCA\SideMenu\Service\Color;
 
 class CssController extends Controller
 {
@@ -58,8 +58,7 @@ class CssController extends Controller
         ConfigProxy $config,
         ThemingDefaults $theming,
         Color $color
-    )
-    {
+    ) {
         parent::__construct($appName, $request);
 
         $this->user = OC::$server[IUserSession::class]->getUser();
@@ -105,16 +104,18 @@ class CssController extends Controller
                 $topSideMenuApps = $userTopSideMenuApps;
             }
 
-            $isDarkThemeUserEnabled = $this->config->getUserValue($this->user, 'theme', '', 'accessibility') === 'dark';
+            $isDarkThemeUserEnabled = 'dark' === $this->config->getUserValue($this->user, 'theme', '', 'accessibility');
             $isBreezeDarkUserEnabled = $this->config->getUserValue($this->user, 'theme_enabled', '', 'breezedark');
 
-            $isBreezeDarkUserEnabled = $isBreezeDarkUserEnabled === '1' || ($isBreezeDarkGlobalEnabled && $isBreezeDarkUserEnabled === '');
+            $isBreezeDarkUserEnabled = '1' === $isBreezeDarkUserEnabled ||
+                ($isBreezeDarkGlobalEnabled && '' === $isBreezeDarkUserEnabled);
         } else {
             $isDarkThemeUserEnabled = false;
             $isBreezeDarkUserEnabled = false;
         }
 
-        $isDarkMode = ($isAccessibilityAppEnabled && $isDarkThemeUserEnabled) || ($isBreezeDarkAppEnabled && $isBreezeDarkUserEnabled);
+        $isDarkMode = ($isAccessibilityAppEnabled && $isDarkThemeUserEnabled) ||
+            ($isBreezeDarkAppEnabled && $isBreezeDarkUserEnabled);
 
         $primaryColor = $this->theming->getColorPrimary();
         $lightenPrimaryColor = $this->color->adjustBrightness($primaryColor, 0.2);
diff --git a/lib/Controller/PersonalSettingController.php b/lib/Controller/PersonalSettingController.php
index 6f126c7..fc30c35 100644
--- a/lib/Controller/PersonalSettingController.php
+++ b/lib/Controller/PersonalSettingController.php
@@ -43,8 +43,13 @@ class PersonalSettingController extends Controller
      */
     protected $userSession;
 
-    public function __construct($appName, IRequest $request, IConfig $config, ConfigProxy $configProxy, IUserSession $userSession)
-    {
+    public function __construct(
+        $appName,
+        IRequest $request,
+        IConfig $config,
+        ConfigProxy $configProxy,
+        IUserSession $userSession
+    ) {
         parent::__construct($appName, $request);
 
         $this->config = $config;
diff --git a/lib/Settings/Personal.php b/lib/Settings/Personal.php
index e61f9e5..57112d0 100644
--- a/lib/Settings/Personal.php
+++ b/lib/Settings/Personal.php
@@ -54,8 +54,13 @@ class Personal implements ISettings
      */
     private $appRepository;
 
-    public function __construct(IL10N $l, ILogger $logger, ConfigProxy $config, IUserSession $userSession, AppRepository $appRepository)
-    {
+    public function __construct(
+        IL10N $l,
+        ILogger $logger,
+        ConfigProxy $config,
+        IUserSession $userSession,
+        AppRepository $appRepository
+    ) {
         $this->l = $l;
         $this->logger = $logger;
         $this->config = $config;

From 24c87c0104adedb901cf83bf1c6b65bd375abdc7 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sun, 4 Dec 2022 00:47:30 +0100
Subject: [PATCH 10/19] add missing img alt

---
 src/SettingsButton.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SettingsButton.vue b/src/SettingsButton.vue
index 38aaefc..a4eb97f 100644
--- a/src/SettingsButton.vue
+++ b/src/SettingsButton.vue
@@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
       {{ label }}
 
       <span class="avatardiv avatardiv-shown">
-        <img v-bind:src="avatar">
+        <img v-bind:src="avatar" :alt="label">
       </span>
     </a>
   </div>

From 0bd1a5baaf39a94fba2d799b969ccaad43acb46c Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sun, 4 Dec 2022 00:56:05 +0100
Subject: [PATCH 11/19] split long lines

---
 lib/Controller/CssController.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/lib/Controller/CssController.php b/lib/Controller/CssController.php
index 338acb7..06f7ae8 100644
--- a/lib/Controller/CssController.php
+++ b/lib/Controller/CssController.php
@@ -126,25 +126,33 @@ class CssController extends Controller
         if ($isDarkMode) {
             $backgroundColor = $this->config->getAppValue('dark-mode-background-color', $darkenPrimaryColor);
             $backgroundColorTo = $this->config->getAppValue('dark-mode-background-color-to', $darkenPrimaryColor);
-            $currentAppBackgroundColor = $this->config->getAppValue('dark-mode-current-app-background-color', $darkenPrimaryColor2);
+            $currentAppBackgroundColor = $this->config->getAppValue(
+                'dark-mode-current-app-background-color',
+                $darkenPrimaryColor2
+            );
             $loaderColor = $this->config->getAppValue('dark-mode-loader-color', $lightenPrimaryColor);
             $textColor = $this->config->getAppValue('dark-mode-text-color', $textColor);
             $iconInvertFilter = abs($this->config->getAppValueInt('dark-mode-icon-invert-filter', '0')).'%';
             $iconOpacity = abs($this->config->getAppValueInt('dark-mode-icon-opacity', '100') / 100);
             $opener = $this->config->getAppValue('dark-mode-opener', 'side-menu-opener');
 
-            $backgroundOpacity = dechex($this->config->getAppValueInt('dark-mode-background-color-opacity', '100') * 255 / 100);
+            $opacity = $this->config->getAppValueInt('dark-mode-background-color-opacity', '100');
+            $backgroundOpacity = dechex($opacity * 255 / 100);
         } else {
             $backgroundColor = $this->config->getAppValue('background-color', $darkenPrimaryColor);
             $backgroundColorTo = $this->config->getAppValue('background-color-to', $darkenPrimaryColor);
-            $currentAppBackgroundColor = $this->config->getAppValue('current-app-background-color', $darkenPrimaryColor2);
+            $currentAppBackgroundColor = $this->config->getAppValue(
+                'current-app-background-color',
+                $darkenPrimaryColor2
+            );
             $loaderColor = $this->config->getAppValue('loader-color', $lightenPrimaryColor);
             $textColor = $this->config->getAppValue('text-color', $textColor);
             $iconInvertFilter = abs($this->config->getAppValueInt('icon-invert-filter', '0')).'%';
             $iconOpacity = abs($this->config->getAppValueInt('icon-opacity', '100') / 100);
             $opener = $this->config->getAppValue('opener', 'side-menu-opener');
 
-            $backgroundOpacity = dechex($this->config->getAppValueInt('background-color-opacity', '100') * 255 / 100);
+            $opacity = $this->config->getAppValueInt('background-color-opacity', '100');
+            $backgroundOpacity = dechex($opacity * 255 / 100);
         }
 
         $backgroundColor .= $backgroundOpacity;

From 3f04546a6ea912259370499f3ee8229c215aa029 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sun, 4 Dec 2022 00:57:17 +0100
Subject: [PATCH 12/19] split long lines

---
 lib/Settings/Admin.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php
index 12be78a..b1e2781 100644
--- a/lib/Settings/Admin.php
+++ b/lib/Settings/Admin.php
@@ -125,15 +125,24 @@ class Admin implements ISettings
             'background-color' => $backgroundColor,
             'background-color-to' => $backgroundColorTo,
             'background-color-opacity' => $this->config->getAppValueInt('background-color-opacity', '100'),
-            'current-app-background-color' => $this->config->getAppValue('current-app-background-color', $darkenPrimaryColor2),
+            'current-app-background-color' => $this->config->getAppValue(
+                'current-app-background-color',
+                $darkenPrimaryColor2
+            ),
             'loader-color' => $this->config->getAppValue('loader-color', $lightenPrimaryColor),
             'icon-invert-filter' => $this->config->getAppValueInt('icon-invert-filter', '0'),
             'icon-opacity' => $this->config->getAppValueInt('icon-opacity', '100'),
             'text-color' => $this->config->getAppValue('text-color', $textColor),
             'dark-mode-background-color' => $darkModeBackgroundColor,
             'dark-mode-background-color-to' => $darkModeBackgroundColorTo,
-            'dark-mode-background-color-opacity' => $this->config->getAppValueInt('dark-mode-background-color-opacity', '100'),
-            'dark-mode-current-app-background-color' => $this->config->getAppValue('dark-mode-current-app-background-color', $darkenPrimaryColor2),
+            'dark-mode-background-color-opacity' => $this->config->getAppValueInt(
+                'dark-mode-background-color-opacity',
+                '100'
+            ),
+            'dark-mode-current-app-background-color' => $this->config->getAppValue(
+                'dark-mode-current-app-background-color',
+                $darkenPrimaryColor2
+            ),
             'dark-mode-loader-color' => $this->config->getAppValue('dark-mode-loader-color', $textColor),
             'dark-mode-icon-invert-filter' => $this->config->getAppValueInt('dark-mode-icon-invert-filter', '0'),
             'dark-mode-icon-opacity' => $this->config->getAppValueInt('dark-mode-icon-opacity', '100'),

From e1797e1e038ab9ecba6d9b9addffebd6a03b6142 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sun, 4 Dec 2022 13:01:56 +0100
Subject: [PATCH 13/19] split long lines

---
 lib/Service/CategoryRepository.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Service/CategoryRepository.php b/lib/Service/CategoryRepository.php
index 7559854..c146609 100644
--- a/lib/Service/CategoryRepository.php
+++ b/lib/Service/CategoryRepository.php
@@ -74,7 +74,8 @@ class CategoryRepository
         }
 
         foreach ($categoriesLabels as $k => $category) {
-            $categoriesLabels[$category['id']] = $category['translations'][$currentLanguage]['name'] ?? $category['translations']['en']['name'];
+            $categoriesLabels[$category['id']] = $category['translations'][$currentLanguage]['name'] ??
+                $category['translations']['en']['name'];
 
             unset($categoriesLabels[$k]);
         }

From d1b2a1ee3c7219513334526d90ec652cc5d653ae Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sun, 4 Dec 2022 18:59:21 +0100
Subject: [PATCH 14/19] sonar-scanner configuration

---
 .woodpecker.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 9de7535..dbfbe1d 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -19,10 +19,16 @@ pipeline:
     image: sonarsource/sonar-scanner-cli
     secrets: [sonar_token, sonar_host, sonar_project]
     commands:
-      - sonar-scanner -Dsonar.projectKey=$SONAR_PROJECT -Dsonar.sources=. -Dsonar.host.url=$SONAR_HOST
+      - sonar-scanner \
+        -Dsonar.projectKey=$SONAR_PROJECT \
+        -Dsonar.sources=. \
+        -Dsonar.host.url=$SONAR_HOST \
+        -Dsonar.pullrequest.key=$CI_COMMIT_PULL_REQUEST \
+        -Dsonar.pullrequest.branch=$CI_COMMIT_SOURCE_BRANCH \
+        -Dsonar.pullrequest.base=$CI_COMMIT_TARGET_BRANCH
     failure: ignore
     when:
-      event: [push, pull_request]
+      event: [pull_request]
 
   package:
     image: gitnet.fr/deblan/devenv

From 7c7219873675d76de9ca453da094b4e30e2e6617 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sun, 4 Dec 2022 19:06:19 +0100
Subject: [PATCH 15/19] sonar-scanner configuration

---
 .woodpecker.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index dbfbe1d..354819e 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -19,12 +19,12 @@ pipeline:
     image: sonarsource/sonar-scanner-cli
     secrets: [sonar_token, sonar_host, sonar_project]
     commands:
-      - sonar-scanner \
-        -Dsonar.projectKey=$SONAR_PROJECT \
-        -Dsonar.sources=. \
-        -Dsonar.host.url=$SONAR_HOST \
-        -Dsonar.pullrequest.key=$CI_COMMIT_PULL_REQUEST \
-        -Dsonar.pullrequest.branch=$CI_COMMIT_SOURCE_BRANCH \
+      - sonar-scanner
+        -Dsonar.projectKey=$SONAR_PROJECT
+        -Dsonar.sources=.
+        -Dsonar.host.url=$SONAR_HOST
+        -Dsonar.pullrequest.key=$CI_COMMIT_PULL_REQUEST
+        -Dsonar.pullrequest.branch=$CI_COMMIT_SOURCE_BRANCH
         -Dsonar.pullrequest.base=$CI_COMMIT_TARGET_BRANCH
     failure: ignore
     when:

From a7ab4573c59b6aaaa765ca565d9671722a457f02 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sun, 4 Dec 2022 20:23:48 +0100
Subject: [PATCH 16/19] update makefile run-code-quality-analysis command: use
 current branch and envvars

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 966581f..783bb6a 100644
--- a/Makefile
+++ b/Makefile
@@ -34,4 +34,4 @@ translations:
 .ONESHELL:
 run-code-quality-analysis:
 	export SONAR_TOKEN="$$SONAR_TOKEN_DEBLAN_SIDE_MENU"
-	sonar-scanner -Dsonar.projectKey=deblan-side_menu -Dsonar.sources=. -Dsonar.host.url=https://cq.gitnet.fr
+	sonar-scanner -Dsonar.projectKey=deblan-side_menu -Dsonar.sources=. -Dsonar.host.url=$$SONAR_SERVER -Dsonar.branch.name=$$(git branch --show-current)

From 709ace5d4f25aac8c25fed298f4fac90a05cd370 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sun, 4 Dec 2022 22:25:04 +0100
Subject: [PATCH 17/19] CI: add dependency check

---
 .woodpecker.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 354819e..29e70b2 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -30,6 +30,12 @@ pipeline:
     when:
       event: [pull_request]
 
+  dependency_check:
+    image: registry.gitlab.com/gitlab-ci-utils/docker-dependency-check:latest
+    commands:
+      - /usr/share/dependency-check/bin/dependency-check.sh --scan "./" --format ALL --project "$CI_REPO" --failOnCVSS 0
+      - if [ $(grep -c "vulnerabilities" dependency-check-report.json) -gt 0 ]; then exit 2; fi
+
   package:
     image: gitnet.fr/deblan/devenv
     volumes:

From b50cd5c4d071b63bb6062cbb5c004b5187bf1349 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sun, 4 Dec 2022 22:42:50 +0100
Subject: [PATCH 18/19] CI: update dependency check

---
 .woodpecker.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 29e70b2..ee170c2 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -33,8 +33,7 @@ pipeline:
   dependency_check:
     image: registry.gitlab.com/gitlab-ci-utils/docker-dependency-check:latest
     commands:
-      - /usr/share/dependency-check/bin/dependency-check.sh --scan "./" --format ALL --project "$CI_REPO" --failOnCVSS 0
-      - if [ $(grep -c "vulnerabilities" dependency-check-report.json) -gt 0 ]; then exit 2; fi
+      - /usr/share/dependency-check/bin/dependency-check.sh --scan ./*.json -out ./ --format ALL --failOnCVSS 0
 
   package:
     image: gitnet.fr/deblan/devenv

From 5411267960407fccc54f0353b5ce37e04ad8d57b Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sun, 4 Dec 2022 22:52:02 +0100
Subject: [PATCH 19/19] CI: use nodejs for dependency check

---
 .woodpecker.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index ee170c2..71adb98 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -31,9 +31,12 @@ pipeline:
       event: [pull_request]
 
   dependency_check:
-    image: registry.gitlab.com/gitlab-ci-utils/docker-dependency-check:latest
+    image: node:16-slim
     commands:
-      - /usr/share/dependency-check/bin/dependency-check.sh --scan ./*.json -out ./ --format ALL --failOnCVSS 0
+      - npm audit
+    failure: ignore
+    when:
+      event: [pull_request]
 
   package:
     image: gitnet.fr/deblan/devenv