From a81e227b9c49f337d3ef7d5b01a17318460a64b6 Mon Sep 17 00:00:00 2001 From: grnd-alt Date: Mon, 1 Jun 2026 16:10:03 +0200 Subject: [PATCH 1/2] fix: correctly handle upcoming url path Signed-off-by: grnd-alt --- appinfo/routes.php | 1 + lib/Controller/PageController.php | 6 ++++++ src/components/navigation/AppNavigation.vue | 2 +- src/router.js | 3 +++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/appinfo/routes.php b/appinfo/routes.php index 8597092191..146ec8d648 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -8,6 +8,7 @@ return [ 'routes' => [ ['name' => 'page#index', 'url' => '/', 'verb' => 'GET'], + ['name' => 'page#indexUpcoming', 'url' => '/upcoming', 'verb' => 'GET'], ['name' => 'page#indexList', 'url' => '/board', 'verb' => 'GET'], ['name' => 'page#indexBoard', 'url' => '/board/{boardId}', 'verb' => 'GET'], ['name' => 'page#indexBoardDetails', 'url' => '/board/{boardId}/details', 'verb' => 'GET'], diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php index 1b5304436c..1cad275201 100644 --- a/lib/Controller/PageController.php +++ b/lib/Controller/PageController.php @@ -107,6 +107,12 @@ public function indexCard(int $cardId): TemplateResponse { return $this->index(); } + #[NoAdminRequired] + #[NoCSRFRequired] + public function indexUpcoming(): TemplateResponse { + return $this->index(); + } + #[NoAdminRequired] #[NoCSRFRequired] public function redirectToCard($cardId): RedirectResponse { diff --git a/src/components/navigation/AppNavigation.vue b/src/components/navigation/AppNavigation.vue index 86562bec3a..e0cffe2387 100644 --- a/src/components/navigation/AppNavigation.vue +++ b/src/components/navigation/AppNavigation.vue @@ -10,7 +10,7 @@ :exact="true" to="/upcoming"> diff --git a/src/router.js b/src/router.js index 7bca45457d..6b7387ace7 100644 --- a/src/router.js +++ b/src/router.js @@ -166,6 +166,9 @@ router.beforeEach((to, from, next) => { if (defaultBoardId) { next({ name: 'board', params: { id: parseInt(defaultBoardId, 10) } }) return + } else { + next({ name: 'upcoming' }) + return } } next() From f0ac3076a5e9e3654194719f7d5f169937f54e41 Mon Sep 17 00:00:00 2001 From: grnd-alt Date: Mon, 1 Jun 2026 16:16:01 +0200 Subject: [PATCH 2/2] bump version for main deployments Signed-off-by: grnd-alt --- appinfo/info.xml | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index 8507c56248..2e534010cc 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -20,7 +20,7 @@ - 🚀 Get your project organized - 4.0.0-dev.0 + 4.0.0-dev.1 agpl Julius Härtl Deck diff --git a/package-lock.json b/package-lock.json index 088421a527..83a3b05bf9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "deck", - "version": "4.0.0-dev.0", + "version": "4.0.0-dev.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "deck", - "version": "4.0.0-dev.0", + "version": "4.0.0-dev.1", "license": "agpl", "dependencies": { "@babel/polyfill": "^7.12.1", diff --git a/package.json b/package.json index 0f2c6c15b5..0d7957e0f1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "deck", "description": "", - "version": "4.0.0-dev.0", + "version": "4.0.0-dev.1", "authors": [ { "name": "Julius Härtl",