From 7306a31a7d472ccb3314202c4005b55cbf19da6c Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sat, 3 Jul 2021 20:32:39 +0200
Subject: [PATCH 01/23] release v1.24.0

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index d35adbc..5faecd0 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -26,7 +26,7 @@ If you like this application and if you want to support the development:
 * [Donate with liberapay](https://liberapay.com/deblan)
 * [Leave a comment](https://apps.nextcloud.com/apps/side_menu#comments)
 ]]></description>
-    <version>1.23.1</version>
+    <version>1.24.0</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
     <namespace>SideMenu</namespace>

From f6c40d939154f1d4e3aff1bc64fffa923ac3788d Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Tue, 5 Jul 2022 16:52:03 +0200
Subject: [PATCH 02/23] fix typo

---
 appinfo/info.xml                  | 2 +-
 templates/settings/admin-form.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 44530b3..fd6f980 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.3
+* PHP >= 7.4
 * App `theming` enabled
 
 If you like this application and if you want to support the development:
diff --git a/templates/settings/admin-form.php b/templates/settings/admin-form.php
index ba7cf77..59a5143 100644
--- a/templates/settings/admin-form.php
+++ b/templates/settings/admin-form.php
@@ -880,7 +880,7 @@ $choicesSizes = [
                     <a class="side-menu-toggler" data-target="#apps-categories-custom-list" href="#_">
                         🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
                     </a>
--to
+
                     <div id="apps-categories-custom-list" style="display: none">
                         <ul class="side-menu-setting-list">
                             <?php foreach ($_['apps'] as $app): ?>

From 5835f1ae929b9b65c65173ed30bb02f1d85f17f9 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Mon, 25 Jul 2022 10:34:24 +0200
Subject: [PATCH 03/23] add woodpacker ci

---
 .woodpecker.yml | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 .woodpecker.yml

diff --git a/.woodpecker.yml b/.woodpecker.yml
new file mode 100644
index 0000000..505111b
--- /dev/null
+++ b/.woodpecker.yml
@@ -0,0 +1,35 @@
+pipeline:
+  dependencies:
+    image: deblan/devenv
+    commands:
+      - npm install
+    
+    when:
+      branch: [master, develop, feature/*]
+      event:
+        - push
+        - pull_request
+
+  build:
+    image: deblan/devenv
+    commands:
+      - make npm-build
+    when:
+      branch: [master, develop, feature/*]
+      event:
+        - push
+        - pull_request
+
+  release:
+    image: deblan/devenv
+    volumes:
+      - /var/www/html/artifacts:/var/www/html/artifacts
+    secrets: [app_certificate]
+    commands:
+      - mkdir -p "$HOME/.nextcloud/certificates"
+      - echo "$APP_CERTIFICATE" > "$HOME/.nextcloud/certificates/side_menu.key"
+      - export VERSION=$(grep "<version>" appinfo/info.xml | grep -o "[0-9]*\.[0-9]*\.[0-9]*" --color=never)
+      - export RELEASE_DIRECTORY="/var/www/html/artifacts/deblan/side_menu"
+      - make release
+    when:
+      branch: [master]

From b83d9f8d764f47201f95860f839a33d77c737b2a Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Mon, 25 Jul 2022 10:38:59 +0200
Subject: [PATCH 04/23] add woodpacker ci

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 35a2d51..92f05f7 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ You can customize colors depending of the theme (Dark theme and Breeze Dark). Co
 
 You like this app and you want to support me? ☕ [Buy me a coffee](https://www.buymeacoffee.com/deblan) or [Donate with liberapay](https://liberapay.com/deblan)
 
-[![Build Status](https://ci2.gitnet.fr/api/badges/deblan/side_menu/status.svg)](https://ci2.gitnet.fr/deblan/side_menu)
+[![Build Status](https://ci.gitnet.fr/api/badges/deblan/side_menu/status.svg)](https://ci.gitnet.fr/deblan/side_menu)
 
 Requirements
 ------------

From ef604ee61203b15b418def29fffb9b146539ebed Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Tue, 26 Jul 2022 14:44:43 +0200
Subject: [PATCH 05/23] fix merge

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

diff --git a/.woodpecker.yml b/.woodpecker.yml
index c52ca04..428dfce 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -3,7 +3,7 @@ pipeline:
     image: deblan/devenv
     commands:
       - npm install
-  when:
+    when:
       branch: [master, develop, feature/*]
 
   build:

From 06b10568e7f171f333e521efc31e20c9d534ec07 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Tue, 26 Jul 2022 14:55:25 +0200
Subject: [PATCH 06/23] update ci

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

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 3c8b513..3133960 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -4,8 +4,8 @@ pipeline:
     commands:
       - npm install
     when:
-      branch: [master, develop, feature/*]
       event: [tag, push, pull_request]
+      branch: [master, develop, feature/*]
 
   build:
     image: deblan/devenv
@@ -27,8 +27,8 @@ pipeline:
       - export RELEASE_DIRECTORY="/var/www/html/artifacts/deblan/side_menu"
       - make release
     when:
-      branch: [master]
       event: [tag]
+      branch: [master]
 
   release:
     image: plugins/gitea-release

From ff1ebb4a508d3b556215b81e82b46045c3940b41 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Tue, 26 Jul 2022 14:57:19 +0200
Subject: [PATCH 07/23] update ci

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

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 3133960..48da78e 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -12,7 +12,7 @@ pipeline:
     commands:
       - make npm-build
     when:
-      branch: [develop, feature/*]
+      branch: [master, develop, feature/*]
       event: [push, pull_request]
 
   package:
@@ -28,7 +28,6 @@ pipeline:
       - make release
     when:
       event: [tag]
-      branch: [master]
 
   release:
     image: plugins/gitea-release

From 49f45534de40559c144dbaf5e300d0b07cb6e70a Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Mon, 15 Aug 2022 15:03:46 +0200
Subject: [PATCH 08/23] update changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3901de8..a7fc283 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## [Unreleased]
 
+### Changed
+* upgrade dependencies
+
 ## 2.4.3
 ### Fixed
 * fix translations

From 47c2beae4a7122f3730b1f2683b5b63eb247a5fc Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sun, 21 Aug 2022 13:48:16 +0200
Subject: [PATCH 09/23] (cq) remove duplicated code

---
 css/sideMenu.css | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/css/sideMenu.css b/css/sideMenu.css
index 56bf97f..80ed6b7 100644
--- a/css/sideMenu.css
+++ b/css/sideMenu.css
@@ -315,6 +315,7 @@
 @media screen and (max-width: 1024px) {
     #side-menu.side-menu-big {
         max-width: 290px;
+        height: 100vh;
     }
 
     .side-menu-categories {
@@ -325,10 +326,6 @@
     .side-menu-category {
         padding: 10px 0;
     }
-
-    #side-menu.side-menu-big {
-        height: 100vh;
-    }
 }
 
 @media screen and (min-width: 1024px) {

From a20b0d470940d8e3b8081b1998cd6b474606c874 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sun, 21 Aug 2022 13:48:42 +0200
Subject: [PATCH 10/23] (cq) remove unsed variables

---
 lib/AppInfo/Application.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index f7f5e7e..b812fd7 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -96,7 +96,7 @@ class Application extends App implements IBootstrap
 
         $cache = $this->config->getAppValue(self::APP_ID, 'cache', '0');
 
-        foreach ($assets as $key => $value) {
+        foreach ($assets as $value) {
             $route = OC::$server->getURLGenerator()->linkToRoute($value['route'], ['v' => $cache]);
             $value['attr'][$value['route_attr']] = $route;
 
@@ -106,15 +106,15 @@ class Application extends App implements IBootstrap
 
     public function register(IRegistrationContext $context): void
     {
-        $context->registerService('AppRepository', function (ContainerInterface $c) {
+        $context->registerService('AppRepository', function () {
             return new AppRepository();
         });
 
-        $context->registerService('CategoryRepository', function (ContainerInterface $c) {
+        $context->registerService('CategoryRepository', function () {
             return new CategoryRepository();
         });
 
-        $context->registerService('ConfigProxy', function (ContainerInterface $c) {
+        $context->registerService('ConfigProxy', function () {
             return new ConfigProxy();
         });
     }

From 7b8d8800fccccaf0039658dec482e710237764a2 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sun, 21 Aug 2022 13:49:20 +0200
Subject: [PATCH 11/23] (cq) replace repeated strings with variables

---
 templates/settings/admin-form.php    | 28 +++++++++++++++-------------
 templates/settings/personal-form.php |  8 +++++---
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/templates/settings/admin-form.php b/templates/settings/admin-form.php
index 59a5143..bd01e59 100644
--- a/templates/settings/admin-form.php
+++ b/templates/settings/admin-form.php
@@ -39,6 +39,8 @@ $choicesSizes = [
     'Big' => 'big',
 ];
 
+$labelShowHideApps = 'Show and hide the list of applications';
+$labelReset = 'Reset to default';
 ?>
 <div id="side-menu-section">
     <div class="section">
@@ -67,7 +69,7 @@ $choicesSizes = [
                         class="side-menu-setting side-menu-setting-live"
                         value="<?php print_unescaped($_['background-color-to']); ?>">
 
-                        <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t('Reset to default')); ?>" data-reset="<?php echo htmlentities(json_encode([
+                        <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
                             'side-menu-background-color' => $_['defaults']['background-color'],
                             'side-menu-background-color-to' => $_['defaults']['background-color-to'],
                         ])) ?>"></div>
@@ -107,7 +109,7 @@ $choicesSizes = [
                         class="side-menu-setting side-menu-setting-live"
                         value="<?php print_unescaped($_['current-app-background-color']); ?>">
 
-                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t('Reset to default')); ?>" data-reset="<?php echo htmlentities(json_encode([
+                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
                         'side-menu-current-app-background-color' => $_['defaults']['current-app-background-color'],
                     ])) ?>"></div>
                 </div>
@@ -127,7 +129,7 @@ $choicesSizes = [
                         class="side-menu-setting side-menu-setting-live"
                         value="<?php print_unescaped($_['text-color']); ?>">
 
-                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t('Reset to default')); ?>" data-reset="<?php echo htmlentities(json_encode([
+                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
                         'side-menu-text-color' => $_['defaults']['text-color'],
                     ])) ?>"></div>
                 </div>
@@ -147,7 +149,7 @@ $choicesSizes = [
                         class="side-menu-setting"
                         value="<?php print_unescaped($_['loader-color']); ?>">
 
-                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t('Reset to default')); ?>" data-reset="<?php echo htmlentities(json_encode([
+                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
                         'side-menu-loader-color' => $_['defaults']['loader-color'],
                     ])) ?>"></div>
                 </div>
@@ -255,7 +257,7 @@ $choicesSizes = [
                         class="side-menu-setting"
                         value="<?php print_unescaped($_['dark-mode-background-color-to']); ?>">
 
-                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t('Reset to default')); ?>" data-reset="<?php echo htmlentities(json_encode([
+                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
                         'side-menu-dark-mode-background-color' => $_['defaults']['dark-mode-background-color'],
                         'side-menu-dark-mode-background-color-to' => $_['defaults']['dark-mode-background-color-to'],
                     ])) ?>"></div>
@@ -295,7 +297,7 @@ $choicesSizes = [
                         class="side-menu-setting"
                         value="<?php print_unescaped($_['dark-mode-current-app-background-color']); ?>">
 
-                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t('Reset to default')); ?>" data-reset="<?php echo htmlentities(json_encode([
+                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
                         'side-menu-dark-mode-current-app-background-color' => $_['defaults']['dark-mode-current-app-background-color'],
                     ])) ?>"></div>
                 </div>
@@ -315,7 +317,7 @@ $choicesSizes = [
                         class="side-menu-setting"
                         value="<?php print_unescaped($_['dark-mode-text-color']); ?>">
 
-                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t('Reset to default')); ?>" data-reset="<?php echo htmlentities(json_encode([
+                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
                         'side-menu-dark-mode-text-color' => $_['defaults']['dark-mode-text-color'],
                     ])) ?>"></div>
                 </div>
@@ -335,7 +337,7 @@ $choicesSizes = [
                         class="side-menu-setting"
                         value="<?php print_unescaped($_['dark-mode-loader-color']); ?>">
 
-                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t('Reset to default')); ?>" data-reset="<?php echo htmlentities(json_encode([
+                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
                         'side-menu-dark-mode-loader-color' => $_['defaults']['dark-mode-loader-color'],
                     ])) ?>"></div>
                 </div>
@@ -649,7 +651,7 @@ $choicesSizes = [
                 </div>
                 <div class="side-menu-setting-form">
                     <a class="side-menu-toggler" data-target="#big-menu-hidden-apps" href="#_">
-                        🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+                        🖱️ <?php p($l->t($labelShowHideApps)); ?>
                     </a>
 
                     <div class="side-menu-setting" data-name="big-menu-hidden-apps" id="big-menu-hidden-apps" data-checkbox style="display: none">
@@ -718,7 +720,7 @@ $choicesSizes = [
                 </div>
                 <div class="side-menu-setting-form">
                     <a class="side-menu-toggler" data-target="#target-blank-apps" href="#_">
-                        🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+                        🖱️ <?php p($l->t($labelShowHideApps)); ?>
                     </a>
 
                     <div class="side-menu-setting" data-name="target-blank-apps" id="target-blank-apps" data-checkbox style="display: none">
@@ -772,7 +774,7 @@ $choicesSizes = [
                 </div>
                 <div class="side-menu-setting-form">
                     <a class="side-menu-toggler" data-target="#top-menu-apps" href="#_">
-                        🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+                        🖱️ <?php p($l->t($labelShowHideApps)); ?>
                     </a>
 
                     <div class="side-menu-setting" data-name="top-menu-apps" id="top-menu-apps" data-checkbox style="display: none">
@@ -805,7 +807,7 @@ $choicesSizes = [
                 </div>
                 <div class="side-menu-setting-form">
                     <a class="side-menu-toggler" data-target="#top-side-menu-apps" href="#_">
-                        🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+                        🖱️ <?php p($l->t($labelShowHideApps)); ?>
                     </a>
 
                     <div class="side-menu-setting" data-name="top-side-menu-apps" id="top-side-menu-apps" data-checkbox style="display: none">
@@ -878,7 +880,7 @@ $choicesSizes = [
                 </div>
                 <div class="side-menu-setting-form">
                     <a class="side-menu-toggler" data-target="#apps-categories-custom-list" href="#_">
-                        🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+                        🖱️ <?php p($l->t($labelShowHideApps)); ?>
                     </a>
 
                     <div id="apps-categories-custom-list" style="display: none">
diff --git a/templates/settings/personal-form.php b/templates/settings/personal-form.php
index ada1754..9e9bfc9 100644
--- a/templates/settings/personal-form.php
+++ b/templates/settings/personal-form.php
@@ -25,6 +25,8 @@ $choicesYesNo = [
     'Yes' => '1',
 ];
 
+
+$labelShowHideApps = 'Show and hide the list of applications';
 ?>
 <div id="side-menu-section">
     <?php if ($_['force']): ?>
@@ -85,7 +87,7 @@ $choicesYesNo = [
 
                         <p>
                             <a class="side-menu-toggler" data-target="#target-blank-apps" href="#_">
-                                🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+                                🖱️ <?php p($l->t($labelShowHideApps)); ?>
                             </a>
                         </p>
 
@@ -131,7 +133,7 @@ $choicesYesNo = [
                     <div class="side-menu-setting-form">
                         <p>
                             <a class="side-menu-toggler" data-target="#top-menu-apps" href="#_">
-                                🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+                                🖱️ <?php p($l->t($labelShowHideApps)); ?>
                             </a>
                         </p>
 
@@ -171,7 +173,7 @@ $choicesYesNo = [
                     <div class="side-menu-setting-form">
                         <p>
                             <a class="side-menu-toggler" data-target="#top-side-menu-apps" href="#_">
-                                🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+                                🖱️ <?php p($l->t($labelShowHideApps)); ?>
                             </a>
                         </p>
 

From 80532ead63dd80f17c06dc1d7005856cbd98d573 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sun, 21 Aug 2022 13:52:08 +0200
Subject: [PATCH 12/23] (cq) rename variable

---
 lib/Controller/AdminSettingController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Controller/AdminSettingController.php b/lib/Controller/AdminSettingController.php
index 0eb9b57..aa11d9a 100644
--- a/lib/Controller/AdminSettingController.php
+++ b/lib/Controller/AdminSettingController.php
@@ -69,7 +69,7 @@ class AdminSettingController extends Controller
     public function exportConfiguration()
     {
         $keys = $this->config->getAppKeys(Application::APP_ID);
-        $config = [];
+        $appConfig = [];
         $excludedKeys = [
             'cache',
             'cache-categories',
@@ -80,11 +80,11 @@ class AdminSettingController extends Controller
                 continue;
             }
 
-            $config[$key] = $this->config->getAppValue(Application::APP_ID, $key);
+            $appConfig[$key] = $this->config->getAppValue(Application::APP_ID, $key);
         }
 
         return new DataDownloadResponse(
-            json_encode($config, JSON_PRETTY_PRINT),
+            json_encode($appConfig, JSON_PRETTY_PRINT),
             'config.json',
             'text/json'
         );

From 6347403ed7fe1f373bdd00410d89b8973d7e3db7 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sun, 21 Aug 2022 13:53:40 +0200
Subject: [PATCH 13/23] (cq) remove unsed variable

---
 lib/Service/AppRepository.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/Service/AppRepository.php b/lib/Service/AppRepository.php
index d91ec75..258c5c5 100644
--- a/lib/Service/AppRepository.php
+++ b/lib/Service/AppRepository.php
@@ -53,7 +53,6 @@ class AppRepository
     {
         $navigation = $this->ocApp->getNavigation();
         $appCategoriesCustom = $this->config->getAppValueArray('apps-categories-custom', '[]');
-        $categoriesCustom = $this->config->getAppValueArray('categories-custom', '[]');
         $categories = $this->categoryRepository->getOrderedCategories();
         $apps = $this->ocApp->listAllApps();
         $visibleApps = [];

From ca08a26e1bac6940236107a749aae7714f08a45c Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sun, 21 Aug 2022 13:55:29 +0200
Subject: [PATCH 14/23] (cq) add alt attribute on logo

---
 src/Logo.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Logo.vue b/src/Logo.vue
index 36aa7b6..0e76b5b 100644
--- a/src/Logo.vue
+++ b/src/Logo.vue
@@ -17,9 +17,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 <template>
     <div v-bind:class="classes">
         <a v-if="link !== null" v-bind:href="link">
-            <img v-bind:src="image">
+            <img v-bind:src="image" alt="Logo">
         </a>
-        <img v-else v-bind:src="image">
+        <img v-else v-bind:src="image" alt="Logo">
     </div>
 </template>
 

From d2b589a64402022b1ab380e007f0a0f4948de5c1 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sun, 21 Aug 2022 15:46:33 +0200
Subject: [PATCH 15/23] (cq) add rel noopener attribute

---
 templates/settings/admin-form.php    | 4 ++--
 templates/settings/personal-form.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/settings/admin-form.php b/templates/settings/admin-form.php
index bd01e59..d2ffa93 100644
--- a/templates/settings/admin-form.php
+++ b/templates/settings/admin-form.php
@@ -999,7 +999,7 @@ $labelReset = 'Reset to default';
             <progress max="100" value="0" id="side-menu-save-progress"></progress>
         </button>
 
-        <a href="<?php echo $urlGenerator->linkToRoute('side_menu.AdminSetting.exportConfiguration') ?>" target="_blank">
+        <a href="<?php echo $urlGenerator->linkToRoute('side_menu.AdminSetting.exportConfiguration') ?>" target="_blank" rel="noopener">
             <button class="btn btn-primary" >
                 <?php p($l->t('Export the configuration')); ?>
             </button>
@@ -1017,7 +1017,7 @@ $labelReset = 'Reset to default';
             <span for="side-menu-opener">
                 <?php p($l->t('You like this app and you want to support me?')); ?>
 
-                <a style="margin-left: 10px" target="_blank" href="https://www.buymeacoffee.com/deblan">
+                <a style="margin-left: 10px" target="_blank" href="https://www.buymeacoffee.com/deblan" rel="noopener">
                     <button>
                         <?php p($l->t('Buy me a coffee ☕')); ?>
                     </button>
diff --git a/templates/settings/personal-form.php b/templates/settings/personal-form.php
index 9e9bfc9..7794f23 100644
--- a/templates/settings/personal-form.php
+++ b/templates/settings/personal-form.php
@@ -218,7 +218,7 @@ $labelShowHideApps = 'Show and hide the list of applications';
             <span for="side-menu-opener">
                 <?php p($l->t('You like this app and you want to support me?')); ?>
 
-                <a style="margin-left: 10px" target="_blank" href="https://www.buymeacoffee.com/deblan">
+                <a style="margin-left: 10px" target="_blank" href="https://www.buymeacoffee.com/deblan" rel="noopener">
                     <button>
                         <?php p($l->t('Buy me a coffee ☕')); ?>
                     </button>

From ba7f0673b4d7d80c0335fea2bd6d4e357dbeee71 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sun, 21 Aug 2022 15:53:26 +0200
Subject: [PATCH 16/23] (cq) add alt attribute on app icon

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

diff --git a/src/SideMenuBigApp.vue b/src/SideMenuBigApp.vue
index 0b7fa07..86a2ba4 100644
--- a/src/SideMenuBigApp.vue
+++ b/src/SideMenuBigApp.vue
@@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 <template>
     <li v-bind:class="classes">
         <a v-bind:href="href" :target="target" v-bind:title="label">
-            <img class="side-menu-app-icon" v-bind:src="icon"></span>
+            <img class="side-menu-app-icon" v-bind:src="icon" v-bind:alt="label" />
             <span class="side-menu-app-text" v-html="label"></span>
         </a>
     </li>

From ed8f0e0959131ded086d2db14f5d4cf5e4b8ded6 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sun, 21 Aug 2022 15:54:02 +0200
Subject: [PATCH 17/23] (cq) remove unused package*

---
 src/SideMenuBig.vue            | 1 -
 src/SideMenuWithCategories.vue | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/SideMenuBig.vue b/src/SideMenuBig.vue
index 72e6321..4f01000 100644
--- a/src/SideMenuBig.vue
+++ b/src/SideMenuBig.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 CloserButton from './CloserButton'
diff --git a/src/SideMenuWithCategories.vue b/src/SideMenuWithCategories.vue
index 7accbf0..48d6def 100644
--- a/src/SideMenuWithCategories.vue
+++ b/src/SideMenuWithCategories.vue
@@ -51,7 +51,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 CloserButton from './CloserButton'

From 3cf8b685baf63319186af61ef2b40acd8f5b5973 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sun, 21 Aug 2022 15:55:59 +0200
Subject: [PATCH 18/23] (cq) replace var with let

---
 src/SideMenu.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/SideMenu.vue b/src/SideMenu.vue
index e47df87..b369f87 100644
--- a/src/SideMenu.vue
+++ b/src/SideMenu.vue
@@ -91,13 +91,13 @@ export default {
 
             for (let element of links) {
                 let href = element.getAttribute('href')
-                var parent = element.parentNode
+                let parent = element.parentNode
 
                 if (!parent) {
                     continue
                 }
 
-                var dataId = parent.getAttribute('data-id')
+                let dataId = parent.getAttribute('data-id')
                 dataId = dataId !== null ? dataId : ''
 
                 if (!parent.classList.contains('app-top-side-menu') && !parent.classList.contains('app-hidden') && !menuIsHidden) {

From eba06e8ef83c16840c238be37c2f82041c1476ff Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sun, 21 Aug 2022 15:58:12 +0200
Subject: [PATCH 19/23] (cq) replace var with let

---
 templates/js/_alwaysDisplayed.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/js/_alwaysDisplayed.js b/templates/js/_alwaysDisplayed.js
index e37230a..9e3727f 100644
--- a/templates/js/_alwaysDisplayed.js
+++ b/templates/js/_alwaysDisplayed.js
@@ -2,7 +2,7 @@ const alwaysDisplayed = function() {
     const elements = querySelectorAll('*')
     const fixedElements = []
 
-    for (var element of elements) {
+    for (let element of elements) {
         if (typeof element !== 'object') {
             continue
         }
@@ -44,7 +44,7 @@ const alwaysDisplayed = function() {
         fixedElements.push(element)
     }
 
-    for (var i in fixedElements) {
+    for (let i in fixedElements) {
         const element = fixedElements[i]
         const computedStyle = window.getComputedStyle(element, null)
         const left = computedStyle.getPropertyValue('left')

From 538467dc99e580d253bf4ab26351f8b8a5a6801a Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sun, 21 Aug 2022 16:12:52 +0200
Subject: [PATCH 20/23] (cq) replace v-html with v-text to prevent xss

---
 src/AdminCategoriesCustom.vue  | 6 +++---
 src/SideMenuApp.vue            | 4 ++--
 src/SideMenuBig.vue            | 2 +-
 src/SideMenuBigApp.vue         | 2 +-
 src/SideMenuWithCategories.vue | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/AdminCategoriesCustom.vue b/src/AdminCategoriesCustom.vue
index 909580d..ca5272a 100644
--- a/src/AdminCategoriesCustom.vue
+++ b/src/AdminCategoriesCustom.vue
@@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
     <div>
         <ul class="side-menu-setting-list">
             <li v-for="item in values" class="side-menu-setting-list-item" v-on:click="showEditForm(item)">
-                <span v-html="item.en"></span>
+                <span v-text="item.en"></span>
             </li>
         </ul>
 
@@ -29,7 +29,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 		<Modal v-if="addForm" @close="hideAddForm">
 			<div class="modal__content">
                 <div v-for="lang in langs">
-                    <span class="lang" v-html="lang"></span>
+                    <span class="lang" v-text="lang"></span>
                     <input type="text" v-model="newValue[lang]" required>
                 </div>
 
@@ -42,7 +42,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 		<Modal v-if="editForm" @close="hideEditForm">
 			<div class="modal__content">
                 <div v-for="lang in langs">
-                    <span class="lang" v-html="lang"></span>
+                    <span class="lang" v-text="lang"></span>
                     <input type="text" v-model="editValue[lang]" required>
                 </div>
 
diff --git a/src/SideMenuApp.vue b/src/SideMenuApp.vue
index 21fe5eb..a5474c7 100644
--- a/src/SideMenuApp.vue
+++ b/src/SideMenuApp.vue
@@ -17,8 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 <template>
     <li v-bind:class="classes">
         <a v-bind:href="href" :target="target" v-bind:title="label">
-            <span class="side-menu-app-icon" v-html="icon"></span>
-            <span class="side-menu-app-text" v-html="label"></span>
+            <span class="side-menu-app-icon" v-text="icon"></span>
+            <span class="side-menu-app-text" v-text="label"></span>
         </a>
     </li>
 </template>
diff --git a/src/SideMenuBig.vue b/src/SideMenuBig.vue
index 4f01000..d1f0b1f 100644
--- a/src/SideMenuBig.vue
+++ b/src/SideMenuBig.vue
@@ -34,7 +34,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
                 <Loader v-if="!items.length" />
 
                 <div class="side-menu-category" v-for="category in items">
-                    <h2 class="side-menu-category-title" v-if="category.name != ''" v-html="category.name"></h2>
+                    <h2 class="side-menu-category-title" v-if="category.name != ''" v-text="category.name"></h2>
 
                     <ul class="side-menu-apps-list">
                         <SideMenuBigApp
diff --git a/src/SideMenuBigApp.vue b/src/SideMenuBigApp.vue
index 86a2ba4..bab78e6 100644
--- a/src/SideMenuBigApp.vue
+++ b/src/SideMenuBigApp.vue
@@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
     <li v-bind:class="classes">
         <a v-bind:href="href" :target="target" v-bind:title="label">
             <img class="side-menu-app-icon" v-bind:src="icon" v-bind:alt="label" />
-            <span class="side-menu-app-text" v-html="label"></span>
+            <span class="side-menu-app-text" v-text="label"></span>
         </a>
     </li>
 </template>
diff --git a/src/SideMenuWithCategories.vue b/src/SideMenuWithCategories.vue
index 48d6def..e0a3c41 100644
--- a/src/SideMenuWithCategories.vue
+++ b/src/SideMenuWithCategories.vue
@@ -32,7 +32,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
                 <Loader v-if="!items.length" />
 
                 <div class="side-menu-category" v-for="category in items">
-                    <h2 class="side-menu-category-title" v-if="category.name != ''" v-html="category.name"></h2>
+                    <h2 class="side-menu-category-title" v-if="category.name != ''" v-text="category.name"></h2>
 
                     <ul class="side-menu-apps-list">
                         <SideMenuBigApp

From 0c304b06a0f902e6ed676f47def1d181190c0c80 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sun, 21 Aug 2022 16:13:39 +0200
Subject: [PATCH 21/23] (cq) add missing let

---
 templates/js/_topMenuApps.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/js/_topMenuApps.js b/templates/js/_topMenuApps.js
index 103a453..455b09a 100644
--- a/templates/js/_topMenuApps.js
+++ b/templates/js/_topMenuApps.js
@@ -43,7 +43,7 @@ const updateTopMenu = function() {
         return
     }
 
-    navigationAppsHtml = ''
+    let navigationAppsHtml = ''
 
     for (let app of apps) {
         const dataId = app.getAttribute('data-id')

From 36388bd472b967a8639182c0ae29a06a6203fd1b Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sun, 21 Aug 2022 16:20:05 +0200
Subject: [PATCH 22/23] add code quality makefile action

---
 Makefile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Makefile b/Makefile
index 4c8cdd4..1639f5c 100644
--- a/Makefile
+++ b/Makefile
@@ -26,3 +26,8 @@ release: npm-build translations
 
 translations:
 	php bin/generate_l10n.php
+
+.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

From 1c2c413eef43ee8acb85c94028e613e0f9c6fa66 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sun, 21 Aug 2022 16:20:42 +0200
Subject: [PATCH 23/23] update changelog

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7fc283..cf90cb7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 ### Changed
 * upgrade dependencies
+### Fixed
+* remove duplicated code
+* remove unused variables and packages
+* replace repeated strings with variables
+* add html attributes
+* remove unused package*
+* replace var with let
+* replace v-html with v-text to prevent xss
 
 ## 2.4.3
 ### Fixed