chore(release): Bump version to 1.14.0-beta.2

Signed-off-by: Julius Härtl <jus@bitgrid.net>

.github/dependabot.yml

@@ -13,23 +13,6 @@ updates:
   - juliushaertl
   - luka-nextcloud
 
-- package-ecosystem: npm
-  target-branch: stable30
-  versioning-strategy: lockfile-only
-  directory: "/"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  ignore:
-    - dependency-name: "*"
-      update-types: ["version-update:semver-major"]
-  open-pull-requests-limit: 30
-  labels:
-  - 3. to review
-  - dependencies
-
 - package-ecosystem: npm
   target-branch: stable29
   versioning-strategy: lockfile-only
@@ -64,6 +47,23 @@ updates:
   - 3. to review
   - dependencies
 
+- package-ecosystem: npm
+  target-branch: stable27
+  versioning-strategy: lockfile-only
+  directory: "/"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "03:00"
+    timezone: Europe/Paris
+  ignore:
+    - dependency-name: "*"
+      update-types: ["version-update:semver-major"]
+  open-pull-requests-limit: 30
+  labels:
+  - 3. to review
+  - dependencies
+
 - package-ecosystem: composer
   directory: "/"
   schedule:

.github/workflows/cypress-e2e.yml

@@ -22,7 +22,7 @@ jobs:
         node-version: [20.x]
         # containers: [1, 2, 3]
         php-versions: [ '8.2' ]
-        server-versions: [ 'master' ]
+        server-versions: [ 'stable30' ]
 
     env:
       extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, zip, gd, apcu

.github/workflows/integration.yml

@@ -28,7 +28,7 @@ jobs:
       matrix:
         php-versions: ['8.1']
         databases: ['sqlite', 'mysql', 'pgsql']
-        server-versions: ['master']
+        server-versions: ['stable30']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 

.github/workflows/npm-audit-fix.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branches: ['main', 'master', 'stable30', 'stable29', 'stable28']
+        branches: ['main', 'master', 'stable29', 'stable28', 'stable27']
 
     name: npm-audit-fix-${{ matrix.branches }}
 

.github/workflows/update-nextcloud-ocp-approve-merge.yml

@@ -39,7 +39,7 @@ jobs:
           echo 'Can not approve PRs from forks'
           exit 1
 
-      - uses: mdecoleman/pr-branch-name@bab4c71506bcd299fb350af63bb8e53f2940a599 # v2.0.0
+      - uses: mdecoleman/pr-branch-name@55795d86b4566d300d237883103f052125cc7508 # v3.0.0
         id: branchname
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/update-nextcloud-ocp.yml

@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branches: ['main', 'master', 'stable30', 'stable29', 'stable28']
+        branches: ['main', 'master', 'stable29', 'stable28', 'stable27']
 
     name: update-nextcloud-ocp-${{ matrix.branches }}
 

appinfo/info.xml

@@ -20,17 +20,17 @@
 - 🚀 Get your project organized
 
 </description>
-    <version>2.0.0-dev.0</version>
+    <version>1.14.0-beta.2</version>
     <licence>agpl</licence>
     <author>Julius Härtl</author>
-    <namespace>Deck</namespace>
-    <types>
-        <dav/>
-    </types>
     <documentation>
         <user>https://deck.readthedocs.io/en/latest/User_documentation_en/</user>
         <developer>https://deck.readthedocs.io/en/latest/API/</developer>
     </documentation>
+    <namespace>Deck</namespace>
+    <types>
+        <dav/>
+    </types>
     <category>organization</category>
     <category>office</category>
     <website>https://github.com/nextcloud/deck</website>
@@ -42,7 +42,7 @@
         <database min-version="9.4">pgsql</database>
         <database>sqlite</database>
         <database min-version="8.0">mysql</database>
-        <nextcloud min-version="31" max-version="31"/>
+        <nextcloud min-version="30" max-version="30"/>
     </dependencies>
     <background-jobs>
         <job>OCA\Deck\Cron\DeleteCron</job>

composer.json

@@ -15,7 +15,7 @@
 		"roave/security-advisories": "dev-master",
 		"phpunit/phpunit": "^9",
 		"nextcloud/coding-standard": "^1.1",
-		"nextcloud/ocp": "dev-master",
+		"nextcloud/ocp": "dev-stable30",
 		"psalm/phar": "^5.13"
 	},
 	"config": {

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "ee1c5b69795943e43d6277064d284ae0",
+    "content-hash": "7242ec950e99240a95e6b6d877fdd8d2",
     "packages": [
         {
             "name": "icecave/parity",
@@ -440,16 +440,16 @@
         },
         {
             "name": "nextcloud/ocp",
-            "version": "dev-master",
+            "version": "dev-stable30",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nextcloud-deps/ocp.git",
-                "reference": "b0127d6fd2932bf1fdffe334ae59fdd6c8272029"
+                "reference": "2a005250064759f206aa1b5a1ee000dcd808ef5b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/b0127d6fd2932bf1fdffe334ae59fdd6c8272029",
-                "reference": "b0127d6fd2932bf1fdffe334ae59fdd6c8272029",
+                "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/2a005250064759f206aa1b5a1ee000dcd808ef5b",
+                "reference": "2a005250064759f206aa1b5a1ee000dcd808ef5b",
                 "shasum": ""
             },
             "require": {
@@ -459,11 +459,10 @@
                 "psr/event-dispatcher": "^1.0",
                 "psr/log": "^1.1.4"
             },
-            "default-branch": true,
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "31.0.0-dev"
+                    "dev-stable30": "30.0.0-dev"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -479,9 +478,9 @@
             "description": "Composer package containing Nextcloud's public API (classes, interfaces)",
             "support": {
                 "issues": "https://github.com/nextcloud-deps/ocp/issues",
-                "source": "https://github.com/nextcloud-deps/ocp/tree/master"
+                "source": "https://github.com/nextcloud-deps/ocp/tree/stable30"
             },
-            "time": "2024-08-14T08:51:54+00:00"
+            "time": "2024-08-14T08:51:38+00:00"
         },
         {
             "name": "nikic/php-parser",

l10n/fa.js

@@ -257,6 +257,7 @@ OC.L10N.register(
     "Shift" : "تغییر مکان",
     "Ctrl" : "Ctrl",
     "Search" : "جستجو",
+    "Show help dialog" : "نمایش پنجرهٔ راهنما",
     "Enter" : "Enter",
     "Space" : "Space",
     "All boards" : "همه تخته‌ها",

l10n/fa.json

@@ -255,6 +255,7 @@
     "Shift" : "تغییر مکان",
     "Ctrl" : "Ctrl",
     "Search" : "جستجو",
+    "Show help dialog" : "نمایش پنجرهٔ راهنما",
     "Enter" : "Enter",
     "Space" : "Space",
     "All boards" : "همه تخته‌ها",

l10n/fr.js

@@ -149,8 +149,9 @@ OC.L10N.register(
     "Filter by tag" : "Filtrer par étiquette",
     "Filter by assigned user" : "Filtrer par utilisateur",
     "Unassigned" : "Non attribué",
+    "Filter by status" : "Filtrer par statut",
     "Open and completed" : "Ouvert et terminé",
-    "Open" : "Ouvrir",
+    "Open" : "Ouvert",
     "Completed" : "Terminé",
     "Filter by due date" : "Filtrer par échéance",
     "Overdue" : "En retard",

l10n/fr.json

@@ -147,8 +147,9 @@
     "Filter by tag" : "Filtrer par étiquette",
     "Filter by assigned user" : "Filtrer par utilisateur",
     "Unassigned" : "Non attribué",
+    "Filter by status" : "Filtrer par statut",
     "Open and completed" : "Ouvert et terminé",
-    "Open" : "Ouvrir",
+    "Open" : "Ouvert",
     "Completed" : "Terminé",
     "Filter by due date" : "Filtrer par échéance",
     "Overdue" : "En retard",

l10n/hu.js

@@ -247,6 +247,7 @@ OC.L10N.register(
     "Choose a date" : "Válasszon dátumot",
     "Remove due date" : "Határidő eltávolítása",
     "Mark as done" : "Megjelölés készként",
+    "Not done" : "Nincs kész",
     "Unarchive card" : "Kártya archiválásának visszavonása",
     "Archive card" : "Kártya archiválása",
     "Select Date" : "Dátum kiválasztása",

l10n/hu.json

@@ -245,6 +245,7 @@
     "Choose a date" : "Válasszon dátumot",
     "Remove due date" : "Határidő eltávolítása",
     "Mark as done" : "Megjelölés készként",
+    "Not done" : "Nincs kész",
     "Unarchive card" : "Kártya archiválásának visszavonása",
     "Archive card" : "Kártya archiválása",
     "Select Date" : "Dátum kiválasztása",

lib/Cron/ScheduledNotifications.php

@@ -12,17 +12,27 @@ use OCA\Deck\Notification\NotificationHelper;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\Job;
-use Psr\Log\LoggerInterface;
+use OCP\ILogger;
 
 class ScheduledNotifications extends Job {
 
+	/** @var CardMapper */
+	protected $cardMapper;
+	/** @var NotificationHelper */
+	protected $notificationHelper;
+	/** @var ILogger */
+	protected $logger;
+
 	public function __construct(
 		ITimeFactory $time,
-		protected CardMapper $cardMapper,
-		protected NotificationHelper $notificationHelper,
-		protected LoggerInterface $logger
+		CardMapper $cardMapper,
+		NotificationHelper $notificationHelper,
+		ILogger $logger
 	) {
 		parent::__construct($time);
+		$this->cardMapper = $cardMapper;
+		$this->notificationHelper = $notificationHelper;
+		$this->logger = $logger;
 	}
 
 	/**

lib/Cron/SessionsCleanup.php

@@ -14,19 +14,21 @@ namespace OCA\Deck\Cron;
 use OCA\Deck\Service\SessionService;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\TimedJob;
-use Psr\Log\LoggerInterface;
+use OCP\ILogger;
 
 class SessionsCleanup extends TimedJob {
+	private $sessionService;
 	private $documentService;
+	private $logger;
 	private $imageService;
 
 
-	public function __construct(
-		ITimeFactory $time,
-		private SessionService $sessionService,
-		private LoggerInterface $logger,
-	) {
+	public function __construct(ITimeFactory $time,
+		SessionService $sessionService,
+		ILogger $logger) {
 		parent::__construct($time);
+		$this->sessionService = $sessionService;
+		$this->logger = $logger;
 		$this->setInterval(SessionService::SESSION_VALID_TIME);
 	}
 

lib/Middleware/DefaultBoardMiddleware.php

@@ -10,17 +10,27 @@ use OCA\Deck\Service\DefaultBoardService;
 use OCA\Deck\Service\PermissionService;
 use OCP\AppFramework\Middleware;
 use OCP\IL10N;
-use Psr\Log\LoggerInterface;
+use OCP\ILogger;
 
 class DefaultBoardMiddleware extends Middleware {
 
-	public function __construct(
-		private LoggerInterface $logger,
-		private IL10N $l10n,
-		private DefaultBoardService $defaultBoardService,
-		private PermissionService $permissionService,
-		private ?string $userId,
-	) {
+	/** @var ILogger */
+	private $logger;
+	/** @var IL10N */
+	private $l10n;
+	/** @var DefaultBoardService */
+	private $defaultBoardService;
+	/** @var PermissionService */
+	private $permissionService;
+	/** @var string|null */
+	private $userId;
+
+	public function __construct(ILogger $logger, IL10N $l10n, DefaultBoardService $defaultBoardService, PermissionService $permissionService, $userId) {
+		$this->logger = $logger;
+		$this->l10n = $l10n;
+		$this->defaultBoardService = $defaultBoardService;
+		$this->permissionService = $permissionService;
+		$this->userId = $userId;
 	}
 
 	public function beforeController($controller, $methodName) {
@@ -29,7 +39,7 @@ class DefaultBoardMiddleware extends Middleware {
 				$this->defaultBoardService->createDefaultBoard($this->l10n->t('Personal'), $this->userId, '0087C5');
 			}
 		} catch (\Throwable $e) {
-			$this->logger->error('Could not create default board', ['exception' => $e]);
+			$this->logger->logException($e);
 		}
 	}
 }

lib/Middleware/ExceptionMiddleware.php

@@ -15,19 +15,28 @@ use OCP\AppFramework\Middleware;
 use OCP\AppFramework\OCS\OCSException;
 use OCP\AppFramework\OCSController;
 use OCP\IConfig;
+use OCP\ILogger;
 use OCP\IRequest;
-use Psr\Log\LoggerInterface;
 
 class ExceptionMiddleware extends Middleware {
 
+	/** @var ILogger */
+	private $logger;
+	/** @var IConfig */
+	private $config;
+	/** @var IRequest */
+	private $request;
+
 	/**
 	 * SharingMiddleware constructor.
+	 *
+	 * @param ILogger $logger
+	 * @param IConfig $config
 	 */
-	public function __construct(
-		private LoggerInterface $logger,
-		private IConfig $config,
-		private IRequest $request,
-	) {
+	public function __construct(ILogger $logger, IConfig $config, IRequest $request) {
+		$this->logger = $logger;
+		$this->config = $config;
+		$this->request = $request;
 	}
 
 	/**
@@ -60,7 +69,9 @@ class ExceptionMiddleware extends Middleware {
 		}
 
 		if ($exception instanceof StatusException) {
-			$this->logger->debug($exception->getMessage(), ['exception' => $exception]);
+			if ($this->config->getSystemValue('loglevel', ILogger::WARN) === ILogger::DEBUG) {
+				$this->logger->logException($exception);
+			}
 
 			if ($exception instanceof ConflictException) {
 				return new JSONResponse([
@@ -87,7 +98,7 @@ class ExceptionMiddleware extends Middleware {
 				'message' => $exceptionMessage,
 				'requestId' => $this->request->getId(),
 			];
-			$this->logger->error($exception->getMessage(), ['exception' => $exception]);
+			$this->logger->logException($exception);
 			if ($debugMode === true) {
 				$response['exception'] = (array) $exception;
 			}

lib/Service/CommentService.php

@@ -17,22 +17,26 @@ use OCP\Comments\IComment;
 use OCP\Comments\ICommentsManager;
 use OCP\Comments\MessageTooLongException;
 use OCP\Comments\NotFoundException as CommentNotFoundException;
+use OCP\ILogger;
 use OCP\IUserManager;
 use OutOfBoundsException;
-use Psr\Log\LoggerInterface;
-
 use function is_numeric;
 
 class CommentService {
+	private ICommentsManager $commentsManager;
+	private IUserManager $userManager;
+	private CardMapper $cardMapper;
+	private PermissionService $permissionService;
+	private ILogger $logger;
+	private ?string $userId;
 
-	public function __construct(
-		private ICommentsManager $commentsManager,
-		private PermissionService $permissionService,
-		private CardMapper $cardMapper,
-		private IUserManager $userManager,
-		private LoggerInterface $logger,
-		private ?string $userId,
-	) {
+	public function __construct(ICommentsManager $commentsManager, PermissionService $permissionService, CardMapper $cardMapper, IUserManager $userManager, ILogger $logger, ?string $userId) {
+		$this->commentsManager = $commentsManager;
+		$this->permissionService = $permissionService;
+		$this->cardMapper = $cardMapper;
+		$this->userManager = $userManager;
+		$this->logger = $logger;
+		$this->userId = $userId;
 	}
 
 	public function list(string $cardId, int $limit = 20, int $offset = 0): DataResponse {
@@ -183,8 +187,8 @@ class CommentService {
 				try {
 					$displayName = $this->commentsManager->resolveDisplayName($mention['type'], $mention['id']);
 				} catch (OutOfBoundsException $e) {
-					$this->logger->warning('Mention type not registered, can not resolve display name.', ['exception' => $e, 'mention_type' => $mention['type']]);
-					// No display name, upon client's discretion what to display.
+					$this->logger->logException($e);
+					// No displayname, upon client's discretion what to display.
 					$displayName = '';
 				}
 

lib/Service/FileService.php

@@ -20,21 +20,37 @@ use OCP\Files\SimpleFS\ISimpleFile;
 use OCP\Files\SimpleFS\ISimpleFolder;
 use OCP\IConfig;
 use OCP\IL10N;
+use OCP\ILogger;
 use OCP\IRequest;
-use Psr\Log\LoggerInterface;
 
 class FileService implements IAttachmentService {
+	private $l10n;
+	private $appData;
+	private $request;
+	private $logger;
+	private $rootFolder;
+	private $config;
+	private $attachmentMapper;
+	private $mimeTypeDetector;
 
 	public function __construct(
-		private IL10N $l10n,
-		private IAppData $appData,
-		private IRequest $request,
-		private LoggerInterface $logger,
-		private IRootFolder $rootFolder,
-		private IConfig $config,
-		private AttachmentMapper $attachmentMapper,
-		private IMimeTypeDetector $mimeTypeDetector
+		IL10N $l10n,
+		IAppData $appData,
+		IRequest $request,
+		ILogger $logger,
+		IRootFolder $rootFolder,
+		IConfig $config,
+		AttachmentMapper $attachmentMapper,
+		IMimeTypeDetector $mimeTypeDetector
 	) {
+		$this->l10n = $l10n;
+		$this->appData = $appData;
+		$this->request = $request;
+		$this->logger = $logger;
+		$this->rootFolder = $rootFolder;
+		$this->config = $config;
+		$this->attachmentMapper = $attachmentMapper;
+		$this->mimeTypeDetector = $mimeTypeDetector;
 	}
 
 	/**
@@ -177,7 +193,6 @@ class FileService implements IAttachmentService {
 	/**
 	 * Workaround until ISimpleFile can be fetched as a resource
 	 *
-	 * @return \OCP\Files\File
 	 * @throws \Exception
 	 */
 	private function getFileFromRootFolder(Attachment $attachment) {

package-lock.json

@@ -1,20 +1,20 @@
 {
   "name": "deck",
-  "version": "2.0.0-dev.0",
+  "version": "1.14.0-beta.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "deck",
-      "version": "2.0.0-dev.0",
+      "version": "1.14.0-beta.1",
       "license": "agpl",
       "dependencies": {
         "@babel/polyfill": "^7.12.1",
-        "@babel/runtime": "^7.25.0",
-        "@nextcloud/auth": "^2.4.0",
+        "@babel/runtime": "^7.24.8",
+        "@nextcloud/auth": "^2.3.0",
         "@nextcloud/axios": "^2.5.0",
         "@nextcloud/capabilities": "^1.2.0",
-        "@nextcloud/dialogs": "^6.0.0",
+        "@nextcloud/dialogs": "^5.3.5",
         "@nextcloud/event-bus": "^3.3.1",
         "@nextcloud/files": "^3.8.0",
         "@nextcloud/initial-state": "^2.2.0",
@@ -55,8 +55,8 @@
         "@relative-ci/agent": "^4.2.10",
         "@vue/test-utils": "^2.4.6",
         "@vue/vue2-jest": "^29.2.6",
-        "cypress": "^13.13.3",
-        "eslint-plugin-cypress": "^3.5.0",
+        "cypress": "^13.13.2",
+        "eslint-plugin-cypress": "^3.3.0",
         "eslint-webpack-plugin": "^4.2.0",
         "jest": "^29.7.0",
         "jest-serializer-vue": "^3.1.0",
@@ -1917,9 +1917,9 @@
       "peer": true
     },
     "node_modules/@babel/runtime": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.0.tgz",
-      "integrity": "sha512-7dRy4DwXwtzBrPbZflqxnvfxLF8kdZXPkhymtDeFoFqE6ldzjQFgYTtYIFARcLEYDrqfBfYcZt1WqFxRoyC9Rw==",
+      "version": "7.25.4",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.4.tgz",
+      "integrity": "sha512-DSgLeL/FNcpXuzav5wfYvHCGvynXkJbn3Zvc3823AEe9nPwW9IK4UoCSS5yGymmQzN0pCPvivtgS6/8U2kkm1w==",
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
       },
@@ -1994,9 +1994,9 @@
       "dev": true
     },
     "node_modules/@bundle-stats/plugin-webpack-validate": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@bundle-stats/plugin-webpack-validate/-/plugin-webpack-validate-4.14.0.tgz",
-      "integrity": "sha512-VLXk50dAriPXM4i1HfH3rX6rKXKqnU7EKI/xkUaRfGgSCiMWsLfNpA/T+gv3CYYXM/HqCM2tXOy3dc9V5OIh8w==",
+      "version": "4.15.0",
+      "resolved": "https://registry.npmjs.org/@bundle-stats/plugin-webpack-validate/-/plugin-webpack-validate-4.15.0.tgz",
+      "integrity": "sha512-AKj6okcTFgQMFnJg3rSrLDw4dQ2U9I0WGecKf4qzeW3MsoSgnTW58ZBCebIoODEatw7bhawBlXhkl6tvjkjY4A==",
       "dev": true,
       "dependencies": {
         "lodash": "4.17.21",
@@ -3526,9 +3526,9 @@
       }
     },
     "node_modules/@nextcloud/dialogs": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/@nextcloud/dialogs/-/dialogs-6.0.0.tgz",
-      "integrity": "sha512-Yoye/BezFN/hQCic+OHNPSESNI3k7D85YQJU1fW4s/yMi+P6VVNLixp4lbQ7xHF+po5lXZbJhultrOyoNhqaGw==",
+      "version": "5.3.7",
+      "resolved": "https://registry.npmjs.org/@nextcloud/dialogs/-/dialogs-5.3.7.tgz",
+      "integrity": "sha512-//pRF2GJNhW3VbVzSoE97J+DR9nZ/+IkzOzgKKDdMr65JYYMAdOs9Iew4nMf+OruDgZanGyXrfubSMVNI+1svQ==",
       "dependencies": {
         "@mdi/js": "^7.4.47",
         "@nextcloud/auth": "^2.3.0",
@@ -3552,7 +3552,7 @@
         "npm": "^10.0.0"
       },
       "peerDependencies": {
-        "@nextcloud/vue": "^8.16.0",
+        "@nextcloud/vue": "^8.9.1",
         "vue": "^2.7.16"
       }
     },
@@ -3895,9 +3895,9 @@
       }
     },
     "node_modules/@nextcloud/vue": {
-      "version": "8.16.0",
-      "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-8.16.0.tgz",
-      "integrity": "sha512-xkoR2VeWk+WTTmXC01Z7hI0yztSf222XMPXhy9OkDNQBXmCl/idEjNnMWmxezJMyqALtFD/csouW+GS7JUVoFw==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-8.17.1.tgz",
+      "integrity": "sha512-DC7nI04pp69vS5VxMDhpwPFhb5TWvyJgtmFciAx6j8RFrTPutdjNfOxOCncGaNXOlodaIpg/6EYV8YHU9DR9ng==",
       "dependencies": {
         "@floating-ui/dom": "^1.1.0",
         "@linusborg/vue-simple-portal": "^0.1.5",
@@ -3913,8 +3913,8 @@
         "@nextcloud/sharing": "^0.2.2",
         "@nextcloud/timezones": "^0.1.1",
         "@nextcloud/vue-select": "^3.25.0",
-        "@vueuse/components": "^10.9.0",
-        "@vueuse/core": "^10.9.0",
+        "@vueuse/components": "^11.0.0",
+        "@vueuse/core": "^11.0.0",
         "clone": "^2.1.2",
         "debounce": "2.1.0",
         "dompurify": "^3.0.5",
@@ -4180,14 +4180,14 @@
       }
     },
     "node_modules/@relative-ci/agent": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/@relative-ci/agent/-/agent-4.2.10.tgz",
-      "integrity": "sha512-w3aMOrSEyrL6s8i69o6Jjo58WYMz51cI3MuCuoQDKJANew08lXpaQEBI6cyf/gQrVH/ixy9MQhOcESKUqwexEQ==",
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/@relative-ci/agent/-/agent-4.2.11.tgz",
+      "integrity": "sha512-EnX0yiSWUkHUnuWzvmysqJJk44EsSmCD7TuXGMgJ9EGxHkAFdEg/+d3+r0UHdThSJ1tDKX6C0h9S4DoOIl8BSQ==",
       "dev": true,
       "dependencies": {
-        "@bundle-stats/plugin-webpack-filter": "4.14.0",
-        "@bundle-stats/plugin-webpack-validate": "4.14.0",
-        "core-js": "3.38.0",
+        "@bundle-stats/plugin-webpack-filter": "4.15.0",
+        "@bundle-stats/plugin-webpack-validate": "4.15.0",
+        "core-js": "3.38.1",
         "cosmiconfig": "9.0.0",
         "debug": "4.3.6",
         "dotenv": "16.4.5",
@@ -4213,9 +4213,9 @@
       }
     },
     "node_modules/@relative-ci/agent/node_modules/@bundle-stats/plugin-webpack-filter": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@bundle-stats/plugin-webpack-filter/-/plugin-webpack-filter-4.14.0.tgz",
-      "integrity": "sha512-/p8kMPHyFNcmpgQIOIFkSYObQQUf5F5Gbzsy+dgH+QXSGEppyI1m5Os4BJEBzqS8jUewwzcKVDIQCg2pWoKNAw==",
+      "version": "4.15.0",
+      "resolved": "https://registry.npmjs.org/@bundle-stats/plugin-webpack-filter/-/plugin-webpack-filter-4.15.0.tgz",
+      "integrity": "sha512-DQIFkcAkH4VjrDiaoe02c7n5ShGYHIdSMihwDAvRk/4x4PQ1v0/W1kyPxs71glj+6iSddumqNIE28G0DQ4mTQA==",
       "dev": true,
       "engines": {
         "node": ">= 14.0"
@@ -4225,9 +4225,9 @@
       }
     },
     "node_modules/@relative-ci/agent/node_modules/core-js": {
-      "version": "3.38.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.38.0.tgz",
-      "integrity": "sha512-XPpwqEodRljce9KswjZShh95qJ1URisBeKCjUdq27YdenkslVe7OO0ZJhlYXAChW7OhXaRLl8AAba7IBfoIHug==",
+      "version": "3.38.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.38.1.tgz",
+      "integrity": "sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw==",
       "dev": true,
       "hasInstallScript": true,
       "funding": {
@@ -5128,19 +5128,19 @@
       }
     },
     "node_modules/@vueuse/components": {
-      "version": "10.9.0",
-      "resolved": "https://registry.npmjs.org/@vueuse/components/-/components-10.9.0.tgz",
-      "integrity": "sha512-BHQpA0yIi3y7zKa1gYD0FUzLLkcRTqVhP8smnvsCK6GFpd94Nziq1XVPD7YpFeho0k5BzbBiNZF7V/DpkJ967A==",
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/@vueuse/components/-/components-11.0.1.tgz",
+      "integrity": "sha512-iZYHc7XcZ2NqpEaSiDXF6qcVcCzAwnA74s+ZV8aHJhdxO61BFpACGuT32Jb5oR+pVc6dfrUUspcCoYzLcFtOOA==",
       "dependencies": {
-        "@vueuse/core": "10.9.0",
-        "@vueuse/shared": "10.9.0",
-        "vue-demi": ">=0.14.7"
+        "@vueuse/core": "11.0.1",
+        "@vueuse/shared": "11.0.1",
+        "vue-demi": ">=0.14.10"
       }
     },
     "node_modules/@vueuse/components/node_modules/vue-demi": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.7.tgz",
-      "integrity": "sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==",
+      "version": "0.14.10",
+      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
+      "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
       "hasInstallScript": true,
       "bin": {
         "vue-demi-fix": "bin/vue-demi-fix.js",
@@ -5163,23 +5163,23 @@
       }
     },
     "node_modules/@vueuse/core": {
-      "version": "10.9.0",
-      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-10.9.0.tgz",
-      "integrity": "sha512-/1vjTol8SXnx6xewDEKfS0Ra//ncg4Hb0DaZiwKf7drgfMsKFExQ+FnnENcN6efPen+1kIzhLQoGSy0eDUVOMg==",
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-11.0.1.tgz",
+      "integrity": "sha512-YTrekI18WwEyP3h168Fir94G/HNC27wvXJI21Alm0sPOwvhihfkrvHIe+5PNJq+MpgWdRcsjvE/38JaoKrgZhQ==",
       "dependencies": {
         "@types/web-bluetooth": "^0.0.20",
-        "@vueuse/metadata": "10.9.0",
-        "@vueuse/shared": "10.9.0",
-        "vue-demi": ">=0.14.7"
+        "@vueuse/metadata": "11.0.1",
+        "@vueuse/shared": "11.0.1",
+        "vue-demi": ">=0.14.10"
       },
       "funding": {
         "url": "https://github.com/sponsors/antfu"
       }
     },
     "node_modules/@vueuse/core/node_modules/vue-demi": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.7.tgz",
-      "integrity": "sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==",
+      "version": "0.14.10",
+      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
+      "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
       "hasInstallScript": true,
       "bin": {
         "vue-demi-fix": "bin/vue-demi-fix.js",
@@ -5202,28 +5202,28 @@
       }
     },
     "node_modules/@vueuse/metadata": {
-      "version": "10.9.0",
-      "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-10.9.0.tgz",
-      "integrity": "sha512-iddNbg3yZM0X7qFY2sAotomgdHK7YJ6sKUvQqbvwnf7TmaVPxS4EJydcNsVejNdS8iWCtDk+fYXr7E32nyTnGA==",
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-11.0.1.tgz",
+      "integrity": "sha512-dTFvuHFAjLYOiSd+t9Sk7xUiuL6jbfay/eX+g+jaipXXlwKur2VCqBCZX+jfu+2vROUGcUsdn3fJR9KkpadIOg==",
       "funding": {
         "url": "https://github.com/sponsors/antfu"
       }
     },
     "node_modules/@vueuse/shared": {
-      "version": "10.9.0",
-      "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-10.9.0.tgz",
-      "integrity": "sha512-Uud2IWncmAfJvRaFYzv5OHDli+FbOzxiVEQdLCKQKLyhz94PIyFC3CHcH7EDMwIn8NPtD06+PNbC/PiO0LGLtw==",
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-11.0.1.tgz",
+      "integrity": "sha512-eAPf5CQB3HR0S76HqrhjBqFYstZfiHWZq8xF9EQmobGBkrhPfErJEhr8aMNQMqd6MkENIx2pblIEfJGlHpClug==",
       "dependencies": {
-        "vue-demi": ">=0.14.7"
+        "vue-demi": ">=0.14.10"
       },
       "funding": {
         "url": "https://github.com/sponsors/antfu"
       }
     },
     "node_modules/@vueuse/shared/node_modules/vue-demi": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.7.tgz",
-      "integrity": "sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==",
+      "version": "0.14.10",
+      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
+      "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
       "hasInstallScript": true,
       "bin": {
         "vue-demi-fix": "bin/vue-demi-fix.js",
@@ -5963,9 +5963,10 @@
       "dev": true
     },
     "node_modules/axios": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz",
-      "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
+      "version": "1.7.5",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.5.tgz",
+      "integrity": "sha512-fZu86yCo+svH3uqJ/yTdQ0QHpQu5oL+/QE+QPSv6BZSkDAoky9vytxp7u5qk83OJFS3kEBcesWni9WTZAv3tSw==",
+      "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
@@ -7730,9 +7731,9 @@
       "integrity": "sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA=="
     },
     "node_modules/cypress": {
-      "version": "13.13.3",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.13.3.tgz",
-      "integrity": "sha512-hUxPrdbJXhUOTzuML+y9Av7CKoYznbD83pt8g3klgpioEha0emfx4WNIuVRx0C76r0xV2MIwAW9WYiXfVJYFQw==",
+      "version": "13.14.1",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.14.1.tgz",
+      "integrity": "sha512-Wo+byPmjps66hACEH5udhXINEiN3qS3jWNGRzJOjrRJF3D0+YrcP2LVB1T7oYaVQM/S+eanqEvBWYc8cf7Vcbg==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
@@ -8494,6 +8495,7 @@
       "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz",
       "integrity": "sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==",
       "dev": true,
+      "license": "MIT",
       "peer": true,
       "dependencies": {
         "bn.js": "^4.11.9",
@@ -10513,6 +10515,21 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
     "node_modules/function-bind": {
       "version": "1.1.1",
       "dev": true,
@@ -15432,12 +15449,13 @@
       ]
     },
     "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "braces": "^3.0.2",
+        "braces": "^3.0.3",
         "picomatch": "^2.3.1"
       },
       "engines": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "deck",
   "description": "",
-  "version": "2.0.0-dev.0",
+  "version": "1.14.0-beta.2",
   "authors": [
     {
       "name": "Julius Härtl",
@@ -31,11 +31,11 @@
   },
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
-    "@babel/runtime": "^7.25.0",
-    "@nextcloud/auth": "^2.4.0",
+    "@babel/runtime": "^7.24.8",
+    "@nextcloud/auth": "^2.3.0",
     "@nextcloud/axios": "^2.5.0",
     "@nextcloud/capabilities": "^1.2.0",
-    "@nextcloud/dialogs": "^6.0.0",
+    "@nextcloud/dialogs": "^5.3.5",
     "@nextcloud/event-bus": "^3.3.1",
     "@nextcloud/files": "^3.8.0",
     "@nextcloud/initial-state": "^2.2.0",
@@ -83,8 +83,8 @@
     "@relative-ci/agent": "^4.2.10",
     "@vue/test-utils": "^2.4.6",
     "@vue/vue2-jest": "^29.2.6",
-    "cypress": "^13.13.3",
-    "eslint-plugin-cypress": "^3.5.0",
+    "cypress": "^13.13.2",
+    "eslint-plugin-cypress": "^3.3.0",
     "eslint-webpack-plugin": "^4.2.0",
     "jest": "^29.7.0",
     "jest-serializer-vue": "^3.1.0",
@@ -107,4 +107,4 @@
       "<rootDir>/node_modules/jest-serializer-vue"
     ]
   }
-}
+}

src/App.vue

@@ -190,9 +190,8 @@ export default {
 	.modal__card {
 		width: 100%;
 		min-width: 100%;
-		height: 100vh;
-		max-height: calc(100vh - 120px);
-		overflow: auto;
+		height: calc(100% - 20px);
+		overflow: hidden;
 	}
 
 </style>

src/CardMoveDialog.vue

@@ -92,7 +92,6 @@ export default {
 
 <style lang="scss" scoped>
 .modal__content {
-	width: 25vw;
 	min-width: 250px;
 	min-height: 120px;
 	margin: 20px 20px 100px 20px;

src/components/Controls.vue

@@ -31,7 +31,8 @@
 		<div class="board-actions">
 			<SessionList v-if="isNotifyPushEnabled && presentUsers.length"
 				:sessions="presentUsers" />
-			<div v-if="searchQuery || true" class="deck-search">
+			<!-- Hide but not remove for now as search might change in the future -->
+			<div v-if="false" class="deck-search">
 				<input id="deck-search-input"
 					ref="search"
 					:tabindex="0"
@@ -46,8 +47,11 @@
 				id="stack-add"
 				v-click-outside="hideAddStack">
 				<NcActions v-if="!isAddStackVisible">
-					<NcActionButton icon="icon-add" @click.stop="showAddStack">
+					<NcActionButton @click.stop="showAddStack">
 						{{ t('deck', 'Add list') }}
+						<template #icon>
+							<TableColumnPlusAfter :size="20" />
+						</template>
 					</NcActionButton>
 				</NcActions>
 				<form v-else @submit.prevent="addNewStack()">
@@ -263,6 +267,7 @@ import ArchiveIcon from 'vue-material-design-icons/Archive.vue'
 import ImageIcon from 'vue-material-design-icons/ImageMultiple.vue'
 import FilterIcon from 'vue-material-design-icons/Filter.vue'
 import FilterOffIcon from 'vue-material-design-icons/FilterOff.vue'
+import TableColumnPlusAfter from 'vue-material-design-icons/TableColumnPlusAfter.vue'
 import ArrowCollapseVerticalIcon from 'vue-material-design-icons/ArrowCollapseVertical.vue'
 import ArrowExpandVerticalIcon from 'vue-material-design-icons/ArrowExpandVertical.vue'
 import SessionList from './SessionList.vue'
@@ -286,6 +291,7 @@ export default {
 		FilterOffIcon,
 		ArrowCollapseVerticalIcon,
 		ArrowExpandVerticalIcon,
+		TableColumnPlusAfter,
 		SessionList,
 	},
 	mixins: [labelStyle],
@@ -475,7 +481,7 @@ export default {
 <style lang="scss" scoped>
 	.controls {
 		display: flex;
-		margin: 5px;
+		margin: calc(var(--default-grid-baseline) * 2);
 		height: var(--default-clickable-area);
 		padding-left: var(--default-clickable-area);
 
@@ -486,17 +492,17 @@ export default {
 			h2 {
 				margin: 0;
 				margin-right: 10px;
+				font-size: 18px;
 			}
 
 			.board-bullet {
 				display: inline-block;
-				width: 20px;
-				height: 20px;
+				width: 16px;
+				height: 16px;
 				border: none;
 				border-radius: 50%;
 				background-color: transparent;
-				margin: 12px;
-				margin-left: -4px;
+				margin: var(--default-grid-baseline);
 			}
 		}
 

src/components/SessionList.vue

@@ -4,7 +4,7 @@
 -->
 
 <template>
-	<div :title="t('text', 'Currently present people')"
+	<div :title="t('deck', 'Currently present people')"
 		class="avatar-list">
 		<div v-for="session in sessionsVisible"
 			:key="session.uid"

src/components/board/Stack.vue

@@ -57,8 +57,11 @@
 				</NcActionButton>
 			</NcActions>
 			<NcActions v-if="canEdit && !showArchived && !isArchived">
-				<NcActionButton icon="icon-add" data-cy="action:add-card" @click.stop="showAddCard=true">
+				<NcActionButton data-cy="action:add-card" @click.stop="showAddCard=true">
 					{{ t('deck', 'Add card') }}
+					<template #icon>
+						<CardPlusOutline :size="20" />
+					</template>
 				</NcActionButton>
 			</NcActions>
 		</div>
@@ -136,6 +139,7 @@ import ClickOutside from 'vue-click-outside'
 import { mapGetters, mapState } from 'vuex'
 import { Container, Draggable } from 'vue-smooth-dnd'
 import ArchiveIcon from 'vue-material-design-icons/Archive.vue'
+import CardPlusOutline from 'vue-material-design-icons/CardPlusOutline.vue'
 import { NcActions, NcActionButton, NcModal } from '@nextcloud/vue'
 import { showError, showUndo } from '@nextcloud/dialogs'
 
@@ -153,6 +157,7 @@ export default {
 		Draggable,
 		NcModal,
 		ArchiveIcon,
+		CardPlusOutline,
 	},
 	directives: {
 		ClickOutside,
@@ -332,8 +337,9 @@ export default {
 		z-index: 100;
 		padding-left: $card-spacing;
 		padding-right: $card-spacing;
+		margin: 6px;
 		cursor: grab;
-		min-height: var(--default-clickable-area);
+		background-color: var(--color-main-background);
 
 		// Smooth fade out of the cards at the top
 		&:before {
@@ -354,7 +360,7 @@ export default {
 		}
 
 		&--add:before {
-			height: 80px;
+			height: 78px;
 			background-image: linear-gradient(180deg, var(--color-main-background) 68px, rgba(255, 255, 255, 0) 100%);
 			body.theme--dark & {
 				background-image: linear-gradient(180deg, var(--color-main-background) 68px, rgba(0, 0, 0, 0) 100%);
@@ -383,9 +389,8 @@ export default {
 			text-overflow: ellipsis;
 			max-width: calc($stack-width - 60px);
 			border-radius: 3px;
-			margin: 6px;
 			padding: 4px 4px;
-			font-size: 120%;
+			font-size: var(--default-font-size);
 
 			&:focus-visible {
 				outline: 2px solid var(--color-border-dark);
@@ -394,7 +399,15 @@ export default {
 		}
 
 		form {
-			margin: 2px 0;
+			margin: -4px;
+			input {
+				font-weight: bold;
+				padding: 0 6px;
+			}
+			input[type="submit"] {
+				border-style: solid;
+				border-left-style: none;
+			}
 		}
 
 		:deep {
@@ -406,20 +419,18 @@ export default {
 	}
 
 	.stack__card-add {
-		height: var(--default-clickable-area);
 		flex-shrink: 0;
 		z-index: 100;
 		display: flex;
 		margin-top: 5px;
-		margin-bottom: 8px;
 		background-color: var(--color-main-background);
 
 		form {
 			display: flex;
-			margin-left: 12px;
-			margin-right: 12px;
+			margin-left: $stack-spacing;
+			margin-right: $card-spacing + $stack-spacing + 4px;
 			width: 100%;
-			border: 2px solid var(--color-border);
+			border: 2px solid var(--color-border-maxcontrast);
 			border-radius: var(--border-radius-large);
 			overflow: hidden;
 			padding: 2px;
@@ -436,6 +447,8 @@ export default {
 
 		input {
 			border: none;
+			margin: 0;
+			padding: 4px;
 		}
 	}
 

src/components/card/CardSidebar.vue

@@ -209,6 +209,10 @@ section.app-sidebar__tab--active {
 	height: 100%;
 }
 
+.modal-container {
+	overflow: hidden;
+}
+
 // FIXME: Obivously we should at some point not randomly reuse the sidebar component
 // since this is not oficially supported
 .modal__card .app-sidebar {
@@ -222,10 +226,23 @@ section.app-sidebar__tab--active {
 	max-width: calc(100% - #{$modal-padding * 2});
 	padding: 0 14px;
 	height: 97%;
-	overflow: initial;
+	overflow: hidden !important;
 	user-select: text;
 	-webkit-user-select: text;
 
+	.app-sidebar-header__mainname-container {
+		padding-top: calc(var(--default-grid-baseline, 4px) * 2);
+	}
+
+	.app-sidebar-tabs {
+		max-height: 90%;
+	}
+
+	.app-sidebar__tab {
+		min-height: calc(100% - 20px);
+		max-height: calc(100% - 20px);
+	}
+
 	// FIXME: test
 	&:deep {
 		.app-sidebar-header {

src/components/card/DueDateSelector.vue

@@ -247,7 +247,6 @@ export default defineComponent({
 .done-info--duedate,
 .done-info--done {
 	display: flex;
-	padding-top: 10px;
 	&.dimmed {
 		color: var(--color-text-maxcontrast);
 	}

src/components/cards/CardBadges.vue

@@ -168,13 +168,13 @@ export default {
 	}
 
 	.badge-left {
-		align-self: end;
-		margin-bottom: 8px;
 		flex-basis: auto;
 		flex-grow: 1;
 		flex-shrink: 1;
 		flex-wrap: wrap;
 		align-content: flex-end;
+		align-items: center;
+		align-self: center;
 		gap: 3px;
 	}
 
@@ -196,6 +196,10 @@ export default {
 		opacity: 0;
 	}
 
+	.avatars:deep(button) {
+		margin: 0;
+	}
+
 	@media print {
 		.badges {
 			align-items: flex-start;

src/components/cards/CardItem.vue

@@ -19,10 +19,10 @@
 			</div>
 			<CardCover v-if="showCardCover" :card-id="card.id" />
 			<div class="card-upper">
-				<h3 v-if="inlineEditingBlocked" dir="auto">
+				<h4 v-if="inlineEditingBlocked" dir="auto">
 					{{ card.title }}
-				</h3>
-				<h3 v-else
+				</h4>
+				<h4 v-else
 					dir="auto"
 					class="editable"
 					:aria-label="t('deck', 'Edit card title')">
@@ -35,7 +35,7 @@
 						@click.stop
 						@keyup.esc="cancelEdit"
 						@keyup.stop>{{ card.title }}</span>
-				</h3>
+				</h4>
 
 				<DueDate v-if="compactMode" :card="card" />
 				<CardMenu v-if="showMenuAtTitle" :card="card" class="right card-menu" />
@@ -294,7 +294,7 @@ export default {
 		width: 100%;
 		display: flex;
 		flex-direction: column;
-		gap: 6px;
+		gap: var(--default-grid-baseline);
 
 		&:deep(*) {
 			cursor: pointer;
@@ -314,7 +314,8 @@ export default {
 
 		.card-upper {
 			display: flex;
-			h3 {
+			h4 {
+				font-weight: normal;
 				margin: 0;
 				padding: 6px;
 				flex-grow: 1;

src/components/navigation/AppNavigationBoard.vue

@@ -350,4 +350,10 @@ export default {
 	.forced-active {
 		box-shadow: inset 4px 0 var(--color-primary-element);
 	}
+
+	:deep(.active) {
+		.material-design-icon svg {
+			fill: var(--color-primary-element-text);
+		}
+	}
 </style>

src/css/selector.scss

@@ -9,9 +9,13 @@
 	margin-top: 10px;
 
 	&--icon {
-		width: 38px;
-		padding-top: 12px;
+		width: var(--default-clickable-area);
+		height: var(--default-clickable-area);
 		flex-shrink: 0;
+		display: flex;
+		align-items: center;
+		align-content: center;
+		justify-content: center;
 	}
 
 	&--selector {
@@ -21,5 +25,6 @@
 	&--content {
 		display: flex;
 		flex-grow: 1;
+		align-items: center;
 	}
 }

src/css/variables.scss

@@ -2,8 +2,8 @@
  * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-$card-spacing: 16px;
-$card-padding: 8px;
-$stack-spacing: 12px;
-$stack-width: 280px;
-$board-spacing: 16px;
+ $card-spacing: 8px;
+ $card-padding: 4px;
+ $stack-spacing: 12px;
+ $stack-width: 280px;
+ $board-spacing: 16px;

tests/unit/Cron/ScheduledNoificationsTest.php

@@ -27,24 +27,29 @@ use OCA\Deck\Db\Card;
 use OCA\Deck\Db\CardMapper;
 use OCA\Deck\Notification\NotificationHelper;
 use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\ILogger;
 use PHPUnit\Framework\MockObject\MockObject;
-use Psr\Log\LoggerInterface;
 use Test\TestCase;
 
 class ScheduledNoificationsTest extends TestCase {
 
-	protected ITimeFactory&MockObject $timeFactory;
-	protected CardMapper&MockObject $cardMapper;
-	protected NotificationHelper&MockObject $notificationHelper;
-	protected LoggerInterface&MockObject $logger;
-	protected ScheduledNotifications $scheduledNotifications;
+	/** @var ITimeFactory|MockObject */
+	protected $timeFactory;
+	/** @var CardMapper|MockObject */
+	protected $cardMapper;
+	/** @var NotificationHelper|MockObject */
+	protected $notificationHelper;
+	/** @var ILogger|MockObject */
+	protected $logger;
+	/** @var ScheduledNotifications */
+	protected $scheduledNotifications;
 
 	public function setUp(): void {
 		parent::setUp();
 		$this->timeFactory = $this->createMock(ITimeFactory::class);
 		$this->cardMapper = $this->createMock(CardMapper::class);
 		$this->notificationHelper = $this->createMock(NotificationHelper::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
+		$this->logger = $this->createMock(ILogger::class);
 		$this->scheduledNotifications = new ScheduledNotifications($this->timeFactory, $this->cardMapper, $this->notificationHelper, $this->logger);
 	}
 

tests/unit/Middleware/ExceptionMiddlewareTest.php

@@ -32,20 +32,21 @@ use OCA\Deck\Service\PermissionService;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\IConfig;
+use OCP\ILogger;
 use OCP\IRequest;
-use PHPUnit\Framework\MockObject\MockObject;
-use Psr\Log\LoggerInterface;
 
 class ExceptionMiddlewareTest extends \Test\TestCase {
 
-	private LoggerInterface&MockObject $logger;
-	private IConfig&MockObject $config;
-	private IRequest&MockObject $request;
-	private Controller&MockObject $controller;
+	/** @var ILogger */
+	private $logger;
+	/** @var IConfig */
+	private $config;
+	private $request;
+	private $controller;
 	private $exceptionMiddleware;
 
 	public function setUp(): void {
-		$this->logger = $this->createMock(LoggerInterface::class);
+		$this->logger = $this->createMock(ILogger::class);
 		$this->config = $this->createMock(IConfig::class);
 		$this->request = $this->createMock(IRequest::class);
 		$this->controller = $this->createMock(Controller::class);

tests/unit/Service/FileServiceTest.php

@@ -34,29 +34,38 @@ use OCP\Files\SimpleFS\ISimpleFile;
 use OCP\Files\SimpleFS\ISimpleFolder;
 use OCP\IConfig;
 use OCP\IL10N;
+use OCP\ILogger;
 use OCP\IRequest;
 use PHPUnit\Framework\MockObject\MockObject;
-use Psr\Log\LoggerInterface;
 use Test\TestCase;
 
 class FileServiceTest extends TestCase {
 
-	private IL10N&MockObject $l10n;
-	private IAppData&MockObject $appData;
-	private IRequest&MockObject $request;
-	private LoggerInterface&MockObject $logger;
-	private IRootFolder&MockObject $rootFolder;
-	private IConfig&MockObject $config;
-	private AttachmentMapper&MockObject $attachmentMapper;
-	private IMimeTypeDetector&MockObject $mimeTypeDetector;
-	private FileService $fileService;
-	
+	/** @var IL10N|MockObject */
+	private $l10n;
+	/** @var IAppData|MockObject */
+	private $appData;
+	/** @var IRequest|MockObject */
+	private $request;
+	/** @var ILogger|MockObject */
+	private $logger;
+	/** @var FileService */
+	private $fileService;
+	/** @var IRootFolder */
+	private $rootFolder;
+	/** @var IConfig */
+	private $config;
+	/** @var AttachmentMapper|MockObject */
+	private $attachmentMapper;
+	/** @var IMimeTypeDetector|MockObject */
+	private $mimeTypeDetector;
+
 	public function setUp(): void {
 		parent::setUp();
 		$this->request = $this->createMock(IRequest::class);
 		$this->appData = $this->createMock(IAppData::class);
 		$this->l10n = $this->createMock(IL10N::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
+		$this->logger = $this->createMock(ILogger::class);
 		$this->rootFolder = $this->createMock(IRootFolder::class);
 		$this->config = $this->createMock(IConfig::class);
 		$this->attachmentMapper = $this->createMock(AttachmentMapper::class);