Merge pull request 'release v2.5.0' (#132) from develop into master

Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/132

.drone.yml

@@ -1,42 +0,0 @@
----
-kind: pipeline
-type: docker
-name: default
-
-steps:
-  - name: dependencies
-    image: deblan/devenv
-    commands:
-      - npm install
-
-  - name: build
-    image: deblan/devenv
-    commands:
-      - make npm-build
-    when:
-      branch:
-        - develop
-        - feature/*
-
-  - name: release
-    image: deblan/devenv
-    volumes:
-      - name: artifacts
-        path: /artifacts
-    environment:
-      APP_CERTIFICATE:
-        from_secret: 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="/artifacts/deblan/side_menu"
-      - make release
-    when:
-      branch:
-        - master
-
-volumes:
-  - name: artifacts
-    host:
-      path: /var/www/html/artifacts

.metroline.yml

@@ -1,7 +0,0 @@
-version: '1'
-image: deblan/devenv
-jobs:
-  build:
-    script:
-      - npm install
-      - make npm-build

.stylelintrc.json

@@ -0,0 +1,5 @@
+{
+    "rules": {
+        "indentation": 4
+    }
+}

.woodpecker.yml

@@ -0,0 +1,42 @@
+pipeline:
+  dependencies:
+    image: deblan/devenv
+    commands:
+      - npm install
+    when:
+      event: [tag, push, pull_request]
+      branch: [master, develop, feature/*]
+
+  build:
+    image: deblan/devenv
+    commands:
+      - make npm-build
+    when:
+      event: [push, pull_request]
+
+  package:
+    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:
+      event: [tag]
+
+  release:
+    image: plugins/gitea-release
+    volumes:
+      - /var/www/html/artifacts:/var/www/html/artifacts
+    settings:
+      api_key:
+        from_secret: gitnet_api_key
+      base_url: https://gitnet.fr
+      note: ${CI_COMMIT_MESSAGE}
+      files: /var/www/html/artifacts/deblan/side_menu/${CI_COMMIT_TAG/v//}/*
+    when:
+      event: [tag]

CHANGELOG.md

@@ -1,5 +1,86 @@
 ## [Unreleased]
 
+## 2.5.0
+### Changed
+* upgrade dependencies
+### Fixed
+* remove duplicated code
+* remove unused variables and packages
+* replace repeated strings with variables
+* add html attributes
+* replace var with let
+* replace v-html with v-text to prevent xss
+
+## 2.4.3
+### Fixed
+* fix translations
+
+## 2.4.2
+### Fixed
+* fix typo
+### Changed
+* change ci/cd
+
+## 2.4.1
+### Fixed
+* fix user setting save
+
+## 2.4.0
+### Added
+* remove focus on opener after click
+* add button to set default colors
+* add menu hover effect
+* add translations
+### Fixed
+* fix deprecated app.php file
+* fix menu with categories header
+* fix minor issues
+### Changed
+* change saving progression
+### Removed
+* Nextcloud 19 is not supported anymore
+* PHP 7.3 is not supported anymore
+
+## 2.3.5
+### Fixed
+* fix white square (#99)
+
+## 2.3.4
+### Fixed
+* fix blank line when settings are open (#96)
+
+## 2.3.3
+### Added
+* hide the scrollbar when mouse is out (menu always displayed)
+### Fixed
+* fix SQL Exception InvalidFieldNameException (#93)
+
+## 2.3.2
+### Fixed
+- fix hidden menu
+
+## 2.3.1
+### Fixed
+- fix #88: does not work with default menu
+
+## 2.3.0
+### Added
+- fix #82: add an option to keep visible an app in both menus
+- fix #83: add custom categories
+- add auto-reload when settings are saved
+
+## 2.2.0
+### Added
+- fix #84: update icons
+- fix #85: use Nextcloud colors by default
+
+### Fixed
+- fix categories order in large menu
+
+## 2.1.0
+### Added
+- add compatibility with Nextcloud 23
+
 ## 2.0.1
 ### Fixed
 - fix #78: Top menu is broken - invisible apps are shown

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

README.md

@@ -2,7 +2,7 @@
 ===============================
 
 Allows you to modify the position of the main menu by creating a panel on the left of the interface or with a big menu on the top.
-You can also define apps that must be displayed in the top menu. Fully customisable.
+You can also add and sort custom categories, define apps that must be displayed in the top menu, etc. Fully customisable.
 
 This application is rather suitable for instances that activate a lot of applications.
 
@@ -15,10 +15,12 @@ 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://ci.gitnet.fr/api/badges/deblan/side_menu/status.svg)](https://ci.gitnet.fr/deblan/side_menu)
+
 Requirements
 ------------
 
-* PHP >= 7.3
+* PHP >= 7.4
 * App `theming` enabled
 
 Installation and upgrade

appinfo/app.php

@@ -1,10 +0,0 @@
-<?php
-
-use OCA\SideMenu\AppInfo\Application;
-
-$app = new Application();
-
-if ($app->isEnabled()) {
-    $app->registerAssets();
-    $app->registerServices();
-}

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:
@@ -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>2.0.1</version>
+    <version>2.5.0</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
     <namespace>SideMenu</namespace>
@@ -46,8 +46,8 @@ If you like this application and if you want to support the development:
     <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc20_big_menu_responsive.png</screenshot>
     <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/personal_settings.png</screenshot>
     <dependencies>
-        <nextcloud min-version="19" max-version="22"/>
-        <php min-version="7.3"/>
+        <nextcloud min-version="20" max-version="24"/>
+        <php min-version="7.4"/>
     </dependencies>
     <settings>
         <admin>OCA\SideMenu\Settings\Admin</admin>

css/admin.css

@@ -97,6 +97,10 @@
     margin-top: -1px;
 }
 
+#apps-categories-custom-list select {
+    width: 100%;
+}
+
 
 .side-menu-setting-table {
     display: table;
@@ -115,7 +119,7 @@
 
 .side-menu-setting-form {
     display: table-cell;
-    width: 300px;
+    min-width: 300px;
 }
 
 .side-menu-setting-label-short {
@@ -125,3 +129,18 @@
 .side-menu-setting-form-long {
     width: 400px;
 }
+
+#side-menu-save-progress {
+    display: inline-block;
+    width: 0;
+    height: 15px;
+    background: #fff;
+}
+
+.btn-reset {
+    display: inline-block;
+    cursor: pointer;
+    position: absolute;
+    margin-top: 17px;
+    margin-left: 5px;
+}

css/sideMenu.css

@@ -29,6 +29,10 @@
     display: none;
 }
 
+#side-menu a {
+    transition: 0.2s;
+}
+
 #side-menu.open {
     display: block;
 }
@@ -59,6 +63,8 @@
 .side-menu-settings img {
     vertical-align: bottom;
     margin-left: 3px;
+    width: 32px;
+    height: 32px;
 }
 
 #side-menu.open .side-menu-settings {
@@ -78,8 +84,8 @@
     margin-left: 3px !important;
 }
 
-.side-menu-opener:active {
-    background-color: var(--color-background-dark) !important;
+.side-menu-opener:active, .side-menu-opener:focus {
+    background-color: var(--side-menu-current-app-background-color, #444) !important;
 }
 
 .side-menu-closer {
@@ -151,6 +157,10 @@
     top: 0;
 }
 
+#side-menu.side-menu-with-categories .side-menu-header {
+    max-width: 295px;
+}
+
 #side-menu.hide-opener .side-menu-logo {
     margin-top: 20px;
 }
@@ -247,6 +257,11 @@
 .side-menu-always-displayed .side-menu-apps-list {
     height: calc(100vh - 49px);
     top: 49px;
+    overflow: hidden;
+}
+
+.side-menu-always-displayed .side-menu-apps-list:hover {
+    overflow: auto;
 }
 
 .side-menu-always-displayed #side-menu,
@@ -293,9 +308,14 @@
     padding: 10px 0;
 }
 
+.side-menu-always-displayed #body-settings, #body-settings.body-settings-side-menu {
+    overflow-x: visible;
+}
+
 @media screen and (max-width: 1024px) {
     #side-menu.side-menu-big {
         max-width: 290px;
+        height: 100vh;
     }
 
     .side-menu-categories {
@@ -306,10 +326,6 @@
     .side-menu-category {
         padding: 10px 0;
     }
-
-    #side-menu.side-menu-big {
-        height: 100vh;
-    }
 }
 
 @media screen and (min-width: 1024px) {

img/side-menu-opener-closer.svg

@@ -1,6 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 10.583 10.583">
-  <g color="#000" fill="#fff">
-    <rect transform="rotate(135)" ry=".545" rx=".545" y="-8.209" x="-3.608" height="1.451" width="7.216" style="marker:none" overflow="visible" paint-order="stroke markers fill"/>
-    <rect transform="rotate(-135)" ry=".545" rx=".545" y="-.726" x="-11.091" height="1.451" width="7.216" style="marker:none" overflow="visible" paint-order="stroke markers fill"/>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 10.583 10.583"><g fill="#fff" color="#000" transform="translate(-.067 .224)"><rect width="5.027" height=".777" x="-2.307" y="6.984" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none" transform="rotate(-45)"/><rect width="5.027" height=".777" x="4.859" y="-.595" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none" transform="rotate(45)"/></g></svg>

img/side-menu-opener-dark.svg

@@ -1,173 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="40"
-   height="40"
-   viewBox="0 0 10.583 10.583"
-   version="1.1"
-   id="svg935"
-   sodipodi:docname="side-menu-opener-dark.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
-  <metadata
-     id="metadata941">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs939" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1918"
-     inkscape:window-height="1008"
-     id="namedview937"
-     showgrid="false"
-     inkscape:zoom="8.34386"
-     inkscape:cx="83.025045"
-     inkscape:cy="14.304895"
-     inkscape:window-x="0"
-     inkscape:window-y="41"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg935" />
-  <g
-     transform="translate(.3 -286.074)"
-     fill="#fff"
-     color="#000"
-     fill-opacity=".855"
-     id="g933"
-     style="fill:#000000;fill-opacity:0.89855075">
-    <rect
-       ry="0"
-       rx="0"
-       y="288.474"
-       x="4.266"
-       height="1.451"
-       width="1.451"
-       style="marker:none;fill:#000000;fill-opacity:0.89855075"
-       overflow="visible"
-       paint-order="stroke markers fill"
-       id="rect909" />
-    <g
-       transform="translate(-.13)"
-       id="g915"
-       style="fill:#000000;fill-opacity:0.89855075">
-      <rect
-         style="marker:none;fill:#000000;fill-opacity:0.89855075"
-         width="1.451"
-         height="1.451"
-         x="6.445"
-         y="288.474"
-         rx="0"
-         ry="0"
-         overflow="visible"
-         paint-order="stroke markers fill"
-         id="rect911" />
-      <rect
-         style="marker:none;fill:#000000;fill-opacity:0.89855075"
-         width="1.451"
-         height="1.451"
-         x="2.345"
-         y="288.474"
-         rx="0"
-         ry="0"
-         overflow="visible"
-         paint-order="stroke markers fill"
-         id="rect913" />
-    </g>
-    <rect
-       ry="0"
-       rx="0"
-       y="290.631"
-       x="4.266"
-       height="1.451"
-       width="1.451"
-       style="marker:none;fill:#000000;fill-opacity:0.89855075"
-       overflow="visible"
-       paint-order="stroke markers fill"
-       id="rect917" />
-    <g
-       transform="translate(-.13 2.157)"
-       id="g923"
-       style="fill:#000000;fill-opacity:0.89855075">
-      <rect
-         style="marker:none;fill:#000000;fill-opacity:0.89855075"
-         width="1.451"
-         height="1.451"
-         x="6.445"
-         y="288.474"
-         rx="0"
-         ry="0"
-         overflow="visible"
-         paint-order="stroke markers fill"
-         id="rect919" />
-      <rect
-         style="marker:none;fill:#000000;fill-opacity:0.89855075"
-         width="1.451"
-         height="1.451"
-         x="2.345"
-         y="288.474"
-         rx="0"
-         ry="0"
-         overflow="visible"
-         paint-order="stroke markers fill"
-         id="rect921" />
-    </g>
-    <rect
-       ry="0"
-       rx="0"
-       y="292.808"
-       x="4.266"
-       height="1.451"
-       width="1.451"
-       style="marker:none;fill:#000000;fill-opacity:0.89855075"
-       overflow="visible"
-       paint-order="stroke markers fill"
-       id="rect925" />
-    <g
-       transform="translate(-.13 4.334)"
-       id="g931"
-       style="fill:#000000;fill-opacity:0.89855075">
-      <rect
-         style="marker:none;fill:#000000;fill-opacity:0.89855075"
-         width="1.451"
-         height="1.451"
-         x="6.445"
-         y="288.474"
-         rx="0"
-         ry="0"
-         overflow="visible"
-         paint-order="stroke markers fill"
-         id="rect927" />
-      <rect
-         style="marker:none;fill:#000000;fill-opacity:0.89855075"
-         width="1.451"
-         height="1.451"
-         x="2.345"
-         y="288.474"
-         rx="0"
-         ry="0"
-         overflow="visible"
-         paint-order="stroke markers fill"
-         id="rect929" />
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 10.583 10.583"><g fill-opacity=".898" color="#000" transform="matrix(.90559 0 0 .86896 .772 -247.893)"><rect width="1.451" height="1.451" x="4.266" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><g transform="translate(-.13)"><rect width="1.451" height="1.451" x="6.445" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="1.451" height="1.451" x="2.345" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></g><rect width="1.451" height="1.451" x="4.266" y="290.631" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><g transform="translate(-.13 2.157)"><rect width="1.451" height="1.451" x="6.445" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="1.451" height="1.451" x="2.345" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></g><rect width="1.451" height="1.451" x="4.266" y="292.808" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><g transform="translate(-.13 4.334)"><rect width="1.451" height="1.451" x="6.445" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="1.451" height="1.451" x="2.345" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></g></g></svg>

img/side-menu-opener-hamburger-2-dark.svg

@@ -1,102 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="40"
-   height="40"
-   viewBox="0 0 10.583 10.583"
-   version="1.1"
-   id="svg1090"
-   sodipodi:docname="side-menu-opener-hamburger-2-dark.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
-  <metadata
-     id="metadata1096">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs1094" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1918"
-     inkscape:window-height="1008"
-     id="namedview1092"
-     showgrid="false"
-     inkscape:zoom="8.34386"
-     inkscape:cx="84.523455"
-     inkscape:cy="12.270318"
-     inkscape:window-x="0"
-     inkscape:window-y="41"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg1090" />
-  <rect
-     overflow="visible"
-     style="marker:none;fill:#000000;fill-opacity:1"
-     width="4.806"
-     height="1.256"
-     x="2.888"
-     y="2.787"
-     rx="0"
-     ry=".472"
-     color="#000"
-     fill="#fff"
-     fill-opacity=".855"
-     paint-order="stroke markers fill"
-     id="rect1082" />
-  <rect
-     overflow="visible"
-     style="marker:none;fill:#000000;fill-opacity:1"
-     width="4.806"
-     height="1.256"
-     x="2.888"
-     y="4.655"
-     rx="0"
-     ry=".472"
-     color="#000"
-     fill="#fff"
-     fill-opacity=".855"
-     paint-order="stroke markers fill"
-     id="rect1084" />
-  <rect
-     overflow="visible"
-     style="marker:none;fill:#000000;fill-opacity:1"
-     width="4.806"
-     height="1.256"
-     x="2.888"
-     y="6.54"
-     rx="0"
-     ry=".472"
-     color="#000"
-     fill="#fff"
-     fill-opacity=".855"
-     paint-order="stroke markers fill"
-     id="rect1086" />
-  <path
-     style="marker:none;fill:#000000;fill-opacity:1"
-     d="M1.243.71A.469.469 0 0 0 .881.88a.469.469 0 0 0-.171.362V9.34c0 .146.067.275.171.362a.469.469 0 0 0 .362.171H9.34a.469.469 0 0 0 .362-.171.469.469 0 0 0 .171-.362V1.243a.469.469 0 0 0-.171-.362A.469.469 0 0 0 9.34.71zm.723 1.256h6.65v6.65h-6.65z"
-     color="#000"
-     overflow="visible"
-     fill="#fff"
-     fill-opacity=".855"
-     paint-order="stroke markers fill"
-     id="path1088" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 10.583 10.583"><rect width="7.62" height="7.62" x="1.482" y="1.482" fill="none" stroke="#000" stroke-linecap="square" stroke-width=".777" color="#000" overflow="visible" paint-order="markers fill stroke" rx="0" ry="0" style="marker:none"/><rect width="5.027" height=".777" x="2.778" y="3.148" color="#000" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="5.027" height=".777" x="2.778" y="6.658" color="#000" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="5.027" height=".777" x="2.778" y="4.936" color="#000" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></svg>

img/side-menu-opener-hamburger-2.svg

@@ -1,101 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="40"
-   height="40"
-   viewBox="0 0 10.583 10.583"
-   version="1.1"
-   id="svg1443"
-   sodipodi:docname="side-menu-opener-hamburger-2.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
-  <metadata
-     id="metadata1449">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs1447" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1918"
-     inkscape:window-height="1008"
-     id="namedview1445"
-     showgrid="false"
-     inkscape:zoom="5.9"
-     inkscape:cx="90.508475"
-     inkscape:cy="4.5762712"
-     inkscape:window-x="0"
-     inkscape:window-y="41"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg1443" />
-  <rect
-     overflow="visible"
-     style="marker:none;fill:#ffffff;fill-opacity:1"
-     width="4.806"
-     height="1.256"
-     x="2.888"
-     y="2.787"
-     rx="0"
-     ry=".472"
-     color="#000"
-     fill="#fff"
-     fill-opacity=".855"
-     paint-order="stroke markers fill"
-     id="rect1435" />
-  <rect
-     overflow="visible"
-     style="marker:none;fill:#ffffff;fill-opacity:1"
-     width="4.806"
-     height="1.256"
-     x="2.888"
-     y="4.655"
-     rx="0"
-     ry=".472"
-     color="#000"
-     fill="#fff"
-     fill-opacity=".855"
-     paint-order="stroke markers fill"
-     id="rect1437" />
-  <rect
-     overflow="visible"
-     style="marker:none;fill:#ffffff;fill-opacity:1"
-     width="4.806"
-     height="1.256"
-     x="2.888"
-     y="6.54"
-     rx="0"
-     ry=".472"
-     color="#000"
-     fill="#fff"
-     fill-opacity=".855"
-     paint-order="stroke markers fill"
-     id="rect1439" />
-  <path
-     style="marker:none;fill:#ffffff;fill-opacity:1"
-     d="M1.243.71A.469.469 0 0 0 .881.88a.469.469 0 0 0-.171.362V9.34c0 .146.067.275.171.362a.469.469 0 0 0 .362.171H9.34a.469.469 0 0 0 .362-.171.469.469 0 0 0 .171-.362V1.243a.469.469 0 0 0-.171-.362A.469.469 0 0 0 9.34.71zm.723 1.256h6.65v6.65h-6.65z"
-     color="#000"
-     overflow="visible"
-     fill="#fff"
-     fill-opacity=".855"
-     paint-order="stroke markers fill"
-     id="path1441" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 10.583 10.583"><rect width="7.62" height="7.62" x="1.482" y="1.482" fill="none" stroke="#fff" stroke-linecap="square" stroke-width=".777" color="#000" overflow="visible" paint-order="markers fill stroke" rx="0" ry="0" style="marker:none"/><g fill="#fff" color="#000" transform="translate(0 .034)"><rect width="5.027" height=".777" x="2.778" y="3.114" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="5.027" height=".777" x="2.778" y="6.624" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="5.027" height=".777" x="2.778" y="4.903" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></g></svg>

img/side-menu-opener-hamburger-dark.svg

@@ -1,92 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="40"
-   height="40"
-   viewBox="0 0 10.583 10.583"
-   version="1.1"
-   id="svg1168"
-   sodipodi:docname="side-menu-opener-hamburger-dark.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
-  <metadata
-     id="metadata1174">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs1172" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1918"
-     inkscape:window-height="1008"
-     id="namedview1170"
-     showgrid="false"
-     inkscape:zoom="5.9"
-     inkscape:cx="112.71186"
-     inkscape:cy="0.16949153"
-     inkscape:window-x="0"
-     inkscape:window-y="41"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg1168" />
-  <g
-     color="#000"
-     fill="#fff"
-     fill-opacity=".855"
-     transform="translate(0 -286.417)"
-     id="g1166"
-     style="fill:#000000;fill-opacity:0.99637681">
-    <rect
-       ry=".545"
-       rx="0"
-       y="288.816"
-       x="2.516"
-       height="1.451"
-       width="5.551"
-       style="marker:none;fill:#000000;fill-opacity:0.99637681"
-       overflow="visible"
-       paint-order="stroke markers fill"
-       id="rect1160" />
-    <rect
-       ry=".545"
-       rx="0"
-       y="290.973"
-       x="2.516"
-       height="1.451"
-       width="5.551"
-       style="marker:none;fill:#000000;fill-opacity:0.99637681"
-       overflow="visible"
-       paint-order="stroke markers fill"
-       id="rect1162" />
-    <rect
-       ry=".545"
-       rx="0"
-       y="293.15"
-       x="2.516"
-       height="1.451"
-       width="5.551"
-       style="marker:none;fill:#000000;fill-opacity:0.99637681"
-       overflow="visible"
-       paint-order="stroke markers fill"
-       id="rect1164" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 10.583 10.583"><g color="#000" transform="matrix(.85624 0 0 .9944 .747 .03)"><g transform="matrix(1.0055 0 0 1 -.013 0)"><rect width="5.839" height=".782" x="2.372" y="2.764" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="5.839" height=".782" x="2.372" y="7.037" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></g><rect width="5.871" height=".782" x="2.372" y="4.901" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></g></svg>

img/side-menu-opener-hamburger.svg

@@ -1,91 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="40"
-   height="40"
-   viewBox="0 0 10.583 10.583"
-   version="1.1"
-   id="svg1382"
-   sodipodi:docname="side-menu-opener-hamburger.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
-  <metadata
-     id="metadata1388">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs1386" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1918"
-     inkscape:window-height="1008"
-     id="namedview1384"
-     showgrid="false"
-     inkscape:zoom="5.9"
-     inkscape:cx="108.13559"
-     inkscape:cy="3.8983051"
-     inkscape:window-x="0"
-     inkscape:window-y="41"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg1382" />
-  <g
-     color="#000"
-     fill="#fff"
-     fill-opacity=".855"
-     transform="translate(0 -286.417)"
-     id="g1380"
-     style="fill:#ffffff;fill-opacity:1">
-    <rect
-       ry=".545"
-       rx="0"
-       y="288.816"
-       x="2.516"
-       height="1.451"
-       width="5.551"
-       style="marker:none;fill:#ffffff;fill-opacity:1"
-       overflow="visible"
-       paint-order="stroke markers fill"
-       id="rect1374" />
-    <rect
-       ry=".545"
-       rx="0"
-       y="290.973"
-       x="2.516"
-       height="1.451"
-       width="5.551"
-       style="marker:none;fill:#ffffff;fill-opacity:1"
-       overflow="visible"
-       paint-order="stroke markers fill"
-       id="rect1376" />
-    <rect
-       ry=".545"
-       rx="0"
-       y="293.15"
-       x="2.516"
-       height="1.451"
-       width="5.551"
-       style="marker:none;fill:#ffffff;fill-opacity:1"
-       overflow="visible"
-       paint-order="stroke markers fill"
-       id="rect1378" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 10.583 10.583"><g fill="#fff" color="#000" transform="matrix(.85624 0 0 .9944 .747 .03)"><g transform="matrix(1.0055 0 0 1 -.013 0)"><rect width="5.839" height=".782" x="2.372" y="2.764" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="5.839" height=".782" x="2.372" y="7.037" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></g><rect width="5.871" height=".782" x="2.372" y="4.901" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></g></svg>

img/side-menu-opener.svg

@@ -1,172 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="40"
-   height="40"
-   viewBox="0 0 10.583 10.583"
-   version="1.1"
-   id="svg1321"
-   sodipodi:docname="side-menu-opener.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
-  <metadata
-     id="metadata1327">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs1325" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1918"
-     inkscape:window-height="1008"
-     id="namedview1323"
-     showgrid="false"
-     inkscape:zoom="5.9"
-     inkscape:cx="78.983051"
-     inkscape:cy="5.5932203"
-     inkscape:window-x="0"
-     inkscape:window-y="41"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg1321" />
-  <g
-     transform="translate(.3 -286.074)"
-     fill="#fff"
-     color="#000"
-     fill-opacity=".855"
-     id="g1319"
-     style="fill:#ffffff;fill-opacity:0.94565219">
-    <rect
-       ry="0"
-       rx="0"
-       y="288.474"
-       x="4.266"
-       height="1.451"
-       width="1.451"
-       style="marker:none;fill:#ffffff;fill-opacity:0.94565219"
-       overflow="visible"
-       paint-order="stroke markers fill"
-       id="rect1295" />
-    <g
-       transform="translate(-.13)"
-       id="g1301"
-       style="fill:#ffffff;fill-opacity:0.94565219">
-      <rect
-         style="marker:none;fill:#ffffff;fill-opacity:0.94565219"
-         width="1.451"
-         height="1.451"
-         x="6.445"
-         y="288.474"
-         rx="0"
-         ry="0"
-         overflow="visible"
-         paint-order="stroke markers fill"
-         id="rect1297" />
-      <rect
-         style="marker:none;fill:#ffffff;fill-opacity:0.94565219"
-         width="1.451"
-         height="1.451"
-         x="2.345"
-         y="288.474"
-         rx="0"
-         ry="0"
-         overflow="visible"
-         paint-order="stroke markers fill"
-         id="rect1299" />
-    </g>
-    <rect
-       ry="0"
-       rx="0"
-       y="290.631"
-       x="4.266"
-       height="1.451"
-       width="1.451"
-       style="marker:none;fill:#ffffff;fill-opacity:0.94565219"
-       overflow="visible"
-       paint-order="stroke markers fill"
-       id="rect1303" />
-    <g
-       transform="translate(-.13 2.157)"
-       id="g1309"
-       style="fill:#ffffff;fill-opacity:0.94565219">
-      <rect
-         style="marker:none;fill:#ffffff;fill-opacity:0.94565219"
-         width="1.451"
-         height="1.451"
-         x="6.445"
-         y="288.474"
-         rx="0"
-         ry="0"
-         overflow="visible"
-         paint-order="stroke markers fill"
-         id="rect1305" />
-      <rect
-         style="marker:none;fill:#ffffff;fill-opacity:0.94565219"
-         width="1.451"
-         height="1.451"
-         x="2.345"
-         y="288.474"
-         rx="0"
-         ry="0"
-         overflow="visible"
-         paint-order="stroke markers fill"
-         id="rect1307" />
-    </g>
-    <rect
-       ry="0"
-       rx="0"
-       y="292.808"
-       x="4.266"
-       height="1.451"
-       width="1.451"
-       style="marker:none;fill:#ffffff;fill-opacity:0.94565219"
-       overflow="visible"
-       paint-order="stroke markers fill"
-       id="rect1311" />
-    <g
-       transform="translate(-.13 4.334)"
-       id="g1317"
-       style="fill:#ffffff;fill-opacity:0.94565219">
-      <rect
-         style="marker:none;fill:#ffffff;fill-opacity:0.94565219"
-         width="1.451"
-         height="1.451"
-         x="6.445"
-         y="288.474"
-         rx="0"
-         ry="0"
-         overflow="visible"
-         paint-order="stroke markers fill"
-         id="rect1313" />
-      <rect
-         style="marker:none;fill:#ffffff;fill-opacity:0.94565219"
-         width="1.451"
-         height="1.451"
-         x="2.345"
-         y="288.474"
-         rx="0"
-         ry="0"
-         overflow="visible"
-         paint-order="stroke markers fill"
-         id="rect1315" />
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 10.583 10.583"><g fill="#fff" fill-opacity=".946" color="#000" transform="matrix(.90559 0 0 .86896 .772 -247.893)"><rect width="1.451" height="1.451" x="4.266" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><g transform="translate(-.13)"><rect width="1.451" height="1.451" x="6.445" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="1.451" height="1.451" x="2.345" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></g><rect width="1.451" height="1.451" x="4.266" y="290.631" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><g transform="translate(-.13 2.157)"><rect width="1.451" height="1.451" x="6.445" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="1.451" height="1.451" x="2.345" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></g><rect width="1.451" height="1.451" x="4.266" y="292.808" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><g transform="translate(-.13 4.334)"><rect width="1.451" height="1.451" x="6.445" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="1.451" height="1.451" x="2.345" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></g></g></svg>

lib/AppInfo/Application.php

@@ -9,6 +9,9 @@ use OCA\SideMenu\Service\AppRepository;
 use OCA\SideMenu\Service\CategoryRepository;
 use OCA\SideMenu\Service\ConfigProxy;
 use OCP\AppFramework\App;
+use OCP\AppFramework\Bootstrap\IBootContext;
+use OCP\AppFramework\Bootstrap\IBootstrap;
+use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\IUserSession;
 use OCP\Util;
 use Psr\Container\ContainerInterface;
@@ -18,7 +21,7 @@ use Psr\Container\ContainerInterface;
  *
  * @author Simon Vieille <simon@deblan.fr>
  */
-class Application extends App
+class Application extends App implements IBootstrap
 {
     public const APP_ID = 'side_menu';
 
@@ -44,16 +47,9 @@ class Application extends App
     public function __construct(array $urlParams = [])
     {
         parent::__construct(self::APP_ID, $urlParams);
-
-        $this->config = OC::$server->getConfig();
-        $this->cspnm = OC::$server->getContentSecurityPolicyNonceManager();
-        $this->user = OC::$server[IUserSession::class]->getUser();
     }
 
-    /**
-     * Checks if this app is enabled.
-     */
-    public function isEnabled(): bool
+    protected function isEnabled(): bool
     {
         $enabled = true;
         $isForced = (bool) $this->config->getAppValue(self::APP_ID, 'force', '0');
@@ -74,64 +70,65 @@ class Application extends App
         return $enabled;
     }
 
-    /**
-     * Registes services.
-     */
-    public function registerServices()
-    {
-        $container = $this->getContainer();
-
-        $container->registerService('AppRepository', function (ContainerInterface $c) {
-            return new AppRepository();
-        });
-
-        $container->registerService('CategoryRepository', function (ContainerInterface $c) {
-            return new CategoryRepository();
-        });
-
-        $container->registerService('ConfigProxy', function (ContainerInterface $c) {
-            return new ConfigProxy();
-        });
-    }
-
-    /**
-     * Registers assets.
-     */
-    public function registerAssets()
+    protected function addAssets()
     {
         Util::addScript(self::APP_ID, 'sideMenu');
         Util::addStyle(self::APP_ID, 'sideMenu');
 
-        $stylesheet = OC::$server->getURLGenerator()->linkToRoute(
-            'side_menu.Css.stylesheet',
-            [
-                'v' => $this->config->getAppValue(self::APP_ID, 'cache', '0'),
-            ]
-        );
-
-        $script = OC::$server->getURLGenerator()->linkToRoute(
-            'side_menu.Js.script',
-            [
-                'v' => $this->config->getAppValue(self::APP_ID, 'cache', '0'),
-            ]
-        );
-
-        Util::addHeader(
-            'link',
-            [
-                'href' => $stylesheet,
-                'rel' => 'stylesheet',
+        $assets = [
+            'stylesheet' => [
+                'route' => 'side_menu.Css.stylesheet',
+                'type' => 'link',
+                'route_attr' => 'href',
+                'attr' => [
+                    'rel' => 'stylesheet',
+                ],
             ],
-            ''
-        );
-
-        Util::addHeader(
-            'script',
-            [
-                'src' => $script,
-                'nonce' => $this->cspnm->getNonce(),
+            'script' => [
+                'route' => 'side_menu.Js.script',
+                'type' => 'script',
+                'route_attr' => 'src',
+                'attr' => [
+                    'nonce' => $this->cspnm->getNonce(),
+                ],
             ],
-            ''
-        );
+        ];
+
+        $cache = $this->config->getAppValue(self::APP_ID, 'cache', '0');
+
+        foreach ($assets as $value) {
+            $route = OC::$server->getURLGenerator()->linkToRoute($value['route'], ['v' => $cache]);
+            $value['attr'][$value['route_attr']] = $route;
+
+            Util::addHeader($value['type'], $value['attr'], '');
+        }
+    }
+
+    public function register(IRegistrationContext $context): void
+    {
+        $context->registerService('AppRepository', function () {
+            return new AppRepository();
+        });
+
+        $context->registerService('CategoryRepository', function () {
+            return new CategoryRepository();
+        });
+
+        $context->registerService('ConfigProxy', function () {
+            return new ConfigProxy();
+        });
+    }
+
+    public function boot(IBootContext $context): void
+    {
+        $this->config = OC::$server->getConfig();
+        $this->cspnm = OC::$server->getContentSecurityPolicyNonceManager();
+        $this->user = OC::$server[IUserSession::class]->getUser();
+
+        if (!$this->isEnabled()) {
+            return;
+        }
+
+        $this->addAssets();
     }
 }

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'
         );

lib/Controller/CssController.php

@@ -27,6 +27,8 @@ 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
 {
@@ -40,12 +42,30 @@ class CssController extends Controller
      */
     protected $user;
 
-    public function __construct(string $appName, IRequest $request, ConfigProxy $config)
+    /**
+     * @var ThemingDefaults
+     */
+    protected $theming;
+
+    /**
+     * @var Color
+     */
+    protected $color;
+
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        ConfigProxy $config,
+        ThemingDefaults $theming,
+        Color $color
+    )
     {
         parent::__construct($appName, $request);
 
         $this->user = OC::$server[IUserSession::class]->getUser();
         $this->config = $config;
+        $this->theming = $theming;
+        $this->color = $color;
     }
 
     /**
@@ -67,6 +87,7 @@ class CssController extends Controller
     {
         $isForced = $this->config->getAppValueBool('force', '0');
         $topMenuApps = $this->config->getAppValueArray('top-menu-apps', '[]');
+        $topSideMenuApps = $this->config->getAppValueArray('top-side-menu-apps', '[]');
 
         $isAccessibilityAppEnabled = $this->config->getAppValueBool('enabled', '0', 'accessibility');
         $isBreezeDarkAppEnabled = $this->config->getAppValueBool('enabled', '0', 'breezedark');
@@ -74,11 +95,16 @@ class CssController extends Controller
 
         if ($this->user) {
             $userTopMenuApps = $this->config->getUserValueArray($this->user, 'top-menu-apps', '[]');
+            $userTopSideMenuApps = $this->config->getUserValueArray($this->user, 'top-side-menu-apps', '[]');
 
             if (!empty($userTopMenuApps) && !$isForced) {
                 $topMenuApps = $userTopMenuApps;
             }
 
+            if (!empty($userTopSideMenuApps) && !$isForced) {
+                $topSideMenuApps = $userTopSideMenuApps;
+            }
+
             $isDarkThemeUserEnabled = $this->config->getUserValue($this->user, 'theme', '', 'accessibility') === 'dark';
             $isBreezeDarkUserEnabled = $this->config->getUserValue($this->user, 'theme_enabled', '', 'breezedark');
 
@@ -90,23 +116,29 @@ class CssController extends Controller
 
         $isDarkMode = ($isAccessibilityAppEnabled && $isDarkThemeUserEnabled) || ($isBreezeDarkAppEnabled && $isBreezeDarkUserEnabled);
 
+        $primaryColor = $this->theming->getColorPrimary();
+        $lightenPrimaryColor = $this->color->adjustBrightness($primaryColor, 0.2);
+        $darkenPrimaryColor = $this->color->adjustBrightness($primaryColor, -0.2);
+        $darkenPrimaryColor2 = $this->color->adjustBrightness($primaryColor, -0.3);
+        $textColor = $this->theming->getTextColorPrimary();
+
         if ($isDarkMode) {
-            $backgroundColor = $this->config->getAppValue('dark-mode-background-color', '#333333');
-            $backgroundColorTo = $this->config->getAppValue('dark-mode-background-color-to', $backgroundColor);
-            $currentAppBackgroundColor = $this->config->getAppValue('dark-mode-current-app-background-color', '#444444');
-            $loaderColor = $this->config->getAppValue('dark-mode-loader-color', '#cccccc');
-            $textColor = $this->config->getAppValue('dark-mode-text-color', '#FFFFFF');
+            $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);
+            $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);
         } else {
-            $backgroundColor = $this->config->getAppValue('background-color', '#333333');
-            $backgroundColorTo = $this->config->getAppValue('background-color-to', $backgroundColor);
-            $currentAppBackgroundColor = $this->config->getAppValue('current-app-background-color', '#444444');
-            $loaderColor = $this->config->getAppValue('loader-color', '#0e75ac');
-            $textColor = $this->config->getAppValue('text-color', '#FFFFFF');
+            $backgroundColor = $this->config->getAppValue('background-color', $darkenPrimaryColor);
+            $backgroundColorTo = $this->config->getAppValue('background-color-to', $darkenPrimaryColor);
+            $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');
@@ -136,6 +168,7 @@ class CssController extends Controller
             'always-displayed' => $this->config->getAppValueBool('always-displayed', '0'),
             'big-menu' => $this->config->getAppValueBool('big-menu', '0'),
             'top-menu-apps' => $topMenuApps,
+            'top-side-menu-apps' => $topSideMenuApps,
         ];
     }
 }

lib/Controller/JsController.php

@@ -94,6 +94,7 @@ class JsController extends Controller
     protected function getConfig(): array
     {
         $topMenuApps = $this->config->getAppValueArray('top-menu-apps', '[]');
+        $topSideMenuApps = $this->config->getAppValueArray('top-side-menu-apps', '[]');
         $targetBlankApps = $this->config->getAppValueArray('target-blank-apps', '[]');
         $useAvatar = $this->config->getAppValueBool('use-avatar', '0');
         $isForced = $this->config->getAppValueBool('force', '0');
@@ -103,11 +104,16 @@ class JsController extends Controller
 
         if ($this->user) {
             $userTopMenuApps = $this->config->getUserValueArray($this->user, 'top-menu-apps', '[]');
+            $userTopSideMenuApps = $this->config->getUserValueArray($this->user, 'top-side-menu-apps', '[]');
 
             if (!empty($userTopMenuApps) && !$isForced) {
                 $topMenuApps = $userTopMenuApps;
             }
 
+            if (!empty($userTopSideMenuApps) && !$isForced) {
+                $topSideMenuApps = $userTopSideMenuApps;
+            }
+
             $userTargetBlankMode = $this->config->getUserValueInt($this->user, 'target-blank-mode', '1');
             $userTargetBlankApps = $this->config->getUserValueArray($this->user, 'target-blank-apps', '[]');
 
@@ -157,6 +163,7 @@ class JsController extends Controller
             'big-menu-hidden-apps' => $this->config->getAppValueArray('big-menu-hidden-apps', '[]'),
             'avatar' => $avatar,
             'top-menu-apps' => $topMenuApps,
+            'top-side-menu-apps' => $topSideMenuApps,
             'target-blank-apps' => $targetBlankApps,
             'settings' => $settings,
             'logo' => $this->themingDefaults->getLogo(),

lib/Controller/NavController.php

@@ -187,9 +187,18 @@ class NavController extends Controller
 
         usort($items, function ($a, $b) use ($categoriesLabels) {
             foreach ($categoriesLabels as $key => $value) {
+                if ($a['categoryId'] === 'other') {
+                    return -1;
+                }
+
+                if ($b['categoryId'] === 'other') {
+                    return 1;
+                }
+
                 if ($a['categoryId'] === $key) {
                     return -1;
                 }
+
                 if ($b['categoryId'] === $key) {
                     return 1;
                 }

lib/Controller/PersonalSettingController.php

@@ -97,7 +97,7 @@ class PersonalSettingController extends Controller
             }
         }
 
-        if ('top-menu-apps' === $name) {
+        if (in_array($name, ['top-menu-apps', 'top-side-menu-apps'])) {
             $doSave = true;
             $data = json_decode($value, true);
 

lib/Service/AppRepository.php

@@ -21,10 +21,27 @@ class AppRepository
      */
     protected $l10nFactory;
 
-    public function __construct(\OC_App $ocApp, IFactory $l10nFactory)
+    /**
+     * @var ConfigProxy
+     */
+    protected $config;
+
+    /**
+     * @var CategoryRepository
+     */
+    protected $categoryRepository;
+
+    public function __construct(
+        \OC_App $ocApp,
+        IFactory $l10nFactory,
+        ConfigProxy $config,
+        CategoryRepository $categoryRepository
+    )
     {
         $this->ocApp = $ocApp;
         $this->l10nFactory = $l10nFactory;
+        $this->config = $config;
+        $this->categoryRepository = $categoryRepository;
     }
 
     /**
@@ -35,6 +52,8 @@ class AppRepository
     public function getVisibleApps()
     {
         $navigation = $this->ocApp->getNavigation();
+        $appCategoriesCustom = $this->config->getAppValueArray('apps-categories-custom', '[]');
+        $categories = $this->categoryRepository->getOrderedCategories();
         $apps = $this->ocApp->listAllApps();
         $visibleApps = [];
 
@@ -74,6 +93,12 @@ class AppRepository
             }
         }
 
+        foreach ($visibleApps as $id => $app) {
+            if (isset($appCategoriesCustom[$id], $categories[$appCategoriesCustom[$id]])) {
+                $visibleApps[$id]['category'] = [$appCategoriesCustom[$id]];
+            }
+        }
+
         usort($visibleApps, function ($a, $b) {
             return ($a['name'] < $b['name']) ? -1 : 1;
         });

lib/Service/CategoryRepository.php

@@ -5,6 +5,7 @@ namespace OCA\SideMenu\Service;
 use OC\App\AppStore\Fetcher\CategoryFetcher;
 use OCA\SideMenu\AppInfo\Application;
 use OCP\IConfig;
+use OCP\IUserSession;
 use OCP\L10N\IFactory;
 
 /**
@@ -34,16 +35,23 @@ class CategoryRepository
      */
     protected $iConfig;
 
+    /**
+     * @var IUserSession
+     */
+    protected $userSession;
+
     public function __construct(
         CategoryFetcher $categoryFetcher,
         ConfigProxy $config,
         IConfig $iConfig,
-        IFactory $l10nFactory
+        IFactory $l10nFactory,
+        IUserSession $userSession
     ) {
         $this->categoryFetcher = $categoryFetcher;
         $this->l10nFactory = $l10nFactory;
         $this->config = $config;
         $this->iConfig = $iConfig;
+        $this->userSession = $userSession;
     }
 
     /**
@@ -56,8 +64,8 @@ class CategoryRepository
         $currentLanguage = substr($this->l10nFactory->findLanguage(), 0, 2);
         $type = $this->config->getAppValue('categories-order-type', 'default');
         $order = $this->config->getAppValueArray('categories-order', '[]');
-
         $categoriesLabels = $this->config->getAppValueArray('cache-categories', '[]');
+        $customCategories = $this->config->getAppValueArray('categories-custom', '[]');
 
         if (empty($categoriesLabels)) {
             $categoriesLabels = $this->categoryFetcher->get();
@@ -74,6 +82,18 @@ class CategoryRepository
         $categoriesLabels['external_links'] = $this->l10nFactory->get('external')->t('External sites');
         $categoriesLabels['other'] = '';
 
+        $user = $this->userSession->getUser();
+
+        if ($user) {
+            $lang = $this->iConfig->getUserValue($user->getUid(), 'core', 'lang');
+        } else {
+            $lang = 'en';
+        }
+
+        foreach ($customCategories as $category) {
+            $categoriesLabels[$category['id']] = $category[$lang] ?? $category['en'];
+        }
+
         asort($categoriesLabels);
 
         if ('custom' === $type) {

lib/Service/Color.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace OCA\SideMenu\Service;
+
+/**
+ * class Color.
+ *
+ * @author Simon Vieille <simon@deblan.fr>
+ */
+class Color
+{
+    /**
+     * @thanks https://stackoverflow.com/posts/54393956/revision
+     */
+    public function adjustBrightness(string $hexCode, float $adjustPercent): string
+    {
+        $hexCode = ltrim($hexCode, '#');
+
+        if (3 == strlen($hexCode)) {
+            $hexCode = $hexCode[0].$hexCode[0].$hexCode[1].$hexCode[1].$hexCode[2].$hexCode[2];
+        }
+
+        $hexCode = array_map('hexdec', str_split($hexCode, 2));
+
+        foreach ($hexCode as &$color) {
+            $adjustableLimit = $adjustPercent < 0 ? $color : 255 - $color;
+            $adjustAmount = ceil($adjustableLimit * $adjustPercent);
+
+            $color = str_pad(dechex($color + $adjustAmount), 2, '0', STR_PAD_LEFT);
+        }
+
+        return '#'.implode($hexCode);
+    }
+}

lib/Service/LangRepository.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace OCA\SideMenu\Service;
+
+use OCP\IDBConnection;
+
+/**
+ * class LangRepository.
+ *
+ * @author Simon Vieille <simon@deblan.fr>
+ */
+class LangRepository
+{
+    /**
+     * @var IDBConnection
+     */
+    protected $db;
+
+    public function __construct(IDBConnection $db)
+    {
+        $this->db = $db;
+    }
+
+    public function getUsedLangs(): array
+    {
+        $qb = $this->db->getQueryBuilder();
+
+        $qb->select($qb->createFunction('DISTINCT configvalue'))
+            ->where('configkey=:configkey and appid=:appid and configvalue<>:configvalue')
+            ->setParameters([
+                'configkey' => 'lang',
+                'appid' => 'core',
+                'configvalue' => 'en',
+            ])
+            ->from('preferences')
+        ;
+
+        $stmt = $qb->execute();
+
+        $langs = ['en'];
+
+        foreach ($stmt->fetchAll() as $result) {
+            $langs[] = $result['configvalue'];
+        }
+
+        return $langs;
+    }
+}

lib/Settings/Admin.php

@@ -26,6 +26,9 @@ use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IL10N;
 use OCP\ILogger;
 use OCP\Settings\ISettings;
+use OCA\Theming\ThemingDefaults;
+use OCA\SideMenu\Service\Color;
+use OCA\SideMenu\Service\LangRepository;
 
 class Admin implements ISettings
 {
@@ -54,18 +57,39 @@ class Admin implements ISettings
      */
     private $categoryRepository;
 
+    /**
+     * @var ThemingDefaults
+     */
+    protected $theming;
+
+    /**
+     * @var Color
+     */
+    protected $color;
+
+    /**
+     * @var LangRepository
+     */
+    protected $langRepository;
+
     public function __construct(
         IL10N $l,
         ILogger $logger,
         ConfigProxy $config,
         AppRepository $appRepository,
-        CategoryRepository $categoryRepository
+        CategoryRepository $categoryRepository,
+        ThemingDefaults $theming,
+        Color $color,
+        LangRepository $langRepository
     ) {
         $this->l = $l;
         $this->logger = $logger;
         $this->config = $config;
         $this->appRepository = $appRepository;
         $this->categoryRepository = $categoryRepository;
+        $this->theming = $theming;
+        $this->color = $color;
+        $this->langRepository = $langRepository;
     }
 
     /**
@@ -73,29 +97,47 @@ class Admin implements ISettings
      */
     public function getForm()
     {
-        $backgroundColor = $this->config->getAppValue('background-color', '#333333');
-        $backgroundColorTo = $this->config->getAppValue('background-color-to', $backgroundColor);
+        $primaryColor = $this->theming->getColorPrimary();
+        $lightenPrimaryColor = $this->color->adjustBrightness($primaryColor, 0.2);
+        $darkenPrimaryColor = $this->color->adjustBrightness($primaryColor, -0.2);
+        $darkenPrimaryColor2 = $this->color->adjustBrightness($primaryColor, -0.3);
+        $textColor = $this->theming->getTextColorPrimary();
 
-        $darkModeBackgroundColor = $this->config->getAppValue('dark-mode-background-color', '#333333');
-        $darkModeBackgroundColorTo = $this->config->getAppValue('dark-mode-background-color-to', $darkModeBackgroundColor);
+        $backgroundColor = $this->config->getAppValue('background-color', $darkenPrimaryColor);
+        $backgroundColorTo = $this->config->getAppValue('background-color-to', $darkenPrimaryColor);
+
+        $darkModeBackgroundColor = $this->config->getAppValue('dark-mode-background-color', $darkenPrimaryColor);
+        $darkModeBackgroundColorTo = $this->config->getAppValue('dark-mode-background-color-to', $darkenPrimaryColor);
 
         $parameters = [
+            'defaults' => [
+                'background-color' => $darkenPrimaryColor,
+                'background-color-to' => $darkenPrimaryColor,
+                'current-app-background-color' => $darkenPrimaryColor2,
+                'text-color' => $textColor,
+                'loader-color' => $lightenPrimaryColor,
+                'dark-mode-background-color' => $darkenPrimaryColor,
+                'dark-mode-background-color-to' => $darkenPrimaryColor,
+                'dark-mode-current-app-background-color' => $darkenPrimaryColor2,
+                'dark-mode-text-color' => $textColor,
+                'dark-mode-loader-color' => $textColor,
+            ],
             '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', '#444444'),
-            'loader-color' => $this->config->getAppValue('loader-color', '#0e75ac'),
+            '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', '#FFFFFF'),
+            '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', '#444444'),
-            'dark-mode-loader-color' => $this->config->getAppValue('dark-mode-loader-color', '#cccccc'),
+            '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'),
-            'dark-mode-text-color' => $this->config->getAppValue('dark-mode-text-color', '#FFFFFF'),
+            'dark-mode-text-color' => $this->config->getAppValue('dark-mode-text-color', $textColor),
             'dark-mode-opener' => $this->config->getAppValue('dark-mode-opener', 'side-menu-opener'),
             'opener' => $this->config->getAppValue('opener', 'side-menu-opener'),
             'loader-enabled' => $this->config->getAppValue('loader-enabled', '1'),
@@ -117,11 +159,15 @@ class Admin implements ISettings
             'force' => $this->config->getAppValue('force', '0'),
             'target-blank-apps' => $this->config->getAppValueArray('target-blank-apps', '[]'),
             'top-menu-apps' => $this->config->getAppValueArray('top-menu-apps', '[]'),
+            'top-side-menu-apps' => $this->config->getAppValueArray('top-side-menu-apps', '[]'),
             'default-enabled' => $this->config->getAppValue('default-enabled', '1'),
+            'apps' => $this->appRepository->getVisibleApps(),
+            'apps-categories-custom' => $this->config->getAppValueArray('apps-categories-custom', '[]'),
             'categories-order-type' => $this->config->getAppValue('categories-order-type', 'default'),
             'categories-order' => $this->config->getAppValueArray('categories-order', '[]'),
-            'apps' => $this->appRepository->getVisibleApps(),
+            'categories-custom' => $this->config->getAppValueArray('categories-custom', '[]'),
             'categories' => $this->categoryRepository->getOrderedCategories(),
+            'langs' => $this->langRepository->getUsedLangs(),
         ];
 
         return new TemplateResponse(Application::APP_ID, 'settings/admin-form', $parameters, '');

lib/Settings/Personal.php

@@ -78,6 +78,7 @@ class Personal implements ISettings
                 $this->config->getAppValue('default-enabled', '1')
             ),
             'top-menu-apps' => $this->config->getUserValueArray($user, 'top-menu-apps', '[]'),
+            'top-side-menu-apps' => $this->config->getUserValueArray($user, 'top-side-menu-apps', '[]'),
             'target-blank-mode' => $this->config->getUserValue($user, 'target-blank-mode', '1'),
             'target-blank-apps' => $this->config->getUserValueArray($user, 'target-blank-apps', '[]'),
             'apps' => $this->appRepository->getVisibleApps(),

package.json

@@ -2,7 +2,7 @@
 	"license": "agpl",
 	"private": true,
 	"scripts": {
-		"build": "NODE_ENV=production webpack --progress --hide-modules --config webpack.js",
+		"build": "NODE_ENV=production webpack --progress --config webpack.js",
 		"dev": "NODE_ENV=development webpack --progress --config webpack.js",
 		"watch": "NODE_ENV=development webpack --progress --watch --config webpack.js",
 		"lint": "eslint --ext .js,.vue src",
@@ -11,49 +11,49 @@
 		"stylelint:fix": "stylelint src --fix"
 	},
 	"dependencies": {
-		"@nextcloud/axios": "^1.3.2",
-		"@nextcloud/vue": "^1.4.0",
-		"axios": "^0.19.2",
-		"trim": "0.0.1",
+		"@nextcloud/axios": "^1.8.0",
+		"@nextcloud/vue": "^1.5.0",
+		"axios": "^0.24.0",
+		"trim": "^1.0.1",
 		"vue": "^2.6.11"
 	},
 	"browserslist": [
 		"extends @nextcloud/browserslist-config"
 	],
 	"engines": {
-		"node": ">=10.0.0"
+		"node": ">=16.0.0"
 	},
 	"devDependencies": {
 		"@babel/core": "^7.9.0",
 		"@babel/plugin-syntax-dynamic-import": "^7.8.3",
 		"@babel/preset-env": "^7.9.0",
 		"@nextcloud/browserslist-config": "^1.0.0",
+		"@nextcloud/eslint-config": "^8.1.2",
 		"babel-eslint": "^10.1.0",
 		"babel-loader": "^8.1.0",
 		"css-loader": "^3.4.2",
-		"eslint": "^5.16.0",
-		"eslint-config-nextcloud": "0.1.1",
-		"eslint-config-standard": "^12.0.0",
+		"eslint": "^8.0.0",
+		"eslint-config-standard": "^17.0.0",
 		"eslint-import-resolver-webpack": "^0.12.1",
-		"eslint-loader": "^3.0.3",
 		"eslint-plugin-import": "^2.20.0",
 		"eslint-plugin-nextcloud": "^0.3.0",
 		"eslint-plugin-node": "^10.0.0",
-		"eslint-plugin-promise": "^4.2.1",
+		"eslint-plugin-promise": "^6.0.0",
 		"eslint-plugin-standard": "^4.0.1",
-		"eslint-plugin-vue": "^5.2.3",
+		"eslint-plugin-vue": "^9.0.0",
+		"eslint-webpack-plugin": "^3.0.0",
 		"file-loader": "^6.0.0",
-		"node-sass": "^4.13.1",
-		"sass-loader": "^8.0.2",
-		"stylelint": "^8.4.0",
-		"stylelint-config-recommended-scss": "^3.3.0",
-		"stylelint-scss": "^3.16.0",
-		"stylelint-webpack-plugin": "^0.10.5",
+		"sass": "^1.49.9",
+		"sass-loader": "^13.0.2",
+		"stylelint": "^14.0.0",
+		"stylelint-config-recommended-scss": "^7.0.0",
+		"stylelint-scss": "^4.0.0",
+		"stylelint-webpack-plugin": "^3.3.0",
 		"url-loader": "^4.0.0",
 		"vue-loader": "^15.9.1",
 		"vue-template-compiler": "^2.6.11",
-		"webpack": "^4.42.0",
-		"webpack-cli": "^3.3.11",
+		"webpack": "^5.0.0",
+		"webpack-cli": "^4.0.0",
 		"webpack-merge": "^4.2.2",
 		"webpack-node-externals": "^1.7.2"
 	}

src/AdminCategoriesCustom.vue

@@ -0,0 +1,182 @@
+<!--
+@license GNU AGPL version 3 or any later version
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+-->
+<template>
+    <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-text="item.en"></span>
+            </li>
+        </ul>
+
+        <Actions>
+	        <ActionButton @click="showAddForm" icon="icon-add"></ActionButton>
+        </Actions>
+
+		<Modal v-if="addForm" @close="hideAddForm">
+			<div class="modal__content">
+                <div v-for="lang in langs">
+                    <span class="lang" v-text="lang"></span>
+                    <input type="text" v-model="newValue[lang]" required>
+                </div>
+
+                <Actions>
+                    <ActionButton @click="saveAdd" icon="icon-checkmark"></ActionButton>
+                </Actions>
+            </div>
+		</Modal>
+
+		<Modal v-if="editForm" @close="hideEditForm">
+			<div class="modal__content">
+                <div v-for="lang in langs">
+                    <span class="lang" v-text="lang"></span>
+                    <input type="text" v-model="editValue[lang]" required>
+                </div>
+
+                <div class="pull-right">
+                    <Actions>
+                        <ActionButton @click="removeEdit" icon="icon-delete"></ActionButton>
+                    </Actions>
+                </div>
+
+                <Actions>
+                    <ActionButton @click="saveEdit" icon="icon-checkmark"></ActionButton>
+                </Actions>
+            </div>
+		</Modal>
+    </div>
+</template>
+
+<style scoped>
+    .modal__content {
+        width: 200px;
+        padding: 10px;
+    }
+
+    .modal__content .lang {
+        width: 60px;
+        display: inline-block;
+        padding: 4px;
+        box-sizing: border-box;
+    }
+
+    .modal__content input[type=text] {
+        width: calc(100% - 85px);
+        display: inline-block;
+        margin: 0;
+    }
+
+    .pull-right {
+        float: right;
+    }
+</style>
+
+<script>
+import Modal from '@nextcloud/vue/dist/Components/Modal'
+import Actions from '@nextcloud/vue/dist/Components/Actions'
+import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
+
+export default {
+    name: 'AdminCategoriesCustom',
+    components: {
+        Modal,
+        Actions,
+        ActionButton,
+    },
+    data() {
+        return {
+            input: null,
+            values: [],
+            langs: [],
+            addForm: false,
+            editForm: false,
+            newValue: {},
+            editValue: {},
+        }
+    },
+    methods: {
+        init() {
+            this.values = JSON.parse(this.input.value)
+            this.langs = JSON.parse(this.input.getAttribute('data-langs'))
+        },
+        update() {
+            this.input.value = JSON.stringify(this.values)
+        },
+        showAddForm() {
+            this.newValue = {id: 'cat' + Math.random().toString().replace('0.', '')}
+
+            this.addForm = true
+        },
+        showEditForm(value) {
+            this.editValue = {id: value.id}
+
+            for (let i of this.langs) {
+                this.editValue[i] = typeof value[i] !== 'undefined' ? value[i] : ''
+            }
+
+            this.editForm = true
+        },
+        saveAdd() {
+            for (let i of this.langs) {
+                if (!this.newValue[i] || /^\s*$/.test(this.newValue[i])) {
+                    return
+                }
+            }
+
+            this.values.push(this.newValue)
+            this.update()
+            this.hideAddForm()
+            this.newValue = {}
+        },
+        saveEdit() {
+            for (let i of this.langs) {
+                if (!this.editValue[i] || /^\s*$/.test(this.editValue[i])) {
+                    return
+                }
+            }
+
+            for (let i in this.values) {
+                if (this.values[i].id === this.editValue.id) {
+                    this.values[i] = this.editValue
+                }
+            }
+
+            this.update()
+            this.hideEditForm()
+        },
+        removeEdit() {
+            for (let i in this.values) {
+                if (this.values[i].id === this.editValue.id) {
+                    this.values.splice(i, 1);
+                }
+            }
+
+            this.update()
+            this.hideEditForm()
+        },
+        hideAddForm() {
+            this.addForm = false
+        },
+        hideEditForm() {
+            this.editForm = false
+        },
+    },
+    mounted() {
+        this.input = document.querySelector('input[name="categories-custom"]')
+        this.init()
+    }
+}
+</script>

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>
 

src/SideMenu.vue

@@ -91,16 +91,16 @@ 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-hidden') && !menuIsHidden) {
+                if (!parent.classList.contains('app-top-side-menu') && !parent.classList.contains('app-hidden') && !menuIsHidden) {
                     continue
                 }
 

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>

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
@@ -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'

src/SideMenuBigApp.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">
-            <img class="side-menu-app-icon" v-bind:src="icon"></span>
-            <span class="side-menu-app-text" v-html="label"></span>
+            <img class="side-menu-app-icon" v-bind:src="icon" v-bind:alt="label" />
+            <span class="side-menu-app-text" v-text="label"></span>
         </a>
     </li>
 </template>

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
@@ -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'

src/admin.js

@@ -15,6 +15,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import AdminCategoriesCustom from './AdminCategoriesCustom.vue'
+import Vue from 'vue'
+
+Vue.prototype.OC = window.OC
+Vue.prototype.OCA = window.OCA
+
 let elements = []
 
 const selector = '#side-menu-message'
@@ -73,17 +79,21 @@ const saveSettings = (key) => {
         ++value
     }
 
+    const progress = document.querySelector('#side-menu-save-progress')
+
+    progress.style.width = '40px';
+    progress.style.marginLeft = '5px';
+
     const callbacks = {
         success: () => {
-            OC.msg.finishedSuccess(
-                selector,
-                t('side_menu', (key + 1) + '/' + size)
-            )
+            const percent = parseInt((key + 1) * 100 / size);
 
-            if (key < size) {
+            progress.setAttribute('value', percent)
+
+            if (key < size - 1) {
                 saveSettings(key + 1)
             } else {
-                OC.msg.finishedSuccess(selector, t('side_menu', 'Saved'))
+                location.reload()
             }
         },
         error: () => {
@@ -108,7 +118,31 @@ const elementToggler = (element) => {
     element.style.display = display
 }
 
+const updateAppsCategoriesCustom = () => {
+    let values = {}
+
+    for (let item of document.querySelectorAll('.apps-categories-custom')) {
+        let app = item.getAttribute('data-app')
+        let value = item.value
+
+        if (value) {
+            values[app] = value
+        }
+    }
+
+    document.querySelector('#apps-categories-custom').value = JSON.stringify(values)
+}
+
 document.addEventListener('DOMContentLoaded', () => {
+    $('*[data-toggle="tooltip"]').tooltip();
+
+    if (document.querySelector('#side-menu-categories-custom')) {
+        const View = Vue.extend(AdminCategoriesCustom)
+        const adminCategoriesCustom = new View({})
+
+        adminCategoriesCustom.$mount('#side-menu-categories-custom')
+    }
+
     elements = document.querySelectorAll('.side-menu-setting')
 
     document.querySelector('#side-menu-save').addEventListener('click', (event) => {
@@ -118,6 +152,19 @@ document.addEventListener('DOMContentLoaded', () => {
         saveSettings(0)
     })
 
+    const resets = document.querySelectorAll('.btn-reset')
+
+    for (let btn of resets) {
+        btn.addEventListener('click', (event) => {
+            const target = event.target
+            const values = JSON.parse(target.getAttribute('data-reset'))
+
+            for (let i in values) {
+                document.querySelector(`#${i}`).value = values[i]
+            }
+        })
+    }
+
     const displays = document.querySelectorAll('.side-menu-display')
 
     for (let display of displays) {
@@ -134,6 +181,12 @@ document.addEventListener('DOMContentLoaded', () => {
         })
     }
 
+    for (let item of document.querySelectorAll('.apps-categories-custom')) {
+        item.addEventListener('change', (event) => {
+            updateAppsCategoriesCustom()
+        })
+    }
+
     for (let item of document.querySelectorAll('.side-menu-setting-live')) {
         item.addEventListener('change', (event) => {
             const target = event.target
@@ -196,6 +249,7 @@ document.addEventListener('DOMContentLoaded', () => {
             let value = []
 
             for (let item of document.querySelectorAll('#categories-list .side-menu-setting-list-item')) {
+                console.log(item.getAttribute('data-id'))
                 value.push(item.getAttribute('data-id'))
             }
 

src/l10n/fixtures/cs.yaml

@@ -3,8 +3,8 @@
 "No": "Ne"
 "Yes": "Ano"
 "Menu": "Nabídka"
-'Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.': 'Pro otevření/skrytí postranní nabídky použijte zkratku <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span>. Pro pohyb po použijte klávesu <span class="keyboard-key">tab</span>.'
-"Top menu": "Hlavní nabídka"
+'Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.': 'Pro otevření/skrytí postranní nabídky použijte zkratku <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">O</span> („O“ jako otevřít). Pro pohyb po použijte klávesu <span class="keyboard-key">Tab</span>.'
+"Top menu": "Horní nabídka"
 "Apps that not must be moved in the side menu": "Aplikace, které nepřesouvat do postranní nabídky"
 "If there is no selection then the global configuration is applied.": "Pokud neexistuje žádný výběr, je uplatněno globální nastavení."
 "Experimental": "Experimentální"
@@ -62,7 +62,7 @@
 "Export the configuration": "Exportovat nastavení"
 "Purge the cache": "Vyprázdnit mezipaměť"
 "Show the link to settings": "Zobrazit odkaz na nastavení"
-"The menu is enabled by default for users": "Nabídka je ve výchozím stavu zapnutá pro uživatele"
+"The menu is enabled by default for users": "Nabídka je ve výchozím stavu pro uživatele zapnutá"
 "Except when the configuration is forced.": "S výjimkou, kdy je nastavení vynuceno."
 "Apps that should not be displayed in the menu": "Aplikace, které by neměly být v nabídce zobrazeny"
 "This feature is only compatible with the <code>big menu</code> display.": "Tato funkce je kompatibilní pouze s <code>velkou nabídkou</ code>."
@@ -77,3 +77,16 @@
 "This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Tyto parametry jsou použity v případě, že je zapnutý (Breeze) tmavý motiv vzhledu."
 "Dark mode colors": "Barvy tmavého režimu"
 "With categories": "S kategoriemi"
+"Custom categories": "Vlastní kategorie"
+"Customize application categories": "Přizpůsobte kategorie aplikací"
+"Apps only visible in the top menu": "Aplikace jsou viditelné pouze v horní nabídce "
+"Apps visible in the top and side menus": "Aplikace viditelné v horní a boční nabídce"
+"Reset to default": "Vrátit zpět na výchozí hodnoty"
+"Hidden icon": "Skrytá ikona"
+"Small icon": "Malá ikona"
+"Normal icon": "Normální ikona"
+"Big icon": "Velká ikona"
+"Hidden text": "Skrytý text"
+"Small text": "Malý text"
+"Normal text": "Normální text"
+"Big text": "Velký text"

src/l10n/fixtures/de.yaml

@@ -77,3 +77,16 @@
 "This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Diese Optionen werden auf <code>Dark Theme</code> oder <code>Breeze Dark Theme</code> angewendet."
 "Dark mode colors": "Farben für den dunklen Modus"
 "With categories": "Mit Kategorien"
+"Custom categories": "Benutzerdefinierte Kategorien"
+"Customize application categories": "Anwendungskategorien anpassen"
+"Apps only visible in the top menu": "Apps nur im oberen Menü sichtbar "
+"Apps visible in the top and side menus": "Apps im oberen und seitlichen Menü sichtbar"
+"Reset to default": "Auf Standard zurücksetzen"
+"Hidden icon": "Verstecktes Symbol"
+"Small icon": "Kleines Symbol"
+"Normal icon": "Normales Symbol"
+"Big icon": "Große Ikone"
+"Hidden text": "Versteckter Text"
+"Small text": "Kleiner Text"
+"Normal text": "Normaler Text"
+"Big text": "Großer Text"

src/l10n/fixtures/fr.yaml

@@ -15,6 +15,14 @@
 "Small": "Petit"
 "Normal": "Normal"
 "Big": "Gros"
+"Hidden icon": "Icône masqué"
+"Small icon": "Petit icône"
+"Normal icon": "Icône normal"
+"Big icon": "Gros icône"
+"Hidden text": "Text masqué"
+"Small text": "Texte petit"
+"Normal text": "Texte normal"
+"Big text": "Gros texte"
 "Colors": "Couleurs"
 "Background color": "Couleur de fond"
 "Background color of current app": "Couleur de fond de l'application en cours"
@@ -77,3 +85,8 @@
 "This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Ces paramètres sont utilisés lorsque le thème sombre ou le thème Breeze Dark sont activés."
 "Dark mode colors": "Couleurs du mode sombre"
 "With categories": "Avec les catégories"
+"Custom categories": "Catégories personnalisées"
+"Customize application categories": "Personnaliser les catégories des applications"
+"Apps only visible in the top menu": "Applications visibles uniquement dans le menu supérieur"
+"Apps visible in the top and side menus": "Applications visibles dans le menus supérieur et latéral"
+"Reset to default": "Restaurer les valeurs par défaut"

src/l10n/fixtures/zh_CN.yaml

@@ -77,3 +77,16 @@
 "This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "此参数将应用于暗黑主题激活时。"
 "Dark mode colors": "暗黑模式颜色"
 "With categories": "有类别"
+"Custom categories": "自定义类别"
+"Customize application categories": "自定义应用程序类别"
+"Apps only visible in the top menu": "应用程序仅在顶部菜单中可见"
+"Apps visible in the top and side menus": "顶部和侧边菜单中可见的应用程序"
+"Reset to default": "重置为默认设置"
+"Hidden icon": "隐藏图标"
+"Small icon": "小图标"
+"Normal icon": "正常图标"
+"Big icon": "大图标"
+"Hidden text": "隐藏文字"
+"Small text": "小文本"
+"Normal text": "普通文本"
+"Big text": "大文本"

templates/css/stylesheet.php

@@ -8,7 +8,7 @@
     <?php endforeach; ?>
 }
 
-<?php if (empty($_['top-menu-apps'])): ?>
+<?php if (empty($_['top-menu-apps']) && empty($_['top-side-menu-apps'])): ?>
     #appmenu {
         display: none;
     }

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')

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')
@@ -52,13 +52,17 @@ const updateTopMenu = function() {
             continue
         }
 
-        if (topMenuApps.indexOf(dataId) === -1) {
+        if (topMenuApps.indexOf(dataId) === -1 && topSideMenuApps.indexOf(dataId) === -1) {
             app.classList.add('hidden')
             app.classList.add('app-hidden')
         } else {
             app.classList.remove('hidden')
             app.classList.add('app-external-site')
 
+            if (topSideMenuApps.indexOf(dataId) !== -1) {
+                app.classList.add('app-top-side-menu')
+            }
+
             appShown.push(app)
 
             navigationAppsHtml = navigationAppsHtml + app.outerHTML
@@ -67,7 +71,6 @@ const updateTopMenu = function() {
         if (targetBlankApps.indexOf(dataId) !== -1) {
             querySelector('a', app).setAttribute('target', '_blank')
         }
-
     }
 
     navigationApps.innerHTML = navigationAppsHtml
@@ -198,7 +201,7 @@ const updateTopMenu = function() {
     menuCache = menu.innerHTML + menu.nextSibling.innerHTML
 }
 
-for (let i = 0; i < 3000; i+= 100) {
+for (let i = 0; i < 4000; i+= 100) {
     setTimeout(updateTopMenu, i)
 }
 

templates/js/script.php

@@ -149,6 +149,8 @@ if ($_['always-displayed']) {
             if (a !== null) {
                 a.focus()
             }
+
+            headerMenuOpener.blur()
         })
 
         for (let opener of sideMenuOpener) {
@@ -171,6 +173,21 @@ if ($_['always-displayed']) {
                 sideMenuFocus()
             }
         })
+
+        const sideMenuObserver = new MutationObserver((e) => {
+            if (body.getAttribute('id') !== 'body-settings') {
+                return
+            }
+
+            body.classList.toggle('body-settings-side-menu', sideMenu.classList.contains('open'))
+        })
+
+        sideMenuObserver.observe(sideMenu, {
+            attributes: true,
+            attributeFilter: ['class'],
+            childList: false,
+            characterData: false
+        })
     })
 
     body.appendChild(sideMenuContainer)
@@ -186,8 +203,9 @@ if ($_['always-displayed']) {
         nextcloud.parentNode.insertBefore(sideMenuOpener, nextcloud.nextSibling)
     <?php endif; ?>
 
-    <?php if (!empty($_['top-menu-apps'])): ?>
-        const topMenuApps = <?php echo json_encode($_['top-menu-apps']); ?>
+    <?php if (!empty($_['top-menu-apps']) || !empty($_['top-side-menu-apps'])): ?>
+        const topMenuApps = <?php echo json_encode($_['top-menu-apps']), "\n"; ?>
+        const topSideMenuApps = <?php echo json_encode($_['top-side-menu-apps']); ?>
 
         <?php require_once __DIR__.'/_topMenuApps.js'; ?>
     <?php endif; ?>

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,6 +69,10 @@ $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($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>
                     <div>
                         <em>
                             <?php p($l->t('Transparent')); ?>
@@ -102,6 +108,10 @@ $choicesSizes = [
                         type="color"
                         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($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
+                        'side-menu-current-app-background-color' => $_['defaults']['current-app-background-color'],
+                    ])) ?>"></div>
                 </div>
             </div>
         </div>
@@ -118,6 +128,10 @@ $choicesSizes = [
                         type="color"
                         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($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
+                        'side-menu-text-color' => $_['defaults']['text-color'],
+                    ])) ?>"></div>
                 </div>
             </div>
         </div>
@@ -134,6 +148,10 @@ $choicesSizes = [
                         type="color"
                         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($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
+                        'side-menu-loader-color' => $_['defaults']['loader-color'],
+                    ])) ?>"></div>
                 </div>
             </div>
         </div>
@@ -227,16 +245,23 @@ $choicesSizes = [
                 </div>
                 <div class="side-menu-setting-form side-menu-setting-form-long">
                     <input
+                        id="side-menu-dark-mode-background-color"
                         name="dark-mode-background-color"
                         type="color"
                         class="side-menu-setting"
                         value="<?php print_unescaped($_['dark-mode-background-color']); ?>">
                     <input
+                        id="side-menu-dark-mode-background-color-to"
                         name="dark-mode-background-color-to"
                         type="color"
                         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($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>
+
                     <div>
                         <em>
                             <?php p($l->t('Transparent')); ?>
@@ -266,10 +291,15 @@ $choicesSizes = [
                 </div>
                 <div class="side-menu-setting-form side-menu-setting-form-long">
                     <input
+                        id="side-menu-dark-mode-current-app-background-color"
                         name="dark-mode-current-app-background-color"
                         type="color"
                         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($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>
             </div>
         </div>
@@ -281,10 +311,15 @@ $choicesSizes = [
                 </div>
                 <div class="side-menu-setting-form side-menu-setting-form-long">
                     <input
+                        id="side-menu-dark-mode-text-color"
                         name="dark-mode-text-color"
                         type="color"
                         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($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
+                        'side-menu-dark-mode-text-color' => $_['defaults']['dark-mode-text-color'],
+                    ])) ?>"></div>
                 </div>
             </div>
         </div>
@@ -296,10 +331,15 @@ $choicesSizes = [
                 </div>
                 <div class="side-menu-setting-form side-menu-setting-form-long">
                     <input
+                        id="side-menu-dark-mode-loader-color"
                         name="dark-mode-loader-color"
                         type="color"
                         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($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
+                        'side-menu-dark-mode-loader-color' => $_['defaults']['dark-mode-loader-color'],
+                    ])) ?>"></div>
                 </div>
             </div>
         </div>
@@ -497,7 +537,6 @@ $choicesSizes = [
         <div>
             <label for="side-menu-opener">
                 <?php p($l->t('Always displayed')); ?>
-                <small><span class="warning"><?php p($l->t('Experimental')); ?></span></small>
             </label>
         </div>
         <p><em><?php p($l->t('Not compatible with touch screens.')); ?></em></p>
@@ -612,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">
@@ -660,7 +699,7 @@ $choicesSizes = [
                     <select id="side-menu-size-icon" name="size-icon" class="side-menu-setting">
                         <?php foreach ($choicesSizes as $label => $value): ?>
                             <option value="<?php echo $value ?>" <?php if ($value === $_['size-icon']): ?>selected<?php endif; ?>>
-                                <?php echo $l->t($label);  ?> icon
+                                <?php echo $l->t($label.' icon');  ?>
                             </option>
                         <?php endforeach; ?>
                     </select>
@@ -668,7 +707,7 @@ $choicesSizes = [
                     <select id="side-menu-size-text" name="size-text" class="side-menu-setting">
                         <?php foreach ($choicesSizes as $label => $value): ?>
                             <option value="<?php echo $value ?>" <?php if ($value === $_['size-text']): ?>selected<?php endif; ?>>
-                                <?php echo $l->t($label);  ?> text
+                                <?php echo $l->t($label.' text'); ?>
                             </option>
                         <?php endforeach; ?>
                     </select>
@@ -681,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">
@@ -731,11 +770,11 @@ $choicesSizes = [
         <div class="side-menu-setting-table">
             <div class="side-menu-setting-row">
                 <div class="side-menu-setting-label">
-                    <?php p($l->t('Apps that not must be moved in the side menu')); ?>
+                    <?php p($l->t('Apps only visible in the top menu')); ?>
                 </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">
@@ -760,6 +799,39 @@ $choicesSizes = [
                 </div>
             </div>
         </div>
+
+        <div class="side-menu-setting-table">
+            <div class="side-menu-setting-row">
+                <div class="side-menu-setting-label">
+                    <?php p($l->t('Apps visible in the top and side menus')); ?>
+                </div>
+                <div class="side-menu-setting-form">
+                    <a class="side-menu-toggler" data-target="#top-side-menu-apps" href="#_">
+                        🖱️ <?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">
+                        <ul class="side-menu-setting-list">
+                            <?php foreach ($_['apps'] as $app): ?>
+                                <li class="side-menu-setting-list-item">
+                                    <input
+                                        type="checkbox"
+                                        name="top-side-menu-apps[]"
+                                        value="<?php echo $app['id'] ?>"
+                                        id="top-side-menu-app-<?php echo $app['id'] ?>"
+                                        <?php if (in_array($app['id'], $_['top-side-menu-apps'])): ?>checked<?php endif; ?>
+                                    />
+
+                                    <label for="top-side-menu-app-<?php echo $app['id'] ?>">
+                                        <?php echo p($l->t($app['name'])); ?>
+                                    </label>
+                                </li>
+                            <?php endforeach; ?>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+        </div>
     </div>
 
 
@@ -790,6 +862,60 @@ $choicesSizes = [
                 </div>
             </div>
 
+            <div class="side-menu-setting-row">
+                <div class="side-menu-setting-label">
+                    <?php p($l->t('Custom categories')); ?>
+                </div>
+                <div class="side-menu-setting-form">
+                    <input type="hidden" name="categories-custom" class="side-menu-setting" data-langs="<?php echo htmlentities(json_encode($langs)) ?>" value="<?php echo htmlentities(json_encode($_['categories-custom'])) ?>">
+
+                    <div id="side-menu-categories-custom">
+                    </div>
+                </div>
+            </div>
+
+            <div class="side-menu-setting-row">
+                <div class="side-menu-setting-label">
+                    <?php p($l->t('Customize application categories')); ?>
+                </div>
+                <div class="side-menu-setting-form">
+                    <a class="side-menu-toggler" data-target="#apps-categories-custom-list" href="#_">
+                        🖱️ <?php p($l->t($labelShowHideApps)); ?>
+                    </a>
+
+                    <div id="apps-categories-custom-list" style="display: none">
+                        <ul class="side-menu-setting-list">
+                            <?php foreach ($_['apps'] as $app): ?>
+                                <li class="side-menu-setting-list-item">
+                                    <label for="apps-categories-custom-<?php echo $app['id'] ?>">
+                                        <?php echo p($l->t($app['name'])); ?>
+                                    </label>
+
+                                    <br>
+
+                                    <select data-app="<?php echo $app['id'] ?>" class="apps-categories-custom">
+                                        <option value=""></option>
+
+                                        <?php foreach ($_['categories'] as $id => $category): ?>
+                                            <?php if ($category): ?>
+                                                <option
+                                                    value="<?php echo $id ?>"
+                                                    <?php if (($_['apps-categories-custom'][$app['id']] ?? '') === $id): ?>
+                                                        selected
+                                                    <?php endif; ?>
+                                                ><?php echo $category ?></option>
+                                            <?php endif; ?>
+                                        <?php endforeach; ?>
+                                    </select>
+                                </li>
+                            <?php endforeach; ?>
+                        </ul>
+                    </div>
+
+                    <input type="hidden" class="side-menu-setting" id="apps-categories-custom" name="apps-categories-custom" value="<?php echo htmlentities(json_encode($_['apps-categories-custom'])) ?>">
+                </div>
+            </div>
+
             <div class="side-menu-setting-row">
                 <div class="side-menu-setting-label">
                     <?php p($l->t('Customize sorting')); ?>
@@ -870,11 +996,10 @@ $choicesSizes = [
     <div class="section" id="more">
         <button id="side-menu-save" class="btn btn-info">
             <?php p($l->t('Save')); ?>
+            <progress max="100" value="0" id="side-menu-save-progress"></progress>
         </button>
 
-        <span id="side-menu-message" class="msg"></span>
-
-        <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>
@@ -892,7 +1017,7 @@ $choicesSizes = [
             <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>

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']): ?>
@@ -43,69 +45,73 @@ $choicesYesNo = [
                 <?php p($l->t('Menu')); ?>
             </h2>
 
-            <div>
-                <label for="side-menu-enabled">
-                    <?php p($l->t('Enable the custom menu')); ?>
-                </label>
-            </div>
-
             <p>
                 <em><?php echo $l->t('Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.'); ?></em>
             </p>
 
-            <div>
-                <select id="side-menu-enabled" name="enabled" class="side-menu-setting" data-personal>
-                    <?php foreach ($choicesYesNo as $label => $value): ?>
-                        <option value="<?php echo $value ?>" <?php if ($value === $_['enabled']): ?>selected<?php endif; ?>>
-                            <?php echo $l->t($label); ?>
-                        </option>
-                    <?php endforeach; ?>
-                </select>
-            </div>
-
-            <div>
-                <label for="side-menu-target-blank">
-                    <?php p($l->t('Open apps in new tab')); ?>
-                </label>
-            </div>
-
-            <div>
-                <?php $choices = [
-                    'Use the global setting' => '1',
-                    'Use my selection' => '2',
-                ]; ?>
-
-                <select id="side-menu-loader-enabled" name="target-blank-mode" class="side-menu-setting" data-personal>
-                    <?php foreach ($choices as $label => $value): ?>
-                        <option value="<?php echo $value ?>" <?php if ($value === $_['target-blank-mode']): ?>selected<?php endif; ?>>
-                            <?php echo $l->t($label);  ?>
-                        </option>
-                    <?php endforeach; ?>
-                </select>
-            </div>
-
-            <p>
-                <a class="side-menu-toggler" data-target="#target-blank-apps" href="#_">
-                    🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
-                </a>
-            </p>
-
-            <div class="side-menu-setting" data-name="target-blank-apps" id="target-blank-apps" data-personal data-checkbox style="display: none">
-                <?php foreach ($_['apps'] as $app): ?>
-                    <div>
-                        <input
-                            type="checkbox"
-                            name="target-blank-apps[]"
-                            value="<?php echo $app['id'] ?>"
-                            id="target-blank-app-<?php echo $app['id'] ?>"
-                            <?php if (in_array($app['id'], $_['target-blank-apps'])): ?>checked<?php endif; ?>
-                        />
-
-                        <label for="target-blank-app-<?php echo $app['id'] ?>">
-                            <?php echo p($l->t($app['name'])); ?>
-                        </label>
+            <div class="side-menu-setting-table">
+                <div class="side-menu-setting-row">
+                    <div class="side-menu-setting-label">
+                        <?php p($l->t('Enable the custom menu')); ?>
                     </div>
-                <?php endforeach; ?>
+                    <div class="side-menu-setting-form">
+                        <select id="side-menu-enabled" name="enabled" class="side-menu-setting" data-personal>
+                            <?php foreach ($choicesYesNo as $label => $value): ?>
+                                <option value="<?php echo $value ?>" <?php if ($value === $_['enabled']): ?>selected<?php endif; ?>>
+                                    <?php echo $l->t($label); ?>
+                                </option>
+                            <?php endforeach; ?>
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+            <div class="side-menu-setting-table">
+                <div class="side-menu-setting-row">
+                    <div class="side-menu-setting-label">
+                        <?php p($l->t('Open apps in new tab')); ?>
+                    </div>
+                    <div class="side-menu-setting-form">
+                        <?php $choices = [
+                            'Use the global setting' => '1',
+                            'Use my selection' => '2',
+                        ]; ?>
+
+                        <select id="side-menu-loader-enabled" name="target-blank-mode" class="side-menu-setting" data-personal>
+                            <?php foreach ($choices as $label => $value): ?>
+                                <option value="<?php echo $value ?>" <?php if ($value === $_['target-blank-mode']): ?>selected<?php endif; ?>>
+                                    <?php echo $l->t($label);  ?>
+                                </option>
+                            <?php endforeach; ?>
+                        </select>
+
+                        <p>
+                            <a class="side-menu-toggler" data-target="#target-blank-apps" href="#_">
+                                🖱️ <?php p($l->t($labelShowHideApps)); ?>
+                            </a>
+                        </p>
+
+                        <div class="side-menu-setting" data-name="target-blank-apps" id="target-blank-apps" data-personal data-checkbox style="display: none">
+                            <ul class="side-menu-setting-list">
+                                <?php foreach ($_['apps'] as $app): ?>
+                                    <li class="side-menu-setting-list-item">
+                                        <input
+                                            type="checkbox"
+                                            name="target-blank-apps[]"
+                                            value="<?php echo $app['id'] ?>"
+                                            id="target-blank-app-<?php echo $app['id'] ?>"
+                                            <?php if (in_array($app['id'], $_['target-blank-apps'])): ?>checked<?php endif; ?>
+                                        />
+
+                                        <label for="target-blank-app-<?php echo $app['id'] ?>">
+                                            <?php echo p($l->t($app['name'])); ?>
+                                        </label>
+                                    </li>
+                                <?php endforeach; ?>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
 
@@ -113,47 +119,95 @@ $choicesYesNo = [
             <h2>
                 <?php p($l->t('Top menu')); ?>
             </h2>
-            <div>
-                <label for="side-menu-top-menu-apps">
-                    <?php p($l->t('Apps that not must be moved in the side menu')); ?>
-                </label>
+
+            <div class="side-menu-setting-table">
+                <div class="side-menu-setting-row">
+                    <div class="side-menu-setting-label">
+                        <?php p($l->t('Apps only visible in the top menu')); ?>
+                        <p>
+                            <em>
+                                <?php p($l->t('If there is no selection then the global configuration is applied.')); ?>
+                            </em>
+                        </p>
+                    </div>
+                    <div class="side-menu-setting-form">
+                        <p>
+                            <a class="side-menu-toggler" data-target="#top-menu-apps" href="#_">
+                                🖱️ <?php p($l->t($labelShowHideApps)); ?>
+                            </a>
+                        </p>
+
+                        <div class="side-menu-setting" data-name="top-menu-apps" data-checkbox data-personal id="top-menu-apps" style="display: none">
+                            <ul class="side-menu-setting-list">
+                                <?php foreach ($_['apps'] as $app): ?>
+                                    <li class="side-menu-setting-list-item">
+                                        <input
+                                            type="checkbox"
+                                            name="top-menu-apps[]"
+                                            value="<?php echo $app['id'] ?>"
+                                            id="top-menu-app-<?php echo $app['id'] ?>"
+                                            <?php if (in_array($app['id'], $_['top-menu-apps'])): ?>checked<?php endif; ?>
+                                        />
+
+                                        <label for="top-menu-app-<?php echo $app['id'] ?>">
+                                            <?php echo $app['name'] ?>
+                                        </label>
+                                    </li>
+                                <?php endforeach; ?>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
             </div>
 
-            <p>
-                <em>
-                    <?php p($l->t('If there is no selection then the global configuration is applied.')); ?>
-                </em>
-            </p>
-
-            <p>
-                <a class="side-menu-toggler" data-target="#top-menu-apps" href="#_">
-                    🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
-                </a>
-            </p>
-
-            <div class="side-menu-setting" data-name="top-menu-apps" data-checkbox data-personal id="top-menu-apps" style="display: none">
-                <?php foreach ($_['apps'] as $app): ?>
-                    <div>
-                        <input
-                            type="checkbox"
-                            name="top-menu-apps[]"
-                            value="<?php echo $app['id'] ?>"
-                            id="top-menu-app-<?php echo $app['id'] ?>"
-                            <?php if (in_array($app['id'], $_['top-menu-apps'])): ?>checked<?php endif; ?>
-                        />
-
-                        <label for="top-menu-app-<?php echo $app['id'] ?>">
-                            <?php echo $app['name'] ?>
-                        </label>
+            <div class="side-menu-setting-table">
+                <div class="side-menu-setting-row">
+                    <div class="side-menu-setting-label">
+                        <?php p($l->t('Apps visible in the top and side menus')); ?>
+                        <p>
+                            <em>
+                                <?php p($l->t('If there is no selection then the global configuration is applied.')); ?>
+                            </em>
+                        </p>
                     </div>
-                <?php endforeach; ?>
+                    <div class="side-menu-setting-form">
+                        <p>
+                            <a class="side-menu-toggler" data-target="#top-side-menu-apps" href="#_">
+                                🖱️ <?php p($l->t($labelShowHideApps)); ?>
+                            </a>
+                        </p>
+
+                        <div class="side-menu-setting" data-name="top-side-menu-apps" data-checkbox data-personal id="top-side-menu-apps" style="display: none">
+                            <ul class="side-menu-setting-list">
+                                <?php foreach ($_['apps'] as $app): ?>
+                                    <li class="side-menu-setting-list-item">
+                                        <input
+                                            type="checkbox"
+                                            name="top-side-menu-apps[]"
+                                            value="<?php echo $app['id'] ?>"
+                                            id="top-side-menu-app-<?php echo $app['id'] ?>"
+                                            <?php if (in_array($app['id'], $_['top-side-menu-apps'])): ?>checked<?php endif; ?>
+                                        />
+
+                                        <label for="top-side-menu-app-<?php echo $app['id'] ?>">
+                                            <?php echo $app['name'] ?>
+                                        </label>
+                                    </li>
+                                <?php endforeach; ?>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
     <?php endif ?>
 
     <div class="section">
         <?php if (!$_['force']): ?>
-            <button id="side-menu-save" class="btn btn-primary"><?php p($l->t('Save')); ?></button>
+            <button id="side-menu-save" class="btn btn-info">
+                <?php p($l->t('Save')); ?>
+                <progress max="100" value="0" id="side-menu-save-progress"></progress>
+            </button>
 
             <span id="side-menu-message" class="msg"></span>
 
@@ -164,7 +218,7 @@ $choicesYesNo = [
             <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>