Merge branch 'develop'

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

.gitea/issue_template/FEATURE_TEMPLATE.md

@@ -0,0 +1,16 @@
+---
+name: "New feature"
+about: "Use this template if you want to request a feature"
+title: "[FEATURE] "
+labels:
+  - enhancement
+---
+## Feature
+
+### Description
+
+...
+
+### Benefits
+
+...

.gitea/issue_template/ISSUE_TEMPLATE.md

@@ -0,0 +1,32 @@
+---
+name: "New issue"
+about: "Use this template if you have a bug"
+title: "[BUG] "
+labels:
+  - bug
+---
+## Issue
+
+### Environment
+
+* Custom menu version: 
+* Nextcloud version: 
+* PHP version: 
+* Web server (Nginx, Apache2): 
+* Web browser and version (Firefox 80, Google Chrome 74, etc): 
+
+```
+Insert your configuration here. You can export the configuration using the admin page.
+```
+
+### Steps to reproduce
+
+...
+
+### Observed Results
+
+...
+
+### Expected Results
+
+...

CHANGELOG.md

@@ -0,0 +1,265 @@
+## [Unreleased]
+
+## 1.26.0
+### Added
+- add czech translation
+
+## 1.25.2
+### Fixed
+- fix CHANGELOG
+
+## 1.25.1
+### Added
+- add PHP version as dependency
+- add chinese translation
+### Fixed
+- fix CHANGELOG
+
+## 1.25.0
+### Added
+- add compatibility with Nextcloud 22
+- add CHANGELOG.md (fix #59)
+- update app icon
+
+## 1.24.0
+### Added
+- add option to define the background opacity (fix #53)
+- add missing translations
+
+## 1.23.1
+### Fixed
+- fix but wih dark mode opener option
+
+## 1.23.0
+### Added
+- add support of dark Theme and Breeze Dark
+- add support of Nextcloud 21
+
+## 1.22.2
+### Fixed
+- fix regression: apps does not open in new tab (fix #55)
+
+## 1.22.1
+### Fixed
+- fix regression: apps does not open in new tab
+
+## 1.22.0
+### Added
+- Add option to sort categories (fix #53)
+- Update admin UI
+
+## 1.21.0
+### Added
+- [FEATURE] Logo in the menu links to main page of installation (#51)
+
+## 1.20.1
+### Fixed
+- Fix translations
+
+## 1.20.0
+### Added
+- [FEATURE] Ability to remove apps from the Big Menu (#49)
+
+## 1.19.1
+### Fixed
+- fix #47: setting for list/grid view in files app flashes and dissapears
+
+## 1.19.0
+### Added
+- add option: the menu is enabled by default for users (fix #46)
+
+## 1.18.0
+### Added
+- add option to show link to settings (fix #44)
+- refactor menus using several components
+
+## 1.17.0
+### Added
+- compliance with the app checker
+- add an action to export the configuration
+- add an action to purge the cache
+
+## 1.16.3
+### Fixed
+- 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)
+
+## 1.16.2
+### Fixed
+- fix issue with personal settings when global settings are forced
+
+## 1.16.1
+### Fixed
+- fix #42: add cache to manage failures to access apps.nextcloud.com
+- fix #41: side menu was hover apps list
+
+## 1.16.0
+### Added
+- add an option to force settings to users (fix #38)
+
+## 1.15.0
+### Changed
+- New name
+### Fixed
+- Fix #36: always displayed is not expanding
+
+## 1.14.0
+### Added
+- add an api accessed by components
+- add a config proxy in controllers
+### Fixed
+- fix translations
+
+## 1.13.0
+### Added
+- add an option to display the avatar instead of the logo (fix #34)
+
+## 1.12.3
+### Added
+- add a delay before moving elements (fix #33)
+
+## 1.12.2
+### Fixed
+- fix #30: `Always displayed` menu can not be close using touchscreens
+
+## 1.12.1
+### Fixed
+- fix typo
+- fix translations
+
+## 1.12.0
+### Fixed
+- fix #30: administrators and users can select what apps must be opened in new tab
+- fix typo
+
+## 1.11.0
+### Added
+- add the option for opening apps in new tab (fix #29)
+### Fixed
+- fix issue with the header of the always displayed menu
+
+## 1.10.0
+### Added
+- add images to select the display of the menu
+- add live preview
+- update translations
+- update app info
+
+## 1.9.3
+### Fixed
+- fix regression with logo display
+
+## 1.9.2
+### Added
+- 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)
+
+## 1.8.6
+### Added
+- add translations: `fr` and `de`
+- improve and publish the `Makefile`
+- update documentation
+
+## 1.8.5
+### Fixed
+- fix #28: menu items invisible after 1.8.4
+
+## 1.8.4
+### Fixed
+- fix #27: disable side menu on public pages - broken in 1.8.3
+
+## 1.8.3
+### Fixed
+- fix alphabetic order of apps (#26)
+
+## 1.8.2
+### Added
+- add icon for closing the big menu (fix #25)
+### Fixed
+- fix hidden icons in the top menu (fix #23)
+- fix missing apps (fix #24)
+
+## 1.8.1
+### Fixed
+- fix issue with links
+- fix missing l10n files
+
+## 1.8.0
+### Added
+- 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
+
+## 1.8.0-rc2
+
+## 1.7.0
+### Added
+- add a loader when the page is unloading
+- add compatibility with Nextcloud 19
+
+## 1.6.3
+### Fixed
+- fix #20: add a shortcut to open and to hide the menu
+
+## 1.6.2
+### Fixed
+- fix #19: add a cache to limit flashes
+
+## 1.6.1
+### Fixed
+- fix #19: add a hack to show external sites in the top menu with navigation
+
+## 1.6.0
+### Added
+- Add a page of personal settings
+- Add an option to disable the side menu as user
+- Refactoring of javascripts
+
+## 1.5.0
+### Added
+- add option to force light icons instead of dark icons
+### Fixed
+- fix #19: add option to keep external sites in the top menu
+- fix #16 #17: add dark icons and handle the svg filters
+
+## 1.4.1
+### Added
+- Rendering  harmonization with browsers
+### Fixed
+- FIX #15: make menu start after icon
+
+## 1.4.0
+### Fixed
+- Fix #12: add an option to hide the opener and the panel when there is no application
+
+## 1.3.4
+### Fixed
+- FIX #14: add option to show only the opener
+- FIX #13: add alternate hamburger icon
+- FIX #11: remove error in the console
+
+## 1.3.3
+### Added
+- Add a second background color to create a background gradiant
+- Update documentation
+### Fixed
+- FIX #10: add options to select the size of the icons and the text, or hide them
+
+## 1.3.2
+### Fixed
+- FIX #9: opener icon not visible with multiple apps_paths
+
+## 1.3.1
+### Fixed
+- 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)
+
+## 1.3.0
+### Added
+- `main.js` is replaced by a controller and a template
+### Fixed
+-  FIX #2: add option to open the menu by hovering over opener
+
+## 1.2.4
+### Fixed
+- FIX #7: Opener icon not visible in Safari
+

ISSUE_TEMPLATE.md

@@ -1,33 +0,0 @@
-## Feature
-
-### Description
-
-...
-
-### Benefits
-
-...
-
----
-
-## Issue
-
-### Environment
-
-* Side menu version: ...
-* PHP version: ...
-* Web server (Nginx, Apache2): ...
-
-### Steps to reproduce
-
-* ...
-* ...
-* ...
-
-### Observed Results
-
-...
-
-### Expected Results
-
-...

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

@@ -1,25 +1,40 @@
-🤙 Nextcloud app / Side menu 🎨
+🤙 Nextcloud app / Custom menu 🎨
 ===============================
 
-Side menu 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.
+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.
 
 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) or [Donate with liberapay](https://liberapay.com/deblan)
+
+Requirements
+------------
+
+* PHP >= 7.3
+* App `theming` enabled
+
 Installation and upgrade
 ------------------------
 
-Side menu is availabe from the app store. If you want to install it from source: go to https://gitnet.fr/deblan/side_menu/releases and download the last release (side_menu_vX.Y.Z.zip). Copy the content into `apps`.
+Custom menu is available from the app store.
+
+```
+$ cd /path/to/nextcloud
+$ php occ app:install side_menu
+```
+
+If you want to install it from source, go to https://gitnet.fr/deblan/side_menu/releases and copy the link to the last release (side_menu_vX.Y.Z.tar.gz). Then:
 
 ```
 $ cd /path/to/nextcloud/apps
-$ unzip /path/to/side_menu_vX.Y.Z.zip # tar xvf /path/to/side_menu_vX.Y.Z.tar.gz
+$ curl -sS https://gitnet.fr/attachments/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx | tar xvfz -
 ```
 
 Administrators can edit many settings using the administration page.

appinfo/info.xml

@@ -1,27 +1,42 @@
 <?xml version="1.0"?>
-<info>
+<info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance"
+      xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
     <id>side_menu</id>
-    <name>Side menu</name>
+    <name>Custom menu</name>
-    <summary>Move the top menu to the left side.</summary>
+    <summary>Modify the display of the menu.</summary>
-    <description><![CDATA[Side menu 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.
+    <description><![CDATA[Custom menu 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.
 
 This application is rather suitable for instances that activate a lot of applications.
 
 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.
 
+Requirements:
+
+* PHP >= 7.3
+* App `theming` enabled
+
+If you like this application and if you want to support the development:
+
+* [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.26.0</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
-    <version>1.9.3</version>
     <namespace>SideMenu</namespace>
+    <documentation>
+        <admin>https://gitnet.fr/deblan/side_menu/src/branch/master/README.md</admin>
+        <developer>https://gitnet.fr/deblan/side_menu/src/branch/master/README.md</developer>
+    </documentation>
     <category>customization</category>
     <website>https://gitnet.fr/deblan/side_menu</website>
-    <discussion>https://deblan.cloud/index.php/call/fffxkc7h</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>
@@ -30,12 +45,9 @@ You can report a bug or request a feature by opening an issue.
     <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc18_menu_always_displayed.png</screenshot>
     <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>
-    <documentation>
-        <admin>https://gitnet.fr/deblan/side_menu/src/branch/master/README.md</admin>
-        <developer>https://gitnet.fr/deblan/side_menu/src/branch/master/README.md</developer>
-    </documentation>
     <dependencies>
-        <nextcloud min-version="18" max-version="20"/>
+        <nextcloud min-version="18" max-version="22"/>
+        <php min-version="7.3"/>
     </dependencies>
     <settings>
         <admin>OCA\SideMenu\Settings\Admin</admin>

appinfo/routes.php

@@ -19,9 +19,12 @@
 
 return [
     'routes' => [
-		['name' => 'Css#stylesheet', 'url' => '/css/stylesheet', 'verb' => 'GET'],
+        ['name' => 'Css#stylesheet', 'url' => '/css/stylesheet', 'verb' => 'GET'],
-		['name' => 'Js#script', 'url' => '/js/script', 'verb' => 'GET'],
+        ['name' => 'Js#script', 'url' => '/js/script', 'verb' => 'GET'],
-		['name' => 'Nav#items', 'url' => '/nav/items', 'verb' => 'GET'],
+        ['name' => 'Js#config', 'url' => '/js/config', 'verb' => 'GET'],
-		['name' => 'PersonalSetting#valueSet', 'url' => '/personalSetting/valueSet', 'verb' => 'POST'],
+        ['name' => 'Nav#items', 'url' => '/nav/items', 'verb' => 'GET'],
+        ['name' => 'PersonalSetting#valueSet', 'url' => '/personalSetting/valueSet', 'verb' => 'POST'],
+        ['name' => 'AdminSetting#removeCache', 'url' => '/admin/cache/remove', 'verb' => 'GET'],
+        ['name' => 'AdminSetting#exportConfiguration', 'url' => '/admin/config/export', 'verb' => 'GET'],
     ],
 ];

bin/generate_l10n.php

@@ -1,4 +1,10 @@
 <?php
+/**
+ * Generates l10n files using Yaml.
+ *
+ * Usage:
+ *   php bin/generate_l10n.php
+ */
 
 function generateJsContent($translations)
 {

bin/import_config.php

@@ -0,0 +1,24 @@
+<?php
+/**
+ * Imports a json configuration into a sqlite database.
+ *
+ * Usage:
+ *   php bin/import_config.php /path/to/config.json /path/to/owncloud.db
+ */
+
+$configFile = $argv[1];
+$databaseFile = $argv[2];
+
+$content = file_get_contents($configFile);
+$config = json_decode($content, true);
+
+$pdo = new \Pdo(sprintf('sqlite:%s', $databaseFile));
+$stmt = $pdo->prepare('UPDATE oc_appconfig SET configvalue=:value WHERE configkey=:key and appid=:appId');
+
+foreach ($config as $key => $value) {
+    $stmt->execute([
+        'appId' => 'side_menu',
+        'key' => $key,
+        'value' => $value,
+    ]);
+}

css/admin.css

@@ -64,3 +64,58 @@
     font-size: 11px;
     font-weight: normal;
 }
+
+.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;
+}

css/sideMenu.css

@@ -37,6 +37,34 @@
     margin-left: 5px;
 }
 
+.side-menu-settings {
+    margin-right: 9px;
+    margin-top: 2px;
+    float: right;
+    line-height: 34px;
+    height: 28px;
+    display: none;
+}
+
+.side-menu-settings a {
+    color: var(--side-menu-text-color, #fff);
+    display: block;
+    padding: 4px 7px;
+}
+
+.side-menu-settings:hover a, .side-menu-settings a:active, .side-menu-settings a:focus {
+    background: var(--side-menu-current-app-background-color, #444);
+}
+
+.side-menu-settings img {
+    vertical-align: bottom;
+    margin-left: 3px;
+}
+
+#side-menu.open .side-menu-settings {
+    display: block;
+}
+
 .side-menu-opener {
     background: var(--side-menu-opener, url('../img/side-menu-opener.svg'));
     height: 40px;
@@ -175,6 +203,16 @@
     color: var(--side-menu-text-color, #fff);
 }
 
+.side-menu-loader {
+    text-align: center;
+}
+
+.side-menu-loader svg {
+    width: 38px;
+    margin: auto;
+    stroke: var(--side-menu-text-color, #fff);
+}
+
 .side-menu-big .side-menu-app-icon {
     vertical-align: middle;
     margin-top: -2px;
@@ -211,17 +249,17 @@
     display: none;
 }
 
+.side-menu-always-displayed #side-menu .side-menu-header {
+    height: 49px;
+}
+
 .side-menu-always-displayed #side-menu.open,
 .side-menu-always-displayed #side-menu.open .side-menu-apps-list,
-.side-menu-always-displayed #side-menu.open .side-menu-header,
+.side-menu-always-displayed #side-menu.open .side-menu-header {
-.side-menu-always-displayed #side-menu:hover,
-.side-menu-always-displayed #side-menu:hover .side-menu-apps-list,
-.side-menu-always-displayed #side-menu:hover .side-menu-header {
     width: 100%;
 }
 
-.side-menu-always-displayed #side-menu.open .side-menu-app-text,
+.side-menu-always-displayed #side-menu.open .side-menu-app-text {
-.side-menu-always-displayed #side-menu:hover .side-menu-app-text {
     display: inline;
 }
 

img/icon.svg

@@ -0,0 +1 @@
+<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>

img/loader.svg

@@ -0,0 +1,17 @@
+<!-- By Sam Herbert (@sherb), for everyone. More @ http://goo.gl/7AJzbL -->
+<svg width="38" height="38" viewBox="0 0 38 38" xmlns="http://www.w3.org/2000/svg" stroke="#fff">
+    <g fill="none" fill-rule="evenodd">
+        <g transform="translate(1 1)" stroke-width="2">
+            <circle stroke-opacity=".5" cx="18" cy="18" r="18"/>
+            <path d="M36 18c0-9.94-8.06-18-18-18">
+                <animateTransform
+                    attributeName="transform"
+                    type="rotate"
+                    from="0 18 18"
+                    to="360 18 18"
+                    dur="1s"
+                    repeatCount="indefinite"/>
+            </path>
+        </g>
+    </g>
+</svg>

lib/AppInfo/Application.php

@@ -6,6 +6,8 @@ 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;
 use OCP\Util;
@@ -18,6 +20,9 @@ use Psr\Container\ContainerInterface;
  */
 class Application extends App
 {
+    public const APP_ID = 'side_menu';
+
+    public const APP_NAME = 'Custom menu';
     /**
      * @var OC\AllConfig
      */
@@ -38,7 +43,7 @@ class Application extends App
      */
     public function __construct(array $urlParams = [])
     {
-        parent::__construct('side_menu', $urlParams);
+        parent::__construct(self::APP_ID, $urlParams);
 
         $this->config = OC::$server->getConfig();
         $this->cspnm = OC::$server->getContentSecurityPolicyNonceManager();
@@ -51,9 +56,19 @@ class Application extends App
     public function isEnabled(): bool
     {
         $enabled = true;
+        $isForced = (bool) $this->config->getAppValue(self::APP_ID, 'force', '0');
 
-        if (null !== $this->user) {
+        if (null !== $this->user && !$isForced) {
-            $enabled = (bool) $this->config->getUserValue($this->user->getUid(), 'side_menu', 'enabled', '1');
+            $enabled = (bool) $this->config->getUserValue(
+                $this->user->getUid(),
+                self::APP_ID,
+                'enabled',
+                $this->config->getAppValue(
+                    self::APP_ID,
+                    'default-enabled',
+                    '1'
+                )
+            );
         }
 
         return $enabled;
@@ -67,7 +82,15 @@ class Application extends App
         $container = $this->getContainer();
 
         $container->registerService('AppRepository', function (ContainerInterface $c) {
-            return new AppRepository(new OC_App());
+            return new AppRepository();
+        });
+
+        $container->registerService('CategoryRepository', function (ContainerInterface $c) {
+            return new CategoryRepository();
+        });
+
+        $container->registerService('ConfigProxy', function (ContainerInterface $c) {
+            return new ConfigProxy();
         });
     }
 
@@ -76,20 +99,20 @@ class Application extends App
      */
     public function registerAssets()
     {
-        Util::addScript('side_menu', 'sideMenu');
+        Util::addScript(self::APP_ID, 'sideMenu');
-        Util::addStyle('side_menu', 'sideMenu');
+        Util::addStyle(self::APP_ID, 'sideMenu');
 
         $stylesheet = OC::$server->getURLGenerator()->linkToRoute(
             'side_menu.Css.stylesheet',
             [
-                'v' => $this->config->getAppValue('side_menu', 'cache', '0'),
+                'v' => $this->config->getAppValue(self::APP_ID, 'cache', '0'),
             ]
         );
 
         $script = OC::$server->getURLGenerator()->linkToRoute(
             'side_menu.Js.script',
             [
-                'v' => $this->config->getAppValue('side_menu', 'cache', '0'),
+                'v' => $this->config->getAppValue(self::APP_ID, 'cache', '0'),
             ]
         );
 

lib/Controller/AdminSettingController.php

@@ -0,0 +1,92 @@
+<?php
+/**
+ * @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/>.
+ */
+
+namespace OCA\SideMenu\Controller;
+
+use OCA\SideMenu\AppInfo\Application;
+use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\DataDownloadResponse;
+use OCP\AppFramework\Http\RedirectResponse;
+use OCP\AppFramework\Http\Response;
+use OCP\IConfig;
+use OCP\IRequest;
+use OCP\IURLGenerator;
+
+class AdminSettingController extends Controller
+{
+    /**
+     * @var IConfig
+     */
+    protected $config;
+
+    /**
+     * @var IURLGenerator
+     */
+    protected $urlGenerator;
+
+    public function __construct($appName, IRequest $request, IConfig $config, IURLGenerator $urlGenerator)
+    {
+        parent::__construct($appName, $request);
+
+        $this->config = $config;
+        $this->urlGenerator = $urlGenerator;
+    }
+
+    /**
+     * @NoCSRFRequired
+     *
+     * @return RedirectResponse
+     */
+    public function removeCache()
+    {
+        $this->config->setAppValue(Application::APP_ID, 'cache-categories', '[]');
+
+        return new RedirectResponse($this->urlGenerator->linkToRoute('settings.AdminSettings.index', [
+            'section' => Application::APP_ID,
+        ]).'#more');
+    }
+
+    /**
+     * @NoCSRFRequired
+     *
+     * @return Response
+     */
+    public function exportConfiguration()
+    {
+        $keys = $this->config->getAppKeys(Application::APP_ID);
+        $config = [];
+        $excludedKeys = [
+            'cache',
+            'cache-categories',
+        ];
+
+        foreach ($keys as $key) {
+            if (in_array($key, $excludedKeys)) {
+                continue;
+            }
+
+            $config[$key] = $this->config->getAppValue(Application::APP_ID, $key);
+        }
+
+        return new DataDownloadResponse(
+            json_encode($config, JSON_PRETTY_PRINT),
+            'config.json',
+            'text/json'
+        );
+    }
+}

lib/Controller/CssController.php

@@ -19,27 +19,32 @@
 namespace OCA\SideMenu\Controller;
 
 use OC;
+use OC\User\User;
+use OCA\SideMenu\AppInfo\Application;
+use OCA\SideMenu\Service\ConfigProxy;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\Http\TemplateResponse;
-use OCP\IConfig;
 use OCP\IRequest;
 use OCP\IUserSession;
 
 class CssController extends Controller
 {
     /**
-     * @var \OCP\IConfig
+     * @var ConfigProxy
      */
     protected $config;
 
     /**
-     * @param string $appName
+     * @var User
      */
-    public function __construct($appName, IRequest $request, IConfig $config)
+    protected $user;
+
+    public function __construct(string $appName, IRequest $request, ConfigProxy $config)
     {
         parent::__construct($appName, $request);
 
+        $this->user = OC::$server[IUserSession::class]->getUser();
         $this->config = $config;
     }
 
@@ -52,44 +57,85 @@ class CssController extends Controller
      */
     public function stylesheet()
     {
-        $backgroundColor = $this->config->getAppValue('side_menu', 'background-color', '#333333');
+        $response = new TemplateResponse(Application::APP_ID, 'css/stylesheet', $this->getConfig(), 'blank');
-        $backgroundColorTo = $this->config->getAppValue('side_menu', 'background-color-to', $backgroundColor);
-
-        $user = OC::$server[IUserSession::class]->getUser();
-        $topMenuApps = (array) json_decode($this->config->getAppValue('side_menu', 'top-menu-apps', '[]'), true);
-
-        if ($user) {
-            $userTopMenuApps = (array) json_decode($this->config->getUserValue($user->getUid(), 'side_menu', 'top-menu-apps', '[]'), true);
-
-            if (!empty($userTopMenuApps)) {
-                $topMenuApps = $userTopMenuApps;
-            }
-        }
-
-        $parameters = [
-            'vars' => [
-                'background-color' => $backgroundColor,
-                'background-color-to' => $backgroundColorTo,
-                'current-app-background-color' => $this->config->getAppValue('side_menu', 'current-app-background-color', '#444444'),
-                'loader-color' => $this->config->getAppValue('side_menu', 'loader-color', '#0e75ac'),
-                'text-color' => $this->config->getAppValue('side_menu', 'text-color', '#FFFFFF'),
-                'opener' => $this->config->getAppValue('side_menu', 'opener', 'side-menu-opener'),
-                'icon-invert-filter' => abs((int) $this->config->getAppValue('side_menu', 'icon-invert-filter', '0')).'%',
-                'icon-opacity' => abs((int) $this->config->getAppValue('side_menu', 'icon-opacity', '100') / 100),
-            ],
-            'display-logo' => (bool) $this->config->getAppValue('side_menu', 'display-logo', 1),
-            'opener-only' => (bool) $this->config->getAppValue('side_menu', 'opener-only', 0),
-            'external-sites-in-top-menu' => (bool) $this->config->getAppValue('side_menu', 'external-sites-in-top-menu', 0),
-            'size-icon' => $this->config->getAppValue('side_menu', 'size-icon', 'normal'),
-            'size-text' => $this->config->getAppValue('side_menu', 'size-text', 'normal'),
-            'always-displayed' => (bool) $this->config->getAppValue('side_menu', 'always-displayed', '0'),
-            'big-menu' => (bool) $this->config->getAppValue('side_menu', 'big-menu', '0'),
-            'top-menu-apps' => $topMenuApps,
-        ];
-
-        $response = new TemplateResponse('side_menu', 'css/stylesheet', $parameters, 'blank');
         $response->addHeader('Content-Type', 'text/css');
 
         return $response;
     }
+
+    protected function getConfig(): array
+    {
+        $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' => $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'),
+            'external-sites-in-top-menu' => $this->config->getAppValueBool('external-sites-in-top-menu', '0'),
+            'size-icon' => $this->config->getAppValue('size-icon', 'normal'),
+            'size-text' => $this->config->getAppValue('size-text', 'normal'),
+            'always-displayed' => $this->config->getAppValueBool('always-displayed', '0'),
+            'big-menu' => $this->config->getAppValueBool('big-menu', '0'),
+            'top-menu-apps' => $topMenuApps,
+        ];
+    }
 }

lib/Controller/JsController.php

@@ -19,65 +19,147 @@
 namespace OCA\SideMenu\Controller;
 
 use OC;
+use OC\User\User;
+use OCA\SideMenu\AppInfo\Application;
+use OCA\SideMenu\Service\ConfigProxy;
+use OCA\Theming\ThemingDefaults;
 use OCP\AppFramework\Controller;
-use OCP\AppFramework\Http\Response;
+use OCP\AppFramework\Http\JSONResponse;
 use OCP\AppFramework\Http\TemplateResponse;
-use OCP\IConfig;
 use OCP\IRequest;
 use OCP\IUserSession;
+use OCP\L10N\IFactory;
 
 class JsController extends Controller
 {
     /**
-     * @var \OCP\IConfig
+     * @var ConfigProxy
      */
     protected $config;
 
     /**
-     * @param string $appName
+     * @var User
      */
-    public function __construct($appName, IRequest $request, IConfig $config)
+    protected $user;
-    {
+
+    /**
+     * @var ThemingDefaults
+     */
+    protected $themingDefaults;
+
+    /**
+     * @var IFactory
+     */
+    protected $l10nFactory;
+
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        ConfigProxy $config,
+        ThemingDefaults $themingDefaults,
+        IFactory $l10nFactory
+    ) {
         parent::__construct($appName, $request);
 
+        $this->themingDefaults = $themingDefaults;
+
+        $this->user = OC::$server[IUserSession::class]->getUser();
         $this->config = $config;
+        $this->l10nFactory = $l10nFactory;
     }
 
     /**
      * @NoAdminRequired
      * @NoCSRFRequired
      * @PublicPage
-     *
-     * @return Response
      */
-    public function script()
+    public function script(): TemplateResponse
     {
-        $user = OC::$server[IUserSession::class]->getUser();
+        $response = new TemplateResponse(Application::APP_ID, 'js/script', $this->getConfig(), 'blank');
-        $topMenuApps = (array) json_decode($this->config->getAppValue('side_menu', 'top-menu-apps', '[]'), true);
-
-        if ($user) {
-            $userTopMenuApps = (array) json_decode($this->config->getUserValue($user->getUid(), 'side_menu', 'top-menu-apps', '[]'), true);
-
-            if (!empty($userTopMenuApps)) {
-                $topMenuApps = $userTopMenuApps;
-            }
-        }
-
-        $parameters = [
-            'opener-position' => $this->config->getAppValue('side_menu', 'opener-position', 'before'),
-            'opener-hover' => (bool) $this->config->getAppValue('side_menu', 'opener-hover', '0'),
-            'external-sites-in-top-menu' => (bool) $this->config->getAppValue('side_menu', 'external-sites-in-top-menu', 0),
-            'force-light-icon' => (bool) $this->config->getAppValue('side_menu', 'force-light-icon', '0'),
-            'hide-when-no-apps' => (bool) $this->config->getAppValue('side_menu', 'hide-when-no-apps', '0'),
-            'loader-enabled' => (bool) $this->config->getAppValue('side_menu', 'loader-enabled', '1'),
-            'always-displayed' => (bool) $this->config->getAppValue('side_menu', 'always-displayed', '0'),
-            'big-menu' => (bool) $this->config->getAppValue('side_menu', 'big-menu', '0'),
-            'top-menu-apps' => $topMenuApps,
-        ];
-
-        $response = new TemplateResponse('side_menu', 'js/script', $parameters, 'blank');
         $response->addHeader('Content-Type', 'text/javascript');
 
         return $response;
     }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @PublicPage
+     */
+    public function config(): JSONResponse
+    {
+        return new JSONResponse($this->getConfig());
+    }
+
+    protected function getConfig(): array
+    {
+        $topMenuApps = $this->config->getAppValueArray('top-menu-apps', '[]');
+        $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;
+
+        if ($this->user) {
+            $userTopMenuApps = $this->config->getUserValueArray($this->user, 'top-menu-apps', '[]');
+
+            if (!empty($userTopMenuApps) && !$isForced) {
+                $topMenuApps = $userTopMenuApps;
+            }
+
+            $userTargetBlankMode = $this->config->getUserValueInt($this->user, 'target-blank-mode', '1');
+            $userTargetBlankApps = $this->config->getUserValueArray($this->user, 'target-blank-apps', '[]');
+
+            if (2 === $userTargetBlankMode && !$isForced) {
+                $targetBlankApps = $userTargetBlankApps;
+            }
+
+            $isAvatarSet = OC::$server->getAvatarManager()->getAvatar($this->user->getUid())->exists();
+
+            if ($useAvatar && $isAvatarSet) {
+                $avatar = OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', [
+                    'userId' => $this->user->getUid(),
+                    'size' => 128,
+                    'v' => $this->config->getUserValueInt($this->user, 'avatar', 'version', 0),
+                ]);
+            }
+
+            if ($this->config->getAppValueBool('show-settings', '0')) {
+                $settingsNav = OC::$server->getNavigationManager()->getAll('settings');
+
+                if (isset($settingsNav['settings'])) {
+                    $settings = [
+                        'href' => $settingsNav['settings']['href'],
+                        'name' => $settingsNav['settings']['name'],
+                        'avatar' => OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', [
+                            'userId' => $this->user->getUid(),
+                            'size' => 32,
+                            'v' => $this->config->getUserValueInt($this->user, 'avatar', 'version', 0),
+                        ]),
+                    ];
+                }
+            }
+        }
+
+        $indexUrl = OC::$server->getURLGenerator()->linkTo('', 'index.php');
+
+        return [
+            'opener-position' => $this->config->getAppValue('opener-position', 'before'),
+            'opener-hover' => $this->config->getAppValueBool('opener-hover', '0'),
+            'external-sites-in-top-menu' => $this->config->getAppValueBool('external-sites-in-top-menu', '0'),
+            'force-light-icon' => $this->config->getAppValueBool('force-light-icon', '0'),
+            'hide-when-no-apps' => $this->config->getAppValueBool('hide-when-no-apps', '0'),
+            'loader-enabled' => $this->config->getAppValueBool('loader-enabled', '1'),
+            'always-displayed' => $this->config->getAppValueBool('always-displayed', '0'),
+            'big-menu' => $this->config->getAppValueBool('big-menu', '0'),
+            'big-menu-hidden-apps' => $this->config->getAppValueArray('big-menu-hidden-apps', '[]'),
+            'avatar' => $avatar,
+            'top-menu-apps' => $topMenuApps,
+            'target-blank-apps' => $targetBlankApps,
+            'settings' => $settings,
+            'logo' => $this->themingDefaults->getLogo(),
+            'logo-link' => $addLogoLink ? $indexUrl : null,
+        ];
+    }
 }

lib/Controller/NavController.php

@@ -22,10 +22,10 @@ use OC;
 use OC\App\AppStore\Fetcher\CategoryFetcher;
 use OC\URLGenerator;
 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;
@@ -33,7 +33,7 @@ use OCP\L10N\IFactory;
 class NavController extends Controller
 {
     /**
-     * @var IConfig
+     * @var ConfigProxy
      */
     protected $config;
 
@@ -57,24 +57,20 @@ class NavController extends Controller
      */
     protected $router;
 
-    /**
-     * @param string $appName
-     */
     public function __construct(
-        $appName,
+        string $appName,
         IRequest $request,
-        IConfig $config,
+        ConfigProxy $config,
         AppRepository $appRepository,
-        CategoryFetcher $categoryFetcher,
+        CategoryRepository $categoryRepository,
         URLGenerator $router,
-        IL10N $trans,
+        IFactory $l10nFactory
-        IFactory $l10nFactory)
+    ) {
-    {
         parent::__construct($appName, $request);
 
         $this->config = $config;
         $this->appRepository = $appRepository;
-        $this->categoryFetcher = $categoryFetcher;
+        $this->categoryRepository = $categoryRepository;
         $this->l10nFactory = $l10nFactory;
         $this->router = $router;
     }
@@ -88,13 +84,7 @@ class NavController extends Controller
      */
     public function items()
     {
-        $apps = $this->appRepository->getVisibleApps();
-        $currentLanguage = substr($this->l10nFactory->findLanguage(), 0, 2);
-        $categoriesLabels = $this->categoryFetcher->get();
-        $externalSitesInTopMenu = (bool) $this->config->getAppValue('side_menu', 'external-sites-in-top-menu', 0);
         $user = OC::$server[IUserSession::class]->getUser();
-        $appsCategories = [];
-        $categoriesAppsCount = [];
         $items = [];
 
         if (!$user) {
@@ -103,31 +93,28 @@ class NavController extends Controller
             ]);
         }
 
-        $topMenuApps = (array) json_decode($this->config->getAppValue('side_menu', 'top-menu-apps', '[]'), true);
+        $apps = $this->appRepository->getVisibleApps();
-        $userTopMenuApps = (array) json_decode($this->config->getUserValue($user->getUid(), 'side_menu', 'top-menu-apps', '[]'), true);
+        $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 (!empty($userTopMenuApps)) {
+        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;
             }
 
+            if (in_array($app['id'], $hiddenApps)) {
+                continue;
+            }
+
             $categories = (array) $app['category'];
             $appsCategories[$app['id']] = [];
 
@@ -138,7 +125,8 @@ class NavController extends Controller
             foreach ($categories as $category) {
                 if (!isset($items[$category])) {
                     $items[$category] = [
-                        'name' => $categoriesLabels[$category],
+                        'name' => $categoriesLabels[$category] ?? $category,
+                        'categoryId' => $category,
                         'apps' => [],
                     ];
                 }
@@ -197,8 +185,17 @@ class NavController extends Controller
             }
         }
 
-        usort($items, function ($a, $b) {
+        usort($items, function ($a, $b) use ($categoriesLabels) {
-            return ($a['name'] < $b['name']) ? -1 : 1;
+            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,6 +18,8 @@
 
 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;
@@ -27,20 +29,26 @@ use OCP\IUserSession;
 class PersonalSettingController extends Controller
 {
     /**
-     * @var \OCP\IConfig
+     * @var IConfig
      */
     protected $config;
 
+    /**
+     * @var ConfigProxy
+     */
+    protected $configProxy;
+
     /**
      * @var IUserSession
      */
-    private $userSession;
+    protected $userSession;
 
-    public function __construct($appName, IRequest $request, IConfig $config, IUserSession $userSession)
+    public function __construct($appName, IRequest $request, IConfig $config, ConfigProxy $configProxy, IUserSession $userSession)
     {
         parent::__construct($appName, $request);
 
         $this->config = $config;
+        $this->configProxy = $configProxy;
         $this->userSession = $userSession;
     }
 
@@ -65,6 +73,29 @@ class PersonalSettingController extends Controller
             }
         }
 
+        if ('target-blank-mode' === $name) {
+            $doSave = true;
+
+            if (!in_array($value, ['1', '2'])) {
+                $value = '1';
+            }
+        }
+
+        if ('target-blank-apps' === $name) {
+            $doSave = true;
+            $data = json_decode($value, true);
+
+            if (!is_array($data)) {
+                $doSave = false;
+            } else {
+                foreach ($data as $v) {
+                    if (!is_string($v)) {
+                        $doSave = false;
+                    }
+                }
+            }
+        }
+
         if ('top-menu-apps' === $name) {
             $doSave = true;
             $data = json_decode($value, true);
@@ -80,8 +111,12 @@ class PersonalSettingController extends Controller
             }
         }
 
+        if ($this->configProxy->getAppValueBool('force', '0')) {
+            $doSave = false;
+        }
+
         if ($doSave) {
-            $this->config->setUserValue($user->getUid(), 'side_menu', $name, $value);
+            $this->config->setUserValue($user->getUid(), Application::APP_ID, $name, $value);
 
             return [
                 'name' => $name,

lib/Service/AppRepository.php

@@ -2,7 +2,6 @@
 
 namespace OCA\SideMenu\Service;
 
-use OC_App;
 use OCP\L10N\IFactory;
 
 /**
@@ -13,7 +12,7 @@ use OCP\L10N\IFactory;
 class AppRepository
 {
     /**
-     * @var OC_App
+     * @var \OC_App
      */
     protected $ocApp;
 
@@ -22,7 +21,7 @@ class AppRepository
      */
     protected $l10nFactory;
 
-    public function __construct(OC_App $ocApp, IFactory $l10nFactory)
+    public function __construct(\OC_App $ocApp, IFactory $l10nFactory)
     {
         $this->ocApp = $ocApp;
         $this->l10nFactory = $l10nFactory;

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

@@ -0,0 +1,69 @@
+<?php
+
+namespace OCA\SideMenu\Service;
+
+use OC\User\User;
+use OCA\SideMenu\AppInfo\Application;
+use OCP\IConfig;
+
+/**
+ * class Config.
+ *
+ * @author Simon Vieille <simon@deblan.fr>
+ */
+class ConfigProxy
+{
+    /**
+     * @var IConfig
+     */
+    protected $config;
+
+    public function __construct(IConfig $config)
+    {
+        $this->config = $config;
+    }
+
+    public function getAppValue(string $name, string $default, $appId = null): string
+    {
+        return (string) $this->config->getAppValue($appId ?? Application::APP_ID, $name, $default);
+    }
+
+    public function getUserValue(User $user, string $name, string $default, $appId = null): string
+    {
+        return (string) $this->config->getUserValue($user->getUid(), $appId ?? Application::APP_ID, $name, $default);
+    }
+
+    public function getAppValueBool(string $name, string $default, $appId = null): bool
+    {
+        return (bool) $this->getAppValue($name, $default, $appId);
+    }
+
+    public function getAppValueArray(string $name, string $default, $appId = null): array
+    {
+        return (array) json_decode($this->getAppValue($name, $default, $appId), true);
+    }
+
+    public function getAppValueInt(string $name, string $default, $appId = null): int
+    {
+        return (int) $this->getAppValue($name, $default, $appId);
+    }
+
+    public function getUserValueBool(User $user, string $name, string $default, $appId = null): bool
+    {
+        return (bool) str_replace(
+            ['yes', 'no'],
+            ['1', '0'],
+            $this->getUserValue($user, $name, $default, $appId)
+        );
+    }
+
+    public function getUserValueArray(User $user, string $name, string $default, $appId = null): array
+    {
+        return (array) json_decode($this->getUserValue($user, $name, $default, $appId), true);
+    }
+
+    public function getUserValueInt(User $user, string $name, string $default, $appId = null): int
+    {
+        return (int) $this->getUserValue($user, $name, $default, $appId);
+    }
+}

lib/Settings/Admin.php

@@ -18,9 +18,11 @@
 
 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\IConfig;
 use OCP\IL10N;
 use OCP\ILogger;
 use OCP\Settings\ISettings;
@@ -38,7 +40,7 @@ class Admin implements ISettings
     private $logger;
 
     /**
-     * @var IConfig
+     * @var ConfigProxy
      */
     private $config;
 
@@ -47,12 +49,23 @@ class Admin implements ISettings
      */
     private $appRepository;
 
-    public function __construct(IL10N $l, ILogger $logger, IConfig $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;
     }
 
     /**
@@ -60,34 +73,57 @@ class Admin implements ISettings
      */
     public function getForm()
     {
-        $backgroundColor = $this->config->getAppValue('side_menu', 'background-color', '#333333');
+        $backgroundColor = $this->config->getAppValue('background-color', '#333333');
-        $backgroundColorTo = $this->config->getAppValue('side_menu', 'background-color-to', $backgroundColor);
+        $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,
-            'current-app-background-color' => $this->config->getAppValue('side_menu', 'current-app-background-color', '#444444'),
+            'background-color-opacity' => $this->config->getAppValueInt('background-color-opacity', '100'),
-            'loader-color' => $this->config->getAppValue('side_menu', 'loader-color', '#0e75ac'),
+            'current-app-background-color' => $this->config->getAppValue('current-app-background-color', '#444444'),
-            'icon-invert-filter' => (int) $this->config->getAppValue('side_menu', 'icon-invert-filter', '0'),
+            'loader-color' => $this->config->getAppValue('loader-color', '#0e75ac'),
-            'icon-opacity' => (int) $this->config->getAppValue('side_menu', 'icon-opacity', '100'),
+            'icon-invert-filter' => $this->config->getAppValueInt('icon-invert-filter', '0'),
-            'loader-enabled' => $this->config->getAppValue('side_menu', 'loader-enabled', '1'),
+            'icon-opacity' => $this->config->getAppValueInt('icon-opacity', '100'),
-            'text-color' => $this->config->getAppValue('side_menu', 'text-color', '#FFFFFF'),
+            'text-color' => $this->config->getAppValue('text-color', '#FFFFFF'),
-            'cache' => $this->config->getAppValue('side_menu', 'cache', '0'),
+            'dark-mode-background-color' => $darkModeBackgroundColor,
-            'opener' => $this->config->getAppValue('side_menu', 'opener', 'side-menu-opener'),
+            'dark-mode-background-color-to' => $darkModeBackgroundColorTo,
-            'always-displayed' => $this->config->getAppValue('side_menu', 'always-displayed', '0'),
+            'dark-mode-background-color-opacity' => $this->config->getAppValueInt('dark-mode-background-color-opacity', '100'),
-            'big-menu' => $this->config->getAppValue('side_menu', 'big-menu', '0'),
+            'dark-mode-current-app-background-color' => $this->config->getAppValue('dark-mode-current-app-background-color', '#444444'),
-            'display-logo' => $this->config->getAppValue('side_menu', 'display-logo', '1'),
+            'dark-mode-loader-color' => $this->config->getAppValue('dark-mode-loader-color', '#cccccc'),
-            'opener-position' => $this->config->getAppValue('side_menu', 'opener-position', 'before'),
+            'dark-mode-icon-invert-filter' => $this->config->getAppValueInt('dark-mode-icon-invert-filter', '0'),
-            'opener-hover' => $this->config->getAppValue('side_menu', 'opener-hover', '0'),
+            'dark-mode-icon-opacity' => $this->config->getAppValueInt('dark-mode-icon-opacity', '100'),
-            'opener-only' => $this->config->getAppValue('side_menu', 'opener-only', '0'),
+            'dark-mode-text-color' => $this->config->getAppValue('dark-mode-text-color', '#FFFFFF'),
-            'hide-when-no-apps' => $this->config->getAppValue('side_menu', 'hide-when-no-apps', '0'),
+            'dark-mode-opener' => $this->config->getAppValue('dark-mode-opener', 'side-menu-opener'),
-            'size-icon' => $this->config->getAppValue('side_menu', 'size-icon', 'normal'),
+            'opener' => $this->config->getAppValue('opener', 'side-menu-opener'),
-            'size-text' => $this->config->getAppValue('side_menu', 'size-text', 'normal'),
+            'loader-enabled' => $this->config->getAppValue('loader-enabled', '1'),
-            'top-menu-apps' => (array) json_decode($this->config->getAppValue('side_menu', 'top-menu-apps', '[]'), true),
+            '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'),
+            'opener-only' => $this->config->getAppValue('opener-only', '0'),
+            'show-settings' => $this->config->getAppValue('show-settings', '0'),
+            'hide-when-no-apps' => $this->config->getAppValue('hide-when-no-apps', '0'),
+            'size-icon' => $this->config->getAppValue('size-icon', 'normal'),
+            'size-text' => $this->config->getAppValue('size-text', 'normal'),
+            'force' => $this->config->getAppValue('force', '0'),
+            '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('side_menu', 'settings/admin-form', $parameters, '');
+        return new TemplateResponse(Application::APP_ID, 'settings/admin-form', $parameters, '');
     }
 
     /**
@@ -95,7 +131,7 @@ class Admin implements ISettings
      */
     public function getSection()
     {
-        return 'side_menu';
+        return Application::APP_ID;
     }
 
     /**

lib/Settings/AdminSection.php

@@ -18,6 +18,7 @@
 
 namespace OCA\SideMenu\Settings;
 
+use OCA\SideMenu\AppInfo\Application;
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\Settings\IIconSection;
@@ -34,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;
@@ -46,13 +43,13 @@ 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
      */
     public function getID()
     {
-        return 'side_menu';
+        return Application::APP_ID;
     }
 
     /**
@@ -63,13 +60,13 @@ class AdminSection implements IIconSection
      */
     public function getName()
     {
-        return $this->l->t('Side menu');
+        return $this->l->t(Application::APP_NAME);
     }
 
     /**
      * @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 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 priority values. It is required to return a value between 0 and 99.
      *
      * E.g.: 70
      */
@@ -83,6 +80,6 @@ class AdminSection implements IIconSection
      */
     public function getIcon()
     {
-        return $this->url->imagePath('theming', 'app-dark.svg');
+        return $this->url->imagePath(Application::APP_ID, 'icon.svg');
     }
 }

lib/Settings/Personal.php

@@ -18,13 +18,14 @@
 
 namespace OCA\SideMenu\Settings;
 
+use OCA\SideMenu\AppInfo\Application;
+use OCA\SideMenu\Service\AppRepository;
+use OCA\SideMenu\Service\ConfigProxy;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IL10N;
 use OCP\ILogger;
-use OCP\Settings\ISettings;
-use OCP\IConfig;
 use OCP\IUserSession;
-use OCA\SideMenu\Service\AppRepository;
+use OCP\Settings\ISettings;
 
 class Personal implements ISettings
 {
@@ -39,7 +40,7 @@ class Personal implements ISettings
     private $logger;
 
     /**
-     * @var IConfig
+     * @var ConfigProxy
      */
     private $config;
 
@@ -53,7 +54,7 @@ class Personal implements ISettings
      */
     private $appRepository;
 
-    public function __construct(IL10N $l, ILogger $logger, IConfig $config, IUserSession $userSession, AppRepository $appRepository)
+    public function __construct(IL10N $l, ILogger $logger, ConfigProxy $config, IUserSession $userSession, AppRepository $appRepository)
     {
         $this->l = $l;
         $this->logger = $logger;
@@ -70,12 +71,19 @@ class Personal implements ISettings
         $user = $this->userSession->getUser();
 
         $parameters = [
-            'enabled' => $this->config->getUserValue($user->getUid(), 'side_menu', 'enabled', '1'),
+            'force' => $this->config->getAppValueBool('force', '0'),
-            'top-menu-apps' => (array) json_decode($this->config->getUserValue($user->getUid(), 'side_menu', 'top-menu-apps', '[]'), true),
+            'enabled' => $this->config->getUserValue(
+                $user,
+                'enabled',
+                $this->config->getAppValue('default-enabled', '1')
+            ),
+            'top-menu-apps' => $this->config->getUserValueArray($user, 'top-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(),
         ];
 
-        return new TemplateResponse('side_menu', 'settings/personal-form', $parameters, '');
+        return new TemplateResponse(Application::APP_ID, 'settings/personal-form', $parameters, '');
     }
 
     /**
@@ -83,13 +91,13 @@ class Personal implements ISettings
      */
     public function getSection()
     {
-        return 'side_menu';
+        return Application::APP_ID;
     }
 
     /**
      * @return int whether the form should be rather on the top or bottom of
-     * the admin section. The forms are arranged in ascending order of the
+     *             the admin section. The forms are arranged in ascending order of the
-     * priority values. It is required to return a value between 0 and 100.
+     *             priority values. It is required to return a value between 0 and 100.
      *
      * E.g.: 70
      */

lib/Settings/PersonalSection.php

@@ -18,6 +18,7 @@
 
 namespace OCA\SideMenu\Settings;
 
+use OCA\SideMenu\AppInfo\Application;
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\Settings\IIconSection;
@@ -34,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;
@@ -46,13 +43,13 @@ 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
      */
     public function getID()
     {
-        return 'side_menu';
+        return Application::APP_ID;
     }
 
     /**
@@ -63,13 +60,13 @@ class PersonalSection implements IIconSection
      */
     public function getName()
     {
-        return $this->l->t('Side menu');
+        return $this->l->t(Application::APP_NAME);
     }
 
     /**
      * @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 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 priority values. It is required to return a value between 0 and 99.
      *
      * E.g.: 70
      */
@@ -83,6 +80,6 @@ class PersonalSection implements IIconSection
      */
     public function getIcon()
     {
-        return $this->url->imagePath('theming', 'app-dark.svg');
+        return $this->url->imagePath(Application::APP_ID, 'icon.svg');
     }
 }

src/CloserButton.vue

@@ -0,0 +1,25 @@
+<!--
+@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>
+    <button class="side-menu-opener side-menu-closer"></button>
+</template>
+
+<script>
+export default {
+    name: 'CloserButton',
+}
+</script>

src/Loader.vue

@@ -0,0 +1,42 @@
+<!--
+@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 class="side-menu-loader">
+        <svg width="38" height="38" viewBox="0 0 38 38" xmlns="http://www.w3.org/2000/svg">
+            <g fill="none" fill-rule="evenodd">
+                <g transform="translate(1 1)" stroke-width="2">
+                    <circle stroke-opacity=".5" cx="18" cy="18" r="18"/>
+                    <path d="M36 18c0-9.94-8.06-18-18-18">
+                        <animateTransform
+                            attributeName="transform"
+                            type="rotate"
+                            from="0 18 18"
+                            to="360 18 18"
+                            dur="1s"
+                            repeatCount="indefinite"/>
+                    </path>
+                </g>
+            </g>
+        </svg>
+    </div>
+</template>
+
+<script>
+export default {
+    name: 'Loader',
+}
+</script>

src/Logo.vue

@@ -0,0 +1,44 @@
+<!--
+@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 v-bind:class="classes">
+        <a v-if="link !== null" v-bind:href="link">
+            <img v-bind:src="image">
+        </a>
+        <img v-else v-bind:src="image">
+    </div>
+</template>
+
+<script>
+export default {
+    name: 'Logo',
+    props: {
+        image: {
+            type: String,
+            required: true
+        },
+        link: {
+            type: String,
+            required: false
+        },
+        classes: {
+            type: Object,
+            required: true
+        },
+    },
+}
+</script>

src/OpenerButton.vue

@@ -0,0 +1,25 @@
+<!--
+@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>
+    <button class="side-menu-opener"></button>
+</template>
+
+<script>
+export default {
+    name: 'OpenerButton',
+}
+</script>

src/SettingsButton.vue

@@ -0,0 +1,47 @@
+<!--
+@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 class="side-menu-settings">
+        <a v-bind:href="href">
+            {{ label }}
+
+            <span class="avatardiv avatardiv-shown">
+                <img v-bind:src="avatar" v-bind:alt="name" v-bind:title="name">
+            </span>
+        </a>
+    </div>
+</template>
+
+<script>
+export default {
+    name: 'SettingsButton',
+    props: {
+        label: {
+            type: String,
+            required: true
+        },
+        href: {
+            type: String,
+            required: true
+        },
+        avatar: {
+            type: String,
+            required: true
+        },
+    },
+}
+</script>

src/SideMenu.vue

@@ -17,34 +17,65 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 <template>
     <div id="side-menu">
         <div class="side-menu-header">
-            <button class="side-menu-opener"></button>
+            <SettingsButton
+                v-if="settings"
+                v-bind:href="settings.href"
+                v-bind:label="settings.name"
+                v-bind:avatar="settings.avatar" />
 
-            <div v-if="logo" class="side-menu-logo">
+            <OpenerButton />
-                <img v-bind:src="logo">
+
-            </div>
+            <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">
-            <li v-for="app in apps" v-bind:class="{'side-menu-app': true, 'active': app.active}">
+            <SideMenuApp
-                <a v-bind:href="app.href" v-bind:title="app.name">
+                v-for="app in apps"
-                     <span class="side-menu-app-icon" v-html="app.icon"></span>
+                v-bind:classes="{'side-menu-app': true, 'active': app.active}"
-                     <span class="side-menu-app-text" v-html="app.name"></span>
+                v-bind:icon="app.icon"
-                </a>
+                v-bind:label="app.name"
-            </li>
+                v-bind:href="app.href"
+                v-bind:target="targetBlankApps.indexOf(app.id) !== -1 ? '_blank' : undefined"
+            />
         </ul>
     </div>
 </template>
 
 <script>
 import trim from 'trim'
+import axios from 'axios'
+import OpenerButton from './OpenerButton'
+import SettingsButton from './SettingsButton'
+import SideMenuApp from './SideMenuApp'
+import Logo from './Logo'
 
 export default {
     name: 'SideMenu',
+    components: {
+        SettingsButton,
+        OpenerButton,
+        SideMenuApp,
+        Logo,
+    },
     data() {
         return {
             apps: [],
             logo: null,
+            logoLink: null,
+            avatar: null,
             forceLightIcon: false,
+            targetBlankApps: [],
+            settings: null,
         }
     },
     methods: {
@@ -86,6 +117,7 @@ export default {
                     }
 
                     this.apps.push({
+                        id: dataId,
                         href: href,
                         name: trim(element.querySelector('span').innerHTML),
                         icon: svg,
@@ -100,25 +132,27 @@ export default {
                 }, 1000)
             })(this.apps)
         },
-        retrieveLogo() {
-            const ncLogo = document.querySelector('#nextcloud .logo')
 
-            if (ncLogo) {
+        retrieveConfig() {
-                const url = window.getComputedStyle(ncLogo, null)
+            let that = this
-                    .getPropertyValue('background-image')
-                    .replace('url("', '')
-                    .replace('")', '')
 
-                if (url && url !== 'none') {
+            axios
-                    this.logo = url
+                .get(OC.generateUrl('/apps/side_menu/js/config'))
-                }
+                .then(function(response) {
-            }
+                    const config = response.data
+
+                    that.targetBlankApps = config['target-blank-apps']
+                    that.forceLightIcon = config['force-light-icon']
+                    that.avatar = config['avatar']
+                    that.logo = config['logo']
+                    that.logoLink = config['logo-link']
+                    that.settings = config['settings']
+                });
         },
     },
     mounted() {
+        this.retrieveConfig()
         this.retrieveApps()
-        this.retrieveLogo()
-        this.forceLightIcon = document.querySelector('#side-menu-container').getAttribute('data-forcelighticon') == 1;
 
         const menu = document.querySelector('#appmenu')
 

src/SideMenuApp.vue

@@ -0,0 +1,52 @@
+<!--
+@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>
+    <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>
+        </a>
+    </li>
+</template>
+
+<script>
+export default {
+    name: 'SideMenuApp',
+    props: {
+        label: {
+            type: String,
+            required: true
+        },
+        icon: {
+            type: String,
+            required: true
+        },
+        href: {
+            type: String,
+            required: true
+        },
+        classes: {
+            type: Object,
+            required: true
+        },
+        target: {
+            type: String,
+            required: false
+        },
+    },
+}
+</script>

src/SideMenuBig.vue

@@ -17,22 +17,34 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 <template>
     <div id="side-menu" class="side-menu-big">
         <div class="side-menu-header">
-            <button class="side-menu-opener side-menu-closer"></button>
+            <CloserButton />
-			<button class="side-menu-opener"></button>
+
+            <SettingsButton
+                v-if="settings"
+                v-bind:href="settings.href"
+                v-bind:label="settings.name"
+                v-bind:avatar="settings.avatar"
+            />
+
+            <OpenerButton />
         </div>
 
         <div class="side-menu-categories-wrapper">
             <div class="side-menu-categories">
+                <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>
 
                     <ul class="side-menu-apps-list">
-                        <li v-bind:class="{'side-menu-app': true, 'active': activeApp === appId}" v-for="(app, appId) in category.apps">
+                        <SideMenuBigApp
-                            <a v-bind:href="app.href" v-bind:title="app.name">
+                            v-for="(app, appId) in category.apps"
-                                 <img class="side-menu-app-icon" v-bind:src="app.icon"></span>
+                            v-bind:classes="{'side-menu-app': true, 'active': activeApp === appId}"
-                                 <span class="side-menu-app-text" v-html="app.name"></span>
+                            v-bind:icon="app.icon"
-                            </a>
+                            v-bind:label="app.name"
-                        </li>
+                            v-bind:href="app.href"
+                            v-bind:target="targetBlankApps.indexOf(appId) !== -1 ? '_blank' : undefined"
+                        />
                     </ul>
                 </div>
             </div>
@@ -43,13 +55,28 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 <script>
 import trim from 'trim'
 import axios from 'axios'
+import OpenerButton from './OpenerButton'
+import CloserButton from './CloserButton'
+import SettingsButton from './SettingsButton'
+import Loader from './Loader'
+import SideMenuBigApp from './SideMenuBigApp'
 
 export default {
     name: 'SideMenuBig',
+    components: {
+        SettingsButton,
+        OpenerButton,
+        CloserButton,
+        Loader,
+        SideMenuBigApp,
+    },
     data() {
         return {
             items: [],
             activeApp: null,
+            targetBlank: false,
+            targetBlankApps: [],
+            settings: null,
         }
     },
     methods: {
@@ -73,12 +100,27 @@ export default {
                     jQuery('body').trigger('side-menu.apps', [apps])
                 });
         },
+
         retrieveActiveApp() {
             let activeAppLink = document.querySelector('#appmenu a.active')
             this.activeApp = activeAppLink ? activeAppLink.parentNode.getAttribute('data-id') : null
         },
+
+        retrieveConfig() {
+            let that = this
+
+            axios
+                .get(OC.generateUrl('/apps/side_menu/js/config'))
+                .then(function(response) {
+                    const config = response.data
+
+                    that.targetBlankApps = config['target-blank-apps']
+                    that.settings = config['settings']
+                });
+        },
     },
     mounted() {
+        this.retrieveConfig()
         this.retrieveApps()
         this.retrieveActiveApp()
     }

src/SideMenuBigApp.vue

@@ -0,0 +1,52 @@
+<!--
+@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>
+    <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>
+        </a>
+    </li>
+</template>
+
+<script>
+export default {
+    name: 'SideMenuBigApp',
+    props: {
+        label: {
+            type: String,
+            required: true
+        },
+        icon: {
+            type: String,
+            required: true
+        },
+        href: {
+            type: String,
+            required: true
+        },
+        classes: {
+            type: Object,
+            required: true
+        },
+        target: {
+            type: String,
+            required: false
+        },
+    },
+}
+</script>

src/admin.js

@@ -81,6 +81,10 @@ const saveSettings = (key) => {
     }
 }
 
+const elementToggler = (element) => {
+    jQuery(element).toggle()
+}
+
 jQuery(document).ready(() => {
     elements = jQuery('.side-menu-setting')
 
@@ -106,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', '')
 
@@ -116,6 +126,39 @@ 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)
     })
+
+    jQuery('.side-menu-toggler').on('click', (event) => {
+        var target = jQuery(event.target)
+        var element = target.attr('data-target')
+
+        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/cs.yaml

@@ -0,0 +1,78 @@
+"Custom menu": "Uživatelsky určená nabídka"
+"Enable the custom menu": "Zapnout uživatelsky určenou nabídku"
+"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"
+"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í"
+"Save": "Uložit"
+"You like this app and you want to support me?": "Líbí se vám tato aplikace a chcete podpořit její vývoj?"
+"Buy me a coffee ☕": "Kupte mi kafe ☕"
+"Hidden": "Skryté"
+"Small": "Malé"
+"Normal": "Normální"
+"Big": "Velké"
+"Colors": "Barvy"
+"Background color": "Barva pozadí"
+"Background color of current app": "Barva pozadí stávající aplikace"
+"Text color": "Barva textu"
+"Loader": "Nástroj pro načítání"
+"Icon": "Ikona"
+"Same color": "Stejná barva"
+"Opposite color": "Doplňková barva"
+"Transparent": "Průhledné"
+"Opaque": "Neprůhledné"
+"Opener": "Tlačítko pro otevření"
+"Default": "Výchozí"
+"Default (dark)": "Výchozí (tmavé)"
+"Hamburger": "Hamburger"
+"Hamburger (dark)": "Hamburger (tmavé)"
+"Hamburger 2": "Hamburger 2"
+"Hamburger 2 (dark)": "Hamburger 2 (tmavé)"
+"Before the logo": "Před logem"
+"After the logo": "Za logem"
+"Position": "Pozice"
+"Show only the opener (hidden logo)": "Zobrazovat pouze otevírací tlačítko (logo skryto)"
+"Do not display the side menu and the opener if there is no application (eg: public pages).": "Nezobrazovat postranní nabídku a její otevírací tlačítko pokud nejsou dostupné žádné aplikace (např. na veřejných stránkách)."
+"Panel": "Panel"
+"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Otevřít nabídku při najetím ukazatelem na tlačítko nabídky (automaticky vypnuto pro dotykové obrazovky)."
+"Display the big menu": "Zobrazit velkou nabídku"
+"The big menu is not compatible with AppOrder.": "Velká nabídka není kompatibilní s jinou aplikací (doplňkem) „Pořadí aplikací“."
+"Display the logo": "Zobrazit logo"
+"This feature is not compatible with the <code>big menu</code> display.": "Tato funkce není kompatibilní se zobrazením <code>velké nabídky</code>."
+"Icons and texts": "Ikony a texty"
+"Loader enabled": "Načítání zapnuto"
+"Tips": "Tipy"
+"Always displayed": "Vždy zobrazeno"
+"The logo will be hidden when the menu is always displayed.": "Pokud je nabídka zobrazena trvale, logo bude skryto."
+"This is the automatic behavior when the menu is always displayed.": "Toto je automatické chování, kdy je nabídka vždy zobrazena."
+"Not compatible with touch screens.": "Nekompatibilní s dotykovými obrazovkami."
+"Big menu": "Velká nabídka"
+"Live preview": "Živý náhled"
+"Open apps in new tab": "Otevírat aplikace v novém panelu"
+"Use the global setting": "Použít globální nastavení"
+"Use my selection": "Použít můj výběr"
+"Show and hide the list of applications": "Zobrazit/skrýt seznam aplikací"
+"Use the avatar instead of the logo": "Použít namísto loga profilový obrázek uživatele"
+"You do not have permission to change the settings.": "Nemáte oprávnění měnit nastavení."
+"Force this configuration to users": "Vynutit uplatnění těchto nastavení uživatelům"
+"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"
+"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>."
+"The logo is a link to the default app": "Logo je odkaz na výchozí aplikaci"
+"Others": "Ostatní"
+"Categories": "Kategorie"
+"Customize sorting": "Přizpůsobit si řazení"
+"Order by": "Řadit podle"
+"Name": "Název"
+"Customed": "Přizpůsobeno"
+"Show and hide the list of categories": "Zobrazit/skrýt seznam kategorií"
+"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"

src/l10n/fixtures/de.yaml

@@ -1,16 +1,16 @@
-"Side menu": "Seitenmenü"
+"Custom menu": "Benutzerdefiniertes Menü"
-"Enable the side menu": "Aktivieren Sie das Seitenmenü"
+"Enable the custom menu": "Aktiviere das Benutzerdefiniertes Menü"
 "No": "Nein"
 "Yes": "Ja"
-"Menu": "Speisekarte"
+"Menu": "Menü"
-'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.': 'Verwenden Sie die Tastenkombination <span class="keyboard-key">Strg</span>+<span class="keyboard-key">o</span>, um das Seitenmenü zu öffnen und auszublenden. Verwenden Sie zum Navigieren die Registerkarte <span class="keyboard-key">tab</span>.'
+'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.': 'Verwende die Tastenkombination <span class="keyboard-key">Strg</span>+<span class="keyboard-key">o</span>, um das Seitenmenü ein- und auszublenden. Verwende <span class="keyboard-key">tab</span> zum Navigieren.'
 "Top menu": "Hauptmenü"
-"Apps that not must be moved in the side menu": "Apps, die nicht im Seitenmenü verschoben werden müssen"
+"Apps that not must be moved in the side menu": "Apps, die nicht ins Seitenmenü verschoben werden müssen"
 "If there is no selection then the global configuration is applied.": "Wenn keine Auswahl vorhanden ist, wird die globale Konfiguration angewendet."
-"Experimental": "Experimental"
+"Experimental": "Experimentell"
-"Save": "Sparen"
+"Save": "Speichern"
 "You like this app and you want to support me?": "Du magst diese App und möchtest mich unterstützen?"
-"Buy me a coffe ☕": "Gib mir einen Kaffee ☕"
+"Buy me a coffee ☕": "Gib mir einen Kaffee ☕"
 "Hidden": "Versteckt"
 "Small": "Klein"
 "Normal": "Normal"
@@ -36,13 +36,13 @@
 "After the logo": "Nach dem Logo"
 "Position": "Position"
 "Show only the opener (hidden logo)": "Nur den Öffner anzeigen (verstecktes Logo)"
-"Do not display the side menu and the opener if there is no application (eg: public pages).": "Zeigen Sie das Seitenmenü und den Öffner nicht an, wenn keine Anwendung vorhanden ist (z. B. öffentliche Seiten)."
+"Do not display the side menu and the opener if there is no application (eg: public pages).": "Zeige das Seitenmenü und den Öffner nicht an, wenn keine Anwendung vorhanden ist (z.B. bei öffentlichen Seiten)."
 "Panel": "Panel"
-"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Öffnen Sie das Menü, wenn Sie die Maus über den Öffner bewegen (auf Touchscreens automatisch deaktiviert)."
+"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Öffne das Menü, wenn die Maus über den Öffner bewegt wird (auf Touchscreens automatisch deaktiviert)."
 "Display the big menu": "Großes Menü anzeigen"
 "The big menu is not compatible with AppOrder.": "Das große Menü ist nicht mit AppOrder kompatibel."
 "Display the logo": "Logo anzeigen"
-"This feature is not compatible with the <code>big menu</code> display.": "Diese Funktion ist nicht mit der großen Menüanzeige kompatibel."
+"This feature is not compatible with the <code>big menu</code> display.": "Diese Funktion ist nicht mit <code>großes Menü</code> kompatibel."
 "Icons and texts": "Symbole und Texte"
 "Loader enabled": "Loader aktiviert"
 "Tips": "Tipps"
@@ -50,5 +50,29 @@
 "The logo will be hidden when the menu is always displayed.": "Das Logo wird ausgeblendet, wenn das Menü immer angezeigt wird."
 "This is the automatic behavior when the menu is always displayed.": "Dies ist das automatische Verhalten, wenn das Menü immer angezeigt wird."
 "Not compatible with touch screens.": "Nicht kompatibel mit Touchscreens."
-"Big menu": "Große Speisekarte"
+"Big menu": "Großes Menü"
 "Live preview": "Live Vorschau"
+"Open apps in new tab": "Öffne Apps in einem neuen Tab"
+"Use the global setting": "Verwende die globale Einstellung"
+"Use my selection": "Verwende meine Auswahl"
+"Show and hide the list of applications": "Ein- und Ausblenden der Anwendungsliste"
+"Use the avatar instead of the logo": "Verwenden Sie den Avatar anstelle des Logos"
+"You do not have permission to change the settings.": "Sie haben keine Berechtigung zum Ändern der Einstellungen."
+"Force this configuration to users": "Erzwingen Sie diese Konfiguration für Benutzer"
+"Export the configuration": "Exportieren Sie die Konfiguration"
+"Purge the cache": "Leeren Sie den Cache"
+"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

@@ -1,5 +1,5 @@
-"Side menu": "Menu latéral"
+"Custom menu": "Menu personnalisé"
-"Enable the side menu": "Activer le menu latéral"
+"Enable the custom menu": "Activer le menu personnalisé"
 "No": "Non"
 "Yes": "Oui"
 "Menu": "Menu"
@@ -10,7 +10,7 @@
 "Experimental": "Expérimental"
 "Save": "Sauvegarder"
 "You like this app and you want to support me?": "Vous aimer cette application et vous souhaitez m'aider ?"
-"Buy me a coffe ☕": "Offrez moi un café ☕"
+"Buy me a coffee ☕": "Offrez moi un café ☕"
 "Hidden": "Caché"
 "Small": "Petit"
 "Normal": "Normal"
@@ -52,3 +52,27 @@
 "Not compatible with touch screens.": "Incompatible avec les écrans tactiles."
 "Big menu": "Menu large"
 "Live preview": "Aperçu en direct"
+"Open apps in new tab": "Ouvrir les applications dans un nouvel onglet"
+"Use the global setting": "Utiliser la configuration globale"
+"Use my selection": "Utiliser ma sélection"
+"Show and hide the list of applications": "Afficher et masquer la liste des applications"
+"Use the avatar instead of the logo": "Utiliser l'avatar à la place du logo"
+"You do not have permission to change the settings.": "Vous n'avez pas la permission de changer les paramètres."
+"Force this configuration to users": "Forcer cette configuration aux utilisateurs"
+"Export the configuration": "Exporter la configuration"
+"Purge the cache": "Purger le cache"
+"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"

src/l10n/fixtures/zh_CN.yaml

@@ -0,0 +1,78 @@
+"Custom menu": "自定义菜单"
+"Enable the custom menu": "激活自定义菜单"
+"No": "取消"
+"Yes": "确定"
+"Menu": "菜单"
+"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.": "使用快捷键 <span class=\"keyboard-key\">Ctrl<\/span>+<span class=\"keyboard-key\">o<\/span> 打开或隐藏侧边栏菜单。使用<span class=\"keyboard-key\">tab<\/span> 来导航。"
+"Top menu": "顶部菜单"
+"Apps that not must be moved in the side menu": "禁止在侧边栏菜单移动的应用"
+"If there is no selection then the global configuration is applied.": "如不选择，将应用全局设定。"
+"Experimental": "实验性"
+"Save": "保存"
+"You like this app and you want to support me?": "喜欢本应用并支持我一下？"
+"Buy me a coffee ☕": "赏一杯咖啡 ☕ 给我"
+"Hidden": "隐藏"
+"Small": "小型"
+"Normal": "标准"
+"Big": "大型"
+"Colors": "颜色"
+"Background color": "背景颜色"
+"Background color of current app": "当前应用的背景色"
+"Text color": "文字颜色"
+"Loader": "菜单指示器"
+"Icon": "图标"
+"Same color": "相同颜色"
+"Opposite color": "相反颜色"
+"Transparent": "透明"
+"Opaque": "不透明"
+"Opener": "容器"
+"Default": "默认"
+"Default (dark)": "默认(深色)"
+"Hamburger": "Hamburger"
+"Hamburger (dark)": "Hamburger (深色)"
+"Hamburger 2": "Hamburger 2"
+"Hamburger 2 (dark)": "Hamburger 2 (深色)"
+"Before the logo": "在logo前"
+"After the logo": "在logo后"
+"Position": "位置"
+"Show only the opener (hidden logo)": "只显示容器 (隐藏logo)"
+"Do not display the side menu and the opener if there is no application (eg: public pages).": "N如果没有应用，不显示侧边栏菜单和容器 (例如 : 公共页面)。"
+"Panel": "面板"
+"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "鼠标悬停时打开菜单 (触摸屏时将自动禁用)"
+"Display the big menu": "显示大型菜单"
+"The big menu is not compatible with AppOrder.": "大型菜单与应用顺序不兼容"
+"Display the logo": "显示logo"
+"This feature is not compatible with the <code>big menu<\/code> display.": "此功能与显示<code>大型菜单<\/code>不兼容。"
+"Icons and texts": "图标与文字"
+"Loader enabled": "菜单指示器已激活"
+"Tips": "技巧"
+"Always displayed": "一直显示"
+"The logo will be hidden when the menu is always displayed.": "一直显示菜单时logo将被隐藏。"
+"This is the automatic behavior when the menu is always displayed.": "一直显示菜单时的自动动作。"
+"Not compatible with touch screens.": "与触屏不兼容。"
+"Big menu": "大型菜单"
+"Live preview": "实时预览"
+"Open apps in new tab": "在新标签中打开应用"
+"Use the global setting": "使用全局设定"
+"Use my selection": "使用自定义设定"
+"Show and hide the list of applications": "显示或隐藏应用列表"
+"Use the avatar instead of the logo": "使用头像代替logo"
+"You do not have permission to change the settings.": "没有更改设置的权限。"
+"Force this configuration to users": "强制用户使用此设置"
+"Export the configuration": "导出设置"
+"Purge the cache": "清除缓存"
+"Show the link to settings": "显示设置链接"
+"The menu is enabled by default for users": "用户的默认菜单已激活"
+"Except when the configuration is forced.": "除非设置被强制使用。"
+"Apps that should not be displayed in the menu": "禁止在菜单中显示的应用"
+"This feature is only compatible with the <code>big menu<\/code> display.": "此功能只和<code>大型菜单<\/code>兼容。"
+"The logo is a link to the default app": "logo链接到默认应用"
+"Others": "其他"
+"Categories": "类别"
+"Customize sorting": "自定义顺序"
+"Order by": "排序规则"
+"Name": "名称"
+"Customed": "自定义"
+"Show and hide the list of categories": "显示或隐藏类别列表"
+"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "此参数将应用于暗黑主题激活时。"
+"Dark mode colors": "暗黑模式颜色"

templates/js/_alwaysDisplayed.js

@@ -34,11 +34,41 @@ var alwaysDisplayed = function() {
 
     for (var i in fixedElements) {
         var element = fixedElements[i]
-        var value = window.getComputedStyle(element, null).getPropertyValue('left')
+        var computedStyle = window.getComputedStyle(element, null)
-        var intValue = parseInt(value.replace('px', ''))
+        var left = computedStyle.getPropertyValue('left')
+        var right = computedStyle.getPropertyValue('right')
 
-        element.style.setProperty('transform', 'translateX(' + (intValue + 50) + 'px)')
+        if (right !== '0px') {
+            var intValue = parseInt(left.replace('px', ''))
+            element.style.setProperty('transform', 'translateX(' + (intValue + 50) + 'px)')
+        }
     }
 }
 
-alwaysDisplayed()
+let content = document.getElementById('content')
+
+if (content && content.classList.contains('app-settings')) {
+    let loaded = false
+    const config = {
+        attributes: false,
+        childList: true,
+        subtree: true
+    }
+    const observer = new MutationObserver(() => {
+        if (loaded) {
+            return;
+        }
+
+        const element = content.querySelector('#app-category-your-apps') || content.querySelector('#app-navigation ul')
+
+        if (element) {
+            loaded = true
+
+            alwaysDisplayed()
+        }
+    })
+
+    observer.observe(content, config)
+} else {
+    window.setTimeout(alwaysDisplayed, 200)
+}

templates/js/_topMenuApps.js

@@ -38,6 +38,10 @@ var updateTopMenu = function() {
             appShown.push(app)
             navigationApps.append(app.outerHTML)
         }
+
+        if (targetBlankApps.indexOf(dataId) !== -1) {
+            jQuery(app).children('a').attr('target', '_blank');
+        }
     })
 
     var rightHeaderWidth = jQuery('.header-right').outerWidth()
@@ -104,6 +108,28 @@ var updateTopMenu = function() {
         k++
     })
 
+    // Hack for https://github.com/nextcloud/server/blob/23b0b63c213f5b31eecae817ffd4a9e26f6624d0/core/src/components/MainMenu.js#L74-L96
+    menu.undelegate('li:not(#more-apps) > a', 'click')
+    menu.delegate('li:not(#more-apps) > a', 'click', function(e) {
+        var a = $(e.target)
+
+        if (!a.is('a')) {
+            a = a.closest('a')
+        }
+
+        if (a.attr('target') !== '_blank' && e.which === 1 && !e.ctrlKey && !e.metaKey && a.parent('#more-apps').length === 0) {
+            a.find('svg').remove()
+            a.find('div').remove()
+            a.prepend(jQuery('<div/>').addClass(
+                OCA.Theming && OCA.Theming.inverted
+                ? 'icon-loading-small'
+                : 'icon-loading-small-dark'
+            ))
+
+            window.location.href = a.attr('href')
+        }
+    })
+
     jQuery('#apps li.app-external-site').each(function(i, app) {
         app = jQuery(app)
         var appId = app.attr('data-id')

templates/js/script.php

@@ -10,9 +10,7 @@
         sideMenu.attr('data-bigmenu', '1')
     <?php endif; ?>
 
-    <?php if ($_['force-light-icon']): ?>
+    var targetBlankApps = <?php echo json_encode($_['target-blank-apps']) ?>;
-        sideMenuContainer.attr('data-forcelighticon', '1')
-    <?php endif; ?>
 
     body.on('side-menu.apps', function(e, apps) {
         <?php if ($_['hide-when-no-apps']): ?>
@@ -63,7 +61,7 @@
             }
         }
 
-        <?php if ($_['opener-hover']): ?>
+        <?php if ($_['opener-hover'] || ($_['always-displayed'] && !$_['big-menu'])): ?>
             var sideMenuMouseLeave = function() {
                 sideMenu
                     .removeClass('open')
@@ -83,9 +81,14 @@
             }
 
             if (!isTouchDevice) {
-                headerMenuOpener.on('mouseenter', sideMenuOpenerMouseEnter)
+                <?php if ($_['opener-hover']): ?>
+                    headerMenuOpener.on('mouseenter', sideMenuOpenerMouseEnter)
 
-                sideMenu.addClass('hide-opener')
+                    sideMenu.addClass('hide-opener')
+                <?php endif ?>
+
+                sideMenu.on('mouseleave', sideMenuMouseLeave)
+                sideMenu.on('mouseenter', sideMenuOpenerMouseEnter)
             }
         <?php endif; ?>
 

templates/settings/personal-form.php

@@ -18,7 +18,6 @@
 
 script('side_menu', 'admin');
 style('side_menu', 'admin');
-style('side_menu', 'support');
 
 $choicesYesNo = [
     'No' => '0',
@@ -27,74 +26,142 @@ $choicesYesNo = [
 
 ?>
 
+
 <div id="side-menu-section">
-    <div class="section">
+    <?php if ($_['force']): ?>
-        <h2>
+        <div class="section">
-            <?php p($l->t('Menu')); ?>
+            <h2>
-        </h2>
+                <?php p($l->t('Menu')); ?>
+            </h2>
 
-        <div>
+            <p>
-            <label for="side-menu-enabled">
+                <em><?php echo $l->t('You do not have permission to change the settings.'); ?></em>
-                <?php p($l->t('Enable the side menu')); ?>
+            </p>
-            </label>
         </div>
+    <?php else: ?>
+        <div class="section">
+            <h2>
+                <?php p($l->t('Menu')); ?>
+            </h2>
 
-        <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>
+            <div>
-                <?php foreach ($choicesYesNo as $label => $value): ?>
+                <label for="side-menu-enabled">
-                    <option value="<?php echo $value ?>" <?php if ($value === $_['enabled']): ?>selected<?php endif; ?>>
+                    <?php p($l->t('Enable the custom menu')); ?>
-                        <?php echo $l->t($label); ?>
+                </label>
-                    </option>
+            </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>
                 <?php endforeach; ?>
-            </select>
+            </div>
         </div>
-    </div>
+
+        <div class="section">
+            <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>
+
+            <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>
+                <?php endforeach; ?>
+            </div>
+        </div>
+    <?php endif ?>
 
     <div class="section">
-        <h2>
+        <?php if (!$_['force']): ?>
-            <?php p($l->t('Top menu')); ?>
+            <button id="side-menu-save" class="btn btn-primary"><?php p($l->t('Save')); ?></button>
-        </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>
 
-        <p>
+            <span id="side-menu-message" class="msg"></span>
-            <em>
-                <?php p($l->t('If there is no selection then the global configuration is applied.')); ?>
-            </em>
-        </p>
 
-        <div class="side-menu-setting" data-name="top-menu-apps" data-checkbox data-personal>
+            <div style="height: 30px"></div>
-            <?php foreach ($_['apps'] as $app): ?>
+        <?php endif ?>
-                <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>
-            <?php endforeach; ?>
-        </div>
-    </div>
-
-    <div class="section">
-        <button id="side-menu-save" class="btn btn-primary"><?php p($l->t('Save')); ?></button>
-
-        <span id="side-menu-message" class="msg"></span>
-
-        <div style="height: 30px"></div>
 
         <div>
             <span for="side-menu-opener">
@@ -102,7 +169,7 @@ $choicesYesNo = [
 
                 <a style="margin-left: 10px" target="_blank" href="https://www.buymeacoffee.com/deblan">
                     <button>
-                        <?php p($l->t('Buy me a coffe ☕')); ?>
+                        <?php p($l->t('Buy me a coffee ☕')); ?>
                     </button>
                 </a>
             </span>

webpack.js

@@ -3,51 +3,51 @@ const { VueLoaderPlugin } = require('vue-loader')
 const StyleLintPlugin = require('stylelint-webpack-plugin')
 
 module.exports = {
-	entry: {
+    entry: {
-		'admin': path.join(__dirname, 'src', 'admin.js'),
+        'admin': path.join(__dirname, 'src', 'admin.js'),
-		'sideMenu': path.join(__dirname, 'src', 'SideMenu.js'),
+        'sideMenu': path.join(__dirname, 'src', 'SideMenu.js'),
-	},
+    },
-	output: {
+    output: {
-		path: path.resolve(__dirname, './js'),
+        path: path.resolve(__dirname, './js'),
-		publicPath: '/js',
+        publicPath: '/js',
-		filename: '[name].js?v=[hash]',
+        filename: '[name].js?v=[hash]',
-		chunkFilename: 'chunks/[name]-[hash].js',
+        chunkFilename: 'chunks/[name]-[hash].js',
-	},
+    },
-	module: {
+    module: {
-		rules: [
+        rules: [
-			{
+            {
-				test: /\.css$/,
+                test: /\.css$/,
-				use: ['vue-style-loader', 'css-loader'],
+                use: ['vue-style-loader', 'css-loader'],
-			},
+            },
-			{
+            {
-				test: /\.scss$/,
+                test: /\.scss$/,
-				use: ['vue-style-loader', 'css-loader', 'sass-loader'],
+                use: ['vue-style-loader', 'css-loader', 'sass-loader'],
-			},
+            },
-			{
+            {
-				test: /\.vue$/,
+                test: /\.vue$/,
-				loader: 'vue-loader',
+                loader: 'vue-loader',
-			},
+            },
-			{
+            {
-				test: /\.js$/,
+                test: /\.js$/,
-				loader: 'babel-loader',
+                loader: 'babel-loader',
-				exclude: /node_modules/,
+                exclude: /node_modules/,
-			},
+            },
-			{
+            {
-				test: /\.(png|jpg|gif|svg)$/,
+                test: /\.(png|jpg|gif|svg)$/,
-				loader: 'url-loader',
+                loader: 'url-loader',
-				options: {
+                options: {
-					name: '[name].[ext]?[hash]',
+                    name: '[name].[ext]?[hash]',
-					limit: 8192,
+                    limit: 8192,
-				},
+                },
-			},
+            },
-		],
+        ],
-	},
+    },
-	plugins: [
+    plugins: [
-		new VueLoaderPlugin(),
+        new VueLoaderPlugin(),
-		new StyleLintPlugin(),
+        new StyleLintPlugin(),
-	],
+    ],
-	resolve: {
+    resolve: {
-		extensions: ['*', '.js', '.vue'],
+        extensions: ['*', '.js', '.vue'],
-		symlinks: false,
+        symlinks: false,
-	},
+    },
 }