release v4.1.1

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

.gitea/issue_template/ISSUE_TEMPLATE.yml

@@ -26,7 +26,7 @@ body:
     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/tips/#export-the-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: |
         ```
         {

.gitea/issue_template/QUESTION_TEMPLATE.yml

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

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

.woodpecker.yml

@@ -1,103 +0,0 @@
-steps:
-  check-tag:
-    image: alpine
-    commands:
-      - TAG=${CI_COMMIT_TAG/v//}
-      - grep "<version>$TAG</version>" appinfo/info.xml
-    when:
-      event: [tag]
-
-  dependencies:
-    image: node:16
-    pull: true
-    commands:
-      - npm i
-    when:
-      event: [tag, push, pull_request, manual]
-      branch: [master, develop, feature/*, fix/*, bugfix/*, translations]
-
-  osv-detector:
-    image: gitnet.fr/deblan/osv-detector:v0.10
-    commands:
-      - osv-detector package-lock.json
-    failure: ignore
-
-  build-js:
-    image: node:16
-    commands:
-      - npm run build
-    when:
-      event: [tag, push, pull_request, manual]
-      branch: [master, develop, feature/*, fix/*, bugfix/*, translations]
-
-  build-translations:
-    image: deblan/php:8.0
-    commands:
-      - php bin/generate_l10n.php
-    when:
-      event: [tag, push, pull_request, manual]
-      branch: [master, develop, feature/*, fix/*, bugfix/*, translations]
-
-  create-signature:
-    image: nextcloud:25
-    secrets: [app_certificate, app_public_certificate]
-    environment:
-      SQLITE_DATABASE: /var/www/data/data.db
-      NEXTCLOUD_ADMIN_USER: admin
-      NEXTCLOUD_ADMIN_PASSWORD: admin
-    commands:
-      - 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/
-    when:
-      event: [tag]
-
-  # check-code-quality:
-  #   image: sonarsource/sonar-scanner-cli
-  #   secrets: [sonar_token, sonar_host, sonar_project]
-  #   commands:
-  #     - sonar-scanner
-  #       -Dsonar.projectKey=$SONAR_PROJECT
-  #       -Dsonar.sources=.
-  #       -Dsonar.host.url=$SONAR_HOST
-  #       -Dsonar.pullrequest.key=$CI_COMMIT_PULL_REQUEST
-  #       -Dsonar.pullrequest.branch=$CI_COMMIT_SOURCE_BRANCH
-  #       -Dsonar.pullrequest.base=$CI_COMMIT_TARGET_BRANCH
-  #   failure: ignore
-  #   when:
-  #     event: [pull_request]
-
-  create-package:
-    image: deblan/php:8.0
-    volumes:
-      - /var/www/html/artifacts:/var/www/html/artifacts
-    secrets: [app_certificate]
-    commands:
-      - 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
-    when:
-      event: [tag]
-
-  push-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

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

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

@@ -0,0 +1,17 @@
+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,5 +1,60 @@
 ## [Unreleased]
 
+## 4.1.1
+### 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)

appinfo/info.xml

@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8" ?>
-<info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance"
+<info xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
-      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>
@@ -17,7 +16,7 @@ You can report a bug or request a feature by opening an issue.
 
 Requirements:
 
-* PHP >= 8.0
+* PHP >= 8.1
 * App `theming` enabled
 
 If you like this application and if you want to support the development:
@@ -32,9 +31,9 @@ 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>3.11.6</version>
+    <version>4.1.1</version>
     <licence>agpl</licence>
-    <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
+    <author mail="contact@deblan.fr" homepage="https://www.deblan.fr/">Simon Vieille</author>
     <namespace>SideMenu</namespace>
     <documentation>
         <admin>https://deblan.gitnet.page/side_menu_doc/</admin>
@@ -42,20 +41,20 @@ In case of downtime, you can download **Custom Menu** from [here](https://kim.de
     </documentation>
     <category>customization</category>
     <website>https://gitnet.fr/deblan/side_menu</website>
-    <discussion>https://matrix.to/#/!TFPucDATKODpHNVAtu:neutralnetwork.org?via=neutralnetwork.org</discussion>
+    <discussion><![CDATA[https://matrix.to/#/!TFPucDATKODpHNVAtu:neutralnetwork.org?via=neutralnetwork.org]]></discussion>
     <bugs>https://gitnet.fr/deblan/side_menu/issues</bugs>
     <repository type="git">https://gitnet.fr/deblan/side_menu</repository>
-    <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc19_default_menu.png</screenshot>
+    <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/admin_settings.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/n19_big_menu.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/nc18_menu_always_displayed.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/nc20_big_menu_responsive.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/personal_settings.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/nc25_big_menu.png</screenshot>
+    <screenshot><![CDATA[https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc25_big_menu.png]]></screenshot>
-    <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc25_default_menu.png</screenshot>
+    <screenshot><![CDATA[https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc25_default_menu.png]]></screenshot>
     <dependencies>
-        <nextcloud min-version="25" max-version="28"/>
+        <php min-version="8.1" max-version="8.4" />
-        <php min-version="7.4"/>
+        <nextcloud min-version="30" max-version="32"/>
     </dependencies>
     <settings>
         <admin>OCA\SideMenu\Settings\Admin</admin>

appinfo/routes.php

@@ -1,31 +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/>.
- */
-
-return [
-    'routes' => [
-        ['name' => 'App#index', 'url' => '/', 'verb' => 'GET'],
-        ['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,21 +1,75 @@
 <?php
-/**
- * Imports a json configuration into a sqlite database.
- *
- * Usage:
- *   php bin/import_config.php /path/to/config.json /path/to/owncloud.db
- */
 
-$configFile = $argv[1];
+function showUsageAndExit(int $code)
-$databaseFile = $argv[2];
+{
+    global $argv;
 
-$content = file_get_contents($configFile);
+    echo "${argv[0]} [--help] --config /path/to/config/config.php --file /path/to/config.json\n";
-$config = json_decode($content, true);
 
-$pdo = new \Pdo(sprintf('sqlite:%s', $databaseFile));
+    exit($code);
-$stmt = $pdo->prepare('UPDATE oc_appconfig SET configvalue=:value WHERE configkey=:key and appid=:appId');
+}
 
-foreach ($config as $key => $value) {
+function value(string $shortName, string $longName, array $options, bool $required = true): ?string
+{
+    $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/sideMenu.css

@@ -83,6 +83,16 @@
   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 {
@@ -215,6 +225,11 @@
 .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 {
@@ -287,8 +302,9 @@
   display: inline;
 }
 
-.side-menu-always-displayed .app-navigation--close {
+.side-menu-always-displayed .app-navigation-toggle-wrapper {
-  transform: translateX(calc(-100% + 50px));
+  right: 0 !important;
+  margin-left: 0 !important;
 }
 
 #side-menu.side-menu-with-categories {

lib/AppInfo/Application.php

@@ -3,6 +3,7 @@
 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;
@@ -12,7 +13,11 @@ 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;
 
@@ -26,6 +31,7 @@ class Application extends App implements IBootstrap
     public const APP_ID = 'side_menu';
 
     public const APP_NAME = 'Custom menu';
+
     /**
      * @var OC\AllConfig
      */
@@ -41,14 +47,55 @@ 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;
@@ -97,38 +144,14 @@ class Application extends App implements IBootstrap
         $cache = $this->config->getAppValue(self::APP_ID, 'cache', '0');
 
         foreach ($assets as $value) {
-            $route = OC::$server->getURLGenerator()->linkToRoute($value['route'], ['v' => $cache]);
+            $route = \OC::$server->getURLGenerator()->linkToRoute(
+                $value['route'],
+                ['v' => $cache]
+            );
+
             $value['attr'][$value['route_attr']] = $route;
 
             Util::addHeader($value['type'], $value['attr'], '');
         }
     }
-
-    public function register(IRegistrationContext $context): void
-    {
-        $context->registerService('AppRepository', function () {
-            return new AppRepository();
-        });
-
-        $context->registerService('CategoryRepository', function () {
-            return new CategoryRepository();
-        });
-
-        $context->registerService('ConfigProxy', function () {
-            return new ConfigProxy();
-        });
-    }
-
-    public function boot(IBootContext $context): void
-    {
-        $this->config = OC::$server->getConfig();
-        $this->cspnm = OC::$server->getContentSecurityPolicyNonceManager();
-        $this->user = OC::$server[IUserSession::class]->getUser();
-
-        if (!$this->isEnabled()) {
-            return;
-        }
-
-        $this->addAssets();
-    }
 }

lib/Controller/AdminSettingController.php

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

lib/Controller/AppController.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @license GNU AGPL version 3 or any later version
  *
@@ -18,10 +19,12 @@
 
 namespace OCA\SideMenu\Controller;
 
-use OC;
 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;
@@ -29,37 +32,22 @@ use OCP\IUserSession;
 
 class AppController extends Controller
 {
-    /**
-     * @var ConfigProxy
-     */
-    protected $config;
-
-    /**
-     * @var AppRepository
-     */
-    protected $appRepository;
-
     public function __construct(
         string $appName,
         IRequest $request,
-        AppRepository $appRepository,
+        protected AppRepository $appRepository,
-        IURLGenerator $urlGenerator,
+        protected IURLGenerator $urlGenerator,
-        ConfigProxy $config
+        protected ConfigProxy $config
     ) {
         parent::__construct($appName, $request);
-
-        $this->appRepository = $appRepository;
-        $this->urlGenerator = $urlGenerator;
-        $this->config = $config;
     }
 
-    /**
+    #[NoCSRFRequired]
-     * @NoAdminRequired
+    #[NoAdminRequired]
-     * @NoCSRFRequired
+    #[FrontpageRoute(verb: 'GET', url: '/')]
-     */
     public function index(): RedirectResponse
     {
-        $user = OC::$server[IUserSession::class]->getUser();
+        $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');
@@ -87,7 +75,7 @@ class AppController extends Controller
     protected function redirectToApp($app, bool $isHref = false): RedirectResponse
     {
         if (!$isHref) {
-            $isIgnoreFrontController = true === OC::$server->getConfig()->getSystemValue(
+            $isIgnoreFrontController = true === \OC::$server->getConfig()->getSystemValue(
                 'htaccess.IgnoreFrontController',
                 false
             );

lib/Controller/CssController.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @license GNU AGPL version 3 or any later version
  *
@@ -18,63 +19,40 @@
 
 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\Response;
+use OCP\AppFramework\Http\Attribute\FrontpageRoute;
+use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
+use OCP\AppFramework\Http\Attribute\PublicPage;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IRequest;
 use OCP\IUserSession;
 
 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,
-        ConfigProxy $config,
+        protected ConfigProxy $config,
-        ThemingDefaults $theming,
+        protected ThemingDefaults $theming,
-        Color $color
+        protected 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]
-     * @NoCSRFRequired
+    #[PublicPage]
-     * @PublicPage
+    #[FrontpageRoute(verb: 'GET', url: '/css/stylesheet')]
-     *
+    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');
@@ -107,15 +85,15 @@ class CssController extends Controller
             $isDarkThemeUserEnabled = 'dark' === $this->config->getUserValue($this->user, 'theme', '', 'accessibility');
             $isBreezeDarkUserEnabled = $this->config->getUserValue($this->user, 'theme_enabled', '', 'breezedark');
 
-            $isBreezeDarkUserEnabled = '1' === $isBreezeDarkUserEnabled ||
+            $isBreezeDarkUserEnabled = '1' === $isBreezeDarkUserEnabled
-                ($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);

lib/Controller/JsController.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @license GNU AGPL version 3 or any later version
  *
@@ -18,12 +19,15 @@
 
 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;
@@ -32,47 +36,28 @@ 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,
-        ConfigProxy $config,
+        protected ConfigProxy $config,
-        ThemingDefaults $themingDefaults,
+        protected ThemingDefaults $themingDefaults,
-        IFactory $l10nFactory
+        protected 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]
-     * @NoCSRFRequired
+    #[PublicPage]
-     * @PublicPage
+    #[FrontpageRoute(verb: 'GET', url: '/js/script')]
-     */
     public function script(): TemplateResponse
     {
         $response = new TemplateResponse(Application::APP_ID, 'js/script', $this->getConfig(), 'blank');
@@ -81,11 +66,10 @@ class JsController extends Controller
         return $response;
     }
 
-    /**
+    #[NoCSRFRequired]
-     * @NoAdminRequired
+    #[NoAdminRequired]
-     * @NoCSRFRequired
+    #[PublicPage]
-     * @PublicPage
+    #[FrontpageRoute(verb: 'GET', url: '/js/config')]
-     */
     public function config(): JSONResponse
     {
         return new JSONResponse($this->getConfig());
@@ -127,10 +111,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),
@@ -138,13 +122,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),
@@ -154,7 +138,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'),

lib/Controller/NavController.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @license GNU AGPL version 3 or any later version
  *
@@ -18,13 +19,15 @@
 
 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;
@@ -32,59 +35,25 @@ 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,
-        ConfigProxy $config,
+        protected ConfigProxy $config,
-        AppRepository $appRepository,
+        protected AppRepository $appRepository,
-        CategoryRepository $categoryRepository,
+        protected CategoryRepository $categoryRepository,
-        URLGenerator $router,
+        protected URLGenerator $router,
-        IFactory $l10nFactory
+        protected IFactory $l10nFactory
     ) {
         parent::__construct($appName, $request);
-
-        $this->config = $config;
-        $this->appRepository = $appRepository;
-        $this->categoryRepository = $categoryRepository;
-        $this->l10nFactory = $l10nFactory;
-        $this->router = $router;
     }
 
-    /**
+    #[NoCSRFRequired]
-     * @NoAdminRequired
+    #[NoAdminRequired]
-     * @NoCSRFRequired
+    #[PublicPage]
-     * @PublicPage
+    #[FrontpageRoute(verb: 'GET', url: '/nav/items')]
-     *
+    public function items(): JSONResponse
-     * @return JSONResponse
-     */
-    public function items()
     {
-        $user = OC::$server[IUserSession::class]->getUser();
+        $user = \OC::$server[IUserSession::class]->getUser();
         $items = [];
 
         if (!$user) {
@@ -189,11 +158,11 @@ class NavController extends Controller
 
         usort($items, function ($a, $b) use ($categoriesLabels) {
             foreach ($categoriesLabels as $key => $value) {
-                if ($a['categoryId'] === 'other') {
+                if ('other' === $a['categoryId']) {
                     return -1;
                 }
 
-                if ($b['categoryId'] === 'other') {
+                if ('other' === $b['categoryId']) {
                     return 1;
                 }
 

lib/Controller/PersonalSettingController.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,52 +22,29 @@ namespace OCA\SideMenu\Controller;
 use OCA\SideMenu\AppInfo\Application;
 use OCA\SideMenu\Service\ConfigProxy;
 use OCP\AppFramework\Controller;
-use OCP\AppFramework\Http\Response;
+use OCP\AppFramework\Http\Attribute\FrontpageRoute;
+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
 {
-    /**
-     * @var IConfig
-     */
-    protected $config;
-
-    /**
-     * @var ConfigProxy
-     */
-    protected $configProxy;
-
-    /**
-     * @var IUserSession
-     */
-    protected $userSession;
-
     public function __construct(
         $appName,
         IRequest $request,
-        IConfig $config,
+        protected IConfig $config,
-        ConfigProxy $configProxy,
+        protected ConfigProxy $configProxy,
-        IUserSession $userSession
+        protected IUserSession $userSession
     ) {
         parent::__construct($appName, $request);
-
-        $this->config = $config;
-        $this->configProxy = $configProxy;
-        $this->userSession = $userSession;
     }
 
-    /**
+    #[NoCSRFRequired]
-     * @NoAdminRequired
+    #[NoAdminRequired]
-     * @NoCSRFRequired
+    #[FrontpageRoute(verb: 'POST', url: '/personalSetting/valueSet')]
-     *
+    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();

lib/Service/AppRepository.php

@@ -3,7 +3,12 @@
 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;
 
 /**
@@ -13,51 +18,25 @@ use OCP\L10N\IFactory;
  */
 class AppRepository
 {
-    /**
-     * @var \OC_App
-     */
-    protected $ocApp;
-
-    /**
-     * @var IFactory
-     */
-    protected $l10nFactory;
-
-    /**
-     * @var ConfigProxy
-     */
-    protected $config;
-
-    /**
-     * @var CategoryRepository
-     */
-    protected $categoryRepository;
-
-    /**
-     * @var INavigationManager
-     */
-    protected $navigationManager;
-
     public function __construct(
-        \OC_App $ocApp,
+        protected \OC_App $ocApp,
-        INavigationManager $navigationManager,
+        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->dispatcher->dispatchTyped(new BeforeTemplateRenderedEvent(
-        $this->l10nFactory = $l10nFactory;
+            $this->userSession->isLoggedIn(),
-        $this->config = $config;
+            new TemplateResponse(Application::APP_NAME, '')
-        $this->navigationManager = $navigationManager;
+        ));
-        $this->categoryRepository = $categoryRepository;
     }
 
     /**
      * Retrieves visibles apps.
-     *
-     * @return array
      */
-    public function getVisibleApps()
+    public function getVisibleApps(): array
     {
         $navigation = $this->navigationManager->getAll();
         $appCategoriesCustom = $this->config->getAppValueArray('apps-categories-custom', '[]');
@@ -90,6 +69,14 @@ class AppRepository
                         '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'],
@@ -110,7 +97,7 @@ class AppRepository
         return $visibleApps;
     }
 
-    public function getAppName($app)
+    public function getAppName($app): string
     {
         return $this->config->getAppValue(
             'app.navigation.name',
@@ -119,7 +106,7 @@ class AppRepository
         );
     }
 
-    public function getOrderedApps(?User $user = null)
+    public function getOrderedApps(?User $user = null): array
     {
         $apps = $this->getVisibleApps();
         $orders = $this->config->getAppValueArray('apps-order', '[]');

lib/Service/CategoryRepository.php

@@ -15,51 +15,18 @@ 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(
-        CategoryFetcher $categoryFetcher,
+        protected CategoryFetcher $categoryFetcher,
-        ConfigProxy $config,
+        protected ConfigProxy $config,
-        IConfig $iConfig,
+        protected IConfig $iConfig,
-        IFactory $l10nFactory,
+        protected IFactory $l10nFactory,
-        IUserSession $userSession
+        protected IUserSession $userSession
-    ) {
+    ) {}
-        $this->categoryFetcher = $categoryFetcher;
-        $this->l10nFactory = $l10nFactory;
-        $this->config = $config;
-        $this->iConfig = $iConfig;
-        $this->userSession = $userSession;
-    }
 
     /**
      * Retrieves categories.
-     *
-     * @return array
      */
-    public function getOrderedCategories()
+    public function getOrderedCategories(): array
     {
         $currentLanguage = substr($this->l10nFactory->findLanguage(), 0, 2);
         $type = $this->config->getAppValue('categories-order-type', 'default');

lib/Service/ConfigProxy.php

@@ -13,12 +13,7 @@ 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,12 +11,7 @@ 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,4 +1,5 @@
 <?php
+
 /**
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,76 +22,25 @@ 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(
-        IL10N $l,
+        protected IL10N $l,
-        ILogger $logger,
+        protected ConfigProxy $config,
-        ConfigProxy $config,
+        protected AppRepository $appRepository,
-        AppRepository $appRepository,
+        protected CategoryRepository $categoryRepository,
-        CategoryRepository $categoryRepository,
+        protected ThemingDefaults $theming,
-        ThemingDefaults $theming,
+        protected Color $color,
-        Color $color,
+        protected LangRepository $langRepository
-        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

lib/Settings/AdminSection.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @license GNU AGPL version 3 or any later version
  *
@@ -25,59 +26,26 @@ use OCP\Settings\IIconSection;
 
 class AdminSection implements IIconSection
 {
-    /**
+    public function __construct(
-     * @var IL10N
+        protected IURLGenerator $url,
-     */
+        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,4 +1,5 @@
 <?php
+
 /**
  * @license GNU AGPL version 3 or any later version
  *
@@ -23,50 +24,17 @@ 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
 {
-    /**
-     * @var IL10N
-     */
-    private $l;
-
-    /**
-     * @var ILogger
-     */
-    private $logger;
-
-    /**
-     * @var ConfigProxy
-     */
-    private $config;
-
-    /**
-     * @var IUserSession
-     */
-    private $userSession;
-
-    /**
-     * @var AppRepository
-     */
-    private $appRepository;
-
     public function __construct(
-        IL10N $l,
+        protected IL10N $l,
-        ILogger $logger,
+        protected ConfigProxy $config,
-        ConfigProxy $config,
+        protected IUserSession $userSession,
-        IUserSession $userSession,
+        protected AppRepository $appRepository
-        AppRepository $appRepository
+    ) {}
-    ) {
-        $this->l = $l;
-        $this->logger = $logger;
-        $this->config = $config;
-        $this->userSession = $userSession;
-        $this->appRepository = $appRepository;
-    }
 
     /**
      * @return TemplateResponse

lib/Settings/PersonalSection.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @license GNU AGPL version 3 or any later version
  *
@@ -26,34 +27,12 @@ use OCP\Settings\IIconSection;
 
 class PersonalSection implements IIconSection
 {
-    /**
+    public function __construct(
-     * @var IL10N
+        protected IURLGenerator $url,
-     */
+        protected IL10N $l,
-    private $l;
+        protected ConfigProxy $configProxy
+    ) {}
 
-    /**
-     * @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')) {
@@ -63,12 +42,6 @@ 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')) {
@@ -78,13 +51,6 @@ 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')) {
@@ -94,9 +60,6 @@ class PersonalSection implements IIconSection
         return 70;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getIcon()
     {
         return $this->url->imagePath(Application::APP_ID, 'icon.svg');

package.json

@@ -11,9 +11,15 @@
 		"stylelint:fix": "./node_modules/.bin/stylelint src --fix"
 	},
 	"dependencies": {
-		"axios": "^0.24.0",
+		"@nextcloud/axios": "^2.5.1",
-		"trim": "^1.0.1",
+		"@nextcloud/browserslist-config": "^3.0.1",
-		"vue": "^2.6.11"
+		"@nextcloud/event-bus": "^3.3.1",
+		"@nextcloud/initial-state": "^2.2.0",
+		"@nextcloud/l10n": "^3.1.0",
+		"@nextcloud/vue": "^8.19.0",
+		"@vueuse/core": "^11.1.0",
+		"axios": "^1.6.7",
+		"trim": "^1.0.1"
 	},
 	"browserslist": [
 		"extends @nextcloud/browserslist-config"
@@ -22,42 +28,46 @@
 		"node": ">=16.0.0"
 	},
 	"devDependencies": {
-		"@babel/core": "^7.9.0",
+		"@babel/node": "^7.25.7",
-		"@babel/plugin-syntax-dynamic-import": "^7.8.3",
+		"@babel/plugin-transform-private-methods": "^7.25.7",
-		"@babel/preset-env": "^7.9.0",
+		"@babel/preset-typescript": "^7.24.7",
-		"@nextcloud/axios": "^2.3.0",
+		"@cypress/vue2": "^2.1.1",
-		"@nextcloud/browserslist-config": "^2.3.0",
+		"@cypress/webpack-preprocessor": "^6.0.2",
-		"@nextcloud/eslint-config": "^8.1.2",
+		"@nextcloud/babel-config": "^1.2.0",
-		"@nextcloud/initial-state": "^2.0.0",
+		"@nextcloud/eslint-config": "^8.4.1",
-		"@nextcloud/l10n": "^2.1.0",
+		"@nextcloud/stylelint-config": "^3.0.1",
-		"@nextcloud/vue": "^7.12.1",
+		"@nextcloud/typings": "^1.9.1",
-		"babel-eslint": "^10.1.0",
+		"@nextcloud/webpack-vue-config": "^6.0.1",
-		"babel-loader": "^8.1.0",
+		"@simplewebauthn/types": "^10.0.0",
-		"css-loader": "^3.4.2",
+		"@types/dockerode": "^3.3.29",
-		"eslint": "^8.0.0",
+		"@types/wait-on": "^5.3.4",
-		"eslint-config-standard": "^17.0.0",
+		"@vue/tsconfig": "^0.5.1",
-		"eslint-import-resolver-webpack": "^0.12.1",
+		"babel-loader": "^9.2.1",
-		"eslint-plugin-import": "^2.20.0",
+		"babel-loader-exclude-node-modules-except": "^1.2.1",
-		"eslint-plugin-nextcloud": "^0.3.0",
+		"babel-plugin-module-resolver": "^5.0.2",
-		"eslint-plugin-node": "^10.0.0",
+		"colord": "^2.9.3",
-		"eslint-plugin-promise": "^6.0.0",
+		"eslint-plugin-cypress": "^3.5.0",
-		"eslint-plugin-standard": "^4.0.1",
+		"eslint-plugin-es": "^4.1.0",
-		"eslint-plugin-vue": "^9.0.0",
+		"exports-loader": "^5.0.0",
-		"eslint-webpack-plugin": "^3.0.0",
+		"file-loader": "^6.2.0",
-		"file-loader": "^6.0.0",
+		"handlebars-loader": "^1.7.3",
-		"sass": "^1.49.9",
+		"jasmine-core": "~2.5.2",
-		"sass-loader": "^13.0.2",
+		"jasmine-sinon": "^0.4.0",
-		"stylelint": "^14.0.0",
+		"jsdoc": "^4.0.2",
-		"stylelint-config-recommended-scss": "^7.0.0",
+		"raw-loader": "^4.0.2",
-		"stylelint-scss": "^4.0.0",
+		"sass": "^1.79.3",
-		"stylelint-webpack-plugin": "^3.3.0",
+		"stylelint": "^16.9.0",
-		"url-loader": "^4.0.0",
+		"stylelint-use-logical": "^2.1.2",
-		"vue-loader": "^15",
+		"ts-loader": "^9.5.0",
-		"vue-style-loader": "^4.1.3",
+		"ts-node": "^10.9.1",
-		"vue-template-compiler": "^2.7.13",
+		"tslib": "^2.7.0",
-		"webpack": "^5.0.0",
+		"typescript": "^5.6.2",
-		"webpack-cli": "^4.0.0",
+		"vue-loader": "^15.9.8",
-		"webpack-merge": "^4.2.2",
+		"vue-template-compiler": "^2.7.16",
-		"webpack-node-externals": "^1.7.2"
+		"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"
 	}
 }

src/AdminCategoriesCustom.vue

@@ -84,9 +84,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 </style>
 
 <script>
-import NcModal from '@nextcloud/vue/dist/Components/NcModal'
+import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
-import NcActions from '@nextcloud/vue/dist/Components/NcActions'
+import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
+import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
 
 export default {
   name: 'AdminCategoriesCustom',

src/AppMenu.vue

@@ -28,9 +28,9 @@
     <ul
       class="app-menu-main"
       :class="{ 'app-menu-main__hidden-label': hiddenLabels === 1, 'app-menu-main__show-hovered': hiddenLabels === 2 }"
-      v-if="apps !== null"
+      v-if="appList.length"
       >
-      <li v-for="app in mainAppList()"
+      <li v-for="app in mainAppList(state)"
         :key="app.id"
         :data-app-id="app.id"
         class="app-menu-entry"
@@ -50,8 +50,8 @@
         </a>
       </li>
     </ul>
-    <NcActions class="app-menu-more" :aria-label="t('core', 'More apps')" v-if="apps !== null">
+    <NcActions class="app-menu-more" :aria-label="t('core', 'More apps')">
-      <NcActionLink v-for="app in popoverAppList()"
+      <NcActionLink v-for="app in popoverAppList(state)"
         :key="app.id"
         :aria-label="appLabel(app)"
         :aria-current="app.active ? 'page' : false"
@@ -71,92 +71,128 @@
 </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 {
+export default defineComponent({
   name: 'AppMenu',
+
   components: {
-    NcActions, NcActionLink,
+    NcActions,
+    NcActionLink,
   },
+
+  setup() {
+    return {
+        t,
+        n,
+    }
+  },
+
   data() {
     return {
       apps: null,
-      appLimit: 0,
+      appList: [],
       observer: null,
       targetBlankApps: [],
-      hiddenLabels: true
+      hiddenLabels: true,
+      state: 1,
     }
   },
+
   mounted() {
-    const ncApps = loadState('core', 'apps', {})
+    axios.get(generateOcsUrl('core/navigation', 2) + '/apps?format=json')
-    this.apps = {}
+      .then((response) => response.data)
-    let orders = {}
+      .then((data) => {
+        if (data.ocs.meta.statuscode !== 200) {
+          return
+        }
 
-    window.menuAppsOrder.forEach((app, order) => {
+        this.setApps(data.ocs.data)
-      orders[app] = order + 1
+      })
-    })
-
-    Array.from(window.topMenuApps).forEach((id) => {
-      if (ncApps.hasOwnProperty(id)) {
-        this.apps[id] = ncApps[id]
-        this.apps[id].order = orders[id] || null
-      }
-    })
 
     this.targetBlankApps = window.targetBlankApps
     this.hiddenLabels = window.topMenuAppsMouseOverHiddenLabel
-    this.observer = new ResizeObserver(this.resize)
+    let timeout = null
-    this.observer.observe(this.$el)
+
-    this.resize()
+    window.addEventListener('resize', () => {
-  },
+      timeout = window.setTimeout(() => {
-  beforeDestroy() {
+        this.update()
-    this.observer.disconnect()
+      }, 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 }) + ')' : '')
     },
-    appList() {
-      let items = Object.values(this.apps)
 
-      items.sort((a, b) => {
-        return a.order < b.order ? -1 : 1;
-      })
-
-      return items
-    },
-    mainAppList() {
-      return this.appList().slice(0, this.appLimit)
-    },
-    popoverAppList() {
-      return this.appList().slice(this.appLimit)
-    },
-    setNavigationCounter(id, counter) {
-      this.$set(this.apps[id], 'unread', counter)
-    },
-    resize() {
-      const availableWidth = this.$el.offsetWidth
-      let appCount = Math.floor(availableWidth / 50) - 1
-      const popoverAppCount = this.appList.length - appCount
-      if (popoverAppCount === 1) {
-        appCount--
-      }
-      if (appCount < 1) {
-        appCount = 0
-      }
-      this.appLimit = appCount
-    },
     makeStyle(app) {
       if (app.order !== null) {
         return `order: ${app.order}`
       }
     }
   },
-}
+})
 </script>
 
 <style lang="scss" scoped>
@@ -168,6 +204,7 @@ $header-icon-size: 20px;
   flex-shrink: 1;
   flex-wrap: wrap;
 }
+
 .app-menu-main {
   display: flex;
   flex-wrap: nowrap;
@@ -177,7 +214,6 @@ $header-icon-size: 20px;
     height: 50px;
     position: relative;
     display: flex;
-    opacity: .7;
 
     &.app-menu-entry__active {
       opacity: 1;
@@ -217,6 +253,7 @@ $header-icon-size: 20px;
       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));
     }
 
@@ -226,8 +263,8 @@ $header-icon-size: 20px;
       font-size: 12px;
       color: var(--color-primary-text);
       text-align: center;
-      bottom: -5px;
       left: 50%;
+      top: 45%;
       display: block;
       min-width: 100%;
       transform: translateX(-50%);
@@ -235,6 +272,7 @@ $header-icon-size: 20px;
       width: 100%;
       text-overflow: ellipsis;
       overflow: hidden;
+      letter-spacing: -0.5px;
     }
 
     &:not(.app-menu-entry__hidden-label):not(.app-menu-entry__show-hovered):hover,
@@ -242,11 +280,11 @@ $header-icon-size: 20px;
       opacity: 1;
       .app-menu-entry--label {
         opacity: 1;
-        font-weight: bold;
+        font-weight: bolder;
-        font-size: 14px;
         bottom: 0;
-        width: auto;
+        width: 100%;
-        overflow: visible;
+        text-overflow: ellipsis;
+        overflow: hidden;
       }
     }
   }
@@ -263,8 +301,10 @@ $header-icon-size: 20px;
   &: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: -6px;
+      margin-top: -8px;
     }
 
     .app-menu-entry--label {
@@ -280,7 +320,7 @@ $header-icon-size: 20px;
   &.app-menu-main__show-hovered .app-menu-entry:hover,
   &.app-menu-main__show-hovered .app-menu-entry:focus {
     img {
-      margin-top: -6px;
+      margin-top: -8px;
     }
 
     .app-menu-entry--label {
@@ -295,38 +335,42 @@ $header-icon-size: 20px;
 }
 
 ::v-deep .app-menu-more .button-vue--vue-tertiary {
-  color: var(--color-primary-text);
   opacity: .7;
   margin: 3px;
+  filter: var(--background-image-invert-if-bright, var(--primary-invert-if-bright));
 
-  &:hover {
+  &:not([aria-expanded="true"]) {
-    opacity: 1;
+    color: var(--color-main-text);
-    background-color: transparent !important;
+
+    &:hover {
+      opacity: 1;
+      background-color: transparent !important;
+    }
   }
 
-  &:focus-visible {
+    &:focus-visible {
-    opacity: 1;
+      opacity: 1;
-    background-color: transparent !important;
+      outline: none !important;
-    border-radius: var(--border-radius);
+    }
-    outline: none;
-    box-shadow: 0 0 0 2px var(--color-primary-text);
-  }
 }
 
 .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 {
-      filter: var(--background-invert-if-bright, var(--primary-invert-if-bright));
       width: $header-icon-size;
       height: $header-icon-size;
-      padding: calc((50px - $header-icon-size) / 2);
     }
   }
 }
@@ -335,7 +379,7 @@ $header-icon-size: 20px;
   content: "";
   width: 8px;
   height: 8px;
-  background-color: var(--color-primary-text);
+  background-color: var(--color-primary-element-text);
   border-radius: 50%;
   position: absolute;
   display: block;

src/CloserButton.vue

@@ -15,11 +15,18 @@ You should have received a copy of the GNU Affero General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 -->
 <template>
-  <button class="side-menu-opener side-menu-closer"></button>
+  <button class="side-menu-opener side-menu-closer" :arial-label="label">
+    <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,7 +15,9 @@ 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>
+  <button class="side-menu-opener" :arial-label="label">
+    <span v-text="label"></span>
+  </button>
 </template>
 
 <script>
@@ -23,7 +25,7 @@ export default {
   name: 'OpenerButton',
   data() {
     return {
-      label: t('side_menu', 'Toggle menu'),
+      label: t('side_menu', 'Toggle the menu'),
     }
   }
 }

src/SideMenu.js

@@ -21,12 +21,10 @@ import SideMenu from './SideMenu.vue'
 import SideMenuBig from './SideMenuBig.vue'
 import SideMenuWithCategories from './SideMenuWithCategories.vue'
 import PageLoader from './PageLoader'
-import SMcreateElement from './lib/createElement'
 
 Vue.prototype.OC = OC
 Vue.prototype.t = OC.L10N.translate
 
-window.SMcreateElement = SMcreateElement
 window.PageLoader = PageLoader
 
 const mountSideMenuComponent = () => {

src/SideMenu.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 />
+      <OpenerButton v-if="!alwaysDisplayed" />
       <Logo
         v-if="!avatar && !alwaysDisplayed && logo" v-bind:classes="{'side-menu-logo': true, 'avatardiv': false}"
         v-bind:image="logo"
@@ -39,7 +39,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
     <ul class="side-menu-apps-list" :class="{'side-menu-apps-list--with-settings': !!settings}">
       <SideMenuApp
         v-for="(app, key) in apps"
-        v-if="!hiddenApps.includes(app.id) && searchMatch(app.name)"
+        v-if="searchMatch(app.name)"
         v-bind:classes="{'side-menu-app': true, 'active': app.active}"
         v-bind:key="key"
         v-bind:icon="app.icon"
@@ -86,7 +86,7 @@ export default {
   },
   methods: {
     retrieveApps() {
-      const ncApps = loadState('core', 'apps', {})
+      const ncApps = loadState('core', 'apps', [])
       let orders = {}
       let finalApps = []
 
@@ -94,17 +94,16 @@ export default {
         orders[app] = order + 1
       })
 
-      for (let id in ncApps) {
+      for (let app of ncApps) {
-        if (window.topMenuApps.includes(id) && !window.topSideMenuApps.includes(id)) {
+        if (window.topMenuApps.includes(app.id) && !window.topSideMenuApps.includes(app.id)) {
           continue
         }
 
-        if (this.hiddenApps.includes(id)) {
+        if (this.hiddenApps.includes(app.id)) {
           continue
         }
 
-        let app = ncApps[id]
+        app.order = orders[app.id] || null
-        app.order = orders[id] || null
 
         finalApps.push(app)
       }

src/l10n/fixtures/cs.yaml

@@ -93,3 +93,4 @@
 "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

@@ -93,3 +93,4 @@
 "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

@@ -93,3 +93,4 @@
 "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

@@ -93,3 +93,4 @@
 "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

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

@@ -93,3 +93,4 @@
 "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

@@ -91,3 +91,4 @@
 "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

@@ -93,3 +93,4 @@
 "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

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

src/l10n/fixtures/zh_CN.yaml

@@ -93,3 +93,4 @@
 "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

@@ -3,7 +3,13 @@ module.exports = (tagName, attributes) => {
 
   if (typeof attributes === 'object') {
     for (let i in attributes) {
-      element.setAttribute(i, attributes[i])
+      if (i === 'text') {
+        element.textContent = attributes[i]
+      } else if (i === 'html') {
+        element.innerHTML = attributes[i]
+      } else {
+        element.setAttribute(i, attributes[i])
+      }
     }
   }
 

templates/css/stylesheet.php

@@ -42,13 +42,11 @@
     top: 49px;
   }
 
-  #side-menu.hide-opener .side-menu-header .side-menu-opener.side-menu-closer
+  #side-menu.hide-opener .side-menu-header .side-menu-opener.side-menu-closer {
-  {
     visibility: hidden;
   }
 
-  #side-menu.hide-opener.side-menu-with-categories .side-menu-search
+  #side-menu.hide-opener.side-menu-with-categories .side-menu-search {
-  {
     float: none;
   }
 

templates/js/script.php

@@ -1,5 +1,7 @@
 <?php
 
+header('Content-type: text/javascript');
+
 $display = 'default';
 
 if ($_['always-displayed']) {
@@ -12,17 +14,37 @@ if ($_['always-displayed']) {
 
 ?>
 
+const SMcreateElement = (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 = SMcreateElement('div', {id: 'side-menu-container'})
   const sideMenuOpener = SMcreateElement('button', {
     'class': 'side-menu-opener',
-    'arial-label': t('side_menu', 'Toggle menu')
+    '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 html = document.querySelector('html')
   const nextcloud = document.querySelector('#nextcloud')
+  const logo = document.querySelector('.header-left .logo')
 
   const isTouchDevice = window.matchMedia("(pointer: coarse)").matches
 
@@ -38,6 +60,15 @@ if ($_['always-displayed']) {
     sideMenu.setAttribute('data-sidewithcategories', '1')
   <?php endif; ?>
 
+  const sideMenuFocus = () => {
+    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;
 
@@ -80,22 +111,6 @@ if ($_['always-displayed']) {
       return
     }
 
-    sideMenuFocus = () => {
-      let a = document.querySelector('.side-menu-app.active a', sideMenu)
-
-      if (!a) {
-        return
-      }
-
-      if (a.length === 0) {
-        a = sideMenu.querySelector('.side-menu-app:first-child a')
-      }
-
-      if (a.length > 0) {
-        a.focus()
-      }
-    }
-
     <?php if ($_['opener-hover']): ?>
       const sideMenuMouseLeave = () => {
         sideMenu.classList.remove('open')
@@ -127,14 +142,8 @@ if ($_['always-displayed']) {
 
     headerMenuOpener.addEventListener('click', () => {
       sideMenu.classList.add('open')
-
-      const a = sideMenu.querySelector('.side-menu-app.active a')
-
-      if (a !== null) {
-        a.focus()
-      }
-
       headerMenuOpener.blur()
+      sideMenuFocus()
     })
 
     for (let opener of sideMenuOpener) {
@@ -182,6 +191,10 @@ if ($_['always-displayed']) {
   <?php endif; ?>
 
   if (nextcloud) {
+    if (logo && logo.parentNode !== nextcloud) {
+      nextcloud.appendChild(logo)
+    }
+
     <?php if ($_['opener-position'] === 'before'): ?>
       nextcloud.parentNode.insertBefore(sideMenuOpener, nextcloud)
     <?php else: ?>

templates/settings/personal-form.php

@@ -241,6 +241,7 @@ $labelReset = 'Reset to default';
     <div class="section">
         <?php if (!$_['force']): ?>
             <button id="side-menu-save" class="btn btn-info" arial-label="<?php p($l->t('Save')); ?>">
+                <?php p($l->t('Save')); ?>
                 <progress max="100" value="0" id="side-menu-save-progress"></progress>
             </button>
 

tsconfig.json

@@ -0,0 +1,33 @@
+{
+	"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,54 +1,70 @@
 const path = require('path')
-const { VueLoaderPlugin } = require('vue-loader')
+const BabelLoaderExcludeNodeModulesExcept = require('babel-loader-exclude-node-modules-except')
-const StyleLintPlugin = require('stylelint-webpack-plugin')
+const {
+  VueLoaderPlugin
+} = require('vue-loader')
+// const StyleLintPlugin = require('stylelint-webpack-plugin')
 
 module.exports = {
-    devtool: "source-map",
+  devtool: "source-map",
-    entry: {
+  entry: {
-        'admin': path.join(__dirname, 'src', 'admin.js'),
+    'admin': path.join(__dirname, 'src', 'admin.js'),
-        'sideMenu': path.join(__dirname, 'src', 'SideMenu.js'),
+    'sideMenu': path.join(__dirname, 'src', 'SideMenu.js'),
-    },
+  },
-    output: {
+  output: {
-        path: path.resolve(__dirname, './js'),
+    path: path.resolve(__dirname, './js'),
-        publicPath: '/js',
+    publicPath: '/js',
-        filename: '[name].js?v=[hash]',
+    filename: '[name].js?v=[chunkhash]',
-        chunkFilename: 'chunks/[name]-[hash].js',
+    chunkFilename: 'chunks/[name]-[chunkhash].js',
-    },
+  },
-    module: {
+  module: {
-        rules: [
+    rules: [{
-            {
+        test: /\.css$/,
-                test: /\.css$/,
+        use: ['vue-style-loader', 'css-loader'],
-                use: ['vue-style-loader', 'css-loader'],
+      },
-            },
+      {
-            {
+        test: /\.scss$/,
-                test: /\.scss$/,
+        use: ['vue-style-loader', 'css-loader', 'sass-loader'],
-                use: ['vue-style-loader', 'css-loader', 'sass-loader'],
+      },
-            },
+      {
-            {
+        test: /\.vue$/,
-                test: /\.vue$/,
+        loader: 'vue-loader',
-                loader: 'vue-loader',
+      },
-            },
+      {
-            {
+        test: /\.tsx?$/,
-                test: /\.js$/,
+        use: [
-                loader: 'babel-loader',
+          'babel-loader',
-                exclude: /node_modules/,
+          {
-            },
+            // Fix TypeScript syntax errors in Vue
-            {
+            loader: 'ts-loader',
-                test: /\.(png|jpg|gif|svg)$/,
+            options: {
-                loader: 'url-loader',
+              transpileOnly: true,
-                options: {
-                    name: '[name].[ext]?[hash]',
-                    limit: 8192,
-                },
             },
+          },
         ],
-    },
+        exclude: BabelLoaderExcludeNodeModulesExcept([]),
-    plugins: [
+      },
-        new VueLoaderPlugin(),
+      {
-        new StyleLintPlugin(),
+        test: /\.js$/,
+        loader: 'babel-loader',
+        exclude: /node_modules/,
+      },
+      {
+        test: /\.(png|jpg|gif|svg)$/,
+        loader: 'url-loader',
+        options: {
+          name: '[name].[ext]?[hash]',
+          limit: 8192,
+        },
+      },
     ],
-    resolve: {
+  },
-        extensions: ['*', '.js', '.vue'],
+  plugins: [
-        symlinks: false,
+    new VueLoaderPlugin(),
-    },
+    // new StyleLintPlugin(),
+  ],
+  resolve: {
+    extensions: ['.*', '.js', '.vue'],
+    symlinks: false,
+  },
 }