merge develop

.gitea/issue_template/ISSUE_TEMPLATE.md

@@ -9,7 +9,7 @@ labels:
 
 ### Environment
 
-* Side menu version: 
+* Custom menu version: 
 * Nextcloud version: 
 * PHP version: 
 * Web server (Nginx, Apache2): 

CHANGELOG.md

@@ -0,0 +1,190 @@
+## v1.25.0
+- add compatibility with Nextcloud 22
+- add CHANGELOG.md (fix #59)
+- update app icon
+
+## v1.24.0
+- add option to define the background opacity (fix #53)
+- add missing translations
+
+## v1.23.1
+- fix but wih dark mode opener option
+
+## v1.23.0
+- add support of dark Theme and Breeze Dark
+- add support of Nextcloud 21
+
+## v1.22.2
+- fix regression: apps does not open in new tab (fix #55)
+
+## v1.22.1
+- fix regression: apps does not open in new tab
+
+## v1.22.0
+- Add option to sort categories (fix #53)
+- Update admin UI
+
+## v1.21.0
+- [FEATURE] Logo in the menu links to main page of installation (#51)
+
+## v1.20.1
+- Fix translations
+
+## v1.20.0
+- [FEATURE] Ability to remove apps from the Big Menu (#49)
+
+## v1.19.1
+- fix #47: setting for list/grid view in files app flashes and dissapears
+
+## v1.19.0
+- add option: the menu is enabled by default for users (fix #46)
+
+## v1.18.0
+- add option to show link to settings (fix #44)
+- refactor menus using several components
+
+## v1.17.0
+- compliance with the app checker
+- add an action to export the configuration
+- add an action to purge the cache
+
+## v1.16.3
+- fix links that must be opened in new window (https://help.nextcloud.com/t/external-petit-probleme-concernant-lapplication-external-sites-ou-sites-externes/94884/11)
+
+## v1.16.2
+- fix issue with personal settings when global settings are forced
+
+## v1.16.1
+- fix #42: add cache to manage failures to access apps.nextcloud.com
+- fix #41: side menu was hover apps list
+
+## v1.16.0
+- add an option to force settings to users (fix #38)
+
+## v1.15.0
+- New name
+- Fix #36: always displayed is not expanding
+
+## v1.14.0
+- add an api accessed by components
+- add a config proxy in controllers
+- fix translations
+
+## v1.13.0
+- add an option to display the avatar instead of the logo (fix #34)
+
+## v1.12.3
+- add a delay before moving elements (fix #33)
+
+## v1.12.2
+- fix #30: `Always displayed` menu can not be close using touchscreens
+
+## v1.12.1
+- fix typo
+- fix translations
+
+## v1.12.0
+- fix #30: administrators and users can select what apps must be opened in new tab
+- fix typo
+
+## v1.11.0
+- add the option for opening apps in new tab (fix #29)
+- fix issue with the header of the always displayed menu
+
+## v1.10.0
+- add images to select the display of the menu
+- add live preview
+- update translations
+- update app info
+
+## v1.9.3
+- fix regression with logo display
+
+## v1.9.2
+- add the option “always displayed” which fixes the position of the menu to the left and always displays the application icons (fix #21, fix #2)
+
+## v1.8.6
+- add translations: `fr` and `de`
+- improve and publish the `Makefile`
+- update documentation
+
+## v1.8.5
+- fix #28: menu items invisible after 1.8.4
+
+## v1.8.4
+- fix #27: disable side menu on public pages - broken in 1.8.3
+
+## v1.8.3
+- fix alphabetic order of apps (#26)
+
+## v1.8.2
+- add icon for closing the big menu (fix #25)
+- fix hidden icons in the top menu (fix #23)
+- fix missing apps (fix #24)
+
+## v1.8.1
+- fix issue with links
+- fix missing l10n files
+
+## v1.8.0
+- add a `big menu` display (fix #22)
+- add the possibility to choose what apps are displayed in the top menu (fix #22)
+- add icon color filter
+- add icon opacity filter
+
+## v1.8.0-rc2
+
+## v1.7.0
+- add a loader when the page is unloading
+- add compatibility with Nextcloud 19
+
+## v1.6.3
+- fix #20: add a shortcut to open and to hide the menu
+
+## v1.6.2
+- fix #19: add a cache to limit flashes
+
+## v1.6.1
+- fix #19: add a hack to show external sites in the top menu with navigation
+
+## v1.6.0
+- Refactoring of javascripts
+- Add a page of personal settings
+- Add an option to disable the side menu as user
+
+## v1.5.0
+- fix #19: add option to keep external sites in the top menu
+- fix #16 #17: add dark icons and handle the svg filters
+- add option to force light icons instead of dark icons
+
+## v1.4.1
+- FIX #15: make menu start after icon
+- Rendering  harmonization  with browsers
+
+## v1.4.0
+- Fix #12: add an option to hide the opener and the panel when there is no application
+
+## v1.3.4
+- FIX #14: add option to show only the opener
+- FIX #13: add alternate hamburger icon
+- FIX #11: remove error in the console
+
+## v1.3.3
+- FIX #10: add options to select the size of the icons and the text, or hide them
+- Add a second background color to create a background gradiant
+- Update documentation
+
+## v1.3.2
+- FIX #9: opener icon not visible with multiple apps_paths
+
+## v1.3.1
+- FIX #3: Add an opition the choose the position of the opener (after or before the logo)
+- FIX #8: Remove extension of dynamic asset's routes (js, css)
+
+## v1.3.0
+-  FIX #2: add option to open the menu by hovering over opener
+- `main.js` is replaced by a controller and a template
+
+## v1.2.4
+- FIX #7: Opener icon not visible in Safari
+

Makefile

@@ -13,7 +13,7 @@ release: npm-build translations
 
 	test -d releases/$$VERSION && rm -fr releases/$$VERSION
 	mkdir -p releases/$$VERSION/side_menu
-	cp -r README.md appinfo css lib img l10n js src templates screenshots releases/$$VERSION/side_menu
+	cp -r README.md CHANGELOG.md appinfo css lib img l10n js src templates screenshots releases/$$VERSION/side_menu
 	cd releases/$$VERSION
 	zip -r side_menu_v$$VERSION.zip side_menu
 	tar cvzf side_menu_v$$VERSION.tar.gz side_menu

README.md

@@ -6,13 +6,13 @@ You can also define apps that must be displayed in the top menu. Fully customisa
 
 This application is rather suitable for instances that activate a lot of applications.
 
-Comptatible with AppOrder.
+You can customize colors depending of the theme (Dark theme and Breeze Dark). Comptatible with AppOrder.
 
 * [Installation and upgrade](#installation-and-upgrade)
 * [How to contribute?](#how-to-contribute)
 * [Screenshots](https://gitnet.fr/deblan/side_menu/src/branch/master/screenshots/)
 
-You like this app and you want to support me? [Buy me a coffee](https://www.buymeacoffee.com/deblan) ☕
+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)
 
 Requirements
 ------------

appinfo/info.xml

@@ -11,7 +11,7 @@ This application is rather suitable for instances that activate a lot of applica
 
 Use the shortcut `Ctrl`+`o` to open and to hide the side menu. Use `tab` to navigate.
 
-Comptatible with AppOrder.
+You can customize colors depending of the theme (Dark theme and Breeze Dark). Comptatible with AppOrder.
 
 You can report a bug or request a feature by opening an issue.
 
@@ -22,10 +22,11 @@ Requirements:
 
 If you like this application and if you want to support the development:
 
-* ☕ [Buy me a coffee](https://www.buymeacoffee.com/deblan)
-* 😃 [Leave a comment](https://apps.nextcloud.com/apps/side_menu#comments)
+* [Buy me a coffee](https://www.buymeacoffee.com/deblan)
+* [Donate with liberapay](https://liberapay.com/deblan)
+* [Leave a comment](https://apps.nextcloud.com/apps/side_menu#comments)
 ]]></description>
-    <version>1.20.0</version>
+    <version>1.25.0</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
     <namespace>SideMenu</namespace>
@@ -35,7 +36,7 @@ If you like this application and if you want to support the development:
     </documentation>
     <category>customization</category>
     <website>https://gitnet.fr/deblan/side_menu</website>
-    <discussion>https://matrix.to/#/!GhfQePnOSPYpYEunWM:neutralnetwork.org</discussion>
+    <discussion>https://matrix.to/#/!TFPucDATKODpHNVAtu:neutralnetwork.org?via=neutralnetwork.org</discussion>
     <bugs>https://gitnet.fr/deblan/side_menu/issues</bugs>
     <repository type="git">https://gitnet.fr/deblan/side_menu</repository>
     <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc19_default_menu.png</screenshot>
@@ -45,7 +46,7 @@ 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="18" max-version="20"/>
+        <nextcloud min-version="18" max-version="22"/>
     </dependencies>
     <settings>
         <admin>OCA\SideMenu\Settings\Admin</admin>

css/admin.css

@@ -68,3 +68,54 @@
 .side-menu-toggler {
     cursor: pointer;
 }
+
+.side-menu-setting-list {
+    margin: 10px 4px 4px 0px;
+}
+
+.side-menu-setting-list-item {
+    padding: 5px 10px;
+    border: 1px solid var(--color-border-dark);
+    max-width: 300px;
+    margin: -1px 0 0 0;
+    cursor: pointer;
+}
+
+.side-menu-setting.arrow {
+    color: #ccc;
+    padding-right: 5px;
+}
+
+.side-menu-setting-list-item input {
+    min-height: auto;
+    margin-top: -1px;
+}
+
+
+.side-menu-setting-table {
+    display: table;
+    width: 100%;
+}
+
+.side-menu-setting-row {
+    display: table;
+}
+
+.side-menu-setting-label {
+    display: table-cell;
+    width: 400px;
+    padding-right: 20px;
+}
+
+.side-menu-setting-form {
+    display: table-cell;
+    width: 300px;
+}
+
+.side-menu-setting-label-short {
+    width: 300px;
+}
+
+.side-menu-setting-form-long {
+    width: 400px;
+}

img/icon.svg

@@ -1,113 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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="37.099998mm"
-   height="37.099998mm"
-   viewBox="0 0 37.099998 37.099998"
-   version="1.1"
-   id="svg8"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   sodipodi:docname="icon.svg">
-  <defs
-     id="defs2" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8"
-     inkscape:cx="242.1839"
-     inkscape:cy="32.026866"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1918"
-     inkscape:window-height="1027"
-     inkscape:window-x="1920"
-     inkscape:window-y="21"
-     inkscape:window-maximized="0"
-     inkscape:snap-nodes="false" />
-  <metadata
-     id="metadata5">
-    <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>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-59.922223,-92.669069)">
-    <rect
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:1.46500015;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;enable-background:accumulate"
-       id="rect815-6-2-7"
-       width="34.535"
-       height="34.535"
-       x="61.204723"
-       y="93.951569"
-       rx="5.4806547"
-       ry="5.4806547" />
-    <rect
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#ececec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.46500015;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;enable-background:accumulate"
-       id="rect815-6-7"
-       width="20.357224"
-       height="33.40107"
-       x="61.677193"
-       y="94.518532"
-       rx="0"
-       ry="0" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#333333;stroke-width:3.16499996;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 66.59458,111.16177 h 9.997359"
-       id="path873-5"
-       inkscape:connector-curvature="0" />
-    <g
-       id="g1018"
-       transform="translate(2.6458333)"
-       style="stroke:#333333;stroke-opacity:1">
-      <g
-         id="g1013"
-         style="stroke:#333333;stroke-opacity:1">
-        <path
-           style="fill:none;fill-rule:evenodd;stroke:#333333;stroke-width:3.16499996;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 63.948747,103.80467 H 75.349244"
-           id="path873"
-           inkscape:connector-curvature="0" />
-        <path
-           style="fill:none;fill-rule:evenodd;stroke:#333333;stroke-width:3.16499996;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 63.948747,118.51887 H 75.349244"
-           id="path873-5-3"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <rect
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#333333;stroke-width:2.56500006;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;enable-background:accumulate"
-       id="rect815-6-2"
-       width="34.535"
-       height="34.535"
-       x="61.204723"
-       y="93.951569"
-       rx="5.4806547"
-       ry="5.4806547" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="145.889" height="145.889" viewBox="0 0 38.6 38.6"><g transform="translate(-59.172 -91.92)" stroke="#000" fill="none"><path d="M66.595 111.162h9.997M66.595 103.805h11.4m-11.4 14.714h11.4" stroke-width="3.165"/><rect width="34.535" height="34.535" x="61.205" y="93.952" overflow="visible" rx="5.481" ry="5.481" style="marker:none" color="#000" stroke-width="4.065" stroke-linecap="round" paint-order="fill markers stroke"/></g></svg>

lib/AppInfo/Application.php

@@ -6,6 +6,7 @@ use OC;
 use OC\Security\CSP\ContentSecurityPolicyNonceManager;
 use OC\User\User;
 use OCA\SideMenu\Service\AppRepository;
+use OCA\SideMenu\Service\CategoryRepository;
 use OCA\SideMenu\Service\ConfigProxy;
 use OCP\AppFramework\App;
 use OCP\IUserSession;
@@ -84,8 +85,12 @@ class Application extends App
             return new AppRepository();
         });
 
+        $container->registerService('CategoryRepository', function (ContainerInterface $c) {
+            return new CategoryRepository();
+        });
+
         $container->registerService('ConfigProxy', function (ContainerInterface $c) {
-            return new ConfigProxy($this->config);
+            return new ConfigProxy();
         });
     }
 

lib/Controller/CssController.php

@@ -65,29 +65,68 @@ class CssController extends Controller
 
     protected function getConfig(): array
     {
-        $backgroundColor = $this->config->getAppValue('background-color', '#333333');
-        $backgroundColorTo = $this->config->getAppValue('background-color-to', $backgroundColor);
         $isForced = $this->config->getAppValueBool('force', '0');
         $topMenuApps = $this->config->getAppValueArray('top-menu-apps', '[]');
 
+        $isAccessibilityAppEnabled = $this->config->getAppValueBool('enabled', '0', 'accessibility');
+        $isBreezeDarkAppEnabled = $this->config->getAppValueBool('enabled', '0', 'breezedark');
+        $isBreezeDarkGlobalEnabled = $this->config->getAppValueBool('theme_enabled', '0', 'breezedark');
+
         if ($this->user) {
             $userTopMenuApps = $this->config->getUserValueArray($this->user, 'top-menu-apps', '[]');
 
             if (!empty($userTopMenuApps) && !$isForced) {
                 $topMenuApps = $userTopMenuApps;
             }
+
+            $isDarkThemeUserEnabled = $this->config->getUserValue($this->user, 'theme', '', 'accessibility') === 'dark';
+            $isBreezeDarkUserEnabled = $this->config->getUserValue($this->user, 'theme_enabled', '', 'breezedark');
+
+            $isBreezeDarkUserEnabled = $isBreezeDarkUserEnabled === '1' || ($isBreezeDarkGlobalEnabled && $isBreezeDarkUserEnabled === '');
+        } else {
+            $isDarkThemeUserEnabled = false;
+            $isBreezeDarkUserEnabled = false;
         }
 
+        $isDarkMode = ($isAccessibilityAppEnabled && $isDarkThemeUserEnabled) || ($isBreezeDarkAppEnabled && $isBreezeDarkUserEnabled);
+
+        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');
+            $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');
+            $iconInvertFilter = abs($this->config->getAppValueInt('icon-invert-filter', '0')).'%';
+            $iconOpacity = abs($this->config->getAppValueInt('icon-opacity', '100') / 100);
+            $opener = $this->config->getAppValue('opener', 'side-menu-opener');
+
+            $backgroundOpacity = dechex($this->config->getAppValueInt('background-color-opacity', '100') * 255 / 100);
+        }
+
+        $backgroundColor .= $backgroundOpacity;
+        $backgroundColorTo .= $backgroundOpacity;
+
         return [
             'vars' => [
                 'background-color' => $backgroundColor,
                 'background-color-to' => $backgroundColorTo,
-                'current-app-background-color' => $this->config->getAppValue('current-app-background-color', '#444444'),
-                'loader-color' => $this->config->getAppValue('loader-color', '#0e75ac'),
-                'text-color' => $this->config->getAppValue('text-color', '#FFFFFF'),
-                'opener' => $this->config->getAppValue('opener', 'side-menu-opener'),
-                'icon-invert-filter' => abs($this->config->getAppValueInt('icon-invert-filter', '0')).'%',
-                'icon-opacity' => abs($this->config->getAppValueInt('icon-opacity', '100') / 100),
+                'current-app-background-color' => $currentAppBackgroundColor,
+                'loader-color' => $loaderColor,
+                'text-color' => $textColor,
+                'opener' => $opener,
+                'icon-invert-filter' => $iconInvertFilter,
+                'icon-opacity' => $iconOpacity,
             ],
             'display-logo' => $this->config->getAppValueBool('display-logo', '1'),
             'opener-only' => $this->config->getAppValueBool('opener-only', '0'),

lib/Controller/JsController.php

@@ -97,6 +97,7 @@ class JsController extends Controller
         $targetBlankApps = $this->config->getAppValueArray('target-blank-apps', '[]');
         $useAvatar = $this->config->getAppValueBool('use-avatar', '0');
         $isForced = $this->config->getAppValueBool('force', '0');
+        $addLogoLink = $this->config->getAppValueBool('add-logo-link', '1');
         $avatar = null;
         $settings = null;
 
@@ -141,6 +142,8 @@ class JsController extends Controller
             }
         }
 
+        $indexUrl = OC::$server->getURLGenerator()->linkTo('', 'index.php');
+
         return [
             'opener-position' => $this->config->getAppValue('opener-position', 'before'),
             'opener-hover' => $this->config->getAppValueBool('opener-hover', '0'),
@@ -156,6 +159,7 @@ class JsController extends Controller
             'target-blank-apps' => $targetBlankApps,
             'settings' => $settings,
             'logo' => $this->themingDefaults->getLogo(),
+            'logo-link' => $addLogoLink ? $indexUrl : null,
         ];
     }
 }

lib/Controller/NavController.php

@@ -21,13 +21,11 @@ namespace OCA\SideMenu\Controller;
 use OC;
 use OC\App\AppStore\Fetcher\CategoryFetcher;
 use OC\URLGenerator;
-use OCA\SideMenu\AppInfo\Application;
 use OCA\SideMenu\Service\AppRepository;
+use OCA\SideMenu\Service\CategoryRepository;
 use OCA\SideMenu\Service\ConfigProxy;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\JSONResponse;
-use OCP\IConfig;
-use OCP\IL10N;
 use OCP\IRequest;
 use OCP\IUserSession;
 use OCP\L10N\IFactory;
@@ -39,11 +37,6 @@ class NavController extends Controller
      */
     protected $config;
 
-    /**
-     * @var IConfig
-     */
-    protected $iConfig;
-
     /**
      * @var AppRepository
      */
@@ -67,20 +60,17 @@ class NavController extends Controller
     public function __construct(
         string $appName,
         IRequest $request,
-        IConfig $iConfig,
         ConfigProxy $config,
         AppRepository $appRepository,
-        CategoryFetcher $categoryFetcher,
+        CategoryRepository $categoryRepository,
         URLGenerator $router,
-        IL10N $trans,
         IFactory $l10nFactory
     ) {
         parent::__construct($appName, $request);
 
         $this->config = $config;
-        $this->iConfig = $iConfig;
         $this->appRepository = $appRepository;
-        $this->categoryFetcher = $categoryFetcher;
+        $this->categoryRepository = $categoryRepository;
         $this->l10nFactory = $l10nFactory;
         $this->router = $router;
     }
@@ -94,14 +84,7 @@ class NavController extends Controller
      */
     public function items()
     {
-        $apps = $this->appRepository->getVisibleApps();
-        $currentLanguage = substr($this->l10nFactory->findLanguage(), 0, 2);
-        $externalSitesInTopMenu = $this->config->getAppValueBool('external-sites-in-top-menu', '0');
-        $hiddenApps = $this->config->getAppValueArray('big-menu-hidden-apps', '[]');
         $user = OC::$server[IUserSession::class]->getUser();
-        $isForced = $this->config->getAppValueBool('force', '0');
-        $appsCategories = [];
-        $categoriesAppsCount = [];
         $items = [];
 
         if (!$user) {
@@ -110,34 +93,19 @@ class NavController extends Controller
             ]);
         }
 
-        $categoriesLabels = $this->config->getAppValueArray('cache-categories', '[]');
-
-        if (empty($categoriesLabels)) {
-            $categoriesLabels = $this->categoryFetcher->get();
-
-            $this->iConfig->setAppValue(Application::APP_ID, 'cache-categories', json_encode($categoriesLabels));
-        }
-
+        $apps = $this->appRepository->getVisibleApps();
+        $categoriesLabels = $this->categoryRepository->getOrderedCategories();
+        $hiddenApps = $this->config->getAppValueArray('big-menu-hidden-apps', '[]');
+        $isForced = $this->config->getAppValueBool('force', '0');
         $topMenuApps = $this->config->getAppValueArray('top-menu-apps', '[]');
         $userTopMenuApps = $this->config->getUserValueArray($user, 'top-menu-apps', '[]');
+        $appsCategories = [];
+        $categoriesAppsCount = [];
 
         if (!$isForced && !empty($userTopMenuApps)) {
             $topMenuApps = $userTopMenuApps;
         }
 
-        foreach ($categoriesLabels as $k => $category) {
-            $categoriesLabels[$category['id']] = $category['translations'][$currentLanguage]['name'] ?? $category['translations']['en']['name'];
-
-            unset($categoriesLabels[$k]);
-        }
-
-        $categoriesLabels['external_links'] = $this->l10nFactory->get('external')->t('External sites');
-
-        $items['other'] = [
-            'name' => '',
-            'apps' => [],
-        ];
-
         foreach ($apps as $app) {
             if (in_array($app['id'], $topMenuApps)) {
                 continue;
@@ -158,6 +126,7 @@ class NavController extends Controller
                 if (!isset($items[$category])) {
                     $items[$category] = [
                         'name' => $categoriesLabels[$category] ?? $category,
+                        'categoryId' => $category,
                         'apps' => [],
                     ];
                 }
@@ -216,8 +185,17 @@ class NavController extends Controller
             }
         }
 
-        usort($items, function ($a, $b) {
-            return ($a['name'] < $b['name']) ? -1 : 1;
+        usort($items, function ($a, $b) use ($categoriesLabels) {
+            foreach ($categoriesLabels as $key => $value) {
+                if ($a['categoryId'] === $key) {
+                    return -1;
+                }
+                if ($b['categoryId'] === $key) {
+                    return 1;
+                }
+            }
+
+            return 0;
         });
 
         return new JSONResponse([

lib/Controller/PersonalSettingController.php

@@ -18,13 +18,13 @@
 
 namespace OCA\SideMenu\Controller;
 
+use OCA\SideMenu\AppInfo\Application;
+use OCA\SideMenu\Service\ConfigProxy;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\Response;
 use OCP\IConfig;
 use OCP\IRequest;
 use OCP\IUserSession;
-use OCA\SideMenu\AppInfo\Application;
-use OCA\SideMenu\Service\ConfigProxy;
 
 class PersonalSettingController extends Controller
 {

lib/Service/CategoryRepository.php

@@ -0,0 +1,99 @@
+<?php
+
+namespace OCA\SideMenu\Service;
+
+use OC\App\AppStore\Fetcher\CategoryFetcher;
+use OCA\SideMenu\AppInfo\Application;
+use OCP\IConfig;
+use OCP\L10N\IFactory;
+
+/**
+ * class CategoryRepository.
+ *
+ * @author Simon Vieille <simon@deblan.fr>
+ */
+class CategoryRepository
+{
+    /**
+     * @var CategoryFetcher
+     */
+    protected $categoryFetcher;
+
+    /**
+     * @var IFactory
+     */
+    protected $l10nFactory;
+
+    /**
+     * @var ConfigProxy
+     */
+    protected $config;
+
+    /**
+     * @var IConfig
+     */
+    protected $iConfig;
+
+    public function __construct(
+        CategoryFetcher $categoryFetcher,
+        ConfigProxy $config,
+        IConfig $iConfig,
+        IFactory $l10nFactory
+    ) {
+        $this->categoryFetcher = $categoryFetcher;
+        $this->l10nFactory = $l10nFactory;
+        $this->config = $config;
+        $this->iConfig = $iConfig;
+    }
+
+    /**
+     * Retrieves categories.
+     *
+     * @return array
+     */
+    public function getOrderedCategories()
+    {
+        $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', '[]');
+
+        if (empty($categoriesLabels)) {
+            $categoriesLabels = $this->categoryFetcher->get();
+
+            $this->iConfig->setAppValue(Application::APP_ID, 'cache-categories', json_encode($categoriesLabels));
+        }
+
+        foreach ($categoriesLabels as $k => $category) {
+            $categoriesLabels[$category['id']] = $category['translations'][$currentLanguage]['name'] ?? $category['translations']['en']['name'];
+
+            unset($categoriesLabels[$k]);
+        }
+
+        $categoriesLabels['external_links'] = $this->l10nFactory->get('external')->t('External sites');
+        $categoriesLabels['other'] = '';
+
+        asort($categoriesLabels);
+
+        if ('custom' === $type) {
+            $ordered = [];
+
+            foreach ($order as $id) {
+                if (isset($categoriesLabels[$id])) {
+                    $ordered[$id] = $categoriesLabels[$id];
+                }
+            }
+
+            foreach ($categoriesLabels as $id => $value) {
+                if (!isset($ordered[$id])) {
+                    $ordered[$id] = $value;
+                }
+            }
+
+            $categoriesLabels = $ordered;
+        }
+
+        return $categoriesLabels;
+    }
+}

lib/Service/ConfigProxy.php

@@ -23,43 +23,47 @@ class ConfigProxy
         $this->config = $config;
     }
 
-    public function getAppValue(string $name, string $default): string
+    public function getAppValue(string $name, string $default, $appId = null): string
     {
-        return (string) $this->config->getAppValue(Application::APP_ID, $name, $default);
+        return (string) $this->config->getAppValue($appId ?? Application::APP_ID, $name, $default);
     }
 
-    public function getUserValue(User $user, string $name, string $default): string
+    public function getUserValue(User $user, string $name, string $default, $appId = null): string
     {
-        return (string) $this->config->getUserValue($user->getUid(), Application::APP_ID, $name, $default);
+        return (string) $this->config->getUserValue($user->getUid(), $appId ?? Application::APP_ID, $name, $default);
     }
 
-    public function getAppValueBool(string $name, string $default): bool
+    public function getAppValueBool(string $name, string $default, $appId = null): bool
     {
-        return (bool) $this->getAppValue($name, $default);
+        return (bool) $this->getAppValue($name, $default, $appId);
     }
 
-    public function getAppValueArray(string $name, string $default): array
+    public function getAppValueArray(string $name, string $default, $appId = null): array
     {
-        return (array) json_decode($this->getAppValue($name, $default), true);
+        return (array) json_decode($this->getAppValue($name, $default, $appId), true);
     }
 
-    public function getAppValueInt(string $name, string $default): int
+    public function getAppValueInt(string $name, string $default, $appId = null): int
     {
-        return (int) $this->getAppValue($name, $default);
+        return (int) $this->getAppValue($name, $default, $appId);
     }
 
-    public function getUserValueBool(User $user, string $name, string $default): bool
+    public function getUserValueBool(User $user, string $name, string $default, $appId = null): bool
     {
-        return (bool) $this->getUserValue($user, $name, $default);
+        return (bool) str_replace(
+            ['yes', 'no'],
+            ['1', '0'],
+            $this->getUserValue($user, $name, $default, $appId)
+        );
     }
 
-    public function getUserValueArray(User $user, string $name, string $default): array
+    public function getUserValueArray(User $user, string $name, string $default, $appId = null): array
     {
-        return (array) json_decode($this->getUserValue($user, $name, $default), true);
+        return (array) json_decode($this->getUserValue($user, $name, $default, $appId), true);
     }
 
-    public function getUserValueInt(User $user, string $name, string $default): int
+    public function getUserValueInt(User $user, string $name, string $default, $appId = null): int
     {
-        return (int) $this->getUserValue($user, $name, $default);
+        return (int) $this->getUserValue($user, $name, $default, $appId);
     }
 }

lib/Settings/Admin.php

@@ -20,6 +20,7 @@ namespace OCA\SideMenu\Settings;
 
 use OCA\SideMenu\AppInfo\Application;
 use OCA\SideMenu\Service\AppRepository;
+use OCA\SideMenu\Service\CategoryRepository;
 use OCA\SideMenu\Service\ConfigProxy;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IL10N;
@@ -48,12 +49,23 @@ class Admin implements ISettings
      */
     private $appRepository;
 
-    public function __construct(IL10N $l, ILogger $logger, ConfigProxy $config, AppRepository $appRepository)
-    {
+    /**
+     * @var CategoryRepository
+     */
+    private $categoryRepository;
+
+    public function __construct(
+        IL10N $l,
+        ILogger $logger,
+        ConfigProxy $config,
+        AppRepository $appRepository,
+        CategoryRepository $categoryRepository
+    ) {
         $this->l = $l;
         $this->logger = $logger;
         $this->config = $config;
         $this->appRepository = $appRepository;
+        $this->categoryRepository = $categoryRepository;
     }
 
     /**
@@ -64,21 +76,35 @@ class Admin implements ISettings
         $backgroundColor = $this->config->getAppValue('background-color', '#333333');
         $backgroundColorTo = $this->config->getAppValue('background-color-to', $backgroundColor);
 
+        $darkModeBackgroundColor = $this->config->getAppValue('dark-mode-background-color', '#333333');
+        $darkModeBackgroundColorTo = $this->config->getAppValue('dark-mode-background-color-to', $darkModeBackgroundColor);
+
         $parameters = [
             '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'),
             'icon-invert-filter' => $this->config->getAppValueInt('icon-invert-filter', '0'),
             'icon-opacity' => $this->config->getAppValueInt('icon-opacity', '100'),
-            'loader-enabled' => $this->config->getAppValue('loader-enabled', '1'),
             'text-color' => $this->config->getAppValue('text-color', '#FFFFFF'),
-            'cache' => $this->config->getAppValue('cache', '0'),
+            '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-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-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'),
+            'cache' => $this->config->getAppValue('cache', '0'),
             'always-displayed' => $this->config->getAppValue('always-displayed', '0'),
             'big-menu' => $this->config->getAppValue('big-menu', '0'),
             'big-menu-hidden-apps' => $this->config->getAppValueArray('big-menu-hidden-apps', '[]'),
             'display-logo' => $this->config->getAppValue('display-logo', '1'),
+            'add-logo-link' => $this->config->getAppValue('add-logo-link', '1'),
             'use-avatar' => $this->config->getAppValue('use-avatar', '0'),
             'opener-position' => $this->config->getAppValue('opener-position', 'before'),
             'opener-hover' => $this->config->getAppValue('opener-hover', '0'),
@@ -91,7 +117,10 @@ class Admin implements ISettings
             'target-blank-apps' => $this->config->getAppValueArray('target-blank-apps', '[]'),
             'top-menu-apps' => $this->config->getAppValueArray('top-menu-apps', '[]'),
             'default-enabled' => $this->config->getAppValue('default-enabled', '1'),
+            'categories-order-type' => $this->config->getAppValue('categories-order-type', 'default'),
+            'categories-order' => $this->config->getAppValueArray('categories-order', '[]'),
             'apps' => $this->appRepository->getVisibleApps(),
+            'categories' => $this->categoryRepository->getOrderedCategories(),
         ];
 
         return new TemplateResponse(Application::APP_ID, 'settings/admin-form', $parameters, '');

lib/Settings/AdminSection.php

@@ -18,10 +18,10 @@
 
 namespace OCA\SideMenu\Settings;
 
+use OCA\SideMenu\AppInfo\Application;
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\Settings\IIconSection;
-use OCA\SideMenu\AppInfo\Application;
 
 class AdminSection implements IIconSection
 {
@@ -35,10 +35,6 @@ class AdminSection implements IIconSection
      */
     private $url;
 
-    /**
-     * @param IURLGenerator $url
-     * @param IL10N $l
-     */
     public function __construct(IURLGenerator $url, IL10N $l)
     {
         $this->url = $url;
@@ -47,7 +43,7 @@ class AdminSection implements IIconSection
 
     /**
      * returns the ID of the section. It is supposed to be a lower case string,
-     * e.g. 'ldap'
+     * e.g. 'ldap'.
      *
      * @returns string
      */
@@ -69,8 +65,8 @@ class AdminSection implements IIconSection
 
     /**
      * @return int whether the form should be rather on the top or bottom of
-     * the settings navigation. The sections are arranged in ascending order of
-     * the priority values. It is required to return a value between 0 and 99.
+     *             the settings navigation. The sections are arranged in ascending order of
+     *             the priority values. It is required to return a value between 0 and 99.
      *
      * E.g.: 70
      */

lib/Settings/PersonalSection.php

@@ -18,10 +18,10 @@
 
 namespace OCA\SideMenu\Settings;
 
+use OCA\SideMenu\AppInfo\Application;
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\Settings\IIconSection;
-use OCA\SideMenu\AppInfo\Application;
 
 class PersonalSection implements IIconSection
 {
@@ -35,10 +35,6 @@ class PersonalSection implements IIconSection
      */
     private $url;
 
-    /**
-     * @param IURLGenerator $url
-     * @param IL10N $l
-     */
     public function __construct(IURLGenerator $url, IL10N $l)
     {
         $this->url = $url;
@@ -47,7 +43,7 @@ class PersonalSection implements IIconSection
 
     /**
      * returns the ID of the section. It is supposed to be a lower case string,
-     * e.g. 'ldap'
+     * e.g. 'ldap'.
      *
      * @returns string
      */
@@ -69,8 +65,8 @@ class PersonalSection implements IIconSection
 
     /**
      * @return int whether the form should be rather on the top or bottom of
-     * the settings navigation. The sections are arranged in ascending order of
-     * the priority values. It is required to return a value between 0 and 99.
+     *             the settings navigation. The sections are arranged in ascending order of
+     *             the priority values. It is required to return a value between 0 and 99.
      *
      * E.g.: 70
      */

src/Logo.vue

@@ -16,7 +16,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 -->
 <template>
     <div v-bind:class="classes">
-        <img v-bind:src="image">
+        <a v-if="link !== null" v-bind:href="link">
+            <img v-bind:src="image">
+        </a>
+        <img v-else v-bind:src="image">
     </div>
 </template>
 
@@ -28,6 +31,10 @@ export default {
             type: String,
             required: true
         },
+        link: {
+            type: String,
+            required: false
+        },
         classes: {
             type: Object,
             required: true

src/SideMenu.vue

@@ -25,8 +25,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
             <OpenerButton />
 
-            <Logo v-if="!avatar && logo" v-bind:classes="{'side-menu-logo': true, 'avatardiv': false}" v-bind:image="logo" />
-            <Logo v-if="avatar" v-bind:classes="{'side-menu-logo': true, 'avatardiv': true}" v-bind:image="avatar" />
+            <Logo
+                v-if="!avatar && logo" v-bind:classes="{'side-menu-logo': true, 'avatardiv': false}"
+                v-bind:image="logo"
+                v-bind:link="logoLink"
+            />
+
+            <Logo
+                v-if="avatar" v-bind:classes="{'side-menu-logo': true, 'avatardiv': true}"
+                v-bind:image="avatar"
+                v-bind:link="logoLink"
+            />
         </div>
 
         <ul class="side-menu-apps-list">
@@ -62,6 +71,7 @@ export default {
         return {
             apps: [],
             logo: null,
+            logoLink: null,
             avatar: null,
             forceLightIcon: false,
             targetBlankApps: [],
@@ -135,6 +145,7 @@ export default {
                     that.forceLightIcon = config['force-light-icon']
                     that.avatar = config['avatar']
                     that.logo = config['logo']
+                    that.logoLink = config['logo-link']
                     that.settings = config['settings']
                 });
         },

src/SideMenuBig.vue

@@ -43,7 +43,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
                             v-bind:icon="app.icon"
                             v-bind:label="app.name"
                             v-bind:href="app.href"
-                            v-bind:target="targetBlankApps.indexOf(app.id) !== -1 ? '_blank' : undefined"
+                            v-bind:target="targetBlankApps.indexOf(appId) !== -1 ? '_blank' : undefined"
                         />
                     </ul>
                 </div>

src/admin.js

@@ -110,6 +110,12 @@ jQuery(document).ready(() => {
         var name = target.attr('name')
         var value = target.val()
 
+        if ('background-color-opacity' === name) {
+            return $('#side-menu-background-color, #side-menu-background-color-to').trigger('change');
+        } else if ('dark-mode-background-color-opacity' === name) {
+            return $('#side-menu-dark-mode-background-color, #side-menu-dark-mode-background-color-to').trigger('change');
+        }
+
         if (name === 'opener') {
             var url = OC.generateUrl(`/apps/side_menu/img/${value}.svg`).replace('/index.php', '')
 
@@ -120,6 +126,16 @@ jQuery(document).ready(() => {
             value/=100;
         }
 
+        if (['dark-mode-background-color', 'dark-mode-background-color-to'].indexOf(name) > -1) {
+            var opacity = parseInt($('#side-menu-dark-mode-background-color-opacity').val() * 255 / 100);
+
+            value = [value, opacity.toString(16)].join('');
+        } else if (['background-color', 'background-color-to'].indexOf(name) > -1) {
+            var opacity = parseInt($('#side-menu-background-color-opacity').val() * 255 / 100);
+
+            value = [value, opacity.toString(16)].join('');
+        }
+
         document.documentElement.style.setProperty('--side-menu-' + name, value)
     })
 
@@ -129,4 +145,20 @@ jQuery(document).ready(() => {
 
         elementToggler(element)
     })
+
+    jQuery("#categories-list .side-menu-setting-list").sortable({
+		forcePlaceholderSize: true,
+		placeholder: 'placeholder',
+		stop: function (event, ui) {
+            let value = []
+
+            jQuery('#categories-list .side-menu-setting-list-item').each(function() {
+                value.push(jQuery(this).attr('data-id'))
+            });
+
+            value = JSON.stringify(value)
+
+            jQuery('input[name="categories-order"]').val(value)
+		}
+	});
 });

src/l10n/fixtures/de.yaml

@@ -64,3 +64,15 @@
 "Show the link to settings": "Zeigen Sie den Link zu den Einstellungen an"
 "The menu is enabled by default for users": "Das Menü ist standardmäßig für Benutzer aktiviert"
 "Except when the configuration is forced.": "Außer wenn die Konfiguration erzwungen wird."
+"Apps that should not be displayed in the menu": "Apps, die nicht im Menü angezeigt werden sollen"
+"This feature is only compatible with the <code>big menu</code> display.": "Kompatibel mit der Anzeige <code> Großes Menü </ code>."
+"The logo is a link to the default app": "Das Logo ist ein Link zur Standard-App"
+"Others": "Andere"
+"Categories": "Kategorien"
+"Customize sorting": "Sortierung anpassen"
+"Order by": "Sortieren nach"
+"Name": "Name"
+"Customed": "Kundenspezifisch"
+"Show and hide the list of categories": "Liste der Kategorien ein- und ausblenden"
+"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Diese Parameter werden verwendet, wenn Dark Theme oder Breeze Dark Theme aktiviert sind."
+"Dark mode colors": "Dunkle Modusfarben"

src/l10n/fixtures/fr.yaml

@@ -64,3 +64,15 @@
 "Show the link to settings": "Afficher le lien vers les paramètres"
 "The menu is enabled by default for users": "Le menu est activé par défaut pour les utilisateurs"
 "Except when the configuration is forced.": "Sauf lorsque la configuration est forcée."
+"Apps that should not be displayed in the menu": "Applications qui ne doivent pas être affichées dans le menu"
+"This feature is only compatible with the <code>big menu</code> display.": "Compatible avec l'affichage <code>Menu large</code>."
+"The logo is a link to the default app": "Le logo est un lien vers l'application par défaut"
+"Others": "Autres"
+"Categories": "Catégories"
+"Customize sorting": "Personnaliser le tri"
+"Order by": "Trier par"
+"Name": "Nom"
+"Customed": "Personnalisé"
+"Show and hide the list of categories": "Afficher et masquer la liste des catégories"
+"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"