Merge pull request 'release v3.13.0' (#353) from develop into master

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

.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:
-  "Verify tag and app version":
-    image: alpine
-    commands:
-      - TAG=${CI_COMMIT_TAG/v//}
-      - grep "<version>$TAG</version>" appinfo/info.xml
-    when:
-      event: [tag]
-
-  "Install dependencies":
-    image: node:16
-    pull: true
-    commands:
-      - npm i
-    when:
-      event: [tag, push, pull_request, manual]
-      branch: [master, develop, feature/*, fix/*, bugfix/*, translations]
-
-  "Check dependencies":
-    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,28 @@
+variables:
+  volumes: &volumes
+    - /data/${CI_REPO}:/builds
+
+when:
+  event: [tag, push, pull_request, manual]
+  branch: [master, develop, feature/*, fix/*, bugfix/*, translations]
+
+steps:
+  "Install dependencies":
+    image: node:16
+    pull: true
+    commands:
+      - npm i
+
+  "Build JS":
+    image: node:16
+    commands:
+      - npm run 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,61 @@
+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
+    secrets: [app_certificate, app_public_certificate]
+    volumes: *volumes
+    environment:
+      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
+    secrets: [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,20 @@
 ## [Unreleased]
 
+## 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

appinfo/info.xml

@@ -32,7 +32,7 @@ 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.7</version>
+    <version>3.13.0</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
     <namespace>SideMenu</namespace>
@@ -54,7 +54,7 @@ In case of downtime, you can download **Custom Menu** from [here](https://kim.de
     <screenshot>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>
     <dependencies>
-        <nextcloud min-version="25" max-version="28"/>
+        <nextcloud min-version="25" max-version="29"/>
         <php min-version="7.4"/>
     </dependencies>
     <settings>

css/sideMenu.css

@@ -293,8 +293,9 @@
   display: inline;
 }
 
-.side-menu-always-displayed .app-navigation--close {
-  transform: translateX(calc(-100% + 50px));
+.side-menu-always-displayed .app-navigation-toggle-wrapper {
+  right: 0 !important;
+  margin-left: 0 !important;
 }
 
 #side-menu.side-menu-with-categories {

lib/Controller/AdminSettingController.php

@@ -22,37 +22,25 @@ use OCA\SideMenu\AppInfo\Application;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\DataDownloadResponse;
 use OCP\AppFramework\Http\RedirectResponse;
-use OCP\AppFramework\Http\Response;
 use OCP\IConfig;
 use OCP\IRequest;
 use OCP\IURLGenerator;
 
 class AdminSettingController extends Controller
 {
-    /**
-     * @var IConfig
-     */
-    protected $config;
-
-    /**
-     * @var IURLGenerator
-     */
-    protected $urlGenerator;
-
-    public function __construct($appName, IRequest $request, IConfig $config, IURLGenerator $urlGenerator)
-    {
+    public function __construct(
+        $appName,
+        IRequest $request,
+        protected IConfig $config,
+        protected IURLGenerator $urlGenerator
+    ) {
         parent::__construct($appName, $request);
-
-        $this->config = $config;
-        $this->urlGenerator = $urlGenerator;
     }
 
     /**
      * @NoCSRFRequired
-     *
-     * @return RedirectResponse
      */
-    public function removeCache()
+    public function removeCache(): RedirectResponse
     {
         $this->config->setAppValue(Application::APP_ID, 'cache-categories', '[]');
 
@@ -63,10 +51,8 @@ class AdminSettingController extends Controller
 
     /**
      * @NoCSRFRequired
-     *
-     * @return Response
      */
-    public function exportConfiguration()
+    public function exportConfiguration(): DataDownloadResponse
     {
         $keys = $this->config->getAppKeys(Application::APP_ID);
         $appConfig = [];

lib/Controller/AppController.php

@@ -29,28 +29,14 @@ use OCP\IUserSession;
 
 class AppController extends Controller
 {
-    /**
-     * @var ConfigProxy
-     */
-    protected $config;
-
-    /**
-     * @var AppRepository
-     */
-    protected $appRepository;
-
     public function __construct(
         string $appName,
         IRequest $request,
-        AppRepository $appRepository,
-        IURLGenerator $urlGenerator,
-        ConfigProxy $config
+        protected AppRepository $appRepository,
+        protected IURLGenerator $urlGenerator,
+        protected ConfigProxy $config
     ) {
         parent::__construct($appName, $request);
-
-        $this->appRepository = $appRepository;
-        $this->urlGenerator = $urlGenerator;
-        $this->config = $config;
     }
 
     /**

lib/Controller/CssController.php

@@ -32,49 +32,26 @@ use OCP\IUserSession;
 
 class CssController extends Controller
 {
-    /**
-     * @var ConfigProxy
-     */
-    protected $config;
-
-    /**
-     * @var User
-     */
-    protected $user;
-
-    /**
-     * @var ThemingDefaults
-     */
-    protected $theming;
-
-    /**
-     * @var Color
-     */
-    protected $color;
+    protected ?User $user;
 
     public function __construct(
         string $appName,
         IRequest $request,
-        ConfigProxy $config,
-        ThemingDefaults $theming,
-        Color $color
+        protected ConfigProxy $config,
+        protected ThemingDefaults $theming,
+        protected Color $color
     ) {
         parent::__construct($appName, $request);
 
         $this->user = OC::$server[IUserSession::class]->getUser();
-        $this->config = $config;
-        $this->theming = $theming;
-        $this->color = $color;
     }
 
     /**
      * @NoAdminRequired
      * @NoCSRFRequired
      * @PublicPage
-     *
-     * @return Response
      */
-    public function stylesheet()
+    public function stylesheet(): TemplateResponse
     {
         $response = new TemplateResponse(Application::APP_ID, 'css/stylesheet', $this->getConfig(), 'blank');
         $response->addHeader('Content-Type', 'text/css');
@@ -107,15 +84,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 ||
-                ($isBreezeDarkGlobalEnabled && '' === $isBreezeDarkUserEnabled);
+            $isBreezeDarkUserEnabled = '1' === $isBreezeDarkUserEnabled
+                || ($isBreezeDarkGlobalEnabled && '' === $isBreezeDarkUserEnabled);
         } else {
             $isDarkThemeUserEnabled = false;
             $isBreezeDarkUserEnabled = false;
         }
 
-        $isDarkMode = ($isAccessibilityAppEnabled && $isDarkThemeUserEnabled) ||
-            ($isBreezeDarkAppEnabled && $isBreezeDarkUserEnabled);
+        $isDarkMode = ($isAccessibilityAppEnabled && $isDarkThemeUserEnabled)
+            || ($isBreezeDarkAppEnabled && $isBreezeDarkUserEnabled);
 
         $primaryColor = $this->theming->getColorPrimary();
         $lightenPrimaryColor = $this->color->adjustBrightness($primaryColor, 0.2);

lib/Controller/JsController.php

@@ -32,32 +32,14 @@ use OCP\L10N\IFactory;
 
 class JsController extends Controller
 {
-    /**
-     * @var ConfigProxy
-     */
-    protected $config;
-
-    /**
-     * @var User
-     */
-    protected $user;
-
-    /**
-     * @var ThemingDefaults
-     */
-    protected $themingDefaults;
-
-    /**
-     * @var IFactory
-     */
-    protected $l10nFactory;
+    protected ?User $user;
 
     public function __construct(
         string $appName,
         IRequest $request,
-        ConfigProxy $config,
-        ThemingDefaults $themingDefaults,
-        IFactory $l10nFactory
+        protected ConfigProxy $config,
+        protected ThemingDefaults $themingDefaults,
+        protected IFactory $l10nFactory
     ) {
         parent::__construct($appName, $request);
 

lib/Controller/NavController.php

@@ -19,7 +19,6 @@
 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;
@@ -32,57 +31,24 @@ 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,
-        AppRepository $appRepository,
-        CategoryRepository $categoryRepository,
-        URLGenerator $router,
-        IFactory $l10nFactory
+        protected ConfigProxy $config,
+        protected AppRepository $appRepository,
+        protected CategoryRepository $categoryRepository,
+        protected URLGenerator $router,
+        protected IFactory $l10nFactory
     ) {
         parent::__construct($appName, $request);
-
-        $this->config = $config;
-        $this->appRepository = $appRepository;
-        $this->categoryRepository = $categoryRepository;
-        $this->l10nFactory = $l10nFactory;
-        $this->router = $router;
     }
 
     /**
      * @NoAdminRequired
      * @NoCSRFRequired
      * @PublicPage
-     *
-     * @return JSONResponse
      */
-    public function items()
+    public function items(): JSONResponse
     {
         $user = OC::$server[IUserSession::class]->getUser();
         $items = [];
@@ -189,11 +155,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

@@ -21,40 +21,20 @@ namespace OCA\SideMenu\Controller;
 use OCA\SideMenu\AppInfo\Application;
 use OCA\SideMenu\Service\ConfigProxy;
 use OCP\AppFramework\Controller;
-use OCP\AppFramework\Http\Response;
 use OCP\IConfig;
 use OCP\IRequest;
 use OCP\IUserSession;
 
 class PersonalSettingController extends Controller
 {
-    /**
-     * @var IConfig
-     */
-    protected $config;
-
-    /**
-     * @var ConfigProxy
-     */
-    protected $configProxy;
-
-    /**
-     * @var IUserSession
-     */
-    protected $userSession;
-
     public function __construct(
         $appName,
         IRequest $request,
-        IConfig $config,
-        ConfigProxy $configProxy,
-        IUserSession $userSession
+        protected IConfig $config,
+        protected ConfigProxy $configProxy,
+        protected IUserSession $userSession
     ) {
         parent::__construct($appName, $request);
-
-        $this->config = $config;
-        $this->configProxy = $configProxy;
-        $this->userSession = $userSession;
     }
 
     /**
@@ -63,10 +43,8 @@ class PersonalSettingController extends Controller
      *
      * @param mixed $name
      * @param mixed $value
-     *
-     * @return Response
      */
-    public function valueSet($name, $value)
+    public function valueSet($name, $value): array
     {
         $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,
-        INavigationManager $navigationManager,
-        IFactory $l10nFactory,
-        ConfigProxy $config,
-        CategoryRepository $categoryRepository
+        protected \OC_App $ocApp,
+        protected INavigationManager $navigationManager,
+        protected IFactory $l10nFactory,
+        protected ConfigProxy $config,
+        protected CategoryRepository $categoryRepository,
+        protected IEventDispatcher $dispatcher,
+        protected IUserSession $userSession,
     ) {
-        $this->ocApp = $ocApp;
-        $this->l10nFactory = $l10nFactory;
-        $this->config = $config;
-        $this->navigationManager = $navigationManager;
-        $this->categoryRepository = $categoryRepository;
+        $this->dispatcher->dispatchTyped(new BeforeTemplateRenderedEvent(
+            $this->userSession->isLoggedIn(),
+            new TemplateResponse(Application::APP_NAME, '')
+        ));
     }
 
     /**
      * 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,19 @@ 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,
-        ConfigProxy $config,
-        IConfig $iConfig,
-        IFactory $l10nFactory,
-        IUserSession $userSession
+        protected CategoryFetcher $categoryFetcher,
+        protected ConfigProxy $config,
+        protected IConfig $iConfig,
+        protected IFactory $l10nFactory,
+        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
 {
-    /**
-     * @var IConfig
-     */
-    protected $config;
-
-    public function __construct(IConfig $config)
+    public function __construct(protected IConfig $config)
     {
         $this->config = $config;
     }

lib/Service/LangRepository.php

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

lib/Settings/Admin.php

@@ -21,75 +21,27 @@ 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,
-        ILogger $logger,
-        ConfigProxy $config,
-        AppRepository $appRepository,
-        CategoryRepository $categoryRepository,
-        ThemingDefaults $theming,
-        Color $color,
-        LangRepository $langRepository
+        protected IL10N $l,
+        protected ILogger $logger,
+        protected ConfigProxy $config,
+        protected AppRepository $appRepository,
+        protected CategoryRepository $categoryRepository,
+        protected ThemingDefaults $theming,
+        protected Color $color,
+        protected 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;
     }
 
     /**

lib/Settings/AdminSection.php

@@ -25,51 +25,22 @@ use OCP\Settings\IIconSection;
 
 class AdminSection implements IIconSection
 {
-    /**
-     * @var IL10N
-     */
-    private $l;
-
-    /**
-     * @var IURLGenerator
-     */
-    private $url;
-
-    public function __construct(IURLGenerator $url, IL10N $l)
-    {
-        $this->url = $url;
-        $this->l = $l;
+    public function __construct(
+        protected IURLGenerator $url,
+        protected IL10N $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;

lib/Settings/Personal.php

@@ -29,43 +29,13 @@ 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,
-        ILogger $logger,
-        ConfigProxy $config,
-        IUserSession $userSession,
-        AppRepository $appRepository
+        protected IL10N $l,
+        protected ILogger $logger,
+        protected ConfigProxy $config,
+        protected IUserSession $userSession,
+        protected AppRepository $appRepository
     ) {
-        $this->l = $l;
-        $this->logger = $logger;
-        $this->config = $config;
-        $this->userSession = $userSession;
-        $this->appRepository = $appRepository;
     }
 
     /**

lib/Settings/PersonalSection.php

@@ -26,34 +26,13 @@ use OCP\Settings\IIconSection;
 
 class PersonalSection implements IIconSection
 {
-    /**
-     * @var IL10N
-     */
-    private $l;
-
-    /**
-     * @var IURLGenerator
-     */
-    private $url;
-
-    /**
-     * @var ConfigProxy
-     */
-    private $configProxy;
-
-    public function __construct(IURLGenerator $url, IL10N $l, ConfigProxy $configProxy)
-    {
-        $this->url = $url;
-        $this->l = $l;
-        $this->configProxy = $configProxy;
+    public function __construct(
+        protected IURLGenerator $url,
+        protected IL10N $l,
+        protected 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')) {

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

@@ -24,6 +24,7 @@ if ($_['always-displayed']) {
   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
 
@@ -170,6 +171,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: ?>