Merge pull request 'add check if menu exists before adding event listeners (#210)' (#211) from feature/issue210 into v2.x

Reviewed-on: deblan/side_menu#211

.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/FEATURE_TEMPLATE.yml

@@ -1,34 +0,0 @@
-name: New feature
-about: Use this template if you want to request a feature
-title: "[FEATURE] "
-labels:
-  - enhancement
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this feature request!
-
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: Describe the feature.
-    validations:
-      required: true
-
-  - type: textarea
-    id: benefits
-    attributes:
-      label: Benefits
-      description: Describe the benefits of this feature.
-    validations:
-      required: true
-
-  - type: textarea
-    id: extra
-    attributes:
-      label: More informations
-      description: If you want to share more things, this is here!
-    validations:
-      required: false

.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
+
+...

.gitea/issue_template/ISSUE_TEMPLATE.yml

@@ -1,69 +0,0 @@
-name: New issue
-about: Use this template if you have a bug
-title: "[Bug] "
-labels:
-  - bug
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this bug report!
-
-  - type: textarea
-    id: environment
-    attributes:
-      label: Environment
-      value: |
-        * Custom menu version: 
-        * Nextcloud version: 
-        * PHP version: 
-        * Web server (Nginx, Apache2): 
-        * Web browser and version (Firefox 80, Google Chrome 74, etc): 
-    validations:
-      required: true
-
-  - type: textarea
-    id: configuration
-    attributes:
-      label: Configuration
-      description: Export the configuration using the admin page and copy/paste here ([documentation](https://deblan.gitnet.page/side_menu_doc/docs/FAQ/export-config/)).
-      value: |
-        ```
-        {
-          ...
-        }
-        ```
-    validations:
-      required: true
-
-  - type: textarea
-    id: steps
-    attributes:
-      label: Steps to reproduce
-      description: How reproduce the bug?
-    validations:
-      required: false
-
-  - type: textarea
-    id: resuts
-    attributes:
-      label: Observed Results
-      description: What happened?
-    validations:
-      required: false
-
-  - type: textarea
-    id: expected
-    attributes:
-      label: Expected Results
-      description: What should happen?
-    validations:
-      required: false
-
-  - type: textarea
-    id: extra
-    attributes:
-      label: More informations
-      description: If you want to share more things, this is here!
-    validations:
-      required: false

.gitea/issue_template/QUESTION_TEMPLATE.yml

@@ -1,30 +0,0 @@
-name: New question
-about: Use this template when you don't know how to do something
-title: "[Question] "
-labels:
-  - question
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill information.
-
-  - type: textarea
-    id: environment
-    attributes:
-      label: Environment
-      value: |
-        * Custom menu version: 
-        * Nextcloud version: 
-        * PHP version: 
-        * Web server (Nginx, Apache2): 
-        * Web browser and version (Firefox 80, Google Chrome 74, etc): 
-    validations:
-      required: true
-
-  - type: textarea
-    id: question
-    attributes:
-      label: Question
-    validations:
-      required: true

.gitea/issue_template/config.yml

@@ -1,8 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Documentation
-    url: https://deblan.gitnet.page/side_menu_doc/
-    about: Official documentation web site
-  - name: Ask a question in our Matrix room
-    about: If you prefer a chat-like conversation or in need for quick help, this might be an alternative to opening an issue.
-    url: https://matrix.to/#/#custommenu:neutralnetwork.org

.gitignore

@@ -4,4 +4,3 @@
 /releases
 /package-lock.json
 !/l10n/.gitkeep
-/yarn*.log

.stylelintrc.json

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

.woodpecker.yml

@@ -0,0 +1,42 @@
+pipeline:
+  dependencies:
+    image: deblan/devenv
+    commands:
+      - npm install
+    when:
+      event: [tag, push, pull_request]
+      branch: [master, develop, v2.x, feature/*]
+
+  build:
+    image: deblan/devenv
+    commands:
+      - make npm-build
+    when:
+      event: [push, pull_request]
+
+  package:
+    image: deblan/devenv
+    volumes:
+      - /var/www/html/artifacts:/var/www/html/artifacts
+    secrets: [app_certificate]
+    commands:
+      - mkdir -p "$HOME/.nextcloud/certificates"
+      - echo "$APP_CERTIFICATE" > "$HOME/.nextcloud/certificates/side_menu.key"
+      - export VERSION=$(grep "<version>" appinfo/info.xml | grep -o "[0-9]*\.[0-9]*\.[0-9]*" --color=never)
+      - export RELEASE_DIRECTORY="/var/www/html/artifacts/deblan/side_menu"
+      - make release
+    when:
+      event: [tag]
+
+  release:
+    image: plugins/gitea-release
+    volumes:
+      - /var/www/html/artifacts:/var/www/html/artifacts
+    settings:
+      api_key:
+        from_secret: gitnet_api_key
+      base_url: https://gitnet.fr
+      note: ${CI_COMMIT_MESSAGE}
+      files: /var/www/html/artifacts/deblan/side_menu/${CI_COMMIT_TAG/v//}/*
+    when:
+      event: [tag]

.woodpecker/.build.yml

@@ -1,22 +0,0 @@
-variables:
-  volumes: &volumes
-    - /data/${CI_REPO}:/builds
-
-when:
-  event: [tag, push, pull_request, manual]
-  branch: [master, develop, feature/*, fix/*, bugfix/*, translations]
-
-steps:
-  "Build JS":
-    image: node:20
-    commands:
-      - make build
-
-  "Build translations":
-    image: deblan/php:8.3
-    commands:
-      - php bin/generate_l10n.php
-
-  "Build cache":
-    image: gitnet.fr/deblan/woodpecker-cache
-    volumes: *volumes

.woodpecker/.publish.yml

@@ -1,66 +0,0 @@
-variables:
-  volumes: &volumes
-    - /data/${CI_REPO}:/builds
-    - /var/www/html/artifacts:/var/www/html/artifacts
-
-depends_on:
-  - build
-
-when:
-  event: [tag]
-
-steps:
-  "Verify tag and app version":
-    image: alpine
-    commands:
-      - TAG=${CI_COMMIT_TAG/v//}
-      - grep "<version>$TAG</version>" appinfo/info.xml
-
-  "Create signature":
-    image: nextcloud:25
-    volumes: *volumes
-    environment:
-      APP_CERTIFICATE:
-        from_secret: app_certificate
-      APP_PUBLIC_CERTIFICATE:
-        from_secret: app_public_certificate
-      SQLITE_DATABASE: /var/www/data/data.db
-      NEXTCLOUD_ADMIN_USER: admin
-      NEXTCLOUD_ADMIN_PASSWORD: admin
-    commands:
-      - cd "/builds/$CI_COMMIT_SHA"
-      - echo "$APP_CERTIFICATE" > "/tmp/side_menu.key"
-      - echo "$APP_PUBLIC_CERTIFICATE" > "/tmp/side_menu.crt"
-      - mkdir /tmp/app
-      - cp -r README.md CHANGELOG.md appinfo css lib img l10n js src templates screenshots vendor /tmp/app
-      - /usr/src/nextcloud/occ integrity:sign-app
-        --privateKey=/tmp/side_menu.key
-        --certificate=/tmp/side_menu.crt
-        --path=/tmp/app
-      - mv /tmp/app/appinfo/signature.json appinfo/
-
-  "Create package":
-    image: deblan/php:8.3
-    volumes: *volumes
-    environment:
-      APP_CERTIFICATE:
-        from_secret: app_certificate
-    commands:
-      - cd "/builds/$CI_COMMIT_SHA"
-      - apt-get update
-      - apt-get install -y zip make
-      - mkdir -p "$HOME/.nextcloud/certificates"
-      - echo "$APP_CERTIFICATE" > "$HOME/.nextcloud/certificates/side_menu.key"
-      - export VERSION=$(grep "<version>" appinfo/info.xml | grep -o "[0-9]*\.[0-9]*\.[0-9]*" --color=never)
-      - export RELEASE_DIRECTORY="/var/www/html/artifacts/deblan/side_menu"
-      - make release
-
-  "Push release":
-    image: plugins/gitea-release
-    volumes: *volumes
-    settings:
-      api_key:
-        from_secret: gitnet_api_key
-      base_url: https://gitnet.fr
-      note: ${CI_COMMIT_MESSAGE}
-      files: /var/www/html/artifacts/deblan/side_menu/${CI_COMMIT_TAG/v//}/*

.woodpecker/.security.yml

@@ -1,17 +0,0 @@
-variables:
-  volumes: &volumes
-    - /data/${CI_REPO}:/builds
-
-depends_on:
-  - build
-
-skip_clone: true
-
-steps:
-  "Check dependencies":
-    image: gitnet.fr/deblan/osv-detector:v0.10
-    volumes: *volumes
-    commands:
-      - cd "/builds/$CI_COMMIT_SHA"
-      - osv-detector package-lock.json
-    failure: ignore

CHANGELOG.md

@@ -1,228 +1,9 @@
 ## [Unreleased]
 
-## 4.1.1
+## 2.5.2
-### Fixed
-* fix(CssController): add missing NoCSRFRequired import (#397)
-* fix(SideMenu): ncApps must be an array (#369)
-
-## 4.1.0
-### Added
-* add compatibility with NC31
-### Fixed
-* fix(service): add service constructor arguments
-* fix(settings): remove non-existing and unused ILogger service
-### Changed
-* refactor(controller): usage of attributes instead of annotations
-
-## 4.0.1
-### Fixed
-* fix top menu labels (fix #368)
-* fix #369: The menu is displayed even if there are no apps
-
-## 4.0.0
-### Added
-* add compatibility with NC30
-
-## 3.13.1
-### Fixed
-* fix #354: remove the opener when the menu is always displayed
-* fix extra margin between the logo and the opener
-
-## 3.13.0
-### Added
-* show apps generated with Tables (fix #349)
-* add constructor property promotion
-### Fixed
-* remove .app-navigation--close translationX for always-displayed menu (fix #348)
-
-## 3.12.0
-### Added
-* add compatibility with NC29
-
-## 3.11.8
-### Fixed
-* move the logo inside #nextcloud element (fix #278 #239) [NC26]
-
-## 3.11.7
-### Added
-* update translations
-* update ci steps names
-### Fixed
-* add accessibility to open and close buttons (#311)
-* fully apply Nextcloud AppMenu.vue updated (#326)
-* add missing label on the 'save' button in personal settings (fix #318)
-### Changed
-* upgrade axios
-* upgrade css-loader
-
-## 3.11.6
-### Fixed
-* add --background-invert-if-bright in top menu (fix #326)
-
-## 3.11.5
-### Fixed
-* add missing label on buttons for accessiblity (fix #311)
-
-## 3.11.4
-### Fixed
-* add label on buttons for accessiblity (fix #311)
-
-## 3.11.3
-### Fixed
-* fix menu icon in decks, collectives and other apps (#302)
-
-## 3.11.2
-### Fixed
-* add default translations for Slovak - fix #298
-
-## 3.11.1
-### Added
-* add Portuguese (Brazil) translations - Thanks to igorfreire
-### Fixed
-* add width to .side-menu-categories for side menu with categories display - fix #294
-
-## 3.11.0
-### Added
-* add a search component in menus - fix #282
-### Fixed
-* remove the label of the link to personal settings - fix #283
-
-## 3.10.3
-### Fixed
-* change the way to load nextcloud components (NcActionLink/NcActions) - fix #274
-* update @nexcloud/* packages
-
-## 3.10.2
-### Fixed
-* add missing properties
-
-## 3.10.1
-### Fixed
-* fix #269: use php7 syntax
-
-## 3.10.0
-### Added
-* add compatibility with NC28
-### Fixed
-* fix NC28 error: remove deprecated method `OC_App::getNavigation()`
-
-## 3.9.1
-### Fixed
-* fix fixed menu on dashboard (#262)
-
-## 3.9.0
-### Added
-* add compatibility with NC27
-### Fixed
-* fix app redirect (#261)
-
-## 3.8.0
-### Added
-* add option to show hovered label only on top menu (fix #253)
-
-## 3.7.4
-### Fixed
-* fix Integrity failed (#247)
-
-## 3.7.3
-### Fixed
-* fix #244: use app href for redirection
-### Added
-* add signature on build
-
-## 3.7.2
-### Added
-* update pipeline conditions allowing `fix/*`
-### Fixed
-* fix #233: load configuration and then retrieve apps in default side menu display
-
-## 3.7.1
-### Fixed
-* fix build process (#230)
-
-## 3.7.0
-### Added
-* add translations (thanks to AHOHNMYC)
-* add compatibility with NC26
-
-## 3.6.0
-### Added
-* add hidden apps compatible with default menu (#219)
-
-## 3.5.2
 ### Fixed
 * add check if menu exists before adding event listeners (#210)
 
-## 3.5.1
-### Added
-* add translations (thanks to p-bo adn gallegonovato)
-### Fixed
-* fix #189: sorting not applied on mobile
-
-## 3.5.0
-### Added
-* add dependency check (ci)
-* add code quality check (ci)
-* add translations (thanks to gallegonovato)
-* add option to disable the display labels in the top menu (#194)
-### Fixed
-* fix missing img alt (settings image)
-* fix code quality alerts
-
-## 3.4.1
-### Added
-* add translations (thanks to zonorti, jorisvandijk, jak2k)
-### Fixed
-* fix #183: hide custom categories list when empty (admin page)
-
-## 3.4.0
-### Added
-* add translations (thanks to Pavelb, nier, Timur, p-bo)
-* add possibility to define Custom Menu as default app and redirect to the first top menu app (#177)
-
-## 3.3.2
-### Fixed
-* fix #173: reduce the height of categories list
-
-## 3.3.1
-### Fixed
-* fix #162: top and side apps does work correctly
-
-## 3.3.0
-### Added
-* add documentation in admin page
-* add app sorter in user config side (#160)
-### Fixed
-* fix #164: open apps in new tab does not work
-* fix #162 #159: top and side apps does work correctly
-
-## 3.2.1
-### Fixed
-* fix #150: active app is not visible has active in menu (except in default menu)
-* fix #151: opener position
-
-## 3.2.0
-### Added
-* use custom app names using 'app.navigation.name' (#148)
-* app sorting with all displays (#147)
-
-## 3.1.0
-### Added
-* add global custom app sorting for the top menu
-### Fixed
-* fix admin list/modal look
-
-## 3.0.1
-### Fixed
-* Remove the gap between the window's top and menu categories (large menu)
-
-## 3.0.0
-### Added
-* Add compatibility with NC25 (#136/#135)
-### Removed
-* Nextcloud 20-24 are not supported anymore
-* AppOrder is not supported anymore
-
 ## 2.5.1
 ### Fixed
 * fix icon render (#133)

Makefile

@@ -1,15 +1,11 @@
-build: dep
+npm-build:
 	npm run build
 
-watch: dep
+npm-watch:
 	npm run watch
 
-dep:
-	npm i
-	npm link @nextcloud/vue || sudo npm link @nextcloud/vue
-
 .ONESHELL:
-release:
+release: npm-build translations
 	if [ -z "$$VERSION" ]; then
 		echo "VERSION required"
 		exit 1
@@ -34,4 +30,4 @@ translations:
 .ONESHELL:
 run-code-quality-analysis:
 	export SONAR_TOKEN="$$SONAR_TOKEN_DEBLAN_SIDE_MENU"
-	sonar-scanner -Dsonar.projectKey=deblan-side_menu -Dsonar.sources=. -Dsonar.host.url=$$SONAR_SERVER -Dsonar.branch.name=$$(git branch --show-current)
+	sonar-scanner -Dsonar.projectKey=deblan-side_menu -Dsonar.sources=. -Dsonar.host.url=https://cq.gitnet.fr

README.md

@@ -1,16 +1,12 @@
 🤙 Nextcloud app / Custom menu 🎨
 ===============================
 
-[![Build Status](https://ci.gitnet.fr/api/badges/deblan/side_menu/status.svg)](https://ci.gitnet.fr/deblan/side_menu)
-[![Translations](https://translate.codeberg.org/widgets/custom-menu/-/application/svg-badge.svg)](https://translate.codeberg.org/engage/custom-menu/)
-![Downloads](https://img.shields.io/badge/dynamic/json?color=brightgreen&label=downloads&query=%24.K_downloads&suffix=K&url=https%3A%2F%2Fapi-side-menu.deblan.org%2Fdownloads.php)
-
 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 add and sort custom categories, define apps that must be displayed in the top menu, etc. Fully customisable.
 
 This application is rather suitable for instances that activate a lot of applications.
 
-You can customize colors depending of the theme (Dark theme and Breeze Dark).
+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)
@@ -19,12 +15,12 @@ You can customize colors depending of the theme (Dark theme and Breeze Dark).
 
 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)
 
-## [📘 Read the documentation](https://deblan.gitnet.page/side_menu_doc/)
+[![Build Status](https://ci.gitnet.fr/api/badges/deblan/side_menu/status.svg)](https://ci.gitnet.fr/deblan/side_menu)
 
 Requirements
 ------------
 
-* PHP >= 8.0
+* PHP >= 7.4
 * App `theming` enabled
 
 Installation and upgrade
@@ -50,33 +46,19 @@ Users can disable the menu using the page of personal settings.
 
 Use the shortcut `Ctrl`+`o` to open and to hide the side menu. Use `tab` to navigate.
 
-### Use first top menu app as default app
-
-You can easily let Custom Menu redirect to the first app in the top menu by changing the following parameter in your `config/config.php`:
-
-```
-'defaultapp' => 'side_menu',
-```
-
-If the top menu is empty then it redirects to files.
-
 How to contribute?
 ------------------
 
 You can report a bug or request a feature by opening an issue: https://gitnet.fr/deblan/side_menu/issues
 
-### You are a translator
+If you are a developer:
-
-Translations are managed from [translate.codeberg.org](https://translate.codeberg.org/projects/custom-menu/application/).
-
-### You are a developer
 
 * fork the repository
 * install an instance of Nextcloud
 * go to `apps/` and clone your repository
-* go to `apps/side_menu` and run `make dep`
+* go to `apps/side_menu` and run `npm install`
 
-Build javascripts using `make build` (or `make watch` to build them in real time).
+Build javascripts using `make npm-build` (or `make npm-watch` to build them in real time).
 
 Then commit and create a pull request.
 
@@ -84,10 +66,3 @@ Support
 -------
 
 You can join the official room on Matrix: [#custommenu:neutralnetwork.org](https://matrix.to/#/#custommenu:neutralnetwork.org).
-
-
-Notice
-------
-
-Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**.
-In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/).

appinfo/info.xml

@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0"?>
-<info xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
+<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>Custom menu</name>
     <summary>Modify the display of the menu.</summary>
@@ -10,13 +11,13 @@ This application is rather suitable for instances that activate a lot of applica
 
 Use the shortcut `Ctrl`+`o` to open and to hide the side menu. Use `tab` to navigate.
 
-You can customize colors depending of the theme (Dark theme and Breeze Dark).
+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 >= 8.1
+* PHP >= 7.4
 * App `theming` enabled
 
 If you like this application and if you want to support the development:
@@ -24,37 +25,29 @@ 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)
-
-Notice
-------
-
-Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**.
-In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/).
 ]]></description>
-    <version>4.1.1</version>
+    <version>2.5.2</version>
     <licence>agpl</licence>
-    <author mail="contact@deblan.fr" homepage="https://www.deblan.fr/">Simon Vieille</author>
+    <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
     <namespace>SideMenu</namespace>
     <documentation>
-        <admin>https://deblan.gitnet.page/side_menu_doc/</admin>
+        <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><![CDATA[https://matrix.to/#/!TFPucDATKODpHNVAtu:neutralnetwork.org?via=neutralnetwork.org]]></discussion>
+    <discussion>https://matrix.to/#/!TFPucDATKODpHNVAtu:neutralnetwork.org?via=neutralnetwork.org</discussion>
     <bugs>https://gitnet.fr/deblan/side_menu/issues</bugs>
     <repository type="git">https://gitnet.fr/deblan/side_menu</repository>
-    <screenshot><![CDATA[https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc19_default_menu.png]]></screenshot>
+    <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc19_default_menu.png</screenshot>
-    <screenshot><![CDATA[https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/admin_settings.png]]></screenshot>
+    <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/admin_settings.png</screenshot>
-    <screenshot><![CDATA[https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/n19_big_menu.png]]></screenshot>
+    <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/n19_big_menu.png</screenshot>
-    <screenshot><![CDATA[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/nc18_menu_always_displayed.png</screenshot>
-    <screenshot><![CDATA[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/nc20_big_menu_responsive.png</screenshot>
-    <screenshot><![CDATA[https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/personal_settings.png]]></screenshot>
+    <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/personal_settings.png</screenshot>
-    <screenshot><![CDATA[https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc25_big_menu.png]]></screenshot>
-    <screenshot><![CDATA[https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc25_default_menu.png]]></screenshot>
     <dependencies>
-        <php min-version="8.1" max-version="8.4" />
+        <nextcloud min-version="20" max-version="24"/>
-        <nextcloud min-version="30" max-version="32"/>
+        <php min-version="7.4"/>
     </dependencies>
     <settings>
         <admin>OCA\SideMenu\Settings\Admin</admin>

appinfo/routes.php

@@ -0,0 +1,30 @@
+<?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/>.
+ */
+
+return [
+    'routes' => [
+        ['name' => 'Css#stylesheet', 'url' => '/css/stylesheet', 'verb' => 'GET'],
+        ['name' => 'Js#script', 'url' => '/js/script', 'verb' => 'GET'],
+        ['name' => 'Js#config', 'url' => '/js/config', 'verb' => 'GET'],
+        ['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/import_config.php

@@ -1,75 +1,21 @@
 <?php
+/**
+ * Imports a json configuration into a sqlite database.
+ *
+ * Usage:
+ *   php bin/import_config.php /path/to/config.json /path/to/owncloud.db
+ */
 
-function showUsageAndExit(int $code)
+$configFile = $argv[1];
-{
+$databaseFile = $argv[2];
-    global $argv;
 
-    echo "${argv[0]} [--help] --config /path/to/config/config.php --file /path/to/config.json\n";
+$content = file_get_contents($configFile);
+$config = json_decode($content, true);
 
-    exit($code);
+$pdo = new \Pdo(sprintf('sqlite:%s', $databaseFile));
-}
+$stmt = $pdo->prepare('UPDATE oc_appconfig SET configvalue=:value WHERE configkey=:key and appid=:appId');
 
-function value(string $shortName, string $longName, array $options, bool $required = true): ?string
+foreach ($config as $key => $value) {
-{
-    $value = $options[$shortName] ?? $options[$longName] ?? null;
-
-    if (is_array($value)) {
-        echo "To much --{$longName}\n";
-        showUsageAndExit(1);
-    }
-
-    if (empty($value) && $required) {
-        echo "--{$longName} is missing\n";
-        showUsageAndExit(1);
-    }
-
-    return $value;
-}
-
-$options = getopt('t:f:c:h', [
-    'type:',
-    'file:',
-    'config:',
-    'help',
-]);
-
-$help = value('h', 'help', $options, false);
-$config = value('c', 'config', $options);
-$file = value('f', 'file', $options);
-
-if (!is_readable($config) && !is_file($config)) {
-    echo "No such file: {$config}\n";
-
-    exit(1);
-}
-
-if (!is_readable($file) && !is_file($file)) {
-    echo "No such file: {$file}\n";
-
-    exit(1);
-}
-
-$appConfig = json_decode(file_get_contents($file), true);
-
-require $config;
-
-if ('mysql' === $CONFIG['dbtype']) {
-    $pdo = new \PDO(
-        'mysql:host='.$CONFIG['dbhost'].';dbname='.$CONFIG['dbname'],
-        $CONFIG['dbuser'],
-        $CONFIG['dbpassword']
-    );
-} elseif ($CONFIG['dbtype']) {
-    $pdo = new \PDO(sprintf('sqlite:%s', $CONFIG['datadirectory'].'/owncloud.db'));
-} else {
-    echo "dbtype is not valid\n";
-
-    exit(1);
-}
-
-$stmt = $pdo->prepare('UPDATE '.$CONFIG['dbtableprefix'].'appconfig SET configvalue=:value WHERE configkey=:key and appid=:appId');
-
-foreach ($appConfig as $key => $value) {
     $stmt->execute([
         'appId' => 'side_menu',
         'key' => $key,

css/admin.css

@@ -18,8 +18,6 @@
 #side-menu-section input[type="color"] {
     width: 100px;
     margin: 10px 0 10px 0;
-  padding: 0;
-  border-radius: 0;
 }
 
 #-dropside-menu-section input[type="checkbox"] {
@@ -73,21 +71,14 @@
 
 .side-menu-setting-list {
     margin: 10px 4px 4px 0px;
-  border: 2px solid var(--color-border-dark);
-  border-radius: 15px;
 }
 
 .side-menu-setting-list-item {
     padding: 5px 10px;
-  border-bottom: 1px solid var(--color-border-dark);
+    border: 1px solid var(--color-border-dark);
     max-width: 300px;
     margin: -1px 0 0 0;
     cursor: pointer;
-  line-height: 32px;
-}
-
-.side-menu-setting-list-item:last-child {
-  border-bottom: 0;
 }
 
 .side-menu-setting-list-drop {
@@ -102,15 +93,15 @@
 }
 
 .side-menu-setting-list-item input {
-  margin-top: 0;
+    min-height: auto;
-  height: 21px !important;
+    margin-top: -1px;
-  min-height: auto !important;
 }
 
 #apps-categories-custom-list select {
     width: 100%;
 }
 
+
 .side-menu-setting-table {
     display: table;
     width: 100%;
@@ -118,29 +109,14 @@
 
 .side-menu-setting-row {
     display: table;
-  margin-bottom: 10px;
-}
-
-.side-menu-setting-row code {
-  margin-left: 2px;
-  margin-bottom: 1px;
-  padding: 3px 10px;
-  border-radius: 5px;
-  display: inline-block;
-  right: 2px;
-  border: 1px solid var(--color-border-dark);
 }
 
 .side-menu-setting-label {
     display: table-cell;
-  width: 430px;
+    width: 400px;
     padding-right: 20px;
 }
 
-.side-menu-setting-label--top {
-  vertical-align: top;
-}
-
 .side-menu-setting-form {
     display: table-cell;
     min-width: 300px;
@@ -164,57 +140,7 @@
 .btn-reset {
     display: inline-block;
     cursor: pointer;
-  position: relative;
+    position: absolute;
-  top: -8px;
+    margin-top: 17px;
-  left: 5px;
+    margin-left: 5px;
-  transition-duration: 0.8s;
-  transition-property: transform;
-  transform: rotate(360deg);
-}
-
-.btn-reset--down {
-  top: 2px;
-}
-
-.btn-reset--progress {
-  transform: rotate(-359deg);
-}
-
-.badges {
-  margin-bottom: 14px;
-  margin-top: 4px;
-}
-
-.badge {
-  border-width: 1px;
-  padding: 2px 8px;
-  margin-right: 2px;
-  margin-bottom: 5px;
-  display: inline-block;
-  border-radius: 4px;
-  font-size: 13px;
-}
-
-.badge-1 {
-  background: #d4ce14;
-  border-color: #cad413;
-  color: #373a05;
-}
-
-.badge-2 {
-  background: #96d47f;
-  border-color: #7ed49b;
-  color: #333;
-}
-
-.badge-3 {
-  background: #d4540a;
-  border-color: #d4700c;
-  color: #fff;
-}
-
-.badge-4 {
-  background: #9d81d4;
-  border-color: #c681d4;
-  color: #fff;
 }

css/sideMenu.css

@@ -21,7 +21,7 @@
     left: 0;
     height: 100vh;
     width: 100%;
-  max-width: 290px;
+    max-width: 250px;
     background: linear-gradient(90deg, var(--side-menu-background-color, #333) 0%, var(--side-menu-background-color-to, #333) 100%);
     z-index: 3000;
     color: var(--side-menu-text-color, #fff);
@@ -39,7 +39,6 @@
 
 #header .side-menu-opener {
     margin-left: 0px;
-  margin-top: -1px;
 }
 
 .side-menu-settings {
@@ -47,7 +46,7 @@
     margin-top: 2px;
     float: right;
     line-height: 34px;
-  height: 42px;
+    height: 28px;
     display: none;
 }
 
@@ -83,16 +82,6 @@
     padding-left: 12px !important;
     margin-left: 5px !important;
     margin-left: 3px !important;
-  overflow: hidden;
-}
-
-.side-menu-opener span {
-  position: relative;
-  left: 50px;
-  display: block;
-  width: 1px;
-  height: 1px;
-  overflow: hidden;
 }
 
 .side-menu-opener:active, .side-menu-opener:focus {
@@ -114,19 +103,27 @@
     position: fixed;
     top: 150px;
     width: 100%;
-  max-width: 290px;
+    max-width: 250px;
     overflow: auto;
 }
 
 .side-menu-app-icon {
     width: 20px;
-  vertical-align: middle;
+    vertical-align: top;
-  margin-top: -4px;
     margin-right: 10px;
     filter: invert(var(--side-menu-icon-invert-filter, 0%));
     opacity: var(--side-menu-icon-opacity, 1);
 }
 
+.side-menu-app-icon svg {
+    vertical-align: middle;
+    margin-top: -3px;
+}
+
+.side-menu-app-icon .app-icon-notification {
+    display: none;
+}
+
 .side-menu-app a {
     line-height: 30px;
     color: var(--side-menu-text-color, #fff);
@@ -150,11 +147,11 @@
     max-height: 100px;
 }
 
-.enu-header {
+.side-menu-header {
     height: 150px;
     width: 100%;
     z-index: 2300;
-  max-width: 290px;
+    max-width: 250px;
     position: fixed;
     padding-top: 2px;
     top: 0;
@@ -165,7 +162,7 @@
 }
 
 #side-menu.hide-opener .side-menu-logo {
-  margin-top: 10px;
+    margin-top: 20px;
 }
 
 #side-menu-loader {
@@ -208,9 +205,10 @@
 }
 
 .side-menu-categories {
-  max-height: calc(100vh - 55px);
+    max-height: calc(100vh - 50px);
     overflow: auto;
     position: relative;
+    top: 50px;
     display: flex;
     flex-wrap: wrap;
     justify-content: center;
@@ -225,11 +223,6 @@
 .side-menu-category-title {
     padding-left: 10px;
     color: var(--side-menu-text-color, #fff);
-  font-weight: bold;
-  font-size: 20px;
-  margin-bottom: 12px;
-  line-height: 30px;
-  margin-top: 0;
 }
 
 .side-menu-loader {
@@ -237,7 +230,7 @@
 }
 
 .side-menu-loader svg {
-  width: 45px;
+    width: 38px;
     margin: auto;
     stroke: var(--side-menu-text-color, #fff);
 }
@@ -247,14 +240,14 @@
     margin-top: -2px;
 }
 
+.side-menu-always-displayed #header,
 .side-menu-always-displayed body {
     width: calc(100% - 50px) !important;
-  position: absolute;
-  left: 50px;
 }
 
-.side-menu-always-displayed #header {
+.side-menu-always-displayed body {
-  position: absolute !important;
+    position: absolute;
+    left: 50px;
 }
 
 .side-menu-always-displayed #side-menu {
@@ -262,14 +255,9 @@
 }
 
 .side-menu-always-displayed .side-menu-apps-list {
-  height: 100vh;
-  top: 0;
-  overflow: hidden;
-}
-
-.side-menu-always-displayed .side-menu-apps-list--with-settings {
     height: calc(100vh - 49px);
     top: 49px;
+    overflow: hidden;
 }
 
 .side-menu-always-displayed .side-menu-apps-list:hover {
@@ -302,9 +290,8 @@
     display: inline;
 }
 
-.side-menu-always-displayed .app-navigation-toggle-wrapper {
+.side-menu-always-displayed .app-navigation--close {
-  right: 0 !important;
+    transform: translateX(calc(-100% + 50px)) !important;
-  margin-left: 0 !important;
 }
 
 #side-menu.side-menu-with-categories {
@@ -315,7 +302,6 @@
 .side-menu-with-categories .side-menu-categories {
     display: block;
     padding: 0;
-  width: 100%;
 }
 
 .side-menu-with-categories .side-menu-category {
@@ -326,43 +312,12 @@
     overflow-x: visible;
 }
 
-.app-menu {
-  visibility: hidden;
-}
-
-.app-menu.show {
-  visibility: visible;
-}
-
-.side-menu-search {
-  float: right;
-}
-
-.side-menu-search input {
-  background: none;
-  border: 0;
-  border-radius: 0;
-  color: var(--side-menu-text-color);
-}
-
-.side-menu-search input::placeholder {
-  color: var(--side-menu-text-color);
-}
-
-.side-menu-always-displayed .side-menu-search {
-  display: none;
-}
-
 @media screen and (max-width: 1024px) {
     #side-menu.side-menu-big {
         max-width: 290px;
         height: 100vh;
     }
 
-  #side-menu.hide-opener.side-menu-big .side-menu-search {
-    float: none;
-  }
-
     .side-menu-categories {
         display: block;
         padding: 0;

lib/AppInfo/Application.php

@@ -3,7 +3,6 @@
 namespace OCA\SideMenu\AppInfo;
 
 use OC;
-use OC\App\AppStore\Fetcher\CategoryFetcher;
 use OC\Security\CSP\ContentSecurityPolicyNonceManager;
 use OC\User\User;
 use OCA\SideMenu\Service\AppRepository;
@@ -13,11 +12,7 @@ use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
-use OCP\EventDispatcher\IEventDispatcher;
-use OCP\IConfig;
-use OCP\INavigationManager;
 use OCP\IUserSession;
-use OCP\L10N\IFactory;
 use OCP\Util;
 use Psr\Container\ContainerInterface;
 
@@ -31,7 +26,6 @@ class Application extends App implements IBootstrap
     public const APP_ID = 'side_menu';
 
     public const APP_NAME = 'Custom menu';
-
     /**
      * @var OC\AllConfig
      */
@@ -47,55 +41,14 @@ class Application extends App implements IBootstrap
      */
     protected $user;
 
+    /**
+     * {@inheritdoc}
+     */
     public function __construct(array $urlParams = [])
     {
         parent::__construct(self::APP_ID, $urlParams);
     }
 
-    public function register(IRegistrationContext $context): void
-    {
-        $context->registerService(CategoryRepository::class, function (ContainerInterface $c) {
-            return new CategoryRepository(
-                $c->get(CategoryFetcher::class),
-                $c->get(ConfigProxy::class),
-                $c->get(IConfig::class),
-                $c->get(IFactory::class),
-                $c->get(IUserSession::class)
-            );
-        });
-
-        $context->registerService(AppRepository::class, function (ContainerInterface $c) {
-            return new AppRepository(
-                $c->get(\OC_App::class),
-                $c->get(INavigationManager::class),
-                $c->get(IFactory::class),
-                $c->get(ConfigProxy::class),
-                $c->get(CategoryRepository::class),
-                $c->get(IEventDispatcher::class),
-                $c->get(IUserSession::class)
-            );
-        });
-
-        $context->registerService(ConfigProxy::class, function (ContainerInterface $c) {
-            return new ConfigProxy(
-                $c->get(IConfig::class),
-            );
-        });
-    }
-
-    public function boot(IBootContext $context): void
-    {
-        $this->config = \OC::$server->getConfig();
-        $this->cspnm = \OC::$server->getContentSecurityPolicyNonceManager();
-        $this->user = \OC::$server[IUserSession::class]->getUser();
-
-        if (!$this->isEnabled()) {
-            return;
-        }
-
-        $this->addAssets();
-    }
-
     protected function isEnabled(): bool
     {
         $enabled = true;
@@ -144,14 +97,38 @@ class Application extends App implements IBootstrap
         $cache = $this->config->getAppValue(self::APP_ID, 'cache', '0');
 
         foreach ($assets as $value) {
-            $route = \OC::$server->getURLGenerator()->linkToRoute(
+            $route = OC::$server->getURLGenerator()->linkToRoute($value['route'], ['v' => $cache]);
-                $value['route'],
-                ['v' => $cache]
-            );
-
             $value['attr'][$value['route_attr']] = $route;
 
             Util::addHeader($value['type'], $value['attr'], '');
         }
     }
+
+    public function register(IRegistrationContext $context): void
+    {
+        $context->registerService('AppRepository', function () {
+            return new AppRepository();
+        });
+
+        $context->registerService('CategoryRepository', function () {
+            return new CategoryRepository();
+        });
+
+        $context->registerService('ConfigProxy', function () {
+            return new ConfigProxy();
+        });
+    }
+
+    public function boot(IBootContext $context): void
+    {
+        $this->config = OC::$server->getConfig();
+        $this->cspnm = OC::$server->getContentSecurityPolicyNonceManager();
+        $this->user = OC::$server[IUserSession::class]->getUser();
+
+        if (!$this->isEnabled()) {
+            return;
+        }
+
+        $this->addAssets();
+    }
 }

lib/Controller/AdminSettingController.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,28 +20,39 @@ namespace OCA\SideMenu\Controller;
 
 use OCA\SideMenu\AppInfo\Application;
 use OCP\AppFramework\Controller;
-use OCP\AppFramework\Http\Attribute\FrontpageRoute;
-use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
 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
 {
-    public function __construct(
+    /**
-        $appName,
+     * @var IConfig
-        IRequest $request,
+     */
-        protected IConfig $config,
+    protected $config;
-        protected IURLGenerator $urlGenerator
+
-    ) {
+    /**
+     * @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]
+    /**
-    #[FrontpageRoute(verb: 'GET', url: '/admin/cache/remove')]
+     * @NoCSRFRequired
-    public function removeCache(): RedirectResponse
+     *
+     * @return RedirectResponse
+     */
+    public function removeCache()
     {
         $this->config->setAppValue(Application::APP_ID, 'cache-categories', '[]');
 
@@ -51,9 +61,12 @@ class AdminSettingController extends Controller
         ]).'#more');
     }
 
-    #[NoCSRFRequired]
+    /**
-    #[FrontpageRoute(verb: 'GET', url: '/admin/config/export')]
+     * @NoCSRFRequired
-    public function exportConfiguration(): DataDownloadResponse
+     *
+     * @return Response
+     */
+    public function exportConfiguration()
     {
         $keys = $this->config->getAppKeys(Application::APP_ID);
         $appConfig = [];

lib/Controller/AppController.php

@@ -1,98 +0,0 @@
-<?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\Service\AppRepository;
-use OCA\SideMenu\Service\ConfigProxy;
-use OCP\AppFramework\Controller;
-use OCP\AppFramework\Http\Attribute\FrontpageRoute;
-use OCP\AppFramework\Http\Attribute\NoAdminRequired;
-use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
-use OCP\AppFramework\Http\RedirectResponse;
-use OCP\IRequest;
-use OCP\IURLGenerator;
-use OCP\IUserSession;
-
-class AppController extends Controller
-{
-    public function __construct(
-        string $appName,
-        IRequest $request,
-        protected AppRepository $appRepository,
-        protected IURLGenerator $urlGenerator,
-        protected ConfigProxy $config
-    ) {
-        parent::__construct($appName, $request);
-    }
-
-    #[NoCSRFRequired]
-    #[NoAdminRequired]
-    #[FrontpageRoute(verb: 'GET', url: '/')]
-    public function index(): RedirectResponse
-    {
-        $user = \OC::$server[IUserSession::class]->getUser();
-        $topMenuApps = $this->config->getAppValueArray('top-menu-apps', '[]');
-        $hiddenApps = $this->config->getAppValueArray('big-menu-hidden-apps', '[]');
-        $isForced = $this->config->getAppValueBool('force', '0');
-        $userTopMenuApps = $this->config->getUserValueArray($user, 'top-menu-apps', '[]');
-        $apps = $this->appRepository->getOrderedApps($user);
-
-        if (!$isForced && !empty($userTopMenuApps)) {
-            $topMenuApps = $userTopMenuApps;
-        }
-
-        foreach ($apps as $app) {
-            $inTopMenuApps = in_array($app['id'], $topMenuApps);
-            $inHiddenApps = in_array($app['id'], $hiddenApps);
-
-            if (!$inTopMenuApps && $inHiddenApps) {
-                continue;
-            }
-
-            return $this->redirectToApp($app, true);
-        }
-
-        return $this->redirectToApp('files');
-    }
-
-    protected function redirectToApp($app, bool $isHref = false): RedirectResponse
-    {
-        if (!$isHref) {
-            $isIgnoreFrontController = true === \OC::$server->getConfig()->getSystemValue(
-                'htaccess.IgnoreFrontController',
-                false
-            );
-
-            $isFrontControllerActive = 'true' === getenv('front_controller_active');
-
-            if ($isIgnoreFrontController || $isFrontControllerActive) {
-                $path = '/apps/%s/';
-            } else {
-                $path = '/index.php/apps/%s/';
-            }
-
-            $url = $this->urlGenerator->getAbsoluteURL(sprintf($path, $app));
-        } else {
-            $url = $app['href'];
-        }
-
-        return new RedirectResponse($url);
-    }
-}

lib/Controller/CssController.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @license GNU AGPL version 3 or any later version
  *
@@ -19,40 +18,64 @@
 
 namespace OCA\SideMenu\Controller;
 
+use OC;
 use OC\User\User;
 use OCA\SideMenu\AppInfo\Application;
-use OCA\SideMenu\Service\Color;
 use OCA\SideMenu\Service\ConfigProxy;
-use OCA\Theming\ThemingDefaults;
 use OCP\AppFramework\Controller;
-use OCP\AppFramework\Http\Attribute\FrontpageRoute;
+use OCP\AppFramework\Http\Response;
-use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
-use OCP\AppFramework\Http\Attribute\PublicPage;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IRequest;
 use OCP\IUserSession;
+use OCA\Theming\ThemingDefaults;
+use OCA\SideMenu\Service\Color;
 
 class CssController extends Controller
 {
-    protected ?User $user;
+    /**
+     * @var ConfigProxy
+     */
+    protected $config;
+
+    /**
+     * @var User
+     */
+    protected $user;
+
+    /**
+     * @var ThemingDefaults
+     */
+    protected $theming;
+
+    /**
+     * @var Color
+     */
+    protected $color;
 
     public function __construct(
         string $appName,
         IRequest $request,
-        protected ConfigProxy $config,
+        ConfigProxy $config,
-        protected ThemingDefaults $theming,
+        ThemingDefaults $theming,
-        protected Color $color
+        Color $color
-    ) {
+    )
+    {
         parent::__construct($appName, $request);
 
-        $this->user = \OC::$server[IUserSession::class]->getUser();
+        $this->user = OC::$server[IUserSession::class]->getUser();
+        $this->config = $config;
+        $this->theming = $theming;
+        $this->color = $color;
     }
 
-    #[NoCSRFRequired]
+    /**
-    #[NoAdminRequired]
+     * @NoAdminRequired
-    #[PublicPage]
+     * @NoCSRFRequired
-    #[FrontpageRoute(verb: 'GET', url: '/css/stylesheet')]
+     * @PublicPage
-    public function stylesheet(): TemplateResponse
+     *
+     * @return Response
+     */
+    public function stylesheet()
     {
         $response = new TemplateResponse(Application::APP_ID, 'css/stylesheet', $this->getConfig(), 'blank');
         $response->addHeader('Content-Type', 'text/css');
@@ -82,18 +105,16 @@ class CssController extends Controller
                 $topSideMenuApps = $userTopSideMenuApps;
             }
 
-            $isDarkThemeUserEnabled = 'dark' === $this->config->getUserValue($this->user, 'theme', '', 'accessibility');
+            $isDarkThemeUserEnabled = $this->config->getUserValue($this->user, 'theme', '', 'accessibility') === 'dark';
             $isBreezeDarkUserEnabled = $this->config->getUserValue($this->user, 'theme_enabled', '', 'breezedark');
 
-            $isBreezeDarkUserEnabled = '1' === $isBreezeDarkUserEnabled
+            $isBreezeDarkUserEnabled = $isBreezeDarkUserEnabled === '1' || ($isBreezeDarkGlobalEnabled && $isBreezeDarkUserEnabled === '');
-                || ($isBreezeDarkGlobalEnabled && '' === $isBreezeDarkUserEnabled);
         } else {
             $isDarkThemeUserEnabled = false;
             $isBreezeDarkUserEnabled = false;
         }
 
-        $isDarkMode = ($isAccessibilityAppEnabled && $isDarkThemeUserEnabled)
+        $isDarkMode = ($isAccessibilityAppEnabled && $isDarkThemeUserEnabled) || ($isBreezeDarkAppEnabled && $isBreezeDarkUserEnabled);
-            || ($isBreezeDarkAppEnabled && $isBreezeDarkUserEnabled);
 
         $primaryColor = $this->theming->getColorPrimary();
         $lightenPrimaryColor = $this->color->adjustBrightness($primaryColor, 0.2);
@@ -104,33 +125,25 @@ class CssController extends Controller
         if ($isDarkMode) {
             $backgroundColor = $this->config->getAppValue('dark-mode-background-color', $darkenPrimaryColor);
             $backgroundColorTo = $this->config->getAppValue('dark-mode-background-color-to', $darkenPrimaryColor);
-            $currentAppBackgroundColor = $this->config->getAppValue(
+            $currentAppBackgroundColor = $this->config->getAppValue('dark-mode-current-app-background-color', $darkenPrimaryColor2);
-                'dark-mode-current-app-background-color',
-                $darkenPrimaryColor2
-            );
             $loaderColor = $this->config->getAppValue('dark-mode-loader-color', $lightenPrimaryColor);
             $textColor = $this->config->getAppValue('dark-mode-text-color', $textColor);
             $iconInvertFilter = abs($this->config->getAppValueInt('dark-mode-icon-invert-filter', '0')).'%';
             $iconOpacity = abs($this->config->getAppValueInt('dark-mode-icon-opacity', '100') / 100);
             $opener = $this->config->getAppValue('dark-mode-opener', 'side-menu-opener');
 
-            $opacity = $this->config->getAppValueInt('dark-mode-background-color-opacity', '100');
+            $backgroundOpacity = dechex($this->config->getAppValueInt('dark-mode-background-color-opacity', '100') * 255 / 100);
-            $backgroundOpacity = dechex($opacity * 255 / 100);
         } else {
             $backgroundColor = $this->config->getAppValue('background-color', $darkenPrimaryColor);
             $backgroundColorTo = $this->config->getAppValue('background-color-to', $darkenPrimaryColor);
-            $currentAppBackgroundColor = $this->config->getAppValue(
+            $currentAppBackgroundColor = $this->config->getAppValue('current-app-background-color', $darkenPrimaryColor2);
-                'current-app-background-color',
-                $darkenPrimaryColor2
-            );
             $loaderColor = $this->config->getAppValue('loader-color', $lightenPrimaryColor);
             $textColor = $this->config->getAppValue('text-color', $textColor);
             $iconInvertFilter = abs($this->config->getAppValueInt('icon-invert-filter', '0')).'%';
             $iconOpacity = abs($this->config->getAppValueInt('icon-opacity', '100') / 100);
             $opener = $this->config->getAppValue('opener', 'side-menu-opener');
 
-            $opacity = $this->config->getAppValueInt('background-color-opacity', '100');
+            $backgroundOpacity = dechex($this->config->getAppValueInt('background-color-opacity', '100') * 255 / 100);
-            $backgroundOpacity = dechex($opacity * 255 / 100);
         }
 
         $backgroundColor .= $backgroundOpacity;

lib/Controller/JsController.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @license GNU AGPL version 3 or any later version
  *
@@ -19,15 +18,12 @@
 
 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\Attribute\FrontpageRoute;
-use OCP\AppFramework\Http\Attribute\NoAdminRequired;
-use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
-use OCP\AppFramework\Http\Attribute\PublicPage;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IRequest;
@@ -36,28 +32,47 @@ use OCP\L10N\IFactory;
 
 class JsController extends Controller
 {
-    protected ?User $user;
+    /**
+     * @var ConfigProxy
+     */
+    protected $config;
+
+    /**
+     * @var User
+     */
+    protected $user;
+
+    /**
+     * @var ThemingDefaults
+     */
+    protected $themingDefaults;
+
+    /**
+     * @var IFactory
+     */
+    protected $l10nFactory;
 
     public function __construct(
         string $appName,
         IRequest $request,
-        protected ConfigProxy $config,
+        ConfigProxy $config,
-        protected ThemingDefaults $themingDefaults,
+        ThemingDefaults $themingDefaults,
-        protected IFactory $l10nFactory
+        IFactory $l10nFactory
     ) {
         parent::__construct($appName, $request);
 
         $this->themingDefaults = $themingDefaults;
 
-        $this->user = \OC::$server[IUserSession::class]->getUser();
+        $this->user = OC::$server[IUserSession::class]->getUser();
         $this->config = $config;
         $this->l10nFactory = $l10nFactory;
     }
 
-    #[NoCSRFRequired]
+    /**
-    #[NoAdminRequired]
+     * @NoAdminRequired
-    #[PublicPage]
+     * @NoCSRFRequired
-    #[FrontpageRoute(verb: 'GET', url: '/js/script')]
+     * @PublicPage
+     */
     public function script(): TemplateResponse
     {
         $response = new TemplateResponse(Application::APP_ID, 'js/script', $this->getConfig(), 'blank');
@@ -66,10 +81,11 @@ class JsController extends Controller
         return $response;
     }
 
-    #[NoCSRFRequired]
+    /**
-    #[NoAdminRequired]
+     * @NoAdminRequired
-    #[PublicPage]
+     * @NoCSRFRequired
-    #[FrontpageRoute(verb: 'GET', url: '/js/config')]
+     * @PublicPage
+     */
     public function config(): JSONResponse
     {
         return new JSONResponse($this->getConfig());
@@ -83,12 +99,10 @@ class JsController extends Controller
         $useAvatar = $this->config->getAppValueBool('use-avatar', '0');
         $isForced = $this->config->getAppValueBool('force', '0');
         $addLogoLink = $this->config->getAppValueBool('add-logo-link', '1');
-        $appsOrder = $this->config->getAppValueArray('apps-order', '[]');
         $avatar = null;
         $settings = null;
 
         if ($this->user) {
-            $userAppsOrder = $this->config->getUserValueArray($this->user, 'apps-order', '[]');
             $userTopMenuApps = $this->config->getUserValueArray($this->user, 'top-menu-apps', '[]');
             $userTopSideMenuApps = $this->config->getUserValueArray($this->user, 'top-side-menu-apps', '[]');
 
@@ -100,10 +114,6 @@ class JsController extends Controller
                 $topSideMenuApps = $userTopSideMenuApps;
             }
 
-            if (!empty($userAppsOrder) && !$isForced) {
-                $appsOrder = $userAppsOrder;
-            }
-
             $userTargetBlankMode = $this->config->getUserValueInt($this->user, 'target-blank-mode', '1');
             $userTargetBlankApps = $this->config->getUserValueArray($this->user, 'target-blank-apps', '[]');
 
@@ -111,10 +121,10 @@ class JsController extends Controller
                 $targetBlankApps = $userTargetBlankApps;
             }
 
-            $isAvatarSet = \OC::$server->getAvatarManager()->getAvatar($this->user->getUid())->exists();
+            $isAvatarSet = OC::$server->getAvatarManager()->getAvatar($this->user->getUid())->exists();
 
             if ($useAvatar && $isAvatarSet) {
-                $avatar = \OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', [
+                $avatar = OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', [
                     'userId' => $this->user->getUid(),
                     'size' => 128,
                     'v' => $this->config->getUserValueInt($this->user, 'avatar', 'version', 0),
@@ -122,13 +132,13 @@ class JsController extends Controller
             }
 
             if ($this->config->getAppValueBool('show-settings', '0')) {
-                $settingsNav = \OC::$server->getNavigationManager()->getAll('settings');
+                $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', [
+                        'avatar' => OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', [
                             'userId' => $this->user->getUid(),
                             'size' => 32,
                             'v' => $this->config->getUserValueInt($this->user, 'avatar', 'version', 0),
@@ -138,7 +148,7 @@ class JsController extends Controller
             }
         }
 
-        $indexUrl = \OC::$server->getURLGenerator()->linkTo('', 'index.php');
+        $indexUrl = OC::$server->getURLGenerator()->linkTo('', 'index.php');
 
         return [
             'opener-position' => $this->config->getAppValue('opener-position', 'before'),
@@ -151,14 +161,9 @@ class JsController extends Controller
             'side-with-categories' => $this->config->getAppValueBool('side-with-categories', '0'),
             'big-menu' => $this->config->getAppValueBool('big-menu', '0'),
             'big-menu-hidden-apps' => $this->config->getAppValueArray('big-menu-hidden-apps', '[]'),
-            'apps-order' => $appsOrder,
             'avatar' => $avatar,
             'top-menu-apps' => $topMenuApps,
             'top-side-menu-apps' => $topSideMenuApps,
-            'top-menu-mouse-over-hidden-label' => $this->config->getAppValueInt(
-                'top-menu-mouse-over-hidden-label',
-                '0'
-            ),
             'target-blank-apps' => $targetBlankApps,
             'settings' => $settings,
             'logo' => $this->themingDefaults->getLogo(),

lib/Controller/NavController.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @license GNU AGPL version 3 or any later version
  *
@@ -19,15 +18,13 @@
 
 namespace OCA\SideMenu\Controller;
 
+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\Attribute\FrontpageRoute;
-use OCP\AppFramework\Http\Attribute\NoAdminRequired;
-use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
-use OCP\AppFramework\Http\Attribute\PublicPage;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\IRequest;
 use OCP\IUserSession;
@@ -35,25 +32,59 @@ use OCP\L10N\IFactory;
 
 class NavController extends Controller
 {
+    /**
+     * @var ConfigProxy
+     */
+    protected $config;
+
+    /**
+     * @var AppRepository
+     */
+    protected $appRepository;
+
+    /**
+     * @var IFactory
+     */
+    protected $l10nFactory;
+
+    /**
+     * @var CategoryFetcher
+     */
+    protected $categoryFetcher;
+
+    /**
+     * @var URLGenerator
+     */
+    protected $router;
+
     public function __construct(
         string $appName,
         IRequest $request,
-        protected ConfigProxy $config,
+        ConfigProxy $config,
-        protected AppRepository $appRepository,
+        AppRepository $appRepository,
-        protected CategoryRepository $categoryRepository,
+        CategoryRepository $categoryRepository,
-        protected URLGenerator $router,
+        URLGenerator $router,
-        protected IFactory $l10nFactory
+        IFactory $l10nFactory
     ) {
         parent::__construct($appName, $request);
+
+        $this->config = $config;
+        $this->appRepository = $appRepository;
+        $this->categoryRepository = $categoryRepository;
+        $this->l10nFactory = $l10nFactory;
+        $this->router = $router;
     }
 
-    #[NoCSRFRequired]
+    /**
-    #[NoAdminRequired]
+     * @NoAdminRequired
-    #[PublicPage]
+     * @NoCSRFRequired
-    #[FrontpageRoute(verb: 'GET', url: '/nav/items')]
+     * @PublicPage
-    public function items(): JSONResponse
+     *
+     * @return JSONResponse
+     */
+    public function items()
     {
-        $user = \OC::$server[IUserSession::class]->getUser();
+        $user = OC::$server[IUserSession::class]->getUser();
         $items = [];
 
         if (!$user) {
@@ -62,13 +93,11 @@ class NavController extends Controller
             ]);
         }
 
-        $apps = $this->appRepository->getOrderedApps($user);
+        $apps = $this->appRepository->getVisibleApps();
         $categoriesLabels = $this->categoryRepository->getOrderedCategories();
         $hiddenApps = $this->config->getAppValueArray('big-menu-hidden-apps', '[]');
         $isForced = $this->config->getAppValueBool('force', '0');
         $topMenuApps = $this->config->getAppValueArray('top-menu-apps', '[]');
-        $topSideMenuApps = $this->config->getAppValueArray('top-side-menu-apps', '[]');
-        $userTopSideMenuApps = $this->config->getUserValueArray($user, 'top-side-menu-apps', '[]');
         $userTopMenuApps = $this->config->getUserValueArray($user, 'top-menu-apps', '[]');
         $appsCategories = [];
         $categoriesAppsCount = [];
@@ -77,16 +106,12 @@ class NavController extends Controller
             $topMenuApps = $userTopMenuApps;
         }
 
-        if (!$isForced && !empty($userTopSideMenuApps)) {
+        foreach ($apps as $app) {
-            $topSideMenuApps = $userTopSideMenuApps;
+            if (in_array($app['id'], $topMenuApps)) {
+                continue;
             }
 
-        foreach ($apps as $app) {
+            if (in_array($app['id'], $hiddenApps)) {
-            $inTopMenuApps = in_array($app['id'], $topMenuApps);
-            $inTopSideMenuApps = in_array($app['id'], $topSideMenuApps);
-            $inHiddenApps = in_array($app['id'], $hiddenApps);
-
-            if (($inTopMenuApps && !$inTopSideMenuApps) || $inHiddenApps) {
                 continue;
             }
 
@@ -153,16 +178,20 @@ class NavController extends Controller
         foreach ($items as $category => $value) {
             if (empty($items[$category]['apps'])) {
                 unset($items[$category]);
+            } else {
+                uasort($items[$category]['apps'], function ($a, $b) {
+                    return ($a['name'] < $b['name']) ? -1 : 1;
+                });
             }
         }
 
         usort($items, function ($a, $b) use ($categoriesLabels) {
             foreach ($categoriesLabels as $key => $value) {
-                if ('other' === $a['categoryId']) {
+                if ($a['categoryId'] === 'other') {
                     return -1;
                 }
 
-                if ('other' === $b['categoryId']) {
+                if ($b['categoryId'] === 'other') {
                     return 1;
                 }
 

lib/Controller/PersonalSettingController.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,29 +21,47 @@ namespace OCA\SideMenu\Controller;
 use OCA\SideMenu\AppInfo\Application;
 use OCA\SideMenu\Service\ConfigProxy;
 use OCP\AppFramework\Controller;
-use OCP\AppFramework\Http\Attribute\FrontpageRoute;
+use OCP\AppFramework\Http\Response;
-use OCP\AppFramework\Http\Attribute\NoAdminRequired;
-use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
 use OCP\IConfig;
 use OCP\IRequest;
 use OCP\IUserSession;
 
 class PersonalSettingController extends Controller
 {
-    public function __construct(
+    /**
-        $appName,
+     * @var IConfig
-        IRequest $request,
+     */
-        protected IConfig $config,
+    protected $config;
-        protected ConfigProxy $configProxy,
+
-        protected IUserSession $userSession
+    /**
-    ) {
+     * @var ConfigProxy
+     */
+    protected $configProxy;
+
+    /**
+     * @var IUserSession
+     */
+    protected $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;
     }
 
-    #[NoCSRFRequired]
+    /**
-    #[NoAdminRequired]
+     * @NoAdminRequired
-    #[FrontpageRoute(verb: 'POST', url: '/personalSetting/valueSet')]
+     * @NoCSRFRequired
-    public function valueSet($name, $value): array
+     *
+     * @param mixed $name
+     * @param mixed $value
+     *
+     * @return Response
+     */
+    public function valueSet($name, $value)
     {
         $doSave = false;
         $user = $this->userSession->getUser();
@@ -80,7 +97,7 @@ class PersonalSettingController extends Controller
             }
         }
 
-        if (in_array($name, ['top-menu-apps', 'top-side-menu-apps', 'apps-order'])) {
+        if (in_array($name, ['top-menu-apps', 'top-side-menu-apps'])) {
             $doSave = true;
             $data = json_decode($value, true);
 

lib/Service/AppRepository.php

@@ -2,13 +2,6 @@
 
 namespace OCA\SideMenu\Service;
 
-use OC\User\User;
-use OCA\SideMenu\AppInfo\Application;
-use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
-use OCP\AppFramework\Http\TemplateResponse;
-use OCP\EventDispatcher\IEventDispatcher;
-use OCP\INavigationManager;
-use OCP\IUserSession;
 use OCP\L10N\IFactory;
 
 /**
@@ -18,27 +11,47 @@ use OCP\L10N\IFactory;
  */
 class AppRepository
 {
+    /**
+     * @var \OC_App
+     */
+    protected $ocApp;
+
+    /**
+     * @var IFactory
+     */
+    protected $l10nFactory;
+
+    /**
+     * @var ConfigProxy
+     */
+    protected $config;
+
+    /**
+     * @var CategoryRepository
+     */
+    protected $categoryRepository;
+
     public function __construct(
-        protected \OC_App $ocApp,
+        \OC_App $ocApp,
-        protected INavigationManager $navigationManager,
+        IFactory $l10nFactory,
-        protected IFactory $l10nFactory,
+        ConfigProxy $config,
-        protected ConfigProxy $config,
+        CategoryRepository $categoryRepository
-        protected CategoryRepository $categoryRepository,
+    )
-        protected IEventDispatcher $dispatcher,
+    {
-        protected IUserSession $userSession,
+        $this->ocApp = $ocApp;
-    ) {
+        $this->l10nFactory = $l10nFactory;
-        $this->dispatcher->dispatchTyped(new BeforeTemplateRenderedEvent(
+        $this->config = $config;
-            $this->userSession->isLoggedIn(),
+        $this->categoryRepository = $categoryRepository;
-            new TemplateResponse(Application::APP_NAME, '')
-        ));
     }
 
     /**
      * Retrieves visibles apps.
+     *
+     * @return array
      */
-    public function getVisibleApps(): array
+    public function getVisibleApps()
     {
-        $navigation = $this->navigationManager->getAll();
+        $navigation = $this->ocApp->getNavigation();
         $appCategoriesCustom = $this->config->getAppValueArray('apps-categories-custom', '[]');
         $categories = $this->categoryRepository->getOrderedCategories();
         $apps = $this->ocApp->listAllApps();
@@ -49,7 +62,7 @@ class AppRepository
 
             foreach ([$app['id'], $app['id'].'_index'] as $id) {
                 if (isset($navigation[$id])) {
-                    $app['name'] = $this->getAppName($app);
+                    $app['name'] = $this->l10nFactory->get($id)->t($app['name']);
                     $app['href'] = $navigation[$id]['href'];
                     $app['icon'] = $navigation[$id]['icon'];
 
@@ -62,25 +75,17 @@ class AppRepository
             if ('external_index' === substr($app['id'], 0, 14)) {
                 $visibleApps[$app['id']] = [
                     'id' => $app['id'],
-                    'name' => $this->getAppName($app),
+                    'name' => $this->l10nFactory->get($app['id'])->t($app['name']),
                     'href' => $app['href'],
                     'icon' => $app['icon'],
                     'category' => [
                         'external_links',
                     ],
                 ];
-            } elseif ('tables_application' === substr($app['id'], 0, 18)) {
-                $visibleApps[$app['id']] = [
-                    'id' => $app['id'],
-                    'name' => $this->getAppName($app),
-                    'href' => $app['href'],
-                    'icon' => $app['icon'],
-                    'category' => [],
-                ];
             } elseif ('files' === $app['id']) {
                 $visibleApps[$app['id']] = [
                     'id' => $app['id'],
-                    'name' => $this->getAppName($app),
+                    'name' => $this->l10nFactory->get($app['id'])->t($app['name']),
                     'href' => $app['href'],
                     'icon' => $app['icon'],
                     'category' => [],
@@ -94,42 +99,10 @@ class AppRepository
             }
         }
 
-        return $visibleApps;
+        usort($visibleApps, function ($a, $b) {
-    }
-
-    public function getAppName($app): string
-    {
-        return $this->config->getAppValue(
-            'app.navigation.name',
-            $this->l10nFactory->get($app['id'])->t($app['name']),
-            $app['id']
-        );
-    }
-
-    public function getOrderedApps(?User $user = null): array
-    {
-        $apps = $this->getVisibleApps();
-        $orders = $this->config->getAppValueArray('apps-order', '[]');
-
-        if (null !== $user && !$this->config->getAppValueBool('force', '0')) {
-            $userOrders = $this->config->getUserValueArray($user, 'apps-order', '[]');
-
-            if (!empty($userOrders)) {
-                $orders = $userOrders;
-            }
-        }
-
-        usort($apps, function ($a, $b) use ($orders) {
-            $ak = array_keys($orders, $a['id'])[0] ?? null;
-            $bk = array_keys($orders, $b['id'])[0] ?? null;
-
-            if (null === $ak || null === $bk) {
             return ($a['name'] < $b['name']) ? -1 : 1;
-            }
-
-            return $ak < $bk ? -1 : 1;
         });
 
-        return $apps;
+        return $visibleApps;
     }
 }

lib/Service/CategoryRepository.php

@@ -15,18 +15,51 @@ use OCP\L10N\IFactory;
  */
 class CategoryRepository
 {
+    /**
+     * @var CategoryFetcher
+     */
+    protected $categoryFetcher;
+
+    /**
+     * @var IFactory
+     */
+    protected $l10nFactory;
+
+    /**
+     * @var ConfigProxy
+     */
+    protected $config;
+
+    /**
+     * @var IConfig
+     */
+    protected $iConfig;
+
+    /**
+     * @var IUserSession
+     */
+    protected $userSession;
+
     public function __construct(
-        protected CategoryFetcher $categoryFetcher,
+        CategoryFetcher $categoryFetcher,
-        protected ConfigProxy $config,
+        ConfigProxy $config,
-        protected IConfig $iConfig,
+        IConfig $iConfig,
-        protected IFactory $l10nFactory,
+        IFactory $l10nFactory,
-        protected IUserSession $userSession
+        IUserSession $userSession
-    ) {}
+    ) {
+        $this->categoryFetcher = $categoryFetcher;
+        $this->l10nFactory = $l10nFactory;
+        $this->config = $config;
+        $this->iConfig = $iConfig;
+        $this->userSession = $userSession;
+    }
 
     /**
      * Retrieves categories.
+     *
+     * @return array
      */
-    public function getOrderedCategories(): array
+    public function getOrderedCategories()
     {
         $currentLanguage = substr($this->l10nFactory->findLanguage(), 0, 2);
         $type = $this->config->getAppValue('categories-order-type', 'default');
@@ -41,8 +74,7 @@ class CategoryRepository
         }
 
         foreach ($categoriesLabels as $k => $category) {
-            $categoriesLabels[$category['id']] = $category['translations'][$currentLanguage]['name'] ??
+            $categoriesLabels[$category['id']] = $category['translations'][$currentLanguage]['name'] ?? $category['translations']['en']['name'];
-                $category['translations']['en']['name'];
 
             unset($categoriesLabels[$k]);
         }

lib/Service/ConfigProxy.php

@@ -13,7 +13,12 @@ use OCP\IConfig;
  */
 class ConfigProxy
 {
-    public function __construct(protected IConfig $config)
+    /**
+     * @var IConfig
+     */
+    protected $config;
+
+    public function __construct(IConfig $config)
     {
         $this->config = $config;
     }

lib/Service/LangRepository.php

@@ -11,7 +11,12 @@ use OCP\IDBConnection;
  */
 class LangRepository
 {
-    public function __construct(protected IDBConnection $db)
+    /**
+     * @var IDBConnection
+     */
+    protected $db;
+
+    public function __construct(IDBConnection $db)
     {
         $this->db = $db;
     }

lib/Settings/Admin.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,25 +21,76 @@ namespace OCA\SideMenu\Settings;
 use OCA\SideMenu\AppInfo\Application;
 use OCA\SideMenu\Service\AppRepository;
 use OCA\SideMenu\Service\CategoryRepository;
-use OCA\SideMenu\Service\Color;
 use OCA\SideMenu\Service\ConfigProxy;
-use OCA\SideMenu\Service\LangRepository;
-use OCA\Theming\ThemingDefaults;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IL10N;
+use OCP\ILogger;
 use OCP\Settings\ISettings;
+use OCA\Theming\ThemingDefaults;
+use OCA\SideMenu\Service\Color;
+use OCA\SideMenu\Service\LangRepository;
 
 class Admin implements ISettings
 {
+    /**
+     * @var IL10N
+     */
+    private $l;
+
+    /**
+     * @var ILogger
+     */
+    private $logger;
+
+    /**
+     * @var ConfigProxy
+     */
+    private $config;
+
+    /**
+     * @var AppRepository
+     */
+    private $appRepository;
+
+    /**
+     * @var CategoryRepository
+     */
+    private $categoryRepository;
+
+    /**
+     * @var ThemingDefaults
+     */
+    protected $theming;
+
+    /**
+     * @var Color
+     */
+    protected $color;
+
+    /**
+     * @var LangRepository
+     */
+    protected $langRepository;
+
     public function __construct(
-        protected IL10N $l,
+        IL10N $l,
-        protected ConfigProxy $config,
+        ILogger $logger,
-        protected AppRepository $appRepository,
+        ConfigProxy $config,
-        protected CategoryRepository $categoryRepository,
+        AppRepository $appRepository,
-        protected ThemingDefaults $theming,
+        CategoryRepository $categoryRepository,
-        protected Color $color,
+        ThemingDefaults $theming,
-        protected LangRepository $langRepository
+        Color $color,
-    ) {}
+        LangRepository $langRepository
+    ) {
+        $this->l = $l;
+        $this->logger = $logger;
+        $this->config = $config;
+        $this->appRepository = $appRepository;
+        $this->categoryRepository = $categoryRepository;
+        $this->theming = $theming;
+        $this->color = $color;
+        $this->langRepository = $langRepository;
+    }
 
     /**
      * @return TemplateResponse
@@ -75,24 +125,15 @@ class Admin implements ISettings
             'background-color' => $backgroundColor,
             'background-color-to' => $backgroundColorTo,
             'background-color-opacity' => $this->config->getAppValueInt('background-color-opacity', '100'),
-            'current-app-background-color' => $this->config->getAppValue(
+            'current-app-background-color' => $this->config->getAppValue('current-app-background-color', $darkenPrimaryColor2),
-                'current-app-background-color',
-                $darkenPrimaryColor2
-            ),
             'loader-color' => $this->config->getAppValue('loader-color', $lightenPrimaryColor),
             'icon-invert-filter' => $this->config->getAppValueInt('icon-invert-filter', '0'),
             'icon-opacity' => $this->config->getAppValueInt('icon-opacity', '100'),
             'text-color' => $this->config->getAppValue('text-color', $textColor),
             'dark-mode-background-color' => $darkModeBackgroundColor,
             'dark-mode-background-color-to' => $darkModeBackgroundColorTo,
-            'dark-mode-background-color-opacity' => $this->config->getAppValueInt(
+            'dark-mode-background-color-opacity' => $this->config->getAppValueInt('dark-mode-background-color-opacity', '100'),
-                'dark-mode-background-color-opacity',
+            'dark-mode-current-app-background-color' => $this->config->getAppValue('dark-mode-current-app-background-color', $darkenPrimaryColor2),
-                '100'
-            ),
-            'dark-mode-current-app-background-color' => $this->config->getAppValue(
-                'dark-mode-current-app-background-color',
-                $darkenPrimaryColor2
-            ),
             'dark-mode-loader-color' => $this->config->getAppValue('dark-mode-loader-color', $textColor),
             'dark-mode-icon-invert-filter' => $this->config->getAppValueInt('dark-mode-icon-invert-filter', '0'),
             'dark-mode-icon-opacity' => $this->config->getAppValueInt('dark-mode-icon-opacity', '100'),
@@ -118,12 +159,6 @@ class Admin implements ISettings
             'force' => $this->config->getAppValue('force', '0'),
             'target-blank-apps' => $this->config->getAppValueArray('target-blank-apps', '[]'),
             'top-menu-apps' => $this->config->getAppValueArray('top-menu-apps', '[]'),
-            'top-menu-mouse-over-hidden-label' => $this->config->getAppValue(
-                'top-menu-mouse-over-hidden-label',
-                '0'
-            ),
-            'apps-order' => $this->config->getAppValueArray('apps-order', '[]'),
-            'ordered-apps' => $this->appRepository->getOrderedApps(),
             'top-side-menu-apps' => $this->config->getAppValueArray('top-side-menu-apps', '[]'),
             'default-enabled' => $this->config->getAppValue('default-enabled', '1'),
             'apps' => $this->appRepository->getVisibleApps(),

lib/Settings/AdminSection.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @license GNU AGPL version 3 or any later version
  *
@@ -26,26 +25,59 @@ use OCP\Settings\IIconSection;
 
 class AdminSection implements IIconSection
 {
-    public function __construct(
+    /**
-        protected IURLGenerator $url,
+     * @var IL10N
-        protected IL10N $l
+     */
-    ) {}
+    private $l;
 
+    /**
+     * @var IURLGenerator
+     */
+    private $url;
+
+    public function __construct(IURLGenerator $url, IL10N $l)
+    {
+        $this->url = $url;
+        $this->l = $l;
+    }
+
+    /**
+     * returns the ID of the section. It is supposed to be a lower case string,
+     * e.g. 'ldap'.
+     *
+     * @returns string
+     */
     public function getID()
     {
         return Application::APP_ID;
     }
 
+    /**
+     * returns the translated name as it should be displayed, e.g. 'LDAP / AD
+     * integration'. Use the L10N service to translate it.
+     *
+     * @return string
+     */
     public function getName()
     {
         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 priority values. It is required to return a value between 0 and 99.
+     *
+     * E.g.: 70
+     */
     public function getPriority()
     {
         return 70;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function getIcon()
     {
         return $this->url->imagePath(Application::APP_ID, 'icon.svg');

lib/Settings/Personal.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @license GNU AGPL version 3 or any later version
  *
@@ -24,17 +23,45 @@ use OCA\SideMenu\Service\AppRepository;
 use OCA\SideMenu\Service\ConfigProxy;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IL10N;
+use OCP\ILogger;
 use OCP\IUserSession;
 use OCP\Settings\ISettings;
 
 class Personal implements ISettings
 {
-    public function __construct(
+    /**
-        protected IL10N $l,
+     * @var IL10N
-        protected ConfigProxy $config,
+     */
-        protected IUserSession $userSession,
+    private $l;
-        protected AppRepository $appRepository
+
-    ) {}
+    /**
+     * @var ILogger
+     */
+    private $logger;
+
+    /**
+     * @var ConfigProxy
+     */
+    private $config;
+
+    /**
+     * @var IUserSession
+     */
+    private $userSession;
+
+    /**
+     * @var AppRepository
+     */
+    private $appRepository;
+
+    public function __construct(IL10N $l, ILogger $logger, ConfigProxy $config, IUserSession $userSession, AppRepository $appRepository)
+    {
+        $this->l = $l;
+        $this->logger = $logger;
+        $this->config = $config;
+        $this->userSession = $userSession;
+        $this->appRepository = $appRepository;
+    }
 
     /**
      * @return TemplateResponse
@@ -54,9 +81,7 @@ class Personal implements ISettings
             'top-side-menu-apps' => $this->config->getUserValueArray($user, 'top-side-menu-apps', '[]'),
             'target-blank-mode' => $this->config->getUserValue($user, 'target-blank-mode', '1'),
             'target-blank-apps' => $this->config->getUserValueArray($user, 'target-blank-apps', '[]'),
-            'apps-order' => $this->config->getUserValueArray($user, 'apps-order', '[]'),
             'apps' => $this->appRepository->getVisibleApps(),
-            'ordered-apps' => $this->appRepository->getOrderedApps($user),
         ];
 
         return new TemplateResponse(Application::APP_ID, 'settings/personal-form', $parameters, '');

lib/Settings/PersonalSection.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @license GNU AGPL version 3 or any later version
  *
@@ -27,12 +26,34 @@ use OCP\Settings\IIconSection;
 
 class PersonalSection implements IIconSection
 {
-    public function __construct(
+    /**
-        protected IURLGenerator $url,
+     * @var IL10N
-        protected IL10N $l,
+     */
-        protected ConfigProxy $configProxy
+    private $l;
-    ) {}
 
+    /**
+     * @var IURLGenerator
+     */
+    private $url;
+
+    /**
+     * @var ConfigProxy
+     */
+    private $configProxy;
+
+    public function __construct(IURLGenerator $url, IL10N $l, ConfigProxy $configProxy)
+    {
+        $this->url = $url;
+        $this->l = $l;
+        $this->configProxy = $configProxy;
+    }
+
+    /**
+     * returns the ID of the section. It is supposed to be a lower case string,
+     * e.g. 'ldap'.
+     *
+     * @returns string
+     */
     public function getID()
     {
         if ($this->configProxy->getAppValueBool('force', '0')) {
@@ -42,6 +63,12 @@ class PersonalSection implements IIconSection
         return Application::APP_ID;
     }
 
+    /**
+     * returns the translated name as it should be displayed, e.g. 'LDAP / AD
+     * integration'. Use the L10N service to translate it.
+     *
+     * @return string
+     */
     public function getName()
     {
         if ($this->configProxy->getAppValueBool('force', '0')) {
@@ -51,6 +78,13 @@ class PersonalSection implements IIconSection
         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 priority values. It is required to return a value between 0 and 99.
+     *
+     * E.g.: 70
+     */
     public function getPriority()
     {
         if ($this->configProxy->getAppValueBool('force', '0')) {
@@ -60,6 +94,9 @@ class PersonalSection implements IIconSection
         return 70;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function getIcon()
     {
         return $this->url->imagePath(Application::APP_ID, 'icon.svg');

package.json

@@ -2,24 +2,20 @@
 	"license": "agpl",
 	"private": true,
 	"scripts": {
-		"build": "NODE_ENV=production ./node_modules/.bin/webpack-cli --progress --config webpack.js",
+		"build": "NODE_ENV=production webpack --progress --config webpack.js",
-		"dev": "NODE_ENV=development ./node_modules/.bin/webpack-cli --progress --config webpack.js",
+		"dev": "NODE_ENV=development webpack --progress --config webpack.js",
-		"watch": "NODE_ENV=development ./node_modules/.bin/webpack-cli --progress --watch --config webpack.js",
+		"watch": "NODE_ENV=development webpack --progress --watch --config webpack.js",
-		"lint": "./node_modules/.bin/eslint --ext .js,.vue src",
+		"lint": "eslint --ext .js,.vue src",
-		"lint:fix": "./node_modules/.bin/eslint --ext .js,.vue src --fix",
+		"lint:fix": "eslint --ext .js,.vue src --fix",
-		"stylelint": "./node_modules/.bin/stylelint src",
+		"stylelint": "stylelint src",
-		"stylelint:fix": "./node_modules/.bin/stylelint src --fix"
+		"stylelint:fix": "stylelint src --fix"
 	},
 	"dependencies": {
-		"@nextcloud/axios": "^2.5.1",
+		"@nextcloud/axios": "^1.8.0",
-		"@nextcloud/browserslist-config": "^3.0.1",
+		"@nextcloud/vue": "^1.5.0",
-		"@nextcloud/event-bus": "^3.3.1",
+		"axios": "^0.24.0",
-		"@nextcloud/initial-state": "^2.2.0",
+		"trim": "^1.0.1",
-		"@nextcloud/l10n": "^3.1.0",
+		"vue": "^2.6.11"
-		"@nextcloud/vue": "^8.19.0",
-		"@vueuse/core": "^11.1.0",
-		"axios": "^1.6.7",
-		"trim": "^1.0.1"
 	},
 	"browserslist": [
 		"extends @nextcloud/browserslist-config"
@@ -28,46 +24,37 @@
 		"node": ">=16.0.0"
 	},
 	"devDependencies": {
-		"@babel/node": "^7.25.7",
+		"@babel/core": "^7.9.0",
-		"@babel/plugin-transform-private-methods": "^7.25.7",
+		"@babel/plugin-syntax-dynamic-import": "^7.8.3",
-		"@babel/preset-typescript": "^7.24.7",
+		"@babel/preset-env": "^7.9.0",
-		"@cypress/vue2": "^2.1.1",
+		"@nextcloud/browserslist-config": "^1.0.0",
-		"@cypress/webpack-preprocessor": "^6.0.2",
+		"@nextcloud/eslint-config": "^8.1.2",
-		"@nextcloud/babel-config": "^1.2.0",
+		"babel-eslint": "^10.1.0",
-		"@nextcloud/eslint-config": "^8.4.1",
+		"babel-loader": "^8.1.0",
-		"@nextcloud/stylelint-config": "^3.0.1",
+		"css-loader": "^3.4.2",
-		"@nextcloud/typings": "^1.9.1",
+		"eslint": "^8.0.0",
-		"@nextcloud/webpack-vue-config": "^6.0.1",
+		"eslint-config-standard": "^17.0.0",
-		"@simplewebauthn/types": "^10.0.0",
+		"eslint-import-resolver-webpack": "^0.12.1",
-		"@types/dockerode": "^3.3.29",
+		"eslint-plugin-import": "^2.20.0",
-		"@types/wait-on": "^5.3.4",
+		"eslint-plugin-nextcloud": "^0.3.0",
-		"@vue/tsconfig": "^0.5.1",
+		"eslint-plugin-node": "^10.0.0",
-		"babel-loader": "^9.2.1",
+		"eslint-plugin-promise": "^6.0.0",
-		"babel-loader-exclude-node-modules-except": "^1.2.1",
+		"eslint-plugin-standard": "^4.0.1",
-		"babel-plugin-module-resolver": "^5.0.2",
+		"eslint-plugin-vue": "^9.0.0",
-		"colord": "^2.9.3",
+		"eslint-webpack-plugin": "^3.0.0",
-		"eslint-plugin-cypress": "^3.5.0",
+		"file-loader": "^6.0.0",
-		"eslint-plugin-es": "^4.1.0",
+		"sass": "^1.49.9",
-		"exports-loader": "^5.0.0",
+		"sass-loader": "^13.0.2",
-		"file-loader": "^6.2.0",
+		"stylelint": "^14.0.0",
-		"handlebars-loader": "^1.7.3",
+		"stylelint-config-recommended-scss": "^7.0.0",
-		"jasmine-core": "~2.5.2",
+		"stylelint-scss": "^4.0.0",
-		"jasmine-sinon": "^0.4.0",
+		"stylelint-webpack-plugin": "^3.3.0",
-		"jsdoc": "^4.0.2",
+		"url-loader": "^4.0.0",
-		"raw-loader": "^4.0.2",
+		"vue-loader": "^15.9.1",
-		"sass": "^1.79.3",
+		"vue-template-compiler": "^2.6.11",
-		"stylelint": "^16.9.0",
+		"webpack": "^5.0.0",
-		"stylelint-use-logical": "^2.1.2",
+		"webpack-cli": "^4.0.0",
-		"ts-loader": "^9.5.0",
+		"webpack-merge": "^4.2.2",
-		"ts-node": "^10.9.1",
+		"webpack-node-externals": "^1.7.2"
-		"tslib": "^2.7.0",
-		"typescript": "^5.6.2",
-		"vue-loader": "^15.9.8",
-		"vue-template-compiler": "^2.7.16",
-		"wait-on": "^8.0.1",
-		"webpack": "^5.94.0",
-		"webpack-cli": "^5.0.2",
-		"webpack-merge": "^6.0.1",
-		"workbox-webpack-plugin": "^7.1.0"
 	}
 }

renovate.json

@@ -1,3 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json"
-}

src/AdminCategoriesCustom.vue

@@ -16,52 +16,53 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 -->
 <template>
     <div>
-    <ul class="side-menu-setting-list" :class="{hide: values.length === 0}">
+        <ul class="side-menu-setting-list">
             <li v-for="item in values" class="side-menu-setting-list-item" v-on:click="showEditForm(item)">
                 <span v-text="item.en"></span>
             </li>
         </ul>
 
-    <NcActions>
+        <Actions>
-      <NcActionButton @click="showAddForm" icon="icon-add"></NcActionButton>
+	        <ActionButton @click="showAddForm" icon="icon-add"></ActionButton>
-    </NcActions>
+        </Actions>
 
-    <NcModal v-if="addForm" @close="hideAddForm">
+		<Modal v-if="addForm" @close="hideAddForm">
 			<div class="modal__content">
                 <div v-for="lang in langs">
                     <span class="lang" v-text="lang"></span>
-          <input type="text" v-model="newValue[lang]" required style="width: calc(100% - 100px)">
+                    <input type="text" v-model="newValue[lang]" required>
                 </div>
 
-        <NcActions>
+                <Actions>
-          <NcActionButton @click="saveAdd" icon="icon-checkmark"></NcActionButton>
+                    <ActionButton @click="saveAdd" icon="icon-checkmark"></ActionButton>
-        </NcActions>
+                </Actions>
             </div>
-    </NcModal>
+		</Modal>
 
-    <NcModal v-if="editForm" @close="hideEditForm">
+		<Modal v-if="editForm" @close="hideEditForm">
 			<div class="modal__content">
                 <div v-for="lang in langs">
                     <span class="lang" v-text="lang"></span>
-          <input type="text" v-model="editValue[lang]" required style="width: calc(100% - 100px)">
+                    <input type="text" v-model="editValue[lang]" required>
                 </div>
 
                 <div class="pull-right">
-          <NcActions>
+                    <Actions>
-            <NcActionButton @click="removeEdit" icon="icon-delete"></NcActionButton>
+                        <ActionButton @click="removeEdit" icon="icon-delete"></ActionButton>
-          </NcActions>
+                    </Actions>
                 </div>
 
-        <NcActions>
+                <Actions>
-          <NcActionButton @click="saveEdit" icon="icon-checkmark"></NcActionButton>
+                    <ActionButton @click="saveEdit" icon="icon-checkmark"></ActionButton>
-        </NcActions>
+                </Actions>
             </div>
-    </NcModal>
+		</Modal>
     </div>
 </template>
 
-<style>
+<style scoped>
     .modal__content {
+        width: 200px;
         padding: 10px;
     }
 
@@ -72,28 +73,28 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
         box-sizing: border-box;
     }
 
+    .modal__content input[type=text] {
+        width: calc(100% - 85px);
+        display: inline-block;
+        margin: 0;
+    }
+
     .pull-right {
         float: right;
     }
 </style>
 
-<style scoped>
-.hide {
-  display: none;
-}
-</style>
-
 <script>
-import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
+import Modal from '@nextcloud/vue/dist/Components/Modal'
-import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
+import Actions from '@nextcloud/vue/dist/Components/Actions'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
+import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
 
 export default {
     name: 'AdminCategoriesCustom',
     components: {
-    NcModal,
+        Modal,
-    NcActions,
+        Actions,
-    NcActionButton,
+        ActionButton,
     },
     data() {
         return {

src/AppMenu.vue

@@ -1,393 +0,0 @@
-
-<!--
-  - @copyright Copyright (c) 2022 Julius Härtl <jus@bitgrid.net>
-  -
-  - @author Julius Härtl <jus@bitgrid.net>
-  -
-  - @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>
-  <nav
-    class="app-menu show"
-    :aria-label="t('core', 'Applications menu')"
-  >
-    <ul
-      class="app-menu-main"
-      :class="{ 'app-menu-main__hidden-label': hiddenLabels === 1, 'app-menu-main__show-hovered': hiddenLabels === 2 }"
-      v-if="appList.length"
-      >
-      <li v-for="app in mainAppList(state)"
-        :key="app.id"
-        :data-app-id="app.id"
-        class="app-menu-entry"
-        :class="{ 'app-menu-entry__active': app.active, 'app-menu-entry__hidden-label': hiddenLabels === 1, 'app-menu-main__show-hovered': hiddenLabels === 2 }"
-        :style="makeStyle(app)"
-        >
-        <a :href="app.href"
-          :class="{ 'has-unread': app.unread > 0 }"
-          :aria-label="appLabel(app)"
-          :target="targetBlankApps.indexOf(app.id) !== -1 ? '_blank' : undefined"
-          :aria-current="app.active ? 'page' : false">
-          <img :src="app.icon" alt="">
-          <div class="app-menu-entry--label">
-            {{ app.name }}
-            <span v-if="app.unread > 0" class="hidden-visually unread-counter">{{ app.unread }}</span>
-          </div>
-        </a>
-      </li>
-    </ul>
-    <NcActions class="app-menu-more" :aria-label="t('core', 'More apps')">
-      <NcActionLink v-for="app in popoverAppList(state)"
-        :key="app.id"
-        :aria-label="appLabel(app)"
-        :aria-current="app.active ? 'page' : false"
-        :href="app.href"
-        :style="makeStyle(app)"
-        class="app-menu-popover-entry">
-        <template #icon>
-          <div class="app-icon" :class="{ 'has-unread': app.unread > 0 }">
-            <img :src="app.icon" alt="">
-          </div>
-        </template>
-        {{ app.name }}
-        <span v-if="app.unread > 0" class="hidden-visually unread-counter">{{ app.unread }}</span>
-      </NcActionLink>
-    </NcActions>
-  </nav>
-</template>
-
-<script>
-import { subscribe, unsubscribe } from '@nextcloud/event-bus'
-import { loadState } from '@nextcloud/initial-state'
-import { n, t } from '@nextcloud/l10n'
-import { useElementSize } from '@vueuse/core'
-import { defineComponent, ref } from 'vue'
-import axios from '@nextcloud/axios'
-import { generateOcsUrl } from '@nextcloud/router'
-import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
-import NcActionLink from '@nextcloud/vue/dist/Components/NcActionLink.js'
-
-export default defineComponent({
-  name: 'AppMenu',
-
-  components: {
-    NcActions,
-    NcActionLink,
-  },
-
-  setup() {
-    return {
-        t,
-        n,
-    }
-  },
-
-  data() {
-    return {
-      apps: null,
-      appList: [],
-      observer: null,
-      targetBlankApps: [],
-      hiddenLabels: true,
-      state: 1,
-    }
-  },
-
-  mounted() {
-    axios.get(generateOcsUrl('core/navigation', 2) + '/apps?format=json')
-      .then((response) => response.data)
-      .then((data) => {
-        if (data.ocs.meta.statuscode !== 200) {
-          return
-        }
-
-        this.setApps(data.ocs.data)
-      })
-
-    this.targetBlankApps = window.targetBlankApps
-    this.hiddenLabels = window.topMenuAppsMouseOverHiddenLabel
-    let timeout = null
-
-    window.addEventListener('resize', () => {
-      timeout = window.setTimeout(() => {
-        this.update()
-      }, 300)
-    })
-  },
-
-  methods: {
-    update() {
-      ++this.state
-    },
-
-    mainAppList() {
-      return this.appList.slice(0, this.appLimit())
-    },
-
-    popoverAppList() {
-      return this.appList.slice(this.appLimit())
-    },
-
-    appLimit() {
-      const maxApps = Math.floor(this.$root.$el.offsetWidth / 60)
-
-      if (maxApps < this.appList.length) {
-        // Ensure there is space for the overflow menu
-        return Math.max(maxApps - 1, 0)
-      }
-
-      return maxApps
-    },
-
-    setNavigationCounter(id, counter) {
-      const app = this.appList.find(({ app }) => app === id)
-      if (app) {
-        this.$set(app, 'unread', counter)
-      } else {
-        logger.warn(`Could not find app "${id}" for setting navigation count`)
-      }
-    },
-
-    setApps(apps) {
-      this.appList = []
-      let orders = {}
-
-      window.menuAppsOrder.forEach((app, order) => {
-        orders[app] = order + 1
-      })
-
-      apps.forEach((app) => {
-        Array.from(window.topMenuApps).forEach((id) => {
-          if (app.id === id) {
-            app.order = orders[id] || null
-            this.appList.push(app)
-          }
-        })
-      })
-    },
-
-    appLabel(app) {
-      return app.name
-        + (app.active ? ' (' + t('core', 'Currently open') + ')' : '')
-        + (app.unread > 0 ? ' (' + n('core', '{count} notification', '{count} notifications', app.unread, { count: app.unread }) + ')' : '')
-    },
-
-    makeStyle(app) {
-      if (app.order !== null) {
-        return `order: ${app.order}`
-      }
-    }
-  },
-})
-</script>
-
-<style lang="scss" scoped>
-$header-icon-size: 20px;
-
-.app-menu {
-  width: 100%;
-  display: flex;
-  flex-shrink: 1;
-  flex-wrap: wrap;
-}
-
-.app-menu-main {
-  display: flex;
-  flex-wrap: nowrap;
-
-  .app-menu-entry {
-    width: 50px;
-    height: 50px;
-    position: relative;
-    display: flex;
-
-    &.app-menu-entry__active {
-      opacity: 1;
-
-      &::before {
-        content: " ";
-        position: absolute;
-        pointer-events: none;
-        border-bottom-color: var(--color-main-background);
-        transform: translateX(-50%);
-        width: 12px;
-        height: 5px;
-        border-radius: 3px;
-        background-color: var(--color-primary-text);
-        left: 50%;
-        bottom: 6px;
-        display: block;
-        transition: all 0.1s ease-in-out;
-        opacity: 1;
-      }
-
-      .app-menu-entry--label {
-        font-weight: bold;
-      }
-    }
-
-    a {
-      width: calc(100% - 4px);
-      height: calc(100% - 4px);
-      margin: 2px;
-      color: var(--color-primary-text);
-      position: relative;
-    }
-
-    img {
-      transition: margin 0.1s ease-in-out;
-      width: $header-icon-size;
-      height: $header-icon-size;
-      padding: calc((100% - $header-icon-size) / 2);
-      box-sizing: content-box;
-      filter: var(--background-image-invert-if-bright, var(--primary-invert-if-bright));
-    }
-
-    .app-menu-entry--label {
-      opacity: 0;
-      position: absolute;
-      font-size: 12px;
-      color: var(--color-primary-text);
-      text-align: center;
-      left: 50%;
-      top: 45%;
-      display: block;
-      min-width: 100%;
-      transform: translateX(-50%);
-      transition: all 0.1s ease-in-out;
-      width: 100%;
-      text-overflow: ellipsis;
-      overflow: hidden;
-      letter-spacing: -0.5px;
-    }
-
-    &:not(.app-menu-entry__hidden-label):not(.app-menu-entry__show-hovered):hover,
-    &:not(.app-menu-entry__hidden-label):not(.app-menu-entry__show-hovered):focus-within {
-      opacity: 1;
-      .app-menu-entry--label {
-        opacity: 1;
-        font-weight: bolder;
-        bottom: 0;
-        width: 100%;
-        text-overflow: ellipsis;
-        overflow: hidden;
-      }
-    }
-  }
-
-  // Show labels
-  &:hover,
-  &:focus-within,
-  .app-menu-entry:hover,
-  .app-menu-entry:focus {
-    opacity: 1;
-  }
-
-  &:not(.app-menu-main__hidden-label):not(.app-menu-main__show-hovered):hover,
-  &:not(.app-menu-main__hidden-label):not(.app-menu-main__show-hovered):focus-within,
-  .app-menu-entry:not(.app-menu-entry__hidden-label):hover,
-  .app-menu-entry:not(.app-menu-entry__hidden-label):focus {
-    opacity: 1;
-
-    img {
-      margin-top: -8px;
-    }
-
-    .app-menu-entry--label {
-      opacity: 1;
-      bottom: 0;
-    }
-
-    &::before, .app-menu-entry::before {
-      opacity: 0;
-    }
-  }
-
-  &.app-menu-main__show-hovered .app-menu-entry:hover,
-  &.app-menu-main__show-hovered .app-menu-entry:focus {
-    img {
-      margin-top: -8px;
-    }
-
-    .app-menu-entry--label {
-      opacity: 1;
-      bottom: 0;
-    }
-
-    &::before, .app-menu-entry::before {
-      opacity: 0;
-    }
-  }
-}
-
-::v-deep .app-menu-more .button-vue--vue-tertiary {
-  opacity: .7;
-  margin: 3px;
-  filter: var(--background-image-invert-if-bright, var(--primary-invert-if-bright));
-
-  &:not([aria-expanded="true"]) {
-    color: var(--color-main-text);
-
-    &:hover {
-      opacity: 1;
-      background-color: transparent !important;
-    }
-  }
-
-    &:focus-visible {
-      opacity: 1;
-      outline: none !important;
-    }
-}
-
-.app-menu-popover-entry {
-  .app-icon {
-    position: relative;
-    height: 44px;
-    width: 48px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    filter: var(--background-invert-if-bright, var(--primary-invert-if-bright));
-
-    &.has-unread::after {
-      background-color: var(--color-main-text);
-    }
-
-    img {
-      width: $header-icon-size;
-      height: $header-icon-size;
-    }
-  }
-}
-
-.has-unread::after {
-  content: "";
-  width: 8px;
-  height: 8px;
-  background-color: var(--color-primary-element-text);
-  border-radius: 50%;
-  position: absolute;
-  display: block;
-  top: 10px;
-  right: 10px;
-}
-
-.unread-counter {
-  display: none;
-}
-</style>

src/AppSearch.vue

@@ -1,32 +0,0 @@
-<!--
-@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-search">
-    <input type="text" :value="value" :placeholder="t('side_menu', 'Search')" @input="$emit('input', $event.target.value)">
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'AppSearch',
-  props: {
-    value: {
-      required: true
-    },
-  },
-}
-</script>

src/CloserButton.vue

@@ -15,18 +15,11 @@ 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" :arial-label="label">
+    <button class="side-menu-opener side-menu-closer"></button>
-    <span v-text="label"></span>
-  </button>
 </template>
 
 <script>
 export default {
     name: 'CloserButton',
-  data() {
-    return {
-      label: t('side_menu', 'Close the menu'),
-    }
-  }
 }
 </script>

src/OpenerButton.vue

@@ -15,18 +15,11 @@ 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" :arial-label="label">
+    <button class="side-menu-opener"></button>
-    <span v-text="label"></span>
-  </button>
 </template>
 
 <script>
 export default {
     name: 'OpenerButton',
-  data() {
-    return {
-      label: t('side_menu', 'Toggle the menu'),
-    }
-  }
 }
 </script>

src/PageLoader.js

@@ -1,20 +0,0 @@
-const createElement = require('./lib/createElement')
-
-const PageLoader = () => {
-  const pageLoader = createElement('div', {id: 'side-menu-loader'})
-  const pageLoaderBar = createElement('div', {id: 'side-menu-loader-bar'})
-
-  pageLoader.appendChild(pageLoaderBar)
-  document.querySelector('body').appendChild(pageLoader)
-
-  let pageLoaderValue = 0
-
-  window.addEventListener('beforeunload', () => {
-    setInterval(() => {
-      pageLoaderBar.style.width = pageLoaderValue.toString() + '%'
-      pageLoaderValue = Math.min(pageLoaderValue + .2, 100)
-    }, 25)
-  })
-}
-
-module.exports = PageLoader

src/SettingsButton.vue

@@ -17,12 +17,10 @@ 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" :alt="label">
+                <img v-bind:src="avatar" v-bind:alt="name" v-bind:title="name">
             </span>
         </a>
     </div>

src/SideMenu.js

@@ -16,54 +16,35 @@
  */
 
 import Vue from 'vue'
-import AppMenu from './AppMenu.vue'
 import SideMenu from './SideMenu.vue'
 import SideMenuBig from './SideMenuBig.vue'
 import SideMenuWithCategories from './SideMenuWithCategories.vue'
-import PageLoader from './PageLoader'
 
 Vue.prototype.OC = OC
-Vue.prototype.t = OC.L10N.translate
-
-window.PageLoader = PageLoader
 
 const mountSideMenuComponent = () => {
-  const container = document.querySelector('#side-menu')
+    const sideMenuContainer = document.querySelector('#side-menu')
 
-  if (!container) {
+    if (sideMenuContainer) {
-    return window.setTimeout(mountSideMenuComponent, 50)
+        let component
-  }
 
-  const component = (() => {
+        if (sideMenuContainer.getAttribute('data-bigmenu')) {
-    if (container.getAttribute('data-bigmenu')) {
+            component = SideMenuBig
-      return SideMenuBig
+        } else if(sideMenuContainer.getAttribute('data-sidewithcategories')) {
-    } else if(container.getAttribute('data-sidewithcategories')) {
+            component = SideMenuWithCategories
-      return SideMenuWithCategories
         } else {
-      return SideMenu
+            component = SideMenu
         }
-  })()
 
         const View = Vue.extend(component)
-  const App = new View({})
+        const sideMenu = new View({})
 
-  App.$mount('#side-menu')
+        sideMenu.$mount('#side-menu')
 
         document.querySelector('body').dispatchEvent(new CustomEvent('side-menu.ready'))
+    } else {
+        window.setTimeout(mountSideMenuComponent, 50)
     }
-
-const mountAppMenu = () => {
-  const container = document.querySelector('#header .app-menu')
-
-  if (!container) {
-    return window.setTimeout(mountAppMenu, 50)
-  }
-
-  const View = Vue.extend(AppMenu)
-  const App = new View({})
-
-  App.$mount('#header .app-menu')
 }
 
 mountSideMenuComponent()
-mountAppMenu()

src/SideMenu.vue

@@ -16,19 +16,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 -->
 <template>
     <div id="side-menu">
-    <div class="side-menu-header" v-if="settings || !openerHover || (!avatar && !alwaysDisplayed && logo) || avatar">
+        <div class="side-menu-header">
             <SettingsButton
                 v-if="settings"
                 v-bind:href="settings.href"
                 v-bind:label="settings.name"
                 v-bind:avatar="settings.avatar" />
-      <AppSearch v-model:search="search" />
+
-      <OpenerButton v-if="!alwaysDisplayed" />
+            <OpenerButton />
+
             <Logo
-        v-if="!avatar && !alwaysDisplayed && logo" v-bind:classes="{'side-menu-logo': true, 'avatardiv': false}"
+                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"
@@ -36,12 +38,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
             />
         </div>
 
-    <ul class="side-menu-apps-list" :class="{'side-menu-apps-list--with-settings': !!settings}">
+        <ul class="side-menu-apps-list">
             <SideMenuApp
-        v-for="(app, key) in apps"
+                v-for="app in apps"
-        v-if="searchMatch(app.name)"
                 v-bind:classes="{'side-menu-app': true, 'active': app.active}"
-        v-bind:key="key"
                 v-bind:icon="app.icon"
                 v-bind:label="app.name"
                 v-bind:href="app.href"
@@ -52,13 +52,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 </template>
 
 <script>
+import trim from 'trim'
 import axios from 'axios'
 import OpenerButton from './OpenerButton'
 import SettingsButton from './SettingsButton'
 import SideMenuApp from './SideMenuApp'
-import AppSearch from './AppSearch'
 import Logo from './Logo'
-import { loadState } from '@nextcloud/initial-state'
 
 export default {
     name: 'SideMenu',
@@ -67,7 +66,6 @@ export default {
         OpenerButton,
         SideMenuApp,
         Logo,
-    AppSearch,
     },
     data() {
         return {
@@ -77,94 +75,94 @@ export default {
             avatar: null,
             forceLightIcon: false,
             targetBlankApps: [],
-      hiddenApps: [],
             settings: null,
-      openerHover: false,
-      alwaysDisplayed: false,
-      search: '',
         }
     },
     methods: {
         retrieveApps() {
-      const ncApps = loadState('core', 'apps', [])
+            this.apps = []
-      let orders = {}
+            const links = document.querySelectorAll('#appmenu a')
-      let finalApps = []
+            const menu = document.querySelector('#appmenu')
+            let menuIsHidden = true
 
-      window.menuAppsOrder.forEach((app, order) => {
+            if (menu) {
-        orders[app] = order + 1
+                menuIsHidden = window.getComputedStyle(menu, null).getPropertyValue('display') === 'none'
-      })
+            }
 
-      for (let app of ncApps) {
+            for (let element of links) {
-        if (window.topMenuApps.includes(app.id) && !window.topSideMenuApps.includes(app.id)) {
+                let href = element.getAttribute('href')
+                let parent = element.parentNode
+
+                if (!parent) {
                     continue
                 }
 
-        if (this.hiddenApps.includes(app.id)) {
+                let dataId = parent.getAttribute('data-id')
+                dataId = dataId !== null ? dataId : ''
+
+                if (!parent.classList.contains('app-top-side-menu') && !parent.classList.contains('app-hidden') && !menuIsHidden) {
                     continue
                 }
 
-        app.order = orders[app.id] || null
+                if (href !== '#') {
+                    let svg = element.querySelector('svg').outerHTML
 
-        finalApps.push(app)
+                    svg = svg
+                        .replace(/(height|width)="20"/, '')
+                        .replace('id="invertMenuMain', 'id="invertSideMenu')
+                        .replace('url(#invertMenuMain', 'url(#invertSideMenu')
+
+                    if (this.forceLightIcon) {
+                        svg = svg.replace(/filter="url[^"]+"/, '')
                     }
 
-      finalApps.sort((a, b) => {
+                    this.apps.push({
-        if (a.order === null || b.order === null) {
+                        id: dataId,
-          return a.name < b.name ? -1 : 1
+                        href: href,
-        }
+                        name: trim(element.querySelector('span').innerHTML),
-
+                        icon: svg,
-        return a.order < b.order ? -1 : 1
+                        active: element.classList.contains('active')
                     })
+                }
+            }
 
-      this.apps = finalApps
+            (function(apps) {
-
+                window.setTimeout(function() {
                     document.querySelector('body').dispatchEvent(new CustomEvent('side-menu.apps', {
-        detail: {apps: this.apps},
+                        detail: {apps: apps},
                     }))
+                }, 1000)
+            })(this.apps)
         },
 
         retrieveConfig() {
-    },
+            let that = this
 
-    hasSearchMatch(apps) {
+            axios
-      if (this.search.trim() === '') {
+                .get(OC.generateUrl('/apps/side_menu/js/config'))
-        return true
+                .then(function(response) {
-      }
+                    const config = response.data
 
-      for (let key in apps) {
+                    that.targetBlankApps = config['target-blank-apps']
-        if (this.searchMatch(apps[key].name)) {
+                    that.forceLightIcon = config['force-light-icon']
-          return true
+                    that.avatar = config['avatar']
-        }
+                    that.logo = config['logo']
-      }
+                    that.logoLink = config['logo-link']
-
+                    that.settings = config['settings']
-      return false
+                })
-    },
-
-    searchMatch(name) {
-      if (this.search.trim() === '') {
-        return true
-      }
-
-      return name.toLowerCase().includes(this.search.toLowerCase())
         },
     },
     mounted() {
-    axios
+        this.retrieveConfig()
-      .get(OC.generateUrl('/apps/side_menu/js/config'))
-      .then((response) => {
-        const config = response.data
-
-        this.targetBlankApps = config['target-blank-apps']
-        this.forceLightIcon = config['force-light-icon']
-        this.avatar = config['avatar']
-        this.logo = config['logo']
-        this.logoLink = config['logo-link']
-        this.settings = config['settings']
-        this.openerHover = config['opener-hover']
-        this.alwaysDisplayed = config['always-displayed']
-        this.hiddenApps = config['big-menu-hidden-apps']
         this.retrieveApps()
-      })
+
+        const menu = document.querySelector('#appmenu')
+
+        if (menu) {
+            const config = {attributes: true, childList: true, subtree: true}
+            const observer = new MutationObserver(this.retrieveApps)
+            observer.observe(menu, config)
+        }
     }
 }
 </script>

src/SideMenuApp.vue

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

src/SideMenuBig.vue

@@ -18,13 +18,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
     <div id="side-menu" class="side-menu-big">
         <div class="side-menu-header">
             <CloserButton />
+
             <SettingsButton
                 v-if="settings"
                 v-bind:href="settings.href"
                 v-bind:label="settings.name"
                 v-bind:avatar="settings.avatar"
             />
-      <AppSearch v-model:search="search" />
+
             <OpenerButton />
         </div>
 
@@ -32,14 +33,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
             <div class="side-menu-categories">
                 <Loader v-if="!items.length" />
 
-        <div class="side-menu-category" v-for="(category, key) in items" v-if="hasSearchMatch(category.apps)" v-bind:key="key">
+                <div class="side-menu-category" v-for="category in items">
                     <h2 class="side-menu-category-title" v-if="category.name != ''" v-text="category.name"></h2>
 
                     <ul class="side-menu-apps-list">
                         <SideMenuBigApp
                             v-for="(app, appId) in category.apps"
-              v-if="searchMatch(app.name)"
-              v-bind:key="appId"
                             v-bind:classes="{'side-menu-app': true, 'active': activeApp === appId}"
                             v-bind:icon="app.icon"
                             v-bind:label="app.name"
@@ -59,9 +58,7 @@ import OpenerButton from './OpenerButton'
 import CloserButton from './CloserButton'
 import SettingsButton from './SettingsButton'
 import Loader from './Loader'
-import AppSearch from './AppSearch'
 import SideMenuBigApp from './SideMenuBigApp'
-import { loadState } from '@nextcloud/initial-state'
 
 export default {
     name: 'SideMenuBig',
@@ -71,7 +68,6 @@ export default {
         CloserButton,
         Loader,
         SideMenuBigApp,
-    AppSearch,
     },
     data() {
         return {
@@ -80,18 +76,21 @@ export default {
             targetBlank: false,
             targetBlankApps: [],
             settings: null,
-      search: '',
         }
     },
     methods: {
         retrieveApps() {
+            this.apps = []
+            let that = this
+
             axios
                 .get(OC.generateUrl('/apps/side_menu/nav/items'))
-        .then((response) => {
+                .then(function(response) {
-          this.items = response.data.items
+                    that.items = response.data.items
+
                     let apps = []
 
-          for (let category of this.items) {
+                    for (let category of that.items) {
                         for (let a in category.apps) {
                             apps.push(category.apps[a])
                         }
@@ -104,47 +103,22 @@ export default {
         },
 
         retrieveActiveApp() {
-      const ncApps = loadState('core', 'apps', {})
+            let activeAppLink = document.querySelector('#appmenu a.active')
-
+            this.activeApp = activeAppLink ? activeAppLink.parentNode.getAttribute('data-id') : null
-      for (let id in ncApps) {
-        if (ncApps[id].active) {
-          this.activeApp = id
-        }
-      }
         },
 
         retrieveConfig() {
+            let that = this
+
             axios
                 .get(OC.generateUrl('/apps/side_menu/js/config'))
-        .then((response) => {
+                .then(function(response) {
                     const config = response.data
 
-          this.targetBlankApps = config['target-blank-apps']
+                    that.targetBlankApps = config['target-blank-apps']
-          this.settings = config['settings']
+                    that.settings = config['settings']
                 })
         },
-
-    hasSearchMatch(apps) {
-      if (this.search.trim() === '') {
-        return true
-      }
-
-      for (let key in apps) {
-        if (this.searchMatch(apps[key].name)) {
-          return true
-        }
-      }
-
-      return false
-    },
-
-    searchMatch(name) {
-      if (this.search.trim() === '') {
-        return true
-      }
-
-      return name.toLowerCase().includes(this.search.toLowerCase())
-    },
     },
     mounted() {
         this.retrieveConfig()

src/SideMenuWithCategories.vue

@@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
                 v-bind:label="settings.name"
                 v-bind:avatar="settings.avatar"
             />
-      <AppSearch v-model:search="search" />
+
             <OpenerButton />
         </div>
 
@@ -31,14 +31,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
             <div class="side-menu-categories">
                 <Loader v-if="!items.length" />
 
-        <div class="side-menu-category" v-for="(category, key) in items" v-if="hasSearchMatch(category.apps)" v-bind:key="key">
+                <div class="side-menu-category" v-for="category in items">
                     <h2 class="side-menu-category-title" v-if="category.name != ''" v-text="category.name"></h2>
 
                     <ul class="side-menu-apps-list">
                         <SideMenuBigApp
                             v-for="(app, appId) in category.apps"
-              v-if="searchMatch(app.name)"
-              v-bind:key="appId"
                             v-bind:classes="{'side-menu-app': true, 'active': activeApp === appId}"
                             v-bind:icon="app.icon"
                             v-bind:label="app.name"
@@ -55,20 +53,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 <script>
 import axios from 'axios'
 import OpenerButton from './OpenerButton'
+import CloserButton from './CloserButton'
 import SettingsButton from './SettingsButton'
 import Loader from './Loader'
-import AppSearch from './AppSearch'
 import SideMenuBigApp from './SideMenuBigApp'
-import { loadState } from '@nextcloud/initial-state'
 
 export default {
     name: 'SideMenuWithCategories',
     components: {
         SettingsButton,
         OpenerButton,
+        CloserButton,
         Loader,
         SideMenuBigApp,
-    AppSearch,
     },
     data() {
         return {
@@ -77,18 +74,21 @@ export default {
             targetBlank: false,
             targetBlankApps: [],
             settings: null,
-      search: '',
         }
     },
     methods: {
         retrieveApps() {
+            this.apps = []
+            let that = this
+
             axios
                 .get(OC.generateUrl('/apps/side_menu/nav/items'))
-        .then((response) => {
+                .then(function(response) {
-          this.items = response.data.items
+                    that.items = response.data.items
+
                     let apps = []
 
-          for (let category of this.items) {
+                    for (let category of that.items) {
                         for (let a in category.apps) {
                             apps.push(category.apps[a])
                         }
@@ -101,47 +101,22 @@ export default {
         },
 
         retrieveActiveApp() {
-      const ncApps = loadState('core', 'apps', {})
+            let activeAppLink = document.querySelector('#appmenu a.active')
-
+            this.activeApp = activeAppLink ? activeAppLink.parentNode.getAttribute('data-id') : null
-      for (let id in ncApps) {
-        if (ncApps[id].active) {
-          this.activeApp = id
-        }
-      }
         },
 
         retrieveConfig() {
+            let that = this
+
             axios
                 .get(OC.generateUrl('/apps/side_menu/js/config'))
-        .then((response) => {
+                .then(function(response) {
                     const config = response.data
 
-          this.targetBlankApps = config['target-blank-apps']
+                    that.targetBlankApps = config['target-blank-apps']
-          this.settings = config['settings']
+                    that.settings = config['settings']
                 })
         },
-
-    hasSearchMatch(apps) {
-      if (this.search.trim() === '') {
-        return true
-      }
-
-      for (let key in apps) {
-        if (this.searchMatch(apps[key].name)) {
-          return true
-        }
-      }
-
-      return false
-    },
-
-    searchMatch(name) {
-      if (this.search.trim() === '') {
-        return true
-      }
-
-      return name.toLowerCase().includes(this.search.toLowerCase())
-    },
     },
     mounted() {
         this.retrieveConfig()

src/admin.js

@@ -159,15 +159,9 @@ document.addEventListener('DOMContentLoaded', () => {
             const target = event.target
             const values = JSON.parse(target.getAttribute('data-reset'))
 
-      target.classList.toggle('btn-reset--progress', true)
-
             for (let i in values) {
                 document.querySelector(`#${i}`).value = values[i]
             }
-
-      window.setTimeout(() => {
-        target.classList.toggle('btn-reset--progress', false)
-      }, 800)
         })
     }
 
@@ -255,6 +249,7 @@ document.addEventListener('DOMContentLoaded', () => {
             let value = []
 
             for (let item of document.querySelectorAll('#categories-list .side-menu-setting-list-item')) {
+                console.log(item.getAttribute('data-id'))
                 value.push(item.getAttribute('data-id'))
             }
 
@@ -262,21 +257,4 @@ document.addEventListener('DOMContentLoaded', () => {
         })
     } catch (e) {
     }
-
-  sortable('#apps-order-list .side-menu-setting-list', {
-    placeholderClass: 'side-menu-setting-list-drop'
-  })
-
-  try {
-    sortable('#apps-order-list .side-menu-setting-list')[0].addEventListener('sortstop', (e) => {
-      let value = []
-
-      for (let item of document.querySelectorAll('#apps-order-list .side-menu-setting-list-item')) {
-        value.push(item.getAttribute('data-id'))
-      }
-
-      document.querySelector('input[name="apps-order"]').value = JSON.stringify(value)
-    })
-  } catch (e) {
-  }
 })

src/l10n/fixtures/cs.yaml

@@ -3,8 +3,7 @@
 "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.'
+'Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.': 'Pro otevření/skrytí postranní nabídky použijte zkratku <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">O</span> („O“ jako otevřít). Pro pohyb po použijte klávesu <span class="keyboard-key">Tab</span>.'
-: 'Pro otevření/skrytí postranní nabídky použijte zkratku <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">O</span> („O“ jako otevřít). Pro pohyb po použijte klávesu <span class="keyboard-key">Tab</span>.'
 "Top menu": "Horní nabídka"
 "Apps that not must be moved in the side menu": "Aplikace, které nepřesouvat do postranní nabídky"
 "If there is no selection then the global configuration is applied.": "Pokud neexistuje žádný výběr, je uplatněno globální nastavení."
@@ -39,13 +38,16 @@
 "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)"
+"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"
+"This menu is not compatible with AppOrder.": "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"
@@ -77,6 +79,8 @@
 "With categories": "S kategoriemi"
 "Custom categories": "Vlastní kategorie"
 "Customize application categories": "Přizpůsobte kategorie aplikací"
+"Apps only visible in the top menu": "Aplikace jsou viditelné pouze v horní nabídce "
+"Apps visible in the top and side menus": "Aplikace viditelné v horní a boční nabídce"
 "Reset to default": "Vrátit zpět na výchozí hodnoty"
 "Hidden icon": "Skrytá ikona"
 "Small icon": "Malá ikona"
@@ -86,11 +90,3 @@
 "Small text": "Malý text"
 "Normal text": "Normální text"
 "Big text": "Velký text"
-"Applications": "Aplikace"
-"Applications kept in the top menu": "Aplikace ponechané v horní nabídce"
-"Applications kept in the top menu but also shown in side menu": "Aplikace ponechané v horní nabídce ale také zobrazené v té boční"
-"These applications must be selected in the previous option.": "Tyto aplikace je třeba vybrat v předchozí volbě."
-"Hide labels on mouse over": "Skrýt popisky při najetím ukazatele myši"
-"Except the hovered app": "Except the hovered app"
-"Search": "Search"
-"Toggle the menu": "Toggle the menu"

src/l10n/fixtures/de.yaml

@@ -3,14 +3,13 @@
 "No": "Nein"
 "Yes": "Ja"
 "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.'
+'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.'
-: '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": "Obere Navigationsleiste"
-"Apps that not must be moved in the side menu": "Apps, die nicht ins Seitenmenü verschoben werden sollen"
+"Apps that not must be moved in the side menu": "Anwendungen, die nicht ins Seitenmenü verschoben werden sollen"
 "If there is no selection then the global configuration is applied.": "Wenn keine Auswahl vorhanden ist, wird die globale Konfiguration angewendet."
 "Experimental": "Experimentell"
 "Save": "Speichern"
-"You like this app and you want to support me?": "Du magst diese App und möchtest mich unterstützen?"
+"You like this app and you want to support me?": "Du magst diese Anwendung und möchtest mich unterstützen?"
 "Buy me a coffee ☕": "Gib mir einen Kaffee aus ☕"
 "Hidden": "Ausblenden"
 "Small": "Klein"
@@ -18,9 +17,9 @@
 "Big": "Groß"
 "Colors": "Farben"
 "Background color": "Hintergrundfarbe"
-"Background color of current app": "Hintergrundfarbe der aktuellen App"
+"Background color of current app": "Hintergrundfarbe der aktuellen Anwendung"
 "Text color": "Textfarbe"
-"Loader": "Fortschrittsbalken"
+"Loader": "Ladestandanzeige"
 "Icon": "Symbol"
 "Same color": "Selbe Farbe"
 "Opposite color": "Gegenfarbe"
@@ -37,32 +36,35 @@
 "After the logo": "Nach dem Logo"
 "Position": "Position"
 "Show only the opener (hidden logo)": "Nur das Menü-Symbol anzeigen (Logo wird ausgeblendet)"
-"Do not display the side menu and the opener if there is no application (eg: public pages).": "Zeige das Seitenmenü und das Menü-Symbol nicht an, wenn keine App vorhanden ist (z.B. bei öffentlichen Seiten)."
+"Do not display the side menu and the opener if there is no application (eg: public pages).": "Zeige das Seitenmenü und das Menü-Symbol 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)": "Öffne das Menü, wenn die Maus über das Menü-Symbol bewegt wird (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 das Menü-Symbol bewegt wird (auf Touchscreens automatisch deaktiviert)."
 "Display the big menu": "Großes Menü anzeigen"
+"This menu is not compatible with AppOrder.": "Dieses Menü ist nicht mit <code>AppOrder</code> kompatibel."
 "Display the logo": "Logo anzeigen"
+"This feature is not compatible with the <code>big menu</code> display.": "Diese Funktion ist nicht mit dem <code>großen Menü</code> kompatibel."
 "Icons and texts": "Symbole und Texte"
-"Loader enabled": "Fortschrittsbalken anzeigen"
+"Loader enabled": "Ladestandanzeige aktiviert"
 "Tips": "Tipps"
 "Always displayed": "Immer anzeigen"
+"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ßes Menü"
 "Live preview": "Live-Vorschau"
-"Open apps in new tab": "Öffne Apps in einem neuen Tab"
+"Open apps in new tab": "Öffne Anwendungen 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 Appliste"
+"Show and hide the list of applications": "Ein- und Ausblenden der Anwendungsliste"
 "Use the avatar instead of the logo": "Avatar anstelle des Logos anzeigen"
-"You do not have permission to change the settings.": "Du hast keine Berechtigung, die Einstellungen dieser App zu ändern."
+"You do not have permission to change the settings.": "Du hast keine Berechtigung, die Einstellungen dieser Anwendung zu ändern."
 "Force this configuration to users": "Konfiguration für alle Benutzer erzwingen"
 "Export the configuration": "Konfiguration exportieren"
 "Purge the cache": "Cache leeren"
 "Show the link to settings": "Link zu den Einstellungen anzeigen"
 "The menu is enabled by default for users": "Das Menü ist standardmäßig für alle Benutzer aktiviert"
 "Except when the configuration is forced.": "Gilt nicht, wenn die Konfiguration erzwungen wird."
-"Apps that should not be displayed in the menu": "Apps, die nicht im Menü angezeigt werden sollen"
+"Apps that should not be displayed in the menu": "Anwendungen, die nicht im Menü angezeigt werden sollen"
 "This feature is only compatible with the <code>big menu</code> display.": "Kompatibel mit dem <code>großen Menü</code>."
 "The logo is a link to the default app": "Das Logo ist ein Link zur Standard-App"
 "Others": "Andere"
@@ -76,21 +78,15 @@
 "Dark mode colors": "Farben für den dunklen Modus"
 "With categories": "Mit Kategorien"
 "Custom categories": "Benutzerdefinierte Kategorien"
-"Customize application categories": "App-Kategorien anpassen"
+"Customize application categories": "Anwendungskategorien anpassen"
+"Apps only visible in the top menu": "Apps nur im oberen Menü sichtbar "
+"Apps visible in the top and side menus": "Apps im oberen und seitlichen Menü sichtbar"
 "Reset to default": "Auf Standard zurücksetzen"
 "Hidden icon": "Verstecktes Symbol"
 "Small icon": "Kleines Symbol"
 "Normal icon": "Normales Symbol"
-"Big icon": "Großes Icon"
+"Big icon": "Große Ikone"
 "Hidden text": "Versteckter Text"
 "Small text": "Kleiner Text"
 "Normal text": "Normaler Text"
 "Big text": "Großer Text"
-"Applications": "Apps"
-"Applications kept in the top menu": "Apps in der oberen Navigationsleiste"
-"Applications kept in the top menu but also shown in side menu": "Apps in der oberen Navigationsleiste, die auch im Seitenmenü angezeigt werden sollen"
-"These applications must be selected in the previous option.": "Diese Apps müssen auch in der vorherigen Einstellung ausgewählt werden."
-"Hide labels on mouse over": "Labels ausblenden, wenn sich die Maus darüber befindet (Hover)"
-"Except the hovered app": "Except the hovered app"
-"Search": "Search"
-"Toggle the menu": "Toggle the menu"

src/l10n/fixtures/es.yaml

@@ -1,96 +0,0 @@
-"Custom menu": "Menú personalizado"
-"Enable the custom menu": "Habilitar el menú personalizado"
-"No": "No"
-"Yes": "Sí"
-"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.'
-: 'Usa la combinación de teclas <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> para activar y desactivar el menú lateral. Use <span class="keyboard-key">tab</span> para navegar.'
-"Top menu": "Menu principal"
-"Apps that not must be moved in the side menu": "Aplicaciones que no se deben mover al menú lateral"
-"If there is no selection then the global configuration is applied.": "Si no hay selección, se aplica la configuración global."
-"Experimental": "En pruebas"
-"Save": "Guardar"
-"You like this app and you want to support me?": "¿Te gusta esta aplicación y quieres apoyarme?"
-"Buy me a coffee ☕": "Cómprame un café ☕"
-"Hidden": "Oculto"
-"Small": "Pequeño"
-"Normal": "Normal"
-"Big": "Grande"
-"Hidden icon": "Ocultar Icono"
-"Small icon": "Icono pequeño"
-"Normal icon": "Icono normal"
-"Big icon": "Icono grande"
-"Hidden text": "Texto oculto"
-"Small text": "Texto pequeño"
-"Normal text": "Texto normal"
-"Big text": "Texto grande"
-"Colors": "Colores"
-"Background color": "Color de fondo"
-"Background color of current app": "Color de fondo de la aplicación actual"
-"Text color": "Color del texto"
-"Loader": "Cargador"
-"Icon": "Icono"
-"Same color": "El mismo color"
-"Opposite color": "Color opuesto"
-"Transparent": "Transparente"
-"Opaque": "Opaco"
-"Opener": "Abrir"
-"Default": "Por defecto"
-"Default (dark)": "Por defecto (oscuro)"
-"Hamburger": "Hamburguesa"
-"Hamburger (dark)": "Hamburger (negro)"
-"Hamburger 2": "Hamburguesa 2"
-"Hamburger 2 (dark)": "Hamburger 2 (negro)"
-"Before the logo": "Antes del logotipo"
-"After the logo": "Después del logotipo"
-"Position": "Posición"
-"Show only the opener (hidden logo)": "Mostrar solo abrir (ocultar logotipo)"
-"Do not display the side menu and the opener if there is no application (eg: public pages).": "No mostrar el menú lateral y el abridor si no hay aplicación (por ejemplo: páginas públicas)."
-"Panel": "Panel"
-"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Abra el menú cuando el ratón esté sobre el icono (se desactiva automáticamente en las pantallas táctiles)"
-"Display the big menu": "Mostrar el menú grande"
-"Display the logo": "Mostrar el logotipo"
-"Icons and texts": "Iconos y textos"
-"Loader enabled": "Cargador activado"
-"Tips": "Consejos"
-"Always displayed": "Siempre se muestra"
-"This is the automatic behavior when the menu is always displayed.": "Este es el comportamiento automático cuando aún se muestra el menú."
-"Not compatible with touch screens.": "No es compatible con las pantallas táctiles."
-"Big menu": "Menú grande"
-"Live preview": "Previsualización en directo"
-"Open apps in new tab": "Abrir las aplicaciones en una nueva pestaña"
-"Use the global setting": "Utilizar la configuración global"
-"Use my selection": "Utilizar mi selección"
-"Show and hide the list of applications": "Mostrar y ocultar la lista de aplicaciones"
-"Use the avatar instead of the logo": "Utilizar un avatar en lugar de un logotipo"
-"You do not have permission to change the settings.": "No tienes permiso para cambiar la configuración."
-"Force this configuration to users": "Forzar esta configuración a todos los usuarios"
-"Export the configuration": "Exportar la configuración"
-"Purge the cache": "Vaciar la caché"
-"Show the link to settings": "Mostrar un enlace a la configuración"
-"The menu is enabled by default for users": "El menú está activado por defecto para los usuarios"
-"Except when the configuration is forced.": "Excepto cuando la configuración es forzada."
-"Apps that should not be displayed in the menu": "Aplicaciones que no deben aparecer en el menú"
-"This feature is only compatible with the <code>big menu</code> display.": "Esta función sólo es compatible con la pantalla del <code>menú grande</code>."
-"The logo is a link to the default app": "El logotipo es un enlace a la aplicación por defecto"
-"Others": "Otros"
-"Categories": "Categorías"
-"Customize sorting": "Personalizar la clasificación"
-"Order by": "Ordenar por"
-"Name": "Nombre"
-"Customed": "Personalizado"
-"Show and hide the list of categories": "Mostrar y ocultar la lista de categorías"
-"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Estos parámetros se utilizan cuando el tema oscuro o el tema oscuro de Breeze están activados."
-"Dark mode colors": "Colores del modo oscuro"
-"With categories": "Con categorías"
-"Custom categories": "Categorías personalizadas"
-"Customize application categories": "Personalizar las categorías de las aplicaciones"
-"Reset to default": "Restablecer los valores por defecto"
-"Applications": "Aplicaciones"
-"Applications kept in the top menu": "Aplicaciones guardadas en el menú superior"
-"Applications kept in the top menu but also shown in side menu": "Las aplicaciones se mantienen en el menú superior pero también se muestran en el menú lateral"
-"These applications must be selected in the previous option.": "Estas aplicaciones deben ser seleccionadas en las opciones anteriores."
-"Hide labels on mouse over": "Ocultar las etiquetas al pasar el ratón"
-"Except the hovered app": "Except the hovered app"
-"Search": "Search"
-"Toggle the menu": "Toggle the menu"

src/l10n/fixtures/fr.yaml

@@ -3,11 +3,10 @@
 "No": "Non"
 "Yes": "Oui"
 "Menu": "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.'
+'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.': 'Utiliser le raccourcis clavier <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> pour ouvrir et fermer le menu latéral. Utiliser <span class="keyboard-key">tab</span> pour naviguer.'
-: 'Utiliser le raccourcis clavier <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> pour ouvrir et fermer le menu latéral. Utiliser <span class="keyboard-key">tab</span> pour naviguer.'
 "Top menu": "Menu supérieur"
 "Apps that not must be moved in the side menu": "Les applications qui ne doivent pas être affichées dans le menu latéral"
-"If there is no selection then the global configuration is applied.": "Si il n'y a aucune sélection alors la configuration globale sera appliquée."
+"If there is no selection then the global configuration is applied.": "Si il n'y a aucune sélection alors la configuration globale sera appliquée"
 "Experimental": "Expérimental"
 "Save": "Sauvegarder"
 "You like this app and you want to support me?": "Vous aimer cette application et vous souhaitez m'aider ?"
@@ -49,11 +48,14 @@
 "Panel": "Panneau"
 "Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Ouvrir le menu au passage de la souris (automatiquement désactivé sur les écrans tactiles)"
 "Display the big menu": "Afficher le menu large"
+"This menu is not compatible with AppOrder.": "Ce menu n'est pas compatible avec l'application AppOrder"
 "Display the logo": "Afficher le logo"
+"This feature is not compatible with the <code>big menu</code> display.": "Cette fonctionnalité n'est pas compatible avec l'affichage du menu large."
 "Icons and texts": "Icônes et textes"
 "Loader enabled": "Activation de l'indicateur de chargement"
 "Tips": "Astuces"
 "Always displayed": "Toujours affiché"
+"The logo will be hidden when the menu is always displayed.": "Le logo sera masque si le menu est toujours affiché."
 "This is the automatic behavior when the menu is always displayed.": "C'est le comportement automatique lorsque le menu est toujours affiché."
 "Not compatible with touch screens.": "Incompatible avec les écrans tactiles."
 "Big menu": "Menu large"
@@ -85,12 +87,6 @@
 "With categories": "Avec les catégories"
 "Custom categories": "Catégories personnalisées"
 "Customize application categories": "Personnaliser les catégories des applications"
+"Apps only visible in the top menu": "Applications visibles uniquement dans le menu supérieur"
+"Apps visible in the top and side menus": "Applications visibles dans le menus supérieur et latéral"
 "Reset to default": "Restaurer les valeurs par défaut"
-"Applications": "Applications"
-"Applications kept in the top menu": "Applications conservées dans le menu supérieur"
-"Applications kept in the top menu but also shown in side menu": "Applications conservées dans le menu supérieur mais également affichées dans le menu latéral"
-"These applications must be selected in the previous option.": "Ces applications doivent également être sélectionnées dans l'option précédente."
-"Hide labels on mouse over": "Masquer le libellé des applications au passage de la souris"
-"Except the hovered app": "À l'exception de l'application survolée"
-"Search": "Rechercher"
-"Toggle the menu": "Basculer le menu"

src/l10n/fixtures/gl.yaml

@@ -1,96 +0,0 @@
-"Custom menu": "Custom menu"
-"Enable the custom menu": "Enable the custom menu"
-"No": "No"
-"Yes": "Yes"
-"Menu": "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.'
-: '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.'
-"Top menu": "Top menu"
-"Apps that not must be moved in the side menu": "Apps that not must be moved in the side menu"
-"If there is no selection then the global configuration is applied.": "If there is no selection then the global configuration is applied."
-"Experimental": "Experimental"
-"Save": "Save"
-"You like this app and you want to support me?": "You like this app and you want to support me?"
-"Buy me a coffee ☕": "Buy me a coffee ☕"
-"Hidden": "Hidden"
-"Small": "Small"
-"Normal": "Normal"
-"Big": "Big"
-"Hidden icon": "Hidden icon"
-"Small icon": "Small icon"
-"Normal icon": "Normal icon"
-"Big icon": "Big icon"
-"Hidden text": "Hidden text"
-"Small text": "Small text"
-"Normal text": "Normal text"
-"Big text": "Big text"
-"Colors": "Colors"
-"Background color": "Background color"
-"Background color of current app": "Background color of current app"
-"Text color": "Text color"
-"Loader": "Loader"
-"Icon": "Icon"
-"Same color": "Same color"
-"Opposite color": "Opposite color"
-"Transparent": "Transparent"
-"Opaque": "Opaque"
-"Opener": "Opener"
-"Default": "Default"
-"Default (dark)": "Default (dark)"
-"Hamburger": "Hamburger"
-"Hamburger (dark)": "Hamburger (dark)"
-"Hamburger 2": "Hamburger 2"
-"Hamburger 2 (dark)": "Hamburger 2 (dark)"
-"Before the logo": "Before the logo"
-"After the logo": "After the logo"
-"Position": "Position"
-"Show only the opener (hidden logo)": "Show only the opener (hidden logo)"
-"Do not display the side menu and the opener if there is no application (eg: public pages).": "Do not display the side menu and the opener if there is no application (eg: public pages)."
-"Panel": "Panel"
-"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Open the menu when the mouse is hover the opener (automatically disabled on touch screens)"
-"Display the big menu": "Display the big menu"
-"Display the logo": "Display the logo"
-"Icons and texts": "Icons and texts"
-"Loader enabled": "Loader enabled"
-"Tips": "Tips"
-"Always displayed": "Always displayed"
-"This is the automatic behavior when the menu is always displayed.": "This is the automatic behavior when the menu is always displayed."
-"Not compatible with touch screens.": "Not compatible with touch screens."
-"Big menu": "Big menu"
-"Live preview": "Live preview"
-"Open apps in new tab": "Open apps in new tab"
-"Use the global setting": "Use the global setting"
-"Use my selection": "Use my selection"
-"Show and hide the list of applications": "Show and hide the list of applications"
-"Use the avatar instead of the logo": "Use the avatar instead of the logo"
-"You do not have permission to change the settings.": "You do not have permission to change the settings."
-"Force this configuration to users": "Force this configuration to users"
-"Export the configuration": "Export the configuration"
-"Purge the cache": "Purge the cache"
-"Show the link to settings": "Show the link to settings"
-"The menu is enabled by default for users": "The menu is enabled by default for users"
-"Except when the configuration is forced.": "Except when the configuration is forced."
-"Apps that should not be displayed in the menu": "Apps that should not be displayed in the menu"
-"This feature is only compatible with the <code>big menu</code> display.": "This feature is only compatible with the <code>big menu</code> display."
-"The logo is a link to the default app": "The logo is a link to the default app"
-"Others": "Others"
-"Categories": "Categories"
-"Customize sorting": "Customize sorting"
-"Order by": "Order by"
-"Name": "Name"
-"Customed": "Customed"
-"Show and hide the list of categories": "Show and hide the list of categories"
-"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "This parameters are used when Dark theme or Breeze Dark Theme are enabled."
-"Dark mode colors": "Dark mode colors"
-"With categories": "With categories"
-"Custom categories": "Custom categories"
-"Customize application categories": "Customize application categories"
-"Reset to default": "Reset to default"
-"Applications": "Applications"
-"Applications kept in the top menu": "Applications kept in the top menu"
-"Applications kept in the top menu but also shown in side menu": "Applications kept in the top menu but also shown in side menu"
-"These applications must be selected in the previous option.": "These applications must be selected in the previous option."
-"Hide labels on mouse over": "Hide labels on mouse over"
-"Except the hovered app": "Except the hovered app"
-"Search": "Search"
-"Toggle the menu": "Toggle the menu"

src/l10n/fixtures/nl.yaml

@@ -1,96 +0,0 @@
-"Custom menu": "Aangepast menu"
-"Enable the custom menu": "Het aangepaste menu inschakelen"
-"No": "Nee"
-"Yes": "Ja"
-"Menu": "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.'
-: 'Gebruik de snelkoppeling <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> om het zijmenu te openen en te verbergen. Gebruik <span class="keyboard-key">tab</span> om te navigeren.'
-"Top menu": "Bovenste menu"
-"Apps that not must be moved in the side menu": "Apps die niet moeten worden verplaatst in het zijmenu"
-"If there is no selection then the global configuration is applied.": "Als er geen keuze is, wordt de globale configuratie toegepast."
-"Experimental": "Experimenteel"
-"Save": "Opslaan"
-"You like this app and you want to support me?": "Vind je deze app leuk en wil je me steunen?"
-"Buy me a coffee ☕": "Koop een koffie voor me ☕"
-"Hidden": "Verborgen"
-"Small": "Klein"
-"Normal": "Normaal"
-"Big": "Groot"
-"Hidden icon": "Verborgen icoon"
-"Small icon": "Klein icoon"
-"Normal icon": "Normaal icoon"
-"Big icon": "Groot icoon"
-"Hidden text": "Verborgen tekst"
-"Small text": "Kleine tekst"
-"Normal text": "Normale tekst"
-"Big text": "Grote tekst"
-"Colors": "Kleuren"
-"Background color": "Achtergrond kleur"
-"Background color of current app": "Achtergrondkleur van huidige app"
-"Text color": "Tekst kleur"
-"Loader": "Lader"
-"Icon": "Icoon"
-"Same color": "Zelfde kleur"
-"Opposite color": "Tegenovergestelde kleur"
-"Transparent": "Transparant"
-"Opaque": "Ondoorzichtig"
-"Opener": "Opener"
-"Default": "Standaard"
-"Default (dark)": "Standaard (donker)"
-"Hamburger": "Hamburger"
-"Hamburger (dark)": "Hamburger (donker)"
-"Hamburger 2": "Hamburger 2"
-"Hamburger 2 (dark)": "Hamburger 2 (donker)"
-"Before the logo": "Voor het logo"
-"After the logo": "Na het logo"
-"Position": "Positie"
-"Show only the opener (hidden logo)": "Toon alleen de opener (verborgen logo)"
-"Do not display the side menu and the opener if there is no application (eg: public pages).": "Geef het zijmenu en de opener niet weer als er geen toepassing is (bijv. openbare pagina's)."
-"Panel": "Paneel"
-"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Open het menu wanneer de muis over de opener gaat (automatisch uitgeschakeld op aanraakschermen)"
-"Display the big menu": "Toon het grote menu"
-"Display the logo": "Toon het logo"
-"Icons and texts": "Iconen en teksten"
-"Loader enabled": "Lader ingeschakeld"
-"Tips": "Tips"
-"Always displayed": "Altijd weergegeven"
-"This is the automatic behavior when the menu is always displayed.": "Dit is het automatische gedrag wanneer het menu altijd wordt weergegeven."
-"Not compatible with touch screens.": "Niet compatibel met aanraakschermen."
-"Big menu": "Groot menu"
-"Live preview": "Live voorbeeld"
-"Open apps in new tab": "Open apps in nieuwe tab"
-"Use the global setting": "Gebruik de globale instellingen"
-"Use my selection": "Gebruik mijn selectie"
-"Show and hide the list of applications": "De lijst met toepassingen tonen en verbergen"
-"Use the avatar instead of the logo": "Gebruik avatar in plaats van het logo"
-"You do not have permission to change the settings.": "Je hebt geen toestemming om de instellingen te veranderen."
-"Force this configuration to users": "Forceer deze configuratie aan gebruikers"
-"Export the configuration": "Exporteer de configuratie"
-"Purge the cache": "De cache wissen"
-"Show the link to settings": "Toon de link naar de instellingen"
-"The menu is enabled by default for users": "Het menu is standaard ingeschakeld voor gebruikers"
-"Except when the configuration is forced.": "Behalve als de configuratie geforceerd is."
-"Apps that should not be displayed in the menu": "Apps die niet in het menu weergegeven mogen worden"
-"This feature is only compatible with the <code>big menu</code> display.": "Deze functie is alleen compatibel met het <code>grote menu</code> scherm."
-"The logo is a link to the default app": "Het logo is een link naar de standaard app"
-"Others": "Overige"
-"Categories": "Categorieën"
-"Customize sorting": "Sortering aanpassen"
-"Order by": "Sorteer op"
-"Name": "Naam"
-"Customed": "Aangepast"
-"Show and hide the list of categories": "De lijst met categorieën tonen en verbergen"
-"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Deze parameters worden gebruikt wanneer Dark theme of Breeze Dark Theme zijn ingeschakeld."
-"Dark mode colors": "Donkere modus kleuren"
-"With categories": "Met categorieën"
-"Custom categories": "Aangepaste categorieën"
-"Customize application categories": "Toepassingscategorieën aanpassen"
-"Reset to default": "Terugzetten naar standaard"
-"Applications": "Applicaties"
-"Applications kept in the top menu": "Applicaties bewaard in het bovenste menu"
-"Applications kept in the top menu but also shown in side menu": "Applicaties blijven in het topmenu maar worden ook in het zijmenu getoond"
-"These applications must be selected in the previous option.": "Deze toepassingen moeten bij de vorige optie zijn geselecteerd."
-"Hide labels on mouse over": "Hide labels on mouse over"
-"Except the hovered app": "Except the hovered app"
-"Search": "Search"
-"Toggle the menu": "Toggle the menu"

src/l10n/fixtures/pt_BR.yaml

@@ -1,94 +0,0 @@
-"Custom menu": "Menu personalizado"
-"Enable the custom menu": "Habilitar o menu personalizado"
-"No": "Não"
-"Yes": "Sim"
-"Menu": "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.'
-: 'Use o atalho <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> para exibir e para esconder o menu lateral. Use <span class="keyboard-key">tab</span> para navegar.'
-"Top menu": "Menu superior"
-"Apps that not must be moved in the side menu": "Apps que não devem ser movidos para o menu lateral"
-"If there is no selection then the global configuration is applied.": "Se não houver seleção, a configuração global será aplicada."
-"Experimental": "Experimental"
-"Save": "Salvar"
-"You like this app and you want to support me?": "Você gosta deste aplicativo e quer me apoiar?"
-"Buy me a coffee ☕": "Me pague um café ☕"
-"Hidden": "Oculto"
-"Small": "Pequeno"
-"Normal": "Normal"
-"Big": "Grande"
-"Hidden icon": "Ícone oculto"
-"Small icon": "Ícone pequeno"
-"Normal icon": "Ícone normal"
-"Big icon": "Ícone grance"
-"Hidden text": "Texto oculto"
-"Small text": "Texto pequeno"
-"Normal text": "Texto normal"
-"Big text": "Texto grande"
-"Colors": "Cores"
-"Background color": "Cor de fundo"
-"Background color of current app": "Cor de fundo do app atual"
-"Text color": "Cor do texto"
-"Loader": "Progresso"
-"Icon": "Ícone"
-"Same color": "Mesma cor"
-"Opposite color": "Cor oposta"
-"Transparent": "Transparente"
-"Opaque": "Opaco"
-"Opener": "Abrir"
-"Default": "Padrão"
-"Default (dark)": "Padrão (escuro)"
-"Hamburger": "Hamburger"
-"Hamburger (dark)": "Hamburger (escuro)"
-"Hamburger 2": "Hamburger 2"
-"Hamburger 2 (dark)": "Hamburger 2 (escuro)"
-"Before the logo": "Antes da logo"
-"After the logo": "Depois da logo"
-"Position": "Posição"
-"Show only the opener (hidden logo)": "Mostrar apenas o Abrir (ocultar logo)"
-"Do not display the side menu and the opener if there is no application (eg: public pages).": "Não mostrar o menu lateral e o Abrir se não houver aplicação (p.ex. páginas públicas)."
-"Panel": "Painel"
-"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Abrir o menu quando o mouse passar sobre o Abrir (desativado automaticamente em telas de toque)"
-"Display the big menu": "Mostrar o menu grande"
-"Display the logo": "Mostrar a logo"
-"Icons and texts": "Ícones e textos"
-"Loader enabled": "Progresso ativado"
-"Tips": "Dicas"
-"Always displayed": "Sempre visível"
-"This is the automatic behavior when the menu is always displayed.": "Este é o comportamento automático quando o menu está sempre visível."
-"Not compatible with touch screens.": "Não compatível com telas de toque."
-"Big menu": "Menu grande"
-"Live preview": "Visualização ao vivo"
-"Open apps in new tab": "Abrir apps em nova aba"
-"Use the global setting": "Usar configurações globais"
-"Use my selection": "Usar minha seleção"
-"Show and hide the list of applications": "Mostrar e ocultar a lista de aplicativos"
-"Use the avatar instead of the logo": "Use o avatar ao invés da logo"
-"You do not have permission to change the settings.": "Você não tem permissão para alterar as configurações."
-"Force this configuration to users": "Forçar esta configuração para os usuários"
-"Export the configuration": "Exportar a configuração"
-"Purge the cache": "Limpar o cache"
-"Show the link to settings": "Mostrar o link para configurações"
-"The menu is enabled by default for users": "O menu é habilitado por padrão para os usuários"
-"Except when the configuration is forced.": "Exceto quando a configuração é forçada."
-"Apps that should not be displayed in the menu": "Apps que não devem ser mostrados no menu"
-"This feature is only compatible with the <code>big menu</code> display.": "Este recurso só é compatível com a exibição do <code>menu grande</code>."
-"The logo is a link to the default app": "A logo é um link para o app padrão"
-"Others": "Outros"
-"Categories": "Categorias"
-"Customize sorting": "Personalizar classificação"
-"Order by": "Ordenar por"
-"Name": "Nome"
-"Customed": "Personalizado"
-"Show and hide the list of categories": "Mostrar e esconder a lista de categorias"
-"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Estes parâmetros são usados quando o tema escuro ou o tema Dark Breeze está ativo."
-"Dark mode colors": "Cores do modo escuro"
-"With categories": "Com categorias"
-"Custom categories": "Categorias personalizadas"
-"Customize application categories": "Personalizar categorias de apps"
-"Reset to default": "Restaurar padrão"
-"Applications": "Aplicativos"
-"Applications kept in the top menu": "Aplicativos mantidos no menu superior"
-"Applications kept in the top menu but also shown in side menu": "Aplicativos mantidos no menu superior, mas também mostrados no menu lateral"
-"These applications must be selected in the previous option.": "Estes aplicativos devem ser selecionados na opção anterior."
-"Hide labels on mouse over": "Ocultar descrição ao passar o mouse"
-"Toggle the menu": "Toggle the menu"

src/l10n/fixtures/ru.yaml

@@ -1,96 +0,0 @@
-"Custom menu": "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": "Большой"
-"Hidden icon": "Без иконки"
-"Small icon": "Маленькая иконка"
-"Normal icon": "Средняя иконка"
-"Big icon": "Большая иконка"
-"Hidden text": "Без текста"
-"Small text": "Маленький текст"
-"Normal text": "Средний текст"
-"Big text": "Большой текст"
-"Colors": "Цвета"
-"Background color": "Цвет фона"
-"Background color of current app": "Цвет фона выбранного приложения"
-"Text color": "Цвет текста"
-"Loader": "Загрузчик"
-"Icon": "Иконка"
-"Same color": "Такой же цвет"
-"Opposite color": "Противоположный цвет"
-"Transparent": "Прозрачный"
-"Opaque": "Непрозрачный"
-"Opener": "Открывалка"
-"Default": "По умолчанию"
-"Default (dark)": "По умолчанию (тёмный)"
-"Hamburger": "Гамбургер"
-"Hamburger (dark)": "Гамбургер (тёмный)"
-"Hamburger 2": "Гамбургер 2"
-"Hamburger 2 (dark)": "Гамбургер 2 (тёмный)"
-"Before the logo": "Перед логотипом"
-"After the logo": "После логотипа"
-"Position": "Положение"
-"Show only the opener (hidden logo)": "Показать только открывающую часть (скрытый логотип)"
-"Do not display the side menu and the opener if there is no application (eg: public pages).": "Не отображать боковое меню и открывалку, если нет приложения (например, публичные страницы)."
-"Panel": "Панель"
-"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Открывать меню при наведении мыши на экран (автоматически отключается на сенсорных экранах)"
-"Display the big menu": "Отобразить большое меню"
-"Display the logo": "Показать логотип"
-"Icons and texts": "Иконки и текст"
-"Loader enabled": "Загрузчик включен"
-"Tips": "Советы"
-"Always displayed": "Всегда отображается"
-"This is the automatic behavior when the menu is always displayed.": "This is the automatic behavior when the menu is always displayed."
-"Not compatible with touch screens.": "Не совместимо с сенсорными экранами."
-"Big menu": "Большое меню"
-"Live preview": "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": "Использовать аватар вместо логотипа"
-"You do not have permission to change the settings.": "У вас нет разрешения изменять настройки."
-"Force this configuration to users": "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.": "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.": "This feature is only compatible with the <code>big menu</code> display."
-"The logo is a link to the default app": "Логотип открывает приложение по умолчанию"
-"Others": "Прочие"
-"Categories": "Категории"
-"Customize sorting": "Настроить сортировку"
-"Order by": "В порядке"
-"Name": "Название"
-"Customed": "Customed"
-"Show and hide the list of categories": "Показать или скрыть список категорий"
-"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Эти настройки используются темами Тёмная и Тёмная Breeze."
-"Dark mode colors": "Цвета тёмной темы"
-"With categories": "С категориями"
-"Custom categories": "Пользовательские категории"
-"Customize application categories": "Изменить категории приложений"
-"Reset to default": "Сбросить к значениям по умолчанию"
-"Applications": "Приложения"
-"Applications kept in the top menu": "Applications kept in the top menu"
-"Applications kept in the top menu but also shown in side menu": "Applications kept in the top menu but also shown in side menu"
-"These applications must be selected in the previous option.": "These applications must be selected in the previous option."
-"Hide labels on mouse over": "Скрыть название при наведении мыши"
-"Except the hovered app": "Except the hovered app"
-"Search": "Search"
-"Toggle the menu": "Toggle the menu"

src/l10n/fixtures/sk.yaml

@@ -1,94 +0,0 @@
-"Custom menu": "Custom menu"
-"Enable the custom menu": "Enable the custom menu"
-"No": "No"
-"Yes": "Yes"
-"Menu": "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.'
-: '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.'
-"Top menu": "Top menu"
-"Apps that not must be moved in the side menu": "Apps that not must be moved in the side menu"
-"If there is no selection then the global configuration is applied.": "If there is no selection then the global configuration is applied."
-"Experimental": "Experimental"
-"Save": "Save"
-"You like this app and you want to support me?": "You like this app and you want to support me?"
-"Buy me a coffee ☕": "Buy me a coffee ☕"
-"Hidden": "Hidden"
-"Small": "Small"
-"Normal": "Normal"
-"Big": "Big"
-"Hidden icon": "Hidden icon"
-"Small icon": "Small icon"
-"Normal icon": "Normal icon"
-"Big icon": "Big icon"
-"Hidden text": "Hidden text"
-"Small text": "Small text"
-"Normal text": "Normal text"
-"Big text": "Big text"
-"Colors": "Colors"
-"Background color": "Background color"
-"Background color of current app": "Background color of current app"
-"Text color": "Text color"
-"Loader": "Loader"
-"Icon": "Icon"
-"Same color": "Same color"
-"Opposite color": "Opposite color"
-"Transparent": "Transparent"
-"Opaque": "Opaque"
-"Opener": "Opener"
-"Default": "Default"
-"Default (dark)": "Default (dark)"
-"Hamburger": "Hamburger"
-"Hamburger (dark)": "Hamburger (dark)"
-"Hamburger 2": "Hamburger 2"
-"Hamburger 2 (dark)": "Hamburger 2 (dark)"
-"Before the logo": "Before the logo"
-"After the logo": "After the logo"
-"Position": "Position"
-"Show only the opener (hidden logo)": "Show only the opener (hidden logo)"
-"Do not display the side menu and the opener if there is no application (eg: public pages).": "Do not display the side menu and the opener if there is no application (eg: public pages)."
-"Panel": "Panel"
-"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Open the menu when the mouse is hover the opener (automatically disabled on touch screens)"
-"Display the big menu": "Display the big menu"
-"Display the logo": "Display the logo"
-"Icons and texts": "Icons and texts"
-"Loader enabled": "Loader enabled"
-"Tips": "Tips"
-"Always displayed": "Always displayed"
-"This is the automatic behavior when the menu is always displayed.": "This is the automatic behavior when the menu is always displayed."
-"Not compatible with touch screens.": "Not compatible with touch screens."
-"Big menu": "Big menu"
-"Live preview": "Live preview"
-"Open apps in new tab": "Open apps in new tab"
-"Use the global setting": "Use the global setting"
-"Use my selection": "Use my selection"
-"Show and hide the list of applications": "Show and hide the list of applications"
-"Use the avatar instead of the logo": "Use the avatar instead of the logo"
-"You do not have permission to change the settings.": "You do not have permission to change the settings."
-"Force this configuration to users": "Force this configuration to users"
-"Export the configuration": "Export the configuration"
-"Purge the cache": "Purge the cache"
-"Show the link to settings": "Show the link to settings"
-"The menu is enabled by default for users": "The menu is enabled by default for users"
-"Except when the configuration is forced.": "Except when the configuration is forced."
-"Apps that should not be displayed in the menu": "Apps that should not be displayed in the menu"
-"This feature is only compatible with the <code>big menu</code> display.": "This feature is only compatible with the <code>big menu</code> display."
-"The logo is a link to the default app": "The logo is a link to the default app"
-"Others": "Others"
-"Categories": "Categories"
-"Customize sorting": "Customize sorting"
-"Order by": "Order by"
-"Name": "Name"
-"Customed": "Customed"
-"Show and hide the list of categories": "Show and hide the list of categories"
-"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "This parameters are used when Dark theme or Breeze Dark Theme are enabled."
-"Dark mode colors": "Dark mode colors"
-"With categories": "With categories"
-"Custom categories": "Custom categories"
-"Customize application categories": "Customize application categories"
-"Reset to default": "Reset to default"
-"Applications": "Applications"
-"Applications kept in the top menu": "Applications kept in the top menu"
-"Applications kept in the top menu but also shown in side menu": "Applications kept in the top menu but also shown in side menu"
-"These applications must be selected in the previous option.": "These applications must be selected in the previous option."
-"Hide labels on mouse over": "Hide labels on mouse over"
-"Toggle the menu": "Toggle the menu"

src/l10n/fixtures/tpl/base.yaml

@@ -1,100 +0,0 @@
-"Custom menu": "Custom menu"
-"Enable the custom menu": "Enable the custom menu"
-"No": "No"
-"Yes": "Yes"
-"Menu": "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.'
-: '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.'
-"Top menu": "Top menu"
-"Apps that not must be moved in the side menu": "Apps that not must be moved in the side menu"
-"If there is no selection then the global configuration is applied.": "If there is no selection then the global configuration is applied."
-"Experimental": "Experimental"
-"Save": "Save"
-"You like this app and you want to support me?": "You like this app and you want to support me?"
-"Buy me a coffee ☕": "Buy me a coffee ☕"
-"Hidden": "Hidden"
-"Small": "Small"
-"Normal": "Normal"
-"Big": "Big"
-"Hidden icon": "Hidden icon"
-"Small icon": "Small icon"
-"Normal icon": "Normal icon"
-"Big icon": "Big icon"
-"Hidden text": "Hidden text"
-"Small text": "Small text"
-"Normal text": "Normal text"
-"Big text": "Big text"
-"Colors": "Colors"
-"Background color": "Background color"
-"Background color of current app": "Background color of current app"
-"Text color": "Text color"
-"Loader": "Loader"
-"Icon": "Icon"
-"Same color": "Same color"
-"Opposite color": "Opposite color"
-"Transparent": "Transparent"
-"Opaque": "Opaque"
-"Opener": "Opener"
-"Default": "Default"
-"Default (dark)": "Default (dark)"
-"Hamburger": "Hamburger"
-"Hamburger (dark)": "Hamburger (dark)"
-"Hamburger 2": "Hamburger 2"
-"Hamburger 2 (dark)": "Hamburger 2 (dark)"
-"Before the logo": "Before the logo"
-"After the logo": "After the logo"
-"Position": "Position"
-"Show only the opener (hidden logo)": "Show only the opener (hidden logo)"
-"Do not display the side menu and the opener if there is no application (eg: public pages).": "Do not display the side menu and the opener if there is no application (eg: public pages)."
-"Panel": "Panel"
-"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Open the menu when the mouse is hover the opener (automatically disabled on touch screens)"
-"Display the big menu": "Display the big menu"
-"Display the logo": "Display the logo"
-"Icons and texts": "Icons and texts"
-"Loader enabled": "Loader enabled"
-"Tips": "Tips"
-"Always displayed": "Always displayed"
-"This is the automatic behavior when the menu is always displayed.": "This is the automatic behavior when the menu is always displayed."
-"Not compatible with touch screens.": "Not compatible with touch screens."
-"Big menu": "Big menu"
-"Live preview": "Live preview"
-"Open apps in new tab": "Open apps in new tab"
-"Use the global setting": "Use the global setting"
-"Use my selection": "Use my selection"
-"Show and hide the list of applications": "Show and hide the list of applications"
-"Use the avatar instead of the logo": "Use the avatar instead of the logo"
-"You do not have permission to change the settings.": "You do not have permission to change the settings."
-"Force this configuration to users": "Force this configuration to users"
-"Export the configuration": "Export the configuration"
-"Purge the cache": "Purge the cache"
-"Show the link to settings": "Show the link to settings"
-"The menu is enabled by default for users": "The menu is enabled by default for users"
-"Except when the configuration is forced.": "Except when the configuration is forced."
-"Apps that should not be displayed in the menu": "Apps that should not be displayed in the menu"
-"This feature is only compatible with the <code>big menu</code> display.": "This feature is only compatible with the <code>big menu</code> display."
-"The logo is a link to the default app": "The logo is a link to the default app"
-"Others": "Others"
-"Categories": "Categories"
-"Customize sorting": "Customize sorting"
-"Order by": "Order by"
-"Name": "Name"
-"Customed": "Customed"
-"Show and hide the list of categories": "Show and hide the list of categories"
-"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "This parameters are used when Dark theme or Breeze Dark Theme are enabled."
-"Dark mode colors": "Dark mode colors"
-"With categories": "With categories"
-"Custom categories": "Custom categories"
-"Customize application categories": "Customize application categories"
-"Reset to default": "Reset to default"
-"Applications": "Applications"
-"Applications kept in the top menu": "Applications kept in the top menu"
-"Applications kept in the top menu but also shown in side menu": "Applications kept in the top menu but also shown in side menu"
-"These applications must be selected in the previous option.": "These applications must be selected in the previous option."
-"Hide labels on mouse over": "Hide labels on mouse over"
-"Except the hovered app": "Except the hovered app"
-"Search": "Search"
-"Toggle the menu": "Toggle the menu"

src/l10n/fixtures/zh_CN.yaml

@@ -3,8 +3,7 @@
 "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."
+"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> 来导航。"
-: "使用快捷键 <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.": "如不选择，将应用全局设定。"
@@ -41,11 +40,14 @@
 "Panel": "面板"
 "Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "鼠标悬停时打开菜单 (触摸屏时将自动禁用)"
 "Display the big menu": "显示大型菜单"
+"This 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": "大型菜单"
@@ -63,7 +65,7 @@
 "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>兼容。"
+"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": "类别"
@@ -77,6 +79,8 @@
 "With categories": "有类别"
 "Custom categories": "自定义类别"
 "Customize application categories": "自定义应用程序类别"
+"Apps only visible in the top menu": "应用程序仅在顶部菜单中可见"
+"Apps visible in the top and side menus": "顶部和侧边菜单中可见的应用程序"
 "Reset to default": "重置为默认设置"
 "Hidden icon": "隐藏图标"
 "Small icon": "小图标"
@@ -86,11 +90,3 @@
 "Small text": "小文本"
 "Normal text": "普通文本"
 "Big text": "大文本"
-"Applications": "Applications"
-"Applications kept in the top menu": "Applications kept in the top menu"
-"Applications kept in the top menu but also shown in side menu": "Applications kept in the top menu but also shown in side menu"
-"These applications must be selected in the previous option.": "These applications must be selected in the previous option."
-"Hide labels on mouse over": "Hide labels on mouse over"
-"Except the hovered app": "Except the hovered app"
-"Search": "Search"
-"Toggle menu": "Toggle menu"

src/lib/createElement.js

@@ -1,17 +0,0 @@
-module.exports = (tagName, attributes) => {
-  const element = document.createElement(tagName)
-
-  if (typeof attributes === 'object') {
-    for (let i in attributes) {
-      if (i === 'text') {
-        element.textContent = attributes[i]
-      } else if (i === 'html') {
-        element.innerHTML = attributes[i]
-      } else {
-        element.setAttribute(i, attributes[i])
-      }
-    }
-  }
-
-  return element
-}

templates/css/stylesheet.php

@@ -42,14 +42,10 @@
         top: 49px;
     }
 
-  #side-menu.hide-opener .side-menu-header .side-menu-opener.side-menu-closer {
+    #side-menu.hide-opener .side-menu-header {
         visibility: hidden;
     }
 
-  #side-menu.hide-opener.side-menu-with-categories .side-menu-search {
-    float: none;
-  }
-
     <?php if ($_['size-text'] === 'hidden'): ?>
         #side-menu, .side-menu-apps-list {
             <?php if ($_['size-icon'] === 'big'): ?>
@@ -118,15 +114,3 @@
         font-size: 16px;
     }
 <?php endif; ?>
-
-<?php if ($_['always-displayed']): ?>
-  #content {
-    left: 53px;
-    width: calc(100% - (var(--body-container-margin) * 2) - 62px);
-  }
-
-  #content-vue {
-    width: calc(100% - (var(--body-container-margin) * 2) - 60px);
-    margin-left: 11px;
-  }
-<?php endif; ?>

templates/js/_alwaysDisplayed.js

@@ -0,0 +1,86 @@
+const alwaysDisplayed = function() {
+    const elements = querySelectorAll('*')
+    const fixedElements = []
+
+    for (let element of elements) {
+        if (typeof element !== 'object') {
+            continue
+        }
+
+        const position = window.getComputedStyle(element, null).getPropertyValue('position')
+
+        if (position !== 'fixed') {
+            continue
+        }
+
+        const id = element.getAttribute('id')
+
+        if (id === 'header' || id === 'side-menu' || id === 'side-menu-loader') {
+            continue
+        }
+
+        if (element.classList.contains('oc-dialog')) {
+            continue
+        }
+
+        let elementIsInSideMenu = false
+        let parent = element.parentNode
+
+        while (parent && !elementIsInSideMenu) {
+            try {
+                if  (parent.getAttribute('id') === 'side-menu') {
+                    elementIsInSideMenu = true
+                }
+            } catch (e) {
+            }
+
+            parent = parent.parentNode
+        }
+
+        if (elementIsInSideMenu) {
+            continue
+        }
+
+        fixedElements.push(element)
+    }
+
+    for (let i in fixedElements) {
+        const element = fixedElements[i]
+        const computedStyle = window.getComputedStyle(element, null)
+        const left = computedStyle.getPropertyValue('left')
+        const right = computedStyle.getPropertyValue('right')
+
+        if (right !== '0px') {
+            const intValue = parseInt(left.replace('px', '')) + 50
+            element.style.setProperty('transform', 'translateX(' + intValue.toString() + 'px)')
+        }
+    }
+}
+
+const content = querySelector('#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/_loaderEnabled.js

@@ -0,0 +1,14 @@
+let pageLoader = createElement('div', {id: 'side-menu-loader'})
+let pageLoaderBar = createElement('div', {id: 'side-menu-loader-bar'})
+
+pageLoader.appendChild(pageLoaderBar)
+querySelector('body').appendChild(pageLoader)
+
+let pageLoaderValue = 0
+
+window.addEventListener('beforeunload', () => {
+    setInterval(() => {
+        pageLoaderBar.style.width = pageLoaderValue.toString() + '%'
+        pageLoaderValue = Math.min(pageLoaderValue + .2, 100)
+    }, 25)
+})

templates/js/_topMenuApps.js

@@ -0,0 +1,216 @@
+let menuCache = null
+
+const breakpointMobileWidth = 1024
+const usePercentualAppMenuLimit = 0.8
+const minAppsDesktop = 8
+
+const handleMenuClick = (e, icon) => {
+    let element = e.target
+
+    while (element.tagName !== 'LI') {
+        element = element.parentNode
+    }
+
+    const a = querySelector('a', element)
+
+    if (a.getAttribute('target') !== '_blank' && e.which === 1 && !e.ctrlKey && !e.metaKey) {
+        for (let tag of ['svg', 'div']) {
+            let el = querySelector(tag, element)
+
+            if (el) {
+                el.remove()
+            }
+        }
+
+        const loader = createElement('div', {'class': icon})
+
+        a.insertBefore(loader, querySelector('span', a))
+    }
+}
+
+const updateTopMenu = function() {
+    const isMobile = window.innerWidth < breakpointMobileWidth
+    const menu = querySelector('#appmenu')
+    const moreApps = querySelector('#more-apps')
+    const navigation = querySelector('#navigation')
+    const navigationApps = querySelector('#apps ul')
+
+    let apps = querySelectorAll('li', menu)
+    let lastShownApp = null
+    let appShown = []
+
+    if ((menu.innerHTML + menu.nextSibling.innerHTML) === menuCache) {
+        return
+    }
+
+    let navigationAppsHtml = ''
+
+    for (let app of apps) {
+        const dataId = app.getAttribute('data-id')
+
+        if (dataId === null) {
+            continue
+        }
+
+        if (topMenuApps.indexOf(dataId) === -1 && topSideMenuApps.indexOf(dataId) === -1) {
+            app.classList.add('hidden')
+            app.classList.add('app-hidden')
+        } else {
+            app.classList.remove('hidden')
+            app.classList.add('app-external-site')
+
+            if (topSideMenuApps.indexOf(dataId) !== -1) {
+                app.classList.add('app-top-side-menu')
+            }
+
+            appShown.push(app)
+
+            navigationAppsHtml = navigationAppsHtml + app.outerHTML
+        }
+
+        if (targetBlankApps.indexOf(dataId) !== -1) {
+            querySelector('a', app).setAttribute('target', '_blank')
+        }
+    }
+
+    navigationApps.innerHTML = navigationAppsHtml
+
+    const rightHeaderWidth = querySelector('.header-right').offsetWidth
+    const headerWidth = querySelector('header').offsetWidth
+
+    let availableWidth = headerWidth
+
+    availableWidth -= nextcloud.offsetWidth
+    availableWidth -= querySelector('#header .side-menu-opener').offsetWidth
+    availableWidth -= rightHeaderWidth > 230 ? rightHeaderWidth : 230
+    availableWidth *= isMobile ? usePercentualAppMenuLimit : 1
+
+    let appCount = Math.floor(availableWidth / querySelector('#appmenu li:not(.hidden)').offsetWidth)
+
+    if (isMobile && appCount > minAppsDesktop) {
+        appCount = minAppsDesktop
+    } else if (!isMobile && appCount < minAppsDesktop) {
+        appCount = minAppsDesktop
+    }
+
+    menu.style.opacity = 1
+
+    if (appShown.length - 1 - appCount >= 1) {
+        appCount--
+    }
+
+    for (let item of querySelectorAll('a', moreApps)) {
+        item.classList.remove('active')
+    }
+
+    let k = 0
+    let notInHeader = 0
+
+    for (let app of appShown) {
+        const name = app.getAttribute('data-id')
+        const li = querySelector('#apps li[data-id=' + name + '].app-external-site')
+
+        if (k < appCount && appCount > 0) {
+            app.classList.remove('hidden')
+            li.classList.add('in-header')
+
+            lastShownApp = app
+        } else {
+            app.classList.add('hidden')
+            li.classList.remove('in-header')
+
+            notInHeader++
+
+            const a = querySelector('a', app)
+
+            if (appCount > 0 && a.classList.contains('active')) {
+                lastShownApp.classList.add('hidden')
+                app.classList.remove('hidden')
+                notInHeader++
+
+                li.classList.add('in-header')
+            }
+        }
+
+        k++
+    }
+
+    // Hack for:
+    // - https://github.com/nextcloud/server/blob/master/core/src/components/MainMenu.js#L97-L119
+    // - https://github.com/nextcloud/server/blob/master/core/src/components/MainMenu.js#L97-L119
+    jQuery(menu).undelegate('li:not(#more-apps) > a', 'click')
+    jQuery(navigation).undelegate('a', 'click')
+
+    const confs = [
+        {
+            items: querySelectorAll('#navigation li'),
+            icon: 'icon-loading-small'
+        },
+        {
+            items: querySelectorAll('li:not(#more-apps)', menu),
+            icon: OCA.Theming && OCA.Theming.inverted ? 'icon-loading-small' : 'icon-loading-small-dark'
+        },
+    ]
+
+    for (let conf of confs) {
+        for (let item of conf.items) {
+            item.addEventListener('click', (e) => {
+                handleMenuClick(e, conf.icon)
+            })
+        }
+    }
+
+    for (let app of querySelectorAll('#apps li.app-external-site')) {
+        const appId = app.getAttribute('data-id')
+
+        if (app.classList.contains('in-header')) {
+            for (let defs of querySelectorAll('svg defs', app)) {
+                defs.remove()
+            }
+        } else {
+            const svg = querySelector('svg', app)
+
+            if (querySelectorAll('svg defs', app).length > 0) {
+                continue
+            }
+
+            const defs = `
+                <defs>
+                    <filter id="invertMenuMore-${appId}">
+                        <feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"></feColorMatrix>
+                    </filter>
+                </defs>`
+
+            svg.innerHTML = defs + svg.innerHTML
+
+            for (let image of querySelectorAll('image', svg)) {
+                image.setAttribute('filter', `url(#invertMenuMore-${appId})`)
+            }
+
+            svg.innerHTML = svg.innerHTML.replace(/fecolormatrix/g, 'feColorMatrix')
+        }
+    }
+
+    if (notInHeader === 0) {
+        moreApps.style.display = 'none'
+        navigation.style.display = 'none'
+    } else {
+        moreApps.style.display = 'flex'
+    }
+
+    menuCache = menu.innerHTML + menu.nextSibling.innerHTML
+}
+
+for (let i = 0; i < 4000; i+= 100) {
+    setTimeout(updateTopMenu, i)
+}
+
+let resizeTimeout = null;
+
+window.addEventListener('resize', () => {
+    if (resizeTimeout !== null) {
+        clearTimeout(resizeTimeout)
+    }
+
+    resizeTimeout = setTimeout(updateTopMenu, 100)
+})

templates/js/script.php

@@ -1,7 +1,5 @@
 <?php
 
-header('Content-type: text/javascript');
-
 $display = 'default';
 
 if ($_['always-displayed']) {
@@ -14,45 +12,45 @@ if ($_['always-displayed']) {
 
 ?>
 
-const SMcreateElement = (tagName, attributes) => {
+(function() {
+    const querySelector = function(selector, element) {
+        if (element) {
+            return element.querySelector(selector)
+        }
+
+        return document.querySelector(selector)
+    }
+
+    const querySelectorAll = function(selector, element) {
+        if (element) {
+            return element.querySelectorAll(selector)
+        }
+
+        return document.querySelectorAll(selector)
+    }
+
+    const createElement = function(tagName, attributes) {
         const element = document.createElement(tagName)
 
         if (typeof attributes === 'object') {
             for (let i in attributes) {
-      if (i === 'text') {
-        element.textContent = attributes[i]
-      } else if (i === 'html') {
-        element.innerHTML = attributes[i]
-      } else {
                 element.setAttribute(i, attributes[i])
             }
         }
-  }
 
         return element
     }
 
-(function() {
+    const sideMenuContainer = createElement('div', {id: 'side-menu-container'})
-  const sideMenuContainer = SMcreateElement('div', {id: 'side-menu-container'})
+    const sideMenuOpener = createElement('button', {'class': 'side-menu-opener'})
-  const sideMenuOpener = SMcreateElement('button', {
+    const sideMenu = createElement('div', {id: 'side-menu'})
-    'class': 'side-menu-opener',
-    'arial-label': t('side_menu', 'Toggle the menu'),
-    'html': `<span>${t('side_menu', 'Toggle the menu')}</span>`
-  })
-  const sideMenu = SMcreateElement('div', {id: 'side-menu'})
 
-  const body = document.querySelector('body')
+    const body = querySelector('body')
-  const html = document.querySelector('html')
+    const html = querySelector('html')
-  const nextcloud = document.querySelector('#nextcloud')
+    const nextcloud = querySelector('#nextcloud')
-  const logo = document.querySelector('.header-left .logo')
 
     const isTouchDevice = window.matchMedia("(pointer: coarse)").matches
-
+    const targetBlankApps = <?php echo json_encode($_['target-blank-apps']) ?>
-  window.targetBlankApps = <?php echo json_encode($_['target-blank-apps']), "\n" ?>
-  window.topMenuApps = <?php echo json_encode($_['top-menu-apps']), "\n"; ?>
-  window.topSideMenuApps = <?php echo json_encode($_['top-side-menu-apps']), "\n"; ?>
-  window.menuAppsOrder = <?php echo json_encode($_['apps-order']), "\n"; ?>
-  window.topMenuAppsMouseOverHiddenLabel = <?php echo json_encode($_['top-menu-mouse-over-hidden-label']), "\n"; ?>
 
     <?php if ($display === 'big-menu'): ?>
         sideMenu.setAttribute('data-bigmenu', '1')
@@ -60,20 +58,11 @@ const SMcreateElement = (tagName, attributes) => {
         sideMenu.setAttribute('data-sidewithcategories', '1')
     <?php endif; ?>
 
-  const sideMenuFocus = () => {
+    querySelector('body').addEventListener('side-menu.apps', (e) => {
-    let a = document.querySelector('#side-menu .side-menu-app.active a')
-      || document.querySelector('#side-menu .side-menu-app a')
-
-    if (a) {
-      a.focus()
-    }
-  }
-
-  document.querySelector('body').addEventListener('side-menu.apps', (e) => {
         const apps = e.detail.apps;
 
         <?php if ($_['hide-when-no-apps']): ?>
-      const sideMenu = document.querySelector('#side-menu')
+            const sideMenu = querySelector('#side-menu')
 
             if (apps.length === 0) {
                 sideMenu.classList.remove('open')
@@ -103,14 +92,30 @@ const SMcreateElement = (tagName, attributes) => {
     })
 
     body.addEventListener('side-menu.ready', () => {
-    const sideMenu = document.querySelector('#side-menu')
+        const sideMenu = querySelector('#side-menu')
-    const headerMenuOpener = document.querySelector('#header .side-menu-opener')
+        const headerMenuOpener = querySelector('#header .side-menu-opener')
-    const sideMenuOpener = document.querySelectorAll('#side-menu .side-menu-opener')
+        const sideMenuOpener = querySelectorAll('#side-menu .side-menu-opener')
 
         if (!headerMenuOpener) {
             return
         }
 
+        sideMenuFocus = () => {
+            let a = querySelector('.side-menu-app.active a', sideMenu)
+
+            if (!a) {
+                return
+            }
+
+            if (a.length === 0) {
+                a = querySelector('.side-menu-app:first-child a', sideMenu)
+            }
+
+            if (a.length > 0) {
+                a.focus()
+            }
+        }
+
         <?php if ($_['opener-hover']): ?>
             const sideMenuMouseLeave = () => {
                 sideMenu.classList.remove('open')
@@ -142,8 +147,14 @@ const SMcreateElement = (tagName, attributes) => {
 
         headerMenuOpener.addEventListener('click', () => {
             sideMenu.classList.add('open')
+
+            const a = querySelector('.side-menu-app.active a', sideMenu)
+
+            if (a !== null) {
+                a.focus()
+            }
+
             headerMenuOpener.blur()
-      sideMenuFocus()
         })
 
         for (let opener of sideMenuOpener) {
@@ -187,18 +198,25 @@ const SMcreateElement = (tagName, attributes) => {
     sideMenuContainer.appendChild(sideMenu)
 
     <?php if ($_['loader-enabled'] === true): ?>
-    PageLoader()
+        <?php require_once __DIR__.'/_loaderEnabled.js'; ?>
     <?php endif; ?>
 
     if (nextcloud) {
-    if (logo && logo.parentNode !== nextcloud) {
-      nextcloud.appendChild(logo)
-    }
-
         <?php if ($_['opener-position'] === 'before'): ?>
             nextcloud.parentNode.insertBefore(sideMenuOpener, nextcloud)
         <?php else: ?>
             nextcloud.parentNode.insertBefore(sideMenuOpener, nextcloud.nextSibling)
         <?php endif; ?>
     }
+
+    <?php if (!empty($_['top-menu-apps']) || !empty($_['top-side-menu-apps'])): ?>
+        const topMenuApps = <?php echo json_encode($_['top-menu-apps']), "\n"; ?>
+        const topSideMenuApps = <?php echo json_encode($_['top-side-menu-apps']); ?>
+
+        <?php require_once __DIR__.'/_topMenuApps.js'; ?>
+    <?php endif; ?>
+
+    <?php if ($display === 'always-displayed'): ?>
+        <?php require_once __DIR__.'/_alwaysDisplayed.js'; ?>
+    <?php endif; ?>
 })();

templates/settings/admin-form.php

@@ -41,108 +41,8 @@ $choicesSizes = [
 
 $labelShowHideApps = 'Show and hide the list of applications';
 $labelReset = 'Reset to default';
-$labelDefault = 'Default';
-$labelWithCategories = 'With categories';
-$labelBigMenu = 'Big menu';
-$labelAlwaysDisplayed = 'Always displayed';
-
 ?>
 <div id="side-menu-section">
-
-    <div class="section">
-        <h2>
-            <?php p($l->t('Panel')); ?>
-        </h2>
-
-        <?php
-            $displays = [
-                'default' => !$_['always-displayed'] && !$_['big-menu'] && !$_['side-with-categories'],
-                'always-displayed' => $_['always-displayed'] && !$_['big-menu'] && !$_['side-with-categories'],
-                'side-with-categories' => $_['side-with-categories'] && !$_['always-displayed'] && !$_['big-menu'],
-                'big-menu' => $_['big-menu'] && !$_['always-displayed'] && !$_['side-with-categories'],
-            ];
-        ?>
-
-        <div>
-            <label>
-                <?php p($l->t($labelDefault)); ?>
-            </label>
-        </div>
-        <p>
-            <img
-                class="side-menu-display <?php echo $displays['default'] ? 'is-active' : '' ?>"
-                data-alwaysdiplayed="0"
-                data-bigmenu="0"
-                data-sidewithcategories="0"
-                src="<?php print_unescaped(image_path('side_menu', 'admin/layout-default.svg')); ?>" alt="<?php p($l->t($labelDefault)); ?>">
-        </p>
-
-        <div>
-            <label>
-                <?php p($l->t($labelWithCategories)); ?>
-            </label>
-        </div>
-        <p>
-            <img
-                class="side-menu-display <?php echo $displays['side-with-categories'] ? 'is-active' : '' ?>"
-                data-alwaysdiplayed="0"
-                data-bigmenu="0"
-                data-sidewithcategories="1"
-                src="<?php print_unescaped(image_path('side_menu', 'admin/layout-side-with-categories.svg')); ?>" alt="<?php p($l->t($labelWithCategories)); ?>">
-        </p>
-
-        <div>
-            <label for="side-menu-opener">
-                <?php p($l->t($labelBigMenu)); ?>
-            </label>
-        </div>
-        <p>
-            <img
-                class="side-menu-display <?php echo $displays['big-menu'] ? 'is-active' : '' ?>"
-                data-alwaysdiplayed="0"
-                data-bigmenu="1"
-                data-sidewithcategories="0"
-                src="<?php print_unescaped(image_path('side_menu', 'admin/layout-big-menu.svg')); ?>" alt="<?php p($l->t($labelBigMenu)); ?>">
-        </p>
-
-        <div>
-            <label for="side-menu-opener">
-                <?php p($l->t($labelAlwaysDisplayed)); ?>
-            </label>
-        </div>
-        <p><em><?php p($l->t('Not compatible with touch screens.')); ?></em></p>
-        <p>
-            <img
-                class="side-menu-display <?php echo $displays['always-displayed'] ? 'is-active' : '' ?>"
-                data-alwaysdiplayed="1"
-                data-bigmenu="0"
-                data-sidewithcategories="0"
-                src="<?php print_unescaped(image_path('side_menu', 'admin/layout-always-displayed.svg')); ?>" alt="<?php p($l->t($labelAlwaysDisplayed)); ?>">
-        </p>
-
-        <input
-            type="hidden"
-            class="side-menu-setting"
-            name="always-displayed"
-            id="side-menu-always-displayed"
-            value="<?php echo (int) $_['always-displayed'] ?>"
-        >
-        <input
-            type="hidden"
-            class="side-menu-setting"
-            name="big-menu"
-            id="side-menu-big-menu"
-            value="<?php echo (int) $_['big-menu'] ?>"
-        >
-        <input
-            type="hidden"
-            class="side-menu-setting"
-            name="side-with-categories"
-            id="side-menu-side-with-categories"
-            value="<?php echo (int) $_['side-with-categories'] ?>"
-        >
-    </div>
-
     <div class="section">
         <h2>
             <?php p($l->t('Colors')); ?>
@@ -150,13 +50,6 @@ $labelAlwaysDisplayed = 'Always displayed';
             <small><span class="info"><?php p($l->t('Live preview')); ?></span></small>
         </h2>
 
-        <div class="badges">
-            <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
-            <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
-            <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
-            <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
-        </div>
-
         <div class="side-menu-setting-table">
             <div class="side-menu-setting-row">
                 <div class="side-menu-setting-label side-menu-setting-label-short">
@@ -313,7 +206,7 @@ $labelAlwaysDisplayed = 'Always displayed';
         <div class="side-menu-setting-table">
             <?php
                 $choices = [
-                    $labelDefault => 'side-menu-opener',
+                    'Default' => 'side-menu-opener',
                     'Default (dark)' => 'side-menu-opener-dark',
                     'Hamburger' => 'side-menu-opener-hamburger',
                     'Hamburger (dark)' => 'side-menu-opener-hamburger-dark',
@@ -341,13 +234,6 @@ $labelAlwaysDisplayed = 'Always displayed';
             <?php p($l->t('Dark mode colors')); ?>
         </h2>
 
-        <div class="badges">
-            <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
-            <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
-            <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
-            <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
-        </div>
-
         <p>
             <?php echo $l->t('This parameters are used when Dark theme or Breeze Dark Theme are enabled.'); ?>
         </p>
@@ -506,7 +392,7 @@ $labelAlwaysDisplayed = 'Always displayed';
         <div class="side-menu-setting-table">
             <?php
                 $choices = [
-                    $labelDefault => 'side-menu-opener',
+                    'Default' => 'side-menu-opener',
                     'Default (dark)' => 'side-menu-opener-dark',
                     'Hamburger' => 'side-menu-opener-hamburger',
                     'Hamburger (dark)' => 'side-menu-opener-hamburger-dark',
@@ -536,13 +422,6 @@ $labelAlwaysDisplayed = 'Always displayed';
             <?php p($l->t('Opener')); ?>
         </h2>
 
-        <div class="badges">
-            <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
-            <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
-            <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
-            <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
-        </div>
-
         <div class="side-menu-setting-table">
             <div class="side-menu-setting-row">
                 <?php
@@ -594,7 +473,107 @@ $labelAlwaysDisplayed = 'Always displayed';
                     </select>
                 </div>
             </div>
+        </div>
+    </div>
 
+    <div class="section">
+        <h2>
+            <?php p($l->t('Panel')); ?>
+        </h2>
+
+        <?php
+            $displays = [
+                'default' => !$_['always-displayed'] && !$_['big-menu'] && !$_['side-with-categories'],
+                'always-displayed' => $_['always-displayed'] && !$_['big-menu'] && !$_['side-with-categories'],
+                'side-with-categories' => $_['side-with-categories'] && !$_['always-displayed'] && !$_['big-menu'],
+                'big-menu' => $_['big-menu'] && !$_['always-displayed'] && !$_['side-with-categories'],
+            ];
+        ?>
+
+        <div>
+            <label>
+                <?php p($l->t('Default')); ?>
+            </label>
+        </div>
+        <p>
+            <img
+                class="side-menu-display <?php echo $displays['default'] ? 'is-active' : '' ?>"
+                data-alwaysdiplayed="0"
+                data-bigmenu="0"
+                data-sidewithcategories="0"
+                src="<?php print_unescaped(image_path('side_menu', 'admin/layout-default.svg')); ?>" alt="<?php p($l->t('Default')); ?>">
+        </p>
+
+        <div>
+            <label>
+                <?php p($l->t('With categories')); ?>
+            </label>
+        </div>
+        <p><em><?php echo $l->t('This menu is not compatible with AppOrder.'); ?></em></p>
+        <p>
+            <img
+                class="side-menu-display <?php echo $displays['side-with-categories'] ? 'is-active' : '' ?>"
+                data-alwaysdiplayed="0"
+                data-bigmenu="0"
+                data-sidewithcategories="1"
+                src="<?php print_unescaped(image_path('side_menu', 'admin/layout-side-with-categories.svg')); ?>" alt="<?php p($l->t('With categories')); ?>">
+        </p>
+
+        <div>
+            <label for="side-menu-opener">
+                <?php p($l->t('Big menu')); ?>
+            </label>
+        </div>
+        <p><em><?php echo $l->t('This menu is not compatible with AppOrder.'); ?></em></p>
+        <p>
+            <img
+                class="side-menu-display <?php echo $displays['big-menu'] ? 'is-active' : '' ?>"
+                data-alwaysdiplayed="0"
+                data-bigmenu="1"
+                data-sidewithcategories="0"
+                src="<?php print_unescaped(image_path('side_menu', 'admin/layout-big-menu.svg')); ?>" alt="<?php p($l->t('Big menu')); ?>">
+        </p>
+
+        <div>
+            <label for="side-menu-opener">
+                <?php p($l->t('Always displayed')); ?>
+            </label>
+        </div>
+        <p><em><?php p($l->t('Not compatible with touch screens.')); ?></em></p>
+        <p>
+            <img
+                class="side-menu-display <?php echo $displays['always-displayed'] ? 'is-active' : '' ?>"
+                data-alwaysdiplayed="1"
+                data-bigmenu="0"
+                data-sidewithcategories="0"
+                src="<?php print_unescaped(image_path('side_menu', 'admin/layout-always-displayed.svg')); ?>" alt="<?php p($l->t('Always displayed')); ?>">
+        </p>
+
+        <input
+            type="hidden"
+            class="side-menu-setting"
+            name="always-displayed"
+            id="side-menu-always-displayed"
+            value="<?php echo (int) $_['always-displayed'] ?>"
+        >
+        <input
+            type="hidden"
+            class="side-menu-setting"
+            name="big-menu"
+            id="side-menu-big-menu"
+            value="<?php echo (int) $_['big-menu'] ?>"
+        >
+        <input
+            type="hidden"
+            class="side-menu-setting"
+            name="side-with-categories"
+            id="side-menu-side-with-categories"
+            value="<?php echo (int) $_['side-with-categories'] ?>"
+        >
+        <br>
+
+
+        <div class="side-menu-setting-table">
             <div class="side-menu-setting-row">
                 <div class="side-menu-setting-label">
                     <?php p($l->t('Open the menu when the mouse is hover the opener (automatically disabled on touch screens)')); ?>
@@ -612,18 +591,16 @@ $labelAlwaysDisplayed = 'Always displayed';
                     </select>
                 </div>
             </div>
-        </div>
-    </div>
 
-    <div class="section">
-        <div class="side-menu-setting-table">
             <div class="side-menu-setting-row">
                 <div class="side-menu-setting-label">
                     <?php p($l->t('Display the logo')); ?>
-
+                    <br>
-                    <div class="badges">
+                    <em>
-                        <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
+                        <?php echo $l->t('This feature is not compatible with the <code>big menu</code> display.'); ?>
-                    </div>
+                        <br>
+                        <?php p($l->t('The logo will be hidden when the menu is always displayed.')); ?>
+                    </em>
                 </div>
                 <div class="side-menu-setting-form">
                     <select id="side-menu-display-logo" name="display-logo" class="side-menu-setting">
@@ -639,10 +616,6 @@ $labelAlwaysDisplayed = 'Always displayed';
             <div class="side-menu-setting-row">
                 <div class="side-menu-setting-label">
                     <?php p($l->t('Use the avatar instead of the logo')); ?>
-
-                    <div class="badges">
-                        <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
-                    </div>
                 </div>
                 <div class="side-menu-setting-form">
                     <select id="side-menu-use-avatar" name="use-avatar" class="side-menu-setting">
@@ -658,10 +631,6 @@ $labelAlwaysDisplayed = 'Always displayed';
             <div class="side-menu-setting-row">
                 <div class="side-menu-setting-label">
                     <?php p($l->t('The logo is a link to the default app')); ?>
-
-                    <div class="badges">
-                        <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
-                    </div>
                 </div>
                 <div class="side-menu-setting-form">
                     <select id="side-menu-add-logo-link" name="add-logo-link" class="side-menu-setting">
@@ -677,13 +646,8 @@ $labelAlwaysDisplayed = 'Always displayed';
             <div class="side-menu-setting-row">
                 <div class="side-menu-setting-label">
                     <?php p($l->t('Apps that should not be displayed in the menu')); ?>
-
+                    <br>
-                    <div class="badges">
+                    <em><?php echo $l->t('This feature is only compatible with the <code>big menu</code> display.'); ?></em>
-                        <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
-                        <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
-                        <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
-                        <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
-                    </div>
                 </div>
                 <div class="side-menu-setting-form">
                     <a class="side-menu-toggler" data-target="#big-menu-hidden-apps" href="#_">
@@ -803,17 +767,10 @@ $labelAlwaysDisplayed = 'Always displayed';
             <?php p($l->t('Top menu')); ?>
         </h2>
 
-        <div class="badges">
-            <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
-            <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
-            <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
-            <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
-        </div>
-
         <div class="side-menu-setting-table">
             <div class="side-menu-setting-row">
                 <div class="side-menu-setting-label">
-                    <?php p($l->t('Applications kept in the top menu')); ?>
+                    <?php p($l->t('Apps only visible in the top menu')); ?>
                 </div>
                 <div class="side-menu-setting-form">
                     <a class="side-menu-toggler" data-target="#top-menu-apps" href="#_">
@@ -841,12 +798,12 @@ $labelAlwaysDisplayed = 'Always displayed';
                     </div>
                 </div>
             </div>
+        </div>
 
+        <div class="side-menu-setting-table">
             <div class="side-menu-setting-row">
                 <div class="side-menu-setting-label">
-                    <?php p($l->t('Applications kept in the top menu but also shown in side menu')); ?>
+                    <?php p($l->t('Apps visible in the top and side menus')); ?>
-                    <br>
-                    <em><?php p($l->t('These applications must be selected in the previous option.')); ?></em>
                 </div>
                 <div class="side-menu-setting-form">
                     <a class="side-menu-toggler" data-target="#top-side-menu-apps" href="#_">
@@ -874,72 +831,6 @@ $labelAlwaysDisplayed = 'Always displayed';
                     </div>
                 </div>
             </div>
-            <div class="side-menu-setting-row">
-                <div class="side-menu-setting-label">
-                    <?php p($l->t('Hide labels on mouse over')); ?>
-                </div>
-                <?php
-                    $choices = array_merge(
-                        $choicesYesNo,
-                        ['Except the hovered app' => '2']
-                    );
-                ?>
-                <div class="side-menu-setting-form">
-                    <select id="side-menu-top-menu-mouse-over-hidden-label" name="top-menu-mouse-over-hidden-label" class="side-menu-setting">
-                        <?php foreach ($choices as $label => $value): ?>
-                            <option value="<?php echo $value ?>" <?php if ($value === $_['top-menu-mouse-over-hidden-label']): ?>selected<?php endif; ?>>
-                                <?php echo $l->t($label);  ?>
-                            </option>
-                        <?php endforeach; ?>
-                    </select>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="section">
-        <h2>
-            <?php p($l->t('Applications')); ?>
-        </h2>
-
-        <div class="badges">
-            <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
-            <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
-            <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
-            <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
-        </div>
-
-        <div class="side-menu-setting-table">
-            <div class="side-menu-setting-row">
-                <div class="side-menu-setting-label">
-                    <?php p($l->t('Customize sorting')); ?>
-                </div>
-                <div class="side-menu-setting-form">
-                    <a class="side-menu-toggler" data-target="#apps-order-list" href="#_">
-                        🖱️ <?php p($l->t($labelShowHideApps)); ?>
-                    </a>
-
-                    <div class="theme-undo icon icon-history btn-reset btn-reset--down" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
-                        'side-menu-apps-order' => [],
-                    ])) ?>"></div>
-
-                    <div id="apps-order-list" style="display: none">
-                        <ul class="side-menu-setting-list">
-                            <?php foreach ($_['ordered-apps'] as $key => $app): ?>
-                                <li data-id="<?php echo $app['id']; ?>" class="side-menu-setting-list-item">
-                                    <span class="arrow">
-                                        ⇅
-                                    </span>
-
-                                    <?php echo p($l->t($app['name'])); ?>
-                                </li>
-                            <?php endforeach; ?>
-                        </ul>
-                    </div>
-
-                    <input type="hidden" value='<?php echo json_encode($_['apps-order']) ?>' name="apps-order" class="side-menu-setting" id="side-menu-apps-order">
-                </div>
-            </div>
         </div>
     </div>
 
@@ -949,11 +840,6 @@ $labelAlwaysDisplayed = 'Always displayed';
             <?php p($l->t('Categories')); ?>
         </h2>
 
-        <div class="badges">
-            <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
-            <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
-        </div>
-
         <div class="side-menu-setting-table">
             <div class="side-menu-setting-row">
                 <?php
@@ -977,7 +863,7 @@ $labelAlwaysDisplayed = 'Always displayed';
             </div>
 
             <div class="side-menu-setting-row">
-                <div class="side-menu-setting-label side-menu-setting-label--top">
+                <div class="side-menu-setting-label">
                     <?php p($l->t('Custom categories')); ?>
                 </div>
                 <div class="side-menu-setting-form">
@@ -1064,13 +950,6 @@ $labelAlwaysDisplayed = 'Always displayed';
             <?php p($l->t('Tips')); ?>
         </h2>
 
-        <div class="badges">
-            <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
-            <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
-            <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
-            <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
-        </div>
-
         <p>
             <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>
@@ -1115,19 +994,19 @@ $labelAlwaysDisplayed = 'Always displayed';
     </div>
 
     <div class="section" id="more">
-        <button id="side-menu-save" class="btn btn-info" arial-label="<?php p($l->t('Save')); ?>">
+        <button id="side-menu-save" class="btn btn-info">
             <?php p($l->t('Save')); ?>
             <progress max="100" value="0" id="side-menu-save-progress"></progress>
         </button>
 
         <a href="<?php echo $urlGenerator->linkToRoute('side_menu.AdminSetting.exportConfiguration') ?>" target="_blank" rel="noopener">
-            <button class="btn btn-primary" arial-label="<?php p($l->t('Export the configuration')); ?>">
+            <button class="btn btn-primary" >
                 <?php p($l->t('Export the configuration')); ?>
             </button>
         </a>
 
         <a href="<?php echo $urlGenerator->linkToRoute('side_menu.AdminSetting.removeCache') ?>">
-            <button class="btn btn-primary" arial-label="<?php p($l->t('Purge the cache')); ?>">
+            <button class="btn btn-primary" >
                 <?php p($l->t('Purge the cache')); ?> (<?php echo $cacheSize ?> Kb)
             </button>
         </a>
@@ -1139,7 +1018,7 @@ $labelAlwaysDisplayed = 'Always displayed';
                 <?php p($l->t('You like this app and you want to support me?')); ?>
 
                 <a style="margin-left: 10px" target="_blank" href="https://www.buymeacoffee.com/deblan" rel="noopener">
-                    <button arial-label="<?php p($l->t('Buy me a coffee ☕')); ?>">
+                    <button>
                         <?php p($l->t('Buy me a coffee ☕')); ?>
                     </button>
                 </a>

templates/settings/personal-form.php

@@ -27,7 +27,6 @@ $choicesYesNo = [
 
 
 $labelShowHideApps = 'Show and hide the list of applications';
-$labelReset = 'Reset to default';
 ?>
 <div id="side-menu-section">
     <?php if ($_['force']): ?>
@@ -42,6 +41,10 @@ $labelReset = 'Reset to default';
         </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>
@@ -120,7 +123,7 @@ $labelReset = 'Reset to default';
             <div class="side-menu-setting-table">
                 <div class="side-menu-setting-row">
                     <div class="side-menu-setting-label">
-                        <?php p($l->t('Applications kept in the top menu')); ?>
+                        <?php p($l->t('Apps only visible in the top menu')); ?>
                         <p>
                             <em>
                                 <?php p($l->t('If there is no selection then the global configuration is applied.')); ?>
@@ -160,10 +163,9 @@ $labelReset = 'Reset to default';
             <div class="side-menu-setting-table">
                 <div class="side-menu-setting-row">
                     <div class="side-menu-setting-label">
-                        <?php p($l->t('Applications kept in the top menu but also shown in side menu')); ?>
+                        <?php p($l->t('Apps visible in the top and side menus')); ?>
                         <p>
                             <em>
-                                <?php p($l->t('These applications must be selected in the previous option.')); ?><br>
                                 <?php p($l->t('If there is no selection then the global configuration is applied.')); ?>
                             </em>
                         </p>
@@ -198,49 +200,11 @@ $labelReset = 'Reset to default';
                 </div>
             </div>
         </div>
-        <div class="section">
-            <h2>
-                <?php p($l->t('Applications')); ?>
-            </h2>
-
-            <div class="side-menu-setting-table">
-                <div class="side-menu-setting-row">
-                    <div class="side-menu-setting-label">
-                        <?php p($l->t('Customize sorting')); ?>
-                    </div>
-                    <div class="side-menu-setting-form">
-                        <a class="side-menu-toggler" data-target="#apps-order-list" href="#_">
-                            🖱️ <?php p($l->t($labelShowHideApps)); ?>
-                        </a>
-
-                        <div class="theme-undo icon icon-history btn-reset btn-reset--down" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
-                            'side-menu-apps-order' => '[]',
-                        ])) ?>"></div>
-
-                        <div id="apps-order-list" style="display: none">
-                            <ul class="side-menu-setting-list">
-                                <?php foreach ($_['ordered-apps'] as $key => $app): ?>
-                                    <li data-id="<?php echo $app['id']; ?>" class="side-menu-setting-list-item">
-                                        <span class="arrow">
-                                            ⇅
-                                        </span>
-
-                                        <?php echo p($l->t($app['name'])); ?>
-                                    </li>
-                                <?php endforeach; ?>
-                            </ul>
-                        </div>
-
-                        <input type="hidden" value='<?php echo json_encode($_['apps-order']) ?>' name="apps-order" class="side-menu-setting" id="side-menu-apps-order" data-personal>
-                    </div>
-                </div>
-            </div>
-        </div>
     <?php endif ?>
 
     <div class="section">
         <?php if (!$_['force']): ?>
-            <button id="side-menu-save" class="btn btn-info" arial-label="<?php p($l->t('Save')); ?>">
+            <button id="side-menu-save" class="btn btn-info">
                 <?php p($l->t('Save')); ?>
                 <progress max="100" value="0" id="side-menu-save-progress"></progress>
             </button>
@@ -255,7 +219,7 @@ $labelReset = 'Reset to default';
                 <?php p($l->t('You like this app and you want to support me?')); ?>
 
                 <a style="margin-left: 10px" target="_blank" href="https://www.buymeacoffee.com/deblan" rel="noopener">
-                    <button arial-label="<?php p($l->t('Buy me a coffee ☕')); ?>">
+                    <button>
                         <?php p($l->t('Buy me a coffee ☕')); ?>
                     </button>
                 </a>

tsconfig.json

@@ -1,33 +0,0 @@
-{
-	"extends": "@vue/tsconfig/tsconfig.json",
-	"include": ["./src/**/*.js"],
-	"compilerOptions": {
-		"types": ["node", "vue", "vue-router"],
-		"outDir": "./js/",
-		"target": "ESNext",
-		"module": "ESNext",
-		// Set module resolution to bundler and `noEmit` to be able to set `allowImportingTsExtensions`, so we can import Typescript with .ts extension
-		"moduleResolution": "Bundler",
-		"allowImportingTsExtensions": true,
-		"noEmit": true,
-		// Allow ts to import js files
-		"allowJs": true,
-		"allowSyntheticDefaultImports": true,
-		"declaration": false,
-		"noImplicitAny": false,
-		"resolveJsonModule": true,
-		"strict": true,
-	},
-	"vueCompilerOptions": {
-		"target": 2.7
-	},
-	"ts-node": {
-		// these options are overrides used only by ts-node
-		// same as our --compilerOptions flag and our TS_NODE_COMPILER_OPTIONS environment variable
-		"compilerOptions": {
-			"moduleResolution": "node",
-			"module": "commonjs",
-			"verbatimModuleSyntax": false
-		}
-	}
-}

webpack.js

@@ -1,12 +1,8 @@
 const path = require('path')
-const BabelLoaderExcludeNodeModulesExcept = require('babel-loader-exclude-node-modules-except')
+const { VueLoaderPlugin } = require('vue-loader')
-const {
+const StyleLintPlugin = require('stylelint-webpack-plugin')
-  VueLoaderPlugin
-} = require('vue-loader')
-// const StyleLintPlugin = require('stylelint-webpack-plugin')
 
 module.exports = {
-  devtool: "source-map",
     entry: {
         'admin': path.join(__dirname, 'src', 'admin.js'),
         'sideMenu': path.join(__dirname, 'src', 'SideMenu.js'),
@@ -14,11 +10,12 @@ module.exports = {
     output: {
         path: path.resolve(__dirname, './js'),
         publicPath: '/js',
-    filename: '[name].js?v=[chunkhash]',
+        filename: '[name].js?v=[hash]',
-    chunkFilename: 'chunks/[name]-[chunkhash].js',
+        chunkFilename: 'chunks/[name]-[hash].js',
     },
     module: {
-    rules: [{
+        rules: [
+            {
                 test: /\.css$/,
                 use: ['vue-style-loader', 'css-loader'],
             },
@@ -30,20 +27,6 @@ module.exports = {
                 test: /\.vue$/,
                 loader: 'vue-loader',
             },
-      {
-        test: /\.tsx?$/,
-        use: [
-          'babel-loader',
-          {
-            // Fix TypeScript syntax errors in Vue
-            loader: 'ts-loader',
-            options: {
-              transpileOnly: true,
-            },
-          },
-        ],
-        exclude: BabelLoaderExcludeNodeModulesExcept([]),
-      },
             {
                 test: /\.js$/,
                 loader: 'babel-loader',
@@ -61,10 +44,10 @@ module.exports = {
     },
     plugins: [
         new VueLoaderPlugin(),
-    // new StyleLintPlugin(),
+        new StyleLintPlugin(),
     ],
     resolve: {
-    extensions: ['.*', '.js', '.vue'],
+        extensions: ['*', '.js', '.vue'],
         symlinks: false,
     },
 }